You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2016/05/27 01:49:57 UTC
spark git commit: [BUILD][1.6] Fix compilation
Repository: spark
Updated Branches:
refs/heads/branch-1.6 0b8bdf793 -> c53c83ce8
[BUILD][1.6] Fix compilation
## What changes were proposed in this pull request?
Makes `UnsafeSortDataFormat` and `RecordPointerAndKeyPrefix` public. These are already public in 2.0 and are used in an `ExternalSorterSuite` test (see https://github.com/apache/spark/commit/0b8bdf793a98296fd1ac1fc499946929c6a5959d)
## How was this patch tested?
Successfully builds locally
Author: Sameer Agarwal <sa...@databricks.com>
Closes #13339 from sameeragarwal/fix-compile.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c53c83ce
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c53c83ce
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c53c83ce
Branch: refs/heads/branch-1.6
Commit: c53c83ce84ff57570d48cfc06583c8e5b9c9a90d
Parents: 0b8bdf7
Author: Sameer Agarwal <sa...@databricks.com>
Authored: Thu May 26 18:49:54 2016 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Thu May 26 18:49:54 2016 -0700
----------------------------------------------------------------------
.../util/collection/unsafe/sort/RecordPointerAndKeyPrefix.java | 2 +-
.../spark/util/collection/unsafe/sort/UnsafeSortDataFormat.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/c53c83ce/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/RecordPointerAndKeyPrefix.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/RecordPointerAndKeyPrefix.java b/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/RecordPointerAndKeyPrefix.java
index dbf6770..a0a2c04 100644
--- a/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/RecordPointerAndKeyPrefix.java
+++ b/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/RecordPointerAndKeyPrefix.java
@@ -19,7 +19,7 @@ package org.apache.spark.util.collection.unsafe.sort;
import org.apache.spark.memory.TaskMemoryManager;
-final class RecordPointerAndKeyPrefix {
+public final class RecordPointerAndKeyPrefix {
/**
* A pointer to a record; see {@link TaskMemoryManager} for a
* description of how these addresses are encoded.
http://git-wip-us.apache.org/repos/asf/spark/blob/c53c83ce/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeSortDataFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeSortDataFormat.java b/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeSortDataFormat.java
index 1eac329..8e73631 100644
--- a/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeSortDataFormat.java
+++ b/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeSortDataFormat.java
@@ -29,7 +29,8 @@ import org.apache.spark.util.collection.SortDataFormat;
* Within each long[] buffer, position {@code 2 * i} holds a pointer pointer to the record at
* index {@code i}, while position {@code 2 * i + 1} in the array holds an 8-byte key prefix.
*/
-final class UnsafeSortDataFormat extends SortDataFormat<RecordPointerAndKeyPrefix, LongArray> {
+public final class UnsafeSortDataFormat
+ extends SortDataFormat<RecordPointerAndKeyPrefix, LongArray> {
public static final UnsafeSortDataFormat INSTANCE = new UnsafeSortDataFormat();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org