Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ inputs:
description: "logic test handlers, mysql,http,hybrid"
required: true
default: ""
storage-format:
description: "storage format for databend query to test"
required: true
default: all

runs:
using: "composite"
Expand All @@ -22,7 +18,6 @@ runs:
artifacts: sqllogictests,meta,query

- name: Run sqllogic Tests with Standalone mode
if: inputs.storage-format == 'all' || inputs.storage-format == 'parquet'
shell: bash
env:
TEST_HANDLERS: ${{ inputs.handlers }}
Expand Down
5 changes: 0 additions & 5 deletions .github/actions/test_ee_sqllogic_standalone_linux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ inputs:
description: "logic test handlers, mysql,http,hybrid"
required: true
default: ""
storage-format:
description: "storage format for databend query to test"
required: true
default: all

runs:
using: "composite"
Expand All @@ -22,7 +18,6 @@ runs:
artifacts: sqllogictests,meta,query

- name: Run sqllogic Tests with Standalone mode
if: inputs.storage-format == 'all' || inputs.storage-format == 'parquet'
shell: bash
env:
TEST_HANDLERS: ${{ inputs.handlers }}
Expand Down
15 changes: 0 additions & 15 deletions .github/actions/test_sqllogic_standalone_linux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ inputs:
description: "logic test parallel"
required: false
default: ""
storage-format:
description: "storage format for databend query to test"
required: true
default: all
enable_table_meta_cache:
description: "Enable table meta cache"
required: false
Expand All @@ -30,20 +26,9 @@ runs:
artifacts: sqllogictests,meta,query

- name: Run sqllogic Tests with Standalone mode
if: inputs.storage-format == 'all' || inputs.storage-format == 'parquet'
shell: bash
env:
TEST_HANDLERS: ${{ inputs.handlers }}
TEST_PARALLEL: ${{ inputs.parallel }}
CACHE_ENABLE_TABLE_META_CACHE: ${{ inputs.enable_table_meta_cache}}
run: bash ./scripts/ci/ci-run-sqllogic-tests.sh ${{ inputs.dirs }}

- name: Run native sqllogic Tests with Standalone mode
if: inputs.storage-format == 'all' || inputs.storage-format == 'native'
shell: bash
env:
TEST_HANDLERS: ${{ inputs.handlers }}
TEST_PARALLEL: ${{ inputs.parallel }}
TEST_EXT_ARGS: '--skip_file tpcds_spill_1.test,tpcds_spill_2.test,tpcds_spill_3.test'
CACHE_ENABLE_TABLE_META_CACHE: ${{ inputs.enable_table_meta_cache}}
run: bash ./scripts/ci/ci-run-sqllogic-tests-native.sh ${{ inputs.dirs }}
12 changes: 0 additions & 12 deletions .github/actions/test_sqllogic_standalone_linux_minio/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ inputs:
description: "logic test handlers, mysql,http,hybrid"
required: true
default: ""
storage-format:
description: "storage format for databend query to test"
required: true
default: all

runs:
using: "composite"
Expand All @@ -24,15 +20,7 @@ runs:
- uses: ./.github/actions/setup_minio

- name: Run sqllogic Tests with Standalone mode
if: inputs.storage-format == 'all' || inputs.storage-format == 'parquet'
shell: bash
env:
TEST_HANDLERS: ${{ inputs.handlers }}
run: bash ./scripts/ci/ci-run-sqllogic-tests-minio.sh ${{ inputs.dirs }}

