Skip to content

Commit 8700a02

Browse files
authored
Merge branch 'main' into refactor-optimize-exprbloomFilter
2 parents 4be8de3 + 2496067 commit 8700a02

File tree

2,068 files changed

+106303
-42692
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,068 files changed

+106303
-42692
lines changed

.config/version-schema.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"$schema": "http://json-schema.org/draft-07/schema#",
3+
"type": "object",
4+
"properties": {
5+
"dependencies": {
6+
"type": "object",
7+
"properties": {
8+
"databend-common-version": false
9+
}
10+
}
11+
}
12+
}

.github/actions/build_linux/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ runs:
3030
uses: ./.github/actions/setup_build_tool
3131
with:
3232
target: ${{ inputs.target }}
33-
bypass_env_vars: RUSTFLAGS,RUST_LOG,DATABEND_ENTERPRISE_LICENSE_PUBLIC_KEY
33+
bypass_env_vars: RUSTFLAGS,RUST_LOG,DATABEND_RELEASE_VERSION,DATABEND_ENTERPRISE_LICENSE_PUBLIC_KEY,DATABEND_ENTERPRISE_LICENSE_EMBEDDED,DATABEND_TELEMETRY_ENDPOINT,DATABEND_TELEMETRY_API_KEY
3434

3535
- name: Cross setup
3636
if: startsWith(inputs.target, 'aarch64-')

.github/actions/pack_binaries/action.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inputs:
55
description: "Release target"
66
required: true
77
category:
8-
description: "Release default/hdfs/udf/testsuite/dbg"
8+
description: "Release default/hdfs/udf/testsuite"
99
required: false
1010
default: default
1111
version:
@@ -15,17 +15,7 @@ inputs:
1515
runs:
1616
using: "composite"
1717
steps:
18-
- name: Download artifact for dbg
19-
if: inputs.category == 'dbg'
20-
uses: ./.github/actions/artifact_download
21-
with:
22-
sha: ${{ github.sha }}
23-
target: ${{ inputs.target }}
24-
category: default
25-
path: distro/bin
26-
artifacts: metactl,meta,query,query.debug,bendsave
2718
- name: Download artifact for others
28-
if: inputs.category != 'dbg'
2919
uses: ./.github/actions/artifact_download
3020
with:
3121
sha: ${{ github.sha }}

.github/actions/publish_binary/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
default)
2424
publish_name="databend-${{ inputs.version }}-${{ inputs.target }}"
2525
;;
26-
hdfs|udf|testsuite|dbg)
26+
hdfs|udf|testsuite)
2727
publish_name="databend-${{ inputs.category }}-${{ inputs.version }}-${{ inputs.target }}"
2828
;;
2929
*)
@@ -41,6 +41,7 @@ runs:
4141
4242
- name: Sync normal release to R2
4343
shell: bash
44+
continue-on-error: true
4445
if: inputs.category == 'default'
4546
run: |
4647
aws s3 cp ${{ steps.name.outputs.name }}.tar.gz s3://repo/databend/${{ inputs.version }}/${{ steps.name.outputs.name }}.tar.gz --no-progress --checksum-algorithm=CRC32

.github/actions/publish_deb/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ runs:
5656
5757
- name: Publish to S3
5858
shell: bash
59+
continue-on-error: true
5960
working-directory: scripts/distribution/deb
6061
run: |
6162
aws s3 sync dists s3://repo/deb/dists --delete --no-progress --checksum-algorithm=CRC32

.github/actions/setup_build_tool/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ runs:
3434
export TARGET=${{ inputs.target }}
3535
export CARGO_INCREMENTAL=0
3636
export CARGO_TERM_COLOR=always
37-
export BYPASS_ENV_VARS=${{ inputs.bypass_env_vars }},CARGO_INCREMENTAL,CARGO_TERM_COLOR,BUILD_PROFILE,JEMALLOC_SYS_WITH_LG_PAGE,DATABEND_RELEASE_VERSION
37+
export BYPASS_ENV_VARS=${{ inputs.bypass_env_vars }},CARGO_INCREMENTAL,CARGO_TERM_COLOR,BUILD_PROFILE,JEMALLOC_SYS_WITH_LG_PAGE
3838
EOF
3939
4040
RUNNER_PROVIDER="${RUNNER_PROVIDER:-github}"

.github/actions/setup_test/action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ inputs:
55
description: "default to ./target/${BUILD_PROFILE}/"
66
required: false
77
default: ""
8+
category:
9+
description: "Category to download, only works with s3/gcs"
10+
required: false
11+
default: "full"
812
artifacts:
913
description: "Artifacts to download, only works with s3/gcs"
1014
required: false
@@ -25,7 +29,7 @@ runs:
2529
with:
2630
sha: ${{ github.sha }}
2731
target: ${{ steps.target.outputs.target }}
28-
category: full
32+
category: ${{ inputs.category }}
2933
artifacts: ${{ inputs.artifacts }}
3034
path: ${{ inputs.path }}
3135

