Skip to content

Commit 9d5462e

Browse files
committed
fix(dataframe): adjust data table ID handling to respect limit in query construction
1 parent 6c04a8c commit 9d5462e

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/datasources/data-frame/datasources/v2/DataFrameDataSourceV2.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9683,12 +9683,10 @@ describe('DataFrameDataSourceV2', () => {
96839683
const requestBody = queryTablesCall![1];
96849684
const substitutions = requestBody.substitutions;
96859685

9686-
// Result IDs + limited data table IDs
96879686
const expectedResultIds = 3; // result-1, result-2, result-3
96889687
const expectedDataTableIds = DATA_TABLES_IDS_LIMIT;
96899688
expect(substitutions.length).toBe(expectedResultIds + expectedDataTableIds);
96909689

9691-
// Verify the filter contains the correct number of placeholders for data table IDs
96929690
const dataTableIdPlaceholders = Array.from(
96939691
{ length: DATA_TABLES_IDS_LIMIT },
96949692
(_, i) => `@${expectedResultIds + i}`

src/datasources/data-frame/datasources/v2/DataFrameDataSourceV2.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2310,7 +2310,7 @@ export class DataFrameDataSourceV2 extends DataFrameDataSourceBase {
23102310

23112311
const dataTableIdFilter = this.buildContainsFilter(
23122312
'id',
2313-
Math.min(dataTableIds.length, DATA_TABLES_IDS_LIMIT),
2313+
dataTableIds.length,
23142314
resultIds.length
23152315
);
23162316
return `(${resultIdFilter}) || (${dataTableIdFilter})`;
@@ -2332,7 +2332,11 @@ export class DataFrameDataSourceV2 extends DataFrameDataSourceBase {
23322332

23332333
for (const { id, dataTableIds } of results) {
23342334
resultIds.push(id);
2335-
dataTableIds?.forEach(dataTableId => dataTableIdSet.add(dataTableId));
2335+
dataTableIds?.forEach(dataTableId => {
2336+
if (dataTableIdSet.size < DATA_TABLES_IDS_LIMIT) {
2337+
dataTableIdSet.add(dataTableId);
2338+
}
2339+
});
23362340
}
23372341

23382342
return { resultIds, dataTableIds: [...dataTableIdSet] };

0 commit comments

Comments
 (0)