[geode] branch develop updated: GEODE-3707: Removal of duplicate entries

[nn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 1210e1b  GEODE-3707: Removal of duplicate entries
1210e1b is described below

commit 1210e1be167a0bb8a3ec31f12020ecdbc583258c
Author: nabarun <nn...@pivotal.io>
AuthorDate: Tue Sep 26 17:34:02 2017 -0700

    GEODE-3707: Removal of duplicate entries
    
    	* Queries with two join condition were entering duplciate entries into the final result set
    	* We do not add the new result entry in derieved info if the entry is already present.
---
 .../geode/cache/query/internal/DerivedInfo.java    |  15 ++-
 .../cache/query/JoinQueriesIntegrationTest.java    | 122 +++++++++++++++++++++
 2 files changed, 131 insertions(+), 6 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DerivedInfo.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DerivedInfo.java
index 26c579a..1cddac1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DerivedInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DerivedInfo.java
@@ -64,18 +64,21 @@ public class DerivedInfo {
     return remainingOps;
   }
 
-  public void addDerivedResults(IndexInfo indexInfo, SelectResults sr) {
+  public void addDerivedResults(IndexInfo indexInfo, SelectResults selectResults) {
     IndexProtocol index = indexInfo._index;
     String key = QueryUtils.getCompiledIdFromPath(indexInfo._path).getId() + ":"
         + index.getCanonicalizedIteratorDefinitions()[0];
-    // String key = index.getCanonicalizedIteratorDefinitions()[0];
     if (derivedResults.containsKey(key)) {
-      derivedResults.get(key).addAll(sr);
+      for (Object result : selectResults) {
+        if (!derivedResults.get(key).contains(result)) {
+          derivedResults.get(key).add(result);
+        }
+      }
     } else {
-      derivedResults.put(key, sr);
+      derivedResults.put(key, selectResults);
     }
-    newDerivatives
-        .add(new Object[] {QueryUtils.getCompiledIdFromPath(indexInfo._path).getId(), sr});
+    newDerivatives.add(
+        new Object[] {QueryUtils.getCompiledIdFromPath(indexInfo._path).getId(), selectResults});
     successfulOps.add(currentOp);
   }
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java
new file mode 100644
index 0000000..f2d4ec0
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java
@@ -0,0 +1,122 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.cache.query;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.Serializable;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.CacheUtils;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+@RunWith(JUnitParamsRunner.class)
+public class JoinQueriesIntegrationTest {
+
+  public static class Customer implements Serializable {
+    public int pkid;
+    public int id;
+    public int joinId;
+    public String name;
+
+    public Customer(int pkid, int id) {
+      this.pkid = pkid;
+      this.id = id;
+      this.joinId = id;
+      this.name = "name" + pkid;
+    }
+
+    public Customer(int pkid, int id, int joinId) {
+      this.pkid = pkid;
+      this.id = id;
+      this.joinId = joinId;
+      this.name = "name" + pkid;
+    }
+
+    public String toString() {
+      return "Customer pkid = " + pkid + ", id: " + id + " name:" + name + " joinId: " + joinId;
+    }
+  }
+
+
+  private static Object[] getQueryStrings() {
+    return new Object[] {new Object[] {
+        "<trace>select STA.id as STACID, STA.pkid as STAacctNum, STC.id as STCCID, STC.pkid as STCacctNum from /region1 STA, /region2 STC where STA.pkid = 1 AND STA.joinId = STC.joinId AND STA.id = STC.id",
+        20},};
+  }
+
+  @Test
+  @Parameters(method = "getQueryStrings")
+  public void testJoinTwoRegions(String queryString, int expectedResultSize) throws Exception {
+    Cache cache = CacheUtils.getCache();
+    try {
+      Region region1 =
+          cache.createRegionFactory().setDataPolicy(DataPolicy.REPLICATE).create("region1");
+      Region region2 =
+          cache.createRegionFactory().setDataPolicy(DataPolicy.REPLICATE).create("region2");
+
+      populateRegionWithData(region1, region2);
+
+      QueryService queryService = cache.getQueryService();
+
+      SelectResults results = (SelectResults) queryService.newQuery(queryString).execute();
+      int resultsWithoutIndex = results.size();
+      assertEquals(expectedResultSize, resultsWithoutIndex);
+
+      queryService.createIndex("pkidregion1", "p.pkid", "/region1 p");
+      queryService.createIndex("pkidregion2", "p.pkid", "/region2 p");
+      queryService.createIndex("indexIDRegion2", "p.id", "/region2 p");
+      queryService.createIndex("indexIDRegion1", "p.id", "/region1 p");
+      queryService.createIndex("joinIdregion1", "p.joinId", "/region1 p");
+      queryService.createIndex("joinIdregion2", "p.joinId", "/region2 p");
+      queryService.createIndex("nameIndex", "p.name", "/region2 p");
+
+      results = (SelectResults) queryService.newQuery(queryString).execute();
+      int resultsSizeWithIndex = results.size();
+      assertEquals(expectedResultSize, resultsWithoutIndex);
+      assertEquals(resultsSizeWithIndex, resultsWithoutIndex);
+    } finally {
+      cache.getRegion("region1").destroyRegion();
+      cache.getRegion("region2").destroyRegion();
+    }
+
+  }
+
+  private void populateRegionWithData(Region region1, Region region2) {
+    for (int i = 1; i < 11; i++) {
+      if (i == 1 || i == 3 || i == 8 || i == 2 || i == 5) {
+        region1.put(i, new Customer(1, 1, 1));
+      } else {
+        region1.put(i, new Customer(i, i, i));
+      }
+      if (i == 1 || i == 4 || i == 7 || i == 10) {
+        region2.put(i, new Customer(1, 1, 1));
+      } else {
+        region2.put(i, new Customer(i % 5, i, i % 3));
+      }
+    }
+  }
+}

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].