Merge branch 'master' into feature/clickhouse_utf8_filter_order

cube-js · Feb 18, 2025 · f712829 · f712829
2 parents 8971b45 + 344f08d
commit f712829
Show file tree

Hide file tree

Showing 18 changed files with 708 additions and 886 deletions.
diff --git a/package.json b/package.json
@@ -64,6 +64,7 @@
     "url": "https://github.com/cube-js/cube.git"
   },
   "resolutions": {
+    "es5-ext": "0.10.53",
     "@types/node": "^18",
     "@types/ramda": "0.27.40",
     "thrift": "0.20.0"

diff --git a/packages/cubejs-backend-shared/package.json b/packages/cubejs-backend-shared/package.json
@@ -23,9 +23,9 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@cubejs-backend/linter": "1.2.5",
-    "@types/bytes": "^3.1.0",
+    "@types/bytes": "^3.1.5",
     "@types/cli-progress": "^3.9.1",
-    "@types/decompress": "^4.2.3",
+    "@types/decompress": "^4.2.7",
     "@types/jest": "^27",
     "@types/node": "^18",
     "@types/node-fetch": "^2.5.8",
@@ -36,15 +36,15 @@
   },
   "dependencies": {
     "@oclif/color": "^0.1.2",
-    "bytes": "^3.1.0",
+    "bytes": "^3.1.2",
     "cli-progress": "^3.9.0",
     "cross-spawn": "^7.0.3",
     "decompress": "^4.2.1",
     "env-var": "^6.3.0",
     "fs-extra": "^9.1.0",
     "http-proxy-agent": "^4.0.1",
-    "moment-range": "^4.0.1",
-    "moment-timezone": "^0.5.46",
+    "moment-range": "^4.0.2",
+    "moment-timezone": "^0.5.47",
     "node-fetch": "^2.6.1",
     "shelljs": "^0.8.5",
     "throttle-debounce": "^3.0.1",

diff --git a/packages/cubejs-base-driver/package.json b/packages/cubejs-base-driver/package.json
@@ -59,10 +59,6 @@
     ],
     "testEnvironment": "node"
   },
-  "resolutions": {
-    "es5-ext": "0.10.53",
-    "minimist": "^1.2.6"
-  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/cubejs-clickhouse-driver/package.json b/packages/cubejs-clickhouse-driver/package.json
@@ -39,7 +39,7 @@
     "@cubejs-backend/linter": "1.2.5",
     "@cubejs-backend/testing-shared": "1.2.5",
     "@types/jest": "^27",
-    "jest": "27",
+    "jest": "^27",
     "typescript": "~5.2.2"
   },
   "publishConfig": {

diff --git a/packages/cubejs-client-core/package.json b/packages/cubejs-client-core/package.json
@@ -42,7 +42,7 @@
     "eslint": "^7.21.0",
     "eslint-config-airbnb-base": "^13.1.0",
     "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-node": "^10.0.0",
     "jest": "^27"
   }
 }
