Skip to content

[SPARK-30844][SQL]Static partition should also follow StoreAssignmentPolicy when insert into table #27597

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

[SPARK-30844][SQL]Static partition should also follow StoreAssignmentPolicy when insert into table #27597

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ca4a77
fix
Ngone51 Feb 16, 2020
1abe474
remove conf
Ngone51 Feb 17, 2020
f38e056
test legacy and strict
Ngone51 Feb 17, 2020
a70c89c
add comments
Ngone51 Feb 21, 2020
3d10ca7
address nit
Ngone51 Feb 21, 2020
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
Next Next commit
remove conf
  • Loading branch information
@Ngone51
Ngone51 committed Feb 17, 2020
commit 1abe474ba2bb5821fdbb1e33bded8cf0ba9aeecb
6 changes: 2 additions & 4 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSourceStrategy.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ case class DataSourceAnalysis(conf: SQLConf) extends Rule[LogicalPlan] with Cast
sourceAttributes: Seq[Attribute],
providedPartitions: Map[String, Option[String]],
targetAttributes: Seq[Attribute],
targetPartitionSchema: StructType,
conf: SQLConf): Seq[NamedExpression] = {
targetPartitionSchema: StructType): Seq[NamedExpression] = {

assert(providedPartitions.exists(_._2.isDefined))

Expand Down Expand Up @@ -184,8 +183,7 @@ case class DataSourceAnalysis(conf: SQLConf) extends Rule[LogicalPlan] with Cast
sourceAttributes = query.output,
providedPartitions = parts,
targetAttributes = l.output,
targetPartitionSchema = t.partitionSchema,
conf)
targetPartitionSchema = t.partitionSchema)
Project(projectList, query)
} else {
query
Expand Down
39 changes: 13 additions & 26 deletions sql/core/src/test/scala/org/apache/spark/sql/sources/DataSourceAnalysisSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = Seq('e.int, 'f.int),
providedPartitions = Map("b" -> None, "c" -> None),
targetAttributes = targetAttributes,
targetPartitionSchema = targetPartitionSchema,
conf)
targetPartitionSchema = targetPartitionSchema)
}
}

Expand All @@ -81,8 +80,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = Seq('e.int),
providedPartitions = Map("b" -> Some("1"), "c" -> None),
targetAttributes = targetAttributes,
targetPartitionSchema = targetPartitionSchema,
conf)
targetPartitionSchema = targetPartitionSchema)
}
}

Expand All @@ -93,8 +91,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = Seq('e.int, 'f.int),
providedPartitions = Map("b" -> Some("1")),
targetAttributes = targetAttributes,
targetPartitionSchema = targetPartitionSchema,
conf)
targetPartitionSchema = targetPartitionSchema)
}

// Missing partitioning columns.
Expand All @@ -103,8 +100,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = Seq('e.int, 'f.int, 'g.int),
providedPartitions = Map("b" -> Some("1")),
targetAttributes = targetAttributes,
targetPartitionSchema = targetPartitionSchema,
conf)
targetPartitionSchema = targetPartitionSchema)
}

// Wrong partitioning columns.
Expand All @@ -113,8 +109,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = Seq('e.int, 'f.int),
providedPartitions = Map("b" -> Some("1"), "d" -> None),
targetAttributes = targetAttributes,
targetPartitionSchema = targetPartitionSchema,
conf)
targetPartitionSchema = targetPartitionSchema)
}
}

Expand All @@ -125,8 +120,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = Seq('e.int, 'f.int),
providedPartitions = Map("b" -> Some("1"), "d" -> Some("2")),
targetAttributes = targetAttributes,
targetPartitionSchema = targetPartitionSchema,
conf)
targetPartitionSchema = targetPartitionSchema)
}

// Wrong partitioning columns.
Expand All @@ -135,8 +129,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = Seq('e.int),
providedPartitions = Map("b" -> Some("1"), "c" -> Some("3"), "d" -> Some("2")),
targetAttributes = targetAttributes,
targetPartitionSchema = targetPartitionSchema,
conf)
targetPartitionSchema = targetPartitionSchema)
}

if (caseSensitive) {
Expand All @@ -146,8 +139,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = Seq('e.int, 'f.int),
providedPartitions = Map("b" -> Some("1"), "C" -> Some("3")),
targetAttributes = targetAttributes,
targetPartitionSchema = targetPartitionSchema,
conf)
targetPartitionSchema = targetPartitionSchema)
}
}
}
Expand All @@ -161,8 +153,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = Seq('e.int, 'f.int),
providedPartitions = Map("b" -> None, "c" -> Some("3")),
targetAttributes = targetAttributes,
targetPartitionSchema = targetPartitionSchema,
conf)
targetPartitionSchema = targetPartitionSchema)
}
}

Expand All @@ -175,8 +166,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = nonPartitionedAttributes,
providedPartitions = Map("b" -> Some("1"), "C" -> Some("3")),
targetAttributes = targetAttributes,
targetPartitionSchema = targetPartitionSchema,
conf)
targetPartitionSchema = targetPartitionSchema)
checkProjectList(actual, expected)
}

Expand All @@ -188,8 +178,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = nonPartitionedAttributes,
providedPartitions = Map("b" -> Some("1"), "c" -> Some("3")),
targetAttributes = targetAttributes,
targetPartitionSchema = targetPartitionSchema,
conf)
targetPartitionSchema = targetPartitionSchema)
checkProjectList(actual, expected)
}

Expand All @@ -201,8 +190,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = nonPartitionedAttributes,
providedPartitions = Map("b" -> Some("1")),
targetAttributes = Seq('a.int, 'd.int, 'b.int),
targetPartitionSchema = new StructType().add("b", IntegerType),
conf)
targetPartitionSchema = new StructType().add("b", IntegerType))
checkProjectList(actual, expected)
}
}
Expand All @@ -218,8 +206,7 @@ class DataSourceAnalysisSuite extends SparkFunSuite with BeforeAndAfterAll {
sourceAttributes = nonPartitionedAttributes ++ dynamicPartitionAttributes,
providedPartitions = Map("b" -> Some("1"), "c" -> None),
targetAttributes = targetAttributes,
targetPartitionSchema = targetPartitionSchema,
conf)
targetPartitionSchema = targetPartitionSchema)
checkProjectList(actual, expected)
}
}
Expand Down