Skip to content

Commit 4c15a99

Browse files
committed
Merge remote-tracking branch 'root/main' into feat_refactor_tag
2 parents 0d93b15 + f7f1afc commit 4c15a99

211 files changed

Lines changed: 15853 additions & 3604 deletions

File tree

Some content is hidden

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

.github/actions/test_sqllogic_stage/action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ inputs:
1717
description: "path type for dedup when copy, choices: full_path,sub_path"
1818
required: true
1919
default: ""
20+
size:
21+
description: "stage parquet read size mode, choices: small,large"
22+
required: true
23+
default: ""
2024
runs:
2125
using: "composite"
2226
steps:
@@ -34,4 +38,5 @@ runs:
3438
TEST_HANDLERS: ${{ inputs.handlers }}
3539
TEST_STAGE_STORAGE: ${{ inputs.storage }}
3640
TEST_STAGE_DEDUP: ${{ inputs.dedup}}
41+
TEST_STAGE_SIZE: ${{ inputs.size }}
3742
run: bash ./scripts/ci/ci-run-sqllogic-tests-without-sandbox.sh ${{ inputs.dirs }}

.github/actions/test_stateful_iceberg_catalogs_standalone/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ runs:
1010
run: |
1111
DOCKER_DEFAULT_PLATFORM=`docker info --format {{.OSType}}/{{.Architecture}}`
1212
docker-compose -f "./docker/it-iceberg-catalogs/docker-compose.yaml" up --quiet-pull -d
13-
hms_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aq --filter "name=hive-metastore"))
13+
# hms_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aq --filter "name=hive-metastore"))
1414
1515
docker ps -a | grep iceberg
16-
echo "HMS in $hms_ip"
16+
# echo "HMS in $hms_ip"
1717
1818
- name: Run Stateful Tests with Standalone mode
1919
shell: bash

.github/workflows/release.yml

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,29 @@ jobs:
6565
script: |
6666
const script = require('./.github/scripts/bump_version.js')
6767
await script({ github, context, core })
68+
- name: Generate release notes
69+
id: notes
70+
uses: actions/github-script@v7
71+
with:
72+
script: |
73+
const tag = '${{ steps.bump.outputs.tag }}';
74+
const previous = '${{ steps.bump.outputs.previous }}';
75+
const sha = '${{ steps.bump.outputs.sha }}';
76+
const { data } = await github.rest.repos.generateReleaseNotes({
77+
owner: context.repo.owner,
78+
repo: context.repo.repo,
79+
tag_name: tag,
80+
target_commitish: sha,
81+
previous_tag_name: previous,
82+
});
83+
const MAX_LEN = 124000;
84+
let body = data.body;
85+
if (body.length > MAX_LEN) {
86+
core.warning(`Release notes too long (${body.length} chars), truncating to ${MAX_LEN}`);
87+
body = body.substring(0, MAX_LEN) + '\n\n> **Note**: changelog truncated due to GitHub size limits. See commit history for full details.';
88+
}
89+
const fs = require('fs');
90+
fs.writeFileSync('/tmp/release_notes.md', body);
6891
- name: Create release
6992
env:
7093
# we need workflow:write permission to create release if there were any workflow changes
@@ -73,13 +96,13 @@ jobs:
7396
run: |
7497
case "${{ steps.bump.outputs.type }}" in
7598
nightly)
76-
gh release create ${{ steps.bump.outputs.tag }} --target ${{ steps.bump.outputs.sha }} --generate-notes --notes-start-tag ${{ steps.bump.outputs.previous }} --prerelease --draft
99+
gh release create ${{ steps.bump.outputs.tag }} --target ${{ steps.bump.outputs.sha }} --notes-file /tmp/release_notes.md --prerelease --draft
77100
;;
78101
stable)
79-
gh release create ${{ steps.bump.outputs.tag }} --target ${{ steps.bump.outputs.sha }} --generate-notes --notes-start-tag ${{ steps.bump.outputs.previous }} --latest --draft
102+
gh release create ${{ steps.bump.outputs.tag }} --target ${{ steps.bump.outputs.sha }} --notes-file /tmp/release_notes.md --latest --draft
80103
;;
81104
patch)
82-
gh release create ${{ steps.bump.outputs.tag }} --target ${{ steps.bump.outputs.sha }} --generate-notes --notes-start-tag ${{ steps.bump.outputs.previous }} --prerelease --draft
105+
gh release create ${{ steps.bump.outputs.tag }} --target ${{ steps.bump.outputs.sha }} --notes-file /tmp/release_notes.md --prerelease --draft
83106
;;
84107
*)
85108
echo "Invalid release type: ${{ steps.bump.outputs.type }}"
@@ -96,6 +119,11 @@ jobs:
96119
with:
97120
repository: databendlabs/databend-docs
98121
ref: main
122+
- name: Checkout Scripts
123+
uses: actions/checkout@v4
124+
with:
125+
sparse-checkout: .github/scripts
126+
path: databend
99127
- name: Get date
100128
id: date
101129
shell: bash
@@ -107,8 +135,10 @@ jobs:
107135
DATE: ${{ steps.date.outputs.DATE }}
108136
with:
109137
script: |
110-
const script = require('./.github/scripts/generate_release_note.js')
138+
const script = require('./databend/.github/scripts/generate_release_note.js')
111139
await script({ github, context, core })
140+
- name: Clean up temporary checkout
141+
run: rm -rf databend
112142
- name: Add Release Note
113143
run: |
114144
git add docs/release-stable

