Skip to content

Commit b377c83

Browse files
committed
Merge remote-tracking branch 'upstream/main' into refactor_append
# Conflicts: # src/query/service/src/interpreters/interpreter_copy_into_table.rs # src/query/service/src/interpreters/interpreter_replace.rs # src/query/service/src/pipelines/builders/builder_copy_into_table.rs # src/query/sql/src/executor/physical_plans/physical_copy_into_table.rs # src/query/sql/src/planner/binder/copy_into_table.rs # src/query/sql/src/planner/plans/copy_into_table.rs # src/query/sql/src/planner/plans/insert.rs
2 parents 8224cc6 + 04df094 commit b377c83

File tree

1,586 files changed

+34669
-110327
lines changed

Some content is hidden

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

1,586 files changed

+34669
-110327
lines changed

.config/workspace-schema.json

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"$schema": "http://json-schema.org/draft-07/schema#",
3+
"type": "object",
4+
"properties": {
5+
"dependencies": {
6+
"type": "object",
7+
"additionalProperties": {
8+
"type": "object",
9+
"properties": {
10+
"workspace": {
11+
"type": "boolean",
12+
"enum": [
13+
true
14+
]
15+
}
16+
},
17+
"required": [
18+
"workspace"
19+
]
20+
}
21+
},
22+
"dev-dependencies": {
23+
"type": "object",
24+
"additionalProperties": {
25+
"type": "object",
26+
"properties": {
27+
"workspace": {
28+
"type": "boolean",
29+
"enum": [
30+
true
31+
]
32+
}
33+
},
34+
"required": [
35+
"workspace"
36+
]
37+
}
38+
},
39+
"build-dependencies": {
40+
"type": "object",
41+
"additionalProperties": {
42+
"type": "object",
43+
"properties": {
44+
"workspace": {
45+
"type": "boolean",
46+
"enum": [
47+
true
48+
]
49+
}
50+
},
51+
"required": [
52+
"workspace"
53+
]
54+
}
55+
}
56+
}
57+
}

.github/actions/build_linux/action.yml

Lines changed: 5 additions & 29 deletions
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
33+
bypass_env_vars: RUSTFLAGS,RUST_LOG,DATABEND_ENTERPRISE_LICENSE_PUBLIC_KEY
3434

