Skip to content

Commit 6241e5e

Browse files
authored
fix(cubesql): Stabilize split operations for SQL push down (#7725)
* fix(cubesql): Stabilize split operations for SQL push down * More split cases support and test fixes * Final test fixes * Match old and new split * Fix linter * Failing @azure/core-util Node 18 * Failing @azure/core-util Node 18 * Failing @azure/core-util Node 18: merge prod_dependencies * Failing @azure/core-util Node 18: merge prod_dependencies * Failing @azure/core-util Node 18: merge prod_dependencies * Env variables * Update bench rewrite rules to match production * Add trivial push down rules * Add alias projection split rules
1 parent 434f961 commit 6241e5e

File tree

36 files changed

+3258
-655
lines changed

36 files changed

+3258
-655
lines changed

packages/cubejs-backend-native/Cargo.lock

Lines changed: 21 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cubejs-databricks-jdbc-driver/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@
5252
"jest": "^27",
5353
"typescript": "~5.2.2"
5454
},
55+
"resolutions": {
56+
"@azure/core-util": "1.6.1"
57+
},
5558
"publishConfig": {
5659
"access": "public"
5760
},

packages/cubejs-docker/dev.Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,14 @@ RUN yarn config set network-timeout 120000 -g
9393
# There is a problem with release process.
9494
# We are doing version bump without updating lock files for the docker package.
9595
#RUN yarn install --frozen-lockfile
96+
9697
FROM base as prod_base_dependencies
98+
COPY packages/cubejs-databricks-jdbc-driver/package.json packages/cubejs-databricks-jdbc-driver/package.json
99+
RUN mkdir packages/cubejs-databricks-jdbc-driver/bin
100+
RUN echo '#!/usr/bin/env node' > packages/cubejs-databricks-jdbc-driver/bin/post-install
97101
RUN yarn install --prod
98102

99103
FROM prod_base_dependencies as prod_dependencies
100-
COPY packages/cubejs-databricks-jdbc-driver/package.json packages/cubejs-databricks-jdbc-driver/package.json
101104
COPY packages/cubejs-databricks-jdbc-driver/bin packages/cubejs-databricks-jdbc-driver/bin
102105
RUN yarn install --prod --ignore-scripts
103106

packages/cubejs-docker/testing-drivers.Dockerfile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,15 @@ RUN yarn policies set-version v1.22.19
8787
RUN yarn config set network-timeout 120000 -g
8888

8989
######################################################################
90-
# Production dependencies for all but the databricks driver #
90+
# Databricks driver dependencies #
9191
######################################################################
9292
FROM base as prod_base_dependencies
93-
93+
COPY packages/cubejs-databricks-jdbc-driver/package.json packages/cubejs-databricks-jdbc-driver/package.json
94+
RUN mkdir packages/cubejs-databricks-jdbc-driver/bin
95+
RUN echo '#!/usr/bin/env node' > packages/cubejs-databricks-jdbc-driver/bin/post-install
9496
RUN yarn install --prod
9597

96-
######################################################################
97-
# Databricks driver dependencies #
98-
######################################################################
9998
FROM prod_base_dependencies as prod_dependencies
100-
101-
COPY packages/cubejs-databricks-jdbc-driver/package.json packages/cubejs-databricks-jdbc-driver/package.json
10299
COPY packages/cubejs-databricks-jdbc-driver/bin packages/cubejs-databricks-jdbc-driver/bin
103100
RUN yarn install --prod --ignore-scripts
104101

rust/cubesql/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ dist
77
node_modules
88
.vscode
99
/cubesql/egraph-debug
10+
/cubesql/egraph-debug-final
11+
/cubesql/egraph-debug-intermediate
1012
egraph-debug
1113
/cubesql/debug-qtrace

rust/cubesql/Cargo.lock

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/cubesql/cubesql/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ tera = { version = "1", default-features = false }
6262
minijinja = { version = "1", features = ["json", "loader"] }
6363
lru = "0.12.1"
6464
sha2 = "0.10.8"
65+
bigdecimal = "0.4.2"
6566

6667

6768
[dev-dependencies]

rust/cubesql/cubesql/benches/benchmarks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ pub fn power_bi_sum_wrap(c: &mut Criterion) {
350350

351351
criterion_group! {
352352
name = benches;
353-
config = Criterion::default().measurement_time(std::time::Duration::from_secs(30)).sample_size(10);
353+
config = Criterion::default().measurement_time(std::time::Duration::from_secs(15)).sample_size(10);
354354
targets = split_query, split_query_count_distinct, wrapped_query, power_bi_wrap, power_bi_sum_wrap
355355
}
356356
criterion_main!(benches);

rust/cubesql/cubesql/egraph-debug-template/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6+
"elkjs": "^0.9.1",
67
"react": "18.1.0",
78
"react-dom": "18.1.0",
8-
"@antv/g6": "4.8.3"
9+
"reactflow": "^11.10.3"
910
},
1011
"scripts": {
1112
"start": "GENERATE_SOURCEMAP=false && react-scripts start",

0 commit comments

Comments
 (0)