Skip to content

Commit

Permalink
ui/cluster-ui: fix no most recent stmt for active txns
Browse files Browse the repository at this point in the history 
Fixes #87738

Previously, active txns could have an empty 'Most Recent
Statement' column, even if their executed statement count
was non-zero. This was due to the most recent query text
being populated by the active stmt, which could be empty
at the time of querying. This commit populates the last
statement text for a txn even when it is not currently
executing a query.

This commit also removes the `isFullScan` field from
active txn pages, as we cannot fill this field out
without all stmts in the txn.

Release note (ui change): Full scan field is removed
from active txn details page.

Release note (bug fix): active txns with non-zero
executed statement count now always have populated
stmt text, even when no stmt is being executed.
  • Loading branch information
@xinhaoz
xinhaoz committed Sep 19, 2022
1 parent a441ed7 commit e264e71
Show file tree
Hide file tree
Showing 5 changed files with 202 additions and 166 deletions.
304 changes: 172 additions & 132 deletions pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementUtils.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ function makeActiveTxn(
statementID: defaultActiveStatement.statementID,
retries: 3,
lastAutoRetryReason: null,
isFullScan: defaultActiveStatement.isFullScan,
priority: "Normal",
statementCount: 5,
status: "Executing",
Expand Down Expand Up @@ -184,67 +183,186 @@ describe("test activeStatementUtils", () => {
});

describe("getActiveExecutionsFromSessions", () => {
const activeQueries = [1, 2, 3, 4].map(num =>
makeActiveQuery({ id: num.toString() }),
);
it("should convert sessions response to active statements result", () => {
const sessionsResponse: SessionsResponse = {
sessions: [
{
id: new Uint8Array(),
username: "bar",
application_name: "application",
client_address: "clientAddress",
active_queries: [makeActiveQuery({ id: "1" })],
},
{
id: new Uint8Array(),
username: "foo",
application_name: "application2",
client_address: "clientAddress2",
active_queries: [makeActiveQuery({ id: "2" })],
},
{
id: new Uint8Array(),
username: "closed",
status: SessionStatusType.CLOSED,
// Closed sessions should not appear in active stmts.
application_name: "application2",
client_address: "clientAddress2",
active_queries: [makeActiveQuery({ id: "3" })],
},
],
errors: [],
internal_app_name_prefix: INTERNAL_APP_NAME_PREFIX,
toJSON: () => ({}),
};

const statements = getActiveExecutionsFromSessions(
sessionsResponse,
LAST_UPDATED,
).statements;

expect(statements.length).toBe(2);

statements.forEach(stmt => {
if (stmt.user === "bar") {
expect(stmt.application).toBe("application");
expect(stmt.clientAddress).toBe("clientAddress");
} else if (stmt.user === "foo") {
expect(stmt.application).toBe("application2");
expect(stmt.clientAddress).toBe("clientAddress2");
} else {
fail(`stmt user should be foo or bar, got ${stmt.user}`);
}
// expect(stmt.transactionID).toBe(defaultActiveStatement.transactionID);
expect(stmt.status).toBe("Executing");
expect(stmt.elapsedTimeMillis).toBe(
LAST_UPDATED.diff(MOCK_START_TIME, "ms"),
);
expect(stmt.start.unix()).toBe(
TimestampToMoment(defaultActiveQuery.start).unix(),
);
expect(stmt.query).toBe(defaultActiveStatement.query);
});
});

const sessionsResponse: SessionsResponse = {
sessions: [
{
id: new Uint8Array(),
username: "bar",
application_name: "application",
client_address: "clientAddress",
active_queries: activeQueries,
},
it("should convert sessions response to active transactions result", () => {
const txns = [
{
id: new Uint8Array(),
username: "foo",
application_name: "application2",
client_address: "clientAddress2",
active_queries: activeQueries,
start: new Timestamp({
seconds: Long.fromNumber(MOCK_START_TIME.unix()),
}),
num_auto_retries: 3,
num_statements_executed: 4,
},
{
id: new Uint8Array(),
username: "foo",
status: SessionStatusType.CLOSED,
application_name: "application2",
client_address: "clientAddress2",
active_queries: activeQueries,
start: new Timestamp({
seconds: Long.fromNumber(MOCK_START_TIME.unix()),
}),
num_auto_retries: 4,
num_statements_executed: 3,
},
],
errors: [],
internal_app_name_prefix: INTERNAL_APP_NAME_PREFIX,
toJSON: () => ({}),
};

const statements = getActiveExecutionsFromSessions(
sessionsResponse,
LAST_UPDATED,
).statements;

expect(statements.length).toBe(activeQueries.length * 2);

statements.forEach(stmt => {
if (stmt.user === "bar") {
expect(stmt.application).toBe("application");
expect(stmt.clientAddress).toBe("clientAddress");
} else if (stmt.user === "foo") {
expect(stmt.application).toBe("application2");
expect(stmt.clientAddress).toBe("clientAddress2");
} else {
fail(`stmt user should be foo or bar, got ${stmt.user}`);
}
// expect(stmt.transactionID).toBe(defaultActiveStatement.transactionID);
expect(stmt.status).toBe("Executing");
expect(stmt.elapsedTimeMillis).toBe(
LAST_UPDATED.diff(MOCK_START_TIME, "ms"),
);
expect(stmt.start.unix()).toBe(
TimestampToMoment(defaultActiveQuery.start).unix(),
];

const sessionsResponse: SessionsResponse = {
sessions: [
{
id: new Uint8Array(),
username: "bar",
application_name: "application",
client_address: "clientAddress",
active_queries: [makeActiveQuery()],
active_txn: txns[0],
},
{
id: new Uint8Array(),
username: "foo",
application_name: "application2",
client_address: "clientAddress2",
active_queries: [makeActiveQuery()],
active_txn: txns[1],
},
{
id: new Uint8Array(),
username: "foo",
status: SessionStatusType.CLOSED,
application_name: "closed_application",
client_address: "clientAddress2",
active_queries: [makeActiveQuery()],
active_txn: txns[1],
},
],
errors: [],
internal_app_name_prefix: INTERNAL_APP_NAME_PREFIX,
toJSON: () => ({}),
};

const activeTransactions = getActiveExecutionsFromSessions(
sessionsResponse,
LAST_UPDATED,
).transactions;

// Should filter out the txn from closed session.
expect(activeTransactions.length).toBe(2);

activeTransactions.forEach((txn: ActiveTransaction, i) => {
expect(txn.application).toBe(
sessionsResponse.sessions[i].application_name,
);
expect(txn.elapsedTimeMillis).toBe(
LAST_UPDATED.diff(MOCK_START_TIME, "ms"),
);
expect(txn.status).toBe("Executing");
expect(txn.query).toBeTruthy();
expect(txn.start.unix()).toBe(
TimestampToMoment(defaultActiveQuery.start).unix(),
);
});
});

it("should populate txn latest query when there is no active stmt for txns with at least 1 stmt", () => {
const lastActiveQueryText = "SELECT 1";
const sessionsResponse: SessionsResponse = {
sessions: [
{
id: new Uint8Array(),
last_active_query: lastActiveQueryText,
active_queries: [],
active_txn: {
id: new Uint8Array(),
start: new Timestamp({
seconds: Long.fromNumber(MOCK_START_TIME.unix()),
}),
num_auto_retries: 0,
num_statements_executed: 1,
},
},
{
id: new Uint8Array(),
last_active_query: lastActiveQueryText,
active_queries: [],
active_txn: {
id: new Uint8Array(),
start: new Timestamp({
seconds: Long.fromNumber(MOCK_START_TIME.unix()),
}),
num_auto_retries: 0,
num_statements_executed: 0,
},
},
],
errors: [],
internal_app_name_prefix: INTERNAL_APP_NAME_PREFIX,
toJSON: () => ({}),
};

const activeExecs = getActiveExecutionsFromSessions(
sessionsResponse,
LAST_UPDATED,
);
// expect(stmt.sessionID).toBe(defaultActiveStatement.sessionID);
expect(stmt.query).toBe(defaultActiveStatement.query);

expect(activeExecs.transactions[0].query).toBe(lastActiveQueryText);
expect(activeExecs.transactions[1].query).toBeFalsy();
});
});

Expand All @@ -262,84 +380,6 @@ describe("test activeStatementUtils", () => {
expect(apps).toEqual(["app1", "app2", "app3", "app4"]);
});

describe("getActiveExecutionsFromSessions transactions result", () => {
const txns = [
{
id: new Uint8Array(),
start: new Timestamp({
seconds: Long.fromNumber(MOCK_START_TIME.unix()),
}),
num_auto_retries: 3,
num_statements_executed: 4,
},
{
id: new Uint8Array(),
start: new Timestamp({
seconds: Long.fromNumber(MOCK_START_TIME.unix()),
}),
num_auto_retries: 4,
num_statements_executed: 3,
},
];

const sessionsResponse: SessionsResponse = {
sessions: [
{
id: new Uint8Array(),
username: "bar",
application_name: "application",
client_address: "clientAddress",
active_queries: [makeActiveQuery()],
active_txn: txns[0],
},
{
id: new Uint8Array(),
username: "foo",
application_name: "application2",
client_address: "clientAddress2",
active_queries: [makeActiveQuery()],
active_txn: txns[1],
},
{
id: new Uint8Array(),
username: "foo",
status: SessionStatusType.CLOSED,
application_name: "closed_application",
client_address: "clientAddress2",
active_queries: [makeActiveQuery()],
active_txn: txns[1],
},
],
errors: [],
internal_app_name_prefix: INTERNAL_APP_NAME_PREFIX,
toJSON: () => ({}),
};

const activeTransactions = getActiveExecutionsFromSessions(
sessionsResponse,
LAST_UPDATED,
).transactions;

// Should filter out the txn from closed session.
expect(activeTransactions.length).toBe(2);

expect(activeTransactions.length).toBe(txns.length);

activeTransactions.forEach((txn: ActiveTransaction, i) => {
expect(txn.application).toBe(
sessionsResponse.sessions[i].application_name,
);
expect(txn.elapsedTimeMillis).toBe(
LAST_UPDATED.diff(MOCK_START_TIME, "ms"),
);
expect(txn.status).toBe("Executing");
expect(txn.query).toBeTruthy();
expect(txn.start.unix()).toBe(
TimestampToMoment(defaultActiveQuery.start).unix(),
);
});
});

describe("filterActiveTransactions", () => {
it("should filter out txns that do not match filters", () => {
const txns: ActiveTransaction[] = [
Expand Down
Loading

0 comments on commit e264e71

Please sign in to comment.