KIKIMR-19712: fix validation and add debug info

ydb-platform · Oct 14, 2023 · 500a0e1 · 500a0e1
1 parent 3e77d96
commit 500a0e1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ydb/core/formats/arrow/reader/read_filter_merger.h b/ydb/core/formats/arrow/reader/read_filter_merger.h
@@ -20,12 +20,12 @@ class TSortableScanData {
     TSortableScanData() = default;
     TSortableScanData(std::shared_ptr<arrow::RecordBatch> batch, const std::vector<std::string>& columns);
 
-    bool IsSameSchema(const std::shared_ptr<arrow::Schema> schema) const {
+    bool IsSameSchema(const std::shared_ptr<arrow::Schema>& schema) const {
         if (Fields.size() != (size_t)schema->num_fields()) {
             return false;
         }
         for (ui32 i = 0; i < Fields.size(); ++i) {
-            if (Fields[i]->type() != schema->field(i)->type()) {
+            if (!Fields[i]->type()->Equals(schema->field(i)->type())) {
                 return false;
             }
             if (Fields[i]->name() != schema->field(i)->name()) {
@@ -37,6 +37,10 @@ class TSortableScanData {
 
     NJson::TJsonValue DebugJson(const i32 position) const {
         NJson::TJsonValue result = NJson::JSON_MAP;
+        auto& jsonFields = result.InsertValue("fields", NJson::JSON_ARRAY);
+        for (auto&& i : Fields) {
+            jsonFields.AppendValue(i->ToString());
+        }
         for (ui32 i = 0; i < Columns.size(); ++i) {
             auto& jsonColumn = result["sorting_columns"].AppendValue(NJson::JSON_MAP);
             jsonColumn["name"] = Fields[i]->name();