Skip to content

Commit 645512c

Browse files
committed
Merge remote-tracking branch 'upstream/master' into feature/clickhouse_utf8_filter_order
2 parents 63b935c + 62ee0c1 commit 645512c

File tree

2,306 files changed

+341767
-142320
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,306 files changed

+341767
-142320
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
!rust/cubestore/bin
1212
!rust/cubesql/package.json
1313

14+
packages/cubejs-backend-native/target
1415
packages/*/node_modules/
1516
packages/*/dist/
1617
packages/*/coverage/

.github/actions/integration/clickhouse.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ set -eo pipefail
44
# Debug log for test containers
55
export DEBUG=testcontainers
66

7-
export TEST_CLICKHOUSE_VERSION=21.1.2
7+
export TEST_CLICKHOUSE_VERSION=23.11
88

99
echo "::group::Clickhouse ${TEST_CLICKHOUSE_VERSION}";
10-
docker pull yandex/clickhouse-server:${TEST_CLICKHOUSE_VERSION}
10+
docker pull clickhouse/clickhouse-server:${TEST_CLICKHOUSE_VERSION}
1111
yarn lerna run --concurrency 1 --stream --no-prefix integration:clickhouse
1212
echo "::endgroup::"
1313

14-
export TEST_CLICKHOUSE_VERSION=20.6
14+
export TEST_CLICKHOUSE_VERSION=22.8
1515

1616
echo "::group::Clickhouse ${TEST_CLICKHOUSE_VERSION}";
17-
docker pull yandex/clickhouse-server:${TEST_CLICKHOUSE_VERSION}
17+
docker pull clickhouse/clickhouse-server:${TEST_CLICKHOUSE_VERSION}
1818
yarn lerna run --concurrency 1 --stream --no-prefix integration:clickhouse
1919
echo "::endgroup::"
2020

21-
export TEST_CLICKHOUSE_VERSION=19
21+
export TEST_CLICKHOUSE_VERSION=21.8
2222

2323
echo "::group::Clickhouse ${TEST_CLICKHOUSE_VERSION}";
24-
docker pull yandex/clickhouse-server:${TEST_CLICKHOUSE_VERSION}
24+
docker pull clickhouse/clickhouse-server:${TEST_CLICKHOUSE_VERSION}
2525
yarn lerna run --concurrency 1 --stream --no-prefix integration:clickhouse
2626
echo "::endgroup::"

.github/actions/integration/druid.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export DEBUG=testcontainers
66

77
export TEST_POSTGRES_VERSION=13
88
export TEST_ZOOKEEPER_VERSION=3.5
9-
export TEST_DRUID_VERSION=0.19.0
9+
export TEST_DRUID_VERSION=27.0.0
1010

1111
echo "::group::Druid ${TEST_DRUID_VERSION}";
1212

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
set -eo pipefail
3+
4+
# Debug log for test containers
5+
export DEBUG=testcontainers
6+
7+
export TEST_MONGO_TAG=6.0
8+
export TEST_MONGOBI_VERSION=mongodb-bi-linux-x86_64-ubuntu2004-v2.14.8
9+
10+
echo "::group::MongoBI"
11+
yarn lerna run --concurrency 1 --stream --no-prefix integration:mongobi
12+
echo "::endgroup::"
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
set -eo pipefail
3+
4+
# Debug log for test containers
5+
export DEBUG=testcontainers
6+
7+
echo "::group::Snowflake [cloud]"
8+
export CUBEJS_DB_NAME=DEMO_DB
9+
export CUBEJS_DB_SNOWFLAKE_ACCOUNT=lxb31104
10+
export CUBEJS_DB_SNOWFLAKE_REGION=us-west-2
11+
export CUBEJS_DB_SNOWFLAKE_WAREHOUSE=COMPUTE_WH
12+
13+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:snowflake
14+
15+
echo "::endgroup::"

.github/actions/smoke.sh

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#!/bin/bash
2+
set -eo pipefail
3+
4+
# Debug log for test containers
5+
export DEBUG=testcontainers
6+
7+
echo "::group::Oracle"
8+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:oracle
9+
echo "::endgroup::"
10+
11+
echo "::group::DuckDB"
12+
# Should we create a separate job integration-duckdb? I believe not, because it works fast.
13+
yarn lerna run --concurrency 1 --stream --no-prefix integration:duckdb
14+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:duckdb
15+
echo "::endgroup::"
16+
17+
echo "::group::Postgres"
18+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:postgres
19+
echo "::endgroup::"
20+
21+
echo "::group::QuestDB"
22+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:questdb
23+
echo "::endgroup::"
24+
25+
echo "::group::Crate"
26+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:crate
27+
echo "::endgroup::"
28+
29+
echo "::group::Lambda"
30+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:lambda
31+
echo "::endgroup::"
32+
33+
echo "::group::Materialize"
34+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:materialize
35+
echo "::endgroup::"
36+
37+
echo "::group::Multidb"
38+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:multidb
39+
echo "::endgroup::"
40+
41+
#echo "::group::Prestodb"
42+
#docker rm -vf $(docker ps -aq)
43+
#docker rmi -f $(docker images -aq)
44+
#docker pull ahanaio/prestodb-sandbox:0.281
45+
#yarn lerna run --concurrency 1 --stream --no-prefix smoke:prestodb
46+
#echo "::endgroup::"
47+
48+
echo "::group::Trino"
49+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:trino
50+
echo "::endgroup::"
51+
52+
echo "::group::MS SQL"
53+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:mssql
54+
echo "::endgroup::"
55+
56+
echo "::group::MongoBI"
57+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:mongobi
58+
echo "::endgroup::"

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,10 @@ updates:
44
directory: "/packages"
55
schedule:
66
interval: "weekly"
7+
- package-ecosystem: "npm"
8+
directory: "/examples"
9+
schedule:
10+
interval: "monthly"
11+
labels: [ ]
12+
ignore:
13+
- dependency-name: "*"

.github/label-actions.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"help wanted":
22
comment: |
3-
If you are interested in working on this issue, please leave a comment below and we will be happy to assign the issue to you.
4-
If this is the first time you are contributing a Pull Request to Cube.js, please check our [contribution guidelines](https://github.com/cube-js/cube.js/blob/master/CONTRIBUTING.md).
5-
You can also post any questions while contributing in the #contributors channel in the [Cube.js Slack](https://slack.cube.dev/).
3+
If you are interested in working on this issue, please go ahead and provide PR for that.
4+
We'd be happy to review it and merge it.
5+
If this is the first time you are contributing a Pull Request to Cube, please check our [contribution guidelines](https://github.com/cube-js/cube/blob/master/CONTRIBUTING.md).
6+
You can also post any questions while contributing in the #contributors channel in the [Cube Slack](https://slack.cube.dev/).

.github/workflows/birdbox.yml

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,14 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
os: [ubuntu-20.04, ubuntu-18.04, macos-11, windows-2019]
28-
node-version: [14.x]
28+
node-version: [18.x]
2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232
- name: Disable rustup update (issue workaround for Windows)
3333
run: rustup set auto-self-update disable
3434
if: contains(runner.os, 'windows')
3535
shell: bash
36-
- name: Install Rust
37-
uses: actions-rs/toolchain@v1
38-
with:
39-
toolchain: nightly-2022-06-22
40-
override: true
41-
components: rustfmt
4236
- name: Install Node.js ${{ matrix.node-version }}
4337
uses: actions/setup-node@v3
4438
with:
@@ -52,11 +46,11 @@ jobs:
5246
node_modules
5347
rust/cubestore/node_modules
5448
packages/*/node_modules
55-
key: ${{ runner.os }}-workspace-main-14.x-${{ hashFiles('**/yarn.lock') }}
49+
key: ${{ runner.os }}-workspace-main-18.x-${{ hashFiles('**/yarn.lock') }}
5650
restore-keys: |
57-
${{ runner.os }}-workspace-main-14.x-
51+
${{ runner.os }}-workspace-main-18.x-
5852
- name: Set Yarn version
59-
run: yarn policies set-version v1.22.5
53+
run: yarn policies set-version v1.22.19
6054
- name: Yarn install
6155
uses: nick-invision/retry@v2
6256
env:
@@ -77,7 +71,7 @@ jobs:
7771
run: |
7872
cd packages/cubejs-testing/
7973
npx cubejs-cli@${{ github.event.inputs.version }} create birdbox-test-project -d postgres
80-
export BIRDBOX_CUBEJS_VERSION=${{ github.event.inputs.version }}${{ matrix.node-arch }}
74+
export BIRDBOX_CUBEJS_VERSION=${{ github.event.inputs.version }}
8175
yarn run dataset:minimal
8276
yarn run birdbox:cli:postgresql
8377
- name: Slack Failure
@@ -97,20 +91,13 @@ jobs:
9791
fail-fast: false
9892
matrix:
9993
target: ['postgresql', 'postgresql-cubestore', 'postgresql-pre-aggregations']
100-
arch: ['', '-alpine']
10194
steps:
10295
- name: Checkout
103-
uses: actions/checkout@v3
104-
- name: Install Rust
105-
uses: actions-rs/toolchain@v1
106-
with:
107-
toolchain: nightly-2022-06-22
108-
override: true
109-
components: rustfmt
110-
- name: Install Node.js 14.x
96+
uses: actions/checkout@v4
97+
- name: Install Node.js 18.x
11198
uses: actions/setup-node@v3
11299
with:
113-
node-version: 14.x
100+
node-version: 18.x
114101
- name: Restore lerna
115102
uses: actions/cache@v3
116103
with:
@@ -120,11 +107,11 @@ jobs:
120107
node_modules
121108
rust/cubestore/node_modules
122109
packages/*/node_modules
123-
key: ${{ runner.os }}-workspace-main-14.x-${{ hashFiles('**/yarn.lock') }}
110+
key: ${{ runner.os }}-workspace-main-18.x-${{ hashFiles('**/yarn.lock') }}
124111
restore-keys: |
125-
${{ runner.os }}-workspace-main-14.x-
112+
${{ runner.os }}-workspace-main-18.x-
126113
- name: Set Yarn version
127-
run: yarn policies set-version v1.22.5
114+
run: yarn policies set-version v1.22.19
128115
- name: Yarn install
129116
uses: nick-invision/retry@v2
130117
env:
@@ -143,7 +130,7 @@ jobs:
143130
run: |
144131
cd packages/cubejs-testing/
145132
export DEBUG=testcontainers
146-
export BIRDBOX_CUBEJS_VERSION=${{ github.event.inputs.version }}${{ matrix.node-arch }}
133+
export BIRDBOX_CUBEJS_VERSION=${{ github.event.inputs.version }}
147134
yarn run dataset:minimal
148135
yarn run birdbox:${{ matrix.target }}
149136
- name: Slack Failure
@@ -169,17 +156,11 @@ jobs:
169156
container: cypress/browsers:node12.18.3-chrome89-ff86
170157
steps:
171158
- name: Checkout
172-
uses: actions/checkout@v3
173-
- name: Install Rust
174-
uses: actions-rs/toolchain@v1
175-
with:
176-
toolchain: nightly-2022-06-22
177-
override: true
178-
components: rustfmt
179-
- name: Install Node.js 14.x
159+
uses: actions/checkout@v4
160+
- name: Install Node.js 18.x
180161
uses: actions/setup-node@v3
181162
with:
182-
node-version: 14.x
163+
node-version: 18.x
183164
- name: Restore lerna
184165
uses: actions/cache@v3
185166
with:
@@ -189,11 +170,11 @@ jobs:
189170
node_modules
190171
rust/cubestore/node_modules
191172
packages/*/node_modules
192-
key: ${{ runner.os }}-workspace-main-14.x-${{ hashFiles('**/yarn.lock') }}
173+
key: ${{ runner.os }}-workspace-main-18.x-${{ hashFiles('**/yarn.lock') }}
193174
restore-keys: |
194-
${{ runner.os }}-workspace-main-14.x-
175+
${{ runner.os }}-workspace-main-18.x-
195176
- name: Set Yarn version
196-
run: yarn policies set-version v1.22.5
177+
run: yarn policies set-version v1.22.19
197178
- name: Yarn install
198179
uses: nick-invision/retry@v2
199180
env:

0 commit comments

Comments
 (0)