Add forgotten clickbench canon files YDB CLI

10 files changed, 125 insertions, 35 deletions

diff --git a/ydb/public/lib/ydb_cli/commands/CMakeLists.darwin-x86_64.txt b/ydb/public/lib/ydb_cli/commands/CMakeLists.darwin-x86_64.txt
index ae92f20fbe..7715907a57 100644
--- a/ydb/public/lib/ydb_cli/commands/CMakeLists.darwin-x86_64.txt
+++ b/ydb/public/lib/ydb_cli/commands/CMakeLists.darwin-x86_64.txt
@@ -117,16 +117,24 @@ target_link_libraries(clicommands.global PUBLIC
   library-cpp-resource
 )
 target_sources(clicommands.global PRIVATE
-  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/5c98b3b184d8067b0b9a88d6d23e0ffc.cpp
+  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/6b4a693856d7dfaada0935e4f9b61c1b.cpp
 )
 resources(clicommands.global
-  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/5c98b3b184d8067b0b9a88d6d23e0ffc.cpp
+  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/6b4a693856d7dfaada0935e4f9b61c1b.cpp
   INPUTS
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_queries.sql
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_schema.sql
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/tpch_schema.sql
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q0.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q1.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q2.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q3.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q4.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q5.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q6.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q7.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q8.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q9.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q10.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q11.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q12.result
@@ -137,7 +145,6 @@ resources(clicommands.global
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q17.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q18.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q19.result
-  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q2.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q20.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q21.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q22.result
@@ -148,7 +155,6 @@ resources(clicommands.global
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q27.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q28.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q29.result
-  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q3.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q30.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q31.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q32.result
@@ -159,7 +165,6 @@ resources(clicommands.global
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q37.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q38.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q39.result
-  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q4.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q40.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q41.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q42.result
@@ -169,6 +174,14 @@ resources(clicommands.global
   tpch_schema.sql
   q0.result
   q1.result
+  q2.result
+  q3.result
+  q4.result
+  q5.result
+  q6.result
+  q7.result
+  q8.result
+  q9.result
   q10.result
   q11.result
   q12.result
@@ -179,7 +192,6 @@ resources(clicommands.global
   q17.result
   q18.result
   q19.result
-  q2.result
   q20.result
   q21.result
   q22.result
@@ -190,7 +202,6 @@ resources(clicommands.global
   q27.result
   q28.result
   q29.result
-  q3.result
   q30.result
   q31.result
   q32.result
@@ -201,7 +212,6 @@ resources(clicommands.global
   q37.result
   q38.result
   q39.result
-  q4.result
   q40.result
   q41.result
   q42.result
diff --git a/ydb/public/lib/ydb_cli/commands/CMakeLists.linux-aarch64.txt b/ydb/public/lib/ydb_cli/commands/CMakeLists.linux-aarch64.txt
index 26589f8bc3..f5ae52358f 100644
--- a/ydb/public/lib/ydb_cli/commands/CMakeLists.linux-aarch64.txt
+++ b/ydb/public/lib/ydb_cli/commands/CMakeLists.linux-aarch64.txt
@@ -119,16 +119,24 @@ target_link_libraries(clicommands.global PUBLIC
   library-cpp-resource
 )
 target_sources(clicommands.global PRIVATE
-  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/5c98b3b184d8067b0b9a88d6d23e0ffc.cpp
+  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/6b4a693856d7dfaada0935e4f9b61c1b.cpp
 )
 resources(clicommands.global
-  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/5c98b3b184d8067b0b9a88d6d23e0ffc.cpp
+  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/6b4a693856d7dfaada0935e4f9b61c1b.cpp
   INPUTS
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_queries.sql
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_schema.sql
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/tpch_schema.sql
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q0.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q1.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q2.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q3.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q4.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q5.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q6.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q7.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q8.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q9.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q10.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q11.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q12.result
@@ -139,7 +147,6 @@ resources(clicommands.global
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q17.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q18.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q19.result
-  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q2.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q20.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q21.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q22.result
@@ -150,7 +157,6 @@ resources(clicommands.global
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q27.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q28.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q29.result
-  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q3.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q30.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q31.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q32.result
@@ -161,7 +167,6 @@ resources(clicommands.global
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q37.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q38.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q39.result
-  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q4.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q40.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q41.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q42.result
@@ -171,6 +176,14 @@ resources(clicommands.global
   tpch_schema.sql
   q0.result
   q1.result
+  q2.result
+  q3.result
+  q4.result
+  q5.result
+  q6.result
+  q7.result
+  q8.result
+  q9.result
   q10.result
   q11.result
   q12.result
@@ -181,7 +194,6 @@ resources(clicommands.global
   q17.result
   q18.result
   q19.result
-  q2.result
   q20.result
   q21.result
   q22.result
@@ -192,7 +204,6 @@ resources(clicommands.global
   q27.result
   q28.result
   q29.result
-  q3.result
   q30.result
   q31.result
   q32.result
@@ -203,7 +214,6 @@ resources(clicommands.global
   q37.result
   q38.result
   q39.result
-  q4.result
   q40.result
   q41.result
   q42.result
diff --git a/ydb/public/lib/ydb_cli/commands/CMakeLists.linux-x86_64.txt b/ydb/public/lib/ydb_cli/commands/CMakeLists.linux-x86_64.txt
index 26589f8bc3..f5ae52358f 100644
--- a/ydb/public/lib/ydb_cli/commands/CMakeLists.linux-x86_64.txt
+++ b/ydb/public/lib/ydb_cli/commands/CMakeLists.linux-x86_64.txt
@@ -119,16 +119,24 @@ target_link_libraries(clicommands.global PUBLIC
   library-cpp-resource
 )
 target_sources(clicommands.global PRIVATE
-  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/5c98b3b184d8067b0b9a88d6d23e0ffc.cpp
+  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/6b4a693856d7dfaada0935e4f9b61c1b.cpp
 )
 resources(clicommands.global
-  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/5c98b3b184d8067b0b9a88d6d23e0ffc.cpp
+  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/6b4a693856d7dfaada0935e4f9b61c1b.cpp
   INPUTS
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_queries.sql
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_schema.sql
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/tpch_schema.sql
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q0.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q1.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q2.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q3.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q4.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q5.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q6.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q7.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q8.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q9.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q10.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q11.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q12.result
@@ -139,7 +147,6 @@ resources(clicommands.global
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q17.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q18.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q19.result
-  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q2.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q20.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q21.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q22.result
@@ -150,7 +157,6 @@ resources(clicommands.global
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q27.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q28.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q29.result
-  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q3.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q30.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q31.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q32.result
@@ -161,7 +167,6 @@ resources(clicommands.global
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q37.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q38.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q39.result
-  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q4.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q40.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q41.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q42.result
@@ -171,6 +176,14 @@ resources(clicommands.global
   tpch_schema.sql
   q0.result
   q1.result
+  q2.result
+  q3.result
+  q4.result
+  q5.result
+  q6.result
+  q7.result
+  q8.result
+  q9.result
   q10.result
   q11.result
   q12.result
@@ -181,7 +194,6 @@ resources(clicommands.global
   q17.result
   q18.result
   q19.result
-  q2.result
   q20.result
   q21.result
   q22.result
@@ -192,7 +204,6 @@ resources(clicommands.global
   q27.result
   q28.result
   q29.result
-  q3.result
   q30.result
   q31.result
   q32.result
@@ -203,7 +214,6 @@ resources(clicommands.global
   q37.result
   q38.result
   q39.result
-  q4.result
   q40.result
   q41.result
   q42.result
diff --git a/ydb/public/lib/ydb_cli/commands/CMakeLists.windows-x86_64.txt b/ydb/public/lib/ydb_cli/commands/CMakeLists.windows-x86_64.txt
index ae92f20fbe..7715907a57 100644
--- a/ydb/public/lib/ydb_cli/commands/CMakeLists.windows-x86_64.txt
+++ b/ydb/public/lib/ydb_cli/commands/CMakeLists.windows-x86_64.txt
@@ -117,16 +117,24 @@ target_link_libraries(clicommands.global PUBLIC
   library-cpp-resource
 )
 target_sources(clicommands.global PRIVATE
-  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/5c98b3b184d8067b0b9a88d6d23e0ffc.cpp
+  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/6b4a693856d7dfaada0935e4f9b61c1b.cpp
 )
 resources(clicommands.global
-  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/5c98b3b184d8067b0b9a88d6d23e0ffc.cpp
+  ${CMAKE_BINARY_DIR}/ydb/public/lib/ydb_cli/commands/6b4a693856d7dfaada0935e4f9b61c1b.cpp
   INPUTS
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_queries.sql
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_schema.sql
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/tpch_schema.sql
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q0.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q1.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q2.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q3.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q4.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q5.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q6.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q7.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q8.result
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q9.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q10.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q11.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q12.result
@@ -137,7 +145,6 @@ resources(clicommands.global
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q17.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q18.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q19.result
-  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q2.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q20.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q21.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q22.result
@@ -148,7 +155,6 @@ resources(clicommands.global
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q27.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q28.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q29.result
-  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q3.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q30.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q31.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q32.result
@@ -159,7 +165,6 @@ resources(clicommands.global
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q37.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q38.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q39.result
-  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q4.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q40.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q41.result
   ${CMAKE_SOURCE_DIR}/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q42.result
@@ -169,6 +174,14 @@ resources(clicommands.global
   tpch_schema.sql
   q0.result
   q1.result
+  q2.result
+  q3.result
+  q4.result
+  q5.result
+  q6.result
+  q7.result
+  q8.result
+  q9.result
   q10.result
   q11.result
   q12.result
@@ -179,7 +192,6 @@ resources(clicommands.global
   q17.result
   q18.result
   q19.result
-  q2.result
   q20.result
   q21.result
   q22.result
@@ -190,7 +202,6 @@ resources(clicommands.global
   q27.result
   q28.result
   q29.result
-  q3.result
   q30.result
   q31.result
   q32.result
@@ -201,7 +212,6 @@ resources(clicommands.global
   q37.result
   q38.result
   q39.result
-  q4.result
   q40.result
   q41.result
   q42.result
diff --git a/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q5.result b/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q5.result
new file mode 100644
index 0000000000..77091a20ae
--- /dev/null
+++ b/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q5.result
@@ -0,0 +1,2 @@
+"uniqExact(SearchPhrase)"
+6019103
diff --git a/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q6.result b/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q6.result
new file mode 100644
index 0000000000..df0185dca7
--- /dev/null
+++ b/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q6.result
@@ -0,0 +1,2 @@
+"min(EventDate)","max(EventDate)"
+"2013-07-02","2013-07-31"
diff --git a/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q7.result b/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q7.result
new file mode 100644
index 0000000000..261b66d98a
--- /dev/null
+++ b/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q7.result
@@ -0,0 +1,19 @@
+"AdvEngineID","cnt"
+2,404602
+27,113167
+13,45631
+45,38960
+44,9730
+3,6896
+62,5266
+52,3554
+50,938
+28,836
+53,350
+25,343
+61,158
+21,38
+42,20
+16,7
+7,3
+22,1
diff --git a/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q8.result b/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q8.result
new file mode 100644
index 0000000000..27d28f6a75
--- /dev/null
+++ b/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q8.result
@@ -0,0 +1,11 @@
+"RegionID","u"
+229,2845673
+2,1081016
+208,831676
+169,604583
+184,322661
+158,307152
+34,299479
+55,286525
+107,272448
+42,243181
diff --git a/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q9.result b/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q9.result
new file mode 100644
index 0000000000..25e17045c5
--- /dev/null
+++ b/ydb/public/lib/ydb_cli/commands/click_bench_canonical/q9.result
@@ -0,0 +1,11 @@
+"RegionID","sum(AdvEngineID)","c","avg(ResolutionWidth)","uniqExact(UserID)"
+229,2077656,18295832,1506.085243130785,2845673
+2,441662,6687587,1479.8386542111527,1081016
+208,285925,4261812,1285.2593246722286,831676
+169,100887,3320229,1465.9073732564832,604583
+32,81498,1843518,1538.0376568061718,216010
+34,161779,1792369,1548.360152401654,299479
+184,55526,1755192,1506.8082967561384,322661
+42,108820,1542717,1587.1085208758313,243181
+107,120470,1516690,1548.6028970982863,272448
+51,98212,1435578,1579.8860354505293,211505
diff --git a/ydb/public/lib/ydb_cli/commands/ya.make b/ydb/public/lib/ydb_cli/commands/ya.make
index 3b81a5130a..087dd39a8e 100644
--- a/ydb/public/lib/ydb_cli/commands/ya.make
+++ b/ydb/public/lib/ydb_cli/commands/ya.make
@@ -70,6 +70,14 @@ RESOURCE(
     tpch_schema.sql tpch_schema.sql
     click_bench_canonical/q0.result q0.result
     click_bench_canonical/q1.result q1.result
+    click_bench_canonical/q2.result q2.result
+    click_bench_canonical/q3.result q3.result
+    click_bench_canonical/q4.result q4.result
+    click_bench_canonical/q5.result q5.result
+    click_bench_canonical/q6.result q6.result
+    click_bench_canonical/q7.result q7.result
+    click_bench_canonical/q8.result q8.result
+    click_bench_canonical/q9.result q9.result
     click_bench_canonical/q10.result q10.result
     click_bench_canonical/q11.result q11.result
     click_bench_canonical/q12.result q12.result
@@ -80,7 +88,6 @@ RESOURCE(
     click_bench_canonical/q17.result q17.result
     click_bench_canonical/q18.result q18.result
     click_bench_canonical/q19.result q19.result
-    click_bench_canonical/q2.result q2.result
     click_bench_canonical/q20.result q20.result
     click_bench_canonical/q21.result q21.result
     click_bench_canonical/q22.result q22.result
@@ -91,7 +98,6 @@ RESOURCE(
     click_bench_canonical/q27.result q27.result
     click_bench_canonical/q28.result q28.result
     click_bench_canonical/q29.result q29.result
-    click_bench_canonical/q3.result  q3.result
     click_bench_canonical/q30.result q30.result
     click_bench_canonical/q31.result q31.result
     click_bench_canonical/q32.result q32.result
@@ -102,7 +108,6 @@ RESOURCE(
     click_bench_canonical/q37.result q37.result
     click_bench_canonical/q38.result q38.result
     click_bench_canonical/q39.result q39.result
-    click_bench_canonical/q4.result q4.result
     click_bench_canonical/q40.result q40.result
     click_bench_canonical/q41.result q41.result
     click_bench_canonical/q42.result q42.result