post-review fixes

ydb-platform · Jan 23, 2025 · 1cf5f02 · 1cf5f02
1 parent 06990a6
commit 1cf5f02
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/ydb/core/formats/arrow/serializer/native.cpp b/ydb/core/formats/arrow/serializer/native.cpp
@@ -143,7 +143,7 @@ NKikimr::TConclusionStatus TNativeSerializer::DoDeserializeFromRequest(NYql::TFe
             level = levelLocal;
         }
     }
-    auto codecPtrStatus = BuildCodec(codec.value_or(GetDefaultCompressionType()), level);
+    auto codecPtrStatus = BuildCodec(codec.value_or(Options.codec->compression_type()), level);
     if (!codecPtrStatus) {
         return codecPtrStatus.GetError();
     }

diff --git a/ydb/core/formats/arrow/serializer/native.h b/ydb/core/formats/arrow/serializer/native.h
@@ -23,10 +23,6 @@ class TNativeSerializer: public ISerializer {
 private:
     arrow::ipc::IpcWriteOptions Options;
 
-    static inline std::shared_ptr<arrow::util::Codec> DefaultCodec() {
-        return NArrow::TStatusValidator::GetValid(arrow::util::Codec::Create(arrow::Compression::type::ZSTD, 1));
-    }
-
     TConclusion<std::shared_ptr<arrow::util::Codec>> BuildCodec(const arrow::Compression::type& cType, const std::optional<ui32> level) const;
     static const inline TFactory::TRegistrator<TNativeSerializer> Registrator = TFactory::TRegistrator<TNativeSerializer>(GetClassNameStatic());
 protected:
@@ -67,7 +63,7 @@ class TNativeSerializer: public ISerializer {
     static std::shared_ptr<arrow::util::Codec> GetDefaultCodec() {
         if (!HasAppData() ||
             (!AppData()->ColumnShardConfig.HasDefaultCompression() && !AppData()->ColumnShardConfig.HasDefaultCompressionLevel())) {
-            return DefaultCodec();
+            return NArrow::TStatusValidator::GetValid(arrow::util::Codec::Create(arrow::Compression::type::ZSTD, 1));
         }
         arrow::Compression::type codec = GetDefaultCompressionType();
         if (AppData()->ColumnShardConfig.HasDefaultCompressionLevel()) {

diff --git a/ydb/core/formats/arrow/serializer/utils.cpp b/ydb/core/formats/arrow/serializer/utils.cpp
@@ -20,10 +20,6 @@ bool SupportsCompressionLevel(const arrow::Compression::type compression, const
     return true;
 }
 
-bool SupportsCompressionLevel(const NKikimrSchemeOp::EColumnCodec compression, const i32 compressionLevel) {
-    return SupportsCompressionLevel(CompressionFromProto(compression).value(), compressionLevel);
-}
-
 std::optional<int> MinimumCompressionLevel(const arrow::Compression::type compression) {
     if (!SupportsCompressionLevel(compression)) {
         return {};