Skip to content

Commit ce01285

Browse files
authored
Merge branch 'main' into feature_fix
2 parents 523d333 + 4d92219 commit ce01285

File tree

71 files changed

+1936
-1234
lines changed

Some content is hidden

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

71 files changed

+1936
-1234
lines changed

.github/actions/fuse_compat/action.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ inputs:
1212
runs:
1313
using: "composite"
1414
steps:
15-
- name: Setup Build Tool
16-
uses: ./.github/actions/setup_build_tool
17-
1815
- name: Download artifact
1916
uses: ./.github/actions/artifact_download
2017
with:
@@ -26,8 +23,20 @@ runs:
2623
- name: Test compatibility
2724
shell: bash
2825
run: |
29-
build-tool bash ./tests/fuse-compat/test-fuse-compat.sh 0.7.150
30-
build-tool bash ./tests/fuse-compat/test-fuse-compat.sh 0.7.151
26+
docker run --rm --tty --net=host \
27+
--user $(id -u):$(id -g) \
28+
--env BUILD_PROFILE \
29+
--volume "${PWD}:/workspace" \
30+
--workdir "/workspace" \
31+
datafuselabs/build-tool:sqllogic \
32+
bash ./tests/fuse-compat/test-fuse-compat.sh 0.7.150
33+
docker run --rm --tty --net=host \
34+
--user $(id -u):$(id -g) \
35+
--env BUILD_PROFILE \
36+
--volume "${PWD}:/workspace" \
37+
--workdir "/workspace" \
38+
datafuselabs/build-tool:sqllogic \
39+
bash ./tests/fuse-compat/test-fuse-compat.sh 0.7.151
3140
3241
- name: Upload failure
3342
if: failure()

.github/actions/test_sqllogic_standalone_linux/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
sha: ${{ github.sha }}
2424
target: ${{ inputs.target }}
2525

26-
- name: Run sqllogic Tests with Standalone mode with embedded meta-store
26+
- name: Run sqllogic Tests with Standalone mode
2727
shell: bash
2828
run: |
2929
docker run --rm --tty --net=host \

.github/workflows/databend-release.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,11 +306,13 @@ jobs:
306306
id: get_image_tags
307307
shell: bash
308308
run: |
309-
dockerhub_base=${{ steps.login.outputs.dockerhub_repo }}:${{ needs.create_release.outputs.version }}
310-
ecr_base=${{ steps.login.outputs.ecr_repo }}:${{ needs.create_release.outputs.version }}
311-
_tags="${dockerhub_base}-${{ matrix.distro }},${ecr_base}-${{ matrix.distro }}"
309+
_tags="${{ steps.login.outputs.dockerhub_repo }}:${{ needs.create_release.outputs.version }}-${{ matrix.distro }}"
310+
_tags="${_tags},${{ steps.login.outputs.ecr_repo }}:${{ needs.create_release.outputs.version }}-${{ matrix.distro }}"
312311
if [[ "${{ matrix.distro }}" == "debian" ]]; then
313-
_tags="${_tags},${dockerhub_base},${ecr_base}"
312+
_tags="${_tags},${{ steps.login.outputs.dockerhub_repo }}:${{ needs.create_release.outputs.version }}"
313+
_tags="${_tags},${{ steps.login.outputs.ecr_repo }}:${{ needs.create_release.outputs.version }}"
314+
_tags="${_tags},${{ steps.login.outputs.dockerhub_repo }}:latest"
315+
_tags="${_tags},${{ steps.login.outputs.ecr_repo }}:latest"
314316
fi
315317
echo ::set-output name=IMAGE_TAGS::${_tags}
316318

.github/workflows/dev-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
- uses: ./.github/actions/test_stateless_cluster_linux
130130

131131
test_sqllogic_standalone_linux:
132-
timeout-minutes: 15
132+
timeout-minutes: 30
133133
name: test_sqllogic_${{ matrix.dirs }}_standalone_linux
134134
runs-on: [self-hosted, X64, Linux, development]
135135
needs: build_gnu

