Skip to content

Commit 8eab2aa

Browse files
authored
Merge branch 'main' into system-table-docs
2 parents 959bc86 + 9102b14 commit 8eab2aa

File tree

322 files changed

+10489
-3960
lines changed

Some content is hidden

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

322 files changed

+10489
-3960
lines changed

.github/actions/benchmark_cloud/action.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ inputs:
3838
runs:
3939
using: "composite"
4040
steps:
41-
- uses: ./.github/actions/setup_bendsql
42-
4341
- name: Install script dependencies
4442
shell: bash
4543
run: |
@@ -53,10 +51,12 @@ runs:
5351
BENCHMARK_DATASET: ${{ inputs.dataset }}
5452
BENCHMARK_SIZE: ${{ inputs.size }}
5553
BENCHMARK_IMAGE_TAG: ${{ inputs.image_tag }}
54+
BENCHMARK_DATABASE: clickbench
5655
CLOUD_EMAIL: ${{ inputs.cloud_email }}
5756
CLOUD_PASSWORD: ${{ inputs.cloud_password }}
5857
CLOUD_ORG: ${{ inputs.cloud_org }}
5958
CLOUD_ENDPOINT: ${{ inputs.cloud_endpoint }}
59+
CLOUD_WAREHOUSE: benchmark-${{ inputs.run_id }}
6060
shell: bash
6161
run: |
6262
./benchmark_cloud.sh
@@ -93,13 +93,20 @@ runs:
9393
exit 1
9494
esac
9595
jq ".cluster_size = \"${BENCHMARK_CLUSTER_SIZE}\"" <result.json >result.json.tmp && mv result.json.tmp result.json
96-
jq ".machine = \"${{ inputs.size }}\"" <result.json >result.json.tmp && mv result.json.tmp result.json
97-
jq ".tags = [\"${BENCHMARK_TYPE}\", \"serverless\"]" <result.json >result.json.tmp && mv result.json.tmp result.json
96+
jq ".machine = \"${BENCHMARK_CLUSTER_SIZE}×${{ inputs.size }}\"" <result.json >result.json.tmp && mv result.json.tmp result.json
97+
jq ".tags = [\"${BENCHMARK_TYPE}\", \"s3\"]" <result.json >result.json.tmp && mv result.json.tmp result.json
9898
jq ".comment = \"commit:${{ inputs.sha }}\"" <result.json >result.json.tmp && mv result.json.tmp result.json
99-
mv result.json result-${{ inputs.dataset }}-cloud.json
99+
mv result.json result-${{ inputs.dataset }}-cloud-${{ inputs.size }}.json
100100
101101
- name: Upload artifact
102102
uses: actions/upload-artifact@v3
103103
with:
104104
name: benchmark-${{ inputs.dataset }}-cloud-${{ inputs.size }}
105105
path: benchmark/clickbench/result-${{ inputs.dataset }}-cloud-${{ inputs.size }}.json
106+
107+
- name: Remove warehouse
108+
if: always()
109+
continue-on-error: true
110+
shell: bash
111+
run: |
112+
bendsql cloud warehouse delete benchmark-${{ inputs.run_id }}

