Fix core dump

apache · Jul 11, 2024 · ea41482 · ea41482
1 parent 0c1d86e
commit ea41482
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/cpp-ch/local-engine/Parser/TypeParser.cpp b/cpp-ch/local-engine/Parser/TypeParser.cpp
@@ -239,7 +239,7 @@ DB::DataTypePtr TypeParser::parseType(const substrait::Type & substrait_type, st
 }
 
 
-DB::Block TypeParser::buildBlockFromNamedStruct(const substrait::NamedStruct & struct_, const std::string & low_card_cols)
+DB::Block TypeParser::buildBlockFromNamedStruct(const substrait::NamedStruct & struct_, const std::string & low_card_cols, bool collect_normal_col_only)
 {
     std::unordered_set<std::string> low_card_columns;
     Poco::StringTokenizer tokenizer(low_card_cols, ",");
@@ -250,9 +250,12 @@ DB::Block TypeParser::buildBlockFromNamedStruct(const substrait::NamedStruct & s
     assert(struct_.column_types_size() == struct_.struct_().types_size());
 
     std::set<int> non_normal_col_set;
-    for (int i = 0; i < struct_.column_types_size(); ++i)
-        if (struct_.column_types(i) != ::substrait::NamedStruct::NORMAL_COL)
-            non_normal_col_set.insert(i);
+    if (collect_normal_col_only)
+    {
+        for (int i = 0; i < struct_.column_types_size(); ++i)
+            if (struct_.column_types(i) != ::substrait::NamedStruct::NORMAL_COL)
+                non_normal_col_set.insert(i);
+    }
 
     DB::ColumnsWithTypeAndName internal_cols;
     internal_cols.reserve(struct_.names_size());

diff --git a/cpp-ch/local-engine/Parser/TypeParser.h b/cpp-ch/local-engine/Parser/TypeParser.h
@@ -44,7 +44,8 @@ namespace local_engine
 
         // low_card_cols is in format of "cola,colb". Currently does not nested column to be LowCardinality.
         static DB::Block buildBlockFromNamedStruct(const substrait::NamedStruct& struct_,
-                                                   const std::string& low_card_cols = "");
+                                                   const std::string& low_card_cols = "",
+                                                   bool collect_normal_col_only = false);
 
         /// Build block from substrait NamedStruct without DFS rules, different from buildBlockFromNamedStruct
         static DB::Block buildBlockFromNamedStructWithoutDFS(const substrait::NamedStruct& struct_);