Github user HyukjinKwon commented on a diff in the pull request:
https://github.com/apache/spark/pull/16898#discussion_r100692348
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatWriter.scala
---
@@ -134,8 +142,26 @@ object FileFormatWriter extends Logging {
// prepares the job, any exception thrown from here shouldn't cause
abortJob() to be called.
committer.setupJob(job)
+ val bucketIdExpression = bucketSpec.map { spec =>
+ // Use `HashPartitioning.partitionIdExpression` as our bucket id
expression, so that we can
+ // guarantee the data distribution is same between shuffle and
bucketed data source, which
+ // enables us to only shuffle one side when join a bucketed table
and a normal one.
+ HashPartitioning(bucketColumns,
spec.numBuckets).partitionIdExpression
+ }
+ // We should first sort by partition columns, then bucket id, and
finally sorting columns.
+ val requiredOrdering = (partitionColumns ++ bucketIdExpression ++
sortColumns)
+ .map(SortOrder(_, Ascending))
+ val actualOrdering = queryExecution.executedPlan.outputOrdering
+ // We can still avoid the sort if the required ordering is [partCol]
and the actual ordering
+ // is [partCol, anotherCol].
+ val rdd = if (requiredOrdering ==
actualOrdering.take(requiredOrdering.length)) {
+ queryExecution.toRdd
+ } else {
+ SortExec(requiredOrdering, global = false,
queryExecution.executedPlan).execute()
--- End diff --
Oh, I met this case before IIRC. This complains in Scala 2.10. I guess it
should be
```
SortExec(requiredOrdering, global = false, child =
queryExecution.executedPlan).execute()
```
because it seems the complier gets confused the positional/named
arguments. (this is actually invalid syntax in Python).
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
