Skip to content

Commit edc57ad

Browse files
committed
Merge branch 'master' into cubestore-df-46.0.1
2 parents 6298c26 + dd53c38 commit edc57ad

File tree

2,288 files changed

+151208
-526701
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,288 files changed

+151208
-526701
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
**
22
!package.json
33
!tsconfig.base.json
4+
!tsconfig.json
45
!rollup.config.js
56
!yarn.lock
67
!lerna.json

.github/actions/codecov-fix.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../" && pwd)"
6+
7+
for path in "$repo_root"/packages/*/coverage/lcov.info; do
8+
[ -f "$path" ] || continue
9+
10+
pkg_dir="$(dirname "$path")" # packages/foo/coverage
11+
pkg_root="$(dirname "$pkg_dir")" # packages/foo
12+
tmp_path="$pkg_dir/lcov.fixed.info"
13+
14+
sed "s|SF:src/|SF:packages/$(basename "$pkg_root")/src/|g" "$path" > "$tmp_path"
15+
done

.github/actions/integration/athena.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ set -eo pipefail
55
export DEBUG=testcontainers
66

77
echo "::group::Athena [cloud]"
8+
export CUBEJS_AWS_KEY=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_AWS_KEY
9+
export CUBEJS_AWS_SECRET=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_AWS_SECRET
10+
811
export CUBEJS_AWS_REGION=us-east-1
912
export CUBEJS_AWS_S3_OUTPUT_LOCATION=s3://cubejs-opensource/testing/output
1013
export CUBEJS_DB_EXPORT_BUCKET=s3://cubejs-opensource/testing/export/

.github/actions/integration/bigquery.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -eo pipefail
55
export DEBUG=testcontainers
66

77
echo "::group::BigQuery [cloud]"
8+
export CUBEJS_DB_BQ_CREDENTIALS=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_DB_BQ_CREDENTIALS
89
export CUBEJS_DB_BQ_PROJECT_ID=cube-open-source
910
export CUBEJS_DB_EXPORT_BUCKET=cube-open-source-export-bucket
1011
yarn lerna run --concurrency 1 --stream --no-prefix integration:bigquery

.github/actions/integration/snowflake.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ export CUBEJS_DB_NAME=DEMO_DB
99
export CUBEJS_DB_SNOWFLAKE_ACCOUNT=lxb31104
1010
export CUBEJS_DB_SNOWFLAKE_REGION=us-west-2
1111
export CUBEJS_DB_SNOWFLAKE_WAREHOUSE=COMPUTE_WH
12+
export CUBEJS_DB_USER=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_DB_USER
13+
export CUBEJS_DB_PASS=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_DB_PASS
1214

1315
yarn lerna run --concurrency 1 --stream --no-prefix smoke:snowflake
1416

.github/pull_request_template.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@
44
- [ ] Tests for the changes have been added if not covered yet
55
- [ ] Docs have been added / updated if required
66

7+
<!--
8+
9+
Please uncomment and fill the sections below if applicable. This will help the reviewer to get the context quicker.
10+
711
**Issue Reference this PR resolves**
812
913
[For example #12]
1014
1115
**Description of Changes Made (if issue reference is not provided)**
1216
1317
[Description goes here]
18+
-->

.github/workflows/cloud.yml

Lines changed: 0 additions & 130 deletions
This file was deleted.

.github/workflows/drivers-tests.yml

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,19 @@ on:
5757
# To test SQL API Push down
5858
- 'packages/cubejs-backend-native/**'
5959
- 'rust/cubesql/**'
60+
workflow_dispatch:
61+
inputs:
62+
use_tesseract_sql_planner:
63+
description: 'Enable TESSERACT_SQL_PLANNER?'
64+
required: true
65+
default: 'false'
66+
type: choice
67+
options:
68+
- 'true'
69+
- 'false'
6070

6171
env:
62-
CUBEJS_TESSERACT_ORCHESTRATOR: true
72+
USE_TESSERACT_SQL_PLANNER: false
6373

6474
jobs:
6575
latest-tag-sha:
@@ -91,7 +101,7 @@ jobs:
91101
name: Build native Linux ${{ matrix.node-version }} ${{ matrix.target }} Python ${{ matrix.python-version }}
92102
strategy:
93103
matrix:
94-
node-version: [ 20 ]
104+
node-version: [ 22 ]
95105
python-version: [ "fallback" ]
96106
target: [ "x86_64-unknown-linux-gnu" ]
97107
fail-fast: false
@@ -205,12 +215,18 @@ jobs:
205215
athena-export-bucket-s3
206216
bigquery-export-bucket-gcs
207217
clickhouse-export-bucket-s3
218+
clickhouse-export-bucket-s3-prefix
208219
databricks-jdbc
209220
databricks-jdbc-export-bucket-s3
221+
databricks-jdbc-export-bucket-s3-prefix
210222
databricks-jdbc-export-bucket-azure
223+
databricks-jdbc-export-bucket-azure-prefix
224+
databricks-jdbc-export-bucket-gcs
225+
databricks-jdbc-export-bucket-gcs-prefix
211226
redshift
212227
redshift-export-bucket-s3
213228
snowflake
229+
snowflake-encrypted-pk
214230
snowflake-export-bucket-s3
215231
snowflake-export-bucket-azure
216232
snowflake-export-bucket-azure-via-storage-integration
@@ -222,22 +238,26 @@ jobs:
222238
DRIVERS_TESTS_ATHENA_CUBEJS_AWS_KEY: ${{ secrets.DRIVERS_TESTS_ATHENA_CUBEJS_AWS_KEY }}
223239
strategy:
224240
matrix:
225-
node:
226-
- 20.x
227241
database:
228242
- athena-export-bucket-s3
229243
- bigquery-export-bucket-gcs
230244
- clickhouse
231245
- clickhouse-export-bucket-s3
246+
- clickhouse-export-bucket-s3-prefix
232247
- databricks-jdbc
233248
- databricks-jdbc-export-bucket-s3
249+
- databricks-jdbc-export-bucket-s3-prefix
234250
- databricks-jdbc-export-bucket-azure
251+
- databricks-jdbc-export-bucket-azure-prefix
252+
- databricks-jdbc-export-bucket-gcs
253+
- databricks-jdbc-export-bucket-gcs-prefix
235254
- mssql
236255
- mysql
237256
- postgres
238257
- redshift
239258
- redshift-export-bucket-s3
240259
- snowflake
260+
- snowflake-encrypted-pk
241261
- snowflake-export-bucket-s3
242262
- snowflake-export-bucket-azure
243263
- snowflake-export-bucket-azure-via-storage-integration
@@ -248,10 +268,10 @@ jobs:
248268
- name: Checkout
249269
uses: actions/checkout@v4
250270

251-
- name: Install Node.js 20.x
271+
- name: Install Node.js 22.x
252272
uses: actions/setup-node@v4
253273
with:
254-
node-version: 20.x
274+
node-version: 22.x
255275

256276
- name: Configure `yarn`
257277
run: yarn policies set-version v1.22.22
@@ -308,6 +328,8 @@ jobs:
308328
(contains(env.CLOUD_DATABASES, matrix.database) && env.DRIVERS_TESTS_ATHENA_CUBEJS_AWS_KEY != '') ||
309329
(!contains(env.CLOUD_DATABASES, matrix.database))
310330
env:
331+
DRIVERS_TESTS_CUBEJS_TESSERACT_SQL_PLANNER: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.use_tesseract_sql_planner || env.USE_TESSERACT_SQL_PLANNER }}
332+
311333
# Athena
312334
DRIVERS_TESTS_ATHENA_CUBEJS_AWS_KEY: ${{ secrets.DRIVERS_TESTS_ATHENA_CUBEJS_AWS_KEY }}
313335
DRIVERS_TESTS_ATHENA_CUBEJS_AWS_SECRET: ${{ secrets.DRIVERS_TESTS_ATHENA_CUBEJS_AWS_SECRET }}
@@ -336,6 +358,8 @@ jobs:
336358
# Snowflake
337359
DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_USER: ${{ secrets.DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_USER }}
338360
DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PASS: ${{ secrets.DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PASS }}
361+
DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PRIVATE_KEY: ${{ secrets.DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PRIVATE_KEY }}
362+
DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PRIVATE_KEY_PASS: ${{ secrets.DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PRIVATE_KEY_PASS }}
339363
with:
340364
max_attempts: 3
341365
retry_on: error

.github/workflows/master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ jobs:
6767
workspaces: ./rust/cubesql -> target
6868
key: cubesql-x86_64-unknown-linux-gnu
6969
shared-key: cubesql-x86_64-unknown-linux-gnu
70-
- name: Install Node.js 20
70+
- name: Install Node.js 22
7171
uses: actions/setup-node@v4
7272
with:
73-
node-version: 20
73+
node-version: 22
7474
- name: Install Yarn
7575
run: npm install -g yarn
7676
- name: Set Yarn version

.github/workflows/post-release.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ on:
1616
branches:
1717
- 'master'
1818

19+
env:
20+
VERSION: ${{ github.event.inputs.version || 'latest' }}
21+
1922
# touch to trigger
2023
jobs:
2124
cli:
@@ -25,7 +28,7 @@ jobs:
2528
strategy:
2629
fail-fast: false
2730
matrix:
28-
node-version: [20.x]
31+
node-version: [22.x]
2932
steps:
3033
- name: Checkout
3134
uses: actions/checkout@v4
@@ -78,8 +81,8 @@ jobs:
7881
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
7982
run: |
8083
cd packages/cubejs-testing/
81-
npx cubejs-cli@${{ github.event.inputs.version }} create birdbox-test-project -d postgres
82-
export BIRDBOX_CUBEJS_VERSION=${{ github.event.inputs.version }}
84+
npx cubejs-cli@"$VERSION" create birdbox-test-project -d postgres
85+
export BIRDBOX_CUBEJS_VERSION="$VERSION"
8386
yarn run dataset:minimal
8487
yarn run birdbox:cli:postgresql
8588
- name: Slack Failure
@@ -103,10 +106,10 @@ jobs:
103106
steps:
104107
- name: Checkout
105108
uses: actions/checkout@v4
106-
- name: Install Node.js 20.x
109+
- name: Install Node.js 22.x
107110
uses: actions/setup-node@v4
108111
with:
109-
node-version: 20.x
112+
node-version: 22.x
110113
- name: Restore lerna
111114
uses: actions/cache@v4
112115
with:
@@ -139,7 +142,7 @@ jobs:
139142
run: |
140143
cd packages/cubejs-testing/
141144
export DEBUG=testcontainers
142-
export BIRDBOX_CUBEJS_VERSION=${{ github.event.inputs.version }}
145+
export BIRDBOX_CUBEJS_VERSION="$VERSION"
143146
yarn run dataset:minimal
144147
yarn run birdbox:${{ matrix.target }}
145148
- name: Slack Failure
@@ -167,10 +170,10 @@ jobs:
167170
steps:
168171
- name: Checkout
169172
uses: actions/checkout@v4
170-
- name: Install Node.js 20.x
173+
- name: Install Node.js 22.x
171174
uses: actions/setup-node@v4
172175
with:
173-
node-version: 20.x
176+
node-version: 22.x
174177
- name: Restore lerna
175178
uses: actions/cache@v4
176179
with:
@@ -204,7 +207,7 @@ jobs:
204207
cd packages/cubejs-testing/
205208
export DEBUG=testcontainers
206209
export BIRDBOX_CYPRESS_BROWSER=${{ matrix.browser }}
207-
export BIRDBOX_CUBEJS_VERSION=${{ github.event.inputs.version }}
210+
export BIRDBOX_CUBEJS_VERSION="$VERSION"
208211
yarn run cypress:install
209212
yarn run dataset:minimal
210213
yarn run cypress:birdbox

0 commit comments

Comments
 (0)