Skip to content

[SPARK-24327][SQL] Verify and normalize a partition column name based on the JDBC resolved schema #21379

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.

Sign up for GitHub

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

Closed
maropu wants to merge 7 commits into from
Closed

[SPARK-24327][SQL] Verify and normalize a partition column name based on the JDBC resolved schema #21379

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
858d4dc
Fix
maropu May 21, 2018
9335b7c
Fix
maropu May 28, 2018
f9992b5
Revert "Fix"
maropu Jun 14, 2018
5b5b8ef
Revert "Fix"
maropu Jun 14, 2018
a3be215
Fix
maropu Jun 14, 2018
d2ef95c
Fix
maropu Jun 14, 2018
614c87a
Fix
maropu Jun 14, 2018
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
Prev Previous commit
Fix
  • Loading branch information
@maropu
maropu committed Jun 14, 2018
commit 614c87aada943c16faa3f7a718837de0e4dcaeab
3 changes: 1 addition & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/DataFrameReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,7 @@ class DataFrameReader private[sql](sparkSession: SparkSession) extends Logging {
val parts: Array[Partition] = predicates.zipWithIndex.map { case (part, i) =>
JDBCPartition(part, i) : Partition
}
val schema = JDBCRelation.getSchema(sparkSession.sessionState.conf.resolver, options)
val relation = JDBCRelation(schema, parts, options)(sparkSession)
val relation = JDBCRelation(parts, options)(sparkSession)
sparkSession.baseRelationToDataFrame(relation)
}

Expand Down
11 changes: 11 additions & 0 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JDBCRelation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,17 @@ private[sql] object JDBCRelation extends Logging {
case None => tableSchema
}
}

/**
* Resolves a Catalyst schema of a JDBC table and returns [[JDBCRelation]] with the schema.
*/
def apply(
parts: Array[Partition],
jdbcOptions: JDBCOptions)(
sparkSession: SparkSession): JDBCRelation = {
val schema = JDBCRelation.getSchema(sparkSession.sessionState.conf.resolver, jdbcOptions)
JDBCRelation(schema, parts, jdbcOptions)(sparkSession)
}
}

private[sql] case class JDBCRelation(
Expand Down