ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject ignite git commit: IGNITE-426 Fixed tests!
Date Wed, 04 Nov 2015 09:38:05 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-426-2-reb eec38dfc1 -> 99a5f20cd


IGNITE-426 Fixed tests!


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/99a5f20c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/99a5f20c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/99a5f20c

Branch: refs/heads/ignite-426-2-reb
Commit: 99a5f20cd6434aead36ddc1ae67ef012942a1dba
Parents: eec38df
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Wed Nov 4 12:38:06 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Wed Nov 4 12:38:06 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheMapEntry.java     | 32 --------------------
 .../dht/atomic/GridDhtAtomicCache.java          |  2 +-
 2 files changed, 1 insertion(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/99a5f20c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 49899cd..9273f5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1944,38 +1944,6 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter
impleme
                                     "[entry=" + this + ", newVer=" + newVer + ']');
                         }
 
-                        if (!cctx.isNear()) {
-                            CacheObject evtVal;
-
-                            if (op == GridCacheOperation.TRANSFORM) {
-                                EntryProcessor<Object, Object, ?> entryProcessor =
-                                    (EntryProcessor<Object, Object, ?>)writeObj;
-
-                                CacheInvokeEntry<Object, Object> entry =
-                                    new CacheInvokeEntry<>(cctx, key, prevVal, version());
-
-                                try {
-                                    entryProcessor.process(entry, invokeArgs);
-
-                                    evtVal = entry.modified() ?
-                                        cctx.toCacheObject(cctx.unwrapTemporary(entry.getValue()))
: prevVal;
-                                }
-                                catch (Exception e) {
-                                    evtVal = prevVal;
-                                }
-                            }
-                            else
-                                evtVal = (CacheObject)writeObj;
-
-                            updateIdx0 = nextPartIndex(topVer);
-
-                            if (updateIdx != null)
-                                updateIdx0 = updateIdx;
-
-                            cctx.continuousQueries().onEntryUpdated(GridCacheMapEntry.this,
key, evtVal,
-                                prevVal, primary, false, updateIdx0, topVer);
-                        }
-
                         return new GridCacheUpdateAtomicResult(false,
                             retval ? rawGetOrUnmarshalUnlocked(false) : null,
                             null,

http://git-wip-us.apache.org/repos/asf/ignite/blob/99a5f20c/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 d64e2c0..d44fc04 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
@@ -1836,7 +1836,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
                                 "[entry=" + entry + ", filter=" + Arrays.toString(req.filter())
+ ']');
                     }
                 }
-                else if (!entry.isNear()) {
+                else if (!entry.isNear() && updRes.success()) {
                     ctx.continuousQueries().onEntryUpdated(entry, entry.key(), updRes.newValue(),
updRes.oldValue(),
                         primary, false, updRes.updateIdx(), topVer);
                 }


Mime
View raw message