fix tests

ivanmorozov333 · ivanmorozov333 · commit cb13d3293c80 · 2024-03-26T08:00:23.000+03:00
diff --git a/ydb/core/tx/columnshard/engines/scheme/statistics/abstract/constructor.h b/ydb/core/tx/columnshard/engines/scheme/statistics/abstract/constructor.h
@@ -20,7 +20,7 @@ class IConstructor {
     YDB_READONLY(EType, Type, EType::Undefined);
     IConstructor() = default;
 protected:
-    virtual TConclusion<TOperatorContainer> DoCreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const = 0;
+    virtual TConclusion<std::shared_ptr<IOperator>> DoCreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const = 0;
     virtual bool DoDeserializeFromProto(const NKikimrColumnShardStatisticsProto::TConstructorContainer& proto) = 0;
     virtual void DoSerializeToProto(NKikimrColumnShardStatisticsProto::TConstructorContainer& proto) const = 0;
     virtual TConclusionStatus DoDeserializeFromJson(const NJson::TJsonValue& jsonData) = 0;
@@ -39,8 +39,12 @@ class IConstructor {
         return DoDeserializeFromJson(jsonData);
     }
 
-    TConclusion<TOperatorContainer> CreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const {
-        return DoCreateOperator(currentSchema);
+    TConclusion<TOperatorContainer> CreateOperator(const TString& name, const NSchemeShard::TOlapSchema& currentSchema) const {
+        auto result = DoCreateOperator(currentSchema);
+        if (!result) {
+            return result.GetError();
+        }
+        return TOperatorContainer(name, result.DetachResult());
     }
 
     TString GetClassName() const {
diff --git a/ydb/core/tx/columnshard/engines/scheme/statistics/abstract/operator.h b/ydb/core/tx/columnshard/engines/scheme/statistics/abstract/operator.h
@@ -72,13 +72,13 @@ class TOperatorContainer: public NBackgroundTasks::TInterfaceProtoContainer<IOpe
     std::optional<TPortionStorageCursor> Cursor;
     using TBase = NBackgroundTasks::TInterfaceProtoContainer<IOperator>;
 public:
-    using TBase::TBase;
+    TOperatorContainer() = default;
 
     TOperatorContainer(const TString& name, const std::shared_ptr<IOperator>& object)
         : TBase(object)
         , Name(name)
     {
-
+        AFL_VERIFY(Name);
     }
 
     const TPortionStorageCursor& GetCursorVerified() const {
diff --git a/ydb/core/tx/columnshard/engines/scheme/statistics/max/constructor.cpp b/ydb/core/tx/columnshard/engines/scheme/statistics/max/constructor.cpp
@@ -3,12 +3,12 @@
 
 namespace NKikimr::NOlap::NStatistics::NMax {
 
-NKikimr::TConclusion<TOperatorContainer> TConstructor::DoCreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const {
+NKikimr::TConclusion<std::shared_ptr<IOperator>> TConstructor::DoCreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const {
     auto column = currentSchema.GetColumns().GetByName(ColumnName);
     if (!TOperator::IsAvailableType(column->GetType())) {
         return TConclusionStatus::Fail("incorrect type for stat calculation");
     }
-    return TOperatorContainer(std::make_shared<TOperator>(column->GetId()));
+    return std::make_shared<TOperator>(column->GetId());
 }
 
 bool TConstructor::DoDeserializeFromProto(const NKikimrColumnShardStatisticsProto::TConstructorContainer& proto) {
diff --git a/ydb/core/tx/columnshard/engines/scheme/statistics/max/constructor.h b/ydb/core/tx/columnshard/engines/scheme/statistics/max/constructor.h
@@ -12,7 +12,7 @@ class TConstructor: public IConstructor {
     static inline const auto Registrator = TFactory::TRegistrator<TConstructor>(::ToString(EType::Max));
     YDB_READONLY(TString, ColumnName, 0);
 protected:
-    virtual TConclusion<TOperatorContainer> DoCreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const override;
+    virtual TConclusion<std::shared_ptr<IOperator>> DoCreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const override;
     virtual bool DoDeserializeFromProto(const NKikimrColumnShardStatisticsProto::TConstructorContainer& proto) override;
     virtual void DoSerializeToProto(NKikimrColumnShardStatisticsProto::TConstructorContainer& proto) const override;
     virtual TConclusionStatus DoDeserializeFromJson(const NJson::TJsonValue& jsonData) override;
diff --git a/ydb/core/tx/columnshard/engines/scheme/statistics/variability/constructor.cpp b/ydb/core/tx/columnshard/engines/scheme/statistics/variability/constructor.cpp
@@ -3,12 +3,12 @@
 
 namespace NKikimr::NOlap::NStatistics::NVariability {
 
-NKikimr::TConclusion<TOperatorContainer> TConstructor::DoCreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const {
+NKikimr::TConclusion<std::shared_ptr<IOperator>> TConstructor::DoCreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const {
     auto column = currentSchema.GetColumns().GetByName(ColumnName);
     if (!TOperator::IsAvailableType(column->GetType())) {
         return TConclusionStatus::Fail("incorrect type for stat calculation");
     }
-    return TOperatorContainer(std::make_shared<TOperator>(column->GetId()));
+    return std::make_shared<TOperator>(column->GetId());
 }
 
 bool TConstructor::DoDeserializeFromProto(const NKikimrColumnShardStatisticsProto::TConstructorContainer& proto) {
diff --git a/ydb/core/tx/columnshard/engines/scheme/statistics/variability/constructor.h b/ydb/core/tx/columnshard/engines/scheme/statistics/variability/constructor.h
@@ -12,7 +12,7 @@ class TConstructor: public IConstructor {
     static inline const auto Registrator = TFactory::TRegistrator<TConstructor>(::ToString(EType::Variability));
     YDB_READONLY(TString, ColumnName, 0);
 protected:
-    virtual TConclusion<TOperatorContainer> DoCreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const override;
+    virtual TConclusion<std::shared_ptr<IOperator>> DoCreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const override;
     virtual bool DoDeserializeFromProto(const NKikimrColumnShardStatisticsProto::TConstructorContainer& proto) override;
     virtual void DoSerializeToProto(NKikimrColumnShardStatisticsProto::TConstructorContainer& proto) const override;
     virtual TConclusionStatus DoDeserializeFromJson(const NJson::TJsonValue& jsonData) override;
diff --git a/ydb/core/tx/schemeshard/olap/statistics/schema.cpp b/ydb/core/tx/schemeshard/olap/statistics/schema.cpp
@@ -4,24 +4,22 @@
 namespace NKikimr::NSchemeShard {
 
 void TOlapStatisticsSchema::SerializeToProto(NKikimrColumnShardStatisticsProto::TOperatorContainer& proto) const {
-    proto.SetName(Name);
     Operator.SerializeToProto(proto);
 }
 
 bool TOlapStatisticsSchema::DeserializeFromProto(const NKikimrColumnShardStatisticsProto::TOperatorContainer& proto) {
-    Name = proto.GetName();
     AFL_VERIFY(Operator.DeserializeFromProto(proto))("incorrect_proto", proto.DebugString());
     return true;
 }
 
 bool TOlapStatisticsSchema::ApplyUpdate(const TOlapSchema& /*currentSchema*/, const TOlapStatisticsUpsert& upsert, IErrorCollector& errors) {
-    AFL_VERIFY(upsert.GetName() == GetName());
+    AFL_VERIFY(upsert.GetName() == Operator.GetName());
     AFL_VERIFY(!!upsert.GetConstructor());
     if (upsert.GetConstructor().GetClassName() != Operator.GetClassName()) {
         errors.AddError("different index classes: " + upsert.GetConstructor().GetClassName() + " vs " + Operator.GetClassName());
         return false;
     }
-    errors.AddError("cannot modify statistics calculation for " + GetName() + ". not implemented currently.");
+    errors.AddError("cannot modify statistics calculation for " + Operator.GetName() + ". not implemented currently.");
     return false;
 }
 
@@ -33,12 +31,12 @@ bool TOlapStatisticsDescription::ApplyUpdate(const TOlapSchema& currentSchema, c
                 return false;
             }
         } else {
-            auto meta = stat.GetConstructor()->CreateOperator(currentSchema);
+            auto meta = stat.GetConstructor()->CreateOperator(stat.GetName(), currentSchema);
             if (!meta) {
                 errors.AddError(meta.GetErrorMessage());
                 return false;
             }
-            TOlapStatisticsSchema object(stat.GetName(), meta.DetachResult());
+            TOlapStatisticsSchema object(meta.DetachResult());
             Y_ABORT_UNLESS(ObjectsByName.emplace(stat.GetName(), std::move(object)).second);
         }
     }
diff --git a/ydb/core/tx/schemeshard/olap/statistics/schema.h b/ydb/core/tx/schemeshard/olap/statistics/schema.h
@@ -7,16 +7,14 @@ class TOlapSchema;
 
 class TOlapStatisticsSchema {
 private:
-    YDB_READONLY_DEF(TString, Name);
     YDB_READONLY_DEF(NOlap::NStatistics::TOperatorContainer, Operator);
 public:
     TOlapStatisticsSchema() = default;
 
-    TOlapStatisticsSchema(const TString& name, const NOlap::NStatistics::TOperatorContainer& container)
-        : Name(name)
-        , Operator(container)
+    TOlapStatisticsSchema(const NOlap::NStatistics::TOperatorContainer& container)
+        : Operator(container)
     {
-
+        AFL_VERIFY(container.GetName());
     }
 
     bool ApplyUpdate(const TOlapSchema& currentSchema, const TOlapStatisticsUpsert& upsert, IErrorCollector& errors);
diff --git a/ydb/library/conclusion/result.h b/ydb/library/conclusion/result.h
@@ -30,11 +30,13 @@ class TConclusion {
         Y_ABORT_UNLESS(IsFail());
     }
 
-    TConclusion(TResult&& result)
+    template <class TResultArg>
+    TConclusion(TResultArg&& result)
         : Result(std::move(result)) {
     }
 
-    TConclusion(const TResult& result)
+    template <class TResultArg>
+    TConclusion(const TResultArg& result)
         : Result(result) {
     }
 

Original file line number	Diff line number	Diff line change
`@@ -72,13 +72,13 @@ class TOperatorContainer: public NBackgroundTasks::TInterfaceProtoContainer<IOpe`
`72`	`72`	`std::optional<TPortionStorageCursor> Cursor;`
`73`	`73`	`using TBase = NBackgroundTasks::TInterfaceProtoContainer<IOperator>;`
`74`	`74`	`public:`
`75`		`- using TBase::TBase;`
	`75`	`+ TOperatorContainer() = default;`
`76`	`76`
`77`	`77`	`TOperatorContainer(const TString& name, const std::shared_ptr<IOperator>& object)`
`78`	`78`	`: TBase(object)`
`79`	`79`	`, Name(name)`
`80`	`80`	`{`
`81`		`-`
	`81`	`+ AFL_VERIFY(Name);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`const TPortionStorageCursor& GetCursorVerified() const {`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@`
`3`	`3`
`4`	`4`	`namespace NKikimr::NOlap::NStatistics::NMax {`
`5`	`5`
`6`		`-NKikimr::TConclusion<TOperatorContainer> TConstructor::DoCreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const {`
	`6`	`+NKikimr::TConclusion<std::shared_ptr<IOperator>> TConstructor::DoCreateOperator(const NSchemeShard::TOlapSchema& currentSchema) const {`
`7`	`7`	`auto column = currentSchema.GetColumns().GetByName(ColumnName);`
`8`	`8`	`if (!TOperator::IsAvailableType(column->GetType())) {`
`9`	`9`	`return TConclusionStatus::Fail("incorrect type for stat calculation");`
`10`	`10`	`}`
`11`		`- return TOperatorContainer(std::make_shared<TOperator>(column->GetId()));`
	`11`	`+ return std::make_shared<TOperator>(column->GetId());`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`bool TConstructor::DoDeserializeFromProto(const NKikimrColumnShardStatisticsProto::TConstructorContainer& proto) {`
Original file line number	Diff line number	Diff line change
`@@ -4,24 +4,22 @@`
`4`	`4`	`namespace NKikimr::NSchemeShard {`
`5`	`5`
`6`	`6`	`void TOlapStatisticsSchema::SerializeToProto(NKikimrColumnShardStatisticsProto::TOperatorContainer& proto) const {`
`7`		`- proto.SetName(Name);`
`8`	`7`	`Operator.SerializeToProto(proto);`
`9`	`8`	`}`
`10`	`9`
`11`	`10`	`bool TOlapStatisticsSchema::DeserializeFromProto(const NKikimrColumnShardStatisticsProto::TOperatorContainer& proto) {`
`12`		`- Name = proto.GetName();`
`13`	`11`	`AFL_VERIFY(Operator.DeserializeFromProto(proto))("incorrect_proto", proto.DebugString());`
`14`	`12`	`return true;`
`15`	`13`	`}`
`16`	`14`
`17`	`15`	`bool TOlapStatisticsSchema::ApplyUpdate(const TOlapSchema& /currentSchema/, const TOlapStatisticsUpsert& upsert, IErrorCollector& errors) {`
`18`		`- AFL_VERIFY(upsert.GetName() == GetName());`
	`16`	`+ AFL_VERIFY(upsert.GetName() == Operator.GetName());`
`19`	`17`	`AFL_VERIFY(!!upsert.GetConstructor());`
`20`	`18`	`if (upsert.GetConstructor().GetClassName() != Operator.GetClassName()) {`
`21`	`19`	`errors.AddError("different index classes: " + upsert.GetConstructor().GetClassName() + " vs " + Operator.GetClassName());`
`22`	`20`	`return false;`
`23`	`21`	`}`
`24`		`- errors.AddError("cannot modify statistics calculation for " + GetName() + ". not implemented currently.");`
	`22`	`+ errors.AddError("cannot modify statistics calculation for " + Operator.GetName() + ". not implemented currently.");`
`25`	`23`	`return false;`
`26`	`24`	`}`
`27`	`25`
`@@ -33,12 +31,12 @@ bool TOlapStatisticsDescription::ApplyUpdate(const TOlapSchema& currentSchema, c`
`33`	`31`	`return false;`
`34`	`32`	`}`
`35`	`33`	`} else {`
`36`		`- auto meta = stat.GetConstructor()->CreateOperator(currentSchema);`
	`34`	`+ auto meta = stat.GetConstructor()->CreateOperator(stat.GetName(), currentSchema);`
`37`	`35`	`if (!meta) {`
`38`	`36`	`errors.AddError(meta.GetErrorMessage());`
`39`	`37`	`return false;`
`40`	`38`	`}`
`41`		`- TOlapStatisticsSchema object(stat.GetName(), meta.DetachResult());`
	`39`	`+ TOlapStatisticsSchema object(meta.DetachResult());`
`42`	`40`	`Y_ABORT_UNLESS(ObjectsByName.emplace(stat.GetName(), std::move(object)).second);`
`43`	`41`	`}`
`44`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,13 @@ class TConclusion {`
`30`	`30`	`Y_ABORT_UNLESS(IsFail());`
`31`	`31`	`}`
`32`	`32`
`33`		`- TConclusion(TResult&& result)`
	`33`	`+ template <class TResultArg>`
	`34`	`+ TConclusion(TResultArg&& result)`
`34`	`35`	`: Result(std::move(result)) {`
`35`	`36`	`}`
`36`	`37`
`37`		`- TConclusion(const TResult& result)`
	`38`	`+ template <class TResultArg>`
	`39`	`+ TConclusion(const TResultArg& result)`
`38`	`40`	`: Result(result) {`
`39`	`41`	`}`
`40`	`42`