Skip to content

Commit 7f9e7ed

Browse files
committed
Remove dead code
1 parent a4cbf15 commit 7f9e7ed

4 files changed

Lines changed: 8 additions & 82 deletions

File tree

streamlit_pivot/frontend/src/PivotRoot.tsx

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,10 @@ import {
4343
import { PivotData, type PivotDataOptions } from "./engine/PivotData";
4444
import {
4545
createArrowDataSource,
46-
parseArrowToRecords,
4746
getArrowColumnNames,
4847
getNumericColumns,
4948
} from "./engine/parseArrow";
5049
import {
51-
FEATURE_FLAGS,
5250
measureSync,
5351
logMetrics,
5452
checkBudgets,
@@ -134,17 +132,10 @@ const PivotRoot: FC<PivotRootProps> = ({
134132
);
135133

136134
const { pivotInput, parseMs } = useMemo(() => {
137-
if (FEATURE_FLAGS.arrowColumnar) {
138-
const measured = measureSync(() => createArrowDataSource(dataframe));
139-
const ds = measured.result;
140-
return {
141-
pivotInput: ds && ds.numRows > 0 ? ds : null,
142-
parseMs: measured.elapsedMs,
143-
};
144-
}
145-
const measured = measureSync(() => parseArrowToRecords(dataframe));
135+
const measured = measureSync(() => createArrowDataSource(dataframe));
136+
const ds = measured.result;
146137
return {
147-
pivotInput: measured.result.length > 0 ? measured.result : null,
138+
pivotInput: ds && ds.numRows > 0 ? ds : null,
148139
parseMs: measured.elapsedMs,
149140
};
150141
}, [dataframe]);

streamlit_pivot/frontend/src/engine/perf.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,9 @@ export interface PerfBudgets {
6464
maxColumnCardinality: number;
6565
}
6666

67-
/** Column count above which horizontal windowing is preferred (legacy cap when wideColumnMode is off). */
67+
/** Column count above which horizontal windowing is preferred. */
6868
export const COLUMN_VIRTUALIZATION_THRESHOLD = 200;
6969

70-
/** Hard cap when {@link FEATURE_FLAGS.wideColumnMode} is false (backward compatible). */
71-
export const LEGACY_MAX_COLUMN_CARDINALITY = 200;
72-
73-
export const FEATURE_FLAGS = {
74-
/** When false, column cardinality uses {@link LEGACY_MAX_COLUMN_CARDINALITY} (200). */
75-
wideColumnMode: true,
76-
/** Skip `DataRecord[]` materialization; feed Arrow column vectors into PivotData. */
77-
arrowColumnar: true,
78-
};
79-
8070
export const DEFAULT_BUDGETS: PerfBudgets = {
8171
maxComputeMs: 500,
8272
maxRenderMs: 200,

streamlit_pivot/frontend/src/shared/budgetCheck.test.ts

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,11 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { afterEach, describe, expect, it } from "vitest";
18+
import { describe, expect, it } from "vitest";
1919
import { checkRenderBudget } from "./budgetCheck";
20-
import {
21-
DEFAULT_BUDGETS,
22-
FEATURE_FLAGS,
23-
LEGACY_MAX_COLUMN_CARDINALITY,
24-
} from "../engine/perf";
20+
import { DEFAULT_BUDGETS } from "../engine/perf";
2521

2622
describe("checkRenderBudget", () => {
27-
afterEach(() => {
28-
FEATURE_FLAGS.wideColumnMode = true;
29-
});
30-
3123
it("returns no warnings for small pivot", () => {
3224
const result = checkRenderBudget(10, 5, 1);
3325
expect(result.needsVirtualization).toBe(false);
@@ -47,7 +39,7 @@ describe("checkRenderBudget", () => {
4739
expect(result.warnings.length).toBeGreaterThan(0);
4840
});
4941

50-
it("truncates columns when cardinality exceeds limit (wideColumnMode on)", () => {
42+
it("truncates columns when cardinality exceeds limit", () => {
5143
const result = checkRenderBudget(10, 1500, 1);
5244
expect(result.columnsTruncated).toBe(true);
5345
expect(result.truncatedColumnCount).toBe(
@@ -58,23 +50,13 @@ describe("checkRenderBudget", () => {
5850
);
5951
});
6052

61-
it("does not truncate at 500 columns when wideColumnMode is true", () => {
53+
it("does not truncate at 500 columns", () => {
6254
const result = checkRenderBudget(10, 500, 1);
6355
expect(result.columnsTruncated).toBe(false);
6456
expect(result.truncatedColumnCount).toBe(500);
6557
expect(result.needsColumnVirtualization).toBe(true);
6658
});
6759

68-
it("truncates at 200 columns when wideColumnMode is false (backward compat)", () => {
69-
FEATURE_FLAGS.wideColumnMode = false;
70-
const result = checkRenderBudget(10, 500, 1);
71-
expect(result.columnsTruncated).toBe(true);
72-
expect(result.truncatedColumnCount).toBe(LEGACY_MAX_COLUMN_CARDINALITY);
73-
expect(result.warnings.some((w) => w.includes("Column cardinality"))).toBe(
74-
true,
75-
);
76-
});
77-
7860
it("accounts for multiple values in cell count", () => {
7961
const result = checkRenderBudget(100, 10, 5);
8062
expect(result.needsVirtualization).toBe(false);

streamlit_pivot/frontend/src/shared/budgetCheck.ts

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import {
1919
COLUMN_VIRTUALIZATION_THRESHOLD,
2020
DEFAULT_BUDGETS,
21-
FEATURE_FLAGS,
22-
LEGACY_MAX_COLUMN_CARDINALITY,
2321
} from "../engine/perf";
2422

2523
export interface BudgetResult {
@@ -54,41 +52,6 @@ export function checkRenderBudget(
5452
const warnings: string[] = [];
5553
const needsColumnVirtualization = colCount > COLUMN_VIRTUALIZATION_THRESHOLD;
5654

57-
if (!FEATURE_FLAGS.wideColumnMode) {
58-
let columnsTruncated = false;
59-
let truncatedColumnCount = colCount;
60-
61-
if (colCount > LEGACY_MAX_COLUMN_CARDINALITY) {
62-
columnsTruncated = true;
63-
truncatedColumnCount = LEGACY_MAX_COLUMN_CARDINALITY;
64-
warnings.push(
65-
`Column cardinality (${colCount}) exceeds limit (${LEGACY_MAX_COLUMN_CARDINALITY}). ` +
66-
`Showing first ${LEGACY_MAX_COLUMN_CARDINALITY} columns.`,
67-
);
68-
}
69-
70-
const needsVirtualization = exceedsCellBudget(
71-
rowCount,
72-
truncatedColumnCount,
73-
valueCount,
74-
);
75-
76-
if (needsVirtualization) {
77-
warnings.push(
78-
`Total cells (${(rowCount * truncatedColumnCount * Math.max(valueCount, 1)).toLocaleString()}) exceeds DOM budget ` +
79-
`(${DEFAULT_BUDGETS.maxVisibleCells.toLocaleString()}). Virtualization enabled.`,
80-
);
81-
}
82-
83-
return {
84-
needsVirtualization,
85-
needsColumnVirtualization,
86-
columnsTruncated,
87-
truncatedColumnCount,
88-
warnings,
89-
};
90-
}
91-
9255
const maxColCap = DEFAULT_BUDGETS.maxColumnCardinality;
9356
const colsAfterHardCap = Math.min(colCount, maxColCap);
9457
const exceedsHardCap = colCount > maxColCap;

0 commit comments

Comments
 (0)