diff --git a/packages/cubejs-client-dx/package.json b/packages/cubejs-client-dx/package.json
@@ -33,7 +33,7 @@
     "eslint": "^7.21.0",
     "eslint-config-airbnb-base": "^13.1.0",
     "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-node": "^10.0.0",
     "jest": "^27"
   },
   "jest": {

diff --git a/packages/cubejs-docker/testing-drivers.Dockerfile b/packages/cubejs-docker/testing-drivers.Dockerfile
@@ -27,6 +27,8 @@ COPY yarn.lock .
 COPY tsconfig.base.json .
 COPY rollup.config.js .
 COPY packages/cubejs-linter packages/cubejs-linter
+
+# Backend
 COPY rust/cubesql/package.json rust/cubesql/package.json
 COPY rust/cubestore/package.json rust/cubestore/package.json
 COPY rust/cubestore/bin rust/cubestore/bin
@@ -43,6 +45,7 @@ COPY packages/cubejs-clickhouse-driver/package.json packages/cubejs-clickhouse-d
 COPY packages/cubejs-crate-driver/package.json packages/cubejs-crate-driver/package.json
 COPY packages/cubejs-dremio-driver/package.json packages/cubejs-dremio-driver/package.json
 COPY packages/cubejs-druid-driver/package.json packages/cubejs-druid-driver/package.json
+COPY packages/cubejs-duckdb-driver/package.json packages/cubejs-duckdb-driver/package.json
 COPY packages/cubejs-elasticsearch-driver/package.json packages/cubejs-elasticsearch-driver/package.json
 COPY packages/cubejs-firebolt-driver/package.json packages/cubejs-firebolt-driver/package.json
 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
 COPY packages/cubejs-ksql-driver/package.json packages/cubejs-ksql-driver/package.json
 COPY packages/cubejs-dbt-schema-extension/package.json packages/cubejs-dbt-schema-extension/package.json
 COPY packages/cubejs-jdbc-driver/package.json packages/cubejs-jdbc-driver/package.json
+COPY packages/cubejs-vertica-driver/package.json packages/cubejs-vertica-driver/package.json
 
 # We dont need client libraries
 #COPY packages/cubejs-templates/package.json packages/cubejs-templates/package.json
@@ -84,28 +88,24 @@ RUN yarn config set network-timeout 120000 -g
 ######################################################################
 # Databricks driver dependencies                                     #
 ######################################################################
-FROM base AS prod_base_dependencies
+FROM base as prod_base_dependencies
 COPY packages/cubejs-databricks-jdbc-driver/package.json packages/cubejs-databricks-jdbc-driver/package.json
 RUN mkdir packages/cubejs-databricks-jdbc-driver/bin
 RUN echo '#!/usr/bin/env node' > packages/cubejs-databricks-jdbc-driver/bin/post-install
 RUN yarn install --prod
 
-FROM prod_base_dependencies AS prod_dependencies
+FROM prod_base_dependencies as prod_dependencies
 COPY packages/cubejs-databricks-jdbc-driver/bin packages/cubejs-databricks-jdbc-driver/bin
 RUN yarn install --prod --ignore-scripts
 
 ######################################################################
 # Build dependencies                                                 #
 ######################################################################
-FROM base AS build_dependencies
+FROM base AS build
 
 RUN yarn install
 
-######################################################################
-# Build layer                                                        #
-######################################################################
-FROM build_dependencies AS build
-
+# Backend
 COPY rust/cubestore/ rust/cubestore/
 COPY rust/cubesql/ rust/cubesql/
 COPY packages/cubejs-backend-shared/ packages/cubejs-backend-shared/
@@ -121,6 +121,7 @@ COPY packages/cubejs-clickhouse-driver/ packages/cubejs-clickhouse-driver/
 COPY packages/cubejs-crate-driver/ packages/cubejs-crate-driver/
 COPY packages/cubejs-dremio-driver/ packages/cubejs-dremio-driver/
 COPY packages/cubejs-druid-driver/ packages/cubejs-druid-driver/
+COPY packages/cubejs-duckdb-driver/ packages/cubejs-duckdb-driver/
 COPY packages/cubejs-elasticsearch-driver/ packages/cubejs-elasticsearch-driver/
 COPY packages/cubejs-firebolt-driver/ packages/cubejs-firebolt-driver/
 COPY packages/cubejs-hive-driver/ packages/cubejs-hive-driver/
@@ -146,6 +147,7 @@ COPY packages/cubejs-ksql-driver/ packages/cubejs-ksql-driver/
 COPY packages/cubejs-dbt-schema-extension/ packages/cubejs-dbt-schema-extension/
 COPY packages/cubejs-jdbc-driver/ packages/cubejs-jdbc-driver/
 COPY packages/cubejs-databricks-jdbc-driver/ packages/cubejs-databricks-jdbc-driver/
+COPY packages/cubejs-vertica-driver/ packages/cubejs-vertica-driver/
 
 # We dont need client libraries
 #COPY packages/cubejs-templates/ packages/cubejs-templates/
@@ -158,7 +160,8 @@ COPY packages/cubejs-databricks-jdbc-driver/ packages/cubejs-databricks-jdbc-dri
 #COPY packages/cubejs-playground/ packages/cubejs-playground/
 
 # As we don't need any UI to test drivers, it's enough to transpile ts only.
-RUN yarn lerna run tsc
+RUN yarn lerna run build
+
 RUN find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +
 
 ######################################################################
@@ -177,7 +180,7 @@ COPY --from=prod_dependencies /cubejs .
 COPY packages/cubejs-docker/bin/cubejs-dev /usr/local/bin/cubejs
 
 # By default Node dont search in parent directory from /cube/conf, @todo Reaserch a little bit more
-ENV NODE_PATH=/cube/conf/node_modules:/cube/node_modules
+ENV NODE_PATH /cube/conf/node_modules:/cube/node_modules
 RUN ln -s  /cubejs/packages/cubejs-docker /cube
 RUN ln -s  /cubejs/rust/cubestore/bin/cubestore-dev /usr/local/bin/cubestore-dev
 

diff --git a/packages/cubejs-dremio-driver/package.json b/packages/cubejs-dremio-driver/package.json
@@ -25,7 +25,7 @@
     "@cubejs-backend/base-driver": "1.2.5",
     "@cubejs-backend/schema-compiler": "1.2.5",
     "@cubejs-backend/shared": "1.2.5",
-    "axios": "^0.21.1",
+    "axios": "^0.28.0",
     "sqlstring": "^2.3.1"
   },
   "devDependencies": {

diff --git a/packages/cubejs-druid-driver/package.json b/packages/cubejs-druid-driver/package.json
@@ -31,7 +31,7 @@
     "@cubejs-backend/base-driver": "1.2.5",
     "@cubejs-backend/schema-compiler": "1.2.5",
     "@cubejs-backend/shared": "1.2.5",
-    "axios": "^0.21.1"
+    "axios": "^0.28.0"
   },
   "devDependencies": {
     "@cubejs-backend/linter": "1.2.5",

diff --git a/packages/cubejs-druid-driver/src/DruidClient.ts b/packages/cubejs-druid-driver/src/DruidClient.ts
@@ -63,7 +63,7 @@ export class DruidClient {
           },
         });
 
