Repository: spark Updated Branches: refs/heads/branch-1.4 ba04b5236 -> e4489c36d
[SPARK-7800] isDefined should not marked too early in putNewKey JIRA: https://issues.apache.org/jira/browse/SPARK-7800 `isDefined` is marked as true twice in `Location.putNewKey`. The first one is unnecessary and will cause problem because it is too early and before some assert checking. E.g., if an attempt with incorrect `keyLengthBytes` marks `isDefined` as true, the location can not be used later. ping JoshRosen Author: Liang-Chi Hsieh <[email protected]> Closes #6324 from viirya/dup_isdefined and squashes the following commits: cbfe03b [Liang-Chi Hsieh] isDefined should not marked too early in putNewKey. (cherry picked from commit 5a3c04bb92e21bd221a75c4ae13a71f7d4716b44) Signed-off-by: Josh Rosen <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e4489c36 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e4489c36 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e4489c36 Branch: refs/heads/branch-1.4 Commit: e4489c36df8a3b9bfeadc475429a2173502756bb Parents: ba04b52 Author: Liang-Chi Hsieh <[email protected]> Authored: Thu May 21 23:12:00 2015 +0100 Committer: Josh Rosen <[email protected]> Committed: Thu May 21 15:21:23 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e4489c36/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java ---------------------------------------------------------------------- diff --git a/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java b/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java index bd4ca74..0b4d8d2 100644 --- a/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java +++ b/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java @@ -429,7 +429,6 @@ public final class BytesToBytesMap { long valueBaseOffset, int valueLengthBytes) { assert (!isDefined) : "Can only set value once for a key"; - isDefined = true; assert (keyLengthBytes % 8 == 0); assert (valueLengthBytes % 8 == 0); if (size == MAX_CAPACITY) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