.github/actions/benchmark_local/action.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ inputs:
1919
runs:
2020
using: "composite"
2121
steps:
22-
- uses: ./.github/actions/setup_bendsql
23-
2422
- name: Install script dependencies
2523
shell: bash
2624
run: |
@@ -55,7 +53,7 @@ runs:
5553
esac
5654
jq ".system = \"${BENCHMARK_SYSTEM}\"" <result.json >result.json.tmp && mv result.json.tmp result.json
5755
jq ".date = \"$(date -u +%Y-%m-%d)\"" <result.json >result.json.tmp && mv result.json.tmp result.json
58-
jq ".machine = \"c5.4xlarge,gp3\"" <result.json >result.json.tmp && mv result.json.tmp result.json
56+
jq ".machine = \"c5.4xlarge\"" <result.json >result.json.tmp && mv result.json.tmp result.json
5957
jq ".cluster_size = 1" <result.json >result.json.tmp && mv result.json.tmp result.json
6058
jq ".comment = \"commit:${{ inputs.sha }}\"" <result.json >result.json.tmp && mv result.json.tmp result.json
6159
jq ".tags = [\"${BENCHMARK_TYPE}\", \"gp3\"]" <result.json >result.json.tmp && mv result.json.tmp result.json
@@ -71,6 +69,7 @@ runs:
7169
- name: Clean test data
7270
working-directory: benchmark/clickbench
7371
if: always()
72+
continue-on-error: true
7473
shell: bash
7574
run: |
7675
bendsql query <"${{ inputs.dataset }}/clear.sql"
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: "Create Check Status"
2+
description: "Create check status on github commit"
3+
inputs:
4+
github_token:
5+
description: "Github Token"
6+
required: true
7+
sha:
8+
description: "commit sha"
9+
required: true
10+
name:
11+
description: "check name"
12+
required: true
13+
status:
14+
description: "check status, Default: queued, Can be one of: queued, in_progress, completed"
15+
required: true
16+
conclusion:
17+
description: "check conclusion, Can be one of: action_required, cancelled, failure, neutral, success, skipped, stale, timed_out"
18+
required: false
19+
run_id:
20+
description: "external id to associate with the check run"
21+
required: false
22+
title:
23+
description: "check title"
24+
required: true
25+
summary:
26+
description: "check summary"
27+
required: true
28+
29+
runs:
30+
using: "composite"
31+
steps:
32+
# Docs: https://docs.github.com/en/rest/checks/runs#create-a-check-run
33+
# Rest: https://octokit.github.io/rest.js/v18#checks-create
34+
- name: Create a check run
35+
uses: actions/github-script@v6
36+
env:
37+
param_sha: ${{ inputs.sha }}
38+
param_name: ${{ inputs.name }}
39+
param_status: ${{ inputs.status }}
40+
param_conclusion: ${{ inputs.conclusion }}
41+
param_run_id: ${{ inputs.run_id }}
42+
param_title: ${{ inputs.title }}
43+
param_summary: ${{ inputs.summary }}
44+
param_url: https://github.com/datafuselabs/databend/actions/runs/${{ github.run_id }}
45+
with:
46+
github-token: ${{ inputs.github_token }}
47+
script: |
48+
let summary = `${process.env.param_summary}
49+
[View Details](https://github.com/datafuselabs/databend/actions/runs/${context.runId})`;
50+
let data = {
51+
owner: context.repo.owner,
52+
repo: context.repo.repo,
53+
head_sha: process.env.param_sha,
54+
name: process.env.param_name,
55+
status: process.env.param_status,
56+
details_url: process.env.param_url,
57+
output: {
58+
title: process.env.param_title,
59+
summary: summary,
60+
},
61+
};
62+
if (process.env.param_status === 'completed') {
63+
data.conclusion = process.env.param_conclusion;
64+
}
65+
if (process.env.param_run_id) {
66+
data.external_id = process.env.param_run_id;
67+
}
68+
await github.rest.checks.create(data);

.github/actions/publish_binary/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ runs:
3737
GH_TOKEN: ${{ inputs.github_token }}
3838

