You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by da...@apache.org on 2016/03/04 22:21:44 UTC
spark git commit: [HOTFIX] fix the conflict when cherry-pick
Repository: spark
Updated Branches:
refs/heads/branch-1.6 f0cc511ec -> ffaf7c080
[HOTFIX] fix the conflict when cherry-pick
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ffaf7c08
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ffaf7c08
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ffaf7c08
Branch: refs/heads/branch-1.6
Commit: ffaf7c080b46243bc0ee3726d84e599f8c7730fa
Parents: f0cc511
Author: Davies Liu <da...@gmail.com>
Authored: Fri Mar 4 13:21:35 2016 -0800
Committer: Davies Liu <da...@gmail.com>
Committed: Fri Mar 4 13:21:35 2016 -0800
----------------------------------------------------------------------
.../spark/sql/execution/datasources/WriterContainer.scala | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ffaf7c08/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/WriterContainer.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/WriterContainer.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/WriterContainer.scala
index f03e2c1..83b4eaf 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/WriterContainer.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/WriterContainer.scala
@@ -368,6 +368,8 @@ private[sql] class DynamicPartitionWriterContainer(
currentWriter.writeInternal(getOutputRow(inputRow))
}
}
+ // current writer is included in outputWriters
+ currentWriter = null
// If the sorter is not null that means that we reached the maxFiles above and need to finish
// using external sort.
@@ -381,12 +383,11 @@ private[sql] class DynamicPartitionWriterContainer(
val sortedIterator = sorter.sortedIterator()
var currentKey: InternalRow = null
- var currentWriter: OutputWriter = null
while (sortedIterator.next()) {
if (currentKey != sortedIterator.getKey) {
if (currentWriter != null) {
currentWriter.close()
- currentWriter = null;
+ currentWriter = null
}
currentKey = sortedIterator.getKey.copy()
logDebug(s"Writing partition: $currentKey")
@@ -402,7 +403,7 @@ private[sql] class DynamicPartitionWriterContainer(
}
if (currentWriter != null) {
currentWriter.close()
- currentWriter = null;
+ currentWriter = null
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org