Intermediate changes

7 files changed, 23 insertions, 24 deletions

diff --git a/yt/yt/library/column_converters/boolean_column_converter.cpp b/yt/yt/library/column_converters/boolean_column_converter.cpp
index 37e27bc56c8..7462f940ec6 100644
--- a/yt/yt/library/column_converters/boolean_column_converter.cpp
+++ b/yt/yt/library/column_converters/boolean_column_converter.cpp
@@ -36,7 +36,7 @@ public:
         , ColumnSchema_(columnSchema)
     { }
 
-    TConvertedColumn Convert(const std::vector<TUnversionedRowValues>& rowsValues) override
+    TConvertedColumn Convert(TRange<TUnversionedRowValues> rowsValues) override
     {
         Reset();
         AddValues(rowsValues);
@@ -74,11 +74,11 @@ private:
         NullBitmap_.Flush<TConverterTag>();
     }
 
-    void AddValues(const std::vector<TUnversionedRowValues>& rowsValues)
+    void AddValues(TRange<TUnversionedRowValues> rowsValues)
     {
-        for (auto rowValues : rowsValues) {
+        for (const auto& rowValues : rowsValues) {
             auto value = rowValues[ColumnIndex_];
-            bool isNull = value == nullptr || value->Type == NTableClient::EValueType::Null;
+            bool isNull = !value || value->Type == NTableClient::EValueType::Null;
             bool data = isNull ? false : value->Data.Boolean;
             NullBitmap_.Append(isNull);
             Values_.Append(data);
diff --git a/yt/yt/library/column_converters/column_converter.cpp b/yt/yt/library/column_converters/column_converter.cpp
index 21c99825490..4a9665d48b1 100644
--- a/yt/yt/library/column_converters/column_converter.cpp
+++ b/yt/yt/library/column_converters/column_converter.cpp
@@ -69,9 +69,8 @@ TConvertedColumnRange ConvertRowsToColumns(
     std::vector<TUnversionedRowValues> rowsValues;
     rowsValues.reserve(rows.size());
 
-    for (const auto& row : rows) {
-        TUnversionedRowValues rowValues;
-        rowValues.resize(columnSchema.size(), nullptr);
+    for (auto row : rows) {
+        TUnversionedRowValues rowValues(columnSchema.size(), nullptr);
         for (const auto* item = row.Begin(); item != row.End(); ++item) {
             rowValues[item->Id] = item;
         }
diff --git a/yt/yt/library/column_converters/column_converter.h b/yt/yt/library/column_converters/column_converter.h
index 64cec2fd44b..13f4b5d133f 100644
--- a/yt/yt/library/column_converters/column_converter.h
+++ b/yt/yt/library/column_converters/column_converter.h
@@ -38,7 +38,7 @@ struct IColumnConverter
     : private TNonCopyable
 {
     virtual ~IColumnConverter() = default;
-    virtual TConvertedColumn Convert(const std::vector<TUnversionedRowValues>& rowsValues) = 0;
+    virtual TConvertedColumn Convert(TRange<TUnversionedRowValues> rowsValues) = 0;
 };
 
 using IColumnConverterPtr = std::unique_ptr<IColumnConverter>;
diff --git a/yt/yt/library/column_converters/floating_point_column_converter.cpp b/yt/yt/library/column_converters/floating_point_column_converter.cpp
index bc18a53f145..0dcb86d21a8 100644
--- a/yt/yt/library/column_converters/floating_point_column_converter.cpp
+++ b/yt/yt/library/column_converters/floating_point_column_converter.cpp
@@ -58,7 +58,7 @@ public:
 
     { }
 
-    TConvertedColumn Convert(const std::vector<TUnversionedRowValues>& rowsValues)
+    TConvertedColumn Convert(TRange<TUnversionedRowValues> rowsValues)
     {
         Reset();
         AddValues(rowsValues);
@@ -104,14 +104,14 @@ private:
         NullBitmap_.Flush<TConverterTag>();
     }
 
-    void AddValues(const std::vector<TUnversionedRowValues>& rowsValues)
+    void AddValues(TRange<TUnversionedRowValues> rowsValues)
     {
-        for (auto rowValues : rowsValues) {
+        for (const auto& rowValues : rowsValues) {
             auto value = rowValues[ColumnIndex_];
-            bool isNull = value == nullptr || value->Type == NTableClient::EValueType::Null;
-            TValue data = isNull ? 0 : value->Data.Double;
+            bool isNull = !value || value->Type == NTableClient::EValueType::Null;
+            TValue valueData = isNull ? 0 : value->Data.Double;
             NullBitmap_.Append(isNull);
-            Values_.push_back(data);
+            Values_.push_back(valueData);
         }
     }
 };
diff --git a/yt/yt/library/column_converters/integer_column_converter.cpp b/yt/yt/library/column_converters/integer_column_converter.cpp
index 862c23e5b74..6b3a2c6cb0c 100644
--- a/yt/yt/library/column_converters/integer_column_converter.cpp
+++ b/yt/yt/library/column_converters/integer_column_converter.cpp
@@ -76,7 +76,7 @@ public:
         , ValueType_(ValueType)
     { }
 
-    TConvertedColumn Convert(const std::vector<TUnversionedRowValues>& rowsValues) override
+    TConvertedColumn Convert(TRange<TUnversionedRowValues> rowsValues) override
     {
         Reset();
         AddValues(rowsValues);
@@ -138,14 +138,14 @@ private:
         NullBitmap_.Flush<TConverterTag>();
     }
 
-    void AddValues(const std::vector<TUnversionedRowValues>& rowsValues)
+    void AddValues(TRange<TUnversionedRowValues> rowsValues)
     {
-        for (auto rowValues : rowsValues) {
+        for (const auto& rowValues : rowsValues) {
             auto value = rowValues[ColumnIndex_];
-            bool isNull = value == nullptr || value->Type == NTableClient::EValueType::Null;
+            bool isNull = !value || value->Type == NTableClient::EValueType::Null;
             ui64 data = 0;
             if (!isNull) {
-                YT_VERIFY(value != nullptr);
+                YT_VERIFY(value);
                 data = EncodeValue(GetValue<TValue>(*value));
             }
             Values_.push_back(data);
diff --git a/yt/yt/library/column_converters/null_column_converter.cpp b/yt/yt/library/column_converters/null_column_converter.cpp
index d07ab24ceb2..f76886ec980 100644
--- a/yt/yt/library/column_converters/null_column_converter.cpp
+++ b/yt/yt/library/column_converters/null_column_converter.cpp
@@ -16,7 +16,7 @@ public:
         : ColumnIndex_(columnIndex)
     { }
 
-    TConvertedColumn Convert(const std::vector<TUnversionedRowValues>& rowsValues) override
+    TConvertedColumn Convert(TRange<TUnversionedRowValues> rowsValues) override
     {
         auto rowCount = rowsValues.size();
 
diff --git a/yt/yt/library/column_converters/string_column_converter.cpp b/yt/yt/library/column_converters/string_column_converter.cpp
index 59a77592eed..cc2154174d2 100644
--- a/yt/yt/library/column_converters/string_column_converter.cpp
+++ b/yt/yt/library/column_converters/string_column_converter.cpp
@@ -60,7 +60,7 @@ public:
         , ColumnSchema_(columnSchema)
     { }
 
-    TConvertedColumn Convert(const std::vector<TUnversionedRowValues>& rowsValues) override
+    TConvertedColumn Convert(TRange<TUnversionedRowValues> rowsValues) override
     {
         Reset();
         AddValues(rowsValues);
@@ -294,11 +294,11 @@ private:
         }
     }
 
-    void AddValues(const std::vector<TUnversionedRowValues>& rowsValues)
+    void AddValues(TRange<TUnversionedRowValues> rowsValues)
     {
-        for (auto rowValues : rowsValues) {
+        for (const auto& rowValues : rowsValues) {
             auto unversionedValue = rowValues[ColumnIndex_];
-            YT_VERIFY(unversionedValue != nullptr);
+            YT_VERIFY(unversionedValue);
             auto value = CaptureValue(*unversionedValue);
             Values_.push_back(value);
             ++RowCount_;