.github/workflows/reuse.sqllogic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ jobs:
323323
dirs: stage
324324
handlers: ${{ matrix.handler }}
325325
dedup: ${{ matrix.dedup }}
326+
size: ${{ matrix.size }}
326327
- name: Upload failure
327328
if: failure()
328329
uses: ./.github/actions/artifact_failure

Cargo.lock

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ default-members = [
6464
# Workspace dependencies
6565
[workspace.dependencies]
6666
databend-common-ast = { path = "src/query/ast" }
67+
databend-common-ast-visit-derive = { path = "src/query/ast/visit_derive" }
6768
databend-common-base = { path = "src/common/base" }
6869
databend-common-binaries = { path = "src/binaries" }
6970
databend-common-building = { path = "src/common/building" }
@@ -293,6 +294,8 @@ hyper = "1"
293294
hyper-util = { version = "0.1.9", features = ["client", "client-legacy", "tokio", "service"] }
294295
lru = "0.12"
295296
perf-event2 = "0.7.4"
297+
proc-macro2 = "1.0"
298+
quote = "1.0"
296299

297300
## in branch dev
298301
iceberg = { version = "0.8.0", git = "https://github.com/databendlabs/iceberg-rust", rev = "6ccaa60e", features = [
@@ -464,6 +467,7 @@ strength_reduce = "0.2.4"
464467
stringslice = "0.2.0"
465468
strum = "0.24.1"
466469
sub-cache = "0.2.1"
470+
syn = { version = "2.0", features = ["full"] }
467471
sys-info = "0.9"
468472
sysinfo = "0.34.2"
469473
tantivy = "0.26.0"

docker/it-iceberg-catalogs/docker-compose.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@ services:
6060
entrypoint: >
6161
/bin/sh -c " until (/usr/bin/mc config host add minio http://minio:9000 admin password) do echo '...waiting...' && sleep 1; done; /usr/bin/mc rm -r --force minio/warehouse; /usr/bin/mc mb minio/warehouse; /usr/bin/mc policy set public minio/warehouse; tail -f /dev/null "
6262
63-
hive-metastore:
64-
image: iceberg-hive-metastore
65-
build: ./
66-
platform: ${DOCKER_DEFAULT_PLATFORM}
67-
ports:
68-
- "9083:9083"
69-
expose:
70-
- 9083
71-
environment:
72-
SERVICE_NAME: "metastore"
73-
SERVICE_OPTS: "-Dmetastore.warehouse.dir=s3a://warehouse/hive/"
63+
# hive-metastore:
64+
# image: iceberg-hive-metastore
65+
# build: ./
66+
# platform: ${DOCKER_DEFAULT_PLATFORM}
67+
# ports:
68+
# - "9083:9083"
69+
# expose:
70+
# - 9083
71+
# environment:
72+
# SERVICE_NAME: "metastore"
73+
# SERVICE_OPTS: "-Dmetastore.warehouse.dir=s3a://warehouse/hive/"
7474

7575
moto:
7676
image: motoserver/moto:5.0.3

src/common/exception/src/exception_into.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,3 +452,9 @@ impl From<tokio::task::JoinError> for ErrorCode {
452452
}
453453
}
454454
}
455+
456+
impl From<!> for ErrorCode {
457+
fn from(_: !) -> Self {
458+
unreachable!()
459+
}
460+
}

src/common/exception/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#![allow(clippy::uninlined_format_args)]
1616
#![allow(clippy::collapsible_if)]
17+
#![feature(never_type)]
1718

1819
extern crate core;
1920

src/common/io/src/format_settings.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ pub struct OutputFormatSettings {
146146
pub binary_format: BinaryDisplayFormat,
147147
pub http_json_result_mode: HttpHandlerDataFormat,
148148
pub headers: u8,
149+
// used only for compat with old bendSQL driver.
150+
pub http_arrow_use_jsonb: bool,
151+
149152
pub json_compact: bool,
150153
pub json_strings: bool,
151154

@@ -161,6 +164,7 @@ impl Default for OutputFormatSettings {
161164
binary_format: BinaryDisplayFormat::Hex,
162165
http_json_result_mode: HttpHandlerDataFormat::Display,
163166
headers: 0,
167+
http_arrow_use_jsonb: false,
164168
json_compact: false,
165169
json_strings: false,
166170
format_null_as_str: false,

0 commit comments

Comments
 (0)