geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasonhu...@apache.org
Subject incubator-geode git commit: Revert "GEODE-1864: CompactMapRangeIndex now updates/removes from index correctly"
Date Tue, 13 Sep 2016 16:04:21 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop cd8187b13 -> 74e773299


Revert "GEODE-1864: CompactMapRangeIndex now updates/removes from index correctly"

This reverts commit 1246f4faedc38715977244e10fa06fa1962d6288.


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

Branch: refs/heads/develop
Commit: 74e773299710eca44f672fff767ab03e0e4e6f8b
Parents: cd8187b
Author: Jason Huynh <huynhja@gmail.com>
Authored: Tue Sep 13 09:02:40 2016 -0700
Committer: Jason Huynh <huynhja@gmail.com>
Committed: Tue Sep 13 09:04:08 2016 -0700

----------------------------------------------------------------------
 .../internal/index/CompactMapRangeIndex.java    |  21 ----
 .../MapRangeIndexMaintenanceJUnitTest.java      | 110 -------------------
 2 files changed, 131 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/74e77329/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactMapRangeIndex.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactMapRangeIndex.java
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactMapRangeIndex.java
index 80c9fca..a089853 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactMapRangeIndex.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactMapRangeIndex.java
@@ -16,16 +16,9 @@
  */
 package com.gemstone.gemfire.cache.query.internal.index;
 
-import static javax.swing.UIManager.get;
-
-import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.cache.query.IndexStatistics;
@@ -117,7 +110,6 @@ public class CompactMapRangeIndex extends AbstractMapIndex
         Object indexKey = mapEntry.getValue();
         this.saveIndexAddition(mapKey, indexKey, value, entry);
       }
-      removeOldMappings(((Map) key).entrySet(), entry);
     }
     else {
       for (Object mapKey : mapKeys) {
@@ -129,19 +121,6 @@ public class CompactMapRangeIndex extends AbstractMapIndex
       }
     }
   }
-
-  private void removeOldMappings(Collection presentKeys, RegionEntry entry) throws IMQException
{
-    Map oldKeysAndValuesForEntry = entryToMapKeyIndexKeyMap.get(entry);
-    if (oldKeysAndValuesForEntry == null) {
-      oldKeysAndValuesForEntry = Collections.EMPTY_MAP;
-    }
-    Set<Entry> removedKeyValueEntries = oldKeysAndValuesForEntry != null ? oldKeysAndValuesForEntry.entrySet():
Collections.EMPTY_SET;
-    removedKeyValueEntries.removeAll(presentKeys);
-    for (Map.Entry<?,?> keyValue : removedKeyValueEntries){
-      CompactRangeIndex rg = (CompactRangeIndex) this.mapKeyToValueIndex.get(keyValue.getKey());
-      rg.removeMapping(keyValue.getValue(), entry);
-    }
-  }
   
   protected void doIndexAddition(Object mapKey, Object indexKey, Object value,
       RegionEntry entry) throws IMQException

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/74e77329/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
index 55084bd..e346522 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
@@ -146,116 +146,6 @@ public class MapRangeIndexMaintenanceJUnitTest{
     }
   }
 
