[GLUTEN-4160][CORE] Fix ClassCastException occurred when fallback bro…

…adcast join and broadcast exchange
apache · Dec 27, 2023 · 67b7cdc · 67b7cdc
1 parent 3e23ad4
commit 67b7cdc
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/ExpressionConverter.scala b/gluten-core/src/main/scala/io/glutenproject/expression/ExpressionConverter.scala
@@ -535,8 +535,11 @@ object ExpressionConverter extends SQLConfHelper with Logging {
       ColumnarBroadcastExchangeExec(exchange.mode, newChild)
     }
 
-    if (GlutenConfig.getConf.enableScanOnly) {
-      // Disable ColumnarSubqueryBroadcast for scan-only execution.
+    if (
+      GlutenConfig.getConf.enableScanOnly || !GlutenConfig.getConf.enableColumnarBroadcastExchange
+    ) {
+      // Disable ColumnarSubqueryBroadcast for scan-only execution
+      // or ColumnarBroadcastExchange was disabled.
       partitionFilters
     } else {
       val newPartitionFilters = partitionFilters.map {