diff --git a/.github/actions/artifact_failure/action.yml b/.github/actions/artifact_failure/action.yml index aab321e72edee..51f5e57e75f46 100644 --- a/.github/actions/artifact_failure/action.yml +++ b/.github/actions/artifact_failure/action.yml @@ -19,6 +19,7 @@ runs: docker logs "$line" > .databend/docker/"$line".log done + mkdir -p target find -type d -name .databend -print0 | xargs -0 tar -zcf target/failure-${{ inputs.name }}.tar.gz - uses: actions/upload-artifact@v3 with: diff --git a/.github/actions/benchmark_cloud/action.yml b/.github/actions/benchmark_cloud/action.yml index c9bc130f6e603..1055711221c9a 100644 --- a/.github/actions/benchmark_cloud/action.yml +++ b/.github/actions/benchmark_cloud/action.yml @@ -38,8 +38,8 @@ runs: - name: Install script dependencies shell: bash run: | - sudo apt-get update -y - sudo apt install -y python3 + sudo apt-get update -yq + sudo apt-get install -yq python3 - name: Run Benchmark working-directory: benchmark/clickbench diff --git a/.github/actions/benchmark_local/action.yml b/.github/actions/benchmark_local/action.yml index c5f3cad43c82b..f0e92eba318ff 100644 --- a/.github/actions/benchmark_local/action.yml +++ b/.github/actions/benchmark_local/action.yml @@ -23,8 +23,8 @@ runs: - name: Install script dependencies shell: bash run: | - sudo apt update -y - sudo apt install -y python3 + sudo apt-get update -yq + sudo apt-get install -yq python3 - name: Run Benchmark working-directory: benchmark/clickbench diff --git a/.github/actions/setup_bendsql/action.yml b/.github/actions/setup_bendsql/action.yml index ac1e26f4793ae..49b11463cfb08 100644 --- a/.github/actions/setup_bendsql/action.yml +++ b/.github/actions/setup_bendsql/action.yml @@ -6,7 +6,6 @@ runs: - name: Download and Install shell: bash run: | - sudo curl -L -o /etc/apt/sources.list.d/datafuselabs.sources https://repo.databend.rs/deb/datafuselabs.sources - sudo apt update - sudo apt install -y bendsql + curl -Lo /tmp/bendsql.deb https://github.com/datafuselabs/bendsql/releases/download/v0.9.0/bendsql_0.9.0_amd64.deb + sudo dpkg -i /tmp/bendsql.deb bendsql --version diff --git a/.github/workflows/reuse.benchmark.yml b/.github/workflows/reuse.benchmark.yml index 855d494a18df0..e37b837381a98 100644 --- a/.github/workflows/reuse.benchmark.yml +++ b/.github/workflows/reuse.benchmark.yml @@ -137,8 +137,8 @@ jobs: - uses: actions/checkout@v4 - name: Install Dependencies run: | - sudo apt update -y - sudo apt install -y python3-jinja2 + sudo apt-get update -yq + sudo apt-get install -yq python3-jinja2 - uses: actions/download-artifact@v3 with: name: benchmark-hits @@ -193,8 +193,8 @@ jobs: - uses: actions/checkout@v4 - name: Install Dependencies run: | - sudo apt update -y - sudo apt install -y python3-jinja2 + sudo apt-get update -yq + sudo apt-get install -yq python3-jinja2 - uses: actions/download-artifact@v3 with: name: benchmark-${{ matrix.dataset }} diff --git a/.github/workflows/reuse.linux.yml b/.github/workflows/reuse.linux.yml index 0a46aed267009..5ee3bb8500b93 100644 --- a/.github/workflows/reuse.linux.yml +++ b/.github/workflows/reuse.linux.yml @@ -20,7 +20,7 @@ env: jobs: check: - runs-on: [self-hosted, X64, Linux, 8c16g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 16c32g, "${{ inputs.runner_provider }}"] steps: - uses: actions/checkout@v4 with: @@ -312,7 +312,7 @@ jobs: timeout-minutes: 20 with: dirs: ${{ matrix.dirs }} - handlers: mysql,http,clickhouse + handlers: http - name: Upload failure if: failure() uses: ./.github/actions/artifact_failure diff --git a/benchmark/clickbench/tpch/queries.sql b/benchmark/clickbench/tpch/queries.sql index 0a317e6e9234b..358525149632e 100644 --- a/benchmark/clickbench/tpch/queries.sql +++ b/benchmark/clickbench/tpch/queries.sql @@ -1,3 +1,4 @@ +select count(*) from lineitem; select l_returnflag, l_linestatus, sum(l_quantity) as sum_qty, sum(l_extendedprice) as sum_base_price, sum(l_extendedprice * (1 - l_discount)) as sum_disc_price, sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge, avg(l_quantity) as avg_qty, avg(l_extendedprice) as avg_price, avg(l_discount) as avg_disc, count(*) as count_order from lineitem where l_shipdate <= add_days(to_date('1998-12-01'), -90) group by l_returnflag, l_linestatus order by l_returnflag, l_linestatus; select s_acctbal, s_name, n_name, p_partkey, p_mfgr, s_address, s_phone, s_comment from part, supplier, partsupp, nation, region where p_partkey = ps_partkey and s_suppkey = ps_suppkey and p_size = 15 and p_type like '%BRASS' and s_nationkey = n_nationkey and n_regionkey = r_regionkey and r_name = 'EUROPE' and ps_supplycost = ( select min(ps_supplycost) from partsupp, supplier, nation, region where p_partkey = ps_partkey and s_suppkey = ps_suppkey and s_nationkey = n_nationkey and n_regionkey = r_regionkey and r_name = 'EUROPE' ) order by s_acctbal desc, n_name, s_name, p_partkey limit 100; select l_orderkey, sum(l_extendedprice * (1 - l_discount)) as revenue, o_orderdate, o_shippriority from customer, orders, lineitem where c_mktsegment = 'BUILDING' and c_custkey = o_custkey and l_orderkey = o_orderkey and o_orderdate < to_date('1995-03-15') and l_shipdate > to_date('1995-03-15') group by l_orderkey, o_orderdate, o_shippriority order by revenue desc, o_orderdate limit 10;