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

RLE and dictionary filter only enabled for UTF8 since format version 17. #3868

Merged
merged 1 commit into from
Feb 8, 2023
Merged

RLE and dictionary filter only enabled for UTF8 since format version 17. #3868

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
8 changes: 4 additions & 4 deletions tiledb/sm/filter/filter_pipeline.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,13 +713,13 @@ Status FilterPipeline::append_encryption_filter(

bool FilterPipeline::skip_offsets_filtering(
const Datatype type, const uint32_t version) const {
if (version >= 12 &&
(type == Datatype::STRING_ASCII || type == Datatype::STRING_UTF8) &&
if (((version >= 12 && type == Datatype::STRING_ASCII) ||
(version >= 17 && type == Datatype::STRING_UTF8)) &&
has_filter(FilterType::FILTER_RLE)) {
return true;
} else if (
version >= 13 &&
(type == Datatype::STRING_ASCII || type == Datatype::STRING_UTF8) &&
((version >= 13 && type == Datatype::STRING_ASCII) ||
(version >= 17 && type == Datatype::STRING_UTF8)) &&
has_filter(FilterType::FILTER_DICTIONARY)) {
return true;
}
Expand Down
3 changes: 2 additions & 1 deletion tiledb/sm/query/readers/reader_base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,8 @@ Status ReaderBase::unfilter_tile_nullable(
// Reverse the tile filters.
// If offsets don't need to be unfiltered separately, it means they
// will be created on the fly from filtered var-length data
if (filters.skip_offsets_filtering(tile->type(), array_schema_.version())) {
if (filters.skip_offsets_filtering(
tile_var->type(), array_schema_.version())) {
RETURN_NOT_OK(filters.run_reverse(
stats_,
tile_var,
Expand Down