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

feat: update ComplexFilterPushdown() #73

Closed
wants to merge 1 commit into from
Closed

feat: update ComplexFilterPushdown() #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion duckdb
Open in desktop
Submodule duckdb updated 3558 files
8 changes: 5 additions & 3 deletions src/functions/delta_scan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,13 +438,15 @@
initialized = true;
}

unique_ptr<MultiFileList> DeltaSnapshot::ComplexFilterPushdown(ClientContext &context, const MultiFileReaderOptions &options, LogicalGet &get,
vector<unique_ptr<Expression>> &filters) {
unique_ptr<MultiFileList> DeltaSnapshot::ComplexFilterPushdown(ClientContext &context,
const MultiFileReaderOptions &options,
MultiFilePushdownInfo &info,

Check failure on line 443 in src/functions/delta_scan.cpp

View workflow job for this annotation

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

unknown type name 'MultiFilePushdownInfo'

Check failure on line 443 in src/functions/delta_scan.cpp

View workflow job for this annotation

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

unknown type name 'MultiFilePushdownInfo'

Check failure on line 443 in src/functions/delta_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / Linux (linux_amd64, ubuntu:18.04, x64-linux) 

'MultiFilePushdownInfo' has not been declared

Check failure on line 443 in src/functions/delta_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / Linux (linux_amd64, ubuntu:18.04, x64-linux) 

'MultiFilePushdownInfo' has not been declared
vector<unique_ptr<Expression>> &filters) {
FilterCombiner combiner(context);
for (const auto &filter : filters) {
combiner.AddFilter(filter->Copy());
}
auto filterstmp = combiner.GenerateTableScanFilters(get.column_ids);
auto filterstmp = combiner.GenerateTableScanFilters(info.column_ids);

Check failure on line 449 in src/functions/delta_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / Linux (linux_amd64, ubuntu:18.04, x64-linux) 

request for member 'column_ids' in 'info', which is of non-class type 'int'

Check failure on line 449 in src/functions/delta_scan.cpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / Linux (linux_amd64, ubuntu:18.04, x64-linux) 

request for member 'column_ids' in 'info', which is of non-class type 'int'

// TODO: can/should we figure out if this filtered anything?
auto filtered_list = make_uniq<DeltaSnapshot>(context, paths[0]);
Expand Down
5 changes: 3 additions & 2 deletions src/include/functions/delta_scan.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@
//! MultiFileList API
public:
void Bind(vector<LogicalType> &return_types, vector<string> &names);
unique_ptr<MultiFileList> ComplexFilterPushdown(ClientContext &context,

Check failure on line 45 in src/include/functions/delta_scan.hpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / Linux (linux_amd64, ubuntu:18.04, x64-linux) 

'duckdb::unique_ptr<duckdb::MultiFileList, std::default_delete<duckdb::MultiFileList>, true> duckdb::DeltaSnapshot::ComplexFilterPushdown(duckdb::ClientContext&, const duckdb::MultiFileReaderOptions&, int&, duckdb::vector<duckdb::unique_ptr<duckdb::Expression> >&)' marked 'override', but does not override

Check failure on line 45 in src/include/functions/delta_scan.hpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / Linux (linux_amd64, ubuntu:18.04, x64-linux) 

'duckdb::unique_ptr<duckdb::MultiFileList, std::default_delete<duckdb::MultiFileList>, true> duckdb::DeltaSnapshot::ComplexFilterPushdown(duckdb::ClientContext&, const duckdb::MultiFileReaderOptions&, int&, duckdb::vector<duckdb::unique_ptr<duckdb::Expression> >&)' marked 'override', but does not override
const MultiFileReaderOptions &options, LogicalGet &get,
vector<unique_ptr<Expression>> &filters) override;
const MultiFileReaderOptions &options,
MultiFilePushdownInfo &info,

Check failure on line 47 in src/include/functions/delta_scan.hpp

View workflow job for this annotation

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

unknown type name 'MultiFilePushdownInfo'

Check failure on line 47 in src/include/functions/delta_scan.hpp

View workflow job for this annotation

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

unknown type name 'MultiFilePushdownInfo'

Check failure on line 47 in src/include/functions/delta_scan.hpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / Linux (linux_amd64, ubuntu:18.04, x64-linux) 

'MultiFilePushdownInfo' has not been declared

Check failure on line 47 in src/include/functions/delta_scan.hpp

View workflow job for this annotation

GitHub Actions / Build extension binaries / Linux (linux_amd64, ubuntu:18.04, x64-linux) 

'MultiFilePushdownInfo' has not been declared
vector<unique_ptr<Expression>> &filters) override;
vector<string> GetAllFiles() override;
FileExpandResult GetExpandResult() override;
idx_t GetTotalFileCount() override;
Expand Down
Loading