Skip to content

Commit f712829

Browse files
KSDaemonKSDaemon
authored
Merge branch 'master' into feature/clickhouse_utf8_filter_order
2 parents 8971b45 + 344f08d commit f712829

File tree

18 files changed

+708
-886
lines changed

18 files changed

+708
-886
lines changed

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
"url": "https://github.com/cube-js/cube.git"
6565
},
6666
"resolutions": {
67+
"es5-ext": "0.10.53",
6768
"@types/node": "^18",
6869
"@types/ramda": "0.27.40",
6970
"thrift": "0.20.0"

‎packages/cubejs-backend-shared/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"license": "Apache-2.0",
2424
"devDependencies": {
2525
"@cubejs-backend/linter": "1.2.5",
26-
"@types/bytes": "^3.1.0",
26+
"@types/bytes": "^3.1.5",
2727
"@types/cli-progress": "^3.9.1",
28-
"@types/decompress": "^4.2.3",
28+
"@types/decompress": "^4.2.7",
2929
"@types/jest": "^27",
3030
"@types/node": "^18",
3131
"@types/node-fetch": "^2.5.8",
@@ -36,15 +36,15 @@
3636
},
3737
"dependencies": {
3838
"@oclif/color": "^0.1.2",
39-
"bytes": "^3.1.0",
39+
"bytes": "^3.1.2",
4040
"cli-progress": "^3.9.0",
4141
"cross-spawn": "^7.0.3",
4242
"decompress": "^4.2.1",
4343
"env-var": "^6.3.0",
4444
"fs-extra": "^9.1.0",
4545
"http-proxy-agent": "^4.0.1",
46-
"moment-range": "^4.0.1",
47-
"moment-timezone": "^0.5.46",
46+
"moment-range": "^4.0.2",
47+
"moment-timezone": "^0.5.47",
4848
"node-fetch": "^2.6.1",
4949
"shelljs": "^0.8.5",
5050
"throttle-debounce": "^3.0.1",

‎packages/cubejs-base-driver/package.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@
5959
],
6060
"testEnvironment": "node"
6161
},
62-
"resolutions": {
63-
"es5-ext": "0.10.53",
64-
"minimist": "^1.2.6"
65-
},
6662
"publishConfig": {
6763
"access": "public"
6864
}

‎packages/cubejs-clickhouse-driver/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@cubejs-backend/linter": "1.2.5",
4040
"@cubejs-backend/testing-shared": "1.2.5",
4141
"@types/jest": "^27",
42-
"jest": "27",
42+
"jest": "^27",
4343
"typescript": "~5.2.2"
4444
},
4545
"publishConfig": {

‎packages/cubejs-client-core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"eslint": "^7.21.0",
4343
"eslint-config-airbnb-base": "^13.1.0",
4444
"eslint-plugin-import": "^2.16.0",
45-
"eslint-plugin-node": "^5.2.1",
45+
"eslint-plugin-node": "^10.0.0",
4646
"jest": "^27"
4747
}
4848
}