- name: Run native sqllogic Tests with Standalone mode
if: inputs.storage-format == 'all' || inputs.storage-format == 'native'
shell: bash
env:
TEST_HANDLERS: ${{ inputs.handlers }}
run: bash ./scripts/ci/ci-run-sqllogic-tests-native-minio.sh ${{ inputs.dirs }}
19 changes: 2 additions & 17 deletions .github/workflows/reuse.sqllogic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ jobs:
dirs: ${{ matrix.tests.dirs }}
handlers: ${{ matrix.handler }}
parallel: ${{ matrix.tests.parallel }}
storage-format: all
- name: Upload failure
if: failure()
uses: ./.github/actions/artifact_failure
Expand Down Expand Up @@ -105,7 +104,6 @@ jobs:
dirs: udf_server
handlers: http,hybrid
parallel: 1
storage-format: all
- name: Upload failure
if: failure() || cancelled()
uses: ./.github/actions/artifact_failure
Expand Down Expand Up @@ -134,7 +132,6 @@ jobs:
with:
dirs: task
handlers: http,hybrid
storage-format: all
- name: Upload failure
if: failure() || cancelled()
uses: ./.github/actions/artifact_failure
Expand All @@ -156,22 +153,18 @@ jobs:
handler:
- "hybrid"
- "http"
format:
- "native"
- "parquet"
steps:
- uses: actions/checkout@v6
- uses: ./.github/actions/test_sqllogic_standalone_linux_minio
timeout-minutes: 15
with:
dirs: ${{ matrix.dirs }}
handlers: ${{ matrix.handler }}
storage-format: ${{ matrix.format }}
- name: Upload failure
if: failure()
uses: ./.github/actions/artifact_failure
with:
name: test-sqllogic-standalone-minio-${{ matrix.dirs }}-${{ matrix.handler }}-${{ matrix.format }}
name: test-sqllogic-standalone-minio-${{ matrix.dirs }}-${{ matrix.handler }}

standalone_minio_with_bendsave:
runs-on:
Expand Down Expand Up @@ -350,7 +343,6 @@ jobs:
with:
dirs: ${{ matrix.dirs }}
handlers: ${{ matrix.handler }}
storage-format: all
enable_table_meta_cache: false
- name: Upload failure
if: failure()
Expand All @@ -365,12 +357,6 @@ jobs:
- Linux
- 2c
- "${{ inputs.runner_provider }}"
strategy:
fail-fast: false
matrix:
format:
- "parquet"
- "native"
steps:
- uses: actions/checkout@v6
- uses: ./.github/actions/setup_license
Expand All @@ -382,9 +368,8 @@ jobs:
with:
dirs: ee
handlers: http,hybrid
storage-format: ${{ matrix.format }}
- name: Upload failure
if: failure()
uses: ./.github/actions/artifact_failure
with:
name: test-ee-sqllogic-standalone-ee-${{ matrix.format }}
name: test-ee-sqllogic-standalone-ee
50 changes: 2 additions & 48 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ databend-common-meta-schema-api-test-suite = { path = "src/meta/schema-api-test-
databend-common-meta-schema-api-tests = { path = "src/meta/schema-api-tests" }
databend-common-meta-store = { path = "src/meta/store" }
databend-common-metrics = { path = "src/common/metrics" }
databend-common-native = { path = "src/common/native" }
databend-common-pipeline = { path = "src/query/pipeline" }
databend-common-pipeline-transforms = { path = "src/query/pipeline/transforms" }
databend-common-proto-conv = { path = "src/meta/proto-conv" }
Expand Down
2 changes: 1 addition & 1 deletion benchmark/benchmark_local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export BENDSQL_DSN="databend://root:@localhost:8000/${BENCHMARK_DATASET}?sslmode

# Create table
if [[ -f "${BENCHMARK_DATASET}/create_local.sql" ]]; then
echo "Creating table for benchmark with native storage format..."
echo "Creating table for benchmark..."
bendsql <"${BENCHMARK_DATASET}/create_local.sql"
fi

Expand Down
2 changes: 1 addition & 1 deletion benchmark/benchmark_local_merge_into.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export BENDSQL_DSN="databend://root:@localhost:8000/${BENCHMARK_DATASET}?sslmode
echo "CREATE DATABASE ${BENCHMARK_DATASET};" | bendsql

# Load the data
echo "Creating table for benchmark with native storage format..."
echo "Creating table for benchmark..."
bendsql <"${BENCHMARK_DATASET}/create_local.sql"

# Detect instance type
Expand Down
2 changes: 1 addition & 1 deletion benchmark/hits/create_local.sql
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ CREATE TRANSIENT TABLE hits (
RefererHash BIGINT NOT NULL,
URLHash BIGINT NOT NULL,
CLID INTEGER NOT NULL
) storage_format = 'native' compression = 'lz4';
) storage_format = 'parquet' compression = 'lz4';
10 changes: 3 additions & 7 deletions benchmark/old/tpch/tpch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ EXPORT DATABASE '/tmp/tpch_1/' (FORMAT CSV, DELIMITER '|');