Cargo.lock

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

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ Databend is licensed under [Apache 2.0](LICENSE).
200200

201201
## Acknowledgement
202202

203-
- Databend is inspired by [ClickHouse](https://github.com/clickhouse/clickhouse) and [Snowflake](https://docs.snowflake.com/en/user-guide/intro-key-concepts.html#snowflake-architecture), its computing model is based on [apache-arrow](https://arrow.apache.org/).
203+
- Databend is inspired by [ClickHouse](https://github.com/clickhouse/clickhouse) and [Snowflake](https://docs.snowflake.com/en/user-guide/intro-key-concepts.html#snowflake-architecture).
204+
- Databend's computing model is based on [Arrow2](https://github.com/jorgecarleitao/arrow2), Arrow2 is a faster and safer implementation of the Apache Arrow Columnar Format.
204205
- The [documentation website](https://databend.rs) is hosted by [Vercel](https://vercel.com/?utm_source=databend&utm_campaign=oss).
205206
- Thanks to [Mergify](https://mergify.com/) for sponsoring advanced features like Batch Merge.
206207
- Thanks to [QingCloud](https://qingcloud.com) for sponsoring CI resources.

docs/doc/30-reference/30-sql/10-dml/dml-copy-into-table.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,16 @@ COPY INTO mytable
224224
FROM 's3://mybucket/data.csv'
225225
FILE_FORMAT = (type = 'CSV' field_delimiter = ',' record_delimiter = '\n' skip_header = 1) size_limit=10;
226226
```
227+
228+
`Parquet` file example:
229+
```sql
230+
COPY INTO mytable
231+
FROM 's3://mybucket/data.parquet'
232+
CONNECTION = (
233+
ACCESS_KEY_ID = '<your-access-key-ID>'
234+
SECRET_ACCESS_KEY = '<your-secret-access-key>')
235+
FILE_FORMAT = (type = 'PARQUET');
236+
```
227237

228238
**Azure Blob storage**
229239

@@ -236,4 +246,4 @@ COPY INTO mytable
236246
ACCOUNT_NAME = '<account_name>'
237247
ACCOUNT_KEY = '<account_key>'
238248
)
239-
```
249+
```

scripts/ci/ci-run-sqllogic-tests-cluster.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ if [ $# -gt 0 ]; then
1515
fi
1616
echo "Run suites using argument: $RUN_DIR"
1717

18+
echo "pip list"
19+
python3 -m pip list
20+
1821
echo "Starting databend-sqllogic tests"
1922
python3 main.py $RUN_DIR
2023

scripts/ci/ci-run-sqllogic-tests.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
set -e
55

66
echo "Starting standalone DatabendQuery and DatabendMeta"
7-
./scripts/ci/deploy/databend-query-standalone-embedded-meta.sh
7+
./scripts/ci/deploy/databend-query-standalone.sh
88

99
SCRIPT_PATH="$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd)"
1010
cd "$SCRIPT_PATH/../../tests/logictest" || exit
@@ -15,6 +15,9 @@ if [ $# -gt 0 ]; then
1515
fi
1616
echo "Run suites using argument: $RUN_DIR"
1717

18+
echo "pip list"
19+
python3 -m pip list
20+
1821
echo "Starting databend-sqllogic tests"
1922
python3 main.py --skip-dir=mode $RUN_DIR
2023

src/binaries/meta/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ async fn run_kvapi_command(conf: &Config, op: &str) {
156156
password: conf.password.clone(),
157157
..Default::default()
158158
};
159-
let client = match MetaStoreProvider::new(rpc_conf).try_get_meta_store().await {
159+
let client = match MetaStoreProvider::new(rpc_conf).create_meta_store().await {
160160
Ok(s) => Arc::new(s),
161161
Err(e) => {
162-
eprintln!("{}", e.message());
162+
eprintln!("{}", e);
163163
return;
164164
}
165165
};

0 commit comments

Comments
 (0)