[GLUTEN-7673][CH] Fix substrait infinite loop (apache#7674)

yikf · Oct 25, 2024 · f2ffda7 · f2ffda7
1 parent 0d3af2a
commit f2ffda7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...src/test/scala/org/apache/gluten/execution/tpch/GlutenClickHouseTPCHParquetAQESuite.scala b/...src/test/scala/org/apache/gluten/execution/tpch/GlutenClickHouseTPCHParquetAQESuite.scala
@@ -371,5 +371,24 @@ class GlutenClickHouseTPCHParquetAQESuite
            |""".stripMargin)(df => {})
     }
   }
+
+  test("GLUTEN-7673: fix substrait infinite loop") {
+    withSQLConf(("spark.sql.autoBroadcastJoinThreshold", "-1")) {
+      val result = sql(
+        s"""
+           |select l_orderkey
+           |from lineitem
+           |inner join orders
+           |on l_orderkey = o_orderkey
+           |  and ((l_shipdate = '2024-01-01' and l_partkey=1
+           |  and l_suppkey>2 and o_orderpriority=-987)
+           |  or l_shipmode>o_comment)
+           |order by l_orderkey limit 1
+           |""".stripMargin
+      ).collect()
+      // check no exception
+      assert(result.length == 1)
+    }
+  }
 }
 // scalastyle:off line.size.limit
diff --git a/cpp-ch/local-engine/Parser/RelParsers/JoinRelParser.cpp b/cpp-ch/local-engine/Parser/RelParsers/JoinRelParser.cpp
@@ -679,7 +679,7 @@ bool JoinRelParser::couldRewriteToMultiJoinOnClauses(
             and_expression_stack.pop_back();
             if (check_function("and", current_expr))
             {
-                for (const auto & arg : e.scalar_function().arguments())
+                for (const auto & arg : current_expr.scalar_function().arguments())
                     and_expression_stack.push_back(&arg.value());
             }
             else if (check_function("equals", current_expr))