diff options
| author | Ferdinand Xu <cheng.a.xu@intel.com> | 2016-08-30 09:15:31 -0700 |
|---|---|---|
| committer | Marcelo Vanzin <vanzin@cloudera.com> | 2016-08-30 09:15:31 -0700 |
| commit | 4b4e329e49f8af28fa6301bd06c48d7097eaf9e6 (patch) | |
| tree | 91ec684d78a76de75097723f82537be3e01a1c28 /core/src/main/java | |
| parent | 27209252f09ff73c58e60c6df8aaba73b308088c (diff) | |
| download | spark-4b4e329e49f8af28fa6301bd06c48d7097eaf9e6.tar.gz spark-4b4e329e49f8af28fa6301bd06c48d7097eaf9e6.tar.bz2 spark-4b4e329e49f8af28fa6301bd06c48d7097eaf9e6.zip | |
[SPARK-5682][CORE] Add encrypted shuffle in spark
This patch is using Apache Commons Crypto library to enable shuffle encryption support.
Author: Ferdinand Xu <cheng.a.xu@intel.com>
Author: kellyzly <kellyzly@126.com>
Closes #8880 from winningsix/SPARK-10771.
Diffstat (limited to 'core/src/main/java')
| -rw-r--r-- | core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeSorterSpillReader.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeSorterSpillReader.java b/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeSorterSpillReader.java index d048cf7aeb..2875b0d69d 100644 --- a/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeSorterSpillReader.java +++ b/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeSorterSpillReader.java @@ -72,7 +72,7 @@ public final class UnsafeSorterSpillReader extends UnsafeSorterIterator implemen final BufferedInputStream bs = new BufferedInputStream(new FileInputStream(file), (int) bufferSizeBytes); try { - this.in = serializerManager.wrapForCompression(blockId, bs); + this.in = serializerManager.wrapStream(blockId, bs); this.din = new DataInputStream(this.in); numRecords = numRecordsRemaining = din.readInt(); } catch (IOException e) { |