Skip to content

Commit 6b54dec

Browse files
debug CI failure
1 parent 5b293e5 commit 6b54dec

File tree

3 files changed

+31
-1
lines changed

3 files changed

+31
-1
lines changed

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2ScanRelationPushDown.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ object V2ScanRelationPushDown extends Rule[LogicalPlan] with PredicateHelper {
4242
import DataSourceV2Implicits._
4343

4444
def apply(plan: LogicalPlan): LogicalPlan = {
45+
println("[find-me] datasourceV2JoinPushdown = " + conf.dataSourceV2JoinPushdown)
46+
log.info("[find-me] datasourceV2JoinPushdown = " + conf.dataSourceV2JoinPushdown)
4547
val pushdownRules = Seq[LogicalPlan => LogicalPlan] (
4648
createScanBuilder,
4749
pushDownSample,
@@ -199,7 +201,10 @@ object V2ScanRelationPushDown extends Rule[LogicalPlan] with PredicateHelper {
199201
val translatedCondition =
200202
normalizedCondition.flatMap(DataSourceV2Strategy.translateFilterV2(_))
201203
val translatedJoinType = DataSourceStrategy.translateJoinType(joinType)
202-
204+
log.info("[find-me] translatedJoinType.isDefined: " + translatedJoinType.isDefined)
205+
println("[find-me] translatedJoinType.isDefined: " + translatedJoinType.isDefined)
206+
log.info("[find-me] translatedCondition.isDefined: " + translatedCondition.isDefined)
207+
println("[find-me] translatedCondition.isDefined: " + translatedCondition.isDefined)
203208
if (translatedJoinType.isDefined &&
204209
translatedCondition.isDefined &&
205210
lBuilder.pushDownJoin(

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/jdbc/JDBCScanBuilder.scala

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,19 @@ case class JDBCScanBuilder(
129129
// Also, we need to check if join is done on 2 tables from 2 different databases within same
130130
// host. These shouldn't be allowed.
131131
override def isOtherSideCompatibleForJoin(other: SupportsPushDownJoin): Boolean = {
132+
log.info("[find-me] isOtherSideCompatible jdbcOptions.pushDownJoin: " +
133+
jdbcOptions.pushDownJoin)
134+
println("[find-me] isOtherSideCompatible jdbcOptions.pushDownJoin: " +
135+
jdbcOptions.pushDownJoin)
136+
log.info("[find-me] isOtherSideCompatible dialect.supportsJoin: " +
137+
dialect.supportsJoin)
138+
println("[find-me] isOtherSideCompatible dialect.supportsJoin: " +
139+
dialect.supportsJoin)
140+
log.info("[find-me] other.isInstanceOf[JDBCScanBuilder]: " +
141+
other.isInstanceOf[JDBCScanBuilder])
142+
println("[find-me] dialect: " + dialect.getClass.getSimpleName)
143+
println("[find-me] url: " + jdbcOptions.url)
144+
132145
if (!jdbcOptions.pushDownJoin ||
133146
!dialect.supportsJoin ||
134147
!other.isInstanceOf[JDBCScanBuilder]) {
@@ -178,6 +191,10 @@ case class JDBCScanBuilder(
178191
leftSideRequiredColumnsWithAliases: Array[SupportsPushDownJoin.ColumnWithAlias],
179192
rightSideRequiredColumnsWithAliases: Array[SupportsPushDownJoin.ColumnWithAlias],
180193
condition: Predicate ): Boolean = {
194+
log.info("[find-me] jdbcOptions.pushDownJoin: " + jdbcOptions.pushDownJoin)
195+
println("[find-me] jdbcOptions.pushDownJoin: " + jdbcOptions.pushDownJoin)
196+
log.info("[find-me] dialect.supportsJoin: " + dialect.supportsJoin)
197+
println("[find-me] dialect.supportsJoin: " + dialect.supportsJoin)
181198
if (!jdbcOptions.pushDownJoin || !dialect.supportsJoin) {
182199
return false
183200
}
@@ -186,11 +203,16 @@ case class JDBCScanBuilder(
186203
case JoinType.INNER_JOIN => Some("INNER JOIN")
187204
case _ => None
188205
}
206+
207+
log.info("[find-me] joinTypeStringOption: " + joinTypeStringOption)
208+
println("[find-me] joinTypeStringOption: " + joinTypeStringOption)
189209
if (!joinTypeStringOption.isDefined) {
190210
return false
191211
}
192212

193213
val compiledCondition = dialect.compileExpression(condition)
214+
log.info("[find-me] compiledCondition: " + compiledCondition)
215+
println("[find-me] compiledCondition: " + compiledCondition)
194216
if (!compiledCondition.isDefined) {
195217
return false
196218
}

sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcDialects.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -964,6 +964,9 @@ object JdbcDialects {
964964
* Fetch the JdbcDialect class corresponding to a given database url.
965965
*/
966966
def get(url: String): JdbcDialect = {
967+
println("[find-me] all dialects:")
968+
dialects.foreach { d => println(d.getClass.getSuperclass)}
969+
println("[find-me] get.url = " + url)
967970
val matchingDialects = dialects.filter(_.canHandle(url))
968971
matchingDialects.length match {
969972
case 0 => NoopDialect

0 commit comments

Comments
 (0)