http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionTimeOutDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionTimeOutDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionTimeOutDUnitTest.java index 7616abc..fb49918 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionTimeOutDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionTimeOutDUnitTest.java @@ -116,14 +116,14 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT FunctionService.registerFunction(function); Execution dataSet = FunctionService.onRegion(pr); try { - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); } catch (Exception expected) { // No data should cause exec to throw assertTrue(expected.getMessage().contains("No target node found for KEY = " + testKey)); } pr.put(testKey, new Integer(1)); ResultCollector rs1 = - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); assertEquals(Boolean.TRUE, ((List) rs1.getResult()).get(0)); try { rs1.getResult(); @@ -134,7 +134,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT ResultCollector rs2 = - dataSet.withFilter(testKeysSet).withArgs(testKey).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(testKey).execute(function.getId()); assertEquals(new Integer(1), ((List) rs2.getResult()).get(0)); try { rs1.getResult(); @@ -147,7 +147,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT putData.put(testKey + "1", new Integer(2)); putData.put(testKey + "2", new Integer(3)); ResultCollector rs3 = - dataSet.withFilter(testKeysSet).withArgs(putData).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(putData).execute(function.getId()); assertEquals(Boolean.TRUE, ((List) rs3.getResult(4000, TimeUnit.MILLISECONDS)).get(0)); try { rs1.getResult(); @@ -161,7 +161,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT ResultCollector rst1 = - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); try { rst1.getResult(1000, TimeUnit.MILLISECONDS); fail("Did not get the expected timeout exception."); @@ -177,7 +177,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT } ResultCollector rst2 = - dataSet.withFilter(testKeysSet).withArgs(testKey).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(testKey).execute(function.getId()); try { rst2.getResult(1000, TimeUnit.MILLISECONDS); fail("Did not get the expected timeout exception."); @@ -196,7 +196,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT putDataTimeOut.put(testKey + "4", new Integer(4)); putDataTimeOut.put(testKey + "5", new Integer(5)); ResultCollector rst3 = - dataSet.withFilter(testKeysSet).withArgs(putDataTimeOut).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(putDataTimeOut).execute(function.getId()); try { rst3.getResult(1000, TimeUnit.MILLISECONDS); fail("Did not get the expected timeout exception."); @@ -273,7 +273,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT Execution dataSet = FunctionService.onRegion(pr); try { - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); } catch (Exception expected) { assertTrue(expected.getMessage(), expected.getMessage().contains("No target node found for KEY")); @@ -287,7 +287,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT pr.put(i.next(), val); } ResultCollector rs = - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); List l = ((List) rs.getResult()); assertEquals(3, l.size()); @@ -304,7 +304,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT // DefaultResultCollector rc2 = new DefaultResultCollector(); ResultCollector rc2 = - dataSet.withFilter(testKeysSet).withArgs(testKeysSet).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(testKeysSet).execute(function.getId()); List l2 = ((List) rc2.getResult()); assertEquals(3, l2.size()); @@ -327,7 +327,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT ResultCollector rst = - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); try { rst.getResult(1000, TimeUnit.MILLISECONDS); fail("Did not get the expected exception."); @@ -344,7 +344,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT } ResultCollector rct2 = - dataSet.withFilter(testKeysSet).withArgs(testKeysSet).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(testKeysSet).execute(function.getId()); try { rct2.getResult(1000, TimeUnit.MILLISECONDS); @@ -428,7 +428,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT pr.put(i.next(), val); } ResultCollector rs = - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); List l = (List) rs.getResult(); assertEquals(3, l.size()); @@ -436,7 +436,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT assertEquals(Boolean.TRUE, i.next()); } ResultCollector rst = - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); try { rst.getResult(1000, TimeUnit.MILLISECONDS); @@ -520,7 +520,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT } ResultCollector rs; try { - rs = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + rs = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); rs.getResult(1000, TimeUnit.MILLISECONDS); fail("Did not get the expected exception."); } catch (Exception expected) { @@ -595,13 +595,13 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT origVals.add(val); pr.put(i.next(), val); } - ResultCollector rs = - dataSet.withFilter(testKeysSet).withArgs("TestingTimeOut").execute(function.getId()); + ResultCollector rs = dataSet.withFilter(testKeysSet).setArguments("TestingTimeOut") + .execute(function.getId()); List l = ((List) rs.getResult(8000, TimeUnit.MILLISECONDS)); assertEquals(3, l.size()); // this test may fail..but rarely - ResultCollector rst = - dataSet.withFilter(testKeysSet).withArgs("TestingTimeOut").execute(function.getId()); + ResultCollector rst = dataSet.withFilter(testKeysSet).setArguments("TestingTimeOut") + .execute(function.getId()); rst.getResult(8000, TimeUnit.MILLISECONDS); assertEquals(3, l.size()); @@ -652,7 +652,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT final HashSet testKeysSet = new HashSet(); testKeysSet.add(testKey); try { - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); // TODO: expected exception pattern requires fail here } catch (Exception expected) { // No data should cause exec to throw @@ -682,7 +682,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT } ResultCollector rc1 = - dataSet.withFilter(testKeys).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeys).setArguments(Boolean.TRUE).execute(function.getId()); List l = ((List) rc1.getResult()); assertEquals(1, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { @@ -691,7 +691,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT // DefaultResultCollector rc2 = new DefaultResultCollector(); ResultCollector rc2 = - dataSet.withFilter(testKeys).withArgs(testKeys).execute(function.getId()); + dataSet.withFilter(testKeys).setArguments(testKeys).execute(function.getId()); List l2 = ((List) rc2.getResult()); assertEquals(1, l2.size()); @@ -706,7 +706,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT assertEquals(origVals, foundVals); ResultCollector rct1 = - dataSet.withFilter(testKeys).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeys).setArguments(Boolean.TRUE).execute(function.getId()); try { rct1.getResult(1000, TimeUnit.MILLISECONDS); @@ -734,7 +734,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT } ResultCollector rct2 = - dataSet.withFilter(testKeys).withArgs(testKeys).execute(function.getId()); + dataSet.withFilter(testKeys).setArguments(testKeys).execute(function.getId()); try { rct2.getResult(1000, TimeUnit.MILLISECONDS); @@ -825,7 +825,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT Function function = new TestFunction(true, TEST_FUNCTION_TIMEOUT); FunctionService.registerFunction(function); Execution dataSet = FunctionService.onRegion(pr); - ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute(function.getId()); + ResultCollector rc1 = dataSet.setArguments(Boolean.TRUE).execute(function.getId()); List l = ((List) rc1.getResult()); assertEquals(4, l.size()); @@ -834,7 +834,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends PartitionedRegionDUnitT } - ResultCollector rct1 = dataSet.withArgs(Boolean.TRUE).execute(function.getId()); + ResultCollector rct1 = dataSet.setArguments(Boolean.TRUE).execute(function.getId()); try { rct1.getResult(1000, TimeUnit.MILLISECONDS);
http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java index 981b384..a846808 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java @@ -120,7 +120,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg FunctionService.registerFunction(function); Execution dataSet = FunctionService.onRegion(pr); try { - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); } catch (Exception expected) { // No data should cause exec to throw assertTrue(expected.getMessage().contains("No target node found for KEY = " + testKey)); @@ -132,16 +132,16 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg testKeysSet.add(testKey + "4"); ResultCollector rs1 = - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); assertEquals(Boolean.TRUE, ((List) rs1.getResult()).get(0)); - ResultCollector rs2 = dataSet.withFilter(testKeysSet).withArgs((Serializable) testKeysSet) - .execute(function.getId()); + ResultCollector rs2 = dataSet.withFilter(testKeysSet) + .setArguments((Serializable) testKeysSet).execute(function.getId()); HashMap putData = new HashMap(); putData.put(testKey + "1", new Integer(2)); putData.put(testKey + "2", new Integer(3)); ResultCollector rs3 = - dataSet.withFilter(testKeysSet).withArgs(putData).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(putData).execute(function.getId()); assertEquals(Boolean.TRUE, ((List) rs3.getResult()).get(0)); assertEquals(new Integer(2), pr.get(testKey + "1")); @@ -209,7 +209,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg testKeysSet.add(testKey + "4"); ResultCollector rs1 = - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); try { assertEquals(Boolean.TRUE, ((List) rs1.getResult()).get(0)); fail("Expected FunctionException : Function did not send last result"); @@ -279,7 +279,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg Execution dataSet = FunctionService.onRegion(pr); try { - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); } catch (Exception expected) { assertTrue(expected.getMessage().contains("No target node found for KEY = ")); } @@ -292,7 +292,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg pr.put(i.next(), val); } ResultCollector rs = - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); List l = ((List) rs.getResult()); assertEquals(3, l.size()); @@ -302,7 +302,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg } ResultCollector rc2 = - dataSet.withFilter(testKeysSet).withArgs(testKeysSet).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(testKeysSet).execute(function.getId()); List l2 = ((List) rc2.getResult()); assertEquals(pr.getTotalNumberOfBuckets() * 2 * 3, l2.size()); @@ -341,7 +341,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg final HashSet testKeysSet = new HashSet(); testKeysSet.add(testKey); try { - dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId()); } catch (Exception expected) { // No data should cause exec to throw assertTrue(expected.getMessage().contains("No target node found for KEY = " + testKey)); @@ -361,7 +361,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg } ResultCollector rc1 = - dataSet.withFilter(testKeys).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeys).setArguments(Boolean.TRUE).execute(function.getId()); List l = ((List) rc1.getResult()); assertEquals(1, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { @@ -369,7 +369,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg } ResultCollector rc2 = - dataSet.withFilter(testKeys).withArgs(testKeys).execute(function.getId()); + dataSet.withFilter(testKeys).setArguments(testKeys).execute(function.getId()); List l2 = ((List) rc2.getResult()); assertEquals(226, l2.size()); @@ -419,7 +419,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg } ResultCollector rc1 = - dataSet.withFilter(testKeys).withArgs(Boolean.TRUE).execute(function.getId()); + dataSet.withFilter(testKeys).setArguments(Boolean.TRUE).execute(function.getId()); try { assertEquals(Boolean.TRUE, ((List) rc1.getResult()).get(0)); fail("Expected FunctionException : Function did not send last result"); @@ -489,7 +489,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_NO_LASTRESULT); FunctionService.registerFunction(function); Execution dataSet = FunctionService.onRegion(pr); - ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute(function.getId()); + ResultCollector rc1 = dataSet.setArguments(Boolean.TRUE).execute(function.getId()); try { assertEquals(Boolean.TRUE, ((List) rc1.getResult()).get(0)); fail("Expected FunctionException : Function did not send last result"); @@ -552,7 +552,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg Function function = new TestFunction(true, TestFunction.TEST_FUNCTION9); FunctionService.registerFunction(function); Execution dataSet = FunctionService.onRegion(pr); - ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute(function.getId()); + ResultCollector rc1 = dataSet.setArguments(Boolean.TRUE).execute(function.getId()); List l = ((List) rc1.getResult()); LogWriterUtils.getLogWriter() .info("PRFunctionExecutionDUnitTest#testExecutionOnAllNodes_byName : Result size :" @@ -613,7 +613,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg Execution dataSet = FunctionService.onRegion(region); try { - ResultCollector rc = dataSet.withArgs(Boolean.TRUE).execute(function.getId()); + ResultCollector rc = dataSet.setArguments(Boolean.TRUE).execute(function.getId()); Object o = rc.getResult(); fail("Expected Function Exception"); } catch (Exception expected) { http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/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 249f757..7a56644 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 @@ -184,7 +184,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { args.add(order); filter.add(custId); try { - e.withFilter(filter).withArgs(args).execute(txFunction.getId()).getResult(); + e.withFilter(filter).setArguments(args).execute(txFunction.getId()).getResult(); fail("Expected exception was not thrown"); } catch (FunctionException fe) { LogWriterUtils.getLogWriter().info("Caught Expected exception"); @@ -201,7 +201,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { LogWriterUtils.getLogWriter().info("VERIFY_TX"); orderpr.put(orderId, order); assertNotNull(orderpr.get(orderId)); - e.withFilter(filter).withArgs(args).execute(txFunction.getId()).getResult(); + e.withFilter(filter).setArguments(args).execute(txFunction.getId()).getResult(); assertTrue("Unexpected customer value after commit", newCus.equals(pr.get(custId))); Order commitedOrder = (Order) orderpr.get(orderId); assertTrue( @@ -209,19 +209,19 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { order.equals(commitedOrder)); // verify conflict detection args.set(0, new Integer(VERIFY_TXSTATE_CONFLICT)); - e.withFilter(filter).withArgs(args).execute(txFunction.getId()).getResult(); + e.withFilter(filter).setArguments(args).execute(txFunction.getId()).getResult(); // verify that the transaction is rolled back args.set(0, new Integer(VERIFY_ROLLBACK)); LogWriterUtils.getLogWriter().info("VERIFY_ROLLBACK"); - e.withFilter(filter).withArgs(args).execute(txFunction.getId()).getResult(); + e.withFilter(filter).setArguments(args).execute(txFunction.getId()).getResult(); // verify destroy args.set(0, new Integer(VERIFY_DESTROY)); LogWriterUtils.getLogWriter().info("VERIFY_DESTROY"); - e.withFilter(filter).withArgs(args).execute(txFunction.getId()).getResult(); + e.withFilter(filter).setArguments(args).execute(txFunction.getId()).getResult(); // verify invalidate args.set(0, new Integer(VERIFY_INVALIDATE)); LogWriterUtils.getLogWriter().info("VERIFY_INVALIDATE"); - e.withFilter(filter).withArgs(args).execute(txFunction.getId()).getResult(); + e.withFilter(filter).setArguments(args).execute(txFunction.getId()).getResult(); return Boolean.TRUE; } }); @@ -933,7 +933,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { args.add(order); filter.add(custId); caughtException = false; - e.withFilter(filter).withArgs(args).execute(txFunction.getId()).getResult(); + e.withFilter(filter).setArguments(args).execute(txFunction.getId()).getResult(); return null; } }); @@ -979,7 +979,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { args.add(orderId); args.add(order); filter.add(custId); - e.withFilter(filter).withArgs(args).execute(txFunction.getId()).getResult(); + e.withFilter(filter).setArguments(args).execute(txFunction.getId()).getResult(); return null; } @@ -1036,7 +1036,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { if (iterations > warmupIterations) { startTime = NanoTimer.getTime(); } - e.withFilter(filter).withArgs(args).execute("perfFunction").getResult(); + e.withFilter(filter).setArguments(args).execute("perfFunction").getResult(); if (startTime > 0) { perfTime += NanoTimer.getTime() - startTime; } @@ -1074,7 +1074,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { if (iterations > warmupIterations) { startTime = NanoTimer.getTime(); } - e.withFilter(filter).withArgs(args).execute("perfTxFunction").getResult(); + e.withFilter(filter).setArguments(args).execute("perfTxFunction").getResult(); if (startTime > 0) { perfTime += NanoTimer.getTime() - startTime; } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java index 5e8f777..316845e 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java @@ -316,7 +316,7 @@ public class PartitionResolverDUnitTest extends JUnit4CacheTestCase { accessor.invoke(new SerializableCallable() { public Object call() throws Exception { - FunctionService.onRegion(getGemfireCache().getRegion(CUSTOMER)).withArgs(type) + FunctionService.onRegion(getGemfireCache().getRegion(CUSTOMER)).setArguments(type) .execute(IteratorFunction.id).getResult(); return null; } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java index efaa2f5..2a1ed9f 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java @@ -118,7 +118,7 @@ public class DiskStoreCommandsJUnitTest { will(returnValue(null)); oneOf(mockMember).getId(); will(returnValue(memberId)); - oneOf(mockFunctionExecutor).withArgs(with(equal(diskStoreName))); + oneOf(mockFunctionExecutor).setArguments(with(equal(diskStoreName))); will(returnValue(mockFunctionExecutor)); oneOf(mockFunctionExecutor).execute(with(aNonNull(DescribeDiskStoreFunction.class))); will(returnValue(mockResultCollector)); @@ -185,7 +185,7 @@ public class DiskStoreCommandsJUnitTest { will(returnValue(null)); oneOf(mockMember).getId(); will(returnValue(memberId)); - oneOf(mockFunctionExecutor).withArgs(with(equal(diskStoreName))); + oneOf(mockFunctionExecutor).setArguments(with(equal(diskStoreName))); will(returnValue(mockFunctionExecutor)); oneOf(mockFunctionExecutor).execute(with(aNonNull(DescribeDiskStoreFunction.class))); will(throwException(new DiskStoreNotFoundException("expected"))); @@ -221,7 +221,7 @@ public class DiskStoreCommandsJUnitTest { will(returnValue(null)); oneOf(mockMember).getId(); will(returnValue(memberId)); - oneOf(mockFunctionExecutor).withArgs(with(equal(diskStoreName))); + oneOf(mockFunctionExecutor).setArguments(with(equal(diskStoreName))); will(returnValue(mockFunctionExecutor)); oneOf(mockFunctionExecutor).execute(with(aNonNull(DescribeDiskStoreFunction.class))); will(throwException(new RuntimeException("expected"))); @@ -260,7 +260,7 @@ public class DiskStoreCommandsJUnitTest { will(returnValue(null)); oneOf(mockMember).getId(); will(returnValue(memberId)); - oneOf(mockFunctionExecutor).withArgs(with(equal(diskStoreName))); + oneOf(mockFunctionExecutor).setArguments(with(equal(diskStoreName))); will(returnValue(mockFunctionExecutor)); oneOf(mockFunctionExecutor).execute(with(aNonNull(DescribeDiskStoreFunction.class))); will(returnValue(mockResultCollector)); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java index 81ed0d1..9f634ca 100644 --- a/geode-core/src/test/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java @@ -63,15 +63,15 @@ public class ClientExecuteFunctionAuthDUnitTest extends JUnit4DistributedTestCas FunctionService.registerFunction(function); assertNotAuthorized(() -> FunctionService.onServer(cache.getDefaultPool()) - .withArgs(Boolean.TRUE).execute(function.getId()), "DATA:WRITE"); + .setArguments(Boolean.TRUE).execute(function.getId()), "DATA:WRITE"); }); client2.invoke("logging in with super-user", () -> { ClientCache cache = createClientCache("super-user", "1234567", server.getPort()); FunctionService.registerFunction(function); - ResultCollector rc = FunctionService.onServer(cache.getDefaultPool()).withArgs(Boolean.TRUE) - .execute(function.getId()); + ResultCollector rc = FunctionService.onServer(cache.getDefaultPool()) + .setArguments(Boolean.TRUE).execute(function.getId()); rc.getResult(); }); } @@ -83,7 +83,7 @@ public class ClientExecuteFunctionAuthDUnitTest extends JUnit4DistributedTestCas client1.invoke("logging in with dataReader", () -> { ClientCache cache = createClientCache("dataReader", "1234567", server.getPort()); assertNotAuthorized(() -> FunctionService.onServer(cache.getDefaultPool()) - .withArgs(Boolean.TRUE).execute(function.getId()), "DATA:WRITE"); + .setArguments(Boolean.TRUE).execute(function.getId()), "DATA:WRITE"); }); } } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java index 0763407..9c1a28f 100644 --- a/geode-core/src/test/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java @@ -64,9 +64,8 @@ public class ClientExecuteRegionFunctionAuthDUnitTest extends JUnit4DistributedT Region region = createProxyRegion(cache, REGION_NAME); FunctionService.registerFunction(function); - assertNotAuthorized( - () -> FunctionService.onRegion(region).withArgs(Boolean.TRUE).execute(function.getId()), - "DATA:WRITE"); + assertNotAuthorized(() -> FunctionService.onRegion(region).setArguments(Boolean.TRUE) + .execute(function.getId()), "DATA:WRITE"); }); client2.invoke("logging in with super-user", () -> { @@ -75,7 +74,7 @@ public class ClientExecuteRegionFunctionAuthDUnitTest extends JUnit4DistributedT Region region = createProxyRegion(cache, REGION_NAME); FunctionService.registerFunction(function); ResultCollector rc = - FunctionService.onRegion(region).withArgs(Boolean.TRUE).execute(function.getId()); + FunctionService.onRegion(region).setArguments(Boolean.TRUE).execute(function.getId()); rc.getResult(); }); } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-docs/developing/function_exec/function_execution.html.md.erb ---------------------------------------------------------------------- diff --git a/geode-docs/developing/function_exec/function_execution.html.md.erb b/geode-docs/developing/function_exec/function_execution.html.md.erb index 4d5e0b8..221098b 100644 --- a/geode-docs/developing/function_exec/function_execution.html.md.erb +++ b/geode-docs/developing/function_exec/function_execution.html.md.erb @@ -185,7 +185,7 @@ See [Function Execution Commands](../../tools_modules/gfsh/quick_ref_commands_by 1. Use one of the `FunctionService` `on*` methods to create an `Execute` object. The `on*` methods, `onRegion`, `onMembers`, etc., define the highest level where the function is run. For colocated partitioned regions, use `onRegion` and specify any one of the colocated regions. The function run using `onRegion` is referred to as a data dependent function - the others as data-independent functions. 2. Use the `Execution` object as needed for additional function configuration. You can: - Provide a key `Set` to `withFilters` to narrow the execution scope for `onRegion` `Execution` objects. You can retrieve the key set in your `Function` `execute` method through `RegionFunctionContext.getFilter`. - - Provide function arguments to `withArgs`. You can retrieve these in your `Function` `execute` method through `FunctionContext.getArguments`. + - Provide function arguments to `setArguments`. You can retrieve these in your `Function` `execute` method through `FunctionContext.getArguments`. - Define a custom `ResultCollector` 3. Call the `Execution` object to `execute` method to run the function. @@ -209,7 +209,7 @@ keysForGet.add("KEY_7"); Execution execution = FunctionService.onRegion(exampleRegion) .withFilter(keysForGet) - .withArgs(Boolean.TRUE) + .setArguments(Boolean.TRUE) .withCollector(new MyArrayListResultCollector()); ResultCollector rc = execution.execute(function); @@ -245,7 +245,7 @@ To customize results collecting: ``` pre Execution execution = FunctionService.onRegion(exampleRegion) .withFilter(keysForGet) - .withArgs(Boolean.TRUE) + .setArguments(Boolean.TRUE) .withCollector(new MyArrayListResultCollector()); ``` http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-docs/developing/partitioned_regions/join_query_partitioned_regions.html.md.erb ---------------------------------------------------------------------- diff --git a/geode-docs/developing/partitioned_regions/join_query_partitioned_regions.html.md.erb b/geode-docs/developing/partitioned_regions/join_query_partitioned_regions.html.md.erb index e6beab2..358b1a1 100644 --- a/geode-docs/developing/partitioned_regions/join_query_partitioned_regions.html.md.erb +++ b/geode-docs/developing/partitioned_regions/join_query_partitioned_regions.html.md.erb @@ -74,7 +74,7 @@ ArrayList argList = new ArrayList(); argList.add(queryString); Object result = FunctionService.onRegion(CacheFactory.getAnyInstance() .getRegion("QueryRegion1" )) - .withArgs(argList).execute(function).getResult(); + .setArguments(argList).execute(function).getResult(); ArrayList resultList = (ArrayList)result; resultList.trimToSize(); List queryResults = null; @@ -92,6 +92,6 @@ On the client side, note that you can specify a bucket filter while invoking Fun **Additional Notes on Using the Query.execute and RegionFunctionContext APIs** -You can also pass multiple parameters (besides the query itself) to the query function by specifying the parameters in the client-side code (`FunctionService.onRegion(..).withArgs()`). Then you can handle the parameters inside the function on the server side using `context.getArguments`. Note that it does not matter which order you specify the parameters as long as you match the parameter handling order on the server with the order specified in the client. +You can also pass multiple parameters (besides the query itself) to the query function by specifying the parameters in the client-side code (`FunctionService.onRegion(..).setArguments()`). Then you can handle the parameters inside the function on the server side using `context.getArguments`. Note that it does not matter which order you specify the parameters as long as you match the parameter handling order on the server with the order specified in the client. http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-docs/developing/query_additional/partitioned_region_key_or_field_value.html.md.erb ---------------------------------------------------------------------- diff --git a/geode-docs/developing/query_additional/partitioned_region_key_or_field_value.html.md.erb b/geode-docs/developing/query_additional/partitioned_region_key_or_field_value.html.md.erb index 8ee443e..91034d8 100644 --- a/geode-docs/developing/query_additional/partitioned_region_key_or_field_value.html.md.erb +++ b/geode-docs/developing/query_additional/partitioned_region_key_or_field_value.html.md.erb @@ -53,7 +53,7 @@ The following is an example how to optimize a query that will be run on data par //for ID=1 and query will execute on that bucket. rcollector = FunctionService .onRegion(region) - .withArgs(qStr) + .setArguments(qStr) .withFilter(filter) .execute(func); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-docs/developing/query_additional/query_on_a_single_node.html.md.erb ---------------------------------------------------------------------- diff --git a/geode-docs/developing/query_additional/query_on_a_single_node.html.md.erb b/geode-docs/developing/query_additional/query_on_a_single_node.html.md.erb index bf83999..f067b14 100644 --- a/geode-docs/developing/query_additional/query_on_a_single_node.html.md.erb +++ b/geode-docs/developing/query_additional/query_on_a_single_node.html.md.erb @@ -142,7 +142,7 @@ To direct a query to specific partitioned region node, you can execute the query //for ID=1 and query will execute on that bucket. rcollector = FunctionService .onRegion(region) - .withArgs(qStr) + .setArguments(qStr) .withFilter(filter) .execute(func); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java index fea4845..c39a4a8 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java @@ -171,7 +171,7 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl { @Override public void dumpFiles(final String directory) { ResultCollector results = FunctionService.onRegion(getDataRegion()) - .withArgs(new String[] {directory, indexName}).execute(DumpDirectoryFiles.ID); + .setArguments(new String[] {directory, indexName}).execute(DumpDirectoryFiles.ID); results.getResult(); } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java index bfc561a..328eb3f 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java @@ -114,7 +114,7 @@ public class LuceneQueryImpl<K, V> implements LuceneQuery<K, V> { try { TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector(context); ResultCollector<TopEntriesCollector, TopEntries<K>> rc = - onRegion().withArgs(context).withCollector(collector).execute(LuceneQueryFunction.ID); + onRegion().setArguments(context).withCollector(collector).execute(LuceneQueryFunction.ID); entries = rc.getResult(); } catch (FunctionException e) { if (e.getCause() instanceof LuceneQueryException) { http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java index 30952bf..935f37c 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java @@ -406,7 +406,7 @@ public class LuceneServiceImpl implements InternalLuceneService { WaitUntilFlushedFunctionContext context = new WaitUntilFlushedFunctionContext(indexName, timeout, unit); Execution execution = FunctionService.onRegion(dataRegion); - ResultCollector rs = execution.withArgs(context).execute(WaitUntilFlushedFunction.ID); + ResultCollector rs = execution.setArguments(context).execute(WaitUntilFlushedFunction.ID); List<Boolean> results = (List<Boolean>) rs.getResult(); for (Boolean oneResult : results) { if (oneResult == false) { http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java index 20f5d1d..03db6c9 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java @@ -66,7 +66,7 @@ public class LuceneQueryImplJUnitTest { collector = mock(ResultCollector.class); provider = mock(LuceneQueryProvider.class); - when(execution.withArgs(any())).thenReturn(execution); + when(execution.setArguments(any())).thenReturn(execution); when(execution.withCollector(any())).thenReturn(execution); when(execution.execute(anyString())).thenReturn((ResultCollector) collector); results = mock(PageableLuceneQueryResults.class); @@ -145,7 +145,7 @@ public class LuceneQueryImplJUnitTest { verify(execution).execute(eq(LuceneQueryFunction.ID)); ArgumentCaptor<LuceneFunctionContext> captor = ArgumentCaptor.forClass(LuceneFunctionContext.class); - verify(execution).withArgs(captor.capture()); + verify(execution).setArguments(captor.capture()); LuceneFunctionContext context = captor.getValue(); assertEquals(LIMIT, context.getLimit()); assertEquals(provider, context.getQueryProvider()); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-spark-connector/geode-spark-connector/src/main/scala/org/apache/geode/spark/connector/internal/DefaultGeodeConnection.scala ---------------------------------------------------------------------- diff --git a/geode-spark-connector/geode-spark-connector/src/main/scala/org/apache/geode/spark/connector/internal/DefaultGeodeConnection.scala b/geode-spark-connector/geode-spark-connector/src/main/scala/org/apache/geode/spark/connector/internal/DefaultGeodeConnection.scala index 670a3f8..b5dcf1d 100644 --- a/geode-spark-connector/geode-spark-connector/src/main/scala/org/apache/geode/spark/connector/internal/DefaultGeodeConnection.scala +++ b/geode-spark-connector/geode-spark-connector/src/main/scala/org/apache/geode/spark/connector/internal/DefaultGeodeConnection.scala @@ -129,7 +129,7 @@ private[connector] class DefaultGeodeConnection ( val collector = new StructStreamingResultCollector(desc) // RetrieveRegionResultCollector[(K, V)] import scala.collection.JavaConversions.setAsJavaSet - val exec = FunctionService.onRegion(region).withArgs(args).withCollector(collector).asInstanceOf[InternalExecution] + val exec = FunctionService.onRegion(region).setArguments(args).withCollector(collector).asInstanceOf[InternalExecution] .withBucketFilter(split.bucketSet.map(Integer.valueOf)) exec.setWaitOnExceptionFlag(true) exec.execute(RetrieveRegionFunction.ID) @@ -144,7 +144,7 @@ private[connector] class DefaultGeodeConnection ( val args: Array[String] = Array[String](queryString, bucketSet.toString) val exec = FunctionService.onRegion(region).withCollector(collector).asInstanceOf[InternalExecution] .withBucketFilter(bucketSet.map(Integer.valueOf)) - .withArgs(args) + .setArguments(args) exec.execute(QueryFunction.ID) collector.getResult } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java index d42e6da..c7aec39 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java @@ -343,7 +343,7 @@ public class SerialGatewaySenderDistributedDeadlockDUnitTest extends WANTestBase FunctionService.registerFunction(new TestFunction()); Execution exe = FunctionService.onRegion(region); for (int x = 0; x < num; x++) { - exe.withArgs(useThreadOwnedSocket) + exe.setArguments(useThreadOwnedSocket) .execute("org.apache.geode.internal.cache.wan.serial.TestFunction"); } } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java ---------------------------------------------------------------------- diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java index e9b61f4..80996c3 100644 --- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java +++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java @@ -203,9 +203,9 @@ public class FunctionAccessController extends AbstractBaseController { // execute function with specified arguments if (args.length == 1) { - results = function.withArgs(args[0]).execute(functionId); + results = function.setArguments(args[0]).execute(functionId); } else { - results = function.withArgs(args).execute(functionId); + results = function.setArguments(args).execute(functionId); } } else { // execute function with no args