-  @Test
-  public void updatingAMapFieldWithDifferentKeysShouldRemoveOldKeysThatAreNoLongerPresent()
throws Exception {
-    //Create Partition Region
-    AttributesFactory af = new AttributesFactory();
-    af.setScope(Scope.LOCAL);
-
-    Portfolio p = new Portfolio(1, 1);
-    HashMap map1 = new HashMap();
-    map1.put("SUN", 1);
-    map1.put("IBM", 2);
-    p.positions = map1;
-    region = CacheUtils.createRegion("portfolio", af.create(), false);
-    region.put(1, p);
-    qs = CacheUtils.getQueryService();
-
-    keyIndex1 = (IndexProtocol) qs.createIndex(INDEX_NAME, "positions[*]", "/portfolio");
-
-    assertTrue(keyIndex1 instanceof CompactMapRangeIndex);
-
-    Portfolio p2 = new Portfolio(1, 1);
-    HashMap map2 = new HashMap();
-    p2.positions = map2;
-    map2.put("NEW_KEY", 1);
-    region.put(1, p2);
-
-    SelectResults results = (SelectResults) qs.newQuery("select * from /portfolio p where
p.positions['SUN'] = 1 OR p.positions['IBM'] = 2").execute();
-    assertEquals(0, results.size());
-  }
-
-  @Test
-  public void updatingAMapFieldSameKeysShouldUpdateCorrectly() throws Exception {
-    //Create Partition Region
-    AttributesFactory af = new AttributesFactory();
-    af.setScope(Scope.LOCAL);
-
-    Portfolio p = new Portfolio(1, 1);
-    HashMap map1 = new HashMap();
-    map1.put("SUN", 1);
-    map1.put("IBM", 2);
-    p.positions = map1;
-    region = CacheUtils.createRegion("portfolio", af.create(), false);
-    region.put(1, p);
-    qs = CacheUtils.getQueryService();
-
-    keyIndex1 = (IndexProtocol) qs.createIndex(INDEX_NAME, "positions[*]", "/portfolio");
-
-    assertTrue(keyIndex1 instanceof CompactMapRangeIndex);
-
-    Portfolio p2 = new Portfolio(1, 1);
-    HashMap map2 = new HashMap();
-    p2.positions = map2;
-    map2.put("NEW_KEY", 1);
-    region.put(1, p2);
-
-    SelectResults results = (SelectResults) qs.newQuery("select * from /portfolio p where
p.positions['SUN'] = 1 OR p.positions['IBM'] = 2").execute();
-    assertEquals(0, results.size());
-  }
-
-  @Test
-  public void updatingAMapFieldWithNoKeysShouldRemoveOldKeysThatAreNoLongerPresent() throws
Exception {
-    //Create Partition Region
-    AttributesFactory af = new AttributesFactory();
-    af.setScope(Scope.LOCAL);
-
-    Portfolio p = new Portfolio(1, 1);
-    HashMap map1 = new HashMap();
-    map1.put("SUN", 1);
-    map1.put("IBM", 2);
-    p.positions = map1;
-    region = CacheUtils.createRegion("portfolio", af.create(), false);
-    region.put(1, p);
-    qs = CacheUtils.getQueryService();
-
-    keyIndex1 = (IndexProtocol) qs.createIndex(INDEX_NAME, "positions[*]", "/portfolio");
-
-    Portfolio p2 = new Portfolio(1, 1);
-    HashMap map2 = new HashMap();
-    p2.positions = map2;
-    region.put(1, p2);
-
-    SelectResults results = (SelectResults) qs.newQuery("select * from /portfolio p where
p.positions['SUN'] = 1 OR p.positions['IBM'] = 2").execute();
-    assertEquals(0, results.size());
-  }
-
-
-  @Test
-  public void updatingEmptyMapToMapWithKeysShouldIndexNewKeysCorrectly() throws Exception
{
-    //Create Partition Region
-    AttributesFactory af = new AttributesFactory();
-    af.setScope(Scope.LOCAL);
-
-    Portfolio p = new Portfolio(1, 1);
-    HashMap map1 = new HashMap();
-    p.positions = map1;
-    region = CacheUtils.createRegion("portfolio", af.create(), false);
-    region.put(1, p);
-    qs = CacheUtils.getQueryService();
-
-    keyIndex1 = (IndexProtocol) qs.createIndex(INDEX_NAME, "positions[*]", "/portfolio");
-
-    Portfolio p2 = new Portfolio(1, 1);
-    HashMap map2 = new HashMap();
-    p2.positions = map2;
-    map2.put("SUN", 1);
-    map2.put("IBM", 2);
-    region.put(1, p2);
-
-    SelectResults results = (SelectResults) qs.newQuery("select * from /portfolio p where
p.positions['SUN'] = 1 OR p.positions['IBM'] = 2").execute();
-    assertEquals(1, results.size());
-  }
   /**
    * Test index object's comapreTo Function implementation correctness for indexes.
    * @throws Exception


Mime
View raw message