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

chore: Fix merge conflicts from merging comet-parquet-exec into main #1323

Merged
merged 2 commits into from
Jan 23, 2025
+3 −629
Merged

chore: Fix merge conflicts from merging comet-parquet-exec into main #1323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
decf212
Remove extra files after merging main into comet-parquet-exec.
mbutrovich Jan 22, 2025
bae65a1
Clean up imports in CometTestBase.
mbutrovich Jan 23, 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
2 changes: 0 additions & 2 deletions native/spark-expr/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
mod error;

mod kernels;
mod schema_adapter;
mod static_invoke;
pub use schema_adapter::SparkSchemaAdapterFactory;
pub use static_invoke::*;

mod struct_funcs;
Expand Down
376 changes: 0 additions & 376 deletions native/spark-expr/src/schema_adapter.rs
View file
Open in desktop

This file was deleted.

Loading
Loading