Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CORE] Creates vanilla plan when the join operators fall back #6093

Merged
merged 1 commit into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ object CHBackendSettings extends BackendSettingsApi with Logging {
}
}

override def utilizeShuffledHashJoinHint(): Boolean = true
override def supportShuffleWithProject(
outputPartitioning: Partitioning,
child: SparkPlan): Boolean = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package org.apache.gluten.execution

import org.apache.spark.SparkConf
import org.apache.spark.sql.catalyst.optimizer.BuildLeft
import org.apache.spark.sql.catalyst.optimizer.{BuildLeft, BuildRight}

class GlutenClickHouseTPCHNullableColumnarShuffleSuite extends GlutenClickHouseTPCHAbstractSuite {

Expand Down Expand Up @@ -63,7 +63,11 @@ class GlutenClickHouseTPCHNullableColumnarShuffleSuite extends GlutenClickHouseT
val shjBuildLeft = df.queryExecution.executedPlan.collect {
case shj: ShuffledHashJoinExecTransformerBase if shj.joinBuildSide == BuildLeft => shj
}
assert(shjBuildLeft.size == 2)
assert(shjBuildLeft.size == 1)
val shjBuildRight = df.queryExecution.executedPlan.collect {
case shj: ShuffledHashJoinExecTransformerBase if shj.joinBuildSide == BuildRight => shj
}
assert(shjBuildRight.size == 1)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import org.apache.gluten.GlutenConfig

import org.apache.spark.SparkConf
import org.apache.spark.sql.catalyst.expressions.Alias
import org.apache.spark.sql.catalyst.optimizer.BuildLeft
import org.apache.spark.sql.catalyst.optimizer.{BuildLeft, BuildRight}

class GlutenClickHouseTPCHNullableSuite extends GlutenClickHouseTPCHAbstractSuite {

Expand Down Expand Up @@ -66,7 +66,11 @@ class GlutenClickHouseTPCHNullableSuite extends GlutenClickHouseTPCHAbstractSuit
val shjBuildLeft = df.queryExecution.executedPlan.collect {
case shj: ShuffledHashJoinExecTransformerBase if shj.joinBuildSide == BuildLeft => shj
}
assert(shjBuildLeft.size == 2)
assert(shjBuildLeft.size == 1)
val shjBuildRight = df.queryExecution.executedPlan.collect {
case shj: ShuffledHashJoinExecTransformerBase if shj.joinBuildSide == BuildRight => shj
}
assert(shjBuildRight.size == 1)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package org.apache.gluten.execution

import org.apache.spark.SparkConf
import org.apache.spark.sql.{Row, TestUtils}
import org.apache.spark.sql.catalyst.optimizer.BuildLeft
import org.apache.spark.sql.catalyst.optimizer.{BuildLeft, BuildRight}
import org.apache.spark.sql.types.{DecimalType, StructType}

// Some sqls' line length exceeds 100
Expand Down Expand Up @@ -73,7 +73,11 @@ class GlutenClickHouseTPCHSuite extends GlutenClickHouseTPCHAbstractSuite {
val shjBuildLeft = df.queryExecution.executedPlan.collect {
case shj: ShuffledHashJoinExecTransformerBase if shj.joinBuildSide == BuildLeft => shj
}
assert(shjBuildLeft.size == 2)
assert(shjBuildLeft.size == 1)
val shjBuildRight = df.queryExecution.executedPlan.collect {
case shj: ShuffledHashJoinExecTransformerBase if shj.joinBuildSide == BuildRight => shj
}
assert(shjBuildRight.size == 1)
}
}
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading