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/01/11 11:32:11 UTC
ignite git commit: Formatting.
Repository: ignite
Updated Branches:
refs/heads/ignite-3477 2185adc24 -> 12a4af644
Formatting.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/12a4af64
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/12a4af64
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/12a4af64
Branch: refs/heads/ignite-3477
Commit: 12a4af6448d12c27e44370bc40efb3cc02fa1dc7
Parents: 2185adc
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jan 11 14:32:07 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jan 11 14:32:07 2017 +0300
----------------------------------------------------------------------
.../cache/GridCacheConcurrentMapImpl.java | 7 ++-
.../distributed/dht/GridDhtCacheEntry.java | 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 9 ++-
.../dht/atomic/GridDhtAtomicCache.java | 60 ++++++++++----------
4 files changed, 42 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12a4af64/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
index 48dae76..61624ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
@@ -110,8 +110,11 @@ public class GridCacheConcurrentMapImpl implements GridCacheConcurrentMap {
/** {@inheritDoc} */
@Nullable @Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(final AffinityTopologyVersion topVer,
- KeyCacheObject key, @Nullable final CacheObject val, final boolean create, final boolean touch) {
-
+ KeyCacheObject key,
+ @Nullable final CacheObject val,
+ final boolean create,
+ final boolean touch)
+ {
GridCacheMapEntry cur = null;
GridCacheMapEntry created = null;
GridCacheMapEntry created0 = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/12a4af64/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
index f985e97..b0ec408 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
@@ -93,7 +93,7 @@ public class GridDhtCacheEntry extends GridDistributedCacheEntry {
locPart = ctx.topology().localPartition(p, topVer, true);
- assert locPart != null : locPart;
+ assert locPart != null : p;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/12a4af64/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 598e1c2..abe5f06 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
@@ -355,8 +355,11 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
/** {@inheritDoc} */
@Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(
- AffinityTopologyVersion topVer, KeyCacheObject key,
- @Nullable CacheObject val, boolean create, boolean touch) {
+ AffinityTopologyVersion topVer,
+ KeyCacheObject key,
+ @Nullable CacheObject val,
+ boolean create,
+ boolean touch) {
return map.putEntryIfObsoleteOrAbsent(topVer, key, val, create, touch);
}
@@ -702,7 +705,7 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
*
*/
private void clearEvicting() {
- boolean free = false;
+ boolean free;
while (true) {
int cnt = evictGuard.get();
http://git-wip-us.apache.org/repos/asf/ignite/blob/12a4af64/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index c4ea7dc..08e9ec5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -3272,36 +3272,36 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
long ttl = req.ttl(i);
long expireTime = req.conflictExpireTime(i);
- GridCacheUpdateAtomicResult updRes = entry.innerUpdate(
- ver,
- nodeId,
- nodeId,
- op,
- op == TRANSFORM ? entryProcessor : val,
- op == TRANSFORM ? req.invokeArguments() : null,
- /*write-through*/(ctx.store().isLocal() && !ctx.shared().localStorePrimaryOnly())
- && writeThrough() && !req.skipStore(),
- /*read-through*/false,
- /*retval*/false,
- req.keepBinary(),
- /*expiry policy*/null,
- /*event*/true,
- /*metrics*/true,
- /*primary*/false,
- /*check version*/!req.forceTransformBackups(),
- req.topologyVersion(),
- CU.empty0(),
- replicate ? DR_BACKUP : DR_NONE,
- ttl,
- expireTime,
- req.conflictVersion(i),
- false,
- intercept,
- req.subjectId(),
- taskName,
- prevVal,
- updateIdx,
- null);
+ GridCacheUpdateAtomicResult updRes = entry.innerUpdate(
+ ver,
+ nodeId,
+ nodeId,
+ op,
+ op == TRANSFORM ? entryProcessor : val,
+ op == TRANSFORM ? req.invokeArguments() : null,
+ /*write-through*/(ctx.store().isLocal() && !ctx.shared().localStorePrimaryOnly())
+ && writeThrough() && !req.skipStore(),
+ /*read-through*/false,
+ /*retval*/false,
+ req.keepBinary(),
+ /*expiry policy*/null,
+ /*event*/true,
+ /*metrics*/true,
+ /*primary*/false,
+ /*check version*/!req.forceTransformBackups(),
+ req.topologyVersion(),
+ CU.empty0(),
+ replicate ? DR_BACKUP : DR_NONE,
+ ttl,
+ expireTime,
+ req.conflictVersion(i),
+ false,
+ intercept,
+ req.subjectId(),
+ taskName,
+ prevVal,
+ updateIdx,
+ null);
if (updRes.removeVersion() != null)
ctx.onDeferredDelete(entry, updRes.removeVersion());