geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [35/50] [abbrv] incubator-geode git commit: [GEODE-480] ConcurrentIndexUpdateWithoutWLDUnitTest.testRangeIndex Stat in abstractIndex should be atomic or in a synchronized block
Date Mon, 02 Nov 2015 21:53:01 GMT
[GEODE-480] ConcurrentIndexUpdateWithoutWLDUnitTest.testRangeIndex
Stat in abstractIndex should be atomic or in a synchronized block


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f437106e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f437106e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f437106e

Branch: refs/heads/feature/GEODE-328
Commit: f437106ecde4414b04d9e21e0af4df41812b82b6
Parents: f0bd8b0
Author: Jason Huynh <jhuynh@pivotal.io>
Authored: Fri Oct 23 12:40:54 2015 -0700
Committer: Jason Huynh <jhuynh@pivotal.io>
Committed: Fri Oct 23 12:40:54 2015 -0700

----------------------------------------------------------------------
 .../query/internal/index/AbstractIndex.java     | 23 ++++++++++----------
 1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f437106e/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
index 6c0d0bf..aca4078 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
@@ -17,6 +17,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -1744,7 +1745,7 @@ public abstract class AbstractIndex implements IndexProtocol
   {
     protected Map map;
     private boolean useList;
-    private volatile int numValues = 0;
+    private AtomicInteger numValues = new AtomicInteger(0);
 
     RegionEntryToValuesMap(boolean useList) {
       this.map = new ConcurrentHashMap(2, 0.75f, 1);
@@ -1793,7 +1794,7 @@ public abstract class AbstractIndex implements IndexProtocol
         coll.add(value);
         map.put(entry, coll);
       }
-      this.numValues++;
+      numValues.incrementAndGet();
     }
 
     public void addAll(RegionEntry entry, Collection values)
@@ -1803,7 +1804,7 @@ public abstract class AbstractIndex implements IndexProtocol
         Collection coll = useList?new ArrayList(values.size()):new IndexConcurrentHashSet(values.size(),
0.75f, 1);
         coll.addAll(values);
         map.put(entry, coll);
-        this.numValues = this.numValues + values.size();
+        numValues.addAndGet(values.size());
       } else if (object instanceof Collection) {
         Collection coll = (Collection) object;
         // If its a list query might get ConcurrentModificationException.
@@ -1822,7 +1823,7 @@ public abstract class AbstractIndex implements IndexProtocol
         coll.add(object);
         map.put(entry, coll);
       }
-      this.numValues = this.numValues + values.size();
+      numValues.addAndGet(values.size());
     }
 
     public Object get(RegionEntry entry)
@@ -1860,14 +1861,14 @@ public abstract class AbstractIndex implements IndexProtocol
           if (coll.size() == 0) {
             map.remove(entry);
           }
-          this.numValues--;
+          numValues.decrementAndGet();
         }
       }
       else {
         if (object.equals(value)) {
           map.remove(entry);
         }
-        this.numValues--;
+        this.numValues.decrementAndGet();
       }
     }
 
@@ -1875,8 +1876,8 @@ public abstract class AbstractIndex implements IndexProtocol
     {
       Object retVal = map.remove(entry);
       if (retVal != null) {
-            this.numValues = (retVal instanceof Collection) ? this.numValues
-                - ((Collection) retVal).size() : this.numValues - 1;
+            numValues.addAndGet((retVal instanceof Collection) ?
+              - ((Collection) retVal).size() : -1 );
       }
       return retVal;
     }
@@ -1896,7 +1897,7 @@ public abstract class AbstractIndex implements IndexProtocol
 
     public int getNumValues()
     {
-      return this.numValues;
+      return this.numValues.get();
     }
 
     public int getNumEntries()
@@ -2158,7 +2159,7 @@ public abstract class AbstractIndex implements IndexProtocol
     public void clear()
     {
       map.clear();
-      this.numValues = 0;
+      this.numValues.set(0);
     }
 
     public Set entrySet()
@@ -2175,7 +2176,7 @@ public abstract class AbstractIndex implements IndexProtocol
     public void replace(RegionEntry entry, Object values) {
       int numOldValues = getNumValues(entry);
       this.map.put(entry, values);
-      this.numValues += (((values instanceof Collection) ? ((Collection) values)
+      this.numValues.addAndGet(((values instanceof Collection) ? ((Collection) values)
           .size() : 1) - numOldValues);
     }
   }


Mime
View raw message