aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolden Karau <holden@pigscanfly.ca>2015-09-10 11:49:53 -0700
committerAndrew Or <andrew@databricks.com>2015-09-10 11:49:53 -0700
commita76bde9dae54c4641e21f3c1ceb4870e3dc91881 (patch)
treed7e4ea9efcb4ee3f817595393fc00f40eab24770
parente04811137680f937669cdcc78771227aeb7cd849 (diff)
downloadspark-a76bde9dae54c4641e21f3c1ceb4870e3dc91881.tar.gz
spark-a76bde9dae54c4641e21f3c1ceb4870e3dc91881.tar.bz2
spark-a76bde9dae54c4641e21f3c1ceb4870e3dc91881.zip
[SPARK-10469] [DOC] Try and document the three options
From JIRA: Add documentation for tungsten-sort. From the mailing list "I saw a new "spark.shuffle.manager=tungsten-sort" implemented in https://issues.apache.org/jira/browse/SPARK-7081, but it can't be found its corresponding description in http://people.apache.org/~pwendell/spark-releases/spark-1.5.0-rc3-docs/configuration.html(Currenlty there are only 'sort' and 'hash' two options)." Author: Holden Karau <holden@pigscanfly.ca> Closes #8638 from holdenk/SPARK-10469-document-tungsten-sort.
-rw-r--r--docs/configuration.md9
1 files changed, 6 insertions, 3 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index e287591f3f..0b1a273916 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -447,9 +447,12 @@ Apart from these, the following properties are also available, and may be useful
<td><code>spark.shuffle.manager</code></td>
<td>sort</td>
<td>
- Implementation to use for shuffling data. There are two implementations available:
- <code>sort</code> and <code>hash</code>. Sort-based shuffle is more memory-efficient and is
- the default option starting in 1.2.
+ Implementation to use for shuffling data. There are three implementations available:
+ <code>sort</code>, <code>hash</code> and the new (1.5+) <code>tungsten-sort</code>.
+ Sort-based shuffle is more memory-efficient and is the default option starting in 1.2.
+ Tungsten-sort is similar to the sort based shuffle, with a direct binary cache-friendly
+ implementation with a fall back to regular sort based shuffle if its requirements are not
+ met.
</td>
</tr>
<tr>