diff options
-rw-r--r-- | docs/configuration.md | 9 |
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> |