File tree 4 files changed +9
-13
lines changed
services/bg_tasks/abstract
4 files changed +9
-13
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ NKikimr::TConclusionStatus TSerializerContainer::DeserializeFromProto(const NKik
6
6
NKikimrSchemeOp::TOlapColumn::TSerializer serializerProto;
7
7
serializerProto.SetClassName (NArrow::NSerialization::TNativeSerializer::GetClassNameStatic ());
8
8
*serializerProto.MutableArrowCompression () = proto;
9
- AFL_VERIFY (Initialize (NArrow::NSerialization::TNativeSerializer::GetClassNameStatic ()));
9
+ AFL_VERIFY (Initialize (NArrow::NSerialization::TNativeSerializer::GetClassNameStatic (), true ));
10
10
return GetObjectPtr ()->DeserializeFromProto (serializerProto);
11
11
}
12
12
Original file line number Diff line number Diff line change @@ -63,14 +63,10 @@ class TFetchedData {
63
63
}
64
64
65
65
void AddFilter (const std::shared_ptr<NArrow::TColumnFilter>& filter) {
66
- if (UseFilter && Table && filter) {
67
- AFL_VERIFY (filter->Apply (Table));
68
- }
69
- if (!Filter) {
70
- Filter = filter;
71
- } else if (filter) {
72
- *Filter = Filter->CombineSequentialAnd (*filter);
66
+ if (!filter) {
67
+ return ;
73
68
}
69
+ return AddFilter (*filter);
74
70
}
75
71
76
72
void AddFilter (const NArrow::TColumnFilter& filter) {
@@ -79,8 +75,10 @@ class TFetchedData {
79
75
}
80
76
if (!Filter) {
81
77
Filter = std::make_shared<NArrow::TColumnFilter>(filter);
82
- } else {
78
+ } else if (UseFilter) {
83
79
*Filter = Filter->CombineSequentialAnd (filter);
80
+ } else {
81
+ *Filter = Filter->And (filter);
84
82
}
85
83
}
86
84
Original file line number Diff line number Diff line change @@ -33,8 +33,6 @@ std::optional<NKikimr::NOlap::TColumnFeatures> TColumnFeatures::BuildFromProto(c
33
33
AFL_VERIFY (result.Serializer .DeserializeFromProto (columnInfo.GetSerializer ()));
34
34
} else if (columnInfo.HasCompression ()) {
35
35
AFL_VERIFY (result.Serializer .DeserializeFromProto (columnInfo.GetCompression ()));
36
- } else {
37
- result.Serializer = NArrow::NSerialization::TSerializerContainer::GetDefaultSerializer ();
38
36
}
39
37
if (columnInfo.HasDictionaryEncoding ()) {
40
38
auto settings = NArrow::NDictionary::TEncodingSettings::BuildFromProto (columnInfo.GetDictionaryEncoding ());
Original file line number Diff line number Diff line change @@ -117,8 +117,8 @@ class TCommonInterfaceContainer {
117
117
static_assert (std::is_base_of<IInterface, TDerived>::value);
118
118
}
119
119
120
- bool Initialize (const TString& className) {
121
- AFL_VERIFY (!Object)(" problem" , " initialize for not-empty-object" );
120
+ bool Initialize (const TString& className, const bool maybeExists = false ) {
121
+ AFL_VERIFY (maybeExists || !Object)(" problem" , " initialize for not-empty-object" );
122
122
Object.reset (TFactory::Construct (className));
123
123
if (!Object) {
124
124
ALS_ERROR (NKikimrServices::BG_TASKS) << " incorrect class name: " << className << " for " << typeid (IInterface).name ();
You can’t perform that action at this time.
0 commit comments