Skip to content

[SPARK-15911][SQL] Remove the additional Project to be consistent with SQL #13631

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
wants to merge 6 commits into from
Closed

[SPARK-15911][SQL] Remove the additional Project to be consistent with SQL #13631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f4455a
Remove the additional Project to be consistent with SQL.
viirya Jun 13, 2016
c0500c2
Remove test.
viirya Jun 13, 2016
f8c9ccf
Address comment.
viirya Jun 14, 2016
3030144
Address comment and add test case.
viirya Jun 15, 2016
42b69f8
Merge remote-tracking branch 'upstream/master' into inserttable
viirya Jun 19, 2016
be60027
Merge branch 'inserttable' of github.com:viirya/spark-1 into inserttable
viirya Jun 19, 2016
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
13 changes: 2 additions & 11 deletions sql/core/src/main/scala/org/apache/spark/sql/DataFrameWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,21 +252,12 @@ final class DataFrameWriter[T] private[sql](ds: Dataset[T]) {
val partitions = normalizedParCols.map(_.map(col => col -> Option.empty[String]).toMap)
val overwrite = mode == SaveMode.Overwrite

// A partitioned relation's schema can be different from the input logicalPlan, since
// partition columns are all moved after data columns. We Project to adjust the ordering.
// TODO: this belongs to the analyzer.
val input = normalizedParCols.map { parCols =>
val (inputPartCols, inputDataCols) = df.logicalPlan.output.partition { attr =>
parCols.contains(attr.name)
}
Project(inputDataCols ++ inputPartCols, df.logicalPlan)
}.getOrElse(df.logicalPlan)

// Assume partition columns are correctly placed at the end of the df.logicalPlan's output.
df.sparkSession.sessionState.executePlan(
InsertIntoTable(
UnresolvedRelation(tableIdent),
partitions.getOrElse(Map.empty[String, Option[String]]),
input,
df.logicalPlan,
overwrite,
ifNotExists = false)).toRdd
}
Expand Down
12 changes: 12 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/InsertIntoHiveTableSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,18 @@ class InsertIntoHiveTableSuite extends QueryTest with TestHiveSingleton with Bef
}
}

test("Resolve dynamic partition columns") {
withSQLConf(("hive.exec.dynamic.partition.mode", "nonstrict")) {
sql("CREATE TABLE partitioned (id bigint) PARTITIONED BY (data string, part string)")
val data = (1 to 10).map(i => (i, s"data-$i", if ((i % 2) == 0) "even" else "odd"))
.toDF("id", "data2", "part")

// Dynamic partition columns are resolved by ordering, not name.
data.write.insertInto("partitioned")
checkAnswer(sql("SELECT * FROM partitioned"), data.collect().toSeq)
}
}

test("Test partition mode = strict") {
withSQLConf(("hive.exec.dynamic.partition.mode", "strict")) {
sql("CREATE TABLE partitioned (id bigint, data string) PARTITIONED BY (part string)")
Expand Down