Mailing-List: contact commits-help@geode.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geode.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: klund@apache.org
To: commits@geode.apache.org
Date: Wed, 11 Jan 2017 00:00:34 -0000
Message-Id: <a9dc7f0b09cc4e1585fe8e34885f9fcc@git.apache.org>
In-Reply-To: <9fe639b8ddc54ababa1ada403a6819f1@git.apache.org>
References: <9fe639b8ddc54ababa1ada403a6819f1@git.apache.org>
Subject: [34/45] geode git commit: GEODE-2274: Add additional test cases --
 region entry operations with non colocated transactions fail with expected
 exception.
archived-at: Wed, 11 Jan 2017 00:00:07 -0000

GEODE-2274: Add additional test cases -- region
 entry operations with non colocated transactions fail with expected exception.


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

Branch: refs/heads/feature/GEODE-1930-2
Commit: 870a80d2d8fcd098ee1ecd053c4b71abc7a45f03
Parents: a10a026
Author: eshu <eshu@pivotal.io>
Authored: Tue Jan 10 10:21:17 2017 -0800
Committer: eshu <eshu@pivotal.io>
Committed: Tue Jan 10 10:24:48 2017 -0800

----------------------------------------------------------------------
 .../apache/geode/disttx/PRDistTXDUnitTest.java  |  10 +-
 .../disttx/PRDistTXWithVersionsDUnitTest.java   |  10 +-
 .../cache/execute/PRTransactionDUnitTest.java   | 189 +++++++++++++++----
 3 files changed, 160 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/870a80d2/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