.github/actions/test_compat_fuse/action.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ runs:
1313
run: |
1414
bash ./tests/compat_fuse/test_compat_fuse.sh --writer-version 1.2.46 --reader-version current --meta-versions 1.2.527 1.2.677 --logictest-path base
1515
bash ./tests/compat_fuse/test_compat_fuse.sh --writer-version 1.2.241 --reader-version current --meta-versions 1.2.527 1.2.677 --logictest-path revoke
16-
bash ./tests/compat_fuse/test_compat_fuse.sh --writer-version 1.2.306 --reader-version current --meta-versions 1.2.527 1.2.677 --logictest-path rbac
17-
bash ./tests/compat_fuse/test_compat_fuse.sh --writer-version 1.2.307 --reader-version current --meta-versions 1.2.527 1.2.677 --logictest-path rbac
16+
bash ./tests/compat_fuse/test_compat_fuse.sh --writer-version 1.2.311 --reader-version current --meta-versions 1.2.527 1.2.677 --logictest-path rbac
1817
bash ./tests/compat_fuse/test_compat_fuse.sh --writer-version 1.2.318 --reader-version current --meta-versions 1.2.527 1.2.677 --logictest-path rbac
1918
bash ./tests/compat_fuse/test_compat_fuse.sh --writer-version 1.2.680 --reader-version current --meta-versions 1.2.527 1.2.680 --logictest-path udf
2019
21-
bash ./tests/compat_fuse/test_compat_fuse.sh --writer-version current --reader-version 1.2.307 --meta-versions 1.2.677 --logictest-path rbac
20+
bash ./tests/compat_fuse/test_compat_fuse.sh --writer-version current --reader-version 1.2.311 --meta-versions 1.2.677 --logictest-path rbac
2221
bash ./tests/compat_fuse/test_compat_fuse.sh --writer-version current --reader-version 1.2.318 --meta-versions 1.2.677 --logictest-path rbac
2322
bash ./tests/compat_fuse/test_compat_fuse.sh --writer-version current --reader-version 1.2.680 --meta-versions 1.2.680 --logictest-path udf
2423
- name: Upload failure

.github/actions/test_compat_meta_meta/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ runs:
1313
# test-*.sh <leader-meta-ver> <follower-meta-ver>
1414
# 1.2.288 is the first version after 1.2.212 that has built a binary.
1515
run: |
16-
bash ./tests/compat/meta_meta/test_meta_meta.sh 1.2.288 current
17-
bash ./tests/compat/meta_meta/test_meta_meta.sh current 1.2.288
16+
bash ./tests/compat/meta_meta/test_meta_meta.sh 1.2.547 current
17+
bash ./tests/compat/meta_meta/test_meta_meta.sh current 1.2.547
1818
1919
- name: Upload failure
2020
if: failure()

.github/actions/test_logs/action.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,41 @@ runs:
55
steps:
66
- uses: ./.github/actions/setup_test
77

8+
- name: Install lsof
9+
shell: bash
10+
run: sudo apt-get update -yq && sudo apt-get install -yq lsof
11+
12+
- name: Minio Setup for (ubuntu-latest only)
13+
shell: bash
14+
run: |
15+
docker run -d --network host --name minio \
16+
-e "MINIO_ACCESS_KEY=minioadmin" \
17+
-e "MINIO_SECRET_KEY=minioadmin" \
18+
-e "MINIO_ADDRESS=:9900" \
19+
-v /tmp/data:/data \
20+
-v /tmp/config:/root/.minio \
21+
minio/minio server /data
22+
23+
export AWS_ACCESS_KEY_ID=minioadmin
24+
export AWS_SECRET_ACCESS_KEY=minioadmin
25+
export AWS_EC2_METADATA_DISABLED=true
26+
27+
aws --endpoint-url http://127.0.0.1:9900/ s3 mb s3://testbucket
28+
aws --endpoint-url http://127.0.0.1:9900/ s3 cp tests/data s3://testbucket/data --recursive --no-progress
29+
830
- name: Run logging Tests
931
shell: bash
1032
run: |
1133
bash ./tests/logging/test-logs.sh
1234
35+
- name: Run History Tables Tests
36+
env:
37+
LOG_HISTORY_STORAGE_S3_ACCESS_KEY_ID: 'minioadmin'
38+
LOG_HISTORY_STORAGE_S3_SECRET_ACCESS_KEY: 'minioadmin'
39+
shell: bash
40+
run: |
41+
bash ./tests/logging/test-history-tables.sh
42+
1343
- name: Upload failure
1444
if: failure()
1545
uses: ./.github/actions/artifact_failure

0 commit comments

Comments
 (0)