‎packages/cubejs-client-dx/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"eslint": "^7.21.0",
3434
"eslint-config-airbnb-base": "^13.1.0",
3535
"eslint-plugin-import": "^2.16.0",
36-
"eslint-plugin-node": "^5.2.1",
36+
"eslint-plugin-node": "^10.0.0",
3737
"jest": "^27"
3838
},
3939
"jest": {

‎packages/cubejs-docker/testing-drivers.Dockerfile‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ COPY yarn.lock .
2727
COPY tsconfig.base.json .
2828
COPY rollup.config.js .
2929
COPY packages/cubejs-linter packages/cubejs-linter
30+
31+
# Backend
3032
COPY rust/cubesql/package.json rust/cubesql/package.json
3133
COPY rust/cubestore/package.json rust/cubestore/package.json
3234
COPY rust/cubestore/bin rust/cubestore/bin
@@ -43,6 +45,7 @@ COPY packages/cubejs-clickhouse-driver/package.json packages/cubejs-clickhouse-d
4345
COPY packages/cubejs-crate-driver/package.json packages/cubejs-crate-driver/package.json
4446
COPY packages/cubejs-dremio-driver/package.json packages/cubejs-dremio-driver/package.json
4547
COPY packages/cubejs-druid-driver/package.json packages/cubejs-druid-driver/package.json
48+
COPY packages/cubejs-duckdb-driver/package.json packages/cubejs-duckdb-driver/package.json
4649
COPY packages/cubejs-elasticsearch-driver/package.json packages/cubejs-elasticsearch-driver/package.json
4750
COPY packages/cubejs-firebolt-driver/package.json packages/cubejs-firebolt-driver/package.json
4851
COPY packages/cubejs-hive-driver/package.json packages/cubejs-hive-driver/package.json
@@ -67,6 +70,7 @@ COPY packages/cubejs-sqlite-driver/package.json packages/cubejs-sqlite-driver/pa
6770
COPY packages/cubejs-ksql-driver/package.json packages/cubejs-ksql-driver/package.json
6871
COPY packages/cubejs-dbt-schema-extension/package.json packages/cubejs-dbt-schema-extension/package.json
6972
COPY packages/cubejs-jdbc-driver/package.json packages/cubejs-jdbc-driver/package.json
73+
COPY packages/cubejs-vertica-driver/package.json packages/cubejs-vertica-driver/package.json
7074

7175
# We dont need client libraries
7276
#COPY packages/cubejs-templates/package.json packages/cubejs-templates/package.json
@@ -84,28 +88,24 @@ RUN yarn config set network-timeout 120000 -g
8488
######################################################################
8589
# Databricks driver dependencies #
8690
######################################################################
87-
FROM base AS prod_base_dependencies
91+
FROM base as prod_base_dependencies
8892
COPY packages/cubejs-databricks-jdbc-driver/package.json packages/cubejs-databricks-jdbc-driver/package.json
8993
RUN mkdir packages/cubejs-databricks-jdbc-driver/bin
9094
RUN echo '#!/usr/bin/env node' > packages/cubejs-databricks-jdbc-driver/bin/post-install
9195
RUN yarn install --prod
9296

93-
FROM prod_base_dependencies AS prod_dependencies
97+
FROM prod_base_dependencies as prod_dependencies
9498
COPY packages/cubejs-databricks-jdbc-driver/bin packages/cubejs-databricks-jdbc-driver/bin
9599
RUN yarn install --prod --ignore-scripts
96100

97101
######################################################################
98102
# Build dependencies #
99103
######################################################################
100-
FROM base AS build_dependencies
104+
FROM base AS build
101105

102106
RUN yarn install
103107

104-
######################################################################
105-
# Build layer #
106-
######################################################################
107-
FROM build_dependencies AS build
108-
108+
# Backend
109109
COPY rust/cubestore/ rust/cubestore/
110110
COPY rust/cubesql/ rust/cubesql/
111111
COPY packages/cubejs-backend-shared/ packages/cubejs-backend-shared/
@@ -121,6 +121,7 @@ COPY packages/cubejs-clickhouse-driver/ packages/cubejs-clickhouse-driver/
121121
COPY packages/cubejs-crate-driver/ packages/cubejs-crate-driver/
122122
COPY packages/cubejs-dremio-driver/ packages/cubejs-dremio-driver/
123123
COPY packages/cubejs-druid-driver/ packages/cubejs-druid-driver/
124+
COPY packages/cubejs-duckdb-driver/ packages/cubejs-duckdb-driver/
124125
COPY packages/cubejs-elasticsearch-driver/ packages/cubejs-elasticsearch-driver/
125126
COPY packages/cubejs-firebolt-driver/ packages/cubejs-firebolt-driver/
126127
COPY packages/cubejs-hive-driver/ packages/cubejs-hive-driver/
@@ -146,6 +147,7 @@ COPY packages/cubejs-ksql-driver/ packages/cubejs-ksql-driver/
146147
COPY packages/cubejs-dbt-schema-extension/ packages/cubejs-dbt-schema-extension/
147148
COPY packages/cubejs-jdbc-driver/ packages/cubejs-jdbc-driver/
148149
COPY packages/cubejs-databricks-jdbc-driver/ packages/cubejs-databricks-jdbc-driver/
150+
COPY packages/cubejs-vertica-driver/ packages/cubejs-vertica-driver/
149151

150152
# We dont need client libraries
151153
#COPY packages/cubejs-templates/ packages/cubejs-templates/
@@ -158,7 +160,8 @@ COPY packages/cubejs-databricks-jdbc-driver/ packages/cubejs-databricks-jdbc-dri
158160
#COPY packages/cubejs-playground/ packages/cubejs-playground/
159161

160162
# As we don't need any UI to test drivers, it's enough to transpile ts only.
161-
RUN yarn lerna run tsc
163+
RUN yarn lerna run build
164+
162165
RUN find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +
163166

164167
######################################################################
@@ -177,7 +180,7 @@ COPY --from=prod_dependencies /cubejs .
177180
COPY packages/cubejs-docker/bin/cubejs-dev /usr/local/bin/cubejs
178181

179182
# By default Node dont search in parent directory from /cube/conf, @todo Reaserch a little bit more
180-
ENV NODE_PATH=/cube/conf/node_modules:/cube/node_modules
183+
ENV NODE_PATH /cube/conf/node_modules:/cube/node_modules
181184
RUN ln -s /cubejs/packages/cubejs-docker /cube
182185
RUN ln -s /cubejs/rust/cubestore/bin/cubestore-dev /usr/local/bin/cubestore-dev
183186

‎packages/cubejs-dremio-driver/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@cubejs-backend/base-driver": "1.2.5",
2626
"@cubejs-backend/schema-compiler": "1.2.5",
2727
"@cubejs-backend/shared": "1.2.5",
28-
"axios": "^0.21.1",
28+
"axios": "^0.28.0",
2929
"sqlstring": "^2.3.1"
3030
},
3131
"devDependencies": {

‎packages/cubejs-druid-driver/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@cubejs-backend/base-driver": "1.2.5",
3232
"@cubejs-backend/schema-compiler": "1.2.5",
3333
"@cubejs-backend/shared": "1.2.5",
34-
"axios": "^0.21.1"
34+
"axios": "^0.28.0"
3535
},
3636
"devDependencies": {
3737
"@cubejs-backend/linter": "1.2.5",

‎packages/cubejs-druid-driver/src/DruidClient.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class DruidClient {
6363
},
6464
});
6565

66-
if (cancelled) {
66+
if (cancelled && response.headers['x-druid-sql-query-id']) {
6767
await this.cancel(response.headers['x-druid-sql-query-id']);
6868

6969
throw new Error('Query cancelled');

0 commit comments

Comments
 (0)