Merge 608d4b4 into d2299da

Author: ivanmorozov333

ydb/core/formats/arrow/accessor/abstract/constructor.h

@@ -25,10 +25,15 @@ class IConstructor {
     virtual TString DoDebugString() const {
         return "";
     }
+    virtual bool DoIsEqualWithSameTypeTo(const IConstructor& item) const = 0;
 
 public:
     virtual ~IConstructor() = default;
 
+    bool IsEqualWithSameTypeTo(const IConstructor& item) const {
+        return DoIsEqualWithSameTypeTo(item);
+    }
+
     TString DebugString() const {
         return TStringBuilder() << GetClassName() << ":" << DoDebugString();
     }
@@ -69,6 +74,19 @@ class TConstructorContainer: public NBackgroundTasks::TInterfaceProtoContainer<I
 public:
     using TBase::TBase;
 
+    bool IsEqualTo(const TConstructorContainer& item) {
+        if (!GetObjectPtr() && !item.GetObjectPtr()) {
+            return true;
+        } else if (!!GetObjectPtr() && !!item.GetObjectPtr()) {
+            if (GetObjectPtr()->GetClassName() != item.GetObjectPtr()->GetClassName()) {
+                return false;
+            }
+            return GetObjectPtr()->IsEqualWithSameTypeTo(*item.GetObjectPtr());
+        } else {
+            return false;
+        }
+    }
+
     static TConstructorContainer GetDefaultConstructor();
 };
 

ydb/core/formats/arrow/accessor/plain/constructor.h

@@ -12,6 +12,11 @@ class TConstructor: public IConstructor {
 
 private:
     static inline auto Registrator = TFactory::TRegistrator<TConstructor>(GetClassNameStatic());
+
+    virtual bool DoIsEqualWithSameTypeTo(const IConstructor& /*item*/) const override {
+        return true;
+    }
+
     virtual TConclusion<std::shared_ptr<NArrow::NAccessor::IChunkedArray>> DoConstruct(
         const std::shared_ptr<arrow::RecordBatch>& originalData, const TChunkConstructionData& externalInfo) const override;
     virtual NKikimrArrowAccessorProto::TConstructor DoSerializeToProto() const override;

ydb/core/formats/arrow/accessor/sparsed/constructor.h

@@ -12,6 +12,11 @@ class TConstructor: public IConstructor {
 
 private:
     static inline auto Registrator = TFactory::TRegistrator<TConstructor>(GetClassNameStatic());
+
+    virtual bool DoIsEqualWithSameTypeTo(const IConstructor& /*item*/) const override {
+        return true;
+    }
+
     virtual TConclusion<std::shared_ptr<NArrow::NAccessor::IChunkedArray>> DoConstruct(
         const std::shared_ptr<arrow::RecordBatch>& originalData, const TChunkConstructionData& externalInfo) const override;
     virtual NKikimrArrowAccessorProto::TConstructor DoSerializeToProto() const override;

ydb/core/formats/arrow/save_load/loader.h

@@ -34,6 +34,12 @@ class TColumnLoader {
         if (!Serializer.IsEqualTo(item.Serializer)) {
             return false;
         }
+        if (!AccessorConstructor->IsEqualTo(item.AccessorConstructor)) {
+            return false;
+        }
+        if (NArrow::ScalarCompareNullable(DefaultValue, item.DefaultValue)) {
+            return false;
+        }
         return true;
     }