Skip to content

Commit 0032388

Browse files
authored
Merge branch 'main' into users
2 parents 626c8c5 + 3f436ac commit 0032388

File tree

31 files changed

+341
-160
lines changed

31 files changed

+341
-160
lines changed

.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/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: 1 addition & 1 deletion
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.

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

Lines changed: 1 addition & 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

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)