Skip to content

[SPARK-18146] [SQL] Avoid using Union to chain together create table and repair partition commands #15665

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

[SPARK-18146] [SQL] Avoid using Union to chain together create table and repair partition commands #15665

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11fc8c4
avoid union
ericl Oct 27, 2016
310c5cb
Update DataFrameWriter.scala
ericl Oct 28, 2016
dd01f3a
Update DataFrameWriter.scala
ericl Oct 28, 2016
e8d28e1
Update DataFrameWriter.scala
ericl Oct 28, 2016
da00002
Fri Oct 28 11:31:14 PDT 2016
ericl Oct 28, 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
16 changes: 8 additions & 8 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 @@ -254,7 +254,8 @@ final class DataFrameWriter[T] private[sql](ds: Dataset[T]) {
)
}

df.sparkSession.sessionState.executePlan(
df.sparkSession.sessionState.

@rxin rxin Oct 28, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's going on here? a dot ?

@ericl ericl Oct 28, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some github text editing gone wrong... fixed it

(
InsertIntoTable(
table = UnresolvedRelation(tableIdent),
partition = Map.empty[String, Option[String]],
Expand Down Expand Up @@ -388,16 +389,15 @@ final class DataFrameWriter[T] private[sql](ds: Dataset[T]) {
partitionColumnNames = partitioningColumns.getOrElse(Nil),
bucketSpec = getBucketSpec
)
val createCmd = CreateTable(tableDesc, mode, Some(df.logicalPlan))
val cmd = if (tableDesc.partitionColumnNames.nonEmpty &&
val result = df.sparkSession.sessionState.executePlan(
CreateTable(tableDesc, mode, Some(df.logicalPlan)))

@yhuai yhuai Oct 28, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the execution of this command triggered at here?

@yhuai yhuai Oct 28, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you want to call result.toRdd at here to trigger the execution of a command? Then inside the loop to use toRdd again.

@cloud-fan cloud-fan Oct 28, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, we don't need the result variable.

@ericl ericl Oct 28, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

if (tableDesc.partitionColumnNames.nonEmpty &&
df.sparkSession.sqlContext.conf.manageFilesourcePartitions) {
// Need to recover partitions into the metastore so our saved data is visible.
val recoverPartitionCmd = AlterTableRecoverPartitionsCommand(tableDesc.identifier)
Union(createCmd, recoverPartitionCmd)
} else {
createCmd
//df.sparkSession.sessionState.executePlan(
// AlterTableRecoverPartitionsCommand(tableDesc.identifier))
}
df.sparkSession.sessionState.executePlan(cmd).toRdd
result.toRdd
}
}

Expand Down