Repository: ignite Updated Branches: refs/heads/ignite-3477-master 5c6d5503e -> 64cad4744
Fixed IgniteCachePartitionLossPolicySelfTest. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8499de3e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8499de3e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8499de3e Branch: refs/heads/ignite-3477-master Commit: 8499de3e8386e496156846461df37e4fc5f06d37 Parents: cf06bad Author: Ilya Lantukh <[email protected]> Authored: Thu Apr 6 18:25:19 2017 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Thu Apr 6 18:25:19 2017 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/GridDhtPartitionMap.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8499de3e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java index 43087ff..0cead44 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java @@ -248,12 +248,11 @@ public class GridDhtPartitionMap implements Comparable<GridDhtPartitionMap>, Ext for (Map.Entry<Integer, GridDhtPartitionState> entry : map.entrySet()) { int ordinal = entry.getValue().ordinal(); - assert ordinal == (ordinal & 0x3); + assert ordinal == (ordinal & 0x7); assert entry.getKey() < CacheConfiguration.MAX_PARTITIONS_COUNT : entry.getKey(); - int coded = (ordinal << 14) | entry.getKey(); - - out.writeShort((short)coded); + out.writeByte(ordinal); + out.writeShort(entry.getKey()); i++; } @@ -281,10 +280,8 @@ public class GridDhtPartitionMap implements Comparable<GridDhtPartitionMap>, Ext map = U.newHashMap(size); for (int i = 0; i < size; i++) { - int entry = in.readShort() & 0xFFFF; - - int part = entry & 0x3FFF; - int ordinal = entry >> 14; + int ordinal = in.readByte(); + int part = in.readShort(); put(part, GridDhtPartitionState.fromOrdinal(ordinal)); }