3535
- name: Cross setup
3636
if: startsWith(inputs.target, 'aarch64-')
@@ -64,49 +64,25 @@ runs:
6464
target=${{ inputs.target }}
6565
echo "BUILD_ARCH=${target/-unknown-linux-*}" >> $GITHUB_ENV
6666
67-
# build all binaries for debug
68-
- name: Build Debug
69-
if: env.BUILD_PROFILE == 'debug' && inputs.artifacts == 'all'
70-
shell: bash
71-
run: |
72-
artifacts="meta,metactl,metabench,query,sqllogictests"
73-
for artifact in ${artifacts//,/ }; do
74-
echo "==> building databend-$artifact ..."
75-
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --features ${{ inputs.features }} --bin databend-$artifact
76-
done
77-
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --features ${{ inputs.features }}
78-
ls -lh ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-*
79-
80-
- name: Build Debug for specific artifacts
81-
if: env.BUILD_PROFILE == 'debug' && inputs.artifacts != 'all'
82-
shell: bash
83-
run: |
84-
artifacts="${{ inputs.artifacts }}"
85-
for artifact in ${artifacts//,/ }; do
86-
echo "==> building databend-$artifact ..."
87-
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --features ${{ inputs.features }} --bin databend-$artifact
88-
done
89-
ls -lh ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-$artifact
90-
9167
- name: Build Release
92-
if: env.BUILD_PROFILE == 'release' && inputs.artifacts == 'all'
68+
if: inputs.artifacts == 'all'
9369
shell: bash
9470
run: |
9571
artifacts="meta,metactl,metabench,query,sqllogictests"
9672
for artifact in ${artifacts//,/ }; do
9773
echo "==> building databend-$artifact ..."
98-
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --features ${{ inputs.features }} --release --bin databend-$artifact
74+
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --features ${{ inputs.features }} --profile ${{ env.BUILD_PROFILE }} --bin databend-$artifact
9975
done
10076
ls -lh ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-$artifact
10177
10278
- name: Build Release for specific artifacts
103-
if: env.BUILD_PROFILE == 'release' && inputs.artifacts != 'all'
79+
if: inputs.artifacts != 'all'
10480
shell: bash
10581
run: |
10682
artifacts="${{ inputs.artifacts }}"
10783
for artifact in ${artifacts//,/ }; do
10884
echo "==> building databend-$artifact ..."
109-
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --features ${{ inputs.features }} --release --bin databend-$artifact
85+
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --features ${{ inputs.features }} --profile ${{ env.BUILD_PROFILE }} --bin databend-$artifact
11086
done
11187
ls -lh ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-$artifact
11288

.github/actions/build_macos/action.yml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ runs:
3232
echo "JEMALLOC_SYS_WITH_LG_PAGE=14" >> $GITHUB_ENV
3333
echo "JEMALLOC_SYS_WITH_MALLOC_CONF=oversize_threshold:0,dirty_decay_ms:5000,muzzy_decay_ms:5000" >> $GITHUB_ENV
3434
35-
3635
- name: Setup build env
3736
shell: bash
3837
run: |
@@ -41,33 +40,15 @@ runs:
4140
echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
4241
echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
4342
44-
- name: Build Debug for all artifacts
45-
if: env.BUILD_PROFILE == 'debug' && inputs.artifacts == 'all'
46-
shell: bash
47-
run: cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }}
48-
49-
- name: Build Debug for specific artifacts
50-
if: env.BUILD_PROFILE == 'debug' && inputs.artifacts != 'all'
51-
shell: bash
52-
run: |
53-
artifacts="${{ inputs.artifacts }}"
54-
echo "==> building libs ..."
55-
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --lib
56-
for artifact in ${artifacts//,/ }; do
57-
echo "==> building databend-$artifact ..."
58-
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --bin databend-$artifact
59-
done
60-
61-
- name: Build Release
62-
if: env.BUILD_PROFILE == 'release'
43+
- name: Build
6344
shell: bash
6445
run: |
6546
artifacts="${{ inputs.artifacts }}"
6647
echo "==> building libs ..."
67-
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --release --lib
48+
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --profile ${{ env.BUILD_PROFILE }} --lib
6849
for artifact in ${artifacts//,/ }; do
6950
echo "==> building databend-$artifact ..."
70-
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --release --bin databend-$artifact
51+
cargo -Zgitoxide=fetch -Zgit=shallow-index,shallow-deps build --target ${{ inputs.target }} --profile ${{ env.BUILD_PROFILE }} --bin databend-$artifact
7152
done
7253
7354
- name: Upload artifact

.github/actions/check/action.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ runs:
3838

3939
- name: Check toml format
4040
shell: bash
41-
run: taplo fmt --check
41+
run: |
42+
taplo check
43+
taplo fmt --check
4244
4345
- name: Audit dependencies
4446
shell: bash

.github/actions/setup_license/action.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ inputs:
55
description: "Self-hosted runner provider, aws or gcp"
66
required: true
77
default: "aws"
8+
type:
9+
description: "License type, enterprise or trial"
10+
required: true
11+
default: "trial"
812

913
runs:
1014
using: "composite"
@@ -13,15 +17,15 @@ runs:
1317
if: inputs.runner_provider == 'aws'
1418
shell: bash
1519
run: |
16-
aws s3 cp s3://databend-ci/misc/license.key license.key
17-
aws s3 cp s3://databend-ci/misc/license.json license.json
20+
aws s3 cp s3://databend-ci/misc/license-${{ inputs.type }}.key license.key
21+
aws s3 cp s3://databend-ci/misc/license-${{ inputs.type }}.json license.json
1822
1923
- name: Get License from GCS
2024
if: inputs.runner_provider == 'gcp'
2125
shell: bash
2226
run: |
23-
gcloud storage cp gs://databend-ci/misc/license.key license.key
24-
gcloud storage cp gs://databend-ci/misc/license.json license.json
27+
gcloud storage cp gs://databend-ci/misc/license-${{ inputs.type }}.key license.key
28+
gcloud storage cp gs://databend-ci/misc/license-${{ inputs.type }}.json license.json
2529
2630
- name: Output License
2731
shell: bash

.github/scripts/bump_version.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ module.exports = async ({ github, context, core }) => {
3232
core.setFailed("Stable release must be triggered with a nightly tag");
3333
}
3434
} else {
35+
core.setOutput("sha", context.sha);
3536
if (TAG) {
3637
core.setOutput("tag", TAG);
37-
core.info(`Release create manually with tag ${TAG}`);
38+
core.info(`Release create manually with tag ${TAG} (${context.sha})`);
3839
} else {
3940
let releases = await github.rest.repos.listReleases({
4041
owner: context.repo.owner,
@@ -52,7 +53,6 @@ module.exports = async ({ github, context, core }) => {
5253
let patch = (parseInt(result[3]) + 1).toString();
5354
let next_tag = `v${major}.${minor}.${patch}-nightly`;
5455
core.setOutput("tag", next_tag);
55-
core.setOutput("sha", context.sha);
5656
core.info(`Nightly release ${next_tag} from ${tag} (${context.sha})`);
5757
}
5858
}

.github/workflows/bindings.python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ concurrency:
2222

2323
jobs:
2424
linux:
25-
runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 8c16g, aws]
25+
runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 4c16g, aws]
2626
strategy:
2727
matrix:
2828
include:

.github/workflows/cloud.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
4646
build:
4747
needs: info
48-
runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 16c32g, aws]
48+
runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 8c32g, aws]
4949
strategy:
5050
matrix:
5151
include:
@@ -59,6 +59,8 @@ jobs:
5959
- name: Build Release
6060
uses: ./.github/actions/build_linux
6161
timeout-minutes: 60
62+
env:
63+
DATABEND_ENTERPRISE_LICENSE_PUBLIC_KEY: ${{ secrets.DATABEND_ENTERPRISE_LICENSE_PUBLIC_KEY }}
6264
with:
6365
sha: ${{ needs.info.outputs.sha }}
6466
target: ${{ matrix.arch }}-unknown-linux-gnu
@@ -69,7 +71,7 @@ jobs:
6971
docker:
7072
needs: [info, build]
7173
timeout-minutes: 10
72-
runs-on: [self-hosted, X64, Linux, 4c8g, aws]
74+
runs-on: [self-hosted, X64, Linux, 2c8g, aws]
7375
outputs:
7476
tag: ${{ steps.prepare.outputs.tag }}
7577
steps:

.github/workflows/dev.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
fetch-depth: 0
2525
- name: Check Source File Changes
26-
uses: tj-actions/changed-files@v39
26+
uses: tj-actions/changed-files@v45
2727
id: src
2828
with:
2929
files_ignore: |
@@ -50,16 +50,17 @@ jobs:
5050
uses: ./.github/workflows/reuse.linux.yml
5151
secrets: inherit
5252
with:
53-
build_profile: debug
53+
build_profile: ci
5454
runner_provider: aws
55+
license_type: trial
5556

5657
linux_hive:
5758
needs: changes
5859
if: needs.changes.outputs.any_src_changed == 'true'
5960
uses: ./.github/workflows/reuse.linux.hive.yml
6061
secrets: inherit
6162
with:
62-
build_profile: debug
63+
build_profile: ci
6364
runner_provider: aws
6465

6566
ready:

.github/workflows/production.yml renamed to .github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
name: Production
1+
name: Main
22

33
on:
44
push:
55
branches:
66
- main
7-
merge_group:
87

98
jobs:
109
changes:
@@ -16,7 +15,7 @@ jobs:
1615
with:
1716
fetch-depth: 0
1817
- name: Check Source File Changes
19-
uses: tj-actions/changed-files@v39
18+
uses: tj-actions/changed-files@v45
2019
id: src
2120
with:
2221
files_ignore: |
@@ -45,6 +44,7 @@ jobs:
4544
with:
4645
build_profile: release
4746
runner_provider: aws
47+
license_type: enterprise
4848

4949
# macos:
5050
# needs: linux

0 commit comments

Comments
 (0)