Skip to content

fix filter apply and serializer usage #1629

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

Merged
merged 2 commits into from
Feb 6, 2024
Merged

fix filter apply and serializer usage #1629

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
53312e8
fix filter apply
ivanmorozov333 Feb 6, 2024
803b21b
fixes
ivanmorozov333 Feb 6, 2024
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 ydb/core/formats/arrow/serializer/abstract.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ NKikimr::TConclusionStatus TSerializerContainer::DeserializeFromProto(const NKik
NKikimrSchemeOp::TOlapColumn::TSerializer serializerProto;
serializerProto.SetClassName(NArrow::NSerialization::TNativeSerializer::GetClassNameStatic());
*serializerProto.MutableArrowCompression() = proto;
AFL_VERIFY(Initialize(NArrow::NSerialization::TNativeSerializer::GetClassNameStatic()));
AFL_VERIFY(Initialize(NArrow::NSerialization::TNativeSerializer::GetClassNameStatic(), true));
return GetObjectPtr()->DeserializeFromProto(serializerProto);
}

Expand Down
14 changes: 6 additions & 8 deletions ydb/core/tx/columnshard/engines/reader/plain_reader/fetched_data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,10 @@ class TFetchedData {
}

void AddFilter(const std::shared_ptr<NArrow::TColumnFilter>& filter) {
if (UseFilter && Table && filter) {
AFL_VERIFY(filter->Apply(Table));
}
if (!Filter) {
Filter = filter;
} else if (filter) {
*Filter = Filter->CombineSequentialAnd(*filter);
if (!filter) {
return;
}
return AddFilter(*filter);
}

void AddFilter(const NArrow::TColumnFilter& filter) {
Expand All @@ -79,8 +75,10 @@ class TFetchedData {
}
if (!Filter) {
Filter = std::make_shared<NArrow::TColumnFilter>(filter);
} else {
} else if (UseFilter) {
*Filter = Filter->CombineSequentialAnd(filter);
} else {
*Filter = Filter->And(filter);
}
}

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/tx/columnshard/engines/scheme/column_features.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ std::optional<NKikimr::NOlap::TColumnFeatures> TColumnFeatures::BuildFromProto(c
AFL_VERIFY(result.Serializer.DeserializeFromProto(columnInfo.GetSerializer()));
} else if (columnInfo.HasCompression()) {
AFL_VERIFY(result.Serializer.DeserializeFromProto(columnInfo.GetCompression()));
} else {
result.Serializer = NArrow::NSerialization::TSerializerContainer::GetDefaultSerializer();
}
if (columnInfo.HasDictionaryEncoding()) {
auto settings = NArrow::NDictionary::TEncodingSettings::BuildFromProto(columnInfo.GetDictionaryEncoding());
Expand Down
4 changes: 2 additions & 2 deletions ydb/services/bg_tasks/abstract/interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ class TCommonInterfaceContainer {
static_assert(std::is_base_of<IInterface, TDerived>::value);
}

bool Initialize(const TString& className) {
AFL_VERIFY(!Object)("problem", "initialize for not-empty-object");
bool Initialize(const TString& className, const bool maybeExists = false) {
AFL_VERIFY(maybeExists || !Object)("problem", "initialize for not-empty-object");
Object.reset(TFactory::Construct(className));
if (!Object) {
ALS_ERROR(NKikimrServices::BG_TASKS) << "incorrect class name: " << className << " for " << typeid(IInterface).name();
Expand Down