index 1061cd5..f276b9f 100644
--- a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
@@ -41,19 +41,15 @@ public class PRDistTXDUnitTest extends PRTransactionDUnitTest {
 
   @Ignore("[DISTTX] TODO test overridden and intentionally left blank as it does not apply to disttx.")
   @Test
-  public void testTxWithGetOnMovedBucket() {}
+  public void testTxWithNonColocatedOps() {}
 
   @Ignore("[DISTTX] TODO test overridden and intentionally left blank as it does not apply to disttx.")
   @Test
-  public void testTxWithGetOnMovedBucketUsingBucketReadHook() {}
+  public void testTxWithOpsOnMovedBucket() {}
 
   @Ignore("[DISTTX] TODO test overridden and intentionally left blank as it does not apply to disttx.")
   @Test
-  public void testTxWithContainsValueForKeyOnMovedBucket() {}
-
-  @Ignore("[DISTTX] TODO test overridden and intentionally left blank as it does not apply to disttx.")
-  @Test
-  public void testTxWithContainsKeyOnMovedBucket() {}
+  public void testTxWithGetOnMovedBucketUsingBucketReadHook() {}
 
   @Ignore("[DISTTX] TODO test overridden and intentionally left blank as they fail.")
   @Test

http://git-wip-us.apache.org/repos/asf/geode/blob/870a80d2/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
index 34c28f4..022c93b 100644
--- a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
@@ -41,19 +41,15 @@ public class PRDistTXWithVersionsDUnitTest extends PRTransactionWithVersionsDUni
 
   @Ignore("[DISTTX] TODO test overridden and intentionally left blank as it does not apply to disttx.")
   @Test
-  public void testTxWithGetOnMovedBucket() {}
+  public void testTxWithNonColocatedOps() {}
 
   @Ignore("[DISTTX] TODO test overridden and intentionally left blank as it does not apply to disttx.")
   @Test
-  public void testTxWithGetOnMovedBucketUsingBucketReadHook() {}
+  public void testTxWithOpsOnMovedBucket() {}
 
   @Ignore("[DISTTX] TODO test overridden and intentionally left blank as it does not apply to disttx.")
   @Test
-  public void testTxWithContainsValueForKeyOnMovedBucket() {}
-
-  @Ignore("[DISTTX] TODO test overridden and intentionally left blank as it does not apply to disttx.")
-  @Test
-  public void testTxWithContainsKeyOnMovedBucket() {}
+  public void testTxWithGetOnMovedBucketUsingBucketReadHook() {}
 
   @Ignore("[DISTTX] TODO test overridden and intentionally left blank as they fail.")
   @Override

http://git-wip-us.apache.org/repos/asf/geode/blob/870a80d2/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
index 937059c..249f757 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
@@ -26,6 +26,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 import org.assertj.core.api.Assertions;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -337,24 +338,38 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
    * @param bucketRedundancy redundancy for the colocated PRs
    */
   protected void basicPRTXWithNonColocatedGet(int bucketRedundancy) {
+    setupColocatedRegions(bucketRedundancy);
+
+    dataStore1.invoke(verifyNonColocated);
+    dataStore2.invoke(verifyNonColocated);
+
+    dataStore1.invoke(getTx);
+  }
+
+  @SuppressWarnings("unchecked")
+  private void setupColocatedRegions(int bucketRedundancy) {
     dataStore1.invoke(runGetCache);
     dataStore2.invoke(runGetCache);
     redundancy = new Integer(bucketRedundancy);
     localMaxmemory = new Integer(50);
     totalNumBuckets = new Integer(2);
 
-    setAttributes(CustomerPartitionedRegionName, null);
-
-    createPRInTwoNodes();
+    createColocatedRegionsInTwoNodes();
 
     // Put the customer 1-2 in CustomerPartitionedRegion
     dataStore1.invoke(
         () -> PRColocationDUnitTest.putCustomerPartitionedRegion(CustomerPartitionedRegionName, 2));
 
-    dataStore1.invoke(verifyNonColocated);
-    dataStore2.invoke(verifyNonColocated);
+    // Put the associated order in colocated OrderPartitionedRegion
+    dataStore1.invoke(
+        () -> PRColocationDUnitTest.putOrderPartitionedRegion(OrderPartitionedRegionName, 2));
+  }
 
-    dataStore1.invoke(getTx);
+  private void createColocatedRegionsInTwoNodes() {
+    setAttributes(CustomerPartitionedRegionName, null);
+    createPRInTwoNodes();
+    setAttributes(OrderPartitionedRegionName, CustomerPartitionedRegionName);
+    createPRInTwoNodes();
   }
 
 
@@ -461,13 +476,9 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
    * @param bucketRedundancy redundancy for the colocated PRs
    */
   @SuppressWarnings("unchecked")
-  protected void basicPRTXWithOpOnMovedBucket(Op op, int bucketRedundancy) {
-    setupMoveBucket(bucketRedundancy);
-
-    DistributedMember dm1 = (DistributedMember) dataStore1.invoke(getDM());
-    DistributedMember dm2 = (DistributedMember) dataStore2.invoke(getDM());
-
-    // First get transaction.
+  protected void basicPRTXWithOpOnMovedBucket(Op op, int bucketRedundancy, DistributedMember dm1,
+      DistributedMember dm2) {
+    // First transaction.
     TransactionId txId = (TransactionId) dataStore1.invoke(beginTx());
     dataStore1.invoke(resumeTx(op, txId, dm1, dm2));
 
@@ -522,13 +533,14 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
   }
 
   enum Op {
-    GET, CONTAINSVALUEFORKEY, CONTAINSKEY;
+    GET, CONTAINSVALUEFORKEY, CONTAINSKEY, CREATE, PUT, INVALIDATE, DESTROY, GETENTRY;
   }
 
   private void _resumeTx(Op op, TransactionId txId, PartitionedRegion pr,
       CacheTransactionManager mgr) {
     CustId cust1 = new CustId(1);
     OrderId order1 = new OrderId(11, cust1);
+    OrderId neworder = new OrderId(111, cust1);
     mgr.resume(txId);
     try {
       switch (op) {
@@ -541,6 +553,21 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
         case CONTAINSKEY:
           pr.containsKey(order1);
           break;
+        case CREATE:
+          pr.create(neworder, new Order("test"));
+          break;
+        case PUT:
+          pr.put(order1, new Order("test"));
+          break;
+        case INVALIDATE:
+          pr.invalidate(order1);
+          break;
+        case DESTROY:
+          pr.destroy(order1);
+          break;
+        case GETENTRY:
+          pr.getEntry(order1);
+          break;
         default:
           throw new AssertionError("Unknown operations " + op);
       }
@@ -570,6 +597,11 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
         break;
       case CONTAINSVALUEFORKEY:
       case CONTAINSKEY:
+      case CREATE:
+      case PUT:
+      case INVALIDATE:
+      case DESTROY:
+      case GETENTRY:
         PartitionRegionHelper.moveBucketByKey(prOrder, source, destination, order1);
         break;
       default:
@@ -619,13 +651,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
     localMaxmemory = new Integer(50);
     totalNumBuckets = new Integer(1);
 
-    setAttributes(CustomerPartitionedRegionName, null);
-
-    createPRInTwoNodes();
-
-    setAttributes(OrderPartitionedRegionName, CustomerPartitionedRegionName);
-
-    createPRInTwoNodes();
+    createColocatedRegionsInTwoNodes();
 
     // Put the customer 1 in CustomerPartitionedRegion
     dataStore1.invoke(
@@ -641,31 +667,124 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
     basicPRTXWithNonColocatedGet(0);
   }
 
-  @Test
-  public void testTxWithGetOnMovedBucket() {
-    Op op = Op.GET;
-    basicPRTXWithOpOnMovedBucket(op, 0);
+  /**
+   * This method executes a transaction with entry op on non colocated entries and expects the
+   * transaction to fail with TransactionDataNotColocatedException.
+   * 
+   * @param bucketRedundancy redundancy for the colocated PRs
+   */
+  protected void basicPRTXWithNonColocatedOp(Op op, int bucketRedundancy) {
+    dataStore1.invoke(verifyNonColocated);
+    dataStore2.invoke(verifyNonColocated);
+
+    // TXState and TXStateStub will be exectued on different nodes.
+    dataStore1.invoke(doOp(op));
+    dataStore2.invoke(doOp(op));
+  }
+
+  @SuppressWarnings("serial")
+  private SerializableRunnable doOp(Op op) {
+    return new SerializableRunnable("doOp") {
+      @Override
+      public void run() {
+        basicDoOp(op);
+      }
+    };
+  }
+
+  private void basicDoOp(Op op) {
+    CacheTransactionManager mgr = basicGetCache().getCacheTransactionManager();
+
+    Assertions.assertThatThrownBy(() -> doOp(op, mgr))
+        .isInstanceOf(TransactionDataNotColocatedException.class);
+  }
+
+  private void doOp(Op op, CacheTransactionManager mgr) {
+    PartitionedRegion cust = (PartitionedRegion) basicGetCache()
+        .getRegion(Region.SEPARATOR + CustomerPartitionedRegionName);
+    PartitionedRegion order = (PartitionedRegion) basicGetCache()
+        .getRegion(Region.SEPARATOR + OrderPartitionedRegionName);
+
+    CustId cust1 = new CustId(1);
+    CustId cust2 = new CustId(2);
+    OrderId order2 = new OrderId(21, cust2);
+    OrderId neworder2 = new OrderId(221, cust2);
+
+    mgr.begin();
+    cust.get(cust1); // touch 1 bucket
+
+    try {
+      switch (op) {
+        case GET:
+          order.get(order2);
+          break;
+        case CONTAINSVALUEFORKEY:
+          order.containsValueForKey(order2);
+          break;
+        case CONTAINSKEY:
+          order.containsKey(order2);
+          break;
+        case CREATE:
+          order.create(neworder2, new Order("test"));
+          break;
+        case PUT:
+          order.put(order2, new Order("test"));
+          break;
+        case INVALIDATE:
+          order.invalidate(order2);
+          break;
+        case DESTROY:
+          order.destroy(order2);
+          break;
+        case GETENTRY:
+          order.getEntry(order2);
+          break;
+        default:
+          throw new AssertionError("Unknown operations " + op);
+      }
+    } finally {
+      mgr.rollback();
+    }
   }
 
   @Test
-  public void testTxWithGetOnMovedBucketUsingBucketReadHook() {
-    Op op = Op.GET;
-    useBucketReadHook = true;
-    basicPRTXWithOpOnMovedBucket(op, 0);
+  public void testTxWithNonColocatedOps() {
+    setupColocatedRegions(0);
+
+    for (Op op : Op.values()) {
+      LogService.getLogger().info("Testing Operation: " + op.name());
+      basicPRTXWithNonColocatedOp(op, 0);
+    }
   }
 
   private boolean useBucketReadHook = false;
 
+  @SuppressWarnings("unchecked")
   @Test
-  public void testTxWithContainsValueForKeyOnMovedBucket() {
-    Op op = Op.CONTAINSVALUEFORKEY;
-    basicPRTXWithOpOnMovedBucket(op, 0);
+  public void testTxWithOpsOnMovedBucket() {
+    setupMoveBucket(0);
+
+    DistributedMember dm1 = (DistributedMember) dataStore1.invoke(getDM());
+    DistributedMember dm2 = (DistributedMember) dataStore2.invoke(getDM());
+
+    for (Op op : Op.values()) {
+      LogService.getLogger().info("Testing Operation: " + op.name());
+      basicPRTXWithOpOnMovedBucket(op, 0, dm1, dm2);
+    }
   }
 
+  @SuppressWarnings("unchecked")
   @Test
-  public void testTxWithContainsKeyOnMovedBucket() {
-    Op op = Op.CONTAINSKEY;
-    basicPRTXWithOpOnMovedBucket(op, 0);
+  public void testTxWithGetOnMovedBucketUsingBucketReadHook() {
+    setupMoveBucket(0);
+
+    DistributedMember dm1 = (DistributedMember) dataStore1.invoke(getDM());
+    DistributedMember dm2 = (DistributedMember) dataStore2.invoke(getDM());
+
+    Op op = Op.GET;
+    useBucketReadHook = true;
+    basicPRTXWithOpOnMovedBucket(op, 0, dm1, dm2);
+    useBucketReadHook = false;
   }
 
   @Test