fix(mongo): use page size for aggregate results
This commit is contained in:
1 parent
0e2d0b0413
commit
c8464bf842
2 files changed
+56
-1
No files matched your search
@@ -35,6 +35,7 @@ import { quoteTableIdentifier } from "@/lib/tableSelectSql";
|
|||||||
import { connectionUsesDatabaseObjectTreeMode, connectionUsesSchemaExecutionContext, effectiveDatabaseTypeForConnection } from "@/lib/jdbcDialect";
|
import { connectionUsesDatabaseObjectTreeMode, connectionUsesSchemaExecutionContext, effectiveDatabaseTypeForConnection } from "@/lib/jdbcDialect";
|
||||||
import { queryTimeoutSecsForConnection } from "@/lib/queryTimeout";
|
import { queryTimeoutSecsForConnection } from "@/lib/queryTimeout";
|
||||||
import { sortDataGridRows, type DataGridSortDirection } from "@/lib/dataGridSort";
|
import { sortDataGridRows, type DataGridSortDirection } from "@/lib/dataGridSort";
|
||||||
|
import { normalizeResultPageSize } from "@/lib/paginationPageSize";
|
||||||
import { clearDataGridPendingSnapshotsForTab } from "@/composables/useDataGridEditor";
|
import { clearDataGridPendingSnapshotsForTab } from "@/composables/useDataGridEditor";
|
||||||
import { buildTabResultSnapshot, deleteTabResultSnapshot, readTabResultSnapshot, tabResultCacheKey, writeTabResultSnapshot } from "@/lib/tabResultCache";
|
import { buildTabResultSnapshot, deleteTabResultSnapshot, readTabResultSnapshot, tabResultCacheKey, writeTabResultSnapshot } from "@/lib/tabResultCache";
|
||||||
import { decodeQueryResultArchive, encodeQueryResultArchive, type DecodedQueryResultArchive } from "@/lib/queryResultArchive";
|
import { decodeQueryResultArchive, encodeQueryResultArchive, type DecodedQueryResultArchive } from "@/lib/queryResultArchive";
|
||||||
@@ -1557,7 +1558,8 @@ export const useQueryStore = defineStore("query", () => {
|
|||||||
}
|
}
|
||||||
await connStore.ensureConnected(tab.connectionId);
|
await connStore.ensureConnected(tab.connectionId);
|
||||||
console.info("[DBX][executeTabSql:mongo-aggregate:start]", { traceId, collection: mongoAggregate.collection });
|
console.info("[DBX][executeTabSql:mongo-aggregate:start]", { traceId, collection: mongoAggregate.collection });
|
||||||
const result = await api.mongoAggregateDocuments(tab.connectionId, tab.database, mongoAggregate.collection, mongoAggregate.pipeline, pageLimit, executionId);
|
const aggregateMaxRows = normalizeResultPageSize(pageLimit ?? options?.pagination?.limit ?? settingsStore.editorSettings.pageSize);
|
||||||
|
const result = await api.mongoAggregateDocuments(tab.connectionId, tab.database, mongoAggregate.collection, mongoAggregate.pipeline, aggregateMaxRows, executionId);
|
||||||
console.info("[DBX][executeTabSql:mongo-aggregate:done]", {
|
console.info("[DBX][executeTabSql:mongo-aggregate:done]", {
|
||||||
traceId,
|
traceId,
|
||||||
rowCount: result.documents.length,
|
rowCount: result.documents.length,
|
||||||
|
|||||||
@@ -1572,6 +1572,59 @@ test("jdbc query pagination uses result sessions without capping max rows to one
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("mongo aggregate execution uses editor page size when pagination plan has no limit", async () => {
|
||||||
|
const restoreStorage = installMemoryStorage();
|
||||||
|
setActivePinia(createPinia());
|
||||||
|
const connectionStore = useConnectionStore();
|
||||||
|
const settingsStore = useSettingsStore();
|
||||||
|
const store = useQueryStore();
|
||||||
|
const originalFetch = globalThis.fetch;
|
||||||
|
let aggregateBody: any;
|
||||||
|
|
||||||
|
settingsStore.updateEditorSettings({ pageSize: 1000 });
|
||||||
|
connectionStore.addEphemeralConnection({
|
||||||
|
...conn("mongo-1"),
|
||||||
|
db_type: "mongodb",
|
||||||
|
port: 27017,
|
||||||
|
});
|
||||||
|
|
||||||
|
globalThis.fetch = withConnectionHealthMock(async (input, init) => {
|
||||||
|
const url = String(input);
|
||||||
|
if (url === "/api/query/prepare-pagination-plan") {
|
||||||
|
const body = JSON.parse(String(init?.body ?? "{}"));
|
||||||
|
return new Response(JSON.stringify({ sqlToExecute: body.options.sql, useAgentResultSession: false }), {
|
||||||
|
status: 200,
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (url === "/api/mongo/aggregate-documents") {
|
||||||
|
aggregateBody = JSON.parse(String(init?.body ?? "{}"));
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({
|
||||||
|
documents: Array.from({ length: 811 }, (_, index) => ({ line: index + 1 })),
|
||||||
|
total: 811,
|
||||||
|
}),
|
||||||
|
{ status: 200, headers: { "Content-Type": "application/json" } },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return new Response("unexpected request", { status: 500 });
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const tabId = store.createTab("mongo-1", "accounting", "Query", "query", "");
|
||||||
|
await store.executeTabSql(tabId, 'db.getCollection("accounting_reconciliations").aggregate([{ "$match": {} }])');
|
||||||
|
const tab = store.tabs.find((item) => item.id === tabId);
|
||||||
|
|
||||||
|
assert.equal(aggregateBody.maxRows, 1000);
|
||||||
|
assert.equal(aggregateBody.collection, "accounting_reconciliations");
|
||||||
|
assert.equal(tab?.result?.rows.length, 811);
|
||||||
|
assert.equal(tab?.result?.truncated, false);
|
||||||
|
} finally {
|
||||||
|
globalThis.fetch = originalFetch;
|
||||||
|
restoreStorage();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
test("table data export fetches every filtered page", async () => {
|
test("table data export fetches every filtered page", async () => {
|
||||||
const restoreStorage = installMemoryStorage();
|
const restoreStorage = installMemoryStorage();
|
||||||
setActivePinia(createPinia());
|
setActivePinia(createPinia());
|
||||||
|
|||||||
Reference in new issue
Block a user