review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fe2be79c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fe2be79c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fe2be79c Branch: refs/heads/ignite-843 Commit: fe2be79c8e4eccf8f823abeb32521f0fca8ddf42 Parents: b2e6734 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Aug 4 17:49:48 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Aug 4 17:49:48 2015 +0300 ---------------------------------------------------------------------- .../ignite/cache/version/package-info.java | 4 ++-- .../processors/cache/CacheInvokeEntry.java | 5 +++-- .../cache/transactions/IgniteTxEntry.java | 4 +++- .../transactions/IgniteTxLocalAdapter.java | 20 ++++++++++---------- 4 files changed, 18 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2be79c/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java b/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java index 9aeaba2..50ceb13 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java @@ -16,6 +16,6 @@ */ /** - * Contains cache version based implementations. + * Contains cache versioned entry interface. */ -package org.apache.ignite.cache.version; \ No newline at end of file +package org.apache.ignite.cache.version; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2be79c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java index 2d8f738..515a4c5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java @@ -49,14 +49,15 @@ public class CacheInvokeEntry<K, V> extends CacheLazyEntry<K, V> implements Muta public CacheInvokeEntry(GridCacheContext cctx, KeyCacheObject keyObj, @Nullable CacheObject valObj, - GridCacheVersion ver) { + GridCacheVersion ver + ) { super(cctx, keyObj, valObj); this.hadVal = valObj != null; this.ver = ver; } - /** + /** * @param ctx Cache context. * @param keyObj Key cache object. * @param key Key value. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2be79c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java index ed57bf2..73b9975 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java @@ -577,6 +577,8 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { ver = entry.version(); } catch (GridCacheEntryRemovedException e) { + assert tx.optimistic() : tx; + ver = null; } @@ -924,7 +926,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { return false; reader.incrementState(); - + case 6: flags = reader.readByte("flags"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2be79c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 7f171c2..e03f34d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -1937,14 +1937,14 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter GridCacheContext cacheCtx, Map<KeyCacheObject, GridCacheDrInfo> drMap ) { - return this.<Object, Object>putAllAsync0(cacheCtx, - null, - null, - null, - drMap, - false, - null, - null); + return putAllAsync0(cacheCtx, + null, + null, + null, + drMap, + false, + null, + null); } /** {@inheritDoc} */ @@ -2237,8 +2237,8 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter } catch (GridCacheEntryRemovedException ex) { if (log.isDebugEnabled()) - log.debug("Failed to get entry version: [msg=" + - ex.getMessage() + ']'); + log.debug("Failed to get entry version " + + "[err=" + ex.getMessage() + ']'); ver = null; }