3939
- name: Configure AWS credentials
40-
uses: aws-actions/configure-aws-credentials@v1
40+
uses: aws-actions/configure-aws-credentials@v2
4141
with:
4242
role-duration-seconds: 900
4343
role-to-assume: ${{ inputs.repo_role_arn }}
@@ -47,7 +47,7 @@ runs:
4747
shell: bash
4848
if: inputs.mode == 'normal'
4949
run: |
50-
aws s3 cp databend-${{ inputs.version }}-${{ inputs.target }}.tar.gz s3://repo.databend.rs/databend/${{ inputs.version }}/databend-${{ inputs.version }}-${{ inputs.target }}.tar.gz
50+
aws s3 cp databend-${{ inputs.version }}-${{ inputs.target }}.tar.gz s3://repo.databend.rs/databend/${{ inputs.version }}/databend-${{ inputs.version }}-${{ inputs.target }}.tar.gz --no-progress
5151
curl --retry 3 -fsSLo tags.json \
5252
--header 'content-type: application/json' \
5353
--header 'authorization: Bearer ${{ inputs.github_token }}' \
@@ -65,7 +65,7 @@ runs:
6565
shell: bash
6666
if: inputs.mode == 'hive'
6767
run: |
68-
aws s3 cp databend-hive-${{ inputs.version }}-${{ inputs.target }}.tar.gz s3://repo.databend.rs/databend/${{ inputs.version }}/databend-hive-${{ inputs.version }}-${{ inputs.target }}.tar.gz
68+
aws s3 cp databend-hive-${{ inputs.version }}-${{ inputs.target }}.tar.gz s3://repo.databend.rs/databend/${{ inputs.version }}/databend-hive-${{ inputs.version }}-${{ inputs.target }}.tar.gz --no-progress
6969
curl --retry 3 -fsSLo tags.json \
7070
--header 'content-type: application/json' \
7171
--header 'authorization: Bearer ${{ inputs.github_token }}' \

.github/actions/publish_deb/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ runs:
4141
reprepro includedeb stable databend_${deb_version}_arm64.deb
4242
4343
- name: Configure AWS credentials
44-
uses: aws-actions/configure-aws-credentials@v1
44+
uses: aws-actions/configure-aws-credentials@v2
4545
with:
4646
role-duration-seconds: 900
4747
role-to-assume: ${{ inputs.repo_role_arn }}

.github/actions/setup_bendsql/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
version:
55
description: "bendsql version"
66
required: false
7-
default: v0.3.5
7+
default: v0.3.8
88
runs:
99
using: "composite"
1010
steps:

.github/actions/setup_docker/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ runs:
2525
using: "composite"
2626
steps:
2727
- name: Set up Docker Buildx
28-
uses: docker/setup-buildx-action@v1
28+
uses: docker/setup-buildx-action@v2
2929

3030
- name: Configure AWS Credentials
3131
if: inputs.ecr_role_arn
32-
uses: aws-actions/configure-aws-credentials@v1
32+
uses: aws-actions/configure-aws-credentials@v2
3333
with:
3434
role-to-assume: ${{ inputs.ecr_role_arn }}
3535
role-duration-seconds: 900
@@ -43,7 +43,7 @@ runs:
4343
4444
- name: Login to DockerHub
4545
if: inputs.dockerhub_token
46-
uses: docker/login-action@v1
46+
uses: docker/login-action@v2
4747
with:
4848
username: ${{ inputs.dockerhub_user }}
4949
password: ${{ inputs.dockerhub_token }}

.github/workflows/benchmark.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
jq ".sha = \"${{ github.sha }}\"" <metadata.json >metadata.json.tmp && mv metadata.json.tmp metadata.json
4545
jq ".run_id = \"${{ github.run_id }}\"" <metadata.json >metadata.json.tmp && mv metadata.json.tmp metadata.json
4646
jq ".pr_id = \"${{ github.event.pull_request.number }}\"" <metadata.json >metadata.json.tmp && mv metadata.json.tmp metadata.json
47+
jq ".head_sha = \"${{ github.event.pull_request.head.sha }}\"" <metadata.json >metadata.json.tmp && mv metadata.json.tmp metadata.json
4748
- name: Upload artifact
4849
uses: actions/upload-artifact@v3
4950
with:

.github/workflows/dev-linux.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
- "docker/**"
1212
- "scripts/setup/**"
1313
- ".devcontainer/**"
14+
merge_group:
15+
types:
16+
- checks_requested
1417

1518
concurrency:
1619
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}

.github/workflows/dev-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@ jobs:
6565
# runs-on: macos-11
6666
# needs: build_macos
6767
# steps:
68-
# - uses: actions/checkout@v2
68+
# - uses: actions/checkout@v3
6969
# - uses: ./.github/actions/test_sqllogic_standalone_macos

0 commit comments

Comments
 (0)