Merge pull request #24 from quackscience/fix/read_parquet_mergetree

akvlad · web-flow · commit 9b1908270c22 · 2025-04-04T22:25:27.000+03:00
debug order_by field index calculation
diff --git a/chsql/src/parquet_ordered_scan.cpp b/chsql/src/parquet_ordered_scan.cpp
@@ -48,7 +48,9 @@ namespace duckdb {
             if (order_by_column_it == reader->metadata->metadata->schema.end()) {
 	            orderByIdx = -1;
             } else {
-                orderByIdx = order_by_column_it - reader->metadata->metadata->schema.begin() - 1;
+                orderByIdx = find_if(columnMap.begin(), columnMap.end(),
+                	[&](const int64_t& i) { return i == (order_by_column_it - reader->metadata->metadata->schema.begin() - 1); }) -
+            	 columnMap.begin();
             }
 		}
 		void Scan(ClientContext& ctx) {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ namespace duckdb {`
`48`	`48`	`if (order_by_column_it == reader->metadata->metadata->schema.end()) {`
`49`	`49`	`orderByIdx = -1;`
`50`	`50`	`} else {`
`51`		`- orderByIdx = order_by_column_it - reader->metadata->metadata->schema.begin() - 1;`
	`51`	`+ orderByIdx = find_if(columnMap.begin(), columnMap.end(),`
	`52`	`+ [&](const int64_t& i) { return i == (order_by_column_it - reader->metadata->metadata->schema.begin() - 1); }) -`
	`53`	`+ columnMap.begin();`
`52`	`54`	`}`
`53`	`55`	`}`
`54`	`56`	`void Scan(ClientContext& ctx) {`