fix ut failed

liuneng1994 · Mar 21, 2024 · ada4384 · ada4384
1 parent d2d5f3b
commit ada4384
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/Analyzer/Passes/ConvertInToEqualPass.cpp b/src/Analyzer/Passes/ConvertInToEqualPass.cpp
@@ -32,7 +32,8 @@ class ConvertInToEqualPassVisitor : public InDepthQueryTreeVisitorWithContext<Co
         if (!column_node || !constant_node)
             return ;
         // IN multiple values is not supported
-        if (constant_node->getValue().getType() == Field::Types::Which::Tuple)
+        if (constant_node->getValue().getType() == Field::Types::Which::Tuple
+            || constant_node->getValue().getType() == Field::Types::Which::Array)
             return ;
         // x IN null not equivalent to x = null
         if (constant_node->hasSourceExpression() || constant_node->getValue().isNull())
@@ -51,12 +52,17 @@ class ConvertInToEqualPassVisitor : public InDepthQueryTreeVisitorWithContext<Co
         {
             resolver = createInternalFunctionNotEqualOverloadResolver(decimal_check_overflow);
         }
-        equal->resolveAsFunction(resolver);
+        try
+        {
+            equal->resolveAsFunction(resolver);
+        }
+        catch (...)
+        {
+            // When function resolver fails, we should not replace the function node
+            return;
+        }
         node = equal;
     }
-private:
-    FunctionOverloadResolverPtr equal_resolver;
-    FunctionOverloadResolverPtr not_equal_resolver;
 };
 
 void ConvertInToEqualPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)

diff --git a/src/Storages/tests/gtest_transform_query_for_external_database.cpp b/src/Storages/tests/gtest_transform_query_for_external_database.cpp
@@ -306,7 +306,8 @@ TEST(TransformQueryForExternalDatabase, Aliases)
 
     check(state, 1, {"field"},
           "SELECT field AS value, field AS display FROM table WHERE field NOT IN ('') AND display LIKE '%test%'",
-          R"(SELECT "field" FROM "test"."table" WHERE ("field" NOT IN ('')) AND ("field" LIKE '%test%'))");
+          R"(SELECT "field" FROM "test"."table" WHERE ("field" NOT IN ('')) AND ("field" LIKE '%test%'))",
+          R"(SELECT "field" FROM "test"."table" WHERE ("field" != '') AND ("field" LIKE '%test%'))");
 }
 
 TEST(TransformQueryForExternalDatabase, ForeignColumnInWhere)
@@ -408,5 +409,6 @@ TEST(TransformQueryForExternalDatabase, Analyzer)
 
     check(state, 1, {"column", "apply_id", "apply_type", "apply_status", "create_time", "field", "value", "a", "b", "foo"},
         "SELECT * FROM table WHERE (column) IN (1)",
-        R"(SELECT "column", "apply_id", "apply_type", "apply_status", "create_time", "field", "value", "a", "b", "foo" FROM "test"."table" WHERE "column" IN (1))");
+        R"(SELECT "column", "apply_id", "apply_type", "apply_status", "create_time", "field", "value", "a", "b", "foo" FROM "test"."table" WHERE "column" IN (1))",
+        R"(SELECT "column", "apply_id", "apply_type", "apply_status", "create_time", "field", "value", "a", "b", "foo" FROM "test"."table" WHERE "column" = 1)");
 }