diff --git a/benchmark/clickbench/benchmark_local.sh b/benchmark/clickbench/benchmark_local.sh
index fff1ac1ba2877..14ecc00171e5b 100755
--- a/benchmark/clickbench/benchmark_local.sh
+++ b/benchmark/clickbench/benchmark_local.sh
@@ -39,6 +39,7 @@ cluster_id = "${BENCHMARK_ID}"
 [[query.users]]
 name = "root"
 auth_type = "no_password"
+default_storage_format = 'parquet'
 [meta]
 endpoints = ["127.0.0.1:9191"]
 client_timeout_in_second = 60
@@ -61,7 +62,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 with parquet storage format..."
     bendsql <"${BENCHMARK_DATASET}/create_local.sql"
 fi
 
diff --git a/benchmark/clickbench/internal/queries/01.sql b/benchmark/clickbench/internal/queries/01.sql
index d939c132d8ee9..2cbb981df042b 100644
--- a/benchmark/clickbench/internal/queries/01.sql
+++ b/benchmark/clickbench/internal/queries/01.sql
@@ -1 +1 @@
-select name from system.tables where name='t_1';
+select name from system.tables where name in ('t_1', 't_2');
diff --git a/benchmark/clickbench/internal/queries/02.sql b/benchmark/clickbench/internal/queries/02.sql
index 2cbb981df042b..520f24e4e7234 100644
--- a/benchmark/clickbench/internal/queries/02.sql
+++ b/benchmark/clickbench/internal/queries/02.sql
@@ -1 +1 @@
-select name from system.tables where name in ('t_1', 't_2');
+select name from system.tables_with_history where name in ('t_1', 't_2');
diff --git a/benchmark/clickbench/internal/queries/03.sql b/benchmark/clickbench/internal/queries/03.sql
index 520f24e4e7234..200be07a5f5a1 100644
--- a/benchmark/clickbench/internal/queries/03.sql
+++ b/benchmark/clickbench/internal/queries/03.sql
@@ -1 +1 @@
-select name from system.tables_with_history where name in ('t_1', 't_2');
+select (number::string)::Int from numbers(100000000) ignore_result;
diff --git a/benchmark/clickbench/internal/queries/04.sql b/benchmark/clickbench/internal/queries/04.sql
index 200be07a5f5a1..076760aeba6a4 100644
--- a/benchmark/clickbench/internal/queries/04.sql
+++ b/benchmark/clickbench/internal/queries/04.sql
@@ -1 +1 @@
-select (number::string)::Int from numbers(100000000) ignore_result;
+select count() from numbers(100000000);
diff --git a/benchmark/clickbench/internal/queries/05.sql b/benchmark/clickbench/internal/queries/05.sql
new file mode 100644
index 0000000000000..f460bcfd65f2f
--- /dev/null
+++ b/benchmark/clickbench/internal/queries/05.sql
@@ -0,0 +1 @@
+select number % 3 a, number % 4 b, number % 5 c, min(number), max(number), sum(number) from numbers(100000000) group by a,b,c;
diff --git a/benchmark/clickbench/internal/queries/06.sql b/benchmark/clickbench/internal/queries/06.sql
new file mode 100644
index 0000000000000..f36a9e242217d
--- /dev/null
+++ b/benchmark/clickbench/internal/queries/06.sql
@@ -0,0 +1 @@
+select number % 3 a, number % 4 b, number % 5 c, min(cast(number as Decimal(15,2))), max(cast(number as Decimal(15,2))), sum(cast(number as Decimal(45,2))) from numbers(100000000) group by a,b,c;
diff --git a/benchmark/clickbench/internal/queries/07.sql b/benchmark/clickbench/internal/queries/07.sql
new file mode 100644
index 0000000000000..1dda3766db552
--- /dev/null
+++ b/benchmark/clickbench/internal/queries/07.sql
@@ -0,0 +1 @@
+select number % 300 a, (number % 400)::string b, number % 500 c, min(cast(number as Decimal(15,2))), max(cast(number as Decimal(15,2))), sum(cast(number as Decimal(45,2))) from numbers(100000000) group by a,b,c ignore_result;
diff --git a/benchmark/clickbench/internal/queries/08.sql b/benchmark/clickbench/internal/queries/08.sql
new file mode 100644
index 0000000000000..cae30c0022f91
--- /dev/null
+++ b/benchmark/clickbench/internal/queries/08.sql
@@ -0,0 +1 @@
+select number % 1000 a, min(cast(number as Decimal(15,2))), max(cast(number as Decimal(15,2))), sum(cast(number as Decimal(45,2))) from numbers(100000000) where number % 100 != 0 group by a ignore_result;
diff --git a/benchmark/clickbench/internal/queries/09.sql b/benchmark/clickbench/internal/queries/09.sql
new file mode 100644
index 0000000000000..85fdcbaa18be4
--- /dev/null
+++ b/benchmark/clickbench/internal/queries/09.sql
@@ -0,0 +1 @@
+select max(number) over (partition by number % 3 order by number), rank() over (partition by number % 3 order by number) from numbers(20000000) where number % 100 != 0 ignore_result;