diff --git a/CHANGELOG.md b/CHANGELOG.md
index 898403cbf8acc..4ce76469e238b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,19 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+### Bug Fixes
+
+- **cubesql:** Support per-column format codes (Tableau Desktop compatibility) ([#10484](https://github.com/cube-js/cube/issues/10484)) ([d6ad885](https://github.com/cube-js/cube/commit/d6ad885f384d675f25ca8405dad4ee5a559e98c3)), closes [#10418](https://github.com/cube-js/cube/issues/10418)
+
+### Features
+
+- **client-core:** Use `throwContinueWait` parameter in `cubeSql` method ([#10461](https://github.com/cube-js/cube/issues/10461)) ([53a80fd](https://github.com/cube-js/cube/commit/53a80fd159fb1655b5ac5b467414b4a5352fae90))
+- **cubesql:** Introduce `cube_cache` session variable ([#10483](https://github.com/cube-js/cube/issues/10483)) ([541aa34](https://github.com/cube-js/cube/commit/541aa3465f25cb55328249b95fa9c258c95f5e07))
+- **cubestore:** Logarithmic probabilistic increment of LFU counter ([#10478](https://github.com/cube-js/cube/issues/10478)) ([4b8ac6f](https://github.com/cube-js/cube/commit/4b8ac6ff81b0ee114cd0bc4a5e8235fe294c53a2))
+- **cubestore:** Queue - add exclusivity support ([#10479](https://github.com/cube-js/cube/issues/10479)) ([b5a0ec3](https://github.com/cube-js/cube/commit/b5a0ec32c061834af0c30bd7def9097ae27af32f))
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
### Bug Fixes
diff --git a/docs/content/product/apis-integrations/core-data-apis/sql-api/index.mdx b/docs/content/product/apis-integrations/core-data-apis/sql-api/index.mdx
index f63748916f699..8ffee5726dd5d 100644
--- a/docs/content/product/apis-integrations/core-data-apis/sql-api/index.mdx
+++ b/docs/content/product/apis-integrations/core-data-apis/sql-api/index.mdx
@@ -211,6 +211,18 @@ to establish too many connections at once can lead to an out-of-memory crash.
You can use the CUBEJS_MAX_SESSIONS environment variable to adjust the session
limit.
+## Cache control
+
+You can use the `cube_cache` session variable with the [`SET` command][ref-set-command]
+to control [in-memory cache][ref-caching] behavior.
+It works the same way as [cache control in the REST API][ref-rest-cache-control].
+
+Example:
+
+```sql
+SET cube_cache = 'must-revalidate';
+```
+
## Troubleshooting
### `Can't find rewrite`
@@ -254,4 +266,7 @@ Use the following environment variables to allocate more resources for query pla
[cube-bi-use-case]: https://cube.dev/use-cases/connected-bi
[ref-queries-row-limit]: /product/apis-integrations/queries#row-limit
[ref-rest-api]: /product/apis-integrations/rest-api
-[ref-rest-api-cubesql]: /product/apis-integrations/rest-api/reference#base_pathv1cubesql
\ No newline at end of file
+[ref-rest-api-cubesql]: /product/apis-integrations/rest-api/reference#base_pathv1cubesql
+[ref-caching]: /product/caching
+[ref-rest-cache-control]: /product/apis-integrations/rest-api#cache-control
+[ref-set-command]: /product/apis-integrations/sql-api/reference#set
\ No newline at end of file
diff --git a/docs/content/product/apis-integrations/core-data-apis/sql-api/reference.mdx b/docs/content/product/apis-integrations/core-data-apis/sql-api/reference.mdx
index 734a00f8576d1..413de58db29bc 100644
--- a/docs/content/product/apis-integrations/core-data-apis/sql-api/reference.mdx
+++ b/docs/content/product/apis-integrations/core-data-apis/sql-api/reference.mdx
@@ -147,6 +147,19 @@ SHOW ALL;
(9 rows)
```
+### `SET`
+
+Synopsis:
+
+```sql
+SET name TO value
+SET name = value
+```
+
+The `SET` command changes a session variable to a new value.
+
+Use `SET` with the `cube_cache` session variable for [cache control][ref-sql-cache-control].
+
## SQL functions and operators
SQL API currently implements a subset of functions and operators [supported by
@@ -428,4 +441,5 @@ See the [XIRR recipe](/product/data-modeling/recipes/xirr) for more details.
[link-postgres-funcs]: https://www.postgresql.org/docs/current/functions.html
[link-github-sql-api]: https://github.com/cube-js/cube/issues?q=is%3Aopen+is%3Aissue+label%3Aapi%3Asql
[link-github-new-sql-api-issue]: https://github.com/cube-js/cube/issues/new?assignees=&labels=&projects=&template=sql_api_query_issue.md&title=
-[link-xirr]: https://support.microsoft.com/en-us/office/xirr-function-de1242ec-6477-445b-b11b-a303ad9adc9d
\ No newline at end of file
+[link-xirr]: https://support.microsoft.com/en-us/office/xirr-function-de1242ec-6477-445b-b11b-a303ad9adc9d
+[ref-sql-cache-control]: /product/apis-integrations/sql-api#cache-control
\ No newline at end of file
diff --git a/lerna.json b/lerna.json
index 31834cf1f52be..c84a75dbc5fb4 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
{
- "version": "1.6.20",
+ "version": "1.6.21",
"npmClient": "yarn",
"command": {
"bootstrap": {
diff --git a/packages/cubejs-api-gateway/CHANGELOG.md b/packages/cubejs-api-gateway/CHANGELOG.md
index ebdc3a7194c8c..eae022b00ef5d 100644
--- a/packages/cubejs-api-gateway/CHANGELOG.md
+++ b/packages/cubejs-api-gateway/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/api-gateway
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
### Features
diff --git a/packages/cubejs-api-gateway/package.json b/packages/cubejs-api-gateway/package.json
index 8b7ab54cf2ca9..43938620cf0ce 100644
--- a/packages/cubejs-api-gateway/package.json
+++ b/packages/cubejs-api-gateway/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/api-gateway",
"description": "Cube.js API Gateway",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -27,9 +27,9 @@
"dist/src/*"
],
"dependencies": {
- "@cubejs-backend/native": "1.6.20",
- "@cubejs-backend/query-orchestrator": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/native": "1.6.21",
+ "@cubejs-backend/query-orchestrator": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"@ungap/structured-clone": "^0.3.4",
"assert-never": "^1.4.0",
"body-parser": "^1.19.0",
@@ -53,7 +53,7 @@
"zod": "^4.1.13"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/express": "^4.17.21",
"@types/jest": "^29",
"@types/jsonwebtoken": "^9.0.2",
diff --git a/packages/cubejs-athena-driver/CHANGELOG.md b/packages/cubejs-athena-driver/CHANGELOG.md
index 4a841d20c6f03..a031e3c98312f 100644
--- a/packages/cubejs-athena-driver/CHANGELOG.md
+++ b/packages/cubejs-athena-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/athena-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/athena-driver
diff --git a/packages/cubejs-athena-driver/package.json b/packages/cubejs-athena-driver/package.json
index e7370e6408d1e..6e00100bb2a53 100644
--- a/packages/cubejs-athena-driver/package.json
+++ b/packages/cubejs-athena-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/athena-driver",
"description": "Cube.js Athena database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -30,13 +30,13 @@
"dependencies": {
"@aws-sdk/client-athena": "^3.22.0",
"@aws-sdk/credential-providers": "^3.22.0",
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"sqlstring": "^2.3.1"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/testing-shared": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/testing-shared": "1.6.21",
"@types/ramda": "^0.27.40",
"typescript": "~5.2.2"
},
diff --git a/packages/cubejs-backend-cloud/CHANGELOG.md b/packages/cubejs-backend-cloud/CHANGELOG.md
index 6518598d21c8a..baf226ae97da6 100644
--- a/packages/cubejs-backend-cloud/CHANGELOG.md
+++ b/packages/cubejs-backend-cloud/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/cloud
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/cloud
diff --git a/packages/cubejs-backend-cloud/package.json b/packages/cubejs-backend-cloud/package.json
index 8852d14c8479b..2f4b44d440c2b 100644
--- a/packages/cubejs-backend-cloud/package.json
+++ b/packages/cubejs-backend-cloud/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-backend/cloud",
- "version": "1.6.20",
+ "version": "1.6.21",
"description": "Cube Cloud package",
"main": "dist/src/index.js",
"typings": "dist/src/index.d.ts",
@@ -30,7 +30,7 @@
"devDependencies": {
"@babel/core": "^7.24.5",
"@babel/preset-env": "^7.24.5",
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/fs-extra": "^9.0.8",
"@types/jest": "^29",
"jest": "^29",
@@ -38,7 +38,7 @@
},
"dependencies": {
"@cubejs-backend/dotenv": "^9.0.2",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/shared": "1.6.21",
"chokidar": "^3.5.1",
"env-var": "^6.3.0",
"form-data": "^4.0.0",
diff --git a/packages/cubejs-backend-maven/CHANGELOG.md b/packages/cubejs-backend-maven/CHANGELOG.md
index 7737ad00bd6e1..ea4f304792fc8 100644
--- a/packages/cubejs-backend-maven/CHANGELOG.md
+++ b/packages/cubejs-backend-maven/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/maven
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/maven
diff --git a/packages/cubejs-backend-maven/package.json b/packages/cubejs-backend-maven/package.json
index cf106049adc90..1556fab8b3c52 100644
--- a/packages/cubejs-backend-maven/package.json
+++ b/packages/cubejs-backend-maven/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/maven",
"description": "Cube.js Maven Wrapper for java dependencies downloading",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"license": "Apache-2.0",
"repository": {
"type": "git",
@@ -31,12 +31,12 @@
"dist/src/*"
],
"dependencies": {
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/shared": "1.6.21",
"source-map-support": "^0.5.19",
"xmlbuilder2": "^2.4.0"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/jest": "^29",
"@types/node": "^20",
"jest": "^29",
diff --git a/packages/cubejs-backend-native/CHANGELOG.md b/packages/cubejs-backend-native/CHANGELOG.md
index 4e7bb9e204507..81609f2e9feb2 100644
--- a/packages/cubejs-backend-native/CHANGELOG.md
+++ b/packages/cubejs-backend-native/CHANGELOG.md
@@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+### Features
+
+- **cubesql:** Introduce `cube_cache` session variable ([#10483](https://github.com/cube-js/cube/issues/10483)) ([541aa34](https://github.com/cube-js/cube/commit/541aa3465f25cb55328249b95fa9c258c95f5e07))
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
### Features
diff --git a/packages/cubejs-backend-native/package.json b/packages/cubejs-backend-native/package.json
index a5d85c3e9d02a..5d9084382d1b3 100644
--- a/packages/cubejs-backend-native/package.json
+++ b/packages/cubejs-backend-native/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-backend/native",
- "version": "1.6.20",
+ "version": "1.6.21",
"author": "Cube Dev, Inc.",
"description": "Native module for Cube.js (binding to Rust codebase)",
"main": "dist/js/index.js",
@@ -36,7 +36,7 @@
"dist/js"
],
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/jest": "^29",
"@types/node": "^20",
"cargo-cp-artifact": "^0.1.9",
@@ -47,8 +47,8 @@
"uuid": "^8.3.2"
},
"dependencies": {
- "@cubejs-backend/cubesql": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/cubesql": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"@cubejs-infra/post-installer": "^0.0.7"
},
"resources": {
diff --git a/packages/cubejs-backend-native/src/transport.rs b/packages/cubejs-backend-native/src/transport.rs
index 9db2d4407be89..a8a3fc620271b 100644
--- a/packages/cubejs-backend-native/src/transport.rs
+++ b/packages/cubejs-backend-native/src/transport.rs
@@ -379,7 +379,7 @@ impl TransportService for NodeBridgeTransport {
member_to_alias: None,
expression_params: None,
streaming: false,
- cache_mode: cache_mode.clone(),
+ cache_mode,
})?;
let result = call_raw_js_with_channel_as_callback(
diff --git a/packages/cubejs-backend-shared/CHANGELOG.md b/packages/cubejs-backend-shared/CHANGELOG.md
index 45a31722b09b4..4045fc75b44c7 100644
--- a/packages/cubejs-backend-shared/CHANGELOG.md
+++ b/packages/cubejs-backend-shared/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/shared
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/shared
diff --git a/packages/cubejs-backend-shared/package.json b/packages/cubejs-backend-shared/package.json
index ae1f172d5515e..2b74f75c686b6 100644
--- a/packages/cubejs-backend-shared/package.json
+++ b/packages/cubejs-backend-shared/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-backend/shared",
- "version": "1.6.20",
+ "version": "1.6.21",
"description": "Shared code for Cube.js backend packages",
"main": "dist/src/index.js",
"typings": "dist/src/index.d.ts",
@@ -27,7 +27,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/bytes": "^3.1.5",
"@types/cli-progress": "^3.9.1",
"@types/decompress": "^4.2.7",
diff --git a/packages/cubejs-base-driver/CHANGELOG.md b/packages/cubejs-base-driver/CHANGELOG.md
index 834155e44e094..3f3e99bb90160 100644
--- a/packages/cubejs-base-driver/CHANGELOG.md
+++ b/packages/cubejs-base-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/base-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/base-driver
diff --git a/packages/cubejs-base-driver/package.json b/packages/cubejs-base-driver/package.json
index 22536e71320aa..b6235d21b4861 100644
--- a/packages/cubejs-base-driver/package.json
+++ b/packages/cubejs-base-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/base-driver",
"description": "Cube.js Base Driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -33,11 +33,11 @@
"@aws-sdk/s3-request-presigner": "^3.49.0",
"@azure/identity": "^4.4.1",
"@azure/storage-blob": "^12.9.0",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/shared": "1.6.21",
"@google-cloud/storage": "^7.13.0"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/jest": "^29",
"@types/node": "^20",
"jest": "^29",
diff --git a/packages/cubejs-bigquery-driver/CHANGELOG.md b/packages/cubejs-bigquery-driver/CHANGELOG.md
index b5a77c6341734..87eaf1b268ff1 100644
--- a/packages/cubejs-bigquery-driver/CHANGELOG.md
+++ b/packages/cubejs-bigquery-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/bigquery-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/bigquery-driver
diff --git a/packages/cubejs-bigquery-driver/package.json b/packages/cubejs-bigquery-driver/package.json
index d3b298d1136be..6b66a53e6dc2c 100644
--- a/packages/cubejs-bigquery-driver/package.json
+++ b/packages/cubejs-bigquery-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/bigquery-driver",
"description": "Cube.js BigQuery database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -29,15 +29,15 @@
"main": "index.js",
"types": "dist/src/index.d.ts",
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
"@cubejs-backend/dotenv": "^9.0.2",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/shared": "1.6.21",
"@google-cloud/bigquery": "^7.7.0",
"@google-cloud/storage": "^7.13.0",
"ramda": "^0.27.2"
},
"devDependencies": {
- "@cubejs-backend/testing-shared": "1.6.20",
+ "@cubejs-backend/testing-shared": "1.6.21",
"@types/big.js": "^6.2.2",
"@types/dedent": "^0.7.0",
"@types/jest": "^29",
diff --git a/packages/cubejs-cli/CHANGELOG.md b/packages/cubejs-cli/CHANGELOG.md
index a80b0af342365..e8e0c2546148d 100644
--- a/packages/cubejs-cli/CHANGELOG.md
+++ b/packages/cubejs-cli/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package cubejs-cli
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package cubejs-cli
diff --git a/packages/cubejs-cli/package.json b/packages/cubejs-cli/package.json
index 592bdb2494982..605b7e62454cd 100644
--- a/packages/cubejs-cli/package.json
+++ b/packages/cubejs-cli/package.json
@@ -2,7 +2,7 @@
"name": "cubejs-cli",
"description": "Cube.js Command Line Interface",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -30,10 +30,10 @@
"LICENSE"
],
"dependencies": {
- "@cubejs-backend/cloud": "1.6.20",
+ "@cubejs-backend/cloud": "1.6.21",
"@cubejs-backend/dotenv": "^9.0.2",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"chalk": "^2.4.2",
"cli-progress": "^3.10",
"commander": "^2.19.0",
@@ -50,8 +50,8 @@
"colors": "1.4.0"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/server": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/server": "1.6.21",
"@oclif/command": "^1.8.0",
"@types/cli-progress": "^3.8.0",
"@types/cross-spawn": "^6.0.2",
diff --git a/packages/cubejs-clickhouse-driver/CHANGELOG.md b/packages/cubejs-clickhouse-driver/CHANGELOG.md
index 4b96b0b627c8d..73373a2bd0552 100644
--- a/packages/cubejs-clickhouse-driver/CHANGELOG.md
+++ b/packages/cubejs-clickhouse-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/clickhouse-driver
diff --git a/packages/cubejs-clickhouse-driver/package.json b/packages/cubejs-clickhouse-driver/package.json
index 30ff57c72ae19..5e74c314845b9 100644
--- a/packages/cubejs-clickhouse-driver/package.json
+++ b/packages/cubejs-clickhouse-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/clickhouse-driver",
"description": "Cube.js ClickHouse database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -28,16 +28,16 @@
},
"dependencies": {
"@clickhouse/client": "^1.12.0",
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"moment": "^2.24.0",
"sqlstring": "^2.3.1",
"uuid": "^8.3.2"
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/testing-shared": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/testing-shared": "1.6.21",
"@types/jest": "^29",
"jest": "^29",
"typescript": "~5.2.2"
diff --git a/packages/cubejs-client-core/CHANGELOG.md b/packages/cubejs-client-core/CHANGELOG.md
index 2fe22a13cd257..84fb1ac0c006c 100644
--- a/packages/cubejs-client-core/CHANGELOG.md
+++ b/packages/cubejs-client-core/CHANGELOG.md
@@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+### Features
+
+- **client-core:** Use `throwContinueWait` parameter in `cubeSql` method ([#10461](https://github.com/cube-js/cube/issues/10461)) ([53a80fd](https://github.com/cube-js/cube/commit/53a80fd159fb1655b5ac5b467414b4a5352fae90))
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-client/core
diff --git a/packages/cubejs-client-core/package.json b/packages/cubejs-client-core/package.json
index f4511acf3fddd..d3036cd671525 100644
--- a/packages/cubejs-client-core/package.json
+++ b/packages/cubejs-client-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-client/core",
- "version": "1.6.20",
+ "version": "1.6.21",
"engines": {},
"repository": {
"type": "git",
@@ -39,7 +39,7 @@
],
"license": "MIT",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/jest": "^29",
"@types/moment-range": "^4.0.0",
"@types/ramda": "^0.27.34",
diff --git a/packages/cubejs-client-core/src/index.ts b/packages/cubejs-client-core/src/index.ts
index bcf8985e3f9eb..de7fa0e2bc7f6 100644
--- a/packages/cubejs-client-core/src/index.ts
+++ b/packages/cubejs-client-core/src/index.ts
@@ -379,7 +379,7 @@ class CubeApi {
body.error = text;
}
- if (body.error === 'Continue wait') {
+ if (body.error?.includes('Continue wait')) {
await checkMutex();
if (options?.progressCallback) {
options.progressCallback(new ProgressResult(body as ProgressResponse));
@@ -742,6 +742,7 @@ class CubeApi {
signal: options?.signal,
fetchTimeout: options?.timeout,
baseRequestId: options?.baseRequestId,
+ throwContinueWait: true,
};
if (options?.cache) {
diff --git a/packages/cubejs-client-dx/CHANGELOG.md b/packages/cubejs-client-dx/CHANGELOG.md
index ca5539e702bc7..a21c976eea37a 100644
--- a/packages/cubejs-client-dx/CHANGELOG.md
+++ b/packages/cubejs-client-dx/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-client/dx
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-client/dx
diff --git a/packages/cubejs-client-dx/package.json b/packages/cubejs-client-dx/package.json
index 23b2308c70af4..f3789440cb290 100644
--- a/packages/cubejs-client-dx/package.json
+++ b/packages/cubejs-client-dx/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-client/dx",
- "version": "1.6.20",
+ "version": "1.6.21",
"engines": {},
"repository": {
"type": "git",
diff --git a/packages/cubejs-client-ngx/CHANGELOG.md b/packages/cubejs-client-ngx/CHANGELOG.md
index 8ac404c111c45..d6fbb13bd9c42 100644
--- a/packages/cubejs-client-ngx/CHANGELOG.md
+++ b/packages/cubejs-client-ngx/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-client/ngx
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-client/ngx
diff --git a/packages/cubejs-client-ngx/package.json b/packages/cubejs-client-ngx/package.json
index dc96f0bca529f..d748fdc98ce39 100644
--- a/packages/cubejs-client-ngx/package.json
+++ b/packages/cubejs-client-ngx/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-client/ngx",
- "version": "1.6.20",
+ "version": "1.6.21",
"author": "Cube Dev, Inc.",
"engines": {},
"repository": {
diff --git a/packages/cubejs-client-react/CHANGELOG.md b/packages/cubejs-client-react/CHANGELOG.md
index 77d82805d8794..ef2fff5263825 100644
--- a/packages/cubejs-client-react/CHANGELOG.md
+++ b/packages/cubejs-client-react/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-client/react
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-client/react
diff --git a/packages/cubejs-client-react/package.json b/packages/cubejs-client-react/package.json
index 70b65ce3e86a0..95959c20309db 100644
--- a/packages/cubejs-client-react/package.json
+++ b/packages/cubejs-client-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-client/react",
- "version": "1.6.20",
+ "version": "1.6.21",
"author": "Cube Dev, Inc.",
"license": "MIT",
"engines": {},
@@ -24,7 +24,7 @@
],
"dependencies": {
"@babel/runtime": "^7.1.2",
- "@cubejs-client/core": "1.6.20",
+ "@cubejs-client/core": "1.6.21",
"core-js": "^3.6.5",
"ramda": "^0.27.2"
},
diff --git a/packages/cubejs-client-vue3/CHANGELOG.md b/packages/cubejs-client-vue3/CHANGELOG.md
index 13a1ac0f525f9..2979bc4bedfa1 100644
--- a/packages/cubejs-client-vue3/CHANGELOG.md
+++ b/packages/cubejs-client-vue3/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-client/vue3
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-client/vue3
diff --git a/packages/cubejs-client-vue3/package.json b/packages/cubejs-client-vue3/package.json
index 54d4102aab6fe..5901d4c01a9fc 100644
--- a/packages/cubejs-client-vue3/package.json
+++ b/packages/cubejs-client-vue3/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-client/vue3",
- "version": "1.6.20",
+ "version": "1.6.21",
"engines": {},
"repository": {
"type": "git",
@@ -28,7 +28,7 @@
"src"
],
"dependencies": {
- "@cubejs-client/core": "1.6.20",
+ "@cubejs-client/core": "1.6.21",
"ramda": "^0.27.0"
},
"devDependencies": {
diff --git a/packages/cubejs-client-ws-transport/CHANGELOG.md b/packages/cubejs-client-ws-transport/CHANGELOG.md
index 750dd199d9be7..bed6d9afe8305 100644
--- a/packages/cubejs-client-ws-transport/CHANGELOG.md
+++ b/packages/cubejs-client-ws-transport/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-client/ws-transport
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-client/ws-transport
diff --git a/packages/cubejs-client-ws-transport/package.json b/packages/cubejs-client-ws-transport/package.json
index 8b32b897ab3b2..29730552928cb 100644
--- a/packages/cubejs-client-ws-transport/package.json
+++ b/packages/cubejs-client-ws-transport/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-client/ws-transport",
- "version": "1.6.20",
+ "version": "1.6.21",
"engines": {},
"repository": {
"type": "git",
@@ -20,7 +20,7 @@
},
"dependencies": {
"@babel/runtime": "^7.1.2",
- "@cubejs-client/core": "1.6.20",
+ "@cubejs-client/core": "1.6.21",
"core-js": "^3.6.5",
"isomorphic-ws": "^4.0.1",
"ws": "^7.3.1"
@@ -33,7 +33,7 @@
"@babel/core": "^7.3.3",
"@babel/preset-env": "^7.3.1",
"@babel/preset-typescript": "^7.12.1",
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/ws": "^7.2.9",
"typescript": "~5.2.2"
},
diff --git a/packages/cubejs-crate-driver/CHANGELOG.md b/packages/cubejs-crate-driver/CHANGELOG.md
index 03203e45d2e0a..b0b7a2b6e8195 100644
--- a/packages/cubejs-crate-driver/CHANGELOG.md
+++ b/packages/cubejs-crate-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/crate-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/crate-driver
diff --git a/packages/cubejs-crate-driver/package.json b/packages/cubejs-crate-driver/package.json
index 22bb80ad1e5d2..4cf03fd84f661 100644
--- a/packages/cubejs-crate-driver/package.json
+++ b/packages/cubejs-crate-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/crate-driver",
"description": "Cube.js Crate database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -28,13 +28,13 @@
"lint:fix": "eslint --fix src/* --ext .ts"
},
"dependencies": {
- "@cubejs-backend/postgres-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20"
+ "@cubejs-backend/postgres-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21"
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/testing-shared": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/testing-shared": "1.6.21",
"testcontainers": "^10.28.0",
"typescript": "~5.2.2"
},
diff --git a/packages/cubejs-cubestore-driver/CHANGELOG.md b/packages/cubejs-cubestore-driver/CHANGELOG.md
index fbdd8d0687d17..9e2a091b32836 100644
--- a/packages/cubejs-cubestore-driver/CHANGELOG.md
+++ b/packages/cubejs-cubestore-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/cubestore-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
### Features
diff --git a/packages/cubejs-cubestore-driver/package.json b/packages/cubejs-cubestore-driver/package.json
index dd58fdf8ce5fe..34326ef782dc5 100644
--- a/packages/cubejs-cubestore-driver/package.json
+++ b/packages/cubejs-cubestore-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/cubestore-driver",
"description": "Cube Store driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -26,10 +26,10 @@
"lint:fix": "eslint --fix src/*.ts"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/cubestore": "1.6.20",
- "@cubejs-backend/native": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/cubestore": "1.6.21",
+ "@cubejs-backend/native": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"csv-write-stream": "^2.0.0",
"flatbuffers": "23.3.3",
"fs-extra": "^9.1.0",
@@ -40,7 +40,7 @@
"ws": "^7.4.3"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/csv-write-stream": "^2.0.0",
"@types/jest": "^29",
"@types/node": "^20",
diff --git a/packages/cubejs-databricks-jdbc-driver/CHANGELOG.md b/packages/cubejs-databricks-jdbc-driver/CHANGELOG.md
index edfc6617abfdb..897b9f3434481 100644
--- a/packages/cubejs-databricks-jdbc-driver/CHANGELOG.md
+++ b/packages/cubejs-databricks-jdbc-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/databricks-jdbc-driver
diff --git a/packages/cubejs-databricks-jdbc-driver/package.json b/packages/cubejs-databricks-jdbc-driver/package.json
index 0684132bda9d9..9ed810a1d5ac7 100644
--- a/packages/cubejs-databricks-jdbc-driver/package.json
+++ b/packages/cubejs-databricks-jdbc-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/databricks-jdbc-driver",
"description": "Cube.js Databricks database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"license": "Apache-2.0",
"repository": {
"type": "git",
@@ -30,17 +30,17 @@
"bin"
],
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/jdbc-driver": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/jdbc-driver": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"node-fetch": "^2.6.1",
"ramda": "^0.27.2",
"source-map-support": "^0.5.19",
"uuid": "^8.3.2"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/jest": "^29",
"@types/node": "^20",
"@types/ramda": "^0.27.34",
diff --git a/packages/cubejs-dbt-schema-extension/CHANGELOG.md b/packages/cubejs-dbt-schema-extension/CHANGELOG.md
index 980343e547a58..23fb0f2bb45ec 100644
--- a/packages/cubejs-dbt-schema-extension/CHANGELOG.md
+++ b/packages/cubejs-dbt-schema-extension/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/dbt-schema-extension
diff --git a/packages/cubejs-dbt-schema-extension/package.json b/packages/cubejs-dbt-schema-extension/package.json
index 0103814999b63..6a5cdd822568a 100644
--- a/packages/cubejs-dbt-schema-extension/package.json
+++ b/packages/cubejs-dbt-schema-extension/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/dbt-schema-extension",
"description": "Cube.js dbt Schema Extension",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -25,14 +25,14 @@
"lint:fix": "eslint --fix src/* --ext .ts,.js"
},
"dependencies": {
- "@cubejs-backend/schema-compiler": "1.6.20",
+ "@cubejs-backend/schema-compiler": "1.6.21",
"fs-extra": "^9.1.0",
"inflection": "^1.12.0",
"node-fetch": "^2.6.1"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/testing": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/testing": "1.6.21",
"@types/jest": "^29",
"jest": "^29",
"stream-to-array": "^2.3.0",
diff --git a/packages/cubejs-docker/CHANGELOG.md b/packages/cubejs-docker/CHANGELOG.md
index d4dc0367c775e..30244e7857a7c 100644
--- a/packages/cubejs-docker/CHANGELOG.md
+++ b/packages/cubejs-docker/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/docker
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/docker
diff --git a/packages/cubejs-docker/package.json b/packages/cubejs-docker/package.json
index cce75447652f9..3f4cd46d039b0 100644
--- a/packages/cubejs-docker/package.json
+++ b/packages/cubejs-docker/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-backend/docker",
- "version": "1.6.20",
+ "version": "1.6.21",
"description": "Cube.js In Docker (virtual package)",
"author": "Cube Dev, Inc.",
"license": "Apache-2.0",
@@ -9,35 +9,35 @@
"node": ">=18.0.0"
},
"dependencies": {
- "@cubejs-backend/athena-driver": "1.6.20",
- "@cubejs-backend/bigquery-driver": "1.6.20",
- "@cubejs-backend/clickhouse-driver": "1.6.20",
- "@cubejs-backend/crate-driver": "1.6.20",
- "@cubejs-backend/databricks-jdbc-driver": "1.6.20",
- "@cubejs-backend/dbt-schema-extension": "1.6.20",
- "@cubejs-backend/dremio-driver": "1.6.20",
- "@cubejs-backend/druid-driver": "1.6.20",
- "@cubejs-backend/duckdb-driver": "1.6.20",
- "@cubejs-backend/elasticsearch-driver": "1.6.20",
- "@cubejs-backend/firebolt-driver": "1.6.20",
- "@cubejs-backend/hive-driver": "1.6.20",
- "@cubejs-backend/ksql-driver": "1.6.20",
- "@cubejs-backend/materialize-driver": "1.6.20",
- "@cubejs-backend/mongobi-driver": "1.6.20",
- "@cubejs-backend/mssql-driver": "1.6.20",
- "@cubejs-backend/mysql-driver": "1.6.20",
- "@cubejs-backend/oracle-driver": "1.6.20",
- "@cubejs-backend/pinot-driver": "1.6.20",
- "@cubejs-backend/postgres-driver": "1.6.20",
- "@cubejs-backend/prestodb-driver": "1.6.20",
- "@cubejs-backend/questdb-driver": "1.6.20",
- "@cubejs-backend/redshift-driver": "1.6.20",
- "@cubejs-backend/server": "1.6.20",
- "@cubejs-backend/snowflake-driver": "1.6.20",
- "@cubejs-backend/sqlite-driver": "1.6.20",
- "@cubejs-backend/trino-driver": "1.6.20",
- "@cubejs-backend/vertica-driver": "1.6.20",
- "cubejs-cli": "1.6.20",
+ "@cubejs-backend/athena-driver": "1.6.21",
+ "@cubejs-backend/bigquery-driver": "1.6.21",
+ "@cubejs-backend/clickhouse-driver": "1.6.21",
+ "@cubejs-backend/crate-driver": "1.6.21",
+ "@cubejs-backend/databricks-jdbc-driver": "1.6.21",
+ "@cubejs-backend/dbt-schema-extension": "1.6.21",
+ "@cubejs-backend/dremio-driver": "1.6.21",
+ "@cubejs-backend/druid-driver": "1.6.21",
+ "@cubejs-backend/duckdb-driver": "1.6.21",
+ "@cubejs-backend/elasticsearch-driver": "1.6.21",
+ "@cubejs-backend/firebolt-driver": "1.6.21",
+ "@cubejs-backend/hive-driver": "1.6.21",
+ "@cubejs-backend/ksql-driver": "1.6.21",
+ "@cubejs-backend/materialize-driver": "1.6.21",
+ "@cubejs-backend/mongobi-driver": "1.6.21",
+ "@cubejs-backend/mssql-driver": "1.6.21",
+ "@cubejs-backend/mysql-driver": "1.6.21",
+ "@cubejs-backend/oracle-driver": "1.6.21",
+ "@cubejs-backend/pinot-driver": "1.6.21",
+ "@cubejs-backend/postgres-driver": "1.6.21",
+ "@cubejs-backend/prestodb-driver": "1.6.21",
+ "@cubejs-backend/questdb-driver": "1.6.21",
+ "@cubejs-backend/redshift-driver": "1.6.21",
+ "@cubejs-backend/server": "1.6.21",
+ "@cubejs-backend/snowflake-driver": "1.6.21",
+ "@cubejs-backend/sqlite-driver": "1.6.21",
+ "@cubejs-backend/trino-driver": "1.6.21",
+ "@cubejs-backend/vertica-driver": "1.6.21",
+ "cubejs-cli": "1.6.21",
"typescript": "~5.2.2"
},
"resolutions": {
diff --git a/packages/cubejs-dremio-driver/CHANGELOG.md b/packages/cubejs-dremio-driver/CHANGELOG.md
index 5afe8b8a9dfe4..1afd8dfc69684 100644
--- a/packages/cubejs-dremio-driver/CHANGELOG.md
+++ b/packages/cubejs-dremio-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/dremio-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/dremio-driver
diff --git a/packages/cubejs-dremio-driver/package.json b/packages/cubejs-dremio-driver/package.json
index 8e33726d03134..0da312a27b7e0 100644
--- a/packages/cubejs-dremio-driver/package.json
+++ b/packages/cubejs-dremio-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/dremio-driver",
"description": "Cube.js Dremio driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -22,15 +22,15 @@
"lint:fix": "eslint driver/*.js"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"axios": "^1.8.3",
"sqlstring": "^2.3.1"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/testing-shared": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/testing-shared": "1.6.21",
"jest": "^29"
},
"license": "Apache-2.0",
diff --git a/packages/cubejs-druid-driver/CHANGELOG.md b/packages/cubejs-druid-driver/CHANGELOG.md
index 0a51cba026e3f..96fbb7e89322a 100644
--- a/packages/cubejs-druid-driver/CHANGELOG.md
+++ b/packages/cubejs-druid-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/druid-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/druid-driver
diff --git a/packages/cubejs-druid-driver/package.json b/packages/cubejs-druid-driver/package.json
index 6ec9d53bd0f62..1cb9e2f064bfa 100644
--- a/packages/cubejs-druid-driver/package.json
+++ b/packages/cubejs-druid-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/druid-driver",
"description": "Cube.js Druid database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"license": "Apache-2.0",
"repository": {
"type": "git",
@@ -28,13 +28,13 @@
"dist/src/*"
],
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"axios": "^1.8.3"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/jest": "^29",
"@types/node": "^20",
"jest": "^29",
diff --git a/packages/cubejs-duckdb-driver/CHANGELOG.md b/packages/cubejs-duckdb-driver/CHANGELOG.md
index 0eeabd9853e3e..63f8a0fb00b20 100644
--- a/packages/cubejs-duckdb-driver/CHANGELOG.md
+++ b/packages/cubejs-duckdb-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/duckdb-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/duckdb-driver
diff --git a/packages/cubejs-duckdb-driver/package.json b/packages/cubejs-duckdb-driver/package.json
index 685948a7bcf15..52c7ed739d088 100644
--- a/packages/cubejs-duckdb-driver/package.json
+++ b/packages/cubejs-duckdb-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/duckdb-driver",
"description": "Cube DuckDB database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -27,15 +27,15 @@
"lint:fix": "eslint --fix src/* --ext .ts"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"duckdb": "^1.4.1"
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/testing-shared": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/testing-shared": "1.6.21",
"@types/jest": "^29",
"@types/node": "^20",
"jest": "^29",
diff --git a/packages/cubejs-elasticsearch-driver/CHANGELOG.md b/packages/cubejs-elasticsearch-driver/CHANGELOG.md
index a9e125df89e92..8a6521dfd5cba 100644
--- a/packages/cubejs-elasticsearch-driver/CHANGELOG.md
+++ b/packages/cubejs-elasticsearch-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/elasticsearch-driver
diff --git a/packages/cubejs-elasticsearch-driver/package.json b/packages/cubejs-elasticsearch-driver/package.json
index ae0fd60b8a6e0..00c3b1ef93dab 100644
--- a/packages/cubejs-elasticsearch-driver/package.json
+++ b/packages/cubejs-elasticsearch-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/elasticsearch-driver",
"description": "Cube.js elasticsearch database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -23,14 +23,14 @@
"driver"
],
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"@elastic/elasticsearch": "7.12.0",
"sqlstring": "^2.3.1"
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/jest": "^29",
"jest": "^29",
"testcontainers": "^10.28.0"
diff --git a/packages/cubejs-firebolt-driver/CHANGELOG.md b/packages/cubejs-firebolt-driver/CHANGELOG.md
index 9a9527e805334..be471ff09fe6c 100644
--- a/packages/cubejs-firebolt-driver/CHANGELOG.md
+++ b/packages/cubejs-firebolt-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/firebolt-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/firebolt-driver
diff --git a/packages/cubejs-firebolt-driver/package.json b/packages/cubejs-firebolt-driver/package.json
index 95cc37fb3eb91..6935d4f6e7c6b 100644
--- a/packages/cubejs-firebolt-driver/package.json
+++ b/packages/cubejs-firebolt-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/firebolt-driver",
"description": "Cube.js Firebolt database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -28,15 +28,15 @@
"lint:fix": "eslint --fix src/* --ext .ts"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"firebolt-sdk": "1.10.0"
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/testing-shared": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/testing-shared": "1.6.21",
"typescript": "~5.2.2"
},
"publishConfig": {
diff --git a/packages/cubejs-hive-driver/CHANGELOG.md b/packages/cubejs-hive-driver/CHANGELOG.md
index 9b4a8873aa55d..9e5345fba8c5f 100644
--- a/packages/cubejs-hive-driver/CHANGELOG.md
+++ b/packages/cubejs-hive-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/hive-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/hive-driver
diff --git a/packages/cubejs-hive-driver/package.json b/packages/cubejs-hive-driver/package.json
index 204bae3184879..34e17bcb0ba82 100644
--- a/packages/cubejs-hive-driver/package.json
+++ b/packages/cubejs-hive-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/hive-driver",
"description": "Cube.js Hive database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -17,8 +17,8 @@
"lint:fix": "eslint --fix src/* --ext .ts"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"jshs2": "^0.4.4",
"sasl-plain": "^0.1.0",
"saslmechanisms": "^0.1.1",
@@ -27,7 +27,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20"
+ "@cubejs-backend/linter": "1.6.21"
},
"publishConfig": {
"access": "public"
diff --git a/packages/cubejs-jdbc-driver/CHANGELOG.md b/packages/cubejs-jdbc-driver/CHANGELOG.md
index c6c646d9ca565..fa28f8a6228b6 100644
--- a/packages/cubejs-jdbc-driver/CHANGELOG.md
+++ b/packages/cubejs-jdbc-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/jdbc-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/jdbc-driver
diff --git a/packages/cubejs-jdbc-driver/package.json b/packages/cubejs-jdbc-driver/package.json
index 5328d9b4bbf12..aded359ed7a9c 100644
--- a/packages/cubejs-jdbc-driver/package.json
+++ b/packages/cubejs-jdbc-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/jdbc-driver",
"description": "Cube.js JDBC database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -25,9 +25,9 @@
"index.js"
],
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
"@cubejs-backend/node-java-maven": "^0.1.3",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/shared": "1.6.21",
"sqlstring": "^2.3.0"
},
"optionalDependencies": {
@@ -42,7 +42,7 @@
"testEnvironment": "node"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/node": "^20",
"@types/sqlstring": "^2.3.0",
"typescript": "~5.2.2"
diff --git a/packages/cubejs-ksql-driver/CHANGELOG.md b/packages/cubejs-ksql-driver/CHANGELOG.md
index 7431ca8763d88..35d999d13a960 100644
--- a/packages/cubejs-ksql-driver/CHANGELOG.md
+++ b/packages/cubejs-ksql-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/ksql-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/ksql-driver
diff --git a/packages/cubejs-ksql-driver/package.json b/packages/cubejs-ksql-driver/package.json
index b186baeb9396c..a52742aeeb51d 100644
--- a/packages/cubejs-ksql-driver/package.json
+++ b/packages/cubejs-ksql-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/ksql-driver",
"description": "Cube.js ksql database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -25,9 +25,9 @@
"lint:fix": "eslint --fix src/* --ext .ts"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"async-mutex": "0.3.2",
"axios": "^1.8.3",
"kafkajs": "^2.2.3",
@@ -41,7 +41,7 @@
"extends": "../cubejs-linter"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"typescript": "~5.2.2"
}
}
diff --git a/packages/cubejs-linter/CHANGELOG.md b/packages/cubejs-linter/CHANGELOG.md
index f85baef1e1efd..170ce1a37a2be 100644
--- a/packages/cubejs-linter/CHANGELOG.md
+++ b/packages/cubejs-linter/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/linter
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/linter
diff --git a/packages/cubejs-linter/package.json b/packages/cubejs-linter/package.json
index 3774467af598a..bdd415c97fecc 100644
--- a/packages/cubejs-linter/package.json
+++ b/packages/cubejs-linter/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/linter",
"description": "Cube.js ESLint (virtual package) for linting code",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
diff --git a/packages/cubejs-materialize-driver/CHANGELOG.md b/packages/cubejs-materialize-driver/CHANGELOG.md
index f25b188c68407..6cf74eaab599e 100644
--- a/packages/cubejs-materialize-driver/CHANGELOG.md
+++ b/packages/cubejs-materialize-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/materialize-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/materialize-driver
diff --git a/packages/cubejs-materialize-driver/package.json b/packages/cubejs-materialize-driver/package.json
index b3803a4482c49..114dcd7d2108d 100644
--- a/packages/cubejs-materialize-driver/package.json
+++ b/packages/cubejs-materialize-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/materialize-driver",
"description": "Cube.js Materialize database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -27,15 +27,15 @@
"lint:fix": "eslint --fix src/* --ext .ts"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/postgres-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/postgres-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"semver": "^7.6.3"
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/testing": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/testing": "1.6.21",
"typescript": "~5.2.2"
},
"publishConfig": {
diff --git a/packages/cubejs-mongobi-driver/CHANGELOG.md b/packages/cubejs-mongobi-driver/CHANGELOG.md
index 50c4c30989d41..514cf1ec111bf 100644
--- a/packages/cubejs-mongobi-driver/CHANGELOG.md
+++ b/packages/cubejs-mongobi-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/mongobi-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/mongobi-driver
diff --git a/packages/cubejs-mongobi-driver/package.json b/packages/cubejs-mongobi-driver/package.json
index 6ebfc4d327e15..20795369c2a7e 100644
--- a/packages/cubejs-mongobi-driver/package.json
+++ b/packages/cubejs-mongobi-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/mongobi-driver",
"description": "Cube.js MongoBI driver",
"author": "krunalsabnis@gmail.com",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -27,8 +27,8 @@
"integration:mongobi": "jest dist/test"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"@types/node": "^20",
"moment": "^2.29.1",
"mysql2": "^3.11.5"
@@ -38,7 +38,7 @@
"access": "public"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"testcontainers": "^10.28.0",
"typescript": "~5.2.2"
},
diff --git a/packages/cubejs-mssql-driver/CHANGELOG.md b/packages/cubejs-mssql-driver/CHANGELOG.md
index 1e95a48989f6d..4e26a7109b6d7 100644
--- a/packages/cubejs-mssql-driver/CHANGELOG.md
+++ b/packages/cubejs-mssql-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/mssql-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/mssql-driver
diff --git a/packages/cubejs-mssql-driver/package.json b/packages/cubejs-mssql-driver/package.json
index 905a1d5da240c..93cf74d73a812 100644
--- a/packages/cubejs-mssql-driver/package.json
+++ b/packages/cubejs-mssql-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/mssql-driver",
"description": "Cube.js MS SQL database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -25,8 +25,8 @@
"lint:fix": "eslint --fix src/* --ext .ts,.js"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"mssql": "^11.0.1"
},
"devDependencies": {
diff --git a/packages/cubejs-mysql-aurora-serverless-driver/CHANGELOG.md b/packages/cubejs-mysql-aurora-serverless-driver/CHANGELOG.md
index 4624c897bf679..661d17817c46c 100644
--- a/packages/cubejs-mysql-aurora-serverless-driver/CHANGELOG.md
+++ b/packages/cubejs-mysql-aurora-serverless-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/mysql-aurora-serverless-driver
diff --git a/packages/cubejs-mysql-aurora-serverless-driver/package.json b/packages/cubejs-mysql-aurora-serverless-driver/package.json
index c0eafb1fc2e37..80e9fd9ea63c0 100644
--- a/packages/cubejs-mysql-aurora-serverless-driver/package.json
+++ b/packages/cubejs-mysql-aurora-serverless-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/mysql-aurora-serverless-driver",
"description": "Cube.js Aurora Serverless Mysql database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -21,14 +21,14 @@
"lint": "eslint driver/*.js test/*.js"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"@types/mysql": "^2.15.15",
"aws-sdk": "^2.787.0",
"data-api-client": "^1.1.0"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/data-api-client": "^1.2.1",
"@types/jest": "^29",
"jest": "^29",
diff --git a/packages/cubejs-mysql-driver/CHANGELOG.md b/packages/cubejs-mysql-driver/CHANGELOG.md
index 98e0617803f42..b2fb6b46dd628 100644
--- a/packages/cubejs-mysql-driver/CHANGELOG.md
+++ b/packages/cubejs-mysql-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/mysql-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/mysql-driver
diff --git a/packages/cubejs-mysql-driver/package.json b/packages/cubejs-mysql-driver/package.json
index 2ed9e678d18e8..237c3b94fab4c 100644
--- a/packages/cubejs-mysql-driver/package.json
+++ b/packages/cubejs-mysql-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/mysql-driver",
"description": "Cube.js Mysql database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -27,13 +27,13 @@
"lint:fix": "eslint --fix src/* test/* --ext .ts,.js"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"mysql": "^2.18.1"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/testing-shared": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/testing-shared": "1.6.21",
"@types/jest": "^29",
"@types/mysql": "^2.15.21",
"jest": "^29",
diff --git a/packages/cubejs-oracle-driver/CHANGELOG.md b/packages/cubejs-oracle-driver/CHANGELOG.md
index c0e4b712e2a1c..62615f90287eb 100644
--- a/packages/cubejs-oracle-driver/CHANGELOG.md
+++ b/packages/cubejs-oracle-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/oracle-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/oracle-driver
diff --git a/packages/cubejs-oracle-driver/package.json b/packages/cubejs-oracle-driver/package.json
index 4ae20dc519eb8..99f609865dd4b 100644
--- a/packages/cubejs-oracle-driver/package.json
+++ b/packages/cubejs-oracle-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/oracle-driver",
"description": "Cube.js oracle database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -13,7 +13,7 @@
},
"main": "driver/OracleDriver.js",
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
"ramda": "^0.27.0"
},
"optionalDependencies": {
diff --git a/packages/cubejs-pinot-driver/CHANGELOG.md b/packages/cubejs-pinot-driver/CHANGELOG.md
index eacef4d56b6bc..3eccc3fbb4441 100644
--- a/packages/cubejs-pinot-driver/CHANGELOG.md
+++ b/packages/cubejs-pinot-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/pinot-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/pinot-driver
diff --git a/packages/cubejs-pinot-driver/package.json b/packages/cubejs-pinot-driver/package.json
index 25a054f5fb18b..001dfb1c786f4 100644
--- a/packages/cubejs-pinot-driver/package.json
+++ b/packages/cubejs-pinot-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/pinot-driver",
"description": "Cube.js Pinot database driver",
"author": "Julian Ronsse, InTheMemory, Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -27,9 +27,9 @@
"lint:fix": "eslint --fix src/* --ext .ts"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"node-fetch": "^2.6.1",
"ramda": "^0.27.2",
"sqlstring": "^2.3.3"
@@ -39,7 +39,7 @@
"access": "public"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/jest": "^29",
"jest": "^29",
"should": "^13.2.3",
diff --git a/packages/cubejs-playground/CHANGELOG.md b/packages/cubejs-playground/CHANGELOG.md
index cbbb39bdfea05..913de1f1b30fe 100644
--- a/packages/cubejs-playground/CHANGELOG.md
+++ b/packages/cubejs-playground/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-client/playground
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-client/playground
diff --git a/packages/cubejs-playground/package.json b/packages/cubejs-playground/package.json
index 78f3dbc8b24e6..e1ab206d0f9fa 100644
--- a/packages/cubejs-playground/package.json
+++ b/packages/cubejs-playground/package.json
@@ -1,7 +1,7 @@
{
"name": "@cubejs-client/playground",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"engines": {},
"repository": {
"type": "git",
@@ -69,8 +69,8 @@
"@ant-design/compatible": "^1.0.1",
"@ant-design/icons": "^5.3.5",
"@cube-dev/ui-kit": "0.52.3",
- "@cubejs-client/core": "1.6.20",
- "@cubejs-client/react": "1.6.20",
+ "@cubejs-client/core": "1.6.21",
+ "@cubejs-client/react": "1.6.21",
"@types/flexsearch": "^0.7.3",
"@types/node": "^20",
"@types/react": "^18.3.4",
diff --git a/packages/cubejs-postgres-driver/CHANGELOG.md b/packages/cubejs-postgres-driver/CHANGELOG.md
index 72f1171326bce..b45a2dd844a6f 100644
--- a/packages/cubejs-postgres-driver/CHANGELOG.md
+++ b/packages/cubejs-postgres-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/postgres-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/postgres-driver
diff --git a/packages/cubejs-postgres-driver/package.json b/packages/cubejs-postgres-driver/package.json
index 595d9a017bd59..4408ba86f903b 100644
--- a/packages/cubejs-postgres-driver/package.json
+++ b/packages/cubejs-postgres-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/postgres-driver",
"description": "Cube.js Postgres database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -27,8 +27,8 @@
"lint:fix": "eslint --fix src/* --ext .ts"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"@types/pg": "^8.16.0",
"@types/pg-query-stream": "^1.0.3",
"moment": "^2.24.0",
@@ -37,8 +37,8 @@
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/testing-shared": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/testing-shared": "1.6.21",
"testcontainers": "^10.28.0",
"typescript": "~5.2.2"
},
diff --git a/packages/cubejs-prestodb-driver/CHANGELOG.md b/packages/cubejs-prestodb-driver/CHANGELOG.md
index ba1667d993d29..931045ad8b8ba 100644
--- a/packages/cubejs-prestodb-driver/CHANGELOG.md
+++ b/packages/cubejs-prestodb-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/prestodb-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/prestodb-driver
diff --git a/packages/cubejs-prestodb-driver/package.json b/packages/cubejs-prestodb-driver/package.json
index f90ebbf3ade8a..27eb29788a2c7 100644
--- a/packages/cubejs-prestodb-driver/package.json
+++ b/packages/cubejs-prestodb-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/prestodb-driver",
"description": "Cube.js Presto database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -27,8 +27,8 @@
"lint:fix": "eslint --fix src/* --ext .ts"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"presto-client": "^1.1.0",
"ramda": "^0.27.0",
"sqlstring": "^2.3.1"
@@ -38,7 +38,7 @@
"access": "public"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/jest": "^29",
"jest": "^29",
"should": "^13.2.3",
diff --git a/packages/cubejs-query-orchestrator/CHANGELOG.md b/packages/cubejs-query-orchestrator/CHANGELOG.md
index ca061f4584648..147e810a76204 100644
--- a/packages/cubejs-query-orchestrator/CHANGELOG.md
+++ b/packages/cubejs-query-orchestrator/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/query-orchestrator
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/query-orchestrator
diff --git a/packages/cubejs-query-orchestrator/package.json b/packages/cubejs-query-orchestrator/package.json
index 2a8ff2d7cbb02..37f5a74e8677b 100644
--- a/packages/cubejs-query-orchestrator/package.json
+++ b/packages/cubejs-query-orchestrator/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/query-orchestrator",
"description": "Cube.js Query Orchestrator and Cache",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -29,15 +29,15 @@
"dist/src/*"
],
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/cubestore-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/cubestore-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"csv-write-stream": "^2.0.0",
"lru-cache": "^11.1.0",
"ramda": "^0.27.2"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/jest": "^29",
"@types/node": "^20",
"@types/ramda": "^0.27.32",
diff --git a/packages/cubejs-questdb-driver/CHANGELOG.md b/packages/cubejs-questdb-driver/CHANGELOG.md
index 30a40dd5f1170..500a3525b6ecd 100644
--- a/packages/cubejs-questdb-driver/CHANGELOG.md
+++ b/packages/cubejs-questdb-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/questdb-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/questdb-driver
diff --git a/packages/cubejs-questdb-driver/package.json b/packages/cubejs-questdb-driver/package.json
index e13e5ba24d87a..eef24eedd572b 100644
--- a/packages/cubejs-questdb-driver/package.json
+++ b/packages/cubejs-questdb-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/questdb-driver",
"description": "Cube.js QuestDB database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -27,9 +27,9 @@
"lint:fix": "eslint --fix src/* --ext .ts"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"@types/pg": "^8.6.0",
"moment": "^2.24.0",
"pg": "^8.7.0",
@@ -37,8 +37,8 @@
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/testing-shared": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/testing-shared": "1.6.21",
"testcontainers": "^10.28.0",
"typescript": "~5.2.2"
},
diff --git a/packages/cubejs-redshift-driver/CHANGELOG.md b/packages/cubejs-redshift-driver/CHANGELOG.md
index c2fbfc1633c2b..36801a6646232 100644
--- a/packages/cubejs-redshift-driver/CHANGELOG.md
+++ b/packages/cubejs-redshift-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/redshift-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/redshift-driver
diff --git a/packages/cubejs-redshift-driver/package.json b/packages/cubejs-redshift-driver/package.json
index e1be1973e15b1..359e7e7a571a9 100644
--- a/packages/cubejs-redshift-driver/package.json
+++ b/packages/cubejs-redshift-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/redshift-driver",
"description": "Cube.js Redshift database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -27,13 +27,13 @@
"dependencies": {
"@aws-sdk/client-redshift": "^3.22.0",
"@aws-sdk/credential-providers": "^3.22.0",
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/postgres-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20"
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/postgres-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21"
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"typescript": "~5.2.2"
},
"publishConfig": {
diff --git a/packages/cubejs-schema-compiler/CHANGELOG.md b/packages/cubejs-schema-compiler/CHANGELOG.md
index 00e4ac9748c0b..7de83372c44a3 100644
--- a/packages/cubejs-schema-compiler/CHANGELOG.md
+++ b/packages/cubejs-schema-compiler/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/schema-compiler
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
### Bug Fixes
diff --git a/packages/cubejs-schema-compiler/package.json b/packages/cubejs-schema-compiler/package.json
index 63184f245e542..52e7eb5d89e15 100644
--- a/packages/cubejs-schema-compiler/package.json
+++ b/packages/cubejs-schema-compiler/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/schema-compiler",
"description": "Cube schema compiler",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -40,8 +40,8 @@
"@babel/standalone": "^7.24",
"@babel/traverse": "^7.24",
"@babel/types": "^7.24",
- "@cubejs-backend/native": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/native": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"antlr4": "^4.13.2",
"camelcase": "^6.2.0",
"cron-parser": "^4.9.0",
@@ -60,9 +60,9 @@
},
"devDependencies": {
"@clickhouse/client": "^1.12.0",
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/mssql-driver": "1.6.20",
- "@cubejs-backend/query-orchestrator": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/mssql-driver": "1.6.21",
+ "@cubejs-backend/query-orchestrator": "1.6.21",
"@types/babel__code-frame": "^7.0.6",
"@types/babel__generator": "^7.6.8",
"@types/babel__traverse": "^7.20.5",
diff --git a/packages/cubejs-server-core/CHANGELOG.md b/packages/cubejs-server-core/CHANGELOG.md
index e2e2f2772eee5..a34ddae558ca6 100644
--- a/packages/cubejs-server-core/CHANGELOG.md
+++ b/packages/cubejs-server-core/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/server-core
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/server-core
diff --git a/packages/cubejs-server-core/package.json b/packages/cubejs-server-core/package.json
index a702ccd9ea70c..27c5c82512419 100644
--- a/packages/cubejs-server-core/package.json
+++ b/packages/cubejs-server-core/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/server-core",
"description": "Cube.js base component to wire all backend components together",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -29,16 +29,16 @@
"unit": "jest --runInBand --forceExit --coverage dist/test"
},
"dependencies": {
- "@cubejs-backend/api-gateway": "1.6.20",
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/cloud": "1.6.20",
- "@cubejs-backend/cubestore-driver": "1.6.20",
+ "@cubejs-backend/api-gateway": "1.6.21",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/cloud": "1.6.21",
+ "@cubejs-backend/cubestore-driver": "1.6.21",
"@cubejs-backend/dotenv": "^9.0.2",
- "@cubejs-backend/native": "1.6.20",
- "@cubejs-backend/query-orchestrator": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
- "@cubejs-backend/templates": "1.6.20",
+ "@cubejs-backend/native": "1.6.21",
+ "@cubejs-backend/query-orchestrator": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
+ "@cubejs-backend/templates": "1.6.21",
"codesandbox-import-utils": "^2.1.12",
"cross-spawn": "^7.0.1",
"fs-extra": "^8.1.0",
@@ -62,8 +62,8 @@
"ws": "^7.5.3"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-client/playground": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-client/playground": "1.6.21",
"@types/cross-spawn": "^6.0.2",
"@types/express": "^4.17.21",
"@types/fs-extra": "^9.0.8",
diff --git a/packages/cubejs-server/CHANGELOG.md b/packages/cubejs-server/CHANGELOG.md
index de8a145a4a52a..99bec946a4e42 100644
--- a/packages/cubejs-server/CHANGELOG.md
+++ b/packages/cubejs-server/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/server
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/server
diff --git a/packages/cubejs-server/package.json b/packages/cubejs-server/package.json
index c7bef2e389de9..5b0075e6276a3 100644
--- a/packages/cubejs-server/package.json
+++ b/packages/cubejs-server/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/server",
"description": "Cube.js all-in-one server",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"types": "index.d.ts",
"repository": {
"type": "git",
@@ -40,11 +40,11 @@
"jest:shapshot": "jest --updateSnapshot test"
},
"dependencies": {
- "@cubejs-backend/cubestore-driver": "1.6.20",
+ "@cubejs-backend/cubestore-driver": "1.6.21",
"@cubejs-backend/dotenv": "^9.0.2",
- "@cubejs-backend/native": "1.6.20",
- "@cubejs-backend/server-core": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/native": "1.6.21",
+ "@cubejs-backend/server-core": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"@oclif/color": "^1.0.0",
"@oclif/command": "^1.8.13",
"@oclif/config": "^1.18.2",
@@ -61,8 +61,8 @@
"ws": "^7.1.2"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/query-orchestrator": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/query-orchestrator": "1.6.21",
"@oclif/dev-cli": "^1.23.1",
"@types/body-parser": "^1.19.0",
"@types/cors": "^2.8.8",
diff --git a/packages/cubejs-snowflake-driver/CHANGELOG.md b/packages/cubejs-snowflake-driver/CHANGELOG.md
index 7c1b5396a9ec3..5deb31bab93d1 100644
--- a/packages/cubejs-snowflake-driver/CHANGELOG.md
+++ b/packages/cubejs-snowflake-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/snowflake-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/snowflake-driver
diff --git a/packages/cubejs-snowflake-driver/package.json b/packages/cubejs-snowflake-driver/package.json
index d3ffb96a6804c..ba4e576bc3b19 100644
--- a/packages/cubejs-snowflake-driver/package.json
+++ b/packages/cubejs-snowflake-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/snowflake-driver",
"description": "Cube.js Snowflake database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -26,8 +26,8 @@
},
"dependencies": {
"@aws-sdk/client-s3": "^3.726.0",
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"date-fns-timezone": "^0.1.4",
"snowflake-sdk": "^2.2.0"
},
@@ -39,7 +39,7 @@
"extends": "../cubejs-linter"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"typescript": "~5.2.2"
}
}
diff --git a/packages/cubejs-sqlite-driver/CHANGELOG.md b/packages/cubejs-sqlite-driver/CHANGELOG.md
index 905f2dde864f3..bb6da03a243cb 100644
--- a/packages/cubejs-sqlite-driver/CHANGELOG.md
+++ b/packages/cubejs-sqlite-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/sqlite-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/sqlite-driver
diff --git a/packages/cubejs-sqlite-driver/package.json b/packages/cubejs-sqlite-driver/package.json
index 352fbae33e690..571188c2f8bb8 100644
--- a/packages/cubejs-sqlite-driver/package.json
+++ b/packages/cubejs-sqlite-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/sqlite-driver",
"description": "Cube.js Sqlite database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -18,13 +18,13 @@
"unit": "jest"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"sqlite3": "^5.1.7"
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"jest": "^29"
},
"publishConfig": {
diff --git a/packages/cubejs-templates/CHANGELOG.md b/packages/cubejs-templates/CHANGELOG.md
index ffbed8c7725a9..c9a1d8c062f54 100644
--- a/packages/cubejs-templates/CHANGELOG.md
+++ b/packages/cubejs-templates/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/templates
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/templates
diff --git a/packages/cubejs-templates/package.json b/packages/cubejs-templates/package.json
index 25c890986dfdf..41eb239dd9bd7 100644
--- a/packages/cubejs-templates/package.json
+++ b/packages/cubejs-templates/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-backend/templates",
- "version": "1.6.20",
+ "version": "1.6.21",
"description": "Cube.js Templates helpers",
"author": "Cube Dev, Inc.",
"repository": {
@@ -31,7 +31,7 @@
"extends": "../cubejs-linter"
},
"dependencies": {
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/shared": "1.6.21",
"cross-spawn": "^7.0.3",
"decompress": "^4.2.1",
"decompress-targz": "^4.1.1",
@@ -41,7 +41,7 @@
"source-map-support": "^0.5.19"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"typescript": "~5.2.2"
}
}
diff --git a/packages/cubejs-testing-drivers/CHANGELOG.md b/packages/cubejs-testing-drivers/CHANGELOG.md
index e21e8787eeb11..15aa1da676dc5 100644
--- a/packages/cubejs-testing-drivers/CHANGELOG.md
+++ b/packages/cubejs-testing-drivers/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/testing-drivers
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/testing-drivers
diff --git a/packages/cubejs-testing-drivers/package.json b/packages/cubejs-testing-drivers/package.json
index 7af2b41b8feb9..765a8cdef3aa1 100644
--- a/packages/cubejs-testing-drivers/package.json
+++ b/packages/cubejs-testing-drivers/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-backend/testing-drivers",
- "version": "1.6.20",
+ "version": "1.6.21",
"description": "Cube.js drivers test suite",
"author": "Cube Dev, Inc.",
"repository": {
@@ -72,24 +72,24 @@
"dist/src"
],
"dependencies": {
- "@cubejs-backend/athena-driver": "1.6.20",
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/bigquery-driver": "1.6.20",
- "@cubejs-backend/clickhouse-driver": "1.6.20",
- "@cubejs-backend/cubestore-driver": "1.6.20",
- "@cubejs-backend/databricks-jdbc-driver": "1.6.20",
+ "@cubejs-backend/athena-driver": "1.6.21",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/bigquery-driver": "1.6.21",
+ "@cubejs-backend/clickhouse-driver": "1.6.21",
+ "@cubejs-backend/cubestore-driver": "1.6.21",
+ "@cubejs-backend/databricks-jdbc-driver": "1.6.21",
"@cubejs-backend/dotenv": "^9.0.2",
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/mssql-driver": "1.6.20",
- "@cubejs-backend/mysql-driver": "1.6.20",
- "@cubejs-backend/postgres-driver": "1.6.20",
- "@cubejs-backend/query-orchestrator": "1.6.20",
- "@cubejs-backend/server-core": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
- "@cubejs-backend/snowflake-driver": "1.6.20",
- "@cubejs-backend/testing-shared": "1.6.20",
- "@cubejs-client/core": "1.6.20",
- "@cubejs-client/ws-transport": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/mssql-driver": "1.6.21",
+ "@cubejs-backend/mysql-driver": "1.6.21",
+ "@cubejs-backend/postgres-driver": "1.6.21",
+ "@cubejs-backend/query-orchestrator": "1.6.21",
+ "@cubejs-backend/server-core": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
+ "@cubejs-backend/snowflake-driver": "1.6.21",
+ "@cubejs-backend/testing-shared": "1.6.21",
+ "@cubejs-client/core": "1.6.21",
+ "@cubejs-client/ws-transport": "1.6.21",
"@jest/globals": "^29",
"@types/jest": "^29",
"@types/node": "^20",
diff --git a/packages/cubejs-testing-shared/CHANGELOG.md b/packages/cubejs-testing-shared/CHANGELOG.md
index e602d32598afa..39adfc4f64d36 100644
--- a/packages/cubejs-testing-shared/CHANGELOG.md
+++ b/packages/cubejs-testing-shared/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/testing-shared
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/testing-shared
diff --git a/packages/cubejs-testing-shared/package.json b/packages/cubejs-testing-shared/package.json
index 7de3c762b24b3..f602f2b768542 100644
--- a/packages/cubejs-testing-shared/package.json
+++ b/packages/cubejs-testing-shared/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-backend/testing-shared",
- "version": "1.6.20",
+ "version": "1.6.21",
"description": "Cube.js Testing Helpers",
"author": "Cube Dev, Inc.",
"repository": {
@@ -26,16 +26,16 @@
],
"dependencies": {
"@cubejs-backend/dotenv": "^9.0.2",
- "@cubejs-backend/query-orchestrator": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/query-orchestrator": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"@testcontainers/kafka": "~10.28.0",
"dedent": "^0.7.0",
"node-fetch": "^2.6.7",
"testcontainers": "^10.28.0"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@jest/globals": "^29",
"@types/dedent": "^0.7.0",
"@types/jest": "^29",
diff --git a/packages/cubejs-testing/CHANGELOG.md b/packages/cubejs-testing/CHANGELOG.md
index dcc2d8e5dec5b..30c4a8e57356b 100644
--- a/packages/cubejs-testing/CHANGELOG.md
+++ b/packages/cubejs-testing/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/testing
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/testing
diff --git a/packages/cubejs-testing/package.json b/packages/cubejs-testing/package.json
index 09a94c7eed7f2..500b56277843c 100644
--- a/packages/cubejs-testing/package.json
+++ b/packages/cubejs-testing/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-backend/testing",
- "version": "1.6.20",
+ "version": "1.6.21",
"description": "Cube.js e2e tests",
"author": "Cube Dev, Inc.",
"repository": {
@@ -99,15 +99,15 @@
"birdbox-fixtures"
],
"dependencies": {
- "@cubejs-backend/cubestore-driver": "1.6.20",
+ "@cubejs-backend/cubestore-driver": "1.6.21",
"@cubejs-backend/dotenv": "^9.0.2",
- "@cubejs-backend/ksql-driver": "1.6.20",
- "@cubejs-backend/postgres-driver": "1.6.20",
- "@cubejs-backend/query-orchestrator": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
- "@cubejs-backend/testing-shared": "1.6.20",
- "@cubejs-client/ws-transport": "1.6.20",
+ "@cubejs-backend/ksql-driver": "1.6.21",
+ "@cubejs-backend/postgres-driver": "1.6.21",
+ "@cubejs-backend/query-orchestrator": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
+ "@cubejs-backend/testing-shared": "1.6.21",
+ "@cubejs-client/ws-transport": "1.6.21",
"dedent": "^0.7.0",
"fs-extra": "^8.1.0",
"http-proxy": "^1.18.1",
@@ -118,8 +118,8 @@
},
"devDependencies": {
"@4tw/cypress-drag-drop": "^1.6.0",
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-client/core": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-client/core": "1.6.21",
"@jest/globals": "^29",
"@types/dedent": "^0.7.0",
"@types/http-proxy": "^1.17.5",
diff --git a/packages/cubejs-trino-driver/CHANGELOG.md b/packages/cubejs-trino-driver/CHANGELOG.md
index 2ae0bb739df3c..703b987a40325 100644
--- a/packages/cubejs-trino-driver/CHANGELOG.md
+++ b/packages/cubejs-trino-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/trino-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/trino-driver
diff --git a/packages/cubejs-trino-driver/package.json b/packages/cubejs-trino-driver/package.json
index 00caf2017457f..4e80162e9fafc 100644
--- a/packages/cubejs-trino-driver/package.json
+++ b/packages/cubejs-trino-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/trino-driver",
"description": "Cube.js Trino database driver",
"author": "Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -27,10 +27,10 @@
"lint:fix": "eslint --fix src/* --ext .ts"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/prestodb-driver": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/prestodb-driver": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"node-fetch": "^2.6.1",
"presto-client": "^1.1.0",
"sqlstring": "^2.3.1"
@@ -40,7 +40,7 @@
"access": "public"
},
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
"@types/jest": "^29",
"jest": "^29",
"testcontainers": "^10.28.0",
diff --git a/packages/cubejs-vertica-driver/CHANGELOG.md b/packages/cubejs-vertica-driver/CHANGELOG.md
index 199be7605d80c..3ab775fa16d8b 100644
--- a/packages/cubejs-vertica-driver/CHANGELOG.md
+++ b/packages/cubejs-vertica-driver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+**Note:** Version bump only for package @cubejs-backend/vertica-driver
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
**Note:** Version bump only for package @cubejs-backend/vertica-driver
diff --git a/packages/cubejs-vertica-driver/package.json b/packages/cubejs-vertica-driver/package.json
index 831df2e93887a..a910b2e367e4c 100644
--- a/packages/cubejs-vertica-driver/package.json
+++ b/packages/cubejs-vertica-driver/package.json
@@ -2,7 +2,7 @@
"name": "@cubejs-backend/vertica-driver",
"description": "Cube.js Vertica database driver",
"author": "Eduard Karacharov, Tim Brown, Cube Dev, Inc.",
- "version": "1.6.20",
+ "version": "1.6.21",
"repository": {
"type": "git",
"url": "https://github.com/cube-js/cube.git",
@@ -19,16 +19,16 @@
"lint:fix": "eslint --fix **/*.js"
},
"dependencies": {
- "@cubejs-backend/base-driver": "1.6.20",
- "@cubejs-backend/query-orchestrator": "1.6.20",
- "@cubejs-backend/schema-compiler": "1.6.20",
- "@cubejs-backend/shared": "1.6.20",
+ "@cubejs-backend/base-driver": "1.6.21",
+ "@cubejs-backend/query-orchestrator": "1.6.21",
+ "@cubejs-backend/schema-compiler": "1.6.21",
+ "@cubejs-backend/shared": "1.6.21",
"vertica-nodejs": "^1.0.3"
},
"license": "Apache-2.0",
"devDependencies": {
- "@cubejs-backend/linter": "1.6.20",
- "@cubejs-backend/testing-shared": "1.6.20",
+ "@cubejs-backend/linter": "1.6.21",
+ "@cubejs-backend/testing-shared": "1.6.21",
"@types/jest": "^29",
"jest": "^29",
"testcontainers": "^10.28.0"
diff --git a/rust/cubesql/CHANGELOG.md b/rust/cubesql/CHANGELOG.md
index ca3a53578086a..d1cb1751dfb0b 100644
--- a/rust/cubesql/CHANGELOG.md
+++ b/rust/cubesql/CHANGELOG.md
@@ -3,6 +3,16 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.21](https://github.com/cube-js/cube/compare/v1.6.20...v1.6.21) (2026-03-10)
+
+### Bug Fixes
+
+- **cubesql:** Support per-column format codes (Tableau Desktop compatibility) ([#10484](https://github.com/cube-js/cube/issues/10484)) ([d6ad885](https://github.com/cube-js/cube/commit/d6ad885f384d675f25ca8405dad4ee5a559e98c3)), closes [#10418](https://github.com/cube-js/cube/issues/10418)
+
+### Features
+
+- **cubesql:** Introduce `cube_cache` session variable ([#10483](https://github.com/cube-js/cube/issues/10483)) ([541aa34](https://github.com/cube-js/cube/commit/541aa3465f25cb55328249b95fa9c258c95f5e07))
+
## [1.6.20](https://github.com/cube-js/cube/compare/v1.6.19...v1.6.20) (2026-03-09)
### Bug Fixes
diff --git a/rust/cubesql/cubesql/src/compile/engine/df/scan.rs b/rust/cubesql/cubesql/src/compile/engine/df/scan.rs
index 50aeb49935dfd..df104f63a1b3d 100644
--- a/rust/cubesql/cubesql/src/compile/engine/df/scan.rs
+++ b/rust/cubesql/cubesql/src/compile/engine/df/scan.rs
@@ -49,7 +49,7 @@ use std::str::FromStr;
use std::{
any::Any,
borrow::Cow,
- fmt,
+ fmt::{self, Display},
sync::Arc,
task::{Context, Poll},
};
@@ -80,7 +80,7 @@ impl MemberField {
}
}
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
pub enum CacheMode {
#[serde(rename = "stale-if-slow")]
StaleIfSlow,
@@ -106,6 +106,17 @@ impl FromStr for CacheMode {
}
}
+impl Display for CacheMode {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ match self {
+ CacheMode::StaleIfSlow => write!(f, "stale-if-slow"),
+ CacheMode::StaleWhileRevalidate => write!(f, "stale-while-revalidate"),
+ CacheMode::MustRevalidate => write!(f, "must-revalidate"),
+ CacheMode::NoCache => write!(f, "no-cache"),
+ }
+ }
+}
+
#[derive(Debug, Clone)]
pub struct CubeScanOptions {
pub change_user: Option,
diff --git a/rust/cubesql/cubesql/src/compile/mod.rs b/rust/cubesql/cubesql/src/compile/mod.rs
index 2d3de410fcc6c..3cfae8db20c16 100644
--- a/rust/cubesql/cubesql/src/compile/mod.rs
+++ b/rust/cubesql/cubesql/src/compile/mod.rs
@@ -37,7 +37,7 @@ mod tests {
};
use crate::{
compile::{
- engine::df::scan::MemberField,
+ engine::df::scan::{CacheMode, MemberField},
rewrite::rewriter::Rewriter,
test::{get_sixteen_char_member_cube, get_string_cube_meta},
},
@@ -18590,4 +18590,69 @@ LIMIT {{ limit }}{% endif %}"#.to_string(),
Ok(())
}
+
+ #[tokio::test]
+ async fn test_set_cache_mode() -> Result<(), CubeError> {
+ if !Rewriter::sql_push_down_enabled() {
+ return Ok(());
+ }
+ init_testing_logger();
+
+ let context = TestContext::new(DatabaseProtocol::PostgreSQL).await;
+
+ context
+ .execute_query("SET cube_cache = 'must-revalidate'")
+ .await?;
+
+ // Test that cache mode has been successfully applied
+ let query = r#"
+ SELECT order_date
+ FROM KibanaSampleDataEcommerce
+ GROUP BY 1
+ "#;
+ let expected_cube_scan = V1LoadRequestQuery {
+ measures: Some(vec![]),
+ dimensions: Some(vec!["KibanaSampleDataEcommerce.order_date".to_string()]),
+ segments: Some(vec![]),
+ order: Some(vec![]),
+ ..Default::default()
+ };
+ let cube_scan = context
+ .convert_sql_to_cube_query(&query)
+ .await
+ .unwrap()
+ .as_logical_plan()
+ .find_cube_scan();
+ assert_eq!(cube_scan.request, expected_cube_scan);
+ assert_eq!(
+ cube_scan.options.cache_mode,
+ Some(CacheMode::MustRevalidate),
+ );
+
+ // Test that cache mode correctly resets to default
+ context.execute_query("SET cube_cache = DEFAULT").await?;
+
+ let query = r#"
+ SELECT order_date
+ FROM KibanaSampleDataEcommerce
+ GROUP BY 1
+ "#;
+ let expected_cube_scan = V1LoadRequestQuery {
+ measures: Some(vec![]),
+ dimensions: Some(vec!["KibanaSampleDataEcommerce.order_date".to_string()]),
+ segments: Some(vec![]),
+ order: Some(vec![]),
+ ..Default::default()
+ };
+ let cube_scan = context
+ .convert_sql_to_cube_query(&query)
+ .await
+ .unwrap()
+ .as_logical_plan()
+ .find_cube_scan();
+ assert_eq!(cube_scan.request, expected_cube_scan);
+ assert_eq!(cube_scan.options.cache_mode, None,);
+
+ Ok(())
+ }
}
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/converter.rs b/rust/cubesql/cubesql/src/compile/rewrite/converter.rs
index e73fffdf386a4..0c71bd7da20bb 100644
--- a/rust/cubesql/cubesql/src/compile/rewrite/converter.rs
+++ b/rust/cubesql/cubesql/src/compile/rewrite/converter.rs
@@ -2099,7 +2099,7 @@ impl LanguageToLogicalPlanConverter {
CubeScanOptions {
change_user,
max_records,
- cache_mode: cache_mode.clone(),
+ cache_mode: *cache_mode,
throw_continue_wait,
},
alias_to_cube.into_iter().map(|(_, c)| c).unique().collect(),
diff --git a/rust/cubesql/cubesql/src/compile/router.rs b/rust/cubesql/cubesql/src/compile/router.rs
index ee52eb4c0633e..386548c55e56e 100644
--- a/rust/cubesql/cubesql/src/compile/router.rs
+++ b/rust/cubesql/cubesql/src/compile/router.rs
@@ -3,10 +3,11 @@ use crate::compile::{
StatusFlags,
};
use sqlparser::ast;
-use std::{collections::HashMap, sync::Arc};
+use std::{collections::HashMap, str::FromStr, sync::Arc};
use crate::{
compile::{
+ engine::df::scan::CacheMode,
error::{CompilationError, CompilationResult},
parser::parse_sql_to_statement,
DatabaseVariable, DatabaseVariablesToUpdate,
@@ -377,7 +378,7 @@ impl QueryRouter {
session_columns_to_update.into_iter().partition(|v| {
matches!(
v.name.to_lowercase().as_str(),
- "user" | "current_user" | "timezone"
+ "user" | "current_user" | "timezone" | "cube_cache"
)
});
@@ -407,6 +408,18 @@ impl QueryRouter {
};
self.change_timezone(timezone).await?;
}
+ "cube_cache" => {
+ let cache_mode = match v.value {
+ ScalarValue::Utf8(Some(mode)) => mode,
+ _ => {
+ return Err(CompilationError::user(format!(
+ "Invalid cube_cache value: {:?}",
+ v.value
+ )))
+ }
+ };
+ self.change_cache_mode(cache_mode).await?;
+ }
_ => {
return Err(CompilationError::user(format!(
"Invalid special variable: {:?}",
@@ -527,6 +540,29 @@ impl QueryRouter {
Ok(())
}
+ async fn change_cache_mode(&self, cache_mode_str: String) -> Result<(), CompilationError> {
+ let mut cache_mode = self.state.cache_mode.write().map_err(|err| {
+ CompilationError::internal(format!("Unable to acquire cache mode lock: {}", err))
+ })?;
+ let cache_mode_value = if cache_mode_str.eq_ignore_ascii_case("default") {
+ *cache_mode = None;
+ None
+ } else {
+ let cache_mode_parsed = CacheMode::from_str(&cache_mode_str).map_err(|_| {
+ CompilationError::user(format!("Invalid value for cache mode: {}", cache_mode_str))
+ })?;
+ *cache_mode = Some(cache_mode_parsed);
+ Some(cache_mode_parsed.to_string())
+ };
+ let variable = DatabaseVariable::user_defined(
+ "cube_cache".to_string(),
+ ScalarValue::Utf8(cache_mode_value),
+ None,
+ );
+ self.state.set_variables(vec![variable]);
+ Ok(())
+ }
+
async fn create_table_to_plan(
&self,
name: &ast::ObjectName,
diff --git a/rust/cubesql/cubesql/src/sql/database_variables/postgres/session_vars.rs b/rust/cubesql/cubesql/src/sql/database_variables/postgres/session_vars.rs
index c13ed346b5252..16c7c89707bc2 100644
--- a/rust/cubesql/cubesql/src/sql/database_variables/postgres/session_vars.rs
+++ b/rust/cubesql/cubesql/src/sql/database_variables/postgres/session_vars.rs
@@ -66,12 +66,13 @@ pub fn defaults() -> DatabaseVariables {
ScalarValue::Utf8(Some("140002".to_string())),
None,
),
- // Custom cubesql variables
+ // Custom cube[sql] variables
DatabaseVariable::user_defined(
CUBESQL_PENALIZE_POST_PROCESSING_VAR.to_string(),
ScalarValue::Boolean(Some(false)),
None,
),
+ DatabaseVariable::user_defined("cube_cache".to_string(), ScalarValue::Utf8(None), None),
];
let variables = IntoIterator::into_iter(variables)
diff --git a/rust/cubesql/cubesql/src/sql/postgres/extended.rs b/rust/cubesql/cubesql/src/sql/postgres/extended.rs
index 867f9a817031f..0d143ad8fef77 100644
--- a/rust/cubesql/cubesql/src/sql/postgres/extended.rs
+++ b/rust/cubesql/cubesql/src/sql/postgres/extended.rs
@@ -22,6 +22,49 @@ use datafusion::{
use futures::{FutureExt, Stream, StreamExt};
use pg_srv::protocol::{CommandComplete, PortalCompletion, PortalSuspended};
+#[derive(Debug, Clone)]
+pub enum ResultFormat {
+ AllText,
+ AllBinary,
+ PerColumn(Vec),
+}
+
+impl ResultFormat {
+ /// Resolve format for column at `idx`.
+ pub fn format_for(&self, idx: usize) -> protocol::Format {
+ match self {
+ ResultFormat::AllText => protocol::Format::Text,
+ ResultFormat::AllBinary => protocol::Format::Binary,
+ ResultFormat::PerColumn(formats) => match formats.get(idx) {
+ Some(&fmt) => fmt,
+ // Per PG protocol, the number of format codes must equal the number of
+ // result columns. The fallback here should never be reached in practice;
+ // it is a defensive default for malformed or empty format vectors.
+ None => {
+ log::error!(
+ "PerColumn format index {} out of bounds (len {}), falling back to Text",
+ idx,
+ formats.len()
+ );
+
+ protocol::Format::Text
+ }
+ },
+ }
+ }
+}
+
+impl From> for ResultFormat {
+ fn from(formats: Vec) -> Self {
+ match formats.len() {
+ 0 => ResultFormat::AllText,
+ 1 if formats[0] == protocol::Format::Text => ResultFormat::AllText,
+ 1 if formats[0] == protocol::Format::Binary => ResultFormat::AllBinary,
+ _ => ResultFormat::PerColumn(formats),
+ }
+ }
+}
+
use crate::transport::SpanId;
use async_stream::stream;
@@ -210,8 +253,7 @@ pub enum PortalBatch {
#[derive(Debug)]
pub struct Portal {
- // Format which is used to return data
- format: protocol::Format,
+ format: ResultFormat,
from: PortalFrom,
// State which holds corresponding data for each step. Option is used for dereferencing
state: Option,
@@ -244,7 +286,7 @@ fn split_record_batch(batch: RecordBatch, mid: usize) -> (RecordBatch, Option>,
) -> Self {
@@ -256,11 +298,7 @@ impl Portal {
}
}
- pub fn new_empty(
- format: protocol::Format,
- from: PortalFrom,
- span_id: Option>,
- ) -> Self {
+ pub fn new_empty(format: ResultFormat, from: PortalFrom, span_id: Option>) -> Self {
Self {
format,
from,
@@ -271,7 +309,7 @@ impl Portal {
pub fn get_description(&self) -> Result, ConnectionError> {
match &self.state {
- Some(PortalState::Prepared(state)) => state.plan.to_row_description(self.format),
+ Some(PortalState::Prepared(state)) => state.plan.to_row_description(&self.format),
Some(PortalState::InExecutionFrame(state)) => Ok(state.description.clone()),
Some(PortalState::InExecutionStream(state)) => Ok(state.description.clone()),
Some(PortalState::Finished(state)) => Ok(state.description.clone()),
@@ -297,10 +335,6 @@ impl Portal {
}
}
- pub fn get_format(&self) -> protocol::Format {
- self.format
- }
-
fn hand_execution_frame_state<'a>(
&'a mut self,
frame_state: InExecutionFrameState,
@@ -318,7 +352,8 @@ impl Portal {
)
.into());
} else {
- let writer = self.dataframe_to_writer(frame_state.batch)?;
+ let format = self.get_result_format(frame_state.description.as_ref());
+ let writer = self.dataframe_to_writer(frame_state.batch, &format)?;
let num_rows = writer.num_rows() as u32;
if let Some(description) = &frame_state.description {
@@ -354,8 +389,12 @@ impl Portal {
}
}
- fn dataframe_to_writer(&self, frame: DataFrame) -> Result {
- let mut writer = BatchWriter::new(self.get_format());
+ fn dataframe_to_writer(
+ &self,
+ frame: DataFrame,
+ format: &ResultFormat,
+ ) -> Result {
+ let mut writer = BatchWriter::new(format.clone());
for row in frame.to_rows().into_iter() {
for value in row.to_values() {
@@ -387,6 +426,7 @@ impl Portal {
batch: RecordBatch,
max_rows: usize,
left: &mut usize,
+ format: &ResultFormat,
) -> Result<(Option, BatchWriter), ConnectionError> {
let mut unused: Option = None;
@@ -407,7 +447,7 @@ impl Portal {
let frame = batches_to_dataframe(batch_for_write.schema().as_ref(), vec![batch_for_write])?;
- Ok((unused, self.dataframe_to_writer(frame)?))
+ Ok((unused, self.dataframe_to_writer(frame, format)?))
}
fn hand_execution_stream_state<'a>(
@@ -419,12 +459,14 @@ impl Portal {
let mut left: usize = max_rows;
let mut num_of_rows = 0;
+ let resolved_format = self.get_result_format(stream_state.description.as_ref());
+
if let Some(description) = &stream_state.description {
yield Ok(PortalBatch::Description(description.clone()));
}
if let Some(unused_batch) = stream_state.unused.take() {
- let (usused_batch, batch_writer) = self.iterate_stream_batch(unused_batch, max_rows, &mut left)?;
+ let (usused_batch, batch_writer) = self.iterate_stream_batch(unused_batch, max_rows, &mut left, &resolved_format)?;
stream_state.unused = usused_batch;
num_of_rows = batch_writer.num_rows() as u32;
@@ -448,7 +490,7 @@ impl Portal {
}
Some(res) => match res {
Ok(batch) => {
- let (unused_batch, writer) = self.iterate_stream_batch(batch, max_rows, &mut left)?;
+ let (unused_batch, writer) = self.iterate_stream_batch(batch, max_rows, &mut left, &resolved_format)?;
num_of_rows += writer.num_rows() as u32;
@@ -490,7 +532,7 @@ impl Portal {
);
}
PortalState::Prepared(state) => {
- let description = state.plan.to_row_description(self.format)?;
+ let description = state.plan.to_row_description(&self.format)?;
match state.plan {
QueryPlan::MetaOk(_, completion) => {
self.state = Some(PortalState::Finished(FinishedState { description }));
@@ -581,6 +623,14 @@ impl Portal {
}
}
+ /// Resolve the effective result format: use per-column formats from the row
+ /// description if available, otherwise fall back to the portal's format.
+ fn get_result_format(&self, description: Option<&protocol::RowDescription>) -> ResultFormat {
+ description
+ .map(|d| ResultFormat::PerColumn(d.get_formats()))
+ .unwrap_or_else(|| self.format.clone())
+ }
+
pub fn span_id(&self) -> Option> {
self.span_id.clone()
}
@@ -589,6 +639,7 @@ impl Portal {
#[cfg(test)]
mod tests {
use super::*;
+ use crate::sql::{error::ConnectionError, extended::PortalFrom};
use crate::{
compile::engine::information_schema::postgres::InfoSchemaTestingDatasetProvider,
sql::{
@@ -597,9 +648,6 @@ mod tests {
ColumnFlags, ColumnType,
},
};
- use pg_srv::protocol::Format;
-
- use crate::sql::{error::ConnectionError, extended::PortalFrom};
use datafusion::{
arrow::{
array::{ArrayRef, StringArray},
@@ -698,7 +746,7 @@ mod tests {
#[tokio::test]
async fn test_portal_legacy_dataframe_limited_more() -> Result<(), ConnectionError> {
let mut p = Portal {
- format: Format::Binary,
+ format: ResultFormat::AllBinary,
from: PortalFrom::Extended,
state: Some(PortalState::InExecutionFrame(InExecutionFrameState::new(
generate_testing_data_frame(3),
@@ -731,7 +779,7 @@ mod tests {
#[tokio::test]
async fn test_portal_legacy_dataframe_limited_less() -> Result<(), ConnectionError> {
let mut p = Portal {
- format: Format::Binary,
+ format: ResultFormat::AllBinary,
from: PortalFrom::Extended,
state: Some(PortalState::InExecutionFrame(InExecutionFrameState::new(
generate_testing_data_frame(3),
@@ -759,7 +807,7 @@ mod tests {
#[tokio::test]
async fn test_portal_legacy_dataframe_unlimited() -> Result<(), ConnectionError> {
let mut p = Portal {
- format: Format::Binary,
+ format: ResultFormat::AllBinary,
from: PortalFrom::Extended,
state: Some(PortalState::InExecutionFrame(InExecutionFrameState::new(
generate_testing_data_frame(3),
@@ -794,7 +842,7 @@ mod tests {
let stream = ctx.read_table(table)?.execute_stream().await?;
let mut portal = Portal {
- format: Format::Binary,
+ format: ResultFormat::AllBinary,
from: PortalFrom::Extended,
state: Some(PortalState::InExecutionStream(InExecutionStreamState::new(
stream,
@@ -817,7 +865,7 @@ mod tests {
let stream = ctx.read_table(table)?.execute_stream().await?;
let mut portal = Portal {
- format: Format::Binary,
+ format: ResultFormat::AllBinary,
from: PortalFrom::Extended,
state: Some(PortalState::InExecutionStream(InExecutionStreamState::new(
stream,
diff --git a/rust/cubesql/cubesql/src/sql/postgres/shim.rs b/rust/cubesql/cubesql/src/sql/postgres/shim.rs
index ffd2c5e6e6260..e68793dc229d2 100644
--- a/rust/cubesql/cubesql/src/sql/postgres/shim.rs
+++ b/rust/cubesql/cubesql/src/sql/postgres/shim.rs
@@ -17,7 +17,7 @@ use crate::{
sql::{
compiler_cache::CompilerCacheEntry,
df_type_to_pg_tid,
- extended::{Cursor, Portal, PortalBatch, PortalFrom},
+ extended::{Cursor, Portal, PortalBatch, PortalFrom, ResultFormat},
statement::{PostgresStatementParamsFinder, StatementPlaceholderReplacer},
AuthContextRef, Session, SessionState,
},
@@ -64,7 +64,7 @@ pub enum StartupState {
pub trait QueryPlanExt {
fn to_row_description(
&self,
- required_format: protocol::Format,
+ format: &ResultFormat,
) -> Result, ConnectionError>;
}
@@ -73,18 +73,18 @@ impl QueryPlanExt for QueryPlan {
/// None is used for special queries, which doesnt have any data, for example: DISCARD ALL
fn to_row_description(
&self,
- required_format: protocol::Format,
+ format: &ResultFormat,
) -> Result, ConnectionError> {
match &self {
QueryPlan::MetaOk(_, _) | QueryPlan::CreateTempTable(_, _, _, _) => Ok(None),
QueryPlan::MetaTabular(_, frame) => {
let mut result = vec![];
- for field in frame.get_columns() {
+ for (idx, field) in frame.get_columns().iter().enumerate() {
result.push(protocol::RowDescriptionField::new(
field.get_name(),
PgType::get_by_tid(PgTypeId::TEXT),
- required_format,
+ format.format_for(idx),
));
}
@@ -93,11 +93,11 @@ impl QueryPlanExt for QueryPlan {
QueryPlan::DataFusionSelect(logical_plan, _) => {
let mut result = vec![];
- for field in logical_plan.schema().fields() {
+ for (idx, field) in logical_plan.schema().fields().iter().enumerate() {
result.push(protocol::RowDescriptionField::new(
field.name().clone(),
df_type_to_pg_tid(field.data_type())?.to_type(),
- required_format,
+ format.format_for(idx),
));
}
@@ -937,7 +937,7 @@ impl AsyncPostgresShim {
)
})?;
- let format = body.result_formats.first().copied().unwrap_or(Format::Text);
+ let format = ResultFormat::from(body.result_formats.clone());
let portal = match source_statement {
PreparedStatement::Empty { .. } => {
drop(statements_guard);
@@ -1084,15 +1084,15 @@ impl AsyncPostgresShim {
match plan {
Ok(plan) => {
- let description =
- plan.to_row_description(Format::Text)?
- .and_then(|description| {
- if description.len() > 0 {
- Some(description)
- } else {
- None
- }
- });
+ let description = plan
+ .to_row_description(&ResultFormat::AllText)?
+ .and_then(|description| {
+ if description.len() > 0 {
+ Some(description)
+ } else {
+ None
+ }
+ });
(
PreparedStatement::Query {
@@ -1219,7 +1219,12 @@ impl AsyncPostgresShim {
let plan = QueryPlan::MetaOk(StatusFlags::empty(), CommandCompletion::Begin);
self.write_portal(
- &mut Portal::new(plan, Format::Text, PortalFrom::Simple, span_id.clone()),
+ &mut Portal::new(
+ plan,
+ ResultFormat::AllText,
+ PortalFrom::Simple,
+ span_id.clone(),
+ ),
0,
cancel,
)
@@ -1238,7 +1243,12 @@ impl AsyncPostgresShim {
let plan = QueryPlan::MetaOk(StatusFlags::empty(), CommandCompletion::Rollback);
self.write_portal(
- &mut Portal::new(plan, Format::Text, PortalFrom::Simple, span_id.clone()),
+ &mut Portal::new(
+ plan,
+ ResultFormat::AllText,
+ PortalFrom::Simple,
+ span_id.clone(),
+ ),
0,
CancellationToken::new(),
)
@@ -1257,7 +1267,12 @@ impl AsyncPostgresShim {
let plan = QueryPlan::MetaOk(StatusFlags::empty(), CommandCompletion::Commit);
self.write_portal(
- &mut Portal::new(plan, Format::Text, PortalFrom::Simple, span_id.clone()),
+ &mut Portal::new(
+ plan,
+ ResultFormat::AllText,
+ PortalFrom::Simple,
+ span_id.clone(),
+ ),
0,
CancellationToken::new(),
)
@@ -1354,8 +1369,12 @@ impl AsyncPostgresShim {
)
.await?;
- let mut portal =
- Portal::new(plan, cursor.format, PortalFrom::Fetch, span_id.clone());
+ let mut portal = Portal::new(
+ plan,
+ ResultFormat::from(vec![cursor.format]),
+ PortalFrom::Fetch,
+ span_id.clone(),
+ );
self.write_portal(&mut portal, limit, cancel).await?;
self.portals.insert(name.value, portal);
@@ -1448,7 +1467,12 @@ impl AsyncPostgresShim {
QueryPlan::MetaOk(StatusFlags::empty(), CommandCompletion::DeclareCursor);
self.write_portal(
- &mut Portal::new(plan, Format::Text, PortalFrom::Simple, span_id.clone()),
+ &mut Portal::new(
+ plan,
+ ResultFormat::AllText,
+ PortalFrom::Simple,
+ span_id.clone(),
+ ),
0,
cancel,
)
@@ -1465,7 +1489,12 @@ impl AsyncPostgresShim {
);
self.write_portal(
- &mut Portal::new(plan, Format::Text, PortalFrom::Simple, span_id.clone()),
+ &mut Portal::new(
+ plan,
+ ResultFormat::AllText,
+ PortalFrom::Simple,
+ span_id.clone(),
+ ),
0,
cancel,
)
@@ -1499,7 +1528,12 @@ impl AsyncPostgresShim {
}?;
self.write_portal(
- &mut Portal::new(plan, Format::Text, PortalFrom::Simple, span_id.clone()),
+ &mut Portal::new(
+ plan,
+ ResultFormat::AllText,
+ PortalFrom::Simple,
+ span_id.clone(),
+ ),
0,
cancel,
)
@@ -1540,7 +1574,12 @@ impl AsyncPostgresShim {
}?;
self.write_portal(
- &mut Portal::new(plan, Format::Text, PortalFrom::Simple, span_id.clone()),
+ &mut Portal::new(
+ plan,
+ ResultFormat::AllText,
+ PortalFrom::Simple,
+ span_id.clone(),
+ ),
0,
cancel,
)
@@ -1579,7 +1618,12 @@ impl AsyncPostgresShim {
let plan = QueryPlan::MetaOk(StatusFlags::empty(), CommandCompletion::Prepare);
self.write_portal(
- &mut Portal::new(plan, Format::Text, PortalFrom::Simple, span_id.clone()),
+ &mut Portal::new(
+ plan,
+ ResultFormat::AllText,
+ PortalFrom::Simple,
+ span_id.clone(),
+ ),
0,
cancel,
)
@@ -1596,7 +1640,12 @@ impl AsyncPostgresShim {
.await?;
self.write_portal(
- &mut Portal::new(plan, Format::Text, PortalFrom::Simple, span_id.clone()),
+ &mut Portal::new(
+ plan,
+ ResultFormat::AllText,
+ PortalFrom::Simple,
+ span_id.clone(),
+ ),
0,
cancel,
)
diff --git a/rust/cubesql/cubesql/src/sql/postgres/writer.rs b/rust/cubesql/cubesql/src/sql/postgres/writer.rs
index dfb6592bafbe7..758ffddeffa11 100644
--- a/rust/cubesql/cubesql/src/sql/postgres/writer.rs
+++ b/rust/cubesql/cubesql/src/sql/postgres/writer.rs
@@ -1,6 +1,7 @@
use crate::sql::{
dataframe::{Decimal128Value, ListValue},
df_type_to_pg_tid,
+ postgres::extended::ResultFormat,
};
use bytes::{BufMut, BytesMut};
use datafusion::arrow::{
@@ -166,17 +167,17 @@ impl ToProtocolValue for ListValue {
#[derive(Debug)]
pub struct BatchWriter {
- format: Format,
+ format: ResultFormat,
// Data of whole rows
data: BytesMut,
- // Current row
+ // Current column index within the current row
current: u32,
rows: u32,
row: BytesMut,
}
impl BatchWriter {
- pub fn new(format: Format) -> Self {
+ pub fn new(format: ResultFormat) -> Self {
Self {
format,
data: BytesMut::new(),
@@ -186,10 +187,15 @@ impl BatchWriter {
}
}
+ fn current_format(&self) -> Format {
+ self.format.format_for(self.current as usize)
+ }
+
pub fn write_value(&mut self, value: T) -> Result<(), ProtocolError> {
+ let format = self.current_format();
self.current += 1;
- match self.format {
+ match format {
Format::Text => value.to_text(&mut self.row)?,
Format::Binary => value.to_binary(&mut self.row)?,
};
@@ -238,6 +244,7 @@ mod tests {
use crate::sql::{
dataframe::{Decimal128Value, ListValue},
error::ConnectionError,
+ postgres::extended::ResultFormat,
writer::{BatchWriter, ToProtocolValue},
};
use bytes::BytesMut;
@@ -297,7 +304,7 @@ mod tests {
async fn test_backend_writer_text_simple() -> Result<(), ConnectionError> {
let mut cursor = Cursor::new(vec![]);
- let mut writer = BatchWriter::new(Format::Text);
+ let mut writer = BatchWriter::new(ResultFormat::AllText);
writer.write_value("test1".to_string())?;
writer.write_value(true)?;
writer.end_row()?;
@@ -325,7 +332,7 @@ mod tests {
async fn test_backend_writer_binary_simple() -> Result<(), ConnectionError> {
let mut cursor = Cursor::new(vec![]);
- let mut writer = BatchWriter::new(Format::Binary);
+ let mut writer = BatchWriter::new(ResultFormat::AllBinary);
writer.write_value("test1".to_string())?;
writer.write_value(true)?;
writer.end_row()?;
@@ -355,7 +362,7 @@ mod tests {
// fetch 2 in test;
let mut cursor = Cursor::new(vec![]);
- let mut writer = BatchWriter::new(Format::Binary);
+ let mut writer = BatchWriter::new(ResultFormat::AllBinary);
writer.write_value(Decimal128Value::new(1, 5))?;
writer.end_row()?;
@@ -380,7 +387,7 @@ mod tests {
#[tokio::test]
async fn test_backend_writer_binary_int8_array() -> Result<(), ConnectionError> {
let mut cursor = Cursor::new(vec![]);
- let mut writer = BatchWriter::new(Format::Binary);
+ let mut writer = BatchWriter::new(ResultFormat::AllBinary);
// Row 1
let mut col = Int64Builder::new(3);
@@ -415,4 +422,65 @@ mod tests {
Ok(())
}
+
+ #[tokio::test]
+ async fn test_backend_writer_per_column_format() -> Result<(), ConnectionError> {
+ // Simulates Tableau/JDBC: text for col0 (string), binary for col1 (int64), binary for col2 (f64)
+ let mut cursor = Cursor::new(vec![]);
+
+ let mut writer = BatchWriter::new(ResultFormat::PerColumn(vec![
+ Format::Text,
+ Format::Binary,
+ Format::Binary,
+ ]));
+ writer.write_value("hello".to_string())?;
+ writer.write_value(42_i64)?;
+ writer.write_value(2.5_f64)?;
+ writer.end_row()?;
+
+ buffer::write_direct(&mut BytesMut::new(), &mut cursor, writer).await?;
+
+ assert_eq!(
+ cursor.get_ref()[0..],
+ vec![
+ // row: "hello" as text, 42_i64 as binary, 2.5_f64 as binary
+ 68, 0, 0, 0, 39, 0, 3, 0, 0, 0, 5, 104, 101, 108, 108, 111, 0, 0, 0, 8, 0, 0, 0, 0,
+ 0, 0, 0, 42, 0, 0, 0, 8, 64, 4, 0, 0, 0, 0, 0, 0
+ ]
+ );
+
+ Ok(())
+ }
+
+ #[tokio::test]
+ async fn test_backend_writer_per_column_format_multiple_rows() -> Result<(), ConnectionError> {
+ // Ensure per-column format resets correctly across rows
+ let mut cursor = Cursor::new(vec![]);
+
+ let mut writer =
+ BatchWriter::new(ResultFormat::PerColumn(vec![Format::Text, Format::Binary]));
+
+ writer.write_value("row1".to_string())?;
+ writer.write_value(100_i64)?;
+ writer.end_row()?;
+
+ writer.write_value("row2".to_string())?;
+ writer.write_value(200_i64)?;
+ writer.end_row()?;
+
+ buffer::write_direct(&mut BytesMut::new(), &mut cursor, writer).await?;
+
+ assert_eq!(
+ cursor.get_ref()[0..],
+ vec![
+ // row 1: "row1" as text, 100_i64 as binary
+ 68, 0, 0, 0, 26, 0, 2, 0, 0, 0, 4, 114, 111, 119, 49, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0,
+ 0, 100, // row 2: "row2" as text, 200_i64 as binary
+ 68, 0, 0, 0, 26, 0, 2, 0, 0, 0, 4, 114, 111, 119, 50, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0,
+ 0, 200
+ ]
+ );
+
+ Ok(())
+ }
}
diff --git a/rust/cubesql/package.json b/rust/cubesql/package.json
index a1861d2019924..ae1296d557fd3 100644
--- a/rust/cubesql/package.json
+++ b/rust/cubesql/package.json
@@ -1,6 +1,6 @@
{
"name": "@cubejs-backend/cubesql",
- "version": "1.6.20",
+ "version": "1.6.21",
"description": "SQL API for Cube as proxy over MySQL protocol.",
"engines": {
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
diff --git a/rust/cubesql/pg-srv/src/protocol.rs b/rust/cubesql/pg-srv/src/protocol.rs
index f1ba92a24383d..eda47110bc5c8 100644
--- a/rust/cubesql/pg-srv/src/protocol.rs
+++ b/rust/cubesql/pg-srv/src/protocol.rs
@@ -555,9 +555,17 @@ impl RowDescription {
pub fn new(fields: Vec) -> Self {
Self { fields }
}
+
pub fn len(&self) -> usize {
self.fields.len()
}
+
+ /// Returns the resolved per-column format codes.
+ /// These account for `is_binary_supported()` — if a type doesn't support
+ /// binary encoding, the format is downgraded to Text even if Binary was requested.
+ pub fn get_formats(&self) -> Vec {
+ self.fields.iter().map(|f| f.format).collect()
+ }
}
impl Serialize for RowDescription {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_hints.rs b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_hints.rs
index b164cb23b6c99..5e8950efa9672 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_hints.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/join_hints.rs
@@ -4,7 +4,7 @@ use cubenativeutils::wrappers::NativeObjectHandle;
use cubenativeutils::CubeError;
use serde::Serialize;
-#[derive(Debug, Clone, Eq, PartialEq, Hash, Serialize)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash, Serialize, Ord, PartialOrd)]
pub enum JoinHintItem {
Single(String),
Vector(Vec),
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/logical_plan/optimizers/pre_aggregation/pre_aggregations_compiler.rs b/rust/cubesqlplanner/cubesqlplanner/src/logical_plan/optimizers/pre_aggregation/pre_aggregations_compiler.rs
index c39cbe8948528..22bec416c1f99 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/logical_plan/optimizers/pre_aggregation/pre_aggregations_compiler.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/logical_plan/optimizers/pre_aggregation/pre_aggregations_compiler.rs
@@ -7,6 +7,7 @@ use crate::logical_plan::PreAggregationJoin;
use crate::logical_plan::PreAggregationJoinItem;
use crate::logical_plan::PreAggregationTable;
use crate::logical_plan::PreAggregationUnion;
+use crate::planner::join_hints::JoinHints;
use crate::planner::planners::JoinPlanner;
use crate::planner::planners::ResolvedJoinItem;
use crate::planner::query_tools::QueryTools;
@@ -342,10 +343,12 @@ impl PreAggregationsCompiler {
.cloned()
.chain(dimensions.iter().cloned())
.collect_vec();
- let pre_aggr_join_hints = collect_cube_names_from_symbols(&all_symbols)?
- .into_iter()
- .map(|v| JoinHintItem::Single(v))
- .collect_vec();
+ let pre_aggr_join_hints = JoinHints::from_items(
+ collect_cube_names_from_symbols(&all_symbols)?
+ .into_iter()
+ .map(|v| JoinHintItem::Single(v))
+ .collect_vec(),
+ );
let join_planner = JoinPlanner::new(self.query_tools.clone());
let pre_aggrs_for_join = rollups
@@ -364,10 +367,12 @@ impl PreAggregationsCompiler {
.cloned()
.chain(join_pre_aggr.dimensions.iter().cloned())
.collect_vec();
- let join_pre_aggr_join_hints = collect_cube_names_from_symbols(&all_symbols)?
- .into_iter()
- .map(|v| JoinHintItem::Single(v))
- .collect_vec();
+ let join_pre_aggr_join_hints = JoinHints::from_items(
+ collect_cube_names_from_symbols(&all_symbols)?
+ .into_iter()
+ .map(|v| JoinHintItem::Single(v))
+ .collect_vec(),
+ );
existing_joins.append(
&mut join_planner.resolve_join_members_by_hints(&join_pre_aggr_join_hints)?,
);
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/logical_plan/pre_aggregation.rs b/rust/cubesqlplanner/cubesqlplanner/src/logical_plan/pre_aggregation.rs
index ab7063d1df2a5..b5a35d2c67fdb 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/logical_plan/pre_aggregation.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/logical_plan/pre_aggregation.rs
@@ -98,10 +98,7 @@ impl PreAggregation {
for dim in self.dimensions().iter() {
let alias = dim.alias();
- res.insert(
- dim.full_name(),
- QualifiedColumnName::new(None, alias.clone()),
- );
+ res.insert(dim.full_name(), QualifiedColumnName::new(None, alias));
}
for dim in self.time_dimensions().iter() {
let (base_symbol, granularity) = if let Ok(td) = dim.as_time_dimension() {
@@ -117,7 +114,7 @@ impl PreAggregation {
let alias = format!("{}{}", base_symbol.alias(), suffix);
res.insert(
base_symbol.full_name(),
- QualifiedColumnName::new(None, alias.clone()),
+ QualifiedColumnName::new(None, alias),
);
}
@@ -130,10 +127,7 @@ impl PreAggregation {
for item in join.items.iter() {
for member in item.from_members.iter().chain(item.to_members.iter()) {
let alias = member.alias();
- res.insert(
- member.full_name(),
- QualifiedColumnName::new(None, alias.clone()),
- );
+ res.insert(member.full_name(), QualifiedColumnName::new(None, alias));
}
}
}
@@ -145,10 +139,7 @@ impl PreAggregation {
.iter()
.map(|measure| {
let alias = measure.alias();
- (
- measure.full_name(),
- QualifiedColumnName::new(None, alias.clone()),
- )
+ (measure.full_name(), QualifiedColumnName::new(None, alias))
})
.collect()
}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_cube.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_cube.rs
index b8f7d8661efd5..8a941c25ece15 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_cube.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_cube.rs
@@ -43,10 +43,7 @@ impl BaseCube {
context: Rc,
templates: &PlanSqlTemplates,
) -> Result {
- let cube_ref = CubeRef::Table {
- symbol: self.cube_table_symbol.clone(),
- path: vec![],
- };
+ let cube_ref = CubeRef::Table(self.cube_table_symbol.clone());
let visitor = context.make_visitor(context.query_tools());
let node_processor = context.node_processor();
visitor.evaluate_cube_ref(&cube_ref, node_processor, templates)
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/base_segment.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/base_segment.rs
index b1770df460ede..4d5198db52b44 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/base_segment.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/filter/base_segment.rs
@@ -1,6 +1,5 @@
-use crate::planner::query_tools::QueryTools;
use crate::planner::sql_evaluator::{
- MemberExpressionExpression, MemberExpressionSymbol, MemberSymbol, SqlCall,
+ CubeTableSymbol, MemberExpressionExpression, MemberExpressionSymbol, MemberSymbol, SqlCall,
};
use crate::planner::sql_templates::PlanSqlTemplates;
use crate::planner::{evaluate_with_context, VisitorContext};
@@ -24,18 +23,18 @@ impl PartialEq for BaseSegment {
impl BaseSegment {
pub fn try_new(
expression: Rc,
- cube_name: String,
+ cube_symbol: Rc,
name: String,
full_name: Option,
- query_tools: Rc,
) -> Result, CubeError> {
+ let cube_name = cube_symbol.cube_name().clone();
let member_expression_symbol = MemberExpressionSymbol::try_new(
- cube_name.clone(),
+ cube_symbol,
name.clone(),
MemberExpressionExpression::SqlCall(expression),
None,
None,
- query_tools.base_tools().clone(),
+ vec![cube_name.clone()],
)?;
let full_name = full_name.unwrap_or(member_expression_symbol.full_name());
let member_evaluator = MemberSymbol::new_member_expression(member_expression_symbol);
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/join_hints.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/join_hints.rs
new file mode 100644
index 0000000000000..109b22a671c6a
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/join_hints.rs
@@ -0,0 +1,149 @@
+use crate::cube_bridge::join_hints::JoinHintItem;
+
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
+pub struct JoinHints {
+ items: Vec,
+}
+
+impl JoinHints {
+ pub fn new() -> Self {
+ Self { items: Vec::new() }
+ }
+
+ pub fn from_items(mut items: Vec) -> Self {
+ items.sort();
+ items.dedup();
+ Self { items }
+ }
+
+ pub fn insert(&mut self, item: JoinHintItem) {
+ match self.items.binary_search(&item) {
+ Ok(_) => {}
+ Err(pos) => self.items.insert(pos, item),
+ }
+ }
+
+ pub fn extend(&mut self, other: &JoinHints) {
+ for item in other.items.iter() {
+ self.insert(item.clone());
+ }
+ }
+
+ pub fn is_empty(&self) -> bool {
+ self.items.is_empty()
+ }
+
+ pub fn len(&self) -> usize {
+ self.items.len()
+ }
+
+ pub fn items(&self) -> &[JoinHintItem] {
+ &self.items
+ }
+
+ pub fn iter(&self) -> std::slice::Iter<'_, JoinHintItem> {
+ self.items.iter()
+ }
+
+ pub fn into_items(self) -> Vec {
+ self.items
+ }
+}
+
+impl IntoIterator for JoinHints {
+ type Item = JoinHintItem;
+ type IntoIter = std::vec::IntoIter;
+
+ fn into_iter(self) -> Self::IntoIter {
+ self.items.into_iter()
+ }
+}
+
+impl<'a> IntoIterator for &'a JoinHints {
+ type Item = &'a JoinHintItem;
+ type IntoIter = std::slice::Iter<'a, JoinHintItem>;
+
+ fn into_iter(self) -> Self::IntoIter {
+ self.items.iter()
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use std::collections::hash_map::DefaultHasher;
+ use std::hash::{Hash, Hasher};
+
+ fn s(name: &str) -> JoinHintItem {
+ JoinHintItem::Single(name.to_string())
+ }
+
+ fn v(names: &[&str]) -> JoinHintItem {
+ JoinHintItem::Vector(names.iter().map(|n| n.to_string()).collect())
+ }
+
+ fn hash_of(h: &JoinHints) -> u64 {
+ let mut hasher = DefaultHasher::new();
+ h.hash(&mut hasher);
+ hasher.finish()
+ }
+
+ #[test]
+ fn test_from_items_normalizes_and_deduplicates() {
+ let hints = JoinHints::from_items(vec![
+ s("orders"),
+ v(&["users", "orders"]),
+ s("orders"),
+ s("abc"),
+ ]);
+
+ assert_eq!(hints.len(), 3);
+ // sorted: Single comes before Vector for same content, and Singles are alphabetical
+ assert_eq!(hints.items()[0], s("abc"));
+ assert_eq!(hints.items()[1], s("orders"));
+ assert_eq!(hints.items()[2], v(&["users", "orders"]));
+
+ // Different insertion order → same result
+ let hints2 = JoinHints::from_items(vec![s("abc"), v(&["users", "orders"]), s("orders")]);
+ assert_eq!(hints, hints2);
+ assert_eq!(hash_of(&hints), hash_of(&hints2));
+ }
+
+ #[test]
+ fn test_insert_and_extend_preserve_invariant() {
+ let mut a = JoinHints::new();
+ assert!(a.is_empty());
+
+ a.insert(s("orders"));
+ a.insert(s("abc"));
+ a.insert(s("orders")); // duplicate
+ assert_eq!(a.len(), 2);
+ assert_eq!(a.items()[0], s("abc"));
+ assert_eq!(a.items()[1], s("orders"));
+
+ let b = JoinHints::from_items(vec![s("orders"), v(&["a", "b"]), s("zzz")]);
+ a.extend(&b);
+ assert_eq!(a.len(), 4);
+ // abc, orders, zzz (Singles sorted), then Vector
+ assert_eq!(a.items()[0], s("abc"));
+ assert_eq!(a.items()[1], s("orders"));
+ assert_eq!(a.items()[2], s("zzz"));
+ assert_eq!(a.items()[3], v(&["a", "b"]));
+ }
+
+ #[test]
+ fn test_into_items_and_into_iter() {
+ let hints = JoinHints::from_items(vec![s("b"), s("a"), v(&["x", "y"])]);
+ let cloned = hints.clone();
+
+ // into_iter
+ let collected: Vec<_> = cloned.into_iter().collect();
+ assert_eq!(collected.len(), 3);
+
+ // into_items
+ let items = hints.into_items();
+ assert_eq!(items.len(), 3);
+ assert_eq!(items[0], s("a"));
+ assert_eq!(items[1], s("b"));
+ }
+}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/mod.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/mod.rs
index 142eb8be7ba96..90cccfb6104ea 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/mod.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/mod.rs
@@ -2,6 +2,7 @@ pub mod base_cube;
pub mod base_join_condition;
pub mod base_query;
pub mod filter;
+pub mod join_hints;
pub mod time_dimension;
pub mod params_allocator;
@@ -17,6 +18,7 @@ pub mod visitor_context;
pub use base_cube::BaseCube;
pub use base_join_condition::{BaseJoinCondition, SqlJoinCondition};
pub use base_query::BaseQuery;
+pub use join_hints::JoinHints;
pub use params_allocator::ParamsAllocator;
pub use query_properties::{FullKeyAggregateMeasures, OrderByItem, QueryProperties};
pub use time_dimension::*;
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/common_utils.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/common_utils.rs
index ede38a2726abd..3cb36feb14d48 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/common_utils.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/common_utils.rs
@@ -17,7 +17,8 @@ impl CommonUtils {
let evaluator_compiler_cell = self.query_tools.evaluator_compiler().clone();
let mut evaluator_compiler = evaluator_compiler_cell.borrow_mut();
- let evaluator = evaluator_compiler.add_cube_table_evaluator(cube_path.to_string())?;
+ let evaluator =
+ evaluator_compiler.add_cube_table_evaluator(cube_path.to_string(), vec![])?;
BaseCube::try_new(cube_path.to_string(), self.query_tools.clone(), evaluator)
}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/dimension_subquery_planner.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/dimension_subquery_planner.rs
index b8d9802ad816e..efce0efc61108 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/dimension_subquery_planner.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/dimension_subquery_planner.rs
@@ -1,6 +1,7 @@
use super::{CommonUtils, QueryPlanner};
use crate::logical_plan::{pretty_print_rc, DimensionSubQuery};
use crate::plan::{FilterItem, QualifiedColumnName};
+use crate::planner::join_hints::JoinHints;
use crate::planner::query_tools::QueryTools;
use crate::planner::sql_evaluator::collectors::collect_sub_query_dimensions;
use crate::planner::sql_evaluator::{
@@ -83,13 +84,18 @@ impl DimensionSubqueryPlanner {
)));
};
+ let cube_symbol = self
+ .query_tools
+ .evaluator_compiler()
+ .borrow_mut()
+ .add_cube_table_evaluator(cube_name.clone(), vec![])?;
let member_expression_symbol = MemberExpressionSymbol::try_new(
- cube_name.clone(),
+ cube_symbol,
dim_name.clone(),
MemberExpressionExpression::SqlCall(expression),
None,
None,
- self.query_tools.base_tools().clone(),
+ vec![cube_name.clone()],
)?;
let measure = MemberSymbol::new_member_expression(member_expression_symbol);
@@ -122,7 +128,7 @@ impl DimensionSubqueryPlanner {
false,
false,
false,
- Rc::new(vec![]),
+ Rc::new(JoinHints::new()),
true,
self.query_properties.disable_external_pre_aggregations(),
)?;
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/join_planner.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/join_planner.rs
index 0c0f813f4d192..552491b115a9a 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/join_planner.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/join_planner.rs
@@ -1,8 +1,8 @@
use super::CommonUtils;
use crate::cube_bridge::join_definition::JoinDefinition;
-use crate::cube_bridge::join_hints::JoinHintItem;
use crate::cube_bridge::join_item::JoinItem;
use crate::logical_plan::*;
+use crate::planner::join_hints::JoinHints;
use crate::planner::query_tools::QueryTools;
use crate::planner::sql_evaluator::MemberSymbol;
use crate::planner::sql_evaluator::SqlCall;
@@ -42,10 +42,13 @@ impl JoinPlanner {
pub fn make_join_logical_plan_with_join_hints(
&self,
- join_hints: Vec,
+ join_hints: JoinHints,
dimension_subqueries: Vec>,
) -> Result, CubeError> {
- let join = self.query_tools.join_graph().build_join(join_hints)?;
+ let join = self
+ .query_tools
+ .join_graph()
+ .build_join(join_hints.into_items())?;
self.make_join_logical_plan(join, dimension_subqueries)
}
@@ -93,12 +96,12 @@ impl JoinPlanner {
pub fn resolve_join_members_by_hints(
&self,
- join_hints: &Vec,
+ join_hints: &JoinHints,
) -> Result, CubeError> {
let join = self
.query_tools
.join_graph()
- .build_join(join_hints.clone())?;
+ .build_join(join_hints.items().to_vec())?;
self.resolve_join_members(join)
}
pub fn resolve_join_members(
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member_query_planner.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member_query_planner.rs
index 1d1382903dae6..ead41dcdff63f 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member_query_planner.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/member_query_planner.rs
@@ -3,6 +3,7 @@ use super::{
MultiStageQueryDescription, RollingWindowDescription, TimeSeriesDescription,
};
use crate::logical_plan::*;
+use crate::planner::join_hints::JoinHints;
use crate::planner::planners::{multi_stage::RollingWindowType, QueryPlanner, SimpleQueryPlanner};
use crate::planner::query_tools::QueryTools;
use crate::planner::sql_evaluator::MemberSymbol;
@@ -74,7 +75,7 @@ impl MultiStageMemberQueryPlanner {
true,
false,
false,
- Rc::new(vec![]),
+ Rc::new(JoinHints::new()),
true,
self.query_properties.disable_external_pre_aggregations(),
)?;
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multiplied_measures_query_planner.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multiplied_measures_query_planner.rs
index a00c333e2bdfe..2c18af329f0dc 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multiplied_measures_query_planner.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multiplied_measures_query_planner.rs
@@ -187,8 +187,9 @@ impl MultipliedMeasuresQueryPlanner {
key_cube_name: &String,
) -> Result {
for measure in measures.iter() {
+ let owned_measure = measure.with_stripped_join_prefix();
let member_expression_over_dimensions_cubes =
- if let Ok(member_expression) = measure.as_member_expression() {
+ if let Ok(member_expression) = owned_measure.as_member_expression() {
member_expression.cube_names_if_dimension_only_expression()?
} else {
None
@@ -196,18 +197,21 @@ impl MultipliedMeasuresQueryPlanner {
let cubes = if let Some(cubes) = member_expression_over_dimensions_cubes {
cubes
} else {
- collect_cube_names(&measure)?
+ collect_cube_names(&owned_measure)?
};
- let join_hints = collect_join_hints(&measure)?;
+ let join_hints = collect_join_hints(&owned_measure)?;
if cubes.iter().any(|cube| cube != key_cube_name) {
- let measures_join = self.query_tools.join_graph().build_join(join_hints)?;
+ let measures_join = self
+ .query_tools
+ .join_graph()
+ .build_join(join_hints.into_items())?;
if *measures_join
.static_data()
.multiplication_factor
.get(key_cube_name)
.unwrap_or(&false)
{
- return Err(CubeError::user(format!("{}' references cubes that lead to row multiplication. Please rewrite it using sub query.", measure.full_name())));
+ return Err(CubeError::user(format!("{}' references cubes ({}) that lead to row multiplication. Please rewrite it using sub query.", measure.full_name(), cubes.join(", "))));
}
return Ok(true);
}
@@ -230,10 +234,11 @@ impl MultipliedMeasuresQueryPlanner {
)?;
let subquery_dimension_queries =
dimension_subquery_planner.plan_queries(&subquery_dimensions)?;
- let join_hints = collect_join_hints_for_measures(&measures)?;
- let source = self
- .join_planner
- .make_join_logical_plan_with_join_hints(join_hints, subquery_dimension_queries)?;
+ let measure_join_hints = collect_join_hints_for_measures(&measures)?;
+ let source = self.join_planner.make_join_logical_plan_with_join_hints(
+ measure_join_hints,
+ subquery_dimension_queries,
+ )?;
let schema = LogicalSchema::default()
.set_dimensions(primary_keys_dimensions.clone())
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/query_properties.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/query_properties.rs
index 85d8280d67322..95891a4a3916d 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/query_properties.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/query_properties.rs
@@ -1,8 +1,8 @@
use super::filter::compiler::FilterCompiler;
use super::filter::BaseSegment;
use super::query_tools::QueryTools;
-use crate::cube_bridge::join_hints::JoinHintItem;
use crate::cube_bridge::member_expression::MemberExpressionExpressionDef;
+use crate::planner::join_hints::JoinHints;
use crate::planner::sql_evaluator::{
apply_static_filter_to_filter_item, apply_static_filter_to_symbol, MemberExpressionExpression,
MemberExpressionSymbol, TimeDimensionSymbol,
@@ -105,7 +105,7 @@ pub struct QueryProperties {
multi_fact_join_groups: Vec<(Rc, Vec>)>,
pre_aggregation_query: bool,
total_query: bool,
- query_join_hints: Rc>,
+ query_join_hints: Rc,
allow_multi_stage: bool,
disable_external_pre_aggregations: bool,
pre_aggregation_id: Option,
@@ -149,13 +149,15 @@ impl QueryProperties {
)));
}
};
+ let cube_symbol = evaluator_compiler
+ .add_cube_table_evaluator(cube_name.clone(), vec![])?;
let member_expression_symbol = MemberExpressionSymbol::try_new(
- cube_name.clone(),
+ cube_symbol,
name.clone(),
MemberExpressionExpression::SqlCall(expression_call),
member_expression.static_data().definition.clone(),
None,
- query_tools.base_tools().clone(),
+ vec![cube_name.clone()],
)?;
Ok(MemberSymbol::new_member_expression(
member_expression_symbol,
@@ -259,13 +261,14 @@ impl QueryProperties {
}
};
+ let cube_symbol = evaluator_compiler.add_cube_table_evaluator(cube_name.clone(), vec![])?;
let member_expression_symbol = MemberExpressionSymbol::try_new(
- cube_name.clone(),
+ cube_symbol,
name.clone(),
expression,
member_expression.static_data().definition.clone(),
None,
- query_tools.base_tools().clone(),
+ vec![cube_name.clone()],
)?;
Ok(MemberSymbol::new_member_expression(member_expression_symbol))
}
@@ -299,12 +302,13 @@ impl QueryProperties {
.segment_by_path(member_name.clone())?;
let expression_evaluator = evaluator_compiler
.compile_sql_call(&cube_name, definition.sql()?)?;
+ let cube_symbol = evaluator_compiler
+ .add_cube_table_evaluator(cube_name.clone(), vec![])?;
BaseSegment::try_new(
expression_evaluator,
- cube_name,
+ cube_symbol,
name,
Some(member_name.clone()),
- query_tools.clone(),
)
}
OptionsMember::MemberExpression(member_expression) => {
@@ -331,13 +335,9 @@ impl QueryProperties {
)));
}
};
- BaseSegment::try_new(
- expression_evaluator,
- cube_name,
- name,
- None,
- query_tools.clone(),
- )
+ let cube_symbol = evaluator_compiler
+ .add_cube_table_evaluator(cube_name.clone(), vec![])?;
+ BaseSegment::try_new(expression_evaluator, cube_symbol, name, None)
}
}?;
Ok(FilterItem::Segment(segment))
@@ -405,7 +405,9 @@ impl QueryProperties {
};
let ungrouped = options.static_data().ungrouped.unwrap_or(false);
- let query_join_hints = Rc::new(options.join_hints()?.unwrap_or_default());
+ let query_join_hints = Rc::new(JoinHints::from_items(
+ options.join_hints()?.unwrap_or_default(),
+ ));
let pre_aggregation_query = options.static_data().pre_aggregation_query.unwrap_or(false);
let total_query = options.static_data().total_query.unwrap_or(false);
@@ -455,7 +457,7 @@ impl QueryProperties {
ungrouped: bool,
pre_aggregation_query: bool,
total_query: bool,
- query_join_hints: Rc>,
+ query_join_hints: Rc,
allow_multi_stage: bool,
disable_external_pre_aggregations: bool,
) -> Result, CubeError> {
@@ -575,7 +577,7 @@ impl QueryProperties {
}
pub fn compute_join_multi_fact_groups(
- query_join_hints: Rc>,
+ query_join_hints: Rc,
query_tools: Rc,
measures: &Vec>,
dimensions: &Vec>,
@@ -728,7 +730,7 @@ impl QueryProperties {
self.row_limit
}
- pub fn query_join_hints(&self) -> &Rc> {
+ pub fn query_join_hints(&self) -> &Rc {
&self.query_join_hints
}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/query_tools.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/query_tools.rs
index a32a4be8b465e..ce1ff3c4460cd 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/query_tools.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/query_tools.rs
@@ -9,6 +9,7 @@ use crate::cube_bridge::join_item::JoinItemStatic;
use crate::cube_bridge::security_context::SecurityContext;
use crate::cube_bridge::sql_templates_render::SqlTemplatesRender;
use crate::plan::FilterItem;
+use crate::planner::join_hints::JoinHints;
use crate::planner::sql_evaluator::collectors::collect_join_hints;
use crate::planner::sql_templates::PlanSqlTemplates;
use chrono_tz::Tz;
@@ -19,8 +20,8 @@ use std::collections::HashMap;
use std::rc::Rc;
pub struct QueryToolsCachedData {
- join_hints: HashMap>>,
- join_hints_to_join_key: HashMap>>, Rc>,
+ join_hints: HashMap>,
+ join_hints_to_join_key: HashMap>, Rc>,
join_key_to_join: HashMap, Rc>,
}
@@ -42,7 +43,7 @@ impl QueryToolsCachedData {
pub fn join_hints_for_member(
&mut self,
node: &Rc,
- ) -> Result>, CubeError> {
+ ) -> Result, CubeError> {
let full_name = node.full_name();
if let Some(val) = self.join_hints.get(&full_name) {
Ok(val.clone())
@@ -56,7 +57,7 @@ impl QueryToolsCachedData {
pub fn join_hints_for_member_symbol_vec(
&mut self,
vec: &Vec>,
- ) -> Result>>, CubeError> {
+ ) -> Result>, CubeError> {
vec.iter()
.map(|b| self.join_hints_for_member(b))
.collect::, _>>()
@@ -65,7 +66,7 @@ impl QueryToolsCachedData {
pub fn join_hints_for_filter_item_vec(
&mut self,
vec: &Vec,
- ) -> Result>>, CubeError> {
+ ) -> Result>, CubeError> {
let mut member_symbols = Vec::new();
for i in vec.iter() {
i.find_all_member_evaluators(&mut member_symbols);
@@ -78,18 +79,13 @@ impl QueryToolsCachedData {
pub fn join_by_hints(
&mut self,
- hints: Vec>>,
+ hints: Vec>,
join_fn: impl FnOnce(Vec) -> Result, CubeError>,
) -> Result<(Rc, Rc), CubeError> {
if let Some(key) = self.join_hints_to_join_key.get(&hints) {
Ok((key.clone(), self.join_key_to_join.get(key).unwrap().clone()))
} else {
- let join = join_fn(
- hints
- .iter()
- .flat_map(|h| h.as_ref().iter().cloned())
- .collect(),
- )?;
+ let join = join_fn(hints.iter().flat_map(|h| h.iter().cloned()).collect())?;
let join_key = Rc::new(JoinKey {
root: join.static_data().root.to_string(),
joins: join
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/calc_group_dims_collector.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/calc_group_dims_collector.rs
index 9dc6e187dfe95..b8e00ff721e3c 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/calc_group_dims_collector.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/calc_group_dims_collector.rs
@@ -27,7 +27,6 @@ impl TraversalVisitor for CalcGroupDimsCollector {
fn on_node_traverse(
&mut self,
node: &Rc,
- path: &Vec,
_: &Self::State,
) -> Result, CubeError> {
match node.as_ref() {
@@ -37,9 +36,7 @@ impl TraversalVisitor for CalcGroupDimsCollector {
return Ok(None);
}
}
- MemberSymbol::TimeDimension(e) => {
- return self.on_node_traverse(e.base_symbol(), path, &())
- }
+ MemberSymbol::TimeDimension(e) => return self.on_node_traverse(e.base_symbol(), &()),
MemberSymbol::Measure(_) => {}
MemberSymbol::MemberExpression(_) => {}
};
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/cube_names_collector.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/cube_names_collector.rs
index 085ed8bc872c0..840b36958312a 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/cube_names_collector.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/cube_names_collector.rs
@@ -24,12 +24,12 @@ impl TraversalVisitor for CubeNamesCollector {
fn on_node_traverse(
&mut self,
node: &Rc,
- path: &Vec,
_: &Self::State,
) -> Result, CubeError> {
match node.as_ref() {
MemberSymbol::Dimension(e) => {
if !e.is_view() {
+ let path = node.path();
if !path.is_empty() {
for p in path {
self.names.insert(p.clone());
@@ -42,11 +42,10 @@ impl TraversalVisitor for CubeNamesCollector {
return Ok(None);
}
}
- MemberSymbol::TimeDimension(e) => {
- return self.on_node_traverse(e.base_symbol(), path, &())
- }
+ MemberSymbol::TimeDimension(e) => return self.on_node_traverse(e.base_symbol(), &()),
MemberSymbol::Measure(e) => {
if !e.is_view() {
+ let path = node.path();
if !path.is_empty() {
for p in path {
self.names.insert(p.clone());
@@ -62,13 +61,10 @@ impl TraversalVisitor for CubeNamesCollector {
}
fn on_cube_ref(&mut self, cube_ref: &CubeRef, _state: &Self::State) -> Result<(), CubeError> {
- if let CubeRef::Name { symbol, path, .. } = cube_ref {
- if !path.is_empty() {
- for p in path {
- self.names.insert(p.clone());
- }
+ if let CubeRef::Name(symbol) = cube_ref {
+ for p in symbol.path() {
+ self.names.insert(p.clone());
}
- self.names.insert(symbol.cube_name().clone());
}
Ok(())
}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_cumulative_members.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_cumulative_members.rs
index 5848fc779ce17..15059c729e572 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_cumulative_members.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_cumulative_members.rs
@@ -23,7 +23,6 @@ impl TraversalVisitor for HasCumulativeMembersCollector {
fn on_node_traverse(
&mut self,
node: &Rc,
- _path: &Vec,
_: &Self::State,
) -> Result, CubeError> {
if let MemberSymbol::Measure(s) = node.as_ref() {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_multi_stage_members.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_multi_stage_members.rs
index 4e092c62162a3..360555be0fd14 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_multi_stage_members.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/has_multi_stage_members.rs
@@ -25,7 +25,6 @@ impl TraversalVisitor for HasMultiStageMembersCollector {
fn on_node_traverse(
&mut self,
node: &Rc,
- _path: &Vec,
_: &Self::State,
) -> Result, CubeError> {
match node.as_ref() {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/join_hints_collector.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/join_hints_collector.rs
index a0b9f248b46ee..51c428685e161 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/join_hints_collector.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/join_hints_collector.rs
@@ -1,4 +1,5 @@
use crate::cube_bridge::join_hints::JoinHintItem;
+use crate::planner::join_hints::JoinHints;
use crate::planner::sql_evaluator::{CubeRef, MemberSymbol, TraversalVisitor};
use cubenativeutils::CubeError;
use itertools::Itertools;
@@ -23,7 +24,6 @@ impl TraversalVisitor for JoinHintsCollector {
fn on_node_traverse(
&mut self,
node: &Rc,
- path: &Vec,
_: &Self::State,
) -> Result, CubeError> {
if node.is_multi_stage() {
@@ -33,10 +33,10 @@ impl TraversalVisitor for JoinHintsCollector {
self.apply(item, &())?;
}
}
- for (dep, path) in dim.get_dependencies_with_path().into_iter() {
+ for dep in dim.get_dependencies().into_iter() {
if let Ok(dim) = dep.as_dimension() {
if dim.is_multi_stage() {
- self.on_node_traverse(&dep, &path, &())?;
+ self.on_node_traverse(&dep, &())?;
}
}
}
@@ -47,6 +47,7 @@ impl TraversalVisitor for JoinHintsCollector {
match node.as_ref() {
MemberSymbol::Dimension(e) => {
if !e.is_view() {
+ let path = node.path();
if !path.is_empty() {
if path.len() == 1 {
self.hints.push(JoinHintItem::Single(path[0].clone()))
@@ -61,11 +62,10 @@ impl TraversalVisitor for JoinHintsCollector {
return Ok(None);
}
}
- MemberSymbol::TimeDimension(e) => {
- return self.on_node_traverse(e.base_symbol(), path, &())
- }
+ MemberSymbol::TimeDimension(e) => return self.on_node_traverse(e.base_symbol(), &()),
MemberSymbol::Measure(e) => {
if !e.is_view() {
+ let path = node.path();
if !path.is_empty() {
if path.len() == 1 {
self.hints.push(JoinHintItem::Single(path[0].clone()))
@@ -83,11 +83,10 @@ impl TraversalVisitor for JoinHintsCollector {
}
fn on_cube_ref(&mut self, cube_ref: &CubeRef, _state: &Self::State) -> Result<(), CubeError> {
- if let CubeRef::Name { symbol, path, .. } = cube_ref {
- if !path.is_empty() {
- let mut path = path.clone();
- path.push(symbol.cube_name().clone());
- self.hints.push(JoinHintItem::Vector(path));
+ if let CubeRef::Name(symbol) = cube_ref {
+ let path = symbol.path();
+ if path.len() > 1 {
+ self.hints.push(JoinHintItem::Vector(path.clone()));
} else {
self.hints
.push(JoinHintItem::Single(symbol.cube_name().clone()));
@@ -97,17 +96,12 @@ impl TraversalVisitor for JoinHintsCollector {
}
}
-pub fn collect_join_hints(node: &Rc) -> Result, CubeError> {
+pub fn collect_join_hints(node: &Rc) -> Result {
let mut visitor = JoinHintsCollector::new();
visitor.apply(node, &())?;
let mut collected_hints = visitor.extract_result();
- let join_map = match node.as_ref() {
- MemberSymbol::Dimension(d) => d.join_map(),
- MemberSymbol::TimeDimension(d) => d.join_map(),
- MemberSymbol::Measure(m) => m.join_map(),
- _ => &None,
- };
+ let join_map = node.join_map();
if let Some(join_map) = join_map {
for hint in collected_hints.iter_mut() {
@@ -128,17 +122,17 @@ pub fn collect_join_hints(node: &Rc) -> Result,
}
}
- Ok(collected_hints)
+ Ok(JoinHints::from_items(collected_hints))
}
pub fn collect_join_hints_for_measures(
measures: &Vec>,
-) -> Result, CubeError> {
+) -> Result {
let mut visitor = JoinHintsCollector::new();
for meas in measures.iter() {
visitor.apply(&meas, &())?;
}
let res = visitor.extract_result();
- Ok(res)
+ Ok(JoinHints::from_items(res))
}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/member_childs_collector.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/member_childs_collector.rs
index a0e6d986879f5..529c3e9d9b921 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/member_childs_collector.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/member_childs_collector.rs
@@ -33,7 +33,6 @@ impl TraversalVisitor for MemberChildsCollector {
fn on_node_traverse(
&mut self,
node: &Rc,
- _path: &Vec,
state: &Self::State,
) -> Result, CubeError> {
if state.is_root {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/multiplied_measures_collector.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/multiplied_measures_collector.rs
index 26836acbe5796..dcfc235564cf0 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/multiplied_measures_collector.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/multiplied_measures_collector.rs
@@ -36,7 +36,6 @@ impl TraversalVisitor for CompositeMeasuresCollector {
fn on_node_traverse(
&mut self,
node: &Rc,
- _path: &Vec,
state: &Self::State,
) -> Result, CubeError> {
let res = match node.as_ref() {
@@ -90,7 +89,6 @@ impl TraversalVisitor for MultipliedMeasuresCollector {
fn on_node_traverse(
&mut self,
node: &Rc,
- _path: &Vec,
_: &Self::State,
) -> Result, CubeError> {
let res = match node.as_ref() {
@@ -100,7 +98,7 @@ impl TraversalVisitor for MultipliedMeasuresCollector {
.join
.static_data()
.multiplication_factor
- .get(e.cube_name())
+ .get(&e.cube_name())
.unwrap_or(&false)
.clone();
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/sub_query_dimensions.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/sub_query_dimensions.rs
index 3f95e194bc3e8..436d948472cb5 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/sub_query_dimensions.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/sub_query_dimensions.rs
@@ -38,7 +38,6 @@ impl TraversalVisitor for SubQueryDimensionsCollector {
fn on_node_traverse(
&mut self,
node: &Rc,
- path: &Vec,
_state: &Self::State,
) -> Result, CubeError> {
match node.as_ref() {
@@ -54,7 +53,7 @@ impl TraversalVisitor for SubQueryDimensionsCollector {
}
Ok(Some(()))
}
- MemberSymbol::TimeDimension(dim) => self.on_node_traverse(dim.base_symbol(), path, &()),
+ MemberSymbol::TimeDimension(dim) => self.on_node_traverse(dim.base_symbol(), &()),
_ => Ok(Some(())),
}
}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/compiler.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/compiler.rs
index 6c133522863ff..5c25f368d441f 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/compiler.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/compiler.rs
@@ -31,8 +31,8 @@ pub struct Compiler {
security_context: Rc,
timezone: Tz,
members: HashMap<(CacheSymbolType, String), Rc>,
- cube_names: HashMap>,
- cube_tables: HashMap>,
+ cube_names: HashMap, Rc>,
+ cube_tables: HashMap, Rc>,
}
impl Compiler {
@@ -57,18 +57,15 @@ impl Compiler {
&mut self,
name: String,
) -> Result, CubeError> {
- let path = name.split(".").map(|s| s.to_string()).collect::>();
- if self.cube_evaluator.is_measure(path.clone())? {
- Ok(self.add_measure_evaluator(name)?)
- } else if self.cube_evaluator.is_dimension(path.clone())? {
- Ok(self.add_dimension_evaluator(name)?)
- } else if self.cube_evaluator.is_segment(path.clone())? {
- Ok(self.add_segment_evaluator(name)?)
- } else {
- Err(CubeError::internal(format!(
- "Cannot resolve evaluator of member {}. Only dimensions, measures and segments can be autoresolved",
+ let path = SymbolPath::parse(self.cube_evaluator.clone(), &name)?;
+ match path.path_type() {
+ SymbolPathType::Dimension => self.add_dimension_evaluator_by_path(path),
+ SymbolPathType::Measure => self.add_measure_evaluator_by_path(path),
+ SymbolPathType::Segment => self.add_segment_evaluator_by_path(path),
+ _ => Err(CubeError::internal(format!(
+ "Cannot auto-resolve {}. Only dimensions, measures and segments",
name
- )))
+ ))),
}
}
@@ -77,10 +74,10 @@ impl Compiler {
measure: String,
) -> Result, CubeError> {
let path = SymbolPath::parse(self.cube_evaluator.clone(), &measure)?;
- self.add_measure_evaluator_impl(path)
+ self.add_measure_evaluator_by_path(path)
}
- fn add_measure_evaluator_impl(
+ pub fn add_measure_evaluator_by_path(
&mut self,
path: SymbolPath,
) -> Result, CubeError> {
@@ -101,15 +98,15 @@ impl Compiler {
let path = SymbolPath::parse(self.cube_evaluator.clone(), &dimension)?;
match path.path_type() {
SymbolPathType::Segment => {
- let symbol = self.add_segment_evaluator(path.full_name().clone())?;
+ let symbol = self.add_segment_evaluator_by_path(path)?;
let me = symbol.as_member_expression()?;
Ok(MemberSymbol::new_member_expression(me.with_parenthesized()))
}
- _ => self.add_dimension_evaluator_impl(path),
+ _ => self.add_dimension_evaluator_by_path(path),
}
}
- fn add_dimension_evaluator_impl(
+ pub fn add_dimension_evaluator_by_path(
&mut self,
path: SymbolPath,
) -> Result, CubeError> {
@@ -124,27 +121,33 @@ impl Compiler {
}
pub fn add_segment_evaluator(&mut self, name: String) -> Result, CubeError> {
- if let Some(exists) = self.exists_member(CacheSymbolType::Segment, &name) {
+ let path = SymbolPath::parse(self.cube_evaluator.clone(), &name)?;
+ self.add_segment_evaluator_by_path(path)
+ }
+
+ pub fn add_segment_evaluator_by_path(
+ &mut self,
+ path: SymbolPath,
+ ) -> Result, CubeError> {
+ let full_name = path.full_name().clone();
+ if let Some(exists) = self.exists_member(CacheSymbolType::Segment, &full_name) {
return Ok(exists.clone());
}
- let path = self
- .cube_evaluator
- .parse_path("segments".to_string(), name.clone())?;
- let cube_name = path[0].clone();
- let member_name = path[1].clone();
- let definition = self.cube_evaluator.segment_by_path(name.clone())?;
- let sql_call = self.compile_sql_call(&cube_name, definition.sql()?)?;
- let alias = PlanSqlTemplates::member_alias_name(&cube_name, &member_name, &None);
+ let definition = self.cube_evaluator.segment_by_path(full_name.clone())?;
+ let sql_call = self.compile_sql_call(path.cube_name(), definition.sql()?)?;
+ let alias =
+ PlanSqlTemplates::member_alias_name(path.cube_name(), path.symbol_name(), &None);
+ let cube_symbol = self.add_cube_table_evaluator(path.cube_name().clone(), vec![])?;
let symbol = MemberExpressionSymbol::try_new(
- cube_name,
- member_name,
+ cube_symbol,
+ path.symbol_name().clone(),
MemberExpressionExpression::SqlCall(sql_call),
None,
Some(alias),
- self.base_tools.clone(),
+ path.path().clone(),
)?;
let result = MemberSymbol::new_member_expression(symbol);
- let key = (CacheSymbolType::Segment, name);
+ let key = (CacheSymbolType::Segment, full_name);
self.members.insert(key, result.clone());
Ok(result)
}
@@ -152,13 +155,16 @@ impl Compiler {
pub fn add_cube_name_evaluator(
&mut self,
cube_name: String,
+ path: Vec,
) -> Result, CubeError> {
- if let Some(exists) = self.cube_names.get(&cube_name) {
+ let cache_key = CubeNameSymbol::normalize_path(path.clone(), &cube_name);
+ if let Some(exists) = self.cube_names.get(&cache_key) {
Ok(exists.clone())
} else {
- let result = CubeNameSymbolFactory::try_new(&cube_name, self.cube_evaluator.clone())?
- .build(self)?;
- self.cube_names.insert(cube_name, result.clone());
+ let result =
+ CubeNameSymbolFactory::try_new(&cube_name, self.cube_evaluator.clone(), path)?
+ .build(self)?;
+ self.cube_names.insert(cache_key, result.clone());
Ok(result)
}
}
@@ -166,13 +172,16 @@ impl Compiler {
pub fn add_cube_table_evaluator(
&mut self,
cube_name: String,
+ path: Vec,
) -> Result, CubeError> {
- if let Some(exists) = self.cube_tables.get(&cube_name) {
+ let cache_key = CubeNameSymbol::normalize_path(path.clone(), &cube_name);
+ if let Some(exists) = self.cube_tables.get(&cache_key) {
Ok(exists.clone())
} else {
- let result = CubeTableSymbolFactory::try_new(&cube_name, self.cube_evaluator.clone())?
- .build(self)?;
- self.cube_tables.insert(cube_name, result.clone());
+ let result =
+ CubeTableSymbolFactory::try_new(&cube_name, self.cube_evaluator.clone(), path)?
+ .build(self)?;
+ self.cube_tables.insert(cache_key, result.clone());
Ok(result)
}
}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/cube_ref_evaluator.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/cube_ref_evaluator.rs
index 1bf94e8f7e824..de638d5d9954b 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/cube_ref_evaluator.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/cube_ref_evaluator.rs
@@ -32,12 +32,12 @@ impl CubeRefEvaluator {
templates: &PlanSqlTemplates,
) -> Result {
match cube_ref {
- CubeRef::Name { symbol, .. } => {
+ CubeRef::Name(symbol) => {
let name = symbol.evaluate_sql()?;
let alias = self.resolve_cube_alias(&name);
templates.quote_identifier(&alias)
}
- CubeRef::Table { symbol, .. } => {
+ CubeRef::Table(symbol) => {
if let Some(pre_agg) = self.original_sql_pre_aggregations.get(symbol.cube_name()) {
return Ok(pre_agg.clone());
}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call.rs
index c6989cefc838d..08dc7235cb380 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call.rs
@@ -13,41 +13,35 @@ use std::rc::Rc;
#[derive(Clone, Debug)]
pub enum CubeRef {
- Name {
- symbol: Rc,
- path: Vec,
- },
- Table {
- symbol: Rc,
- path: Vec,
- },
+ Name(Rc),
+ Table(Rc),
}
impl CubeRef {
pub fn cube_name(&self) -> &String {
match self {
- CubeRef::Name { symbol, .. } => symbol.cube_name(),
- CubeRef::Table { symbol, .. } => symbol.cube_name(),
+ CubeRef::Name(symbol) => symbol.cube_name(),
+ CubeRef::Table(symbol) => symbol.cube_name(),
}
}
pub fn path(&self) -> &Vec {
match self {
- CubeRef::Name { path, .. } => path,
- CubeRef::Table { path, .. } => path,
+ CubeRef::Name(symbol) => symbol.path(),
+ CubeRef::Table(symbol) => symbol.path(),
}
}
pub fn as_name(&self) -> Option<&Rc> {
match self {
- CubeRef::Name { symbol, .. } => Some(symbol),
+ CubeRef::Name(symbol) => Some(symbol),
_ => None,
}
}
pub fn as_table(&self) -> Option<&Rc> {
match self {
- CubeRef::Table { symbol, .. } => Some(symbol),
+ CubeRef::Table(symbol) => Some(symbol),
_ => None,
}
}
@@ -105,12 +99,6 @@ impl SqlCallArg {
}
}
-#[derive(Debug, Clone)]
-pub struct SqlCallDependency {
- pub path: Vec,
- pub symbol: SqlDependency,
-}
-
#[derive(Debug, Clone)]
pub struct SqlCallFilterParamsItem {
pub filter_symbol_name: String,
@@ -125,7 +113,7 @@ pub struct SqlCallFilterGroupItem {
#[derive(Clone, Debug)]
pub struct SqlCall {
template: SqlTemplate,
- deps: Vec,
+ deps: Vec,
filter_params: Vec,
filter_groups: Vec,
security_context: SecutityContextProps,
@@ -134,7 +122,7 @@ pub struct SqlCall {
impl SqlCall {
pub(super) fn new(
template: SqlTemplate,
- deps: Vec,
+ deps: Vec,
filter_params: Vec,
filter_groups: Vec,
security_context: SecutityContextProps,
@@ -168,7 +156,7 @@ impl SqlCall {
)
} else {
Err(CubeError::internal(
- "SqlCall::eval called for fuction that return string".to_string(),
+ "SqlCall::eval called for function that returns string".to_string(),
))
}
}
@@ -213,7 +201,7 @@ impl SqlCall {
if self.deps.is_empty() {
true
} else {
- self.deps.iter().any(|dep| dep.symbol.is_cube_ref())
+ self.deps.iter().any(|dep| dep.is_cube_ref())
}
}
@@ -221,7 +209,7 @@ impl SqlCall {
self.deps
.iter()
.filter_map(|dep| {
- if let SqlDependency::CubeRef(CubeRef::Name { symbol, .. }) = &dep.symbol {
+ if let SqlDependency::CubeRef(CubeRef::Name(symbol)) = dep {
Some(symbol.clone())
} else {
None
@@ -266,7 +254,7 @@ impl SqlCall {
let deps = self
.deps
.iter()
- .map(|dep| match &dep.symbol {
+ .map(|dep| match dep {
SqlDependency::Symbol(m) => visitor.apply(m, node_processor.clone(), templates),
SqlDependency::CubeRef(cr) => {
visitor.evaluate_cube_ref(cr, node_processor.clone(), templates)
@@ -402,60 +390,35 @@ impl SqlCall {
pub fn resolve_direct_reference(&self) -> Option> {
if self.is_direct_reference() {
- self.deps[0].symbol.as_symbol().cloned()
+ self.deps[0].as_symbol().cloned()
} else {
None
}
}
pub fn dependencies_count(&self) -> usize {
- self.deps.iter().filter(|d| d.symbol.is_symbol()).count()
+ self.deps.iter().filter(|d| d.is_symbol()).count()
}
pub fn get_dependencies(&self) -> Vec> {
self.deps
.iter()
- .filter_map(|d| d.symbol.as_symbol().cloned())
- .collect()
- }
-
- pub fn get_dependencies_with_path(&self) -> Vec<(Rc, Vec)> {
- self.deps
- .iter()
- .filter_map(|d| d.symbol.as_symbol().map(|s| (s.clone(), d.path.clone())))
+ .filter_map(|d| d.as_symbol().cloned())
.collect()
}
pub fn extract_symbol_deps(&self, result: &mut Vec>) {
for dep in self.deps.iter() {
- if let Some(s) = dep.symbol.as_symbol() {
+ if let Some(s) = dep.as_symbol() {
result.push(s.clone())
}
}
}
- pub fn extract_symbol_deps_with_path(&self, result: &mut Vec<(Rc, Vec)>) {
- for dep in self.deps.iter() {
- if let Some(s) = dep.symbol.as_symbol() {
- result.push((s.clone(), dep.path.clone()))
- }
- }
- }
-
pub fn extract_cube_refs(&self, result: &mut Vec) {
for dep in self.deps.iter() {
- if let SqlDependency::CubeRef(cr) = &dep.symbol {
- let cube_ref = match cr {
- CubeRef::Name { symbol, .. } => CubeRef::Name {
- symbol: symbol.clone(),
- path: dep.path.clone(),
- },
- CubeRef::Table { symbol, .. } => CubeRef::Table {
- symbol: symbol.clone(),
- path: dep.path.clone(),
- },
- };
- result.push(cube_ref);
+ if let SqlDependency::CubeRef(cr) = dep {
+ result.push(cr.clone());
}
}
}
@@ -466,8 +429,8 @@ impl SqlCall {
) -> Result, CubeError> {
let mut result = self.clone();
for dep in result.deps.iter_mut() {
- if let SqlDependency::Symbol(ref s) = dep.symbol {
- dep.symbol = SqlDependency::Symbol(s.apply_recursive(f)?);
+ if let SqlDependency::Symbol(ref s) = dep {
+ *dep = SqlDependency::Symbol(s.apply_recursive(f)?);
}
}
Ok(Rc::new(result))
@@ -486,7 +449,7 @@ impl crate::utils::debug::DebugSql for SqlCall {
let deps = self
.deps
.iter()
- .map(|dep| match &dep.symbol {
+ .map(|dep| match dep {
SqlDependency::Symbol(s) => {
if expand_deps {
s.debug_sql(true)
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call_builder.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call_builder.rs
index 99a32ff5352f9..5617bad221a07 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call_builder.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call_builder.rs
@@ -1,15 +1,12 @@
-use super::symbols::MemberSymbol;
use super::Compiler;
use super::{
- CubeRef, SqlCall, SqlCallDependency, SqlCallFilterGroupItem, SqlCallFilterParamsItem,
- SqlDependency,
+ CubeRef, SqlCall, SqlCallFilterGroupItem, SqlCallFilterParamsItem, SqlDependency, SymbolPath,
+ SymbolPathType,
};
use crate::cube_bridge::base_tools::BaseTools;
use crate::cube_bridge::evaluator::CubeEvaluator;
use crate::cube_bridge::member_sql::*;
use crate::cube_bridge::security_context::SecurityContext;
-use crate::planner::sql_evaluator::TimeDimensionSymbol;
-use crate::planner::GranularityHelper;
use cubenativeutils::CubeError;
use std::rc::Rc;
@@ -97,145 +94,49 @@ impl<'a> SqlCallBuilder<'a> {
&mut self,
current_cube_name: &String,
dep_path: &Vec,
- ) -> Result {
+ ) -> Result {
assert!(!dep_path.is_empty());
- self.process_dependency_item(current_cube_name, dep_path, vec![])
- .map_err(|e| CubeError::user(format!("Error in `{}`: {}", dep_path.join("."), e)))
- }
-
- fn process_dependency_item(
- &mut self,
- current_cube_name: &String,
- path_tail: &[String],
- processed_path: Vec,
- ) -> Result {
- assert!(!path_tail.is_empty());
- if let Some(member) = self.try_process_member_dependency_item(
- current_cube_name,
- path_tail,
- processed_path.clone(),
- ) {
- Ok(member)
- } else if let Some(cube_name) = self.get_cube_name(¤t_cube_name, &path_tail[0])? {
- self.process_cube_dependency_item(&cube_name, path_tail, processed_path)
- } else {
- Err(CubeError::user(format!(
- "Undefined property {}",
- path_tail[0]
- )))
- }
- }
-
- fn try_process_member_dependency_item(
- &mut self,
- current_cube_name: &String,
- path_tail: &[String],
- processed_path: Vec,
- ) -> Option {
- if let Ok(member_symbol) = self.build_evaluator(¤t_cube_name, &path_tail[0]) {
- if let Ok(dimension) = member_symbol.as_dimension() {
- if dimension.is_time() && path_tail.len() == 2 {
- let granularity = &path_tail[1];
- if let Ok(Some(granularity_obj)) = GranularityHelper::make_granularity_obj(
- self.cube_evaluator.clone(),
- self.compiler,
- ¤t_cube_name,
- &path_tail[0],
- Some(granularity.clone()),
- ) {
- let time_dim_symbol =
- MemberSymbol::new_time_dimension(TimeDimensionSymbol::new(
- member_symbol,
- Some(granularity.clone()),
- Some(granularity_obj),
- None,
- ));
- let result = SqlCallDependency {
- path: processed_path,
- symbol: SqlDependency::Symbol(time_dim_symbol),
- };
- return Some(result);
- } else {
- return None;
- }
- }
+ let symbol_path = SymbolPath::parse_parts(
+ self.cube_evaluator.clone(),
+ Some(current_cube_name),
+ dep_path,
+ )
+ .map_err(|e| CubeError::user(format!("Error in `{}`: {}", dep_path.join("."), e)))?;
+
+ let path = symbol_path.path().clone();
+
+ match symbol_path.path_type() {
+ SymbolPathType::Dimension => {
+ let member = self
+ .compiler
+ .add_dimension_evaluator_by_path(symbol_path.clone())?;
+ Ok(SqlDependency::Symbol(member))
}
- if path_tail.len() > 1 {
- return None;
+ SymbolPathType::Measure => {
+ let member = self
+ .compiler
+ .add_measure_evaluator_by_path(symbol_path.clone())?;
+ Ok(SqlDependency::Symbol(member))
+ }
+ SymbolPathType::Segment => {
+ let member = self
+ .compiler
+ .add_segment_evaluator_by_path(symbol_path.clone())?;
+ Ok(SqlDependency::Symbol(member))
+ }
+ SymbolPathType::CubeName => {
+ let symbol = self
+ .compiler
+ .add_cube_name_evaluator(symbol_path.cube_name().clone(), path)?;
+ Ok(SqlDependency::CubeRef(CubeRef::Name(symbol)))
+ }
+ SymbolPathType::CubeTable => {
+ let symbol = self
+ .compiler
+ .add_cube_table_evaluator(symbol_path.cube_name().clone(), path)?;
+ Ok(SqlDependency::CubeRef(CubeRef::Table(symbol)))
}
- let result = SqlCallDependency {
- path: processed_path,
- symbol: SqlDependency::Symbol(member_symbol),
- };
- Some(result)
- } else {
- None
- }
- }
-
- fn process_cube_dependency_item(
- &mut self,
- cube_name: &String,
- path_tail: &[String],
- mut processed_path: Vec,
- ) -> Result {
- processed_path.push(cube_name.clone());
- if path_tail.len() == 1 {
- let symbol = self.compiler.add_cube_name_evaluator(cube_name.clone())?;
- let result = SqlCallDependency {
- path: processed_path.clone(),
- symbol: SqlDependency::CubeRef(CubeRef::Name {
- symbol,
- path: processed_path,
- }),
- };
- return Ok(result);
- }
- if path_tail.len() == 2 && path_tail[1] == "__sql_fn" {
- let symbol = self.compiler.add_cube_table_evaluator(cube_name.clone())?;
- let result = SqlCallDependency {
- path: processed_path.clone(),
- symbol: SqlDependency::CubeRef(CubeRef::Table {
- symbol,
- path: processed_path,
- }),
- };
- return Ok(result);
- }
- self.process_dependency_item(&cube_name, &path_tail[1..], processed_path)
- }
-
- fn get_cube_name(
- &mut self,
- current_cube: &String,
- cube_name: &String,
- ) -> Result, CubeError> {
- if self.is_current_cube(cube_name) {
- Ok(Some(current_cube.clone()))
- } else if self.cube_evaluator.cube_exists(cube_name.clone())? {
- Ok(Some(cube_name.clone()))
- } else {
- Ok(None)
- }
- }
-
- fn is_current_cube(&self, name: &str) -> bool {
- match name {
- "CUBE" | "TABLE" => true,
- _ => false,
}
}
-
- fn build_evaluator(
- &mut self,
- current_cube_name: &String,
- name: &String,
- ) -> Result, CubeError> {
- let dep_full_name = format!("{}.{}", current_cube_name, name);
- let res = self
- .compiler
- .add_auto_resolved_member_evaluator(dep_full_name.clone())?;
- Ok(res)
- }
}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/case.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/case.rs
index 4066a50df1857..eaaf7bcdd966c 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/case.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/case.rs
@@ -52,18 +52,6 @@ impl CaseDefinition {
sql.extract_symbol_deps(result);
}
}
- fn extract_symbol_deps_with_path(&self, result: &mut Vec<(Rc, Vec)>) {
- for itm in self.items.iter() {
- itm.sql.extract_symbol_deps_with_path(result);
- if let CaseLabel::Sql(sql) = &itm.label {
- sql.extract_symbol_deps_with_path(result);
- }
- }
- if let CaseLabel::Sql(sql) = &self.else_label {
- sql.extract_symbol_deps_with_path(result);
- }
- }
-
fn apply_to_deps) -> Result, CubeError>>(
&self,
f: &F,
@@ -130,13 +118,6 @@ impl CaseSwitchItem {
}
}
- fn extract_symbol_deps_with_path(&self, result: &mut Vec<(Rc, Vec)>) {
- match self {
- CaseSwitchItem::Sql(sql_call) => sql_call.extract_symbol_deps_with_path(result),
- CaseSwitchItem::Member(member_symbol) => result.push((member_symbol.clone(), vec![])),
- }
- }
-
fn apply_to_deps) -> Result, CubeError>>(
&self,
f: &F,
@@ -247,16 +228,6 @@ impl CaseSwitchDefinition {
else_sql.extract_symbol_deps(result);
}
}
- fn extract_symbol_deps_with_path(&self, result: &mut Vec<(Rc, Vec)>) {
- self.switch.extract_symbol_deps_with_path(result);
- for itm in self.items.iter() {
- itm.sql.extract_symbol_deps_with_path(result);
- }
- if let Some(else_sql) = &self.else_sql {
- else_sql.extract_symbol_deps_with_path(result);
- }
- }
-
fn get_switch_values(&self) -> Option> {
if let CaseSwitchItem::Member(member) = &self.switch {
if let Ok(switch_dim) = member.as_dimension() {
@@ -411,13 +382,6 @@ impl Case {
Case::CaseSwitch(def) => def.extract_symbol_deps(result),
}
}
- pub fn extract_symbol_deps_with_path(&self, result: &mut Vec<(Rc, Vec)>) {
- match self {
- Case::Case(def) => def.extract_symbol_deps_with_path(result),
- Case::CaseSwitch(def) => def.extract_symbol_deps_with_path(result),
- }
- }
-
pub fn case_switch_dimension(&self) -> Option> {
if let Case::CaseSwitch(case) = &self {
if let CaseSwitchItem::Member(member) = &case.switch {
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/compiled_member_path.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/compiled_member_path.rs
new file mode 100644
index 0000000000000..e8c9c8fa7dbc3
--- /dev/null
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/compiled_member_path.rs
@@ -0,0 +1,70 @@
+use crate::planner::sql_evaluator::{CubeNameSymbol, CubeTableSymbol};
+use std::rc::Rc;
+
+#[derive(Clone, Debug)]
+pub struct CompiledMemberPath {
+ cube: Rc,
+ full_name: String,
+ name: String,
+ alias: String,
+ path: Vec,
+}
+
+impl CompiledMemberPath {
+ pub fn new(
+ cube: Rc,
+ full_name: String,
+ name: String,
+ alias: String,
+ path: Vec,
+ ) -> Self {
+ let path = CubeNameSymbol::normalize_path(path, cube.cube_name());
+ Self {
+ cube,
+ full_name,
+ name,
+ alias,
+ path,
+ }
+ }
+
+ pub fn full_name(&self) -> &String {
+ &self.full_name
+ }
+
+ pub fn cube_name(&self) -> &String {
+ self.cube.cube_name()
+ }
+
+ pub fn cube(&self) -> &Rc {
+ &self.cube
+ }
+
+ pub fn join_map(&self) -> &Option>> {
+ self.cube.join_map()
+ }
+
+ pub fn name(&self) -> &String {
+ &self.name
+ }
+
+ pub fn alias(&self) -> &String {
+ &self.alias
+ }
+
+ pub fn path(&self) -> &Vec {
+ &self.path
+ }
+
+ /// Returns a copy with the path reduced to just the owning cube,
+ /// stripping any join chain prefix (e.g. from views or cross-cube references).
+ pub fn strip_join_prefix(&self) -> Self {
+ Self {
+ cube: self.cube.clone(),
+ full_name: self.full_name.clone(),
+ name: self.name.clone(),
+ alias: self.alias.clone(),
+ path: vec![self.cube_name().clone()],
+ }
+ }
+}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/mod.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/mod.rs
index ed8bf27a461d2..e278e2e966bff 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/mod.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/mod.rs
@@ -1,11 +1,13 @@
mod aggregation_type;
mod case;
+mod compiled_member_path;
mod dimension_type;
mod static_filter;
mod symbol_path;
pub use aggregation_type::*;
pub use case::*;
+pub use compiled_member_path::*;
pub use dimension_type::*;
pub use static_filter::*;
pub use symbol_path::*;
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/symbol_path.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/symbol_path.rs
index fe05d49b0e835..0a595851443cc 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/symbol_path.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/common/symbol_path.rs
@@ -4,11 +4,13 @@ use cubenativeutils::CubeError;
use crate::cube_bridge::evaluator::CubeEvaluator;
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
pub enum SymbolPathType {
Dimension,
Measure,
Segment,
+ CubeName,
+ CubeTable,
}
#[derive(Debug, Clone)]
@@ -29,7 +31,11 @@ impl SymbolPath {
symbol_name: String,
granularity: Option,
) -> Self {
- let full_name = format!("{}.{}", cube_name, symbol_name);
+ let full_name = if symbol_name.is_empty() {
+ cube_name.clone()
+ } else {
+ format!("{}.{}", cube_name, symbol_name)
+ };
Self {
path_type,
path,
@@ -41,46 +47,140 @@ impl SymbolPath {
}
pub fn parse(cube_evaluator: Rc, path: &str) -> Result {
- let parts = path.split(".").collect::>();
- if parts.len() < 2 {
- return Err(CubeError::user(format!("Invalid symbol path: {}", path)));
+ let parts: Vec = path.split('.').map(|s| s.to_string()).collect();
+ Self::parse_parts(cube_evaluator, None, &parts)
+ }
+
+ pub fn parse_parts(
+ cube_evaluator: Rc,
+ current_cube: Option<&str>,
+ parts: &[String],
+ ) -> Result {
+ Self::resolve_parts(cube_evaluator, current_cube, parts, vec![])
+ }
+
+ fn resolve_parts(
+ cube_evaluator: Rc,
+ current_cube: Option<&str>,
+ parts: &[String],
+ path: Vec,
+ ) -> Result {
+ if parts.is_empty() {
+ return Err(CubeError::user("Empty path".to_string()));
}
- if let Some(dim_path) =
- Self::try_parse_as_dimension_with_granularity(cube_evaluator.clone(), &parts)?
- {
- return Ok(dim_path);
+ // Step 1: If current_cube set, try resolving parts[0] as member
+ if let Some(cube_name) = current_cube {
+ if let Some(result) =
+ Self::try_resolve_as_member(cube_evaluator.clone(), cube_name, parts, &path)?
+ {
+ return Ok(result);
+ }
}
- let path_to_check = vec![
- parts[parts.len() - 2].to_string(),
- parts[parts.len() - 1].to_string(),
- ];
-
- let path_type = if cube_evaluator.is_dimension(path_to_check.clone())? {
- SymbolPathType::Dimension
- } else if cube_evaluator.is_measure(path_to_check.clone())? {
- SymbolPathType::Measure
- } else if cube_evaluator.is_segment(path_to_check.clone())? {
- SymbolPathType::Segment
- } else {
- return Err(CubeError::user(format!(
- "Symbol path doesn't refer to a dimension, measure or segment: {}",
- path
+ // Step 2: Try resolving parts[0] as cube reference
+ let resolved = Self::resolve_cube_name(cube_evaluator.clone(), current_cube, &parts[0])?;
+
+ if let Some(cube_name) = resolved {
+ let mut new_path = path;
+ new_path.push(cube_name.clone());
+
+ if parts.len() == 1 {
+ return Ok(Self::new(
+ SymbolPathType::CubeName,
+ new_path,
+ cube_name,
+ String::new(),
+ None,
+ ));
+ }
+ if parts.len() >= 2 && parts[1] == "__sql_fn" {
+ return Ok(Self::new(
+ SymbolPathType::CubeTable,
+ new_path,
+ cube_name,
+ String::new(),
+ None,
+ ));
+ }
+ return Self::resolve_parts(cube_evaluator, Some(&cube_name), &parts[1..], new_path);
+ }
+
+ Err(CubeError::user(format!("Cannot resolve: {}", parts[0])))
+ }
+
+ fn try_resolve_as_member(
+ evaluator: Rc,
+ cube_name: &str,
+ parts: &[String],
+ path: &[String],
+ ) -> Result, CubeError> {
+ let check_path = vec![cube_name.to_string(), parts[0].clone()];
+
+ if evaluator.is_dimension(check_path.clone())? {
+ if parts.len() == 1 {
+ return Ok(Some(Self::new(
+ SymbolPathType::Dimension,
+ path.to_vec(),
+ cube_name.to_string(),
+ parts[0].clone(),
+ None,
+ )));
+ }
+ if parts.len() == 2 {
+ let dim = evaluator.dimension_by_path(format!("{}.{}", cube_name, parts[0]))?;
+ if dim.static_data().dimension_type == "time" {
+ return Ok(Some(Self::new(
+ SymbolPathType::Dimension,
+ path.to_vec(),
+ cube_name.to_string(),
+ parts[0].clone(),
+ Some(parts[1].clone()),
+ )));
+ }
+ }
+ // Dimension with extra parts (non-time) — not a member match
+ return Ok(None);
+ }
+
+ // Measures/segments can't have extra parts
+ if parts.len() > 1 {
+ return Ok(None);
+ }
+
+ if evaluator.is_measure(check_path.clone())? {
+ return Ok(Some(Self::new(
+ SymbolPathType::Measure,
+ path.to_vec(),
+ cube_name.to_string(),
+ parts[0].clone(),
+ None,
)));
- };
+ }
+ if evaluator.is_segment(check_path)? {
+ return Ok(Some(Self::new(
+ SymbolPathType::Segment,
+ path.to_vec(),
+ cube_name.to_string(),
+ parts[0].clone(),
+ None,
+ )));
+ }
+ Ok(None)
+ }
- let path = parts[0..parts.len() - 2]
- .iter()
- .map(|s| s.to_string())
- .collect();
- Ok(Self::new(
- path_type,
- path,
- path_to_check[0].clone(),
- path_to_check[1].clone(),
- None,
- ))
+ fn resolve_cube_name(
+ evaluator: Rc,
+ current_cube: Option<&str>,
+ name: &str,
+ ) -> Result, CubeError> {
+ if matches!(name, "CUBE" | "TABLE") {
+ return Ok(current_cube.map(|s| s.to_string()));
+ }
+ if evaluator.cube_exists(name.to_string())? {
+ return Ok(Some(name.to_string()));
+ }
+ Ok(None)
}
pub fn path_type(&self) -> &SymbolPathType {
@@ -114,35 +214,6 @@ impl SymbolPath {
pub fn granularity(&self) -> &Option {
&self.granularity
}
-
- fn try_parse_as_dimension_with_granularity(
- cube_evaluator: Rc,
- parts: &[&str],
- ) -> Result, CubeError> {
- if parts.len() > 2 {
- let path_to_check = vec![
- parts[parts.len() - 3].to_string(),
- parts[parts.len() - 2].to_string(),
- ];
- if cube_evaluator.is_dimension(path_to_check.clone())? {
- let path_type = SymbolPathType::Dimension;
- let path = parts[0..parts.len() - 3]
- .iter()
- .map(|s| s.to_string())
- .collect();
-
- let granularity = Some(parts[parts.len() - 1].to_string());
- return Ok(Some(Self::new(
- path_type,
- path,
- path_to_check[0].clone(),
- path_to_check[1].clone(),
- granularity,
- )));
- }
- }
- Ok(None)
- }
}
#[cfg(test)]
@@ -151,8 +222,7 @@ mod tests {
use crate::test_fixtures::cube_bridge::{MockCubeEvaluator, MockSchema};
use indoc::indoc;
- #[test]
- fn test_symbol_path_parsing() {
+ fn create_test_evaluator() -> Rc {
let schema = MockSchema::from_yaml(indoc! {"
cubes:
- name: users
@@ -164,9 +234,15 @@ mod tests {
- name: id
type: number
sql: id
+ - name: source
+ type: string
+ sql: source
measures:
- name: count
type: count
+ segments:
+ - name: google
+ sql: \"{CUBE.source} = 'google'\"
- name: orders
sql: SELECT * FROM orders
dimensions:
@@ -179,55 +255,187 @@ mod tests {
sql: amount
"})
.unwrap();
+ Rc::new(MockCubeEvaluator::new(schema))
+ }
- let evaluator = Rc::new(MockCubeEvaluator::new(schema));
-
+ #[test]
+ fn test_parse_simple_dimension() {
+ let evaluator = create_test_evaluator();
let result = SymbolPath::parse(evaluator.clone(), "users.created_at").unwrap();
assert_eq!(result.cube_name(), "users");
assert_eq!(result.symbol_name(), "created_at");
assert_eq!(result.full_name(), "users.created_at");
- assert_eq!(result.path(), &Vec::::new());
+ assert_eq!(result.path(), &vec!["users".to_string()]);
assert_eq!(result.granularity(), &None);
- assert!(matches!(result.path_type, SymbolPathType::Dimension));
+ assert_eq!(result.path_type(), &SymbolPathType::Dimension);
+ }
+ #[test]
+ fn test_parse_cross_cube_dimension() {
+ let evaluator = create_test_evaluator();
let result = SymbolPath::parse(evaluator.clone(), "orders.users.created_at").unwrap();
assert_eq!(result.cube_name(), "users");
assert_eq!(result.symbol_name(), "created_at");
assert_eq!(result.full_name(), "users.created_at");
- assert_eq!(result.path(), &vec!["orders".to_string()]);
+ assert_eq!(
+ result.path(),
+ &vec!["orders".to_string(), "users".to_string()]
+ );
assert_eq!(result.granularity(), &None);
- assert!(matches!(result.path_type, SymbolPathType::Dimension));
+ assert_eq!(result.path_type(), &SymbolPathType::Dimension);
+ }
+ #[test]
+ fn test_parse_time_dimension_with_granularity() {
+ let evaluator = create_test_evaluator();
let result = SymbolPath::parse(evaluator.clone(), "users.created_at.day").unwrap();
assert_eq!(result.cube_name(), "users");
assert_eq!(result.symbol_name(), "created_at");
assert_eq!(result.full_name(), "users.created_at");
- assert_eq!(result.path(), &Vec::::new());
+ assert_eq!(result.path(), &vec!["users".to_string()]);
assert_eq!(result.granularity(), &Some("day".to_string()));
- assert!(matches!(result.path_type, SymbolPathType::Dimension));
+ assert_eq!(result.path_type(), &SymbolPathType::Dimension);
+ }
+ #[test]
+ fn test_parse_cross_cube_time_dimension_with_granularity() {
+ let evaluator = create_test_evaluator();
let result = SymbolPath::parse(evaluator.clone(), "orders.users.created_at.day").unwrap();
assert_eq!(result.cube_name(), "users");
assert_eq!(result.symbol_name(), "created_at");
assert_eq!(result.full_name(), "users.created_at");
- assert_eq!(result.path(), &vec!["orders".to_string()]);
+ assert_eq!(
+ result.path(),
+ &vec!["orders".to_string(), "users".to_string()]
+ );
assert_eq!(result.granularity(), &Some("day".to_string()));
- assert!(matches!(result.path_type, SymbolPathType::Dimension));
+ assert_eq!(result.path_type(), &SymbolPathType::Dimension);
+ }
+ #[test]
+ fn test_parse_measure() {
+ let evaluator = create_test_evaluator();
let result = SymbolPath::parse(evaluator.clone(), "users.count").unwrap();
assert_eq!(result.cube_name(), "users");
assert_eq!(result.symbol_name(), "count");
assert_eq!(result.full_name(), "users.count");
- assert_eq!(result.path(), &Vec::::new());
+ assert_eq!(result.path(), &vec!["users".to_string()]);
assert_eq!(result.granularity(), &None);
- assert!(matches!(result.path_type, SymbolPathType::Measure));
+ assert_eq!(result.path_type(), &SymbolPathType::Measure);
+ }
+ #[test]
+ fn test_parse_cross_cube_measure() {
+ let evaluator = create_test_evaluator();
let result = SymbolPath::parse(evaluator.clone(), "users.orders.total").unwrap();
assert_eq!(result.cube_name(), "orders");
assert_eq!(result.symbol_name(), "total");
assert_eq!(result.full_name(), "orders.total");
- assert_eq!(result.path(), &vec!["users".to_string()]);
+ assert_eq!(
+ result.path(),
+ &vec!["users".to_string(), "orders".to_string()]
+ );
assert_eq!(result.granularity(), &None);
- assert!(matches!(result.path_type, SymbolPathType::Measure));
+ assert_eq!(result.path_type(), &SymbolPathType::Measure);
+ }
+
+ #[test]
+ fn test_parse_parts_cube_alias() {
+ let evaluator = create_test_evaluator();
+ let parts = vec!["CUBE".to_string()];
+ let result = SymbolPath::parse_parts(evaluator.clone(), Some("users"), &parts).unwrap();
+ assert_eq!(result.path_type(), &SymbolPathType::CubeName);
+ assert_eq!(result.cube_name(), "users");
+ assert_eq!(result.path(), &vec!["users".to_string()]);
+ }
+
+ #[test]
+ fn test_parse_parts_table_alias() {
+ let evaluator = create_test_evaluator();
+ let parts = vec!["TABLE".to_string()];
+ let result = SymbolPath::parse_parts(evaluator.clone(), Some("users"), &parts).unwrap();
+ assert_eq!(result.path_type(), &SymbolPathType::CubeName);
+ assert_eq!(result.cube_name(), "users");
+ assert_eq!(result.path(), &vec!["users".to_string()]);
+ }
+
+ #[test]
+ fn test_parse_parts_cube_table() {
+ let evaluator = create_test_evaluator();
+ let parts = vec!["CUBE".to_string(), "__sql_fn".to_string()];
+ let result = SymbolPath::parse_parts(evaluator.clone(), Some("users"), &parts).unwrap();
+ assert_eq!(result.path_type(), &SymbolPathType::CubeTable);
+ assert_eq!(result.cube_name(), "users");
+ assert_eq!(result.path(), &vec!["users".to_string()]);
+ }
+
+ #[test]
+ fn test_parse_parts_simple_member() {
+ let evaluator = create_test_evaluator();
+ let parts = vec!["source".to_string()];
+ let result = SymbolPath::parse_parts(evaluator.clone(), Some("users"), &parts).unwrap();
+ assert_eq!(result.path_type(), &SymbolPathType::Dimension);
+ assert_eq!(result.cube_name(), "users");
+ assert_eq!(result.symbol_name(), "source");
+ assert_eq!(result.path(), &Vec::::new());
+ }
+
+ #[test]
+ fn test_parse_parts_time_dimension_with_granularity() {
+ let evaluator = create_test_evaluator();
+ let parts = vec!["created_at".to_string(), "day".to_string()];
+ let result = SymbolPath::parse_parts(evaluator.clone(), Some("users"), &parts).unwrap();
+ assert_eq!(result.path_type(), &SymbolPathType::Dimension);
+ assert_eq!(result.cube_name(), "users");
+ assert_eq!(result.symbol_name(), "created_at");
+ assert_eq!(result.granularity(), &Some("day".to_string()));
+ assert_eq!(result.path(), &Vec::::new());
+ }
+
+ #[test]
+ fn test_parse_parts_cross_cube_member() {
+ let evaluator = create_test_evaluator();
+ let parts = vec!["orders".to_string(), "total".to_string()];
+ let result = SymbolPath::parse_parts(evaluator.clone(), Some("users"), &parts).unwrap();
+ assert_eq!(result.path_type(), &SymbolPathType::Measure);
+ assert_eq!(result.cube_name(), "orders");
+ assert_eq!(result.symbol_name(), "total");
+ assert_eq!(result.path(), &vec!["orders".to_string()]);
+ }
+
+ #[test]
+ fn test_parse_parts_measure() {
+ let evaluator = create_test_evaluator();
+ let parts = vec!["count".to_string()];
+ let result = SymbolPath::parse_parts(evaluator.clone(), Some("users"), &parts).unwrap();
+ assert_eq!(result.path_type(), &SymbolPathType::Measure);
+ assert_eq!(result.cube_name(), "users");
+ assert_eq!(result.symbol_name(), "count");
+ assert_eq!(result.path(), &Vec::::new());
+ }
+
+ #[test]
+ fn test_parse_parts_segment() {
+ let evaluator = create_test_evaluator();
+ let parts = vec!["google".to_string()];
+ let result = SymbolPath::parse_parts(evaluator.clone(), Some("users"), &parts).unwrap();
+ assert_eq!(result.path_type(), &SymbolPathType::Segment);
+ assert_eq!(result.cube_name(), "users");
+ assert_eq!(result.symbol_name(), "google");
+ assert_eq!(result.path(), &Vec::::new());
+ }
+
+ #[test]
+ fn test_cache_name_without_granularity() {
+ let evaluator = create_test_evaluator();
+ let result = SymbolPath::parse(evaluator.clone(), "users.count").unwrap();
+ assert_eq!(result.cache_name(), "users.count");
+ }
+
+ #[test]
+ fn test_cache_name_with_granularity() {
+ let evaluator = create_test_evaluator();
+ let result = SymbolPath::parse(evaluator.clone(), "users.created_at.day").unwrap();
+ assert_eq!(result.cache_name(), "users.created_at.day");
}
}
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/cube_symbol.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/cube_symbol.rs
index f2ac27522b0c1..e1d48fc34821e 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/cube_symbol.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/cube_symbol.rs
@@ -12,11 +12,20 @@ use std::rc::Rc;
#[derive(Debug)]
pub struct CubeNameSymbol {
cube_name: String,
+ path: Vec,
}
impl CubeNameSymbol {
- pub fn new(cube_name: String) -> Rc {
- Rc::new(Self { cube_name })
+ pub fn new(cube_name: String, path: Vec) -> Rc {
+ let path = Self::normalize_path(path, &cube_name);
+ Rc::new(Self { cube_name, path })
+ }
+
+ pub(crate) fn normalize_path(mut path: Vec, cube_name: &str) -> Vec {
+ if path.is_empty() || path.last().map(|s| s.as_str()) != Some(cube_name) {
+ path.push(cube_name.to_string());
+ }
+ path
}
pub fn evaluate_sql(&self) -> Result {
@@ -25,6 +34,9 @@ impl CubeNameSymbol {
pub fn cube_name(&self) -> &String {
&self.cube_name
}
+ pub fn path(&self) -> &Vec {
+ &self.path
+ }
pub fn alias(&self) -> String {
PlanSqlTemplates::alias_name(&self.cube_name)
}
@@ -32,30 +44,34 @@ impl CubeNameSymbol {
pub struct CubeNameSymbolFactory {
cube_name: String,
+ path: Vec,
}
impl CubeNameSymbolFactory {
pub fn try_new(
full_name: &String,
_cube_evaluator: Rc,
+ path: Vec,
) -> Result {
//TODO check that cube exists
Ok(Self {
cube_name: full_name.clone(),
+ path,
})
}
}
impl CubeNameSymbolFactory {
pub fn build(self, _compiler: &mut Compiler) -> Result, CubeError> {
- let Self { cube_name } = self;
- Ok(CubeNameSymbol::new(cube_name))
+ let Self { cube_name, path } = self;
+ Ok(CubeNameSymbol::new(cube_name, path))
}
}
#[derive(Debug)]
pub struct CubeTableSymbol {
cube_name: String,
+ path: Vec,
member_sql: Option>,
alias: String,
is_table_sql: bool,
@@ -65,13 +81,16 @@ pub struct CubeTableSymbol {
impl CubeTableSymbol {
pub fn new(
cube_name: String,
+ path: Vec,
member_sql: Option>,
alias: String,
is_table_sql: bool,
join_map: Option>>,
) -> Rc {
+ let path = CubeNameSymbol::normalize_path(path, &cube_name);
Rc::new(Self {
cube_name,
+ path,
member_sql,
alias,
is_table_sql,
@@ -118,6 +137,10 @@ impl CubeTableSymbol {
&self.cube_name
}
+ pub fn path(&self) -> &Vec {
+ &self.path
+ }
+
pub fn alias(&self) -> String {
self.alias.clone()
}
@@ -129,6 +152,7 @@ impl CubeTableSymbol {
pub struct CubeTableSymbolFactory {
cube_name: String,
+ path: Vec,
sql: Option>,
definition: Rc,
is_table_sql: bool,
@@ -138,6 +162,7 @@ impl CubeTableSymbolFactory {
pub fn try_new(
cube_name: &String,
cube_evaluator: Rc,
+ path: Vec,
) -> Result {
let definition = cube_evaluator.cube_from_path(cube_name.clone())?;
let table_sql = definition.sql_table()?;
@@ -146,6 +171,7 @@ impl CubeTableSymbolFactory {
let sql = table_sql.or(sql);
Ok(Self {
cube_name: cube_name.clone(),
+ path,
sql,
definition,
is_table_sql,
@@ -155,6 +181,7 @@ impl CubeTableSymbolFactory {
pub fn build(self, compiler: &mut Compiler) -> Result, CubeError> {
let Self {
cube_name,
+ path,
sql,
definition,
is_table_sql,
@@ -171,6 +198,7 @@ impl CubeTableSymbolFactory {
};
Ok(CubeTableSymbol::new(
cube_name,
+ path,
sql,
alias,
is_table_sql,
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_kinds/case_dimension.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_kinds/case_dimension.rs
index d903bd2a1795d..b84df2734a140 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_kinds/case_dimension.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_kinds/case_dimension.rs
@@ -69,15 +69,6 @@ impl CaseDimension {
deps
}
- pub fn get_dependencies_with_path(&self) -> Vec<(Rc, Vec)> {
- let mut deps = vec![];
- if let Some(member_sql) = &self.member_sql {
- member_sql.extract_symbol_deps_with_path(&mut deps);
- }
- self.case.extract_symbol_deps_with_path(&mut deps);
- deps
- }
-
pub fn apply_to_deps) -> Result, CubeError>>(
&self,
f: &F,
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_kinds/geo.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_kinds/geo.rs
index 30096c1b5ed17..c5ebd21e700a8 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_kinds/geo.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_kinds/geo.rs
@@ -32,13 +32,6 @@ impl GeoDimension {
deps
}
- pub fn get_dependencies_with_path(&self) -> Vec<(Rc, Vec)> {
- let mut deps = vec![];
- self.latitude.extract_symbol_deps_with_path(&mut deps);
- self.longitude.extract_symbol_deps_with_path(&mut deps);
- deps
- }
-
pub fn apply_to_deps) -> Result, CubeError>>(
&self,
f: &F,
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_kinds/mod.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_kinds/mod.rs
index 0e7e8040ecccd..7ad346fcbff29 100644
--- a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_kinds/mod.rs
+++ b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_kinds/mod.rs
@@ -58,15 +58,6 @@ impl DimensionKind {
}
}
- pub fn get_dependencies_with_path(&self) -> Vec<(Rc, Vec)> {
- match self {
- Self::Regular(r) => r.get_dependencies_with_path(),
- Self::Geo(g) => g.get_dependencies_with_path(),
- Self::Switch(s) => s.get_dependencies_with_path(),
- Self::Case(c) => c.get_dependencies_with_path(),
- }
- }
-
pub fn apply_to_deps