ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [1/3] ignite git commit: Reverted invalid changes.
Date Fri, 04 Mar 2016 13:29:41 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-atomic-good-lock-bench a86c4c7d6 -> 78dd3ea42


Reverted invalid changes.


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

Branch: refs/heads/ignite-atomic-good-lock-bench
Commit: 2d6c6c9bd4ce2379edd32e8e472d52c183995920
Parents: a86c4c7
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Mar 4 16:10:40 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Mar 4 16:10:40 2016 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheIoManager.java   |  6 +++---
 .../distributed/dht/atomic/GridDhtAtomicCache.java      | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2d6c6c9b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 6cb3510..b297827 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -281,7 +281,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter
{
     @SuppressWarnings({"unchecked", "ConstantConditions", "ThrowableResultOfMethodCallIgnored"})
     private void onMessage0(final UUID nodeId, final GridCacheMessage cacheMsg,
         final IgniteBiInClosure<UUID, GridCacheMessage> c) {
-        //rw.readLock();
+        rw.readLock();
 
         try {
             if (stopping) {
@@ -312,7 +312,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter
{
             if (depEnabled)
                 cctx.deploy().ignoreOwnership(false);
 
-            //rw.readUnlock();
+            rw.readUnlock();
         }
     }
 
@@ -619,7 +619,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter
{
             cctx.mvcc().contextReset();
 
             // Unwind eviction notifications.
-            //CU.unwindEvicts(cctx);
+            CU.unwindEvicts(cctx);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/2d6c6c9b/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 2ca54c3..e908c05 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
@@ -2611,12 +2611,12 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
             // Optimization.
             return;
 
-//        // Must touch all entries since update may have deleted entries.
-//        // Eviction manager will remove empty entries.
-//        for (GridCacheMapEntry entry : locked) {
-//            if (entry != null && (skip == null || !skip.contains(entry.key())))
-//                ctx.evicts().touch(entry, topVer);
-//        }
+        // Must touch all entries since update may have deleted entries.
+        // Eviction manager will remove empty entries.
+        for (GridCacheMapEntry entry : locked) {
+            if (entry != null && (skip == null || !skip.contains(entry.key())))
+                ctx.evicts().touch(entry, topVer);
+        }
     }
 
     /**


Mime
View raw message