You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/22 16:44:55 UTC
[4/8] ignite git commit: ignite-5075
ignite-5075
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5eab969
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5eab969
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5eab969
Branch: refs/heads/ignite-5075-pds
Commit: b5eab9692188a287b22da8db5da5e9ba06b10f7a
Parents: ea0fef7
Author: sboikov <sb...@gridgain.com>
Authored: Fri May 19 16:41:48 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri May 19 16:41:48 2017 +0300
----------------------------------------------------------------------
.../processors/cache/CacheGroupInfrastructure.java | 5 +++++
.../cache/distributed/dht/GridDhtLocalPartition.java | 12 ++++++++++++
2 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5eab969/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
index 1fc548e..81c0ae0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
@@ -780,4 +780,9 @@ public class CacheGroupInfrastructure {
preldr.onReconnected();
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "CacheGroupInfrastructure [grp=" + cacheOrGroupName() + ']';
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5eab969/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index bbb3cc5..b758610 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -109,9 +109,11 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
private final GridFutureAdapter<?> rent;
/** */
+ @GridToStringExclude
private final GridCacheSharedContext ctx;
/** */
+ @GridToStringExclude
private final CacheGroupInfrastructure grp;
/** Create time. */
@@ -119,30 +121,39 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
private final long createTime = U.currentTimeMillis();
/** Eviction history. */
+ @GridToStringExclude
private volatile Map<KeyCacheObject, GridCacheVersion> evictHist = new HashMap<>();
/** Lock. */
+ @GridToStringExclude
private final ReentrantLock lock = new ReentrantLock();
/** */
+ @GridToStringExclude
private final ConcurrentMap<Integer, ConcurrentMap<KeyCacheObject, GridCacheMapEntry>> cachesEntryMaps;
/** */
+ @GridToStringExclude
private final ConcurrentMap<Integer, AtomicInteger> cacheSizes;
/** */
+ @GridToStringExclude
private final ConcurrentMap<KeyCacheObject, GridCacheMapEntry> singleCacheEntryMap;
/** Remove queue. */
+ @GridToStringExclude
private final ConcurrentLinkedDeque8<RemovedEntryHolder> rmvQueue = new ConcurrentLinkedDeque8<>();
/** Group reservations. */
+ @GridToStringExclude
private final CopyOnWriteArrayList<GridDhtPartitionsReservation> reservations = new CopyOnWriteArrayList<>();
/** */
+ @GridToStringExclude
private final CacheDataStore store;
/** Partition updates. */
+ @GridToStringExclude
private final ConcurrentNavigableMap<Long, Boolean> updates = new ConcurrentSkipListMap<>();
/** Last applied update. */
@@ -1103,6 +1114,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridDhtLocalPartition.class, this,
+ "grp", grp.cacheOrGroupName(),
"state", state(),
"reservations", reservations(),
"empty", isEmpty(),