Minor renames.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5b8eb609 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5b8eb609 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5b8eb609 Branch: refs/heads/ignite-5267-1 Commit: 5b8eb6099f6057b20b48060302b16f90e57d7b08 Parents: ca585f0 Author: sboikov <[email protected]> Authored: Thu Jun 15 15:07:35 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Jun 15 15:07:35 2017 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 6 +++--- .../IgniteDhtPartitionHistorySuppliersMap.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5b8eb609/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 03a4d40..67d5622 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -387,12 +387,12 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte } /** - * @param cacheId Cache ID. + * @param grpId Cache group ID. * @param partId Partition ID. * @return ID of history supplier node or null if it doesn't exist. */ - @Nullable public UUID partitionHistorySupplier(int cacheId, int partId) { - return partHistSuppliers.getSupplier(cacheId, partId); + @Nullable public UUID partitionHistorySupplier(int grpId, int partId) { + return partHistSuppliers.getSupplier(grpId, partId); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/5b8eb609/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java index 15294c3..1c69374 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java @@ -46,16 +46,16 @@ public class IgniteDhtPartitionHistorySuppliersMap implements Serializable { } /** - * @param cacheId Cache ID. + * @param grpId Cache group ID. * @param partId Partition ID. * @return Supplier UUID. */ - @Nullable public synchronized UUID getSupplier(int cacheId, int partId) { + @Nullable public synchronized UUID getSupplier(int grpId, int partId) { if (map == null) return null; for (Map.Entry<UUID, Map<T2<Integer, Integer>, Long>> e : map.entrySet()) { - if (e.getValue().containsKey(new T2<>(cacheId, partId))) + if (e.getValue().containsKey(new T2<>(grpId, partId))) return e.getKey(); } @@ -75,11 +75,11 @@ public class IgniteDhtPartitionHistorySuppliersMap implements Serializable { /** * @param nodeId Node ID. - * @param cacheId Cache ID. + * @param grpId Cache group ID. * @param partId Partition ID. * @param cntr Partition counter. */ - public synchronized void put(UUID nodeId, int cacheId, int partId, long cntr) { + public synchronized void put(UUID nodeId, int grpId, int partId, long cntr) { if (map == null) map = new HashMap<>(); @@ -91,7 +91,7 @@ public class IgniteDhtPartitionHistorySuppliersMap implements Serializable { map.put(nodeId, nodeMap); } - nodeMap.put(new T2<>(cacheId, partId), cntr); + nodeMap.put(new T2<>(grpId, partId), cntr); } /**
