Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend Sort type support for Parquet Mergetree #20

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Extend Sort type support for Parquet Mergetree #20

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e15ea79
Extend Sort type support for Parquet Mergetree
lmangani Jan 30, 2025
aa8321c
Update parquet_ordered_scan.cpp
lmangani Jan 30, 2025
1539e99
Fix Parquet Types
lmangani Jan 30, 2025
dffc15d
Update parquet_ordered_scan.cpp
lmangani Jan 30, 2025
f13360e
Merge branch 'main' into mergetree-sort-types
lmangani Feb 3, 2025
4ae78bf
Merge branch 'main' into mergetree-sort-types
lmangani Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions chsql/src/parquet_ordered_scan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,19 @@
break;
case Type::BYTE_ARRAY:
return_type = LogicalType::VARCHAR;
break;
case Type::FIXED_LEN_BYTE_ARRAY:
return_type = LogicalType::VARCHAR;
break;
case Type::BOOLEAN:
return_type = LogicalType::TINYINT;
break;
case duckdb_parquet::ConvertedType::TIMESTAMP_MILLIS:

Check failure on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

no member named 'ConvertedType' in namespace 'duckdb_parquet'; did you mean 'duckdb_parquet::format::ConvertedType'?

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::format::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check failure on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

no member named 'ConvertedType' in namespace 'duckdb_parquet'; did you mean 'duckdb_parquet::format::ConvertedType'?

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::format::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check failure on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

no member named 'ConvertedType' in namespace 'duckdb_parquet'; did you mean 'duckdb_parquet::format::ConvertedType'?

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::format::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check failure on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_amd64, x86_64, x64-osx) 

no member named 'ConvertedType' in namespace 'duckdb_parquet'; did you mean 'duckdb_parquet::format::ConvertedType'?

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_amd64, x86_64, x64-osx) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::format::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_amd64, x86_64, x64-osx) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_amd64, x86_64, x64-osx) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_amd64, x86_64, x64-osx) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_amd64, x86_64, x64-osx) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_amd64, x86_64, x64-osx) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_arm64, arm64, arm64-osx) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_arm64, arm64, arm64-osx) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_arm64, arm64, arm64-osx) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 144 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_arm64, arm64, arm64-osx) 

case value not in enumerated type 'Type::type' [-Wswitch]
return_type = LogicalType::TIMESTAMP_MS;
break;
case duckdb_parquet::ConvertedType::TIMESTAMP_MICROS:

Check failure on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

no member named 'ConvertedType' in namespace 'duckdb_parquet'; did you mean 'duckdb_parquet::format::ConvertedType'?

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::format::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check failure on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

no member named 'ConvertedType' in namespace 'duckdb_parquet'; did you mean 'duckdb_parquet::format::ConvertedType'?

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::format::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check failure on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

no member named 'ConvertedType' in namespace 'duckdb_parquet'; did you mean 'duckdb_parquet::format::ConvertedType'?

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::format::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_threads, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_mvp, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / DuckDB-Wasm (wasm_eh, wasm32-emscripten) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check failure on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_amd64, x86_64, x64-osx) 

no member named 'ConvertedType' in namespace 'duckdb_parquet'; did you mean 'duckdb_parquet::format::ConvertedType'?

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_amd64, x86_64, x64-osx) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::format::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_amd64, x86_64, x64-osx) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_amd64, x86_64, x64-osx) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_amd64, x86_64, x64-osx) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_amd64, x86_64, x64-osx) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_arm64, arm64, arm64-osx) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_arm64, arm64, arm64-osx) 

case value not in enumerated type 'Type::type' [-Wswitch]

Check warning on line 147 in chsql/src/parquet_ordered_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries (next) / MacOS (osx_arm64, arm64, arm64-osx) 

comparison of different enumeration types in switch statement ('Type::type' and 'duckdb_parquet::ConvertedType::type') [-Wenum-compare-switch]
return_type = LogicalType::TIMESTAMP;
break;
default:
break;;
}
Expand Down
Loading