Inline sql.

Author: Omega359

benchmarks/sql_benchmarks/sort_pushdown/README.md

@@ -1,9 +1,8 @@
 # Sort pushdown SQL benchmarks
 
 Run the existing sort pushdown queries through `benchmark_runner`. This suite
-uses the same Parquet files and references the original SQL files under
-`benchmarks/queries/`. The `dfbench` implementation and its commands remain
-available for comparison.
+uses the same Parquet files, with queries inlined in each `.benchmark` file.
+The `dfbench` implementation and its commands remain available for comparison.
 
 From `benchmarks/`, prepare data with the existing generators:
 

benchmarks/sql_benchmarks/sort_pushdown/benchmarks/baseline/q01.benchmark

@@ -1,8 +1,14 @@
 template sql_benchmarks/sort_pushdown/sort_pushdown.benchmark.template
 QPAD=01
-QUERY_ID=1
 VARIANT=baseline
 DATASET=sort_pushdown
-QUERY_DIR=sort_pushdown
 SETTINGS=standard
 ORDERING=unordered
+
+run
+-- Sort elimination: ORDER BY sort key ASC (full scan)
+-- With --sorted: SortExec removed, sequential scan in file order
+-- Without --sorted: full SortExec required
+SELECT l_orderkey, l_partkey, l_suppkey
+FROM lineitem
+ORDER BY l_orderkey

benchmarks/sql_benchmarks/sort_pushdown/benchmarks/baseline/q02.benchmark

@@ -1,8 +1,15 @@
 template sql_benchmarks/sort_pushdown/sort_pushdown.benchmark.template
 QPAD=02
-QUERY_ID=2
 VARIANT=baseline
 DATASET=sort_pushdown
-QUERY_DIR=sort_pushdown
 SETTINGS=standard
 ORDERING=unordered
+
+run
+-- Sort elimination + limit pushdown
+-- With --sorted: SortExec removed + limit pushed to DataSourceExec
+-- Without --sorted: TopK sort over all data
+SELECT l_orderkey, l_partkey, l_suppkey
+FROM lineitem
+ORDER BY l_orderkey
+LIMIT 100

benchmarks/sql_benchmarks/sort_pushdown/benchmarks/baseline/q03.benchmark

@@ -1,8 +1,13 @@
 template sql_benchmarks/sort_pushdown/sort_pushdown.benchmark.template
 QPAD=03
-QUERY_ID=3
 VARIANT=baseline
 DATASET=sort_pushdown
-QUERY_DIR=sort_pushdown
 SETTINGS=standard
 ORDERING=unordered
+
+run
+-- Sort elimination: wide projection (all columns)
+-- Tests sort elimination benefit with larger row payload
+SELECT *
+FROM lineitem
+ORDER BY l_orderkey

benchmarks/sql_benchmarks/sort_pushdown/benchmarks/baseline/q04.benchmark

@@ -1,8 +1,13 @@
 template sql_benchmarks/sort_pushdown/sort_pushdown.benchmark.template
 QPAD=04
-QUERY_ID=4
 VARIANT=baseline
 DATASET=sort_pushdown
-QUERY_DIR=sort_pushdown
 SETTINGS=standard
 ORDERING=unordered
+
+run
+-- Sort elimination + limit: wide projection
+SELECT *
+FROM lineitem
+ORDER BY l_orderkey
+LIMIT 100

benchmarks/sql_benchmarks/sort_pushdown/benchmarks/baseline/q05.benchmark

@@ -1,8 +1,15 @@
 template sql_benchmarks/sort_pushdown/sort_pushdown.benchmark.template
 QPAD=05
-QUERY_ID=5
 VARIANT=baseline
 DATASET=sort_pushdown
-QUERY_DIR=sort_pushdown
 SETTINGS=standard
 ORDERING=unordered
+
+run
+-- Reverse scan: ORDER BY DESC LIMIT (narrow projection)
+-- With --sorted: reverse_row_groups=true + TopK + stats init + cumulative prune
+-- Without --sorted: full TopK sort over all data
+SELECT l_orderkey, l_partkey, l_suppkey
+FROM lineitem
+ORDER BY l_orderkey DESC
+LIMIT 100

benchmarks/sql_benchmarks/sort_pushdown/benchmarks/baseline/q06.benchmark

@@ -1,8 +1,13 @@
 template sql_benchmarks/sort_pushdown/sort_pushdown.benchmark.template
 QPAD=06
-QUERY_ID=6
 VARIANT=baseline
 DATASET=sort_pushdown
-QUERY_DIR=sort_pushdown
 SETTINGS=standard
 ORDERING=unordered
+
+run
+-- Reverse scan: ORDER BY DESC LIMIT larger fetch (narrow projection)
+SELECT l_orderkey, l_partkey, l_suppkey
+FROM lineitem
+ORDER BY l_orderkey DESC
+LIMIT 1000

benchmarks/sql_benchmarks/sort_pushdown/benchmarks/baseline/q07.benchmark

@@ -1,8 +1,13 @@
 template sql_benchmarks/sort_pushdown/sort_pushdown.benchmark.template
 QPAD=07
-QUERY_ID=7
 VARIANT=baseline
 DATASET=sort_pushdown
-QUERY_DIR=sort_pushdown
 SETTINGS=standard
 ORDERING=unordered
+
+run
+-- Reverse scan: wide projection + DESC LIMIT
+SELECT *
+FROM lineitem
+ORDER BY l_orderkey DESC
+LIMIT 100

benchmarks/sql_benchmarks/sort_pushdown/benchmarks/baseline/q08.benchmark

@@ -1,8 +1,13 @@
 template sql_benchmarks/sort_pushdown/sort_pushdown.benchmark.template
 QPAD=08
-QUERY_ID=8
 VARIANT=baseline
 DATASET=sort_pushdown
-QUERY_DIR=sort_pushdown
 SETTINGS=standard
 ORDERING=unordered
+
+run
+-- Reverse scan: wide projection + DESC LIMIT larger fetch
+SELECT *
+FROM lineitem
+ORDER BY l_orderkey DESC
+LIMIT 1000

benchmarks/sql_benchmarks/sort_pushdown/benchmarks/inexact/q01.benchmark

@@ -1,8 +1,16 @@
 template sql_benchmarks/sort_pushdown/sort_pushdown.benchmark.template
 QPAD=01
-QUERY_ID=1
 VARIANT=inexact
 DATASET=sort_pushdown_inexact
-QUERY_DIR=sort_pushdown_inexact
 SETTINGS=inexact
 ORDERING=ordered
+
+run
+-- Inexact path: TopK + DESC LIMIT on ASC-declared file.
+-- With RG reorder, the first RG read contains the highest max value,
+-- so TopK's threshold tightens quickly and subsequent RGs get filtered
+-- efficiently via dynamic filter pushdown.
+SELECT l_orderkey, l_partkey, l_suppkey
+FROM lineitem
+ORDER BY l_orderkey DESC
+LIMIT 100