mv /tmp/tpch_1/ "$(pwd)/data/"

if [[ $2 == native ]]; then
echo "native"
sh ./load_data.sh "storage_format = 'native' compression = 'lz4'"
else
echo "fuse"
sh ./load_data.sh ""
fi
# `parquet` is the only supported storage format; an empty option string lets
# the table fall back to it.
sh ./load_data.sh ""

16 changes: 8 additions & 8 deletions benchmark/tpch/create_local.sql
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS customer (
c_acctbal DECIMAL(15, 2) not null,
c_mktsegment STRING not null,
c_comment STRING not null
) CLUSTER BY (c_custkey) storage_format = 'native' compression = 'lz4';
) CLUSTER BY (c_custkey) storage_format = 'parquet' compression = 'lz4';

CREATE TABLE IF NOT EXISTS lineitem (
l_orderkey BIGINT not null,
Expand All @@ -26,14 +26,14 @@ CREATE TABLE IF NOT EXISTS lineitem (
l_shipinstruct STRING not null,
l_shipmode STRING not null,
l_comment STRING not null
) CLUSTER BY(l_shipdate, l_orderkey) storage_format = 'native' compression = 'lz4';
) CLUSTER BY(l_shipdate, l_orderkey) storage_format = 'parquet' compression = 'lz4';

CREATE TABLE IF NOT EXISTS nation (
n_nationkey INTEGER not null,
n_name STRING not null,
n_regionkey INTEGER not null,
n_comment STRING
) CLUSTER BY (n_nationkey) storage_format = 'native' compression = 'lz4';
) CLUSTER BY (n_nationkey) storage_format = 'parquet' compression = 'lz4';

CREATE TABLE IF NOT EXISTS orders (
o_orderkey BIGINT not null,
Expand All @@ -45,15 +45,15 @@ CREATE TABLE IF NOT EXISTS orders (
o_clerk STRING not null,
o_shippriority INTEGER not null,
o_comment STRING not null
) CLUSTER BY (o_orderkey, o_orderdate) storage_format = 'native' compression = 'lz4';
) CLUSTER BY (o_orderkey, o_orderdate) storage_format = 'parquet' compression = 'lz4';

CREATE TABLE IF NOT EXISTS partsupp (
ps_partkey BIGINT not null,
ps_suppkey BIGINT not null,
ps_availqty BIGINT not null,
ps_supplycost DECIMAL(15, 2) not null,
ps_comment STRING not null
) CLUSTER BY (ps_partkey) storage_format = 'native' compression = 'lz4';
) CLUSTER BY (ps_partkey) storage_format = 'parquet' compression = 'lz4';

CREATE TABLE IF NOT EXISTS part (
p_partkey BIGINT not null,
Expand All @@ -65,13 +65,13 @@ CREATE TABLE IF NOT EXISTS part (
p_container STRING not null,
p_retailprice DECIMAL(15, 2) not null,
p_comment STRING not null
) CLUSTER BY (p_partkey) storage_format = 'native' compression = 'lz4';
) CLUSTER BY (p_partkey) storage_format = 'parquet' compression = 'lz4';

CREATE TABLE IF NOT EXISTS region (
r_regionkey INTEGER not null,
r_name STRING not null,
r_comment STRING
) CLUSTER BY (r_regionkey) storage_format = 'native' compression = 'lz4';
) CLUSTER BY (r_regionkey) storage_format = 'parquet' compression = 'lz4';

CREATE TABLE IF NOT EXISTS supplier (
s_suppkey BIGINT not null,
Expand All @@ -81,4 +81,4 @@ CREATE TABLE IF NOT EXISTS supplier (
s_phone STRING not null,
s_acctbal DECIMAL(15, 2) not null,
s_comment STRING not null
) CLUSTER BY (s_suppkey) storage_format = 'native' compression = 'lz4';
) CLUSTER BY (s_suppkey) storage_format = 'parquet' compression = 'lz4';
Loading
Loading