dummpy column

apache · Dec 31, 2024 · 70994f6 · 70994f6
1 parent 97e256b
commit 70994f6
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/cpp-ch/local-engine/Parser/ExpressionParser.cpp b/cpp-ch/local-engine/Parser/ExpressionParser.cpp
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 #include "ExpressionParser.h"
+#include <Columns/ColumnSet.h>
 #include <Core/Settings.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate32.h>
@@ -35,6 +36,7 @@
 #include <Parser/ParserContext.h>
 #include <Parser/SerializedPlanParser.h>
 #include <Parser/TypeParser.h>
+#include <Poco/Logger.h>
 #include <Common/BlockTypeUtils.h>
 #include <Common/CHUtil.h>
 #include <Common/logger_useful.h>
@@ -266,7 +268,6 @@ ExpressionParser::addConstColumn(DB::ActionsDAG & actions_dag, const DB::DataTyp
 {
     String name = toString(field).substr(0, 10);
     name = getUniqueName(name);
-    LOG_ERROR(getLogger("ExpressionParser"), "xxx add new const col: {}", name);
     const auto * res_node = &actions_dag.addColumn(DB::ColumnWithTypeAndName(type->createColumnConst(1, field), type, name));
     if (reuseCSE())
         if (const auto * exists_node = findOneStructureEqualNode(res_node, actions_dag))
@@ -882,27 +883,31 @@ bool ExpressionParser::areEqualNodes(const DB::ActionsDAG::Node * a, const Actio
             break;
         }
         case DB::ActionsDAG::ActionType::COLUMN: {
+            // dummpy columns cannot be compared
+            if (typeid_cast<const DB::ColumnSet *>(a->column.get()))
+                return a->result_name == b->result_name;
             if (a->column->compareAt(0, 0, *(b->column), 1) != 0)
                 return false;
             break;
         }
         case DB::ActionsDAG::ActionType::ARRAY_JOIN: {
-            break;
+            return false;
         }
         case DB::ActionsDAG::ActionType::FUNCTION: {
             if (!a->function_base->isDeterministic() || a->function_base->getName() != b->function_base->getName())
                 return false;
 
             break;
         }
-        default:
-            break;
+        default: {
+            LOG_DEBUG(getLogger("ExpressionParser"), "Unknow node type: {}|{}|{}", a->type, a->result_type->getName(), a->result_name);
+            return false;
+        }
     }
 
     for (size_t i = 0; i < a->children.size(); ++i)
         if (!areEqualNodes(a->children[i], b->children[i]))
             return false;
-
     return true;
 }