-        if (cancelled) {
+        if (cancelled && response.headers['x-druid-sql-query-id']) {
           await this.cancel(response.headers['x-druid-sql-query-id']);
 
           throw new Error('Query cancelled');

diff --git a/packages/cubejs-ksql-driver/package.json b/packages/cubejs-ksql-driver/package.json
@@ -29,7 +29,7 @@
     "@cubejs-backend/schema-compiler": "1.2.5",
     "@cubejs-backend/shared": "1.2.5",
     "async-mutex": "0.3.2",
-    "axios": "^0.21.1",
+    "axios": "^0.28.0",
     "kafkajs": "^2.2.3",
     "sqlstring": "^2.3.1"
   },

diff --git a/packages/cubejs-linter/package.json b/packages/cubejs-linter/package.json
@@ -21,7 +21,7 @@
     "eslint": "^8.54.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-node": "^9.2.0"
+    "eslint-plugin-node": "^10.0.0"
   },
   "files": [
     "index.js"

diff --git a/packages/cubejs-query-orchestrator/package.json b/packages/cubejs-query-orchestrator/package.json
@@ -33,9 +33,8 @@
     "@cubejs-backend/cubestore-driver": "1.2.5",
     "@cubejs-backend/shared": "1.2.5",
     "csv-write-stream": "^2.0.0",
-    "es5-ext": "0.10.53",
     "generic-pool": "^3.7.1",
-    "lru-cache": "^6.0.0",
+    "lru-cache": "^5.1.1",
     "ramda": "^0.27.2"
   },
   "devDependencies": {
@@ -63,9 +62,5 @@
     "coveragePathIgnorePatterns": [
       ".*\\.d\\.ts"
     ]
-  },
-  "resolutions": {
-    "es5-ext": "0.10.53",
-    "minimist": "^1.2.6"
   }
 }
diff --git a/packages/cubejs-server/examples/simple-mysql/package.json b/packages/cubejs-server/examples/simple-mysql/package.json
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "eslint": "^4.14.0",
-    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-node": "^10.0.0",
     "mocha": "^5.2.0",
     "should": "^13.2.3"
   },

diff --git a/packages/cubejs-server/examples/simple-postgres/package.json b/packages/cubejs-server/examples/simple-postgres/package.json
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "eslint": "^4.14.0",
-    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-node": "^10.0.0",
     "mocha": "^5.2.0",
     "should": "^13.2.3"
   },

diff --git a/packages/cubejs-vertica-driver/package.json b/packages/cubejs-vertica-driver/package.json
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@cubejs-backend/linter": "1.2.5",
     "@cubejs-backend/testing-shared": "1.2.5",
-    "jest": "^27.5.1",
+    "jest": "^27",
     "testcontainers": "^10.13.0"
   },
   "publishConfig": {

diff --git a/rust/cubestore/package.json b/rust/cubestore/package.json
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@cubejs-backend/linter": "1.2.5",
     "@types/jest": "^27",
-    "@types/node": "^12",
+    "@types/node": "^18",
     "jest": "^27",
     "typescript": "~5.2.2"
   },