You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/04/20 21:23:15 UTC
[1/8] geode git commit: GEODE-510
Bug48571DUnitTest.testStatsMatchWithSize failed [Forced Update!]
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-2632-5 1bde842c8 -> bbb3b153f (forced update)
GEODE-510 Bug48571DUnitTest.testStatsMatchWithSize failed
This ticket was marked fixed in early 2016 but the Flaky annotation was
never removed and it was reopened by Anthony with no comment. I'm removing
the Flaky annotation and closing the ticket.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f038c2d9
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f038c2d9
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f038c2d9
Branch: refs/heads/feature/GEODE-2632-5
Commit: f038c2d9a57fcead8ace21ba81f2b357dcf81d34
Parents: 9b49bc8
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Wed Apr 19 16:10:34 2017 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Wed Apr 19 16:13:27 2017 -0700
----------------------------------------------------------------------
.../internal/cache/ha/Bug48571DUnitTest.java | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/f038c2d9/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
index c776984..516275a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
@@ -24,14 +24,6 @@ import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARC
import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
import static org.junit.Assert.assertEquals;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Properties;
-
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Region;
@@ -55,8 +47,14 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Properties;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class Bug48571DUnitTest extends JUnit4DistributedTestCase {
@@ -122,7 +120,7 @@ public class Bug48571DUnitTest extends JUnit4DistributedTestCase {
Wait.waitForCriterion(criterion, 15 * 1000, 200, true);
}
- @Category(FlakyTest.class) // GEODE-510
+ // @Category(FlakyTest.class) // GEODE-510
@Test
public void testStatsMatchWithSize() throws Exception {
IgnoredException.addIgnoredException("Unexpected IOException||Connection reset");
[2/8] geode git commit: GEODE-728: Rename Execution.withArgs to
Execution.setArguments
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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/aaef124e/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
[3/8] geode git commit: GEODE-728: Rename Execution.withArgs to
Execution.setArguments
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
index d85b810..3592ec0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
@@ -217,8 +217,8 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
origVals.add(val);
region.put(i.next(), val);
}
- ResultCollector rc =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ ResultCollector rc = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE)
+ .execute(function.getId());
int resultSize = ((List) rc.getResult()).size();
resultReceived_Aggregate += resultSize;
resultReceived_TESTFUNCTION2 += resultSize;
@@ -227,7 +227,8 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
noOfExecutionsCompleted_Aggregate++;
noOfExecutionsCompleted_TESTFUNCTION2++;
- rc = dataSet.withFilter(testKeysSet).withArgs(testKeysSet).execute(function.getId());
+ rc = dataSet.withFilter(testKeysSet).setArguments(testKeysSet)
+ .execute(function.getId());
resultSize = ((List) rc.getResult()).size();
resultReceived_Aggregate += resultSize;
resultReceived_TESTFUNCTION2 += resultSize;
@@ -238,7 +239,8 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
function = new TestFunction(true, TestFunction.TEST_FUNCTION3);
FunctionService.registerFunction(function);
- rc = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ rc = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE)
+ .execute(function.getId());
resultSize = ((List) rc.getResult()).size();
resultReceived_Aggregate += resultSize;
resultReceived_TESTFUNCTION3 += resultSize;
@@ -548,7 +550,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
Execution member = FunctionService.onServers(pool);
try {
- ResultCollector rs = member.withArgs(Boolean.TRUE).execute(function.getId());
+ ResultCollector rs = member.setArguments(Boolean.TRUE).execute(function.getId());
int size = ((List) rs.getResult()).size();
resultReceived_Aggregate += size;
noOfExecutionCalls_Aggregate++;
@@ -568,7 +570,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
for (int i = 0; i < 20; i++) {
testKeysSet.add("execKey-" + i);
}
- ResultCollector rs = member.withArgs("Success").execute(function.getId());
+ ResultCollector rs = member.setArguments("Success").execute(function.getId());
int size = ((List) rs.getResult()).size();
resultReceived_Aggregate += size;
noOfExecutionCalls_Aggregate++;
@@ -771,19 +773,19 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION2);
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(pr);
- ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute(function);
+ ResultCollector rc1 = dataSet.setArguments(Boolean.TRUE).execute(function);
int size = ((List) rc1.getResult()).size();
resultReceived_Aggregate += size;
resultReceived_TESTFUNCTION2 += size;
- rc1 = dataSet.withArgs(testKeys).execute(function);
+ rc1 = dataSet.setArguments(testKeys).execute(function);
size = ((List) rc1.getResult()).size();
resultReceived_Aggregate += size;
resultReceived_TESTFUNCTION2 += size;
function = new TestFunction(true, TestFunction.TEST_FUNCTION3);
FunctionService.registerFunction(function);
- rc1 = dataSet.withArgs(Boolean.TRUE).execute(function);
+ rc1 = dataSet.setArguments(Boolean.TRUE).execute(function);
size = ((List) rc1.getResult()).size();
resultReceived_Aggregate += size;
resultReceived_TESTFUNCTION3 += size;
@@ -942,7 +944,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
public Object call() throws Exception {
Region region = getCache().getRegion(rName);
try {
- List list = (List) FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+ List list = (List) FunctionService.onRegion(region).setArguments(Boolean.TRUE)
.execute(TestFunction.TEST_FUNCTION2).getResult();
// this is the Distributed Region with Empty Data policy.
// therefore no function execution takes place here. it only receives the results.
@@ -1057,7 +1059,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
DistributedMember localmember = ds.getDistributedMember();
memberExecution = FunctionService.onMember(ds, localmember);
- memberExecution.withArgs("Key");
+ memberExecution.setArguments("Key");
try {
ResultCollector rc = memberExecution.execute(inlineFunction);
int size = ((List) rc.getResult()).size();
@@ -1198,7 +1200,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
Function function = new TestFunction(true, "TestFunctionException");
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(pr);
- ResultCollector rc = dataSet.withArgs(Boolean.TRUE).execute(function.getId());
+ ResultCollector rc = dataSet.setArguments(Boolean.TRUE).execute(function.getId());
// Wait Criterion is added to make sure that the function execution
// happens on all nodes and all nodes get the FunctionException so that the stats will get
// incremented,
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
index a0ed90d..5b6f065 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
@@ -143,7 +143,7 @@ public class LocalFunctionExecutionDUnitTest extends JUnit4DistributedTestCase {
Function function1 = new TestFunction(true, TestFunction.TEST_FUNCTION_EXCEPTION);
FunctionService.registerFunction(function1);
ResultCollector rc =
- FunctionService.onRegion(region).withArgs(Boolean.TRUE).execute(function1.getId());
+ FunctionService.onRegion(region).setArguments(Boolean.TRUE).execute(function1.getId());
rc.getResult();
Assert.fail("Exception should occur", new Exception("Test Failed"));
} catch (Exception e) {
@@ -157,7 +157,7 @@ public class LocalFunctionExecutionDUnitTest extends JUnit4DistributedTestCase {
FunctionService.registerFunction(function1);
DistributedMember localmember = getSystemStatic().getDistributedMember();
ResultCollector rc = FunctionService.onMember(getSystemStatic(), localmember)
- .withArgs(Boolean.TRUE).execute(function1.getId());
+ .setArguments(Boolean.TRUE).execute(function1.getId());
rc.getResult();
Assert.fail("Exception should occur", new Exception("Test Failed"));
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index 3fa944a..1bc00a8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -379,7 +379,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
DistributedMember localmember = ds.getDistributedMember();
Execution memberExcution = null;
memberExcution = FunctionService.onMember(ds, localmember);
- Execution executor = memberExcution.withArgs("Key");
+ Execution executor = memberExcution.setArguments("Key");
try {
ResultCollector rc = executor.execute(new FunctionAdapter() {
@Override
@@ -492,7 +492,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
memberExcution = (InternalExecution) FunctionService.onMembers(ds, memberSet);
}
try {
- ResultCollector rc = memberExcution.withArgs(Boolean.TRUE).execute(function);
+ ResultCollector rc = memberExcution.setArguments(Boolean.TRUE).execute(function);
List li = (ArrayList) rc.getResult();
LogWriterUtils.getLogWriter()
.info("MemberFunctionExecutionDUnitTest#excuteOnMembers: Result : " + li);
@@ -569,7 +569,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
memberSet.remove(localVM);
memberExcution = FunctionService.onMembers(ds, memberSet);
}
- Execution executor = memberExcution.withArgs("Key");
+ Execution executor = memberExcution.setArguments("Key");
try {
ResultCollector rc = executor.execute(new FunctionAdapter() {
@Override
@@ -612,7 +612,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
assertNotNull(ds);
Function function = new TestFunction(false, TEST_FUNCTION6);
Execution memberExcution = FunctionService.onMembers(ds);
- Execution executor = memberExcution.withArgs("Key");
+ Execution executor = memberExcution.setArguments("Key");
try {
ResultCollector rc = executor.execute(function.getId());
rc.getResult();
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
index 1d85c58..6be9980 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
@@ -237,7 +237,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
Execution e = FunctionService.onMembers("gm");
ArrayList<String> args = new ArrayList<String>();
args.add("gm");
- e = e.withArgs(args);
+ e = e.setArguments(args);
if (registerFunction) {
e.execute(OnGroupsFunction.Id).getResult();
} else {
@@ -258,7 +258,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
Execution e = FunctionService.onMembers("g0");
ArrayList<String> args = new ArrayList<String>();
args.add("g0");
- e = e.withArgs(args);
+ e = e.setArguments(args);
if (registerFunction) {
e.execute(OnGroupsFunction.Id).getResult();
} else {
@@ -278,7 +278,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
Execution e = FunctionService.onMembers("g1");
ArrayList<String> args = new ArrayList<String>();
args.add("g1");
- e = e.withArgs(args);
+ e = e.setArguments(args);
if (registerFunction) {
e.execute(OnGroupsFunction.Id).getResult();
} else {
@@ -300,7 +300,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
ArrayList<String> args = new ArrayList<String>();
args.add("g0");
args.add("g1");
- e = e.withArgs(args);
+ e = e.setArguments(args);
if (registerFunction) {
e.execute(OnGroupsFunction.Id).getResult();
} else {
@@ -511,7 +511,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
Execution e = FunctionService.onMembers("mg");
ArrayList<String> args = new ArrayList<String>();
args.add("runtime");
- e = e.withArgs(args);
+ e = e.setArguments(args);
try {
e.execute(new OnGroupsExceptionFunction()).getResult();
fail("expected exception not thrown");
@@ -520,7 +520,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
}
Execution e1 = FunctionService.onMembers("g1");
- e1 = e1.withArgs(args);
+ e1 = e1.setArguments(args);
try {
e1.execute(new OnGroupsExceptionFunction()).getResult();
fail("expected exception not thrown");
@@ -531,7 +531,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
// fail on only one member
Execution e2 = FunctionService.onMembers("g1");
args.add("g2");
- e2 = e2.withArgs(args);
+ e2 = e2.setArguments(args);
try {
e2.execute(new OnGroupsExceptionFunction()).getResult();
fail("expected exception not thrown");
@@ -562,7 +562,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
Execution e1 = FunctionService.onMembers("g1");
ArrayList<String> args = new ArrayList<String>();
args.add("shutdown");
- e1 = e1.withArgs(args);
+ e1 = e1.setArguments(args);
try {
e1.execute(new OnGroupsExceptionFunction()).getResult();
fail("expected exception not thrown");
@@ -594,7 +594,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
ArrayList<String> args = new ArrayList<String>();
args.add("shutdown");
args.add("g2");
- e1 = e1.withArgs(args);
+ e1 = e1.setArguments(args);
try {
e1.execute(new OnGroupsExceptionFunction()).getResult();
fail("expected exception not thrown");
@@ -626,7 +626,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
ArrayList<String> args = new ArrayList<String>();
args.add("shutdown");
args.add("g2");
- e1 = e1.withArgs(args);
+ e1 = e1.setArguments(args);
((AbstractExecution) e1).setIgnoreDepartedMembers(true);
ArrayList l = (ArrayList) e1.execute(new OnGroupsExceptionFunction()).getResult();
assertEquals(2, l.size());
@@ -705,7 +705,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
if (withArgs) {
ArrayList<String> args = new ArrayList<String>();
args.add("g0");
- e = e.withArgs(args);
+ e = e.setArguments(args);
}
if (register) {
e.execute(OnGroupsFunction.Id).getResult();
@@ -728,7 +728,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
if (withArgs) {
ArrayList<String> args = new ArrayList<String>();
args.add("mg");
- e = e.withArgs(args);
+ e = e.setArguments(args);
}
if (register) {
e.execute(OnGroupsFunction.Id).getResult();
@@ -752,7 +752,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
ArrayList<String> args = new ArrayList<String>();
args.add("g0");
args.add("g1");
- e = e.withArgs(args);
+ e = e.setArguments(args);
}
if (register) {
e.execute(OnGroupsFunction.Id).getResult();
@@ -977,7 +977,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
Execution e = InternalFunctionService.onServers(c, "mg");
ArrayList<String> args = new ArrayList<String>();
args.add("runtime");
- e = e.withArgs(args);
+ e = e.setArguments(args);
try {
e.execute(new OnGroupsExceptionFunction()).getResult();
fail("expected exception not thrown");
@@ -986,7 +986,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
}
Execution e1 = InternalFunctionService.onServers(c, "g1");
- e1 = e1.withArgs(args);
+ e1 = e1.setArguments(args);
try {
e1.execute(new OnGroupsExceptionFunction()).getResult();
fail("expected exception not thrown");
@@ -997,7 +997,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
// only one member
Execution e2 = InternalFunctionService.onServers(c, "g1");
args.add("g2");
- e2 = e2.withArgs(args);
+ e2 = e2.setArguments(args);
try {
e2.execute(new OnGroupsExceptionFunction()).getResult();
fail("expected exception not thrown");
@@ -1045,7 +1045,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
Execution e = InternalFunctionService.onServers(c, "g1");
ArrayList<String> args = new ArrayList<String>();
args.add("disconnect");
- e = e.withArgs(args);
+ e = e.setArguments(args);
IgnoredException.addIgnoredException("FunctionInvocationTargetException");
try {
@@ -1096,7 +1096,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
ArrayList<String> args = new ArrayList<String>();
args.add("disconnect");
args.add("g2");
- e = e.withArgs(args);
+ e = e.setArguments(args);
IgnoredException.addIgnoredException("FunctionInvocationTargetException");
try {
e.execute(new OnGroupsExceptionFunction()).getResult();
@@ -1146,7 +1146,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
ArrayList<String> args = new ArrayList<String>();
args.add("disconnect");
args.add("g2");
- e = e.withArgs(args);
+ e = e.setArguments(args);
((AbstractExecution) e).setIgnoreDepartedMembers(true);
ArrayList l = (ArrayList) e.execute(new OnGroupsExceptionFunction()).getResult();
LogWriterUtils.getLogWriter().info("SWAP:result:" + l);
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
index e5464bb..4aa36a4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
@@ -235,19 +235,19 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe
if (isByName.booleanValue()) {// by name
if (toRegister.booleanValue()) {
LogWriterUtils.getLogWriter().info("The function name to execute : " + function.getId());
- Execution me = member.withArgs(args);
+ Execution me = member.setArguments(args);
LogWriterUtils.getLogWriter().info("The args passed : " + args);
return me.execute(function.getId());
} else {
LogWriterUtils.getLogWriter()
.info("The function name to execute : (without Register) " + function.getId());
- Execution me = member.withArgs(args);
+ Execution me = member.setArguments(args);
LogWriterUtils.getLogWriter().info("The args passed : " + args);
return me.execute(function.getId(), function.hasResult(), function.isHA(),
function.optimizeForWrite());
}
} else { // By Instance
- return member.withArgs(args).execute(function);
+ return member.setArguments(args).execute(function);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index e4a85b0..3d18067 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -606,7 +606,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
Integer val = new Integer(j++);
region.put(i.next(), val);
}
- List list = (List) FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+ List list = (List) FunctionService.onRegion(region).setArguments(Boolean.TRUE)
.execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
@@ -672,7 +672,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
Execution dataSet = FunctionService.onRegion(region);
try {
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
List l = ((List) rc1.getResult());
LogWriterUtils.getLogWriter().info("Result size : " + l.size());
assertEquals(3, l.size());
@@ -696,7 +696,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(region);
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
List l = ((List) rc1.getResult());
LogWriterUtils.getLogWriter().info("Result size : " + l.size());
return l;
@@ -993,7 +993,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
}
List l = null;
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -1045,28 +1045,29 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
}
ResultCollector rc1 = null;
try {
- rc1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
- @Override
- public void execute(FunctionContext context) {
- if (((RegionFunctionContext) context).isPossibleDuplicate()) {
- context.getResultSender().lastResult(new Integer(retryCount));
- return;
- }
- if (context.getArguments() instanceof Boolean) {
- throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
- }
- }
+ rc1 =
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
+ @Override
+ public void execute(FunctionContext context) {
+ if (((RegionFunctionContext) context).isPossibleDuplicate()) {
+ context.getResultSender().lastResult(new Integer(retryCount));
+ return;
+ }
+ if (context.getArguments() instanceof Boolean) {
+ throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
+ }
+ }
- @Override
- public String getId() {
- return getClass().getName();
- }
+ @Override
+ public String getId() {
+ return getClass().getName();
+ }
- @Override
- public boolean hasResult() {
- return true;
- }
- });
+ @Override
+ public boolean hasResult() {
+ return true;
+ }
+ });
List list = (ArrayList) rc1.getResult();
assertEquals(list.get(0), 0);
@@ -1120,7 +1121,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
}
Function function = new TestFunction(false, TEST_FUNCTION2);
Execution dataSet = FunctionService.onRegion(region);
- dataSet.withArgs(Boolean.TRUE).execute(function);
+ dataSet.setArguments(Boolean.TRUE).execute(function);
region.put(new Integer(2), "KB_2");
assertEquals("KB_2", region.get(new Integer(2)));
}
@@ -1130,7 +1131,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
assertNotNull(region);
Function function = new TestFunction(false, TEST_FUNCTION2);
Execution dataSet = FunctionService.onServer(pool);
- dataSet.withArgs(Boolean.TRUE).execute(function);
+ dataSet.setArguments(Boolean.TRUE).execute(function);
region.put(new Integer(1), "KB_1");
assertEquals("KB_1", region.get(new Integer(1)));
}
@@ -1190,14 +1191,14 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
Execution dataSet = FunctionService.onRegion(region);
region.put(testKey, new Integer(1));
((AbstractExecution) dataSet).removeFunctionAttributes(TestFunction.TEST_FUNCTION2);
- ResultCollector rs =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(TestFunction.TEST_FUNCTION2);
+ ResultCollector rs = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE)
+ .execute(TestFunction.TEST_FUNCTION2);
assertEquals(Boolean.TRUE, ((List) rs.getResult()).get(0));
byte[] functionAttributes =
((AbstractExecution) dataSet).getFunctionAttributes(TestFunction.TEST_FUNCTION2);
assertNotNull(functionAttributes);
- rs = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE)
+ rs = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE)
.execute(TestFunction.TEST_FUNCTION2);
assertEquals(Boolean.TRUE, ((List) rs.getResult()).get(0));
assertNotNull(functionAttributes);
@@ -1371,7 +1372,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
.info("<ExpectedException action=add>" + "No target node found for KEY = "
+ "|Server could not send the reply" + "|Unexpected exception during"
+ "</ExpectedException>");
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -1406,7 +1407,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
region.put(testKey, new Integer(1));
ResultCollector rs =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -1429,7 +1430,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
assertEquals("Failure", ((List) rs.getResult()).get(0));
ResultCollector rs2 =
- dataSet.withFilter(testKeysSet).withArgs(testKey).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(testKey).execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -1483,7 +1484,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
.info("<ExpectedException action=add>"
+ "Could not create an instance of org.apache.geode.internal.cache.execute.PRClientServerRegionFunctionExecutionDUnitTest$UnDeserializable"
+ "</ExpectedException>");
- dataSet.withFilter(testKeysSet).withArgs(new UnDeserializable())
+ dataSet.withFilter(testKeysSet).setArguments(new UnDeserializable())
.execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
@@ -1519,9 +1520,9 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
private static ResultCollector execute(Execution dataSet, Set testKeysSet, Serializable args,
Function function, Boolean isByName) throws Exception {
if (isByName.booleanValue()) {// by name
- return dataSet.withFilter(testKeysSet).withArgs(args).execute(function.getId());
+ return dataSet.withFilter(testKeysSet).setArguments(args).execute(function.getId());
} else { // By Instance
- return dataSet.withFilter(testKeysSet).withArgs(args).execute(function);
+ return dataSet.withFilter(testKeysSet).setArguments(args).execute(function);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index bc7e061..e61ce84 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -483,7 +483,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends PRCl
public static Object executeFunction() {
Execution execute = FunctionService.onRegion(region);
- ResultCollector rc = execute.withArgs(Boolean.TRUE)
+ ResultCollector rc = execute.setArguments(Boolean.TRUE)
.execute(new TestFunction(true, TestFunction.TEST_FUNCTION_LASTRESULT));
LogWriterUtils.getLogWriter().info("Exeuction Result :" + rc.getResult());
List l = ((List) rc.getResult());
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index 0925bc5..ff4ca42 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -436,7 +436,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
Integer val = new Integer(j++);
region.put(i.next(), val);
}
- HashMap resultMap = (HashMap) FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+ HashMap resultMap = (HashMap) FunctionService.onRegion(region).setArguments(Boolean.TRUE)
.execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -511,7 +511,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
Execution dataSet = FunctionService.onRegion(region);
try {
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
HashMap resultMap = ((HashMap) rc1.getResult());
assertEquals(3, resultMap.size());
@@ -549,7 +549,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(region);
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
List l = ((List) rc1.getResult());
LogWriterUtils.getLogWriter().info("Result size : " + l.size());
return l;
@@ -880,7 +880,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
}
List l = null;
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
context.getResultSender().lastResult("Success");
@@ -929,25 +929,26 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
}
ResultCollector rc1 = null;
try {
- rc1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
- public void execute(FunctionContext context) {
- if (((RegionFunctionContext) context).isPossibleDuplicate()) {
- context.getResultSender().lastResult(new Integer(retryCount));
- return;
- }
- if (context.getArguments() instanceof Boolean) {
- throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
- }
- }
+ rc1 =
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
+ public void execute(FunctionContext context) {
+ if (((RegionFunctionContext) context).isPossibleDuplicate()) {
+ context.getResultSender().lastResult(new Integer(retryCount));
+ return;
+ }
+ if (context.getArguments() instanceof Boolean) {
+ throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
+ }
+ }
- public String getId() {
- return getClass().getName();
- }
+ public String getId() {
+ return getClass().getName();
+ }
- public boolean hasResult() {
- return true;
- }
- });
+ public boolean hasResult() {
+ return true;
+ }
+ });
List list = (ArrayList) rc1.getResult();
assertEquals(list.get(0), 0);
@@ -1078,7 +1079,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
.info("<ExpectedException action=add>" + "No target node found for KEY = "
+ "|Server could not send the reply" + "|Unexpected exception during"
+ "</ExpectedException>");
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
context.getResultSender().lastResult("Success");
@@ -1109,7 +1110,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
region.put(testKey, new Integer(1));
try {
ResultCollector rs =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
context.getResultSender().lastResult("Success");
@@ -1129,7 +1130,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
assertEquals("Failure", ((List) rs.getResult()).get(0));
ResultCollector rs2 =
- dataSet.withFilter(testKeysSet).withArgs(testKey).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(testKey).execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
context.getResultSender().lastResult("Success");
@@ -1158,18 +1159,18 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
private static ResultCollector execute(Execution dataSet, Set testKeysSet, Serializable args,
Function function, Boolean isByName) throws Exception {
if (isByName.booleanValue()) {// by name
- return dataSet.withFilter(testKeysSet).withArgs(args).execute(function.getId());
+ return dataSet.withFilter(testKeysSet).setArguments(args).execute(function.getId());
} else { // By Instance
- return dataSet.withFilter(testKeysSet).withArgs(args).execute(function);
+ return dataSet.withFilter(testKeysSet).setArguments(args).execute(function);
}
}
private static ResultCollector executeOnAll(Execution dataSet, Serializable args,
Function function, Boolean isByName) throws Exception {
if (isByName.booleanValue()) {// by name
- return dataSet.withArgs(args).execute(function.getId());
+ return dataSet.setArguments(args).execute(function.getId());
} else { // By Instance
- return dataSet.withArgs(args).execute(function);
+ return dataSet.setArguments(args).execute(function);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
index 43540a8..a06d7e6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
@@ -414,7 +414,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
Integer val = new Integer(j++);
region.put(i.next(), val);
}
- HashMap resultMap = (HashMap) FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+ HashMap resultMap = (HashMap) FunctionService.onRegion(region).setArguments(Boolean.TRUE)
.execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -489,7 +489,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
Execution dataSet = FunctionService.onRegion(region);
try {
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
HashMap resultMap = ((HashMap) rc1.getResult());
assertEquals(3, resultMap.size());
@@ -527,7 +527,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(region);
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
List l = ((List) rc1.getResult());
LogWriterUtils.getLogWriter().info("Result size : " + l.size());
return l;
@@ -851,7 +851,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
}
List l = null;
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
context.getResultSender().lastResult("Success");
@@ -900,25 +900,26 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
}
ResultCollector rc1 = null;
try {
- rc1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
- public void execute(FunctionContext context) {
- if (((RegionFunctionContext) context).isPossibleDuplicate()) {
- context.getResultSender().lastResult(new Integer(retryCount));
- return;
- }
- if (context.getArguments() instanceof Boolean) {
- throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
- }
- }
+ rc1 =
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
+ public void execute(FunctionContext context) {
+ if (((RegionFunctionContext) context).isPossibleDuplicate()) {
+ context.getResultSender().lastResult(new Integer(retryCount));
+ return;
+ }
+ if (context.getArguments() instanceof Boolean) {
+ throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
+ }
+ }
- public String getId() {
- return getClass().getName();
- }
+ public String getId() {
+ return getClass().getName();
+ }
- public boolean hasResult() {
- return true;
- }
- });
+ public boolean hasResult() {
+ return true;
+ }
+ });
List list = (ArrayList) rc1.getResult();
assertEquals(list.get(0), 0);
@@ -1049,7 +1050,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
.info("<ExpectedException action=add>" + "No target node found for KEY = "
+ "|Server could not send the reply" + "|Unexpected exception during"
+ "</ExpectedException>");
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
context.getResultSender().lastResult("Success");
@@ -1080,7 +1081,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
region.put(testKey, new Integer(1));
try {
ResultCollector rs =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
context.getResultSender().lastResult("Success");
@@ -1100,7 +1101,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
assertEquals("Failure", ((List) rs.getResult()).get(0));
ResultCollector rs2 =
- dataSet.withFilter(testKeysSet).withArgs(testKey).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(testKey).execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
context.getResultSender().lastResult("Success");
@@ -1129,18 +1130,18 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
private static ResultCollector execute(Execution dataSet, Set testKeysSet, Serializable args,
Function function, Boolean isByName) throws Exception {
if (isByName.booleanValue()) {// by name
- return dataSet.withFilter(testKeysSet).withArgs(args).execute(function.getId());
+ return dataSet.withFilter(testKeysSet).setArguments(args).execute(function.getId());
} else { // By Instance
- return dataSet.withFilter(testKeysSet).withArgs(args).execute(function);
+ return dataSet.withFilter(testKeysSet).setArguments(args).execute(function);
}
}
private static ResultCollector executeOnAll(Execution dataSet, Serializable args,
Function function, Boolean isByName) throws Exception {
if (isByName.booleanValue()) {// by name
- return dataSet.withArgs(args).execute(function.getId());
+ return dataSet.setArguments(args).execute(function.getId());
} else { // By Instance
- return dataSet.withArgs(args).execute(function);
+ return dataSet.setArguments(args).execute(function);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index d5d3d64..40b653c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -449,7 +449,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
Integer val = new Integer(j++);
region.put(i.next(), val);
}
- HashMap resultMap = (HashMap) FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+ HashMap resultMap = (HashMap) FunctionService.onRegion(region).setArguments(Boolean.TRUE)
.execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
@@ -525,7 +525,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
Execution dataSet = FunctionService.onRegion(region);
try {
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
HashMap resultMap = ((HashMap) rc1.getResult());
assertEquals(3, resultMap.size());
@@ -561,7 +561,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(region);
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
List l = ((List) rc1.getResult());
LogWriterUtils.getLogWriter().info("Result size : " + l.size());
return l;
@@ -889,7 +889,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
}
List l = null;
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -941,28 +941,29 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
}
ResultCollector rc1 = null;
try {
- rc1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
- @Override
- public void execute(FunctionContext context) {
- if (((RegionFunctionContext) context).isPossibleDuplicate()) {
- context.getResultSender().lastResult(new Integer(retryCount));
- return;
- }
- if (context.getArguments() instanceof Boolean) {
- throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
- }
- }
+ rc1 =
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
+ @Override
+ public void execute(FunctionContext context) {
+ if (((RegionFunctionContext) context).isPossibleDuplicate()) {
+ context.getResultSender().lastResult(new Integer(retryCount));
+ return;
+ }
+ if (context.getArguments() instanceof Boolean) {
+ throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
+ }
+ }
- @Override
- public String getId() {
- return getClass().getName();
- }
+ @Override
+ public String getId() {
+ return getClass().getName();
+ }
- @Override
- public boolean hasResult() {
- return true;
- }
- });
+ @Override
+ public boolean hasResult() {
+ return true;
+ }
+ });
List list = (ArrayList) rc1.getResult();
assertEquals(list.get(0), 0);
@@ -1093,7 +1094,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
.info("<ExpectedException action=add>" + "No target node found for KEY = "
+ "|Server could not send the reply" + "|Unexpected exception during"
+ "</ExpectedException>");
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -1127,7 +1128,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
region.put(testKey, new Integer(1));
try {
ResultCollector rs =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -1150,7 +1151,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
assertEquals("Failure", ((List) rs.getResult()).get(0));
ResultCollector rs2 =
- dataSet.withFilter(testKeysSet).withArgs(testKey).execute(new FunctionAdapter() {
+ dataSet.withFilter(testKeysSet).setArguments(testKey).execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -1182,18 +1183,18 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
private static ResultCollector execute(Execution dataSet, Set testKeysSet, Serializable args,
Function function, Boolean isByName) throws Exception {
if (isByName.booleanValue()) {// by name
- return dataSet.withFilter(testKeysSet).withArgs(args).execute(function.getId());
+ return dataSet.withFilter(testKeysSet).setArguments(args).execute(function.getId());
} else { // By Instance
- return dataSet.withFilter(testKeysSet).withArgs(args).execute(function);
+ return dataSet.withFilter(testKeysSet).setArguments(args).execute(function);
}
}
private static ResultCollector executeOnAll(Execution dataSet, Serializable args,
Function function, Boolean isByName) throws Exception {
if (isByName.booleanValue()) {// by name
- return dataSet.withArgs(args).execute(function.getId());
+ return dataSet.setArguments(args).execute(function.getId());
} else { // By Instance
- return dataSet.withArgs(args).execute(function);
+ return dataSet.setArguments(args).execute(function);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
index 9576330..b9674dd 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
@@ -139,7 +139,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
Execution dataSet = FunctionService.onRegion(pr);
ResultCollector result =
- dataSet.withArgs(Boolean.TRUE).withFilter(testKeysSet).execute(function);
+ dataSet.setArguments(Boolean.TRUE).withFilter(testKeysSet).execute(function);
System.out.println("KBKBKB : Result I got : " + result.getResult());
return Boolean.TRUE;
}
@@ -179,7 +179,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
try {
Execution dataSet = FunctionService.onRegion(pr);
- dataSet.withFilter(testKeysSet).withArgs(testKey).execute(function);
+ dataSet.withFilter(testKeysSet).setArguments(testKey).execute(function);
fail("It should have failed with Function attributes don't match");
} catch (Exception expected) {
expected.printStackTrace();
@@ -239,24 +239,24 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
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));
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));
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"));
@@ -299,7 +299,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
pr.put(testKey, new Integer(1));
try {
ResultCollector rs1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
List list = (ArrayList) rs1.getResult();
assertEquals(list.get(0), 5);
} catch (Throwable e) {
@@ -364,7 +364,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
pr.put(testKey, new Integer(1));
try {
ResultCollector rs1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
List list = (ArrayList) rs1.getResult();
assertEquals(list.get(0), 5);
} catch (Throwable e) {
@@ -425,7 +425,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
Execution dataSet = FunctionService.onRegion(pr); // withCollector(rs);
try {
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
} catch (Exception expected) {
// No data should cause exec to throw
@@ -434,15 +434,17 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
pr.put(testKey, new Integer(1));
ResultCollector rs1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
assertEquals(Boolean.TRUE, ((List) rs1.getResult()).get(0));
- ResultCollector rs2 = dataSet.withFilter(testKeysSet).withArgs(testKey).execute(function);
+ ResultCollector rs2 =
+ dataSet.withFilter(testKeysSet).setArguments(testKey).execute(function);
assertEquals(new Integer(1), ((List) rs2.getResult()).get(0));
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);
+ ResultCollector rs3 =
+ dataSet.withFilter(testKeysSet).setArguments(putData).execute(function);
assertEquals(Boolean.TRUE, ((List) rs3.getResult()).get(0));
assertEquals(new Integer(2), pr.get(testKey + "1"));
@@ -496,8 +498,8 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
DistributedSystem.setThreadsSocketPolicy(false);
Execution dataSet = FunctionService.onRegion(pr);
pr.put(testKey, new Integer(1));
- ResultCollector rs1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ ResultCollector rs1 = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE)
+ .execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -577,7 +579,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
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"));
@@ -591,7 +593,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
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());
@@ -601,7 +603,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
// 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());
HashSet foundVals = new HashSet();
@@ -688,7 +690,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_LASTRESULT);
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(pr);
- ResultCollector rc2 = dataSet.withArgs(Boolean.TRUE).execute(function.getId());
+ ResultCollector rc2 = dataSet.setArguments(Boolean.TRUE).execute(function.getId());
List l = ((List) rc2.getResult());
return l;
}
@@ -749,7 +751,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_LASTRESULT);
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(pr);
- ResultCollector rc2 = dataSet.withArgs(Boolean.TRUE).execute(function.getId());
+ ResultCollector rc2 = dataSet.setArguments(Boolean.TRUE).execute(function.getId());
List l = ((List) rc2.getResult());
return l;
}
@@ -825,7 +827,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
}
try {
ResultCollector rs =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
List list = (ArrayList) rs.getResult();
assertEquals(list.get(0), 5);
} catch (Throwable e) {
@@ -1036,7 +1038,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(pr);
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());
return l;
}
@@ -1095,8 +1097,8 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
origVals.add(val);
pr.put(i.next(), val);
}
- ResultCollector rs =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ ResultCollector rs = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE)
+ .execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -1184,7 +1186,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
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());
@@ -1256,7 +1258,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
}
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();
} catch (Exception expected) {
expected.printStackTrace();
@@ -1332,8 +1334,8 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
pr.put(i.next(), val);
}
// long startTime = System.currentTimeMillis();
- ResultCollector rs =
- dataSet.withFilter(testKeysSet).withArgs("TestingTimeOut").execute(function.getId());
+ ResultCollector rs = dataSet.withFilter(testKeysSet).setArguments("TestingTimeOut")
+ .execute(function.getId());
// long endTime = System.currentTimeMillis();
List l = ((List) rs.getResult(10000, TimeUnit.MILLISECONDS));
assertEquals(3, l.size()); // this test may fail..but rarely
@@ -1404,7 +1406,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
}
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();
} catch (Exception expected) {
assertTrue(expected.getMessage()
@@ -1470,7 +1472,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(pr);
try {
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
} catch (Exception expected) {
// No data should cause exec to throw
LogWriterUtils.getLogWriter().warning("Exception Occured : " + expected.getMessage());
@@ -1488,7 +1490,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
}
// DefaultResultCollector rc1 = new DefaultResultCollector();
ResultCollector rc1 =
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
List l = ((List) rc1.getResult());
assertEquals(3, l.size());
@@ -1498,7 +1500,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
// DefaultResultCollector rc2 = new DefaultResultCollector();
ResultCollector rc2 =
- dataSet.withFilter(testKeysSet).withArgs(testKeysSet).execute(function);
+ dataSet.withFilter(testKeysSet).setArguments(testKeysSet).execute(function);
List l2 = ((List) rc2.getResult());
// assertIndexDetailsEquals(pr.getTotalNumberOfBuckets(), l2.size());
assertEquals(3, l2.size());
@@ -1753,7 +1755,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
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));
@@ -1773,7 +1775,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
}
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());
// assertIndexDetailsEquals(pr.getTotalNumberOfBuckets(), l.size());
assertEquals(1, l.size());
@@ -1783,7 +1785,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
// 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());
@@ -1829,7 +1831,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
final HashSet testKeysSet = new HashSet();
testKeysSet.add(testKey);
try {
- dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+ dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
} catch (Exception expected) {
// No data should cause exec to throw
assertTrue(expected.getMessage().contains("No target node found for KEY = " + testKey));
@@ -1849,7 +1851,8 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
}
// DefaultResultCollector rc1 = new DefaultResultCollector();
- ResultCollector rc1 = dataSet.withFilter(testKeys).withArgs(Boolean.TRUE).execute(function);
+ ResultCollector rc1 =
+ dataSet.withFilter(testKeys).setArguments(Boolean.TRUE).execute(function);
List l = ((List) rc1.getResult());
assertEquals(1, l.size());
for (Iterator i = l.iterator(); i.hasNext();) {
@@ -1857,7 +1860,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
}
// DefaultResultCollector rc2 = new DefaultResultCollector();
- ResultCollector rc2 = dataSet.withFilter(testKeys).withArgs(testKeys).execute(function);
+ ResultCollector rc2 = dataSet.withFilter(testKeys).setArguments(testKeys).execute(function);
List l2 = ((List) rc2.getResult());
assertEquals(1, l2.size());
@@ -1932,14 +1935,14 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(pr);
ResultCollector rc1 =
- dataSet.withFilter(singleKeySet).withArgs(Boolean.TRUE).execute(function.getId());
+ dataSet.withFilter(singleKeySet).setArguments(Boolean.TRUE).execute(function.getId());
List l = ((List) rc1.getResult());
assertEquals(1, l.size());
assertEquals(Boolean.TRUE, l.iterator().next());
// DefaultResultCollector rc2 = new DefaultResultCollector();
- ResultCollector rc2 = dataSet.withFilter(singleKeySet).withArgs(new HashSet(singleKeySet))
- .execute(function.getId());
+ ResultCollector rc2 = dataSet.withFilter(singleKeySet)
+ .setArguments(new HashSet(singleKeySet)).execute(function.getId());
List l2 = ((List) rc2.getResult());
assertEquals(1, l2.size());
@@ -2009,14 +2012,14 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(pr);
ResultCollector rc1 =
- dataSet.withFilter(singleKeySet).withArgs(Boolean.TRUE).execute(function);
+ dataSet.withFilter(singleKeySet).setArguments(Boolean.TRUE).execute(function);
List l = ((List) rc1.getResult());
assertEquals(1, l.size());
assertEquals(Boolean.TRUE, l.iterator().next());
// DefaultResultCollector rc2 = new DefaultResultCollector();
- ResultCollector rc2 = dataSet.withFilter(singleKeySet).withArgs(new HashSet(singleKeySet))
- .execute(function);
+ ResultCollector rc2 = dataSet.withFilter(singleKeySet)
+ .setArguments(new HashSet(singleKeySet)).execute(function);
List l2 = ((List) rc2.getResult());
assertEquals(1, l2.size());
@@ -2083,7 +2086,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION2);
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 :"
@@ -2166,7 +2169,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION2);
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(pr);
- ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute(function);
+ ResultCollector rc1 = dataSet.setArguments(Boolean.TRUE).execute(function);
List l = ((List) rc1.getResult());
assertEquals(3, l.size());
@@ -2228,7 +2231,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
assertTrue(pr.getBucketKeys(bid).size() > 0);
}
Execution dataSet = FunctionService.onRegion(pr);
- ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ ResultCollector rc1 = dataSet.setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -2328,7 +2331,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
assertTrue(pr.getBucketKeys(bid).size() > 0);
}
Execution dataSet = FunctionService.onRegion(pr);
- ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ ResultCollector rc1 = dataSet.setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
@@ -2425,7 +2428,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION3);
FunctionService.registerFunction(function);
Execution dataSet = FunctionService.onRegion(pr);
- ResultCollector rc1 = dataSet.withArgs(testKeys).execute(function.getId());
+ ResultCollector rc1 = dataSet.setArguments(testKeys).execute(function.getId());
List l = ((List) rc1.getResult());
assertEquals(4, l.size());
@@ -2824,7 +2827,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
keysForGet.add("KEY_7");
try {
Execution execution =
- FunctionService.onRegion(region).withFilter(keysForGet).withArgs(Boolean.TRUE);
+ FunctionService.onRegion(region).withFilter(keysForGet).setArguments(Boolean.TRUE);
ResultCollector rc = execution.execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext fc) {
[5/8] geode git commit: GEODE-2796: ClassPathLoader does not blow up
with null TCCL
Posted by kl...@apache.org.
GEODE-2796: ClassPathLoader does not blow up with null TCCL
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/48d662aa
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/48d662aa
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/48d662aa
Branch: refs/heads/feature/GEODE-2632-5
Commit: 48d662aab7ae4110f36a05aadefe9c12b48c1293
Parents: aaef124
Author: Jared Stewart <js...@pivotal.io>
Authored: Tue Apr 18 14:08:19 2017 -0700
Committer: Jared Stewart <js...@pivotal.io>
Committed: Wed Apr 19 20:08:04 2017 -0700
----------------------------------------------------------------------
.../apache/geode/internal/ClassPathLoader.java | 10 +++++++--
.../ClassPathLoaderIntegrationTest.java | 22 +++++++++++++++++---
2 files changed, 27 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/48d662aa/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java b/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java
index 41cce05..39e9d62 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java
@@ -32,6 +32,7 @@ import java.net.URLClassLoader;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
/**
* The delegating <tt>ClassLoader</tt> used by GemFire to load classes and other resources. This
@@ -303,10 +304,15 @@ public final class ClassPathLoader {
ArrayList<ClassLoader> classLoaders = new ArrayList<>();
if (!excludeTCCL) {
- classLoaders.add(Thread.currentThread().getContextClassLoader());
+ ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+ if (tccl != null) {
+ classLoaders.add(tccl);
+ }
}
- classLoaders.add(classLoaderForDeployedJars);
+ if (classLoaderForDeployedJars != null) {
+ classLoaders.add(classLoaderForDeployedJars);
+ }
return classLoaders;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/48d662aa/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
index c783318..2a3a7dd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
@@ -91,6 +91,24 @@ public class ClassPathLoaderIntegrationTest {
ClassPathLoader.setLatestToDefault(temporaryFolder.getRoot());
}
+ @Test
+ public void testClassLoaderWithNullTccl() throws IOException, ClassNotFoundException {
+ // GEODE-2796
+ Thread.currentThread().setContextClassLoader(null);
+ String jarName = "JarDeployerIntegrationTest.jar";
+
+ String classAResource = "integration/parent/ClassA.class";
+
+ String classAName = "integration.parent.ClassA";
+
+ byte[] firstJarBytes = createJarWithClass("ClassA");
+
+ // First deploy of the JAR file
+ ClassPathLoader.getLatest().getJarDeployer().deploy(jarName, firstJarBytes).getFile();
+
+ assertThatClassCanBeLoaded(classAName);
+ assertThatResourceCanBeLoaded(classAResource);
+ }
@Test
public void testDeployFileAndChange() throws IOException, ClassNotFoundException {
@@ -258,13 +276,11 @@ public class ClassPathLoaderIntegrationTest {
List<String> result = (List<String>) execution.execute("MyFunction").getResult();
assertThat(result.get(0)).isEqualTo("Version1");
-
ClassPathLoader.getLatest().getJarDeployer().deploy("MyJar.jar",
FileUtils.readFileToByteArray(jarVersion2));
result = (List<String>) execution.execute("MyFunction").getResult();
assertThat(result.get(0)).isEqualTo("Version2");
-
serverStarterRule.after();
}
@@ -451,7 +467,7 @@ public class ClassPathLoaderIntegrationTest {
/**
* Currently unused but potentially useful for some future test. This causes this loader to only
* generate a class that the parent could not find.
- *
+ *
* @param parent the parent class loader to check with first
*/
@SuppressWarnings("unused")
[6/8] geode git commit: GEODE-728: Using the correct parameter in
withArgs
Posted by kl...@apache.org.
GEODE-728: Using the correct parameter in withArgs
ServerRegionFunctionExecutor.withArgs was not using it's argument, it
was just passing the (null) field named args to setArguments.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5891ed7c
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5891ed7c
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5891ed7c
Branch: refs/heads/feature/GEODE-2632-5
Commit: 5891ed7c4306e761c1f12edf85401ab140429d04
Parents: 48d662a
Author: Dan Smith <up...@apache.org>
Authored: Thu Apr 20 10:45:55 2017 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Thu Apr 20 10:47:23 2017 -0700
----------------------------------------------------------------------
.../geode/internal/cache/execute/ServerRegionFunctionExecutor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/5891ed7c/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java
index 6543daf..3a20dc3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java
@@ -318,7 +318,7 @@ public class ServerRegionFunctionExecutor extends AbstractExecution {
return new ServerRegionFunctionExecutor(this, args);
}
- public Execution withArgs(Object params) {
+ public Execution withArgs(Object args) {
return setArguments(args);
}
[4/8] geode git commit: GEODE-728: Rename Execution.withArgs to
Execution.setArguments
Posted by kl...@apache.org.
GEODE-728: Rename Execution.withArgs to Execution.setArguments
* created setArguments
* deprecated withArgs
* implemented setArguments of all Execution implementations in Geode project
* replaced all of withArgs with setArguments
This closes #457
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/aaef124e
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/aaef124e
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/aaef124e
Branch: refs/heads/feature/GEODE-2632-5
Commit: aaef124e3d4d7b46c82ddb4d2af65ee48b73ba53
Parents: f038c2d
Author: Alyssa Kim <mi...@gmail.com>
Authored: Sat Apr 15 17:48:00 2017 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Wed Apr 19 16:14:07 2017 -0700
----------------------------------------------------------------------
.../common/ClientServerSessionCache.java | 2 +-
.../catalina/ClientServerSessionCache.java | 4 +-
.../catalina/PeerToPeerSessionCache.java | 2 +-
.../apache/geode/cache/execute/Execution.java | 13 +++
.../geode/cache/execute/FunctionContext.java | 2 +-
.../geode/cache/execute/ResultCollector.java | 2 +-
.../org/apache/geode/cache/execute/package.html | 6 +-
.../geode/internal/cache/PartitionedRegion.java | 12 +--
.../DistributedRegionFunctionExecutor.java | 9 +-
.../cache/execute/FunctionContextImpl.java | 2 +-
.../cache/execute/MemberFunctionExecutor.java | 13 ++-
.../execute/MultiRegionFunctionExecutor.java | 7 +-
.../PartitionedRegionFunctionExecutor.java | 7 +-
.../cache/execute/ServerFunctionExecutor.java | 7 +-
.../execute/ServerRegionFunctionExecutor.java | 11 +-
.../internal/cache/snapshot/ClientExporter.java | 2 +-
.../snapshot/RegionSnapshotServiceImpl.java | 2 +-
.../cache/snapshot/WindowedExporter.java | 4 +-
.../tier/sockets/command/ExecuteFunction70.java | 2 +-
.../internal/MBeanProxyInvocationHandler.java | 2 +-
.../internal/beans/QueryDataFunction.java | 8 +-
.../geode/management/internal/cli/CliUtil.java | 4 +-
.../internal/cli/commands/DataCommands.java | 5 +-
.../cli/commands/DiskStoreCommands.java | 2 +-
.../internal/cli/commands/FunctionCommands.java | 6 +-
.../cli/commands/MiscellaneousCommands.java | 2 +-
.../cli/functions/UserFunctionExecution.java | 2 +-
.../management/MemoryThresholdsDUnitTest.java | 6 +-
.../QueryUsingFunctionContextDUnitTest.java | 12 +--
...artitionedRegionEquiJoinIntegrationTest.java | 4 +-
.../PRColocatedEquiJoinDUnitTest.java | 4 +-
.../query/partitioned/PRQueryDUnitHelper.java | 23 +++--
.../cache/ClientServerTransactionDUnitTest.java | 38 +++----
.../geode/internal/cache/CommitFunction.java | 5 +-
...eAndForgetFunctionOnAllServersDUnitTest.java | 6 +-
.../cache/NestedTransactionFunction.java | 2 +-
.../geode/internal/cache/RollbackFunction.java | 5 +-
.../cache/execute/Bug51193DUnitTest.java | 6 +-
.../ClientServerFunctionExecutionDUnitTest.java | 14 +--
...ributedRegionFunctionExecutionDUnitTest.java | 20 ++--
.../FunctionExecution_ExceptionDUnitTest.java | 26 ++---
.../execute/FunctionServiceStatsDUnitTest.java | 26 ++---
.../LocalFunctionExecutionDUnitTest.java | 4 +-
.../MemberFunctionExecutionDUnitTest.java | 8 +-
.../OnGroupsFunctionExecutionDUnitTest.java | 38 +++----
...ntServerFunctionExecutionNoAckDUnitTest.java | 6 +-
...tServerRegionFunctionExecutionDUnitTest.java | 71 ++++++-------
...egionFunctionExecutionFailoverDUnitTest.java | 2 +-
...onFunctionExecutionNoSingleHopDUnitTest.java | 57 ++++++-----
...onExecutionSelectorNoSingleHopDUnitTest.java | 57 ++++++-----
...gionFunctionExecutionSingleHopDUnitTest.java | 63 ++++++------
.../execute/PRFunctionExecutionDUnitTest.java | 101 ++++++++++---------
.../PRFunctionExecutionTimeOutDUnitTest.java | 52 +++++-----
...ctionExecutionWithResultSenderDUnitTest.java | 32 +++---
.../cache/execute/PRTransactionDUnitTest.java | 20 ++--
.../partitioned/PartitionResolverDUnitTest.java | 2 +-
.../commands/DiskStoreCommandsJUnitTest.java | 8 +-
.../ClientExecuteFunctionAuthDUnitTest.java | 8 +-
...lientExecuteRegionFunctionAuthDUnitTest.java | 7 +-
.../function_execution.html.md.erb | 6 +-
.../join_query_partitioned_regions.html.md.erb | 4 +-
...tioned_region_key_or_field_value.html.md.erb | 2 +-
.../query_on_a_single_node.html.md.erb | 2 +-
.../LuceneIndexForPartitionedRegion.java | 2 +-
.../cache/lucene/internal/LuceneQueryImpl.java | 2 +-
.../lucene/internal/LuceneServiceImpl.java | 2 +-
.../internal/LuceneQueryImplJUnitTest.java | 4 +-
.../internal/DefaultGeodeConnection.scala | 4 +-
...tewaySenderDistributedDeadlockDUnitTest.java | 2 +-
.../controllers/FunctionAccessController.java | 4 +-
70 files changed, 482 insertions(+), 425 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
index a1ed5e7..51a2a6e 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
@@ -132,7 +132,7 @@ public class ClientServerSessionCache extends AbstractSessionCache {
RegionConfiguration configuration = createRegionConfiguration();
// Send it to the server tier
- Execution execution = FunctionService.onServer(this.cache).withArgs(configuration);
+ Execution execution = FunctionService.onServer(this.cache).setArguments(configuration);
ResultCollector collector = execution.execute(CreateRegionFunction.ID);
// Verify the region was successfully created on the servers
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
index 2d4a8cd..af2a2a3 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
@@ -109,7 +109,7 @@ public class ClientServerSessionCache extends AbstractSessionCache {
} else {
// Execute the member touch function on all the server(s)
Execution execution = FunctionService.onServers(getCache())
- .withArgs(new Object[] {this.sessionRegion.getFullPath(), sessionIds});
+ .setArguments(new Object[] {this.sessionRegion.getFullPath(), sessionIds});
try {
ResultCollector collector =
execution.execute(TouchReplicatedRegionEntriesFunction.ID, true, false, false);
@@ -202,7 +202,7 @@ public class ClientServerSessionCache extends AbstractSessionCache {
RegionConfiguration configuration = createRegionConfiguration();
// Send it to the server tier
- Execution execution = FunctionService.onServer(this.cache).withArgs(configuration);
+ Execution execution = FunctionService.onServer(this.cache).setArguments(configuration);
ResultCollector collector = execution.execute(CreateRegionFunction.ID);
// Verify the region was successfully created on the servers
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
index 0e1097b..69d6ec0 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
@@ -91,7 +91,7 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
} else {
// Execute the member touch function on all the server(s)
Execution execution = FunctionService.onMembers(getCache().getDistributedSystem())
- .withArgs(new Object[] {this.sessionRegion.getFullPath(), sessionIds});
+ .setArguments(new Object[] {this.sessionRegion.getFullPath(), sessionIds});
collector = execution.execute(TouchReplicatedRegionEntriesFunction.ID, true, false, false);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java b/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
index c3fdb6e..90ee1ec 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
@@ -60,7 +60,20 @@ public interface Execution<IN, OUT, AGG> {
* @param args user data passed to the function execution
* @return an Execution with args
* @throws IllegalArgumentException if the input parameter is null
+ * @since Geode 1.2
+ *
+ */
+ public Execution<IN, OUT, AGG> setArguments(IN args);
+
+ /**
+ * Specifies the user data passed to the function when it is executed. The function can retrieve
+ * these arguments using {@link FunctionContext#getArguments()}
+ *
+ * @param args user data passed to the function execution
+ * @return an Execution with args
+ * @throws IllegalArgumentException if the input parameter is null
* @since GemFire 6.0
+ * @deprecated use {@link #setArguments(Object)} instead
*
*/
public Execution<IN, OUT, AGG> withArgs(IN args);
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java
index 392eea9..74f05c5 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java
@@ -35,7 +35,7 @@ package org.apache.geode.cache.execute;
public interface FunctionContext<T1> {
/**
* Returns the arguments provided to this function execution. These are the arguments specified by
- * the caller using {@link Execution#withArgs(Object)}
+ * the caller using {@link Execution#setArguments(Object)}
*
* @return the arguments or null if there are no arguments
* @since GemFire 6.0
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java b/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java
index 9c9bdeb..605d4f1 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java
@@ -37,7 +37,7 @@ import org.apache.geode.distributed.DistributedMember;
* Function multiGetFunction ;
* Object args ;
* ResultCollector rc = FunctionService.onRegion(region)
- * .withArgs(args)
+ * .setArguments(args)
* .withFilter(keySet)
* .withCollector(new MyCustomResultCollector())
* .execute(multiGetFunction.getId());
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/cache/execute/package.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/package.html b/geode-core/src/main/java/org/apache/geode/cache/execute/package.html
index ce3046e..f1565e2 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/package.html
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/package.html
@@ -73,7 +73,7 @@ limitations under the License.
Function multiGetFunction;
Object args;
ResultCollector rc = FunctionService.onRegion(region)
- .withArgs(args)
+ .setArguments(args)
.withFilter(keySet)
.withCollector(new MyCustomResultCollector())
.execute(multiGetFunction.getId());
@@ -96,7 +96,7 @@ limitations under the License.
Function multiGetFunction;
Object args;
ResultCollector rc = FunctionService.onRegions(s)
- .withArgs(args)
+ .setArguments(args)
.withCollector(new MyCustomResultCollector())
.execute(multiGetFunction.getId());
// Application can get the handle of all the regions at the node it is executing on.
@@ -114,7 +114,7 @@ limitations under the License.
Function memberSetupFunction;
Object args;
ResultCollector rc = FunctionService.onMembers(ds)
- .withArgs(args)
+ .setArguments(args)
.execute(memberSetupFunction.getId());
//Application can do something else here before retrieving the result
Object functionResult = rc.getResult();
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 774ad0c..e15eb2a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -3349,20 +3349,20 @@ public class PartitionedRegion extends LocalRegion
switch (execution.getFilter().size()) {
case 0:
if (logger.isDebugEnabled()) {
- logger.debug("Executing Function: {} withArgs={} on all buckets.", function.getId(),
+ logger.debug("Executing Function: {} setArguments={} on all buckets.", function.getId(),
execution.getArguments());
}
return executeOnAllBuckets(function, execution, rc, false);
case 1:
if (logger.isDebugEnabled()) {
- logger.debug("Executing Function: {} withArgs={} on single node.", function.getId(),
+ logger.debug("Executing Function: {} setArguments={} on single node.", function.getId(),
execution.getArguments());
}
return executeOnSingleNode(function, execution, rc, false, executeOnBucketSet);
default:
if (logger.isDebugEnabled()) {
- logger.debug("Executing Function: {} withArgs={} on multiple nodes.", function.getId(),
- execution.getArguments());
+ logger.debug("Executing Function: {} setArguments={} on multiple nodes.",
+ function.getId(), execution.getArguments());
}
return executeOnMultipleNodes(function, execution, rc, false, executeOnBucketSet);
}
@@ -3578,7 +3578,7 @@ public class PartitionedRegion extends LocalRegion
}
if (logger.isDebugEnabled()) {
- logger.debug("Executing Function: {} withArgs={} on {}", function.getId(),
+ logger.debug("Executing Function: {} setArguments={} on {}", function.getId(),
execution.getArguments(), targetNode);
}
while (!execution.getFailedNodes().isEmpty()) {
@@ -6447,7 +6447,7 @@ public class PartitionedRegion extends LocalRegion
ResultCollector rc = null;
try {
- rc = FunctionService.onRegion(this).withArgs((Serializable) value)
+ rc = FunctionService.onRegion(this).setArguments((Serializable) value)
.execute(PRContainsValueFunction.class.getName());
List<Boolean> results = ((List<Boolean>) rc.getResult());
for (Boolean r : results) {
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java
index 8a4b571..dcadab0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java
@@ -344,7 +344,10 @@ public class DistributedRegionFunctionExecutor extends AbstractExecution {
return this.sender;
}
- public Execution withArgs(Object args) {
+
+
+ @Override
+ public Execution setArguments(Object args) {
if (args == null) {
throw new IllegalArgumentException(
LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
@@ -353,6 +356,10 @@ public class DistributedRegionFunctionExecutor extends AbstractExecution {
return new DistributedRegionFunctionExecutor(this, args);
}
+ public Execution withArgs(Object args) {
+ return setArguments(args);
+ }
+
public Execution withCollector(ResultCollector rs) {
if (rs == null) {
throw new IllegalArgumentException(
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
index e2185c4..c616cbd 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
@@ -59,7 +59,7 @@ public class FunctionContextImpl implements FunctionContext {
/**
* Returns the arguments provided to this function execution. These are the arguments specified by
- * caller using {@link Execution#withArgs(Object)}
+ * caller using {@link Execution#setArguments(Object)}
*
* @return the arguments or null if there are no arguments
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java
index 6bb00fb..74034e4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java
@@ -207,14 +207,19 @@ public class MemberFunctionExecutor extends AbstractExecution {
}
}
- // Changing the object!!
- public Execution withArgs(Object arguments) {
- if (arguments == null) {
+ @Override
+ public Execution setArguments(Object args) {
+ if (args == null) {
throw new IllegalArgumentException(
LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
.toLocalizedString("args"));
}
- return new MemberFunctionExecutor(this, arguments);
+ return new MemberFunctionExecutor(this, args);
+ }
+
+ // Changing the object!!
+ public Execution withArgs(Object args) {
+ return setArguments(args);
}
// Changing the object!!
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java
index c4c3a1a..a3ae2c0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java
@@ -142,7 +142,8 @@ public class MultiRegionFunctionExecutor extends AbstractExecution {
return this.sender;
}
- public Execution withArgs(Object args) {
+ @Override
+ public Execution setArguments(Object args) {
if (args == null) {
throw new IllegalArgumentException(
LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
@@ -151,6 +152,10 @@ public class MultiRegionFunctionExecutor extends AbstractExecution {
return new MultiRegionFunctionExecutor(this, args);
}
+ public Execution withArgs(Object args) {
+ return setArguments(args);
+ }
+
public Execution withCollector(ResultCollector rc) {
if (rc == null) {
throw new IllegalArgumentException(
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java
index 6e0840a..c7a7d36 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java
@@ -278,7 +278,8 @@ public class PartitionedRegionFunctionExecutor extends AbstractExecution {
return this.sender;
}
- public Execution withArgs(Object args) {
+ @Override
+ public Execution setArguments(Object args) {
if (args == null) {
throw new FunctionException(
LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
@@ -287,6 +288,10 @@ public class PartitionedRegionFunctionExecutor extends AbstractExecution {
return new PartitionedRegionFunctionExecutor(this, args);
}
+ public Execution withArgs(Object args) {
+ return setArguments(args);
+ }
+
public Execution withCollector(ResultCollector rs) {
if (rs == null) {
throw new FunctionException(
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
index a310fa5..d11358e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
@@ -250,7 +250,8 @@ public class ServerFunctionExecutor extends AbstractExecution {
.toLocalizedString("buckets as filter"));
}
- public Execution withArgs(Object args) {
+ @Override
+ public Execution setArguments(Object args) {
if (args == null) {
throw new FunctionException(
LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
@@ -259,6 +260,10 @@ public class ServerFunctionExecutor extends AbstractExecution {
return new ServerFunctionExecutor(this, args);
}
+ public Execution withArgs(Object args) {
+ return setArguments(args);
+ }
+
public Execution withCollector(ResultCollector rs) {
if (rs == null) {
throw new FunctionException(
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java
index 1d18fed..6543daf 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java
@@ -308,13 +308,18 @@ public class ServerRegionFunctionExecutor extends AbstractExecution {
.append("]").toString();
}
- public Execution withArgs(Object params) {
- if (params == null) {
+ @Override
+ public Execution setArguments(Object args) {
+ if (args == null) {
throw new FunctionException(
LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
.toLocalizedString("args"));
}
- return new ServerRegionFunctionExecutor(this, params);
+ return new ServerRegionFunctionExecutor(this, args);
+ }
+
+ public Execution withArgs(Object params) {
+ return setArguments(args);
}
public Execution withCollector(ResultCollector rs) {
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java
index c18dcd5..95bde41 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java
@@ -69,7 +69,7 @@ public class ClientExporter<K, V> implements Exporter<K, V> {
: FunctionService.onServer(pool);
ResultCollector<?, ?> rc =
- exec.withArgs(args).withCollector(results).execute(new ProxyExportFunction<K, V>());
+ exec.setArguments(args).withCollector(results).execute(new ProxyExportFunction<K, V>());
// Our custom result collector is writing the data, but this will
// check for errors.
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
index bfdef05..73b8ba9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
@@ -180,7 +180,7 @@ public class RegionSnapshotServiceImpl<K, V> implements RegionSnapshotService<K,
private void snapshotInParallel(ParallelArgs<K, V> args, Function fn) throws IOException {
try {
- ResultCollector rc = FunctionService.onRegion(region).withArgs(args).execute(fn);
+ ResultCollector rc = FunctionService.onRegion(region).setArguments(args).execute(fn);
List result = (List) rc.getResult();
for (Object obj : result) {
if (obj instanceof Exception) {
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java
index c515c7a..6ba94a3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java
@@ -77,8 +77,8 @@ public class WindowedExporter<K, V> implements Exporter<K, V> {
// to keep the reference to the ResultsCollector returned from execute().
// Normally discarding the reference can cause issues if GC causes the
// weak ref in ProcessorKeeper21 to be collected!!
- InternalExecution exec = (InternalExecution) FunctionService.onRegion(region).withArgs(args)
- .withCollector(results);
+ InternalExecution exec = (InternalExecution) FunctionService.onRegion(region)
+ .setArguments(args).withCollector(results);
// Ensure that our collector gets all exceptions so we can shut down the
// queue properly.
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
index d1fc2ab..957b423 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
@@ -124,7 +124,7 @@ public class ExecuteFunction70 extends ExecuteFunction66 {
}
Execution execution = new MemberFunctionExecutor(ds, members, resultSender);
if (args != null) {
- execution = execution.withArgs(args);
+ execution = execution.setArguments(args);
}
if (ignoreFailedMembers) {
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java
index 15ce122..e8f2521 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java
@@ -281,7 +281,7 @@ public class MBeanProxyInvocationHandler implements InvocationHandler {
List<Object> result = null;
try {
- ResultCollector rc = FunctionService.onMember(member).withArgs(functionArgs)
+ ResultCollector rc = FunctionService.onMember(member).setArguments(functionArgs)
.execute(ManagementConstants.MGMT_FUNCTION_ID);
result = (List<Object>) rc.getResult();
// Exceptions of ManagementFunctions
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
index 56064d0..efd7436 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
@@ -174,8 +174,8 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
results = selectResults;
}
} else {
- rcollector = FunctionService.onRegion(cache.getRegion(regionName)).withArgs(queryString)
- .execute(loclQueryFunc);
+ rcollector = FunctionService.onRegion(cache.getRegion(regionName))
+ .setArguments(queryString).execute(loclQueryFunc);
results = rcollector.getResult();
}
}
@@ -250,7 +250,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
try {
if (members.size() == 1) {
DistributedMember member = members.iterator().next();
- ResultCollector collector = FunctionService.onMember(member).withArgs(functionArgs)
+ ResultCollector collector = FunctionService.onMember(member).setArguments(functionArgs)
.execute(ManagementConstants.QUERY_DATA_FUNCTION);
List list = (List) collector.getResult();
Object object = null;
@@ -280,7 +280,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
}
} else { // More than 1 Member
- ResultCollector coll = FunctionService.onMembers(members).withArgs(functionArgs)
+ ResultCollector coll = FunctionService.onMembers(members).setArguments(functionArgs)
.execute(ManagementConstants.QUERY_DATA_FUNCTION);
List list = (List) coll.getResult();
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
index ad3f3df..d125e53 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
@@ -614,7 +614,7 @@ public class CliUtil {
Execution execution = null;
if (args != null) {
- execution = FunctionService.onMembers(targetMembers).withArgs(args);
+ execution = FunctionService.onMembers(targetMembers).setArguments(args);
} else {
execution = FunctionService.onMembers(targetMembers);
}
@@ -637,7 +637,7 @@ public class CliUtil {
Execution execution = null;
if (args != null) {
- execution = FunctionService.onMember(targetMember).withArgs(args);
+ execution = FunctionService.onMember(targetMember).setArguments(args);
} else {
execution = FunctionService.onMember(targetMember);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
index 484bbf2..6324b5c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
@@ -1198,7 +1198,8 @@ public class DataCommands implements CommandMarker {
if (members.size() == 1) {
DistributedMember member = members.iterator().next();
- ResultCollector collector = FunctionService.onMember(member).withArgs(request).execute(putfn);
+ ResultCollector collector =
+ FunctionService.onMember(member).setArguments(request).execute(putfn);
List list = (List) collector.getResult();
Object object = list.get(0);
if (object instanceof Throwable) {
@@ -1213,7 +1214,7 @@ public class DataCommands implements CommandMarker {
return result;
} else {
ResultCollector collector =
- FunctionService.onMembers(members).withArgs(request).execute(putfn);
+ FunctionService.onMembers(members).setArguments(request).execute(putfn);
List list = (List) collector.getResult();
DataCommandResult result = null;
for (int i = 0; i < list.size(); i++) {
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java
index 9116ba3..9ad2060 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java
@@ -911,7 +911,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
// MemberNotFoundException
final ResultCollector<?, ?> resultCollector =
- getMembersFunctionExecutor(Collections.singleton(member)).withArgs(diskStoreName)
+ getMembersFunctionExecutor(Collections.singleton(member)).setArguments(diskStoreName)
.execute(new DescribeDiskStoreFunction());
final Object result = ((List<?>) resultCollector.getResult()).get(0);
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java
index c2fb88f..752ca2a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java
@@ -257,7 +257,7 @@ public class FunctionCommands implements CommandMarker {
execution = execution.withFilter(filters);
}
if (arguments != null && arguments.length > 0) {
- execution = execution.withArgs(arguments);
+ execution = execution.setArguments(arguments);
}
try {
@@ -389,7 +389,7 @@ public class FunctionCommands implements CommandMarker {
}
args[4] = onRegion;
- Execution execution = FunctionService.onMember(member).withArgs(args);
+ Execution execution = FunctionService.onMember(member).setArguments(args);
if (execution != null) {
List<Object> results = (List<Object>) execution.execute(function).getResult();
if (results != null) {
@@ -522,7 +522,7 @@ public class FunctionCommands implements CommandMarker {
Object[] obj = new Object[1];
obj[0] = functionId;
- Execution execution = FunctionService.onMembers(DsMembers).withArgs(obj);
+ Execution execution = FunctionService.onMembers(DsMembers).setArguments(obj);
if (execution == null) {
cache.getLogger().error("executeUnregister execution is null");
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java
index 2a356d8..22981e7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java
@@ -1951,7 +1951,7 @@ public class MiscellaneousCommands implements CommandMarker {
TabularResultData resultTable = section.addTable("ChangeLogLevel");
resultTable = resultTable.setHeader("Summary");
- Execution execution = FunctionService.onMembers(dsMembers).withArgs(functionArgs);
+ Execution execution = FunctionService.onMembers(dsMembers).setArguments(functionArgs);
if (execution == null) {
return ResultBuilder.createUserErrorResult(CliStrings.CHANGE_LOGLEVEL__MSG__CANNOT_EXECUTE);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java
index 855a329..630c2bc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java
@@ -92,7 +92,7 @@ public class UserFunctionExecution implements Function, InternalEntity {
}
if (functionArgs != null && functionArgs.length > 0) {
- execution = execution.withArgs(functionArgs);
+ execution = execution.setArguments(functionArgs);
}
if (filters != null && filters.size() > 0) {
execution = execution.withFilter(filters);
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
index 118fb4b..5db1559 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
@@ -1126,7 +1126,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
Execution e = FunctionService.onRegion(pr);
try {
getCache().getLoggerI18n().fine(addExpectedFunctionExString);
- e.withFilter(s).withArgs((Serializable) s).execute(function);
+ e.withFilter(s).setArguments((Serializable) s).execute(function);
getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
fail("expected LowMemoryExcception was not thrown");
} catch (LowMemoryException ex) {
@@ -1140,7 +1140,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
s.add(sickKey2);
Execution e = FunctionService.onRegion(pr);
try {
- e.withFilter(s).withArgs((Serializable) s).execute(function);
+ e.withFilter(s).setArguments((Serializable) s).execute(function);
fail("expected LowMemoryExcception was not thrown");
} catch (LowMemoryException ex) {
// expected
@@ -1152,7 +1152,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
Set s = new HashSet();
s.add(healthyKey);
Execution e = FunctionService.onRegion(pr);
- e.withFilter(s).withArgs((Serializable) s).execute(function);
+ e.withFilter(s).setArguments((Serializable) s).execute(function);
}
if (sickKey1 != null && sickKey2 != null && healthyKey != null) {
break;
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 638a94d..b5b7c74 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -198,7 +198,7 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
rcollector =
FunctionService.onRegion(CacheFactory.getAnyInstance().getRegion(repRegionName))
- .withArgs(queriesForRR[i]).execute(function);
+ .setArguments(queriesForRR[i]).execute(function);
// Should not come here, an exception is expected from above function call.
fail("Function call did not fail for query with function context");
@@ -438,7 +438,7 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
rcollector = FunctionService
.onRegion(CacheFactory.getAnyInstance().getRegion(PartitionedRegionName1))
- .withArgs(queries[i]).withFilter(filter).execute(function);
+ .setArguments(queries[i]).withFilter(filter).execute(function);
// Should not come here, an exception is expected from above function call.
fail("Function call did not fail for query with function context");
@@ -509,7 +509,7 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
rcollector = FunctionService
.onRegion(CacheFactory.getAnyInstance().getRegion(PartitionedRegionName1))
- .withArgs(queries[i]).withFilter(filter).execute(function);
+ .setArguments(queries[i]).withFilter(filter).execute(function);
// Should not come here, an exception is expected from above function call.
fail("Function call did not fail for query with function context");
@@ -930,10 +930,10 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
// Filter can not be set as null if withFilter() is called.
if (filter != null) {
rcollector = FunctionService.onRegion(CacheFactory.getAnyInstance().getRegion(regionName))
- .withArgs(query).withFilter(filter).execute(func);
+ .setArguments(query).withFilter(filter).execute(func);
} else {
rcollector = FunctionService.onRegion(CacheFactory.getAnyInstance().getRegion(regionName))
- .withArgs(query).execute(func);
+ .setArguments(query).execute(func);
}
Object result = rcollector.getResult();
assertTrue(result instanceof ArrayList);
@@ -968,7 +968,7 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
// Filter can not be set as null if withFilter() is called.
rcollector = FunctionService.onServer(ClientCacheFactory.getAnyInstance())
- .withArgs(new Object[] {query, filter}).execute(func);
+ .setArguments(new Object[] {query, filter}).execute(func);
Object result = rcollector.getResult();
assertTrue(result instanceof ArrayList);
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
index 227d6ce..579bbb2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
@@ -82,8 +82,8 @@ public class PartitionedRegionEquiJoinIntegrationTest extends EquiJoinIntegratio
@Override
protected Object[] executeQueries(String[] queries) {
- ResultCollector collector =
- FunctionService.onRegion(region1).withArgs(queries).execute(equijoinTestFunction.getId());
+ ResultCollector collector = FunctionService.onRegion(region1).setArguments(queries)
+ .execute(equijoinTestFunction.getId());
Object result = collector.getResult();
return (Object[]) ((ArrayList) result).get(0);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index 4f1f68e..ae8da22 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -343,7 +343,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
Object funcResult = FunctionService
.onRegion((getCache().getRegion(name) instanceof PartitionedRegion)
? getCache().getRegion(name) : getCache().getRegion(coloName))
- .withArgs("Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "")
+ .setArguments("Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "")
+ " * from /" + name + " r1, /" + coloName + " r2 where " + queries[j])
.execute(func).getResult();
@@ -1603,7 +1603,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
Object funcResult = FunctionService
.onRegion((getCache().getRegion(name) instanceof PartitionedRegion)
? getCache().getRegion(name) : getCache().getRegion(coloName))
- .withArgs("Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "")
+ .setArguments("Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "")
+ " * from /" + name + " r1, /" + coloName + " r2 where " + queries[j])
.execute(func).getResult();
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
index 0f63df5..827f2a7 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
@@ -2024,8 +2024,9 @@ public class PRQueryDUnitHelper implements Serializable {
Object funcResult = FunctionService
.onRegion((getCache().getRegion(name) instanceof PartitionedRegion)
? getCache().getRegion(name) : getCache().getRegion(coloName))
- .withArgs("<trace> Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "")
- + " * from /" + name + " r1, /" + coloName + " r2 where " + queries[j])
+ .setArguments(
+ "<trace> Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "")
+ + " * from /" + name + " r1, /" + coloName + " r2 where " + queries[j])
.execute(func).getResult();
r[j][0] = ((ArrayList) funcResult).get(0);
@@ -2138,9 +2139,9 @@ public class PRQueryDUnitHelper implements Serializable {
Object funcResult = FunctionService
.onRegion((getCache().getRegion(name) instanceof PartitionedRegion)
? getCache().getRegion(name) : getCache().getRegion(coloName))
- .withArgs("<trace> Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "")
- + " * from /" + name + " r1, /" + coloName
- + " r2, r2.positions.values pos2 where " + queries[j])
+ .setArguments("<trace> Select "
+ + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") + " * from /" + name
+ + " r1, /" + coloName + " r2, r2.positions.values pos2 where " + queries[j])
.execute(func).getResult();
r[j][0] = ((ArrayList) funcResult).get(0);
@@ -2251,9 +2252,9 @@ public class PRQueryDUnitHelper implements Serializable {
Object funcResult = FunctionService
.onRegion((getCache().getRegion(name) instanceof PartitionedRegion)
? getCache().getRegion(name) : getCache().getRegion(coloName))
- .withArgs("<trace> Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "")
- + " * from /" + name + " r1, /" + coloName
- + " r2, r2.positions.values pos2 where " + queries[j])
+ .setArguments("<trace> Select "
+ + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") + " * from /" + name
+ + " r1, /" + coloName + " r2, r2.positions.values pos2 where " + queries[j])
.execute(func).getResult();
r[j][0] = ((ArrayList) funcResult).get(0);
@@ -2365,9 +2366,9 @@ public class PRQueryDUnitHelper implements Serializable {
Object funcResult = FunctionService
.onRegion((getCache().getRegion(name) instanceof PartitionedRegion)
? getCache().getRegion(name) : getCache().getRegion(coloName))
- .withArgs("<trace> Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "")
- + " * from /" + name + " r1, r1.positions.values pos1, /" + coloName
- + " r2 where " + queries[j])
+ .setArguments("<trace> Select "
+ + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") + " * from /" + name
+ + " r1, r1.positions.values pos1, /" + coloName + " r2 where " + queries[j])
.execute(func).getResult();
r[j][0] = ((ArrayList) funcResult).get(0);
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
index 95c09b6..ec4e179 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
@@ -3000,19 +3000,19 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
args.add(new CustId(0));
args.add(new Customer("name0", "address0"));
args.add(null);
- List result = (List) FunctionService.onRegion(cust).withArgs(args).execute(new TXFunction())
- .getResult();
+ List result = (List) FunctionService.onRegion(cust).setArguments(args)
+ .execute(new TXFunction()).getResult();
TransactionId txId = (TransactionId) result.get(0);
assertNotNull(txId);
args = new ArrayList();
args.add(new CustId(1));
args.add(new Customer("name1", "address1"));
args.add(txId);
- result = (List) FunctionService.onRegion(cust).withArgs(args).execute(new TXFunction())
+ result = (List) FunctionService.onRegion(cust).setArguments(args).execute(new TXFunction())
.getResult();
TransactionId txId2 = (TransactionId) result.get(0);
assertEquals(txId, txId2);
- result = (List) FunctionService.onServer(getCache()).withArgs(txId)
+ result = (List) FunctionService.onServer(getCache()).setArguments(txId)
.execute(new CommitFunction()).getResult();
Boolean b = (Boolean) result.get(0);
assertEquals(Boolean.TRUE, b);
@@ -3088,7 +3088,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
args.add(new CustId(0));
args.add(new Customer("name0", "address0"));
args.add(null);
- List result = (List) FunctionService.onRegion(cust).withArgs(args)
+ List result = (List) FunctionService.onRegion(cust).setArguments(args)
.execute(new TXFunction()).getResult();
TransactionId txId = (TransactionId) result.get(0);
assertNotNull(txId);
@@ -3096,17 +3096,17 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
args.add(new CustId(1));
args.add(new Customer("name1", "address1"));
args.add(txId);
- result = (List) FunctionService.onRegion(cust).withArgs(args).execute(new TXFunction())
- .getResult();
+ result = (List) FunctionService.onRegion(cust).setArguments(args)
+ .execute(new TXFunction()).getResult();
TransactionId txId2 = (TransactionId) result.get(0);
assertEquals(txId, txId2);
// invoke ClientCommitFunction
try {
if (commit) {
- FunctionService.onServer(getCache()).withArgs(new CustId(0))
+ FunctionService.onServer(getCache()).setArguments(new CustId(0))
.execute(new CommitFunction()).getResult();
} else {
- FunctionService.onServer(getCache()).withArgs(new CustId(0))
+ FunctionService.onServer(getCache()).setArguments(new CustId(0))
.execute(new RollbackFunction()).getResult();
}
fail("expected exception not thrown");
@@ -3115,10 +3115,10 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
}
List list = null;
if (commit) {
- list = (List) FunctionService.onServer(getCache()).withArgs(txId)
+ list = (List) FunctionService.onServer(getCache()).setArguments(txId)
.execute(new CommitFunction()).getResult();
} else {
- list = (List) FunctionService.onServer(getCache()).withArgs(txId)
+ list = (List) FunctionService.onServer(getCache()).setArguments(txId)
.execute(new RollbackFunction()).getResult();
}
assertEquals(Boolean.TRUE, list.get(0));
@@ -3179,22 +3179,22 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
args.add(new CustId(0));
args.add(new Customer("name0", "address0"));
args.add(null);
- List result = (List) FunctionService.onRegion(cust).withArgs(args).execute(new TXFunction())
- .getResult();
+ List result = (List) FunctionService.onRegion(cust).setArguments(args)
+ .execute(new TXFunction()).getResult();
TransactionId txId = (TransactionId) result.get(0);
assertNotNull(txId);
args = new ArrayList();
args.add(new CustId(1));
args.add(new Customer("name1", "address1"));
args.add(txId);
- result = (List) FunctionService.onRegion(cust).withArgs(args).execute(new TXFunction())
+ result = (List) FunctionService.onRegion(cust).setArguments(args).execute(new TXFunction())
.getResult();
TransactionId txId2 = (TransactionId) result.get(0);
assertEquals(txId, txId2);
// invoke ClientCommitFunction
try {
- FunctionService.onServer(getCache()).withArgs(new CustId(0)).execute(new CommitFunction())
- .getResult();
+ FunctionService.onServer(getCache()).setArguments(new CustId(0))
+ .execute(new CommitFunction()).getResult();
fail("expected exception not thrown");
} catch (FunctionException e) {
assertTrue(e.getCause() instanceof ClassCastException);
@@ -3216,10 +3216,10 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
try {
List list = null;
if (commit) {
- list = (List) FunctionService.onServer(getCache()).withArgs(txId)
+ list = (List) FunctionService.onServer(getCache()).setArguments(txId)
.execute(new CommitFunction()).getResult();
} else {
- list = (List) FunctionService.onServer(getCache()).withArgs(txId)
+ list = (List) FunctionService.onServer(getCache()).setArguments(txId)
.execute(new RollbackFunction()).getResult();
}
fail("expected exception not thrown");
@@ -3281,7 +3281,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
accessor.invoke(new SerializableCallable() {
public Object call() throws Exception {
- Execution exe = FunctionService.onMember(((TXId) txId).getMemberId()).withArgs(txId);
+ Execution exe = FunctionService.onMember(((TXId) txId).getMemberId()).setArguments(txId);
List list = null;
if (commit) {
list = (List) exe.execute(new CommitFunction()).getResult();
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java
index 2db03db..c66901a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java
@@ -79,7 +79,7 @@ public class CommitFunction implements Function {
txId = (TXId) context.getArguments();
} catch (ClassCastException e) {
logger.info(
- "CommitFunction should be invoked with a TransactionId as an argument i.e. withArgs(txId).execute(function)");
+ "CommitFunction should be invoked with a TransactionId as an argument i.e. setArguments(txId).execute(function)");
throw e;
}
DistributedMember member = txId.getMemberId();
@@ -101,7 +101,8 @@ public class CommitFunction implements Function {
ArrayList args = new ArrayList();
args.add(txId);
args.add(NestedTransactionFunction.COMMIT);
- Execution ex = FunctionService.onMember(cache.getDistributedSystem(), member).withArgs(args);
+ Execution ex =
+ FunctionService.onMember(cache.getDistributedSystem(), member).setArguments(args);
if (isDebugEnabled) {
logger.debug(
"CommitFunction: for transaction: {} executing NestedTransactionFunction on member: {}",
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
index 33e312d..c52ead8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
@@ -100,7 +100,7 @@ public class FireAndForgetFunctionOnAllServersDUnitTest extends LocatorTestBase
String regionName = "R1";
Execution dataSet = FunctionService.onServers(pool1);
- dataSet.withArgs(regionName).execute(function);
+ dataSet.setArguments(regionName).execute(function);
// Using Awatility, if the condition is not met during the timeout, a
// ConditionTimeoutException will be thrown. This makes analyzing the failure much simpler
@@ -119,7 +119,7 @@ public class FireAndForgetFunctionOnAllServersDUnitTest extends LocatorTestBase
await().atMost(60, SECONDS)
.until(() -> Assert.assertEquals(1, pool.getCurrentServers().size()));
dataSet = FunctionService.onServers(pool1);
- dataSet.withArgs(regionName).execute(function);
+ dataSet.setArguments(regionName).execute(function);
await().atMost(60, SECONDS)
.until(() -> Assert.assertEquals(2, pool.getCurrentServers().size()));
@@ -140,7 +140,7 @@ public class FireAndForgetFunctionOnAllServersDUnitTest extends LocatorTestBase
// Step 9. Execute the same function to put DistributedMemberID into above created replicated
// region.
dataSet = FunctionService.onServers(pool1);
- dataSet.withArgs(regionName).execute(function);
+ dataSet.setArguments(regionName).execute(function);
await().atMost(60, SECONDS)
.until(() -> Assert.assertEquals(1, pool.getCurrentServers().size()));
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java
index 3762302..4a208d4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java
@@ -67,7 +67,7 @@ public class NestedTransactionFunction implements Function {
action = (Integer) args.get(1);
} catch (ClassCastException e) {
logger.info(
- "CommitFunction should be invoked with a TransactionId as an argument i.e. withArgs(txId).execute(function)");
+ "CommitFunction should be invoked with a TransactionId as an argument i.e. setArguments(txId).execute(function)");
throw e;
}
CacheTransactionManager txMgr = cache.getCacheTransactionManager();
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java
index 00dbd2f..8ec7d2d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java
@@ -78,7 +78,7 @@ public class RollbackFunction implements Function {
txId = (TXId) context.getArguments();
} catch (ClassCastException e) {
logger.info(
- "RollbackFunction should be invoked with a TransactionId as an argument i.e. withArgs(txId).execute(function)");
+ "RollbackFunction should be invoked with a TransactionId as an argument i.e. setArguments(txId).execute(function)");
throw e;
}
DistributedMember member = txId.getMemberId();
@@ -100,7 +100,8 @@ public class RollbackFunction implements Function {
ArrayList args = new ArrayList();
args.add(txId);
args.add(NestedTransactionFunction.ROLLBACK);
- Execution ex = FunctionService.onMember(cache.getDistributedSystem(), member).withArgs(args);
+ Execution ex =
+ FunctionService.onMember(cache.getDistributedSystem(), member).setArguments(args);
if (isDebugEnabled) {
logger.debug(
"RollbackFunction: for transaction: {} executing NestedTransactionFunction on member: {}",
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java
index a8c61ae..12b467c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java
@@ -145,11 +145,11 @@ public class Bug51193DUnitTest extends JUnit4DistributedTestCase {
FunctionService.registerFunction(function);
Execution dataSet = null;
if ("region".equalsIgnoreCase(mode)) {
- dataSet = FunctionService.onRegion(cache.getRegion(REGION_NAME)).withArgs(timeout);
+ dataSet = FunctionService.onRegion(cache.getRegion(REGION_NAME)).setArguments(timeout);
} else if ("server".equalsIgnoreCase(mode)) {
- dataSet = FunctionService.onServer(cache.getDefaultPool()).withArgs(timeout);
+ dataSet = FunctionService.onServer(cache.getDefaultPool()).setArguments(timeout);
} else {
- dataSet = FunctionService.onServers(cache).withArgs(timeout);
+ dataSet = FunctionService.onServers(cache).setArguments(timeout);
}
ResultCollector rs = dataSet.execute(function);
assertTrue("Server did not read client_function_timeout from client.",
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
index 4d5dd7e..becc511 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
@@ -238,7 +238,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa
DistributedSystem.setThreadsSocketPolicy(false);
Execution member = FunctionService.onServers(pool);
try {
- ResultCollector rs = member.withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ ResultCollector rs = member.setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
context.getResultSender().lastResult("Success");
@@ -465,7 +465,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa
// remove any existing attributes
((AbstractExecution) member).removeFunctionAttributes(TestFunction.TEST_FUNCTION1);
- ResultCollector rs = member.withArgs(Boolean.TRUE).execute(TestFunction.TEST_FUNCTION1);
+ ResultCollector rs = member.setArguments(Boolean.TRUE).execute(TestFunction.TEST_FUNCTION1);
assertEquals(Boolean.TRUE, ((List) rs.getResult()).get(0));
byte[] functionAttributes =
((AbstractExecution) member).getFunctionAttributes(TestFunction.TEST_FUNCTION1);
@@ -698,7 +698,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa
Execution member = FunctionService.onServer(pool);
try {
- ResultCollector rs = member.withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ ResultCollector rs = member.setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
context.getResultSender().lastResult("Success");
@@ -730,7 +730,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa
Execution member = FunctionService.onServer(pool);
try {
- ResultCollector rs = member.withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ ResultCollector rs = member.setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
context.getResultSender().lastResult("Success");
@@ -887,7 +887,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa
DistributedSystem.setThreadsSocketPolicy(false);
Execution member = FunctionService.onServers(pool);
try {
- ResultCollector rs = member.withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+ ResultCollector rs = member.setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
public void execute(FunctionContext context) {
if (context.getArguments() instanceof String) {
context.getResultSender().lastResult("Success");
@@ -920,11 +920,11 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa
Boolean isByName) throws Exception {
if (isByName.booleanValue()) {// by name
LogWriterUtils.getLogWriter().info("The function name to execute : " + function.getId());
- Execution me = member.withArgs(args);
+ Execution me = member.setArguments(args);
LogWriterUtils.getLogWriter().info("The args passed : " + args);
return me.execute(function.getId());
} else { // By Instance
- return member.withArgs(args).execute(function);
+ return member.setArguments(args).execute(function);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index 49d67d2..b00921d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -960,7 +960,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
public static void executeInlineFunction() {
- List list = (List) FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+ List list = (List) FunctionService.onRegion(region).setArguments(Boolean.TRUE)
.execute(new FunctionAdapter() {
@Override
public void execute(FunctionContext context) {
@@ -1067,12 +1067,12 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
for (int i = 100; i < 120; i++) {
filter.add("execKey-" + i);
}
- ResultCollector rs = FunctionService.onRegion(region).withFilter(filter).withArgs(Boolean.TRUE)
- .execute(function);
+ ResultCollector rs = FunctionService.onRegion(region).withFilter(filter)
+ .setArguments(Boolean.TRUE).execute(function);
List list = (List) rs.getResult();
assertTrue(list.get(0) instanceof MyFunctionExecutionException);
- rs = FunctionService.onRegion(region).withFilter(filter).withArgs((Serializable) filter)
+ rs = FunctionService.onRegion(region).withFilter(filter).setArguments((Serializable) filter)
.execute(function);
List resultList = (List) rs.getResult();
assertEquals((filter.size() + 1), resultList.size());
@@ -1115,7 +1115,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
public static void executeFunctionFunctionInvocationTargetException() {
try {
- ResultCollector rc1 = FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+ ResultCollector rc1 = FunctionService.onRegion(region).setArguments(Boolean.TRUE)
.execute("DistribuedRegionFunctionFunctionInvocationException");
List list = (ArrayList) rc1.getResult();
assertEquals(5, list.get(0));
@@ -1127,7 +1127,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
public static void executeFunctionFunctionInvocationTargetExceptionWithoutHA() {
try {
- ResultCollector rc1 = FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+ ResultCollector rc1 = FunctionService.onRegion(region).setArguments(Boolean.TRUE)
.execute("DistribuedRegionFunctionFunctionInvocationException", true, false);
rc1.getResult();
fail("Function Invocation Target Exception should be thrown");
@@ -1141,7 +1141,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
public static void executeFunctionFunctionInvocationTargetException_ClientServer() {
try {
- List list = (ArrayList) FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+ List list = (ArrayList) FunctionService.onRegion(region).setArguments(Boolean.TRUE)
.execute("DistribuedRegionFunctionFunctionInvocationException").getResult();
assertEquals(1, list.size());
assertEquals(5, list.get(0));
@@ -1153,7 +1153,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
public static void executeFunctionFunctionInvocationTargetException_ClientServer_WithoutHA() {
try {
- FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+ FunctionService.onRegion(region).setArguments(Boolean.TRUE)
.execute("DistribuedRegionFunctionFunctionInvocationException", true, false).getResult();
fail("Function Invocation Target Exception should be thrown");
} catch (Exception e) {
@@ -1185,8 +1185,8 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
}
// dummy argument Boolean.TRUE indicates that cache should be closed
// in the function body itself on the first try
- List list = (List) FunctionService.onRegion(region).withFilter(filter).withArgs(Boolean.TRUE)
- .execute(function).getResult();
+ List list = (List) FunctionService.onRegion(region).withFilter(filter)
+ .setArguments(Boolean.TRUE).execute(function).getResult();
return list;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java
index b5232a7..bdcbd07 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java
@@ -96,12 +96,12 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit
pr.put(testKey, new Integer(1));
ResultCollector rs1 = null;
- rs1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+ rs1 = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
ArrayList results = (ArrayList) rs1.getResult();
assertTrue(results.get(0) instanceof Exception);
- rs1 =
- dataSet.withFilter(testKeysSet).withArgs((Serializable) testKeysSet).execute(function);
+ rs1 = dataSet.withFilter(testKeysSet).setArguments((Serializable) testKeysSet)
+ .execute(function);
results = (ArrayList) rs1.getResult();
assertEquals((testKeysSet.size() + 1), results.size());
Iterator resultIterator = results.iterator();
@@ -155,7 +155,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit
pr.put(testKey, new Integer(1));
ResultCollector rs1 = null;
- rs1 = dataSet.withFilter(testKeysSet).withArgs("Multiple").execute(function);
+ rs1 = dataSet.withFilter(testKeysSet).setArguments("Multiple").execute(function);
ArrayList results = (ArrayList) rs1.getResult();
assertTrue(results.get(0) instanceof Exception);
return Boolean.TRUE;
@@ -200,7 +200,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit
pr.put(testKey, new Integer(1));
ResultCollector rs1 = null;
- rs1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+ rs1 = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
try {
ArrayList results = (ArrayList) rs1.getResult();
fail("Expecting Exception");
@@ -261,13 +261,13 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit
pr.put(testKey, new Integer(1));
ResultCollector rs1 = null;
- // rs1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(
+ // rs1 = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(
// function);
// ArrayList results = (ArrayList)rs1.getResult();
// assertTrue(results.get(0) instanceof Exception);
//
- rs1 =
- dataSet.withFilter(testKeysSet).withArgs((Serializable) testKeysSet).execute(function);
+ rs1 = dataSet.withFilter(testKeysSet).setArguments((Serializable) testKeysSet)
+ .execute(function);
ArrayList results = (ArrayList) rs1.getResult();
assertEquals((testKeysSet.size() + 1), results.size());
Iterator resultIterator = results.iterator();
@@ -332,7 +332,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit
pr.put(testKey, new Integer(1));
ResultCollector rs1 = null;
- rs1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+ rs1 = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
try {
ArrayList results = (ArrayList) rs1.getResult();
fail("Expecting Exception");
@@ -396,7 +396,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit
pr.put(val, "MyValue_" + i);
}
ResultCollector rs1 =
- dataSet.withFilter(origVals).withArgs((Serializable) origVals).execute(function);
+ dataSet.withFilter(origVals).setArguments((Serializable) origVals).execute(function);
List results = (ArrayList) rs1.getResult();
assertEquals(((origVals.size() * 3) + 3), results.size());
Iterator resultIterator = results.iterator();
@@ -458,7 +458,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit
}
ResultCollector rc2 = null;
ResultCollector rs1 =
- dataSet.withFilter(origVals).withArgs((Serializable) origVals).execute(function);
+ dataSet.withFilter(origVals).setArguments((Serializable) origVals).execute(function);
List results = (ArrayList) rs1.getResult();
assertEquals(((origVals.size() * 4) + 4), results.size());
Iterator resultIterator = results.iterator();
@@ -527,7 +527,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit
pr.put(val, "MyValue_" + i);
}
ResultCollector rc2 = null;
- rc2 = dataSet.withFilter(origVals).withArgs(origVals).execute(function.getId());
+ rc2 = dataSet.withFilter(origVals).setArguments(origVals).execute(function.getId());
try {
ArrayList results = (ArrayList) rc2.getResult();
fail("Expecting Exception");
@@ -585,7 +585,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit
pr.put(val, "MyValue_" + i);
}
ResultCollector rc2 = null;
- rc2 = dataSet.withFilter(origVals).withArgs(origVals).execute(function.getId());
+ rc2 = dataSet.withFilter(origVals).setArguments(origVals).execute(function.getId());
try {
ArrayList results = (ArrayList) rc2.getResult();
fail("Expecting Exception");
[7/8] geode git commit: 2632: refactor code to use InternalCache
instead of GemFireCacheImpl
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceVsdStats.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceVsdStats.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceVsdStats.java
index 8435c4c..5dc7bb0 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceVsdStats.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceVsdStats.java
@@ -25,9 +25,9 @@ import org.apache.geode.cache.query.CqException;
import org.apache.geode.cache.query.CqQuery;
import org.apache.geode.cache.query.internal.DefaultQueryService;
import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.cache.FilterProfile;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.logging.LogService;
/**
@@ -44,35 +44,34 @@ public class CqServiceVsdStats {
private static final StatisticsType _type;
/** Name of the created CQs statistic */
- protected static final String CQS_CREATED = "numCqsCreated";
+ private static final String CQS_CREATED = "numCqsCreated";
/** Name of the active CQs statistic */
- protected static final String CQS_ACTIVE = "numCqsActive";
+ private static final String CQS_ACTIVE = "numCqsActive";
/** Name of the stopped CQs statistic */
- protected static final String CQS_STOPPED = "numCqsStopped";
+ private static final String CQS_STOPPED = "numCqsStopped";
/** Name of the closed CQs statistic */
- protected static final String CQS_CLOSED = "numCqsClosed";
+ private static final String CQS_CLOSED = "numCqsClosed";
/** Name of the client's CQs statistic */
- protected static final String CQS_ON_CLIENT = "numCqsOnClient";
+ private static final String CQS_ON_CLIENT = "numCqsOnClient";
/** Number of clients with CQs statistic */
- protected static final String CLIENTS_WITH_CQS = "numClientsWithCqs";
-
+ private static final String CLIENTS_WITH_CQS = "numClientsWithCqs";
/** CQ query execution time. */
- protected static final String CQ_QUERY_EXECUTION_TIME = "cqQueryExecutionTime";
+ private static final String CQ_QUERY_EXECUTION_TIME = "cqQueryExecutionTime";
/** CQ query execution in progress */
- protected static final String CQ_QUERY_EXECUTION_IN_PROGRESS = "cqQueryExecutionInProgress";
+ private static final String CQ_QUERY_EXECUTION_IN_PROGRESS = "cqQueryExecutionInProgress";
/** Completed CQ query executions */
- protected static final String CQ_QUERY_EXECUTIONS_COMPLETED = "cqQueryExecutionsCompleted";
+ private static final String CQ_QUERY_EXECUTIONS_COMPLETED = "cqQueryExecutionsCompleted";
/** Unique CQs, number of different CQ queries */
- protected static final String UNIQUE_CQ_QUERY = "numUniqueCqQuery";
+ private static final String UNIQUE_CQ_QUERY = "numUniqueCqQuery";
/** Id of the CQs created statistic */
private static final int _numCqsCreatedId;
@@ -104,7 +103,7 @@ public class CqServiceVsdStats {
/** Id for unique CQs, difference in CQ queries */
private static final int _numUniqueCqQuery;
- /**
+ /*
* Static initializer to create and initialize the <code>StatisticsType</code>
*/
static {
@@ -140,7 +139,6 @@ public class CqServiceVsdStats {
_cqQueryExecutionsCompletedId = _type.nameToId(CQ_QUERY_EXECUTIONS_COMPLETED);
_cqQueryExecutionInProgressId = _type.nameToId(CQ_QUERY_EXECUTION_IN_PROGRESS);
_numUniqueCqQuery = _type.nameToId(UNIQUE_CQ_QUERY);
-
}
/** The <code>Statistics</code> instance to which most behavior is delegated */
@@ -152,12 +150,10 @@ public class CqServiceVsdStats {
* @param factory The <code>StatisticsFactory</code> which creates the <code>Statistics</code>
* instance
*/
- public CqServiceVsdStats(StatisticsFactory factory) {
+ CqServiceVsdStats(StatisticsFactory factory) {
this._stats = factory.createAtomicStatistics(_type, "CqServiceStats");
}
- // /////////////////// Instance Methods /////////////////////
-
/**
* Closes the <code>HARegionQueueStats</code>.
*/
@@ -170,14 +166,14 @@ public class CqServiceVsdStats {
*
* @return the current value of the "numCqsCreated" stat
*/
- public long getNumCqsCreated() {
+ long getNumCqsCreated() {
return this._stats.getLong(_numCqsCreatedId);
}
/**
* Increments the "numCqsCreated" stat by 1.
*/
- public void incCqsCreated() {
+ void incCqsCreated() {
this._stats.incLong(_numCqsCreatedId, 1);
}
@@ -186,21 +182,21 @@ public class CqServiceVsdStats {
*
* @return the current value of the "numCqsActive" stat
*/
- public long getNumCqsActive() {
+ long getNumCqsActive() {
return this._stats.getLong(_numCqsActiveId);
}
/**
* Increments the "numCqsActive" stat by 1.
*/
- public void incCqsActive() {
+ void incCqsActive() {
this._stats.incLong(_numCqsActiveId, 1);
}
/**
* Decrements the "numCqsActive" stat by 1.
*/
- public void decCqsActive() {
+ void decCqsActive() {
this._stats.incLong(_numCqsActiveId, -1);
}
@@ -209,21 +205,21 @@ public class CqServiceVsdStats {
*
* @return the current value of the "numCqsStopped" stat
*/
- public long getNumCqsStopped() {
+ long getNumCqsStopped() {
return this._stats.getLong(_numCqsStoppedId);
}
/**
* Increments the "numCqsStopped" stat by 1.
*/
- public void incCqsStopped() {
+ void incCqsStopped() {
this._stats.incLong(_numCqsStoppedId, 1);
}
/**
* Decrements the "numCqsStopped" stat by 1.
*/
- public void decCqsStopped() {
+ void decCqsStopped() {
this._stats.incLong(_numCqsStoppedId, -1);
}
@@ -232,14 +228,14 @@ public class CqServiceVsdStats {
*
* @return the current value of the "numCqsClosed" stat
*/
- public long getNumCqsClosed() {
+ long getNumCqsClosed() {
return this._stats.getLong(_numCqsClosedId);
}
/**
* Increments the "numCqsClosed" stat by 1.
*/
- public void incCqsClosed() {
+ void incCqsClosed() {
this._stats.incLong(_numCqsClosedId, 1);
}
@@ -248,21 +244,21 @@ public class CqServiceVsdStats {
*
* @return the current value of the "numCqsOnClient" stat
*/
- public long getNumCqsOnClient() {
+ long getNumCqsOnClient() {
return this._stats.getLong(_numCqsOnClientId);
}
/**
* Increments the "numCqsOnClient" stat by 1.
*/
- public void incCqsOnClient() {
+ void incCqsOnClient() {
this._stats.incLong(_numCqsOnClientId, 1);
}
/**
* Decrements the "numCqsOnClient" stat by 1.
*/
- public void decCqsOnClient() {
+ void decCqsOnClient() {
this._stats.incLong(_numCqsOnClientId, -1);
}
@@ -278,21 +274,21 @@ public class CqServiceVsdStats {
/**
* Increments the "numClientsWithCqs" stat by 1.
*/
- public void incClientsWithCqs() {
+ void incClientsWithCqs() {
this._stats.incLong(_numClientsWithCqsId, 1);
}
/**
* Decrements the "numCqsOnClient" stat by 1.
*/
- public void decClientsWithCqs() {
+ void decClientsWithCqs() {
this._stats.incLong(_numClientsWithCqsId, -1);
}
/**
* Start the CQ Query Execution time.
*/
- public long startCqQueryExecution() {
+ long startCqQueryExecution() {
this._stats.incInt(_cqQueryExecutionInProgressId, 1);
return NanoTimer.getTime();
}
@@ -302,7 +298,7 @@ public class CqServiceVsdStats {
*
* @param start long time value.
*/
- public void endCqQueryExecution(long start) {
+ void endCqQueryExecution(long start) {
long ts = NanoTimer.getTime();
this._stats.incLong(_cqQueryExecutionTimeId, ts - start);
this._stats.incInt(_cqQueryExecutionInProgressId, -1);
@@ -321,14 +317,14 @@ public class CqServiceVsdStats {
/**
* Increments number of Unique queries.
*/
- public void incUniqueCqQuery() {
+ void incUniqueCqQuery() {
this._stats.incInt(_numUniqueCqQuery, 1);
}
/**
* Decrements number of unique Queries.
*/
- public void decUniqueCqQuery() {
+ void decUniqueCqQuery() {
this._stats.incInt(_numUniqueCqQuery, -1);
}
@@ -338,11 +334,8 @@ public class CqServiceVsdStats {
* tests.
* <p>
* Returns the number of CQs (active + suspended) on the given region.
- *
- * @param regionName
*/
- public long numCqsOnRegion(String regionName) {
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ public long numCqsOnRegion(final InternalCache cache, String regionName) {
if (cache == null) {
return 0;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
index ec6e984..c484105 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
@@ -21,24 +21,18 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedQueue;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.CancelException;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
-import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EvictionAction;
-import org.apache.geode.cache.client.internal.UserAttributes;
import org.apache.geode.cache.query.CqAttributes;
import org.apache.geode.cache.query.CqAttributesMutator;
import org.apache.geode.cache.query.CqClosedException;
import org.apache.geode.cache.query.CqException;
import org.apache.geode.cache.query.CqExistsException;
-import org.apache.geode.cache.query.CqListener;
import org.apache.geode.cache.query.CqResults;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryException;
@@ -49,6 +43,7 @@ import org.apache.geode.cache.query.internal.CompiledRegion;
import org.apache.geode.cache.query.internal.CompiledSelect;
import org.apache.geode.cache.query.internal.CqStateImpl;
import org.apache.geode.cache.query.internal.DefaultQuery;
+import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.Token;
@@ -58,7 +53,6 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.geode.i18n.StringId;
public class ServerCQImpl extends CqQueryImpl implements DataSerializable, ServerCQ {
private static final Logger logger = LogService.getLogger();
@@ -84,7 +78,7 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
public volatile boolean cqResultKeysInitialized = false;
/** Boolean flag to see if the CQ is on Partitioned Region */
- public volatile boolean isPR = false;
+ volatile boolean isPR = false;
private ClientProxyMembershipID clientProxyId = null;
@@ -92,7 +86,6 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
private String serverCqName;
-
/** identifier assigned to this query for FilterRoutingInfos */
private Long filterID;
@@ -106,21 +99,11 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
// For deserialization
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqQuery2#getFilterID()
- */
@Override
public Long getFilterID() {
return this.filterID;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqQuery2#setFilterID(java.lang.Long)
- */
@Override
public void setFilterID(Long filterID) {
this.filterID = filterID;
@@ -142,19 +125,12 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
CacheClientProxy clientProxy = null;
this.clientProxyId = p_clientProxyId;
- // servConnection = serverSideConnection;
if (p_ccn != null) {
this.ccn = p_ccn;
clientProxy = p_ccn.getClientProxy(p_clientProxyId, true);
}
- /*
- * try { initCq(); } catch (CqExistsException cqe) { // Should not happen. throw new
- * CqException(LocalizedStrings.CqQueryImpl_UNABLE_TO_CREATE_CQ_0_ERROR__1.toLocalizedString(new
- * Object[] { cqName, cqe.getMessage()})); }
- */
-
validateCq();
final boolean isDebugEnabled = logger.isDebugEnabled();
@@ -228,13 +204,11 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
throw new CqException(errMsg);
}
- // checkAndSetCqOnRegion();
-
// Can be null by the time we are here
if (clientProxy != null) {
clientProxy.incCqCount();
if (clientProxy.hasOneCq()) {
- cqService.stats.incClientsWithCqs();
+ cqService.stats().incClientsWithCqs();
}
if (isDebugEnabled) {
logger.debug("Added CQ to the base region: {} With key as: {}", cqBaseRegion.getFullPath(),
@@ -307,7 +281,6 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
* query.
*
* @return String modified query.
- * @throws CqException
*/
private Query constructServerSideQuery() throws QueryException {
GemFireCacheImpl cache = (GemFireCacheImpl) cqService.getCache();
@@ -328,7 +301,6 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
* Returns if the passed key is part of the CQs result set. This method needs to be called once
* the CQ result key caching is completed (cqResultsCacheInitialized is true).
*
- * @param key
* @return true if key is in the Results Cache.
*/
public boolean isPartOfCqResult(Object key) {
@@ -352,27 +324,18 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqQuery2#addToCqResultKeys(java.lang.Object)
- */
@Override
public void addToCqResultKeys(Object key) {
if (!CqServiceProvider.MAINTAIN_KEYS) {
return;
}
- // this.logger.fine("Adding key to Results Cache For CQ :" +
- // this.cqName + " key :" + key);
if (this.cqResultKeys != null) {
synchronized (this.cqResultKeys) {
this.cqResultKeys.put(key, TOKEN);
if (!this.cqResultKeysInitialized) {
// This key could be coming after add, destroy.
// Remove this from destroy queue.
- // this.logger.fine("Removing key from Destroy Cache For CQ :" +
- // this.cqName + " key :" + key);
if (this.destroysWhileCqResultsInProgress != null) {
this.destroysWhileCqResultsInProgress.remove(key);
}
@@ -381,21 +344,11 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
}
}
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.cache.query.internal.InternalCqQuery2#removeFromCqResultKeys(java.lang.Object,
- * boolean)
- */
@Override
public void removeFromCqResultKeys(Object key, boolean isTokenMode) {
if (!CqServiceProvider.MAINTAIN_KEYS) {
return;
}
- // this.logger.fine("Removing key from Results Cache For CQ :" +
- // this.cqName + " key :" + key);
if (this.cqResultKeys != null) {
synchronized (this.cqResultKeys) {
if (isTokenMode && this.cqResultKeys.get(key) != Token.DESTROYED) {
@@ -403,8 +356,6 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
}
this.cqResultKeys.remove(key);
if (!this.cqResultKeysInitialized) {
- // this.logger.fine("Adding key to Destroy Cache For CQ :" +
- // this.cqName + " key :" + key);
if (this.destroysWhileCqResultsInProgress != null) {
this.destroysWhileCqResultsInProgress.add(key);
}
@@ -415,10 +366,8 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
/**
* Marks the key as destroyed in the CQ Results key cache.
- *
- * @param key
*/
- public void markAsDestroyedInCqResultKeys(Object key) {
+ void markAsDestroyedInCqResultKeys(Object key) {
if (!CqServiceProvider.MAINTAIN_KEYS) {
return;
}
@@ -439,12 +388,6 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
}
}
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqQuery2#setCqResultsCacheInitialized()
- */
@Override
public void setCqResultsCacheInitialized() {
if (CqServiceProvider.MAINTAIN_KEYS) {
@@ -466,13 +409,6 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
}
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.cache.query.internal.InternalCqQuery2#isOldValueRequiredForQueryProcessing(
- * java.lang.Object)
- */
@Override
public boolean isOldValueRequiredForQueryProcessing(Object key) {
if (this.cqResultKeysInitialized && this.isPartOfCqResult(key)) {
@@ -484,18 +420,11 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
/**
* Closes the Query. On Client side, sends the cq close request to server. On Server side, takes
* care of repository cleanup.
- *
- * @throws CqException
*/
public void close() throws CqClosedException, CqException {
close(true);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqQuery2#close(boolean)
- */
@Override
public void close(boolean sendRequestToServer) throws CqClosedException, CqException {
final boolean isDebugEnabled = logger.isDebugEnabled();
@@ -523,9 +452,9 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
// Stat update.
if (stateBeforeClosing == CqStateImpl.RUNNING) {
- cqService.stats.decCqsActive();
+ cqService.stats().decCqsActive();
} else if (stateBeforeClosing == CqStateImpl.STOPPED) {
- cqService.stats.decCqsStopped();
+ cqService.stats().decCqsStopped();
}
// Clean-up the CQ Results Cache.
@@ -537,8 +466,8 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
// Set the state to close, and update stats
this.cqState.setState(CqStateImpl.CLOSED);
- cqService.stats.incCqsClosed();
- cqService.stats.decCqsOnClient();
+ cqService.stats().incCqsClosed();
+ cqService.stats().decCqsOnClient();
if (this.stats != null)
this.stats.close();
}
@@ -564,9 +493,8 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
/**
* Clears the resource used by CQ.
- *
- * @throws CqException
*/
+ @Override
protected void cleanup() throws CqException {
// CqBaseRegion
try {
@@ -575,7 +503,7 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
CacheClientProxy clientProxy = ccn.getClientProxy(clientProxyId);
clientProxy.decCqCount();
if (clientProxy.hasNoCq()) {
- cqService.stats.decClientsWithCqs();
+ cqService.stats().decClientsWithCqs();
}
}
} catch (Exception ex) {
@@ -587,16 +515,9 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
}
/**
- * @param serverCqName The serverCqName to set.
- */
- public void setServerCqName(String serverCqName) {
-
- this.serverCqName = serverCqName;
- }
-
- /**
* Stop or pause executing the query.
*/
+ @Override
public void stop() throws CqClosedException, CqException {
boolean isStopped = false;
synchronized (this.cqState) {
@@ -613,18 +534,16 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
// Change state and stats on the client side
this.cqState.setState(CqStateImpl.STOPPED);
- this.cqService.stats.incCqsStopped();
- this.cqService.stats.decCqsActive();
+ this.cqService.stats().incCqsStopped();
+ this.cqService.stats().decCqsActive();
if (logger.isDebugEnabled()) {
logger.debug("Successfully stopped the CQ. {}", cqName);
}
}
}
- /* DataSerializableFixedID methods ---------------------------------------- */
-
+ @Override
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- // this.cqName = DataSerializer.readString(in);
synchronized (cqState) {
this.cqState.setState(DataSerializer.readInteger(in));
}
@@ -633,23 +552,14 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
this.filterID = in.readLong();
}
- /*
- * public int getDSFID() { return CQ_QUERY; }
- */
-
+ @Override
public void toData(DataOutput out) throws IOException {
- // DataSerializer.writeString(this.cqName, out);
DataSerializer.writeInteger(this.cqState.getState(), out);
DataSerializer.writeBoolean(this.isDurable, out);
DataSerializer.writeString(this.queryString, out);
out.writeLong(this.filterID);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqQuery2#isPR()
- */
@Override
public boolean isPR() {
return isPR;
@@ -676,5 +586,4 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
throw new IllegalStateException("Execute cannot be called on a CQ on the server");
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
index bcf9806..9bddbc7 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
@@ -27,7 +27,6 @@ import org.apache.geode.cache.query.internal.DefaultQueryService;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.ServerCQ;
import org.apache.geode.distributed.internal.DistributionStats;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
@@ -85,8 +84,7 @@ public class ExecuteCQ extends BaseCQCommand {
ServerCQ cqQuery = null;
try {
- qService =
- (DefaultQueryService) ((GemFireCacheImpl) crHelper.getCache()).getLocalQueryService();
+ qService = (DefaultQueryService) crHelper.getCache().getLocalQueryService();
// Authorization check
AuthorizeRequest authzRequest = servConn.getAuthzRequest();
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java
index f333b4b..de61445 100755
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java
@@ -28,7 +28,6 @@ import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
import org.apache.geode.cache.query.internal.cq.CqServiceProvider;
import org.apache.geode.cache.query.internal.cq.ServerCQImpl;
import org.apache.geode.distributed.internal.DistributionStats;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
@@ -111,8 +110,7 @@ public class ExecuteCQ61 extends BaseCQCommand {
ServerCQImpl cqQuery = null;
try {
- qService =
- (DefaultQueryService) ((GemFireCacheImpl) crHelper.getCache()).getLocalQueryService();
+ qService = (DefaultQueryService) crHelper.getCache().getLocalQueryService();
// Authorization check
AuthorizeRequest authzRequest = servConn.getAuthzRequest();
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java
index eac9ed3..a2d201d 100755
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.geode.cache.query.CqException;
import org.apache.geode.cache.query.internal.DefaultQueryService;
import org.apache.geode.cache.query.internal.cq.CqService;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
@@ -64,8 +63,7 @@ public class GetDurableCQs extends BaseCQCommand {
CqService cqServiceForExec = null;
try {
- qService =
- (DefaultQueryService) ((GemFireCacheImpl) crHelper.getCache()).getLocalQueryService();
+ qService = (DefaultQueryService) crHelper.getCache().getLocalQueryService();
this.securityService.authorizeClusterRead();
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java
index 7ace0e8..f4cd706 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java
@@ -14,20 +14,15 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Collection;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.query.CqException;
-import org.apache.geode.cache.query.CqQuery;
import org.apache.geode.cache.query.CqServiceStatistics;
import org.apache.geode.cache.query.CqStatistics;
import org.apache.geode.cache.query.QueryService;
@@ -40,7 +35,7 @@ import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
import org.apache.geode.cache.query.internal.cq.CqServiceVsdStats;
import org.apache.geode.cache.query.internal.cq.InternalCqQuery;
import org.apache.geode.cache30.CacheSerializableRunnable;
-import org.apache.geode.cache30.CacheTestCase;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
@@ -48,27 +43,26 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
- * This class tests the ContiunousQuery mechanism in GemFire. This includes the test with different
+ * This class tests the ContinuousQuery mechanism in GemFire. This includes the test with different
* data activities.
- *
*/
@Category(DistributedTest.class)
public class CqStatsDUnitTest extends JUnit4CacheTestCase {
+ // TODO: delete this use of CqQueryDUnitTest
private CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest();
- public CqStatsDUnitTest() {
- super();
- }
-
@Override
public final void postSetUp() throws Exception {
// avoid IllegalStateException from HandShake by connecting all vms to
// system before creating pool
getSystem();
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
+ @Override
public void run() {
getSystem();
}
@@ -81,6 +75,7 @@ public class CqStatsDUnitTest extends JUnit4CacheTestCase {
public void validateCQStats(VM vm, final String cqName, final int creates, final int updates,
final int deletes, final int totalEvents, final int cqListenerInvocations) {
vm.invoke(new CacheSerializableRunnable("Validate CQs") {
+ @Override
public void run2() throws CacheException {
LogWriterUtils.getLogWriter().info("### Validating CQ Stats. ### " + cqName);
// Get CQ Service.
@@ -161,6 +156,7 @@ public class CqStatsDUnitTest extends JUnit4CacheTestCase {
final int stopped, final int closed, final int cqsOnClient, final int cqsOnRegion,
final int clientsWithCqs) {
vm.invoke(new CacheSerializableRunnable("Validate CQ Service Stats") {
+ @Override
public void run2() throws CacheException {
LogWriterUtils.getLogWriter().info("### Validating CQ Service Stats. ### ");
// Get CQ Service.
@@ -176,7 +172,7 @@ public class CqStatsDUnitTest extends JUnit4CacheTestCase {
CqServiceVsdStats cqServiceVsdStats = null;
try {
cqServiceVsdStats =
- ((CqServiceImpl) ((DefaultQueryService) qService).getCqService()).stats;
+ ((CqServiceImpl) ((DefaultQueryService) qService).getCqService()).stats();
} catch (CqException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -185,12 +181,14 @@ public class CqStatsDUnitTest extends JUnit4CacheTestCase {
fail("Failed to get CQ Service Stats");
}
- getCache().getLogger().info("#### CQ Service stats: " + " CQs created: "
- + cqServiceStats.numCqsCreated() + " CQs active: " + cqServiceStats.numCqsActive()
- + " CQs stopped: " + cqServiceStats.numCqsStopped() + " CQs closed: "
- + cqServiceStats.numCqsClosed() + " CQs on Client: " + cqServiceStats.numCqsOnClient()
- + " CQs on region /root/regionA : " + cqServiceVsdStats.numCqsOnRegion("/root/regionA")
- + " Clients with CQs: " + cqServiceVsdStats.getNumClientsWithCqs());
+ getCache().getLogger()
+ .info("#### CQ Service stats: " + " CQs created: " + cqServiceStats.numCqsCreated()
+ + " CQs active: " + cqServiceStats.numCqsActive() + " CQs stopped: "
+ + cqServiceStats.numCqsStopped() + " CQs closed: " + cqServiceStats.numCqsClosed()
+ + " CQs on Client: " + cqServiceStats.numCqsOnClient()
+ + " CQs on region /root/regionA : "
+ + cqServiceVsdStats.numCqsOnRegion(GemFireCacheImpl.getInstance(), "/root/regionA")
+ + " Clients with CQs: " + cqServiceVsdStats.getNumClientsWithCqs());
// Check for created count.
@@ -223,7 +221,7 @@ public class CqStatsDUnitTest extends JUnit4CacheTestCase {
// Check for CQs on region.
if (cqsOnRegion != CqQueryDUnitTest.noTest) {
assertEquals("Number of CQs on region /root/regionA mismatch", cqsOnRegion,
- cqServiceVsdStats.numCqsOnRegion("/root/regionA"));
+ cqServiceVsdStats.numCqsOnRegion(GemFireCacheImpl.getInstance(), "/root/regionA"));
}
// Check for clients with CQs count.
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
index d6068f1..c03bb8b 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
@@ -14,21 +14,16 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.distributed.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.util.Collection;
+import java.util.Properties;
-import java.util.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.query.CqException;
-import org.apache.geode.cache.query.CqQuery;
import org.apache.geode.cache.query.CqServiceStatistics;
import org.apache.geode.cache.query.CqStatistics;
import org.apache.geode.cache.query.QueryService;
@@ -41,7 +36,8 @@ import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
import org.apache.geode.cache.query.internal.cq.CqServiceVsdStats;
import org.apache.geode.cache.query.internal.cq.InternalCqQuery;
import org.apache.geode.cache30.CacheSerializableRunnable;
-import org.apache.geode.cache30.CacheTestCase;
+import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
@@ -49,21 +45,19 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
- * This class tests the ContiunousQuery mechanism in GemFire. This includes the test with different
+ * This class tests the ContinuousQuery mechanism in GemFire. This includes the test with different
* data activities.
- *
*/
@Category(DistributedTest.class)
public class CqStatsUsingPoolDUnitTest extends JUnit4CacheTestCase {
+ // TODO: delete this use of CqQueryUsingPoolDUnitTest
private CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest();
- public CqStatsUsingPoolDUnitTest() {
- super();
- }
-
@Override
public Properties getDistributedSystemProperties() {
Properties result = super.getDistributedSystemProperties();
@@ -77,6 +71,7 @@ public class CqStatsUsingPoolDUnitTest extends JUnit4CacheTestCase {
// system before creating pool
getSystem();
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
+ @Override
public void run() {
getSystem();
}
@@ -89,6 +84,7 @@ public class CqStatsUsingPoolDUnitTest extends JUnit4CacheTestCase {
private void validateCQStats(VM vm, final String cqName, final int creates, final int updates,
final int deletes, final int totalEvents, final int cqListenerInvocations) {
vm.invoke(new CacheSerializableRunnable("Validate CQs") {
+ @Override
public void run2() throws CacheException {
LogWriterUtils.getLogWriter().info("### Validating CQ Stats. ### " + cqName);
// Get CQ Service.
@@ -169,6 +165,7 @@ public class CqStatsUsingPoolDUnitTest extends JUnit4CacheTestCase {
final int stopped, final int closed, final int cqsOnClient, final int cqsOnRegion,
final int clientsWithCqs) {
vm.invoke(new CacheSerializableRunnable("Validate CQ Service Stats") {
+ @Override
public void run2() throws CacheException {
LogWriterUtils.getLogWriter().info("### Validating CQ Service Stats. ### ");
// Get CQ Service.
@@ -184,7 +181,7 @@ public class CqStatsUsingPoolDUnitTest extends JUnit4CacheTestCase {
CqServiceVsdStats cqServiceVsdStats = null;
try {
cqServiceVsdStats =
- ((CqServiceImpl) ((DefaultQueryService) qService).getCqService()).stats;
+ ((CqServiceImpl) ((DefaultQueryService) qService).getCqService()).stats();
} catch (CqException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -193,12 +190,14 @@ public class CqStatsUsingPoolDUnitTest extends JUnit4CacheTestCase {
fail("Failed to get CQ Service Stats");
}
- getCache().getLogger().info("#### CQ Service stats: " + " CQs created: "
- + cqServiceStats.numCqsCreated() + " CQs active: " + cqServiceStats.numCqsActive()
- + " CQs stopped: " + cqServiceStats.numCqsStopped() + " CQs closed: "
- + cqServiceStats.numCqsClosed() + " CQs on Client: " + cqServiceStats.numCqsOnClient()
- + " CQs on region /root/regionA : " + cqServiceVsdStats.numCqsOnRegion("/root/regionA")
- + " Clients with CQs: " + cqServiceVsdStats.getNumClientsWithCqs());
+ getCache().getLogger()
+ .info("#### CQ Service stats: " + " CQs created: " + cqServiceStats.numCqsCreated()
+ + " CQs active: " + cqServiceStats.numCqsActive() + " CQs stopped: "
+ + cqServiceStats.numCqsStopped() + " CQs closed: " + cqServiceStats.numCqsClosed()
+ + " CQs on Client: " + cqServiceStats.numCqsOnClient()
+ + " CQs on region /root/regionA : "
+ + cqServiceVsdStats.numCqsOnRegion(GemFireCacheImpl.getInstance(), "/root/regionA")
+ + " Clients with CQs: " + cqServiceVsdStats.getNumClientsWithCqs());
// Check for created count.
@@ -231,7 +230,7 @@ public class CqStatsUsingPoolDUnitTest extends JUnit4CacheTestCase {
// Check for CQs on region.
if (cqsOnRegion != CqQueryUsingPoolDUnitTest.noTest) {
assertEquals("Number of CQs on region /root/regionA mismatch", cqsOnRegion,
- cqServiceVsdStats.numCqsOnRegion("/root/regionA"));
+ cqServiceVsdStats.numCqsOnRegion(GemFireCacheImpl.getInstance(), "/root/regionA"));
}
// Check for clients with CQs count.
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
index 66c4c0a..5dd0d24 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
@@ -15,10 +15,8 @@
package org.apache.geode.cache.lucene.internal.distributed;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.logging.log4j.Logger;
@@ -27,7 +25,7 @@ import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.cache.lucene.LuceneQuery;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
/**
@@ -44,16 +42,15 @@ import org.apache.geode.internal.logging.LogService;
*/
public class TopEntriesFunctionCollector
implements ResultCollector<TopEntriesCollector, TopEntries> {
- // Use this instance to perform reduce operation
- final CollectorManager<TopEntriesCollector> manager;
+ private static final Logger logger = LogService.getLogger();
- final String id;
+ // Use this instance to perform reduce operation
+ private final CollectorManager<TopEntriesCollector> manager;
- // Instance of gemfire cache to check status and other utility methods
- final private GemFireCacheImpl cache;
- private static final Logger logger = LogService.getLogger();
+ private final String id;
private final Collection<TopEntriesCollector> subResults = new ArrayList<>();
+
private TopEntriesCollector mergedResults;
public TopEntriesFunctionCollector() {
@@ -65,8 +62,7 @@ public class TopEntriesFunctionCollector
}
public TopEntriesFunctionCollector(LuceneFunctionContext<TopEntriesCollector> context,
- GemFireCacheImpl cache) {
- this.cache = cache;
+ InternalCache cache) {
id = cache == null ? String.valueOf(this.hashCode()) : cache.getName();
int limit = context == null ? 0 : context.getLimit();
@@ -115,4 +111,8 @@ public class TopEntriesFunctionCollector
subResults.add(resultOfSingleExecution);
}
}
+
+ String id() {
+ return this.id;
+ }
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java
index 5313ced..6690850 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.cache.lucene.internal.distributed;
import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.DEFAULT_FIELD;
@@ -41,6 +40,7 @@ import org.apache.geode.cache.lucene.internal.StringQueryProvider;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.internal.repository.IndexResultCollector;
import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
+import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.InternalFunctionInvocationTargetException;
import org.apache.geode.internal.cache.execute.InternalRegionFunctionContext;
@@ -58,30 +58,30 @@ import org.mockito.Mockito;
@Category(UnitTest.class)
public class LuceneQueryFunctionJUnitTest {
- String regionPath = "/region";
- String indexName = "index";
- final EntryScore<String> r1_1 = new EntryScore<String>("key-1-1", .5f);
- final EntryScore<String> r1_2 = new EntryScore<String>("key-1-2", .4f);
- final EntryScore<String> r1_3 = new EntryScore<String>("key-1-3", .3f);
- final EntryScore<String> r2_1 = new EntryScore<String>("key-2-1", .45f);
- final EntryScore<String> r2_2 = new EntryScore<String>("key-2-2", .35f);
-
- InternalRegionFunctionContext mockContext;
- ResultSender<TopEntriesCollector> mockResultSender;
- Region<Object, Object> mockRegion;
-
- RepositoryManager mockRepoManager;
- IndexRepository mockRepository1;
- IndexRepository mockRepository2;
- IndexResultCollector mockCollector;
- InternalLuceneService mockService;
- LuceneIndexImpl mockIndex;
- LuceneIndexStats mockStats;
-
- ArrayList<IndexRepository> repos;
- LuceneFunctionContext<IndexResultCollector> searchArgs;
- LuceneQueryProvider queryProvider;
- Query query;
+ private String regionPath = "/region";
+
+ private final EntryScore<String> r1_1 = new EntryScore<>("key-1-1", .5f);
+ private final EntryScore<String> r1_2 = new EntryScore<>("key-1-2", .4f);
+ private final EntryScore<String> r1_3 = new EntryScore<>("key-1-3", .3f);
+ private final EntryScore<String> r2_1 = new EntryScore<>("key-2-1", .45f);
+ private final EntryScore<String> r2_2 = new EntryScore<>("key-2-2", .35f);
+
+ private InternalRegionFunctionContext mockContext;
+ private ResultSender<TopEntriesCollector> mockResultSender;
+ private Region<Object, Object> mockRegion;
+
+ private RepositoryManager mockRepoManager;
+ private IndexRepository mockRepository1;
+ private IndexRepository mockRepository2;
+ private IndexResultCollector mockCollector;
+ private InternalLuceneService mockService;
+ private LuceneIndexImpl mockIndex;
+ private LuceneIndexStats mockStats;
+
+ private ArrayList<IndexRepository> repos;
+ private LuceneFunctionContext<IndexResultCollector> searchArgs;
+ private LuceneQueryProvider queryProvider;
+ private Query query;
private InternalCache mockCache;
@@ -120,7 +120,7 @@ public class LuceneQueryFunctionJUnitTest {
List<EntryScore> hits = result.getEntries().getHits();
assertEquals(5, hits.size());
- TopEntriesJUnitTest.verifyResultOrder(result.getEntries().getHits(), r1_1, r2_1, r1_2, r2_2,
+ LuceneTestUtilities.verifyResultOrder(result.getEntries().getHits(), r1_1, r2_1, r1_2, r2_2,
r1_3);
}
@@ -161,7 +161,7 @@ public class LuceneQueryFunctionJUnitTest {
List<EntryScore> hits = result.getEntries().getHits();
assertEquals(3, hits.size());
- TopEntriesJUnitTest.verifyResultOrder(result.getEntries().getHits(), r1_1, r2_1, r1_2);
+ LuceneTestUtilities.verifyResultOrder(result.getEntries().getHits(), r1_1, r2_1, r1_2);
}
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
index 3bfebdf..5767390 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
@@ -26,21 +26,22 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.CopyHelper;
import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.cache.lucene.internal.distributed.TopEntriesCollectorManager.ListScanner;
+import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class TopEntriesCollectorJUnitTest {
- private EntryScore<String> r1_1 = new EntryScore<String>("1-1", .9f);
- private EntryScore<String> r1_2 = new EntryScore<String>("1-2", .7f);
- private EntryScore<String> r1_3 = new EntryScore<String>("1-3", .5f);
+ private EntryScore<String> r1_1 = new EntryScore<>("1-1", .9f);
+ private EntryScore<String> r1_2 = new EntryScore<>("1-2", .7f);
+ private EntryScore<String> r1_3 = new EntryScore<>("1-3", .5f);
- private EntryScore<String> r2_1 = new EntryScore<String>("2-1", .85f);
- private EntryScore<String> r2_2 = new EntryScore<String>("2-2", .65f);
+ private EntryScore<String> r2_1 = new EntryScore<>("2-1", .85f);
+ private EntryScore<String> r2_2 = new EntryScore<>("2-2", .65f);
- private EntryScore<String> r3_1 = new EntryScore<String>("3-1", .8f);
- private EntryScore<String> r3_2 = new EntryScore<String>("3-2", .6f);
- private EntryScore<String> r3_3 = new EntryScore<String>("3-3", .4f);
+ private EntryScore<String> r3_1 = new EntryScore<>("3-1", .8f);
+ private EntryScore<String> r3_2 = new EntryScore<>("3-2", .6f);
+ private EntryScore<String> r3_3 = new EntryScore<>("3-3", .4f);
private TopEntriesCollectorManager manager;
@@ -72,7 +73,7 @@ public class TopEntriesCollectorJUnitTest {
TopEntriesCollector hits = manager.reduce(collectors);
assertEquals(8, hits.getEntries().getHits().size());
- TopEntriesJUnitTest.verifyResultOrder(hits.getEntries().getHits(), r1_1, r2_1, r3_1, r1_2, r2_2,
+ LuceneTestUtilities.verifyResultOrder(hits.getEntries().getHits(), r1_1, r2_1, r3_1, r1_2, r2_2,
r3_2, r1_3, r3_3);
// input collector should not change
@@ -116,7 +117,7 @@ public class TopEntriesCollectorJUnitTest {
c1.collect(r1_3.getKey(), r1_3.getScore());
assertEquals(3, c1.getEntries().getHits().size());
- TopEntriesJUnitTest.verifyResultOrder(c1.getEntries().getHits(), r1_1, r1_2, r1_3);
+ LuceneTestUtilities.verifyResultOrder(c1.getEntries().getHits(), r1_1, r1_2, r1_3);
ListScanner scanner = new ListScanner(c1.getEntries().getHits());
assertTrue(scanner.hasNext());
@@ -131,6 +132,6 @@ public class TopEntriesCollectorJUnitTest {
assertFalse(scanner.hasNext());
assertEquals(3, c1.getEntries().getHits().size());
- TopEntriesJUnitTest.verifyResultOrder(c1.getEntries().getHits(), r1_1, r1_2, r1_3);
+ LuceneTestUtilities.verifyResultOrder(c1.getEntries().getHits(), r1_1, r1_2, r1_3);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
index bf08877..5fd9e2d 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.cache.lucene.internal.distributed;
import static org.junit.Assert.*;
@@ -20,9 +19,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Mockito.*;
import java.util.Collection;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
import org.junit.Assert;
import org.junit.Before;
@@ -31,25 +28,26 @@ import org.junit.experimental.categories.Category;
import org.mockito.ArgumentMatcher;
import org.mockito.Mockito;
-import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.execute.FunctionException;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class TopEntriesFunctionCollectorJUnitTest {
- EntryScore<String> r1_1;
- EntryScore<String> r1_2;
- EntryScore<String> r2_1;
- EntryScore<String> r2_2;
- TopEntriesCollector result1, result2;
+
+ private EntryScore<String> r1_1;
+ private EntryScore<String> r1_2;
+ private EntryScore<String> r2_1;
+ private EntryScore<String> r2_2;
+ private TopEntriesCollector result1;
+ private TopEntriesCollector result2;
@Before
public void initializeCommonObjects() {
- r1_1 = new EntryScore<String>("3", .9f);
- r1_2 = new EntryScore<String>("1", .8f);
- r2_1 = new EntryScore<String>("2", 0.85f);
- r2_2 = new EntryScore<String>("4", 0.1f);
+ r1_1 = new EntryScore<>("3", .9f);
+ r1_2 = new EntryScore<>("1", .8f);
+ r2_1 = new EntryScore<>("2", 0.85f);
+ r2_2 = new EntryScore<>("4", 0.1f);
result1 = new TopEntriesCollector(null);
result1.collect(r1_1);
@@ -73,13 +71,9 @@ public class TopEntriesFunctionCollectorJUnitTest {
collector.addResult(null, result1);
collector.addResult(null, result2);
- final CountDownLatch insideThread = new CountDownLatch(1);
- final CountDownLatch resultReceived = new CountDownLatch(1);
-
- final AtomicReference<TopEntries> result = new AtomicReference<>();
TopEntries merged = collector.getResult(1, TimeUnit.SECONDS);
assertEquals(4, merged.size());
- TopEntriesJUnitTest.verifyResultOrder(merged.getHits(), r1_1, r2_1, r1_2, r2_2);
+ LuceneTestUtilities.verifyResultOrder(merged.getHits(), r1_1, r2_1, r1_2, r2_2);
}
@Test
@@ -95,7 +89,7 @@ public class TopEntriesFunctionCollectorJUnitTest {
TopEntries merged = collector.getResult();
Assert.assertNotNull(merged);
assertEquals(3, merged.size());
- TopEntriesJUnitTest.verifyResultOrder(merged.getHits(), r1_1, r2_1, r1_2);
+ LuceneTestUtilities.verifyResultOrder(merged.getHits(), r1_1, r2_1, r1_2);
}
@Test
@@ -108,7 +102,7 @@ public class TopEntriesFunctionCollectorJUnitTest {
TopEntries merged = collector.getResult();
Assert.assertNotNull(merged);
assertEquals(4, merged.size());
- TopEntriesJUnitTest.verifyResultOrder(merged.getHits(), r1_1, r2_1, r1_2, r2_2);
+ LuceneTestUtilities.verifyResultOrder(merged.getHits(), r1_1, r2_1, r1_2, r2_2);
}
@Test
@@ -121,12 +115,12 @@ public class TopEntriesFunctionCollectorJUnitTest {
TopEntries merged = collector.getResult();
Assert.assertNotNull(merged);
assertEquals(4, merged.size());
- TopEntriesJUnitTest.verifyResultOrder(merged.getHits(), r1_1, r2_1, r1_2, r2_2);
+ LuceneTestUtilities.verifyResultOrder(merged.getHits(), r1_1, r2_1, r1_2, r2_2);
merged = collector.getResult();
Assert.assertNotNull(merged);
assertEquals(4, merged.size());
- TopEntriesJUnitTest.verifyResultOrder(merged.getHits(), r1_1, r2_1, r1_2, r2_2);
+ LuceneTestUtilities.verifyResultOrder(merged.getHits(), r1_1, r2_1, r1_2, r2_2);
}
@Test
@@ -167,7 +161,7 @@ public class TopEntriesFunctionCollectorJUnitTest {
TopEntries merged = collector.getResult();
Assert.assertNotNull(merged);
assertEquals(2, merged.size());
- TopEntriesJUnitTest.verifyResultOrder(merged.getHits(), r2_1, r2_2);
+ LuceneTestUtilities.verifyResultOrder(merged.getHits(), r2_1, r2_2);
}
@Test(expected = RuntimeException.class)
@@ -184,10 +178,10 @@ public class TopEntriesFunctionCollectorJUnitTest {
@Test
public void testCollectorName() {
- GemFireCacheImpl mockCache = mock(GemFireCacheImpl.class);
+ InternalCache mockCache = mock(InternalCache.class);
Mockito.doReturn("server").when(mockCache).getName();
TopEntriesFunctionCollector function = new TopEntriesFunctionCollector(null, mockCache);
- assertEquals("server", function.id);
+ assertEquals("server", function.id());
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
index fcfebbc..e21ac7f 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
@@ -16,9 +16,6 @@ package org.apache.geode.cache.lucene.internal.distributed;
import static org.junit.Assert.*;
-import java.util.Collection;
-import java.util.Iterator;
-
import org.jmock.Mockery;
import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
@@ -30,6 +27,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.CopyHelper;
import org.apache.geode.cache.lucene.LuceneQueryFactory;
import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
+import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
@@ -44,34 +42,34 @@ public class TopEntriesJUnitTest {
@Test
public void testPopulateTopEntries() {
- TopEntries<String> hits = new TopEntries<String>();
+ TopEntries<String> hits = new TopEntries<>();
hits.addHit(r1_1);
hits.addHit(r2_1);
hits.addHit(r1_2);
hits.addHit(r2_2);
assertEquals(4, hits.size());
- verifyResultOrder(hits.getHits(), r1_1, r2_1, r1_2, r2_2);
+ LuceneTestUtilities.verifyResultOrder(hits.getHits(), r1_1, r2_1, r1_2, r2_2);
}
@Test
public void putSameScoreEntries() {
- TopEntries<String> hits = new TopEntries<String>();
- EntryScore<String> r1 = new EntryScore<String>("1", .8f);
- EntryScore<String> r2 = new EntryScore<String>("2", .8f);
+ TopEntries<String> hits = new TopEntries<>();
+ EntryScore<String> r1 = new EntryScore<>("1", .8f);
+ EntryScore<String> r2 = new EntryScore<>("2", .8f);
hits.addHit(r1);
hits.addHit(r2);
assertEquals(2, hits.size());
- verifyResultOrder(hits.getHits(), r1, r2);
+ LuceneTestUtilities.verifyResultOrder(hits.getHits(), r1, r2);
}
@Test
public void testInitialization() {
- TopEntries<String> hits = new TopEntries<String>();
+ TopEntries<String> hits = new TopEntries<>();
assertEquals(LuceneQueryFactory.DEFAULT_LIMIT, hits.getLimit());
- hits = new TopEntries<String>(123);
+ hits = new TopEntries<>(123);
assertEquals(123, hits.getLimit());
}
@@ -82,47 +80,33 @@ public class TopEntriesJUnitTest {
@Test
public void enforceLimit() throws Exception {
- TopEntries<String> hits = new TopEntries<String>(3);
+ TopEntries<String> hits = new TopEntries<>(3);
hits.addHit(r1_1);
hits.addHit(r2_1);
hits.addHit(r1_2);
hits.addHit(r2_2);
assertEquals(3, hits.size());
- verifyResultOrder(hits.getHits(), r1_1, r2_1, r1_2);
+ LuceneTestUtilities.verifyResultOrder(hits.getHits(), r1_1, r2_1, r1_2);
}
@Test
public void testSerialization() {
LuceneServiceImpl.registerDataSerializables();
- TopEntries<String> hits = new TopEntries<String>(3);
+ TopEntries<String> hits = new TopEntries<>(3);
TopEntries<String> copy = CopyHelper.deepCopy(hits);
assertEquals(3, copy.getLimit());
assertEquals(0, copy.getHits().size());
- hits = new TopEntries<String>(3);
+ hits = new TopEntries<>(3);
hits.addHit(r1_1);
hits.addHit(r2_1);
hits.addHit(r1_2);
copy = CopyHelper.deepCopy(hits);
assertEquals(3, copy.size());
- verifyResultOrder(copy.getHits(), r1_1, r2_1, r1_2);
- }
-
- // TODO: extract to lucene test util class
- public static void verifyResultOrder(Collection<EntryScore<String>> list,
- EntryScore<String>... expectedEntries) {
- Iterator<EntryScore<String>> iter = list.iterator();
- for (EntryScore expectedEntry : expectedEntries) {
- if (!iter.hasNext()) {
- fail();
- }
- EntryScore toVerify = iter.next();
- assertEquals(expectedEntry.getKey(), toVerify.getKey());
- assertEquals(expectedEntry.getScore(), toVerify.getScore(), .0f);
- }
+ LuceneTestUtilities.verifyResultOrder(copy.getHits(), r1_1, r2_1, r1_2);
}
@Before
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
index 5563112..17f4dea 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
@@ -18,8 +18,10 @@ import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
@@ -44,6 +46,7 @@ import org.apache.geode.cache.lucene.LuceneService;
import org.apache.geode.cache.lucene.LuceneServiceProvider;
import org.apache.geode.cache.lucene.internal.LuceneIndexForPartitionedRegion;
import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
+import org.apache.geode.cache.lucene.internal.distributed.EntryScore;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.test.dunit.VM;
@@ -82,6 +85,19 @@ public class LuceneTestUtilities {
public static String Quarter3 = "Q3";
public static String Quarter4 = "Q4";
+ public static void verifyResultOrder(Collection<EntryScore<String>> list,
+ EntryScore<String>... expectedEntries) {
+ Iterator<EntryScore<String>> iter = list.iterator();
+ for (EntryScore expectedEntry : expectedEntries) {
+ if (!iter.hasNext()) {
+ fail();
+ }
+ EntryScore toVerify = iter.next();
+ assertEquals(expectedEntry.getKey(), toVerify.getKey());
+ assertEquals(expectedEntry.getScore(), toVerify.getScore(), .0f);
+ }
+ }
+
public static class IntRangeQueryProvider implements LuceneQueryProvider {
String fieldName;
int lowerValue;
[8/8] geode git commit: 2632: refactor code to use InternalCache
instead of GemFireCacheImpl
Posted by kl...@apache.org.
2632: refactor code to use InternalCache instead of GemFireCacheImpl
* minor cleanup also
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/bbb3b153
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/bbb3b153
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/bbb3b153
Branch: refs/heads/feature/GEODE-2632-5
Commit: bbb3b153f5ec841ac496fdaf33bae118035665cc
Parents: 5891ed7
Author: Kirk Lund <kl...@apache.org>
Authored: Wed Apr 19 14:41:42 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Thu Apr 20 14:23:07 2017 -0700
----------------------------------------------------------------------
.../query/internal/cq/CqServiceProvider.java | 22 +-
.../query/internal/cq/spi/CqServiceFactory.java | 8 +-
.../cache/query/internal/cq/ClientCQImpl.java | 95 +--
.../cache/query/internal/cq/CqQueryImpl.java | 91 ++-
.../query/internal/cq/CqServiceFactoryImpl.java | 17 +-
.../cache/query/internal/cq/CqServiceImpl.java | 673 ++++---------------
.../internal/cq/CqServiceStatisticsImpl.java | 21 +-
.../query/internal/cq/CqServiceVsdStats.java | 73 +-
.../cache/query/internal/cq/ServerCQImpl.java | 121 +---
.../cache/tier/sockets/command/ExecuteCQ.java | 4 +-
.../cache/tier/sockets/command/ExecuteCQ61.java | 4 +-
.../tier/sockets/command/GetDurableCQs.java | 4 +-
.../cache/query/cq/dunit/CqStatsDUnitTest.java | 44 +-
.../cq/dunit/CqStatsUsingPoolDUnitTest.java | 47 +-
.../TopEntriesFunctionCollector.java | 22 +-
.../LuceneQueryFunctionJUnitTest.java | 54 +-
.../TopEntriesCollectorJUnitTest.java | 23 +-
.../TopEntriesFunctionCollectorJUnitTest.java | 48 +-
.../distributed/TopEntriesJUnitTest.java | 44 +-
.../cache/lucene/test/LuceneTestUtilities.java | 16 +
20 files changed, 442 insertions(+), 989 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceProvider.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceProvider.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceProvider.java
index cded9c3..90fbf4b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceProvider.java
@@ -16,7 +16,7 @@ package org.apache.geode.cache.query.internal.cq;
import org.apache.geode.cache.query.internal.cq.spi.CqServiceFactory;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import java.io.DataInput;
import java.io.IOException;
@@ -26,17 +26,19 @@ import java.util.ServiceLoader;
public class CqServiceProvider {
private static final CqServiceFactory factory;
- // System property to maintain the CQ event references for optimizing the updates.
- // This will allows to run the CQ query only once during update events.
+
+ /**
+ * System property to maintain the CQ event references for optimizing the updates. This will allow
+ * running the CQ query only once during update events.
+ */
public static boolean MAINTAIN_KEYS = Boolean
- .valueOf(System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "cq.MAINTAIN_KEYS", "true"))
- .booleanValue();
+ .valueOf(System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "cq.MAINTAIN_KEYS", "true"));
+
/**
* A debug flag used for testing vMotion during CQ registration
*/
public static boolean VMOTION_DURING_CQ_REGISTRATION_FLAG = false;
-
static {
ServiceLoader<CqServiceFactory> loader = ServiceLoader.load(CqServiceFactory.class);
Iterator<CqServiceFactory> itr = loader.iterator();
@@ -48,8 +50,7 @@ public class CqServiceProvider {
}
}
- public static CqService create(GemFireCacheImpl cache) {
-
+ public static CqService create(InternalCache cache) {
if (factory == null) {
return new MissingCqService();
}
@@ -63,10 +64,7 @@ public class CqServiceProvider {
} else {
return factory.readCqQuery(in);
}
-
}
- private CqServiceProvider() {
-
- }
+ private CqServiceProvider() {}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/spi/CqServiceFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/spi/CqServiceFactory.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/spi/CqServiceFactory.java
index 68ebbd5..2b8a47e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/spi/CqServiceFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/spi/CqServiceFactory.java
@@ -19,16 +19,16 @@ import java.io.IOException;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.ServerCQ;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
public interface CqServiceFactory {
- public void initialize();
+ void initialize();
/**
* Create a new CqService for the given cache
*/
- public CqService create(GemFireCacheImpl cache);
+ CqService create(InternalCache cache);
- public ServerCQ readCqQuery(DataInput in) throws ClassNotFoundException, IOException;
+ ServerCQ readCqQuery(DataInput in) throws ClassNotFoundException, IOException;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java
index 00a0aa5..111bf84 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java
@@ -35,7 +35,7 @@ import org.apache.geode.cache.query.CqResults;
import org.apache.geode.cache.query.CqStatusListener;
import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.internal.CqStateImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
@@ -57,7 +57,7 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
*/
private volatile ConcurrentLinkedQueue<CqEventImpl> queuedEvents = null;
- public final Object queuedEventsSynchObject = new Object();
+ final Object queuedEventsSynchObject = new Object();
private boolean connected = false;
@@ -73,22 +73,15 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
return this.cqName;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqQuery2#getCQProxy()
- */
- public ServerCQProxyImpl getCQProxy() {
+ ServerCQProxyImpl getCQProxy() {
return this.cqProxy;
}
/**
* Initializes the connection using the pool from the client region. Also sets the cqBaseRegion
* value of this CQ.
- *
- * @throws CqException
*/
- public void initConnectionProxy() throws CqException, RegionNotFoundException {
+ private void initConnectionProxy() throws CqException, RegionNotFoundException {
cqBaseRegion = (LocalRegion) cqService.getCache().getRegion(regionName);
// Check if the region exists on the local cache.
// In the current implementation of 5.1 the Server Connection is (ConnectionProxyImpl)
@@ -113,17 +106,9 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
throw new CqException(
"Unable to get the connection pool. The Region does not have a pool configured.");
}
-
- // if (proxy == null) {
- // throw new
- // CqException(LocalizedStrings.CqQueryImpl_UNABLE_TO_GET_THE_CONNECTIONPROXY_THE_REGION_MAY_NOT_HAVE_A_BRIDGEWRITER_OR_BRIDGECLIENT_INSTALLED_ON_IT.toLocalizedString());
- // } else if(!proxy.getEstablishCallbackConnection()){
- // throw new
- // CqException(LocalizedStrings.CqQueryImpl_THE_ESTABLISHCALLBACKCONNECTION_ON_BRIDGEWRITER_CLIENT_INSTALLED_ON_REGION_0_IS_SET_TO_FALSE
- // .toLocalizedString(regionName));
- // }
}
+ @Override
public void close() throws CqClosedException, CqException {
this.close(true);
}
@@ -182,15 +167,15 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
if (cqProxy == null || !sendRequestToServer || isClosed) {
// Stat update.
if (stateBeforeClosing == CqStateImpl.RUNNING) {
- cqService.stats.decCqsActive();
+ cqService.stats().decCqsActive();
} else if (stateBeforeClosing == CqStateImpl.STOPPED) {
- cqService.stats.decCqsStopped();
+ cqService.stats().decCqsStopped();
}
// Set the state to close, and update stats
this.cqState.setState(CqStateImpl.CLOSED);
- cqService.stats.incCqsClosed();
- cqService.stats.decCqsOnClient();
+ cqService.stats().incCqsClosed();
+ cqService.stats().decCqsOnClient();
if (this.stats != null)
this.stats.close();
} else {
@@ -201,7 +186,7 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
if (exception != null) {
throw new CqException(
LocalizedStrings.CqQueryImpl_FAILED_TO_CLOSE_THE_CQ_CQNAME_0_ERROR_FROM_LAST_ENDPOINT_1
- .toLocalizedString(new Object[] {this.cqName, exception.getLocalizedMessage()}),
+ .toLocalizedString(this.cqName, exception.getLocalizedMessage()),
exception.getCause());
} else {
throw new CqException(
@@ -261,31 +246,28 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
/**
* Clears the resource used by CQ.
- *
- * @throws CqException
*/
+ @Override
protected void cleanup() throws CqException {
this.cqService.removeFromBaseRegionToCqNameMap(this.regionName, this.getServerCqName());
}
+ @Override
public CqAttributes getCqAttributes() {
return cqAttributes;
}
-
-
/**
* @return Returns the cqListeners.
*/
public CqListener[] getCqListeners() {
-
return cqAttributes.getCqListeners();
}
-
/**
* Start or resume executing the query.
*/
+ @Override
public void execute() throws CqClosedException, RegionNotFoundException, CqException {
executeCqOnRedundantsAndPrimary(false);
}
@@ -293,7 +275,8 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
/**
* Start or resume executing the query. Gets or updates the CQ results and returns them.
*/
- public CqResults executeWithInitialResults()
+ @Override
+ public <E> CqResults<E> executeWithInitialResults()
throws CqClosedException, RegionNotFoundException, CqException {
synchronized (queuedEventsSynchObject) {
@@ -320,16 +303,7 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
CqResults initialResults;
try {
initialResults = (CqResults) executeCqOnRedundantsAndPrimary(true);
- } catch (CqClosedException e) {
- queuedEvents = null;
- throw e;
- } catch (RegionNotFoundException e) {
- queuedEvents = null;
- throw e;
- } catch (CqException e) {
- queuedEvents = null;
- throw e;
- } catch (RuntimeException e) {
+ } catch (RegionNotFoundException | CqException | RuntimeException e) {
queuedEvents = null;
throw e;
}
@@ -343,6 +317,7 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
if (!this.queuedEvents.isEmpty()) {
try {
Runnable r = new Runnable() {
+ @Override
public void run() {
Object[] eventArray = null;
if (CqQueryImpl.testHook != null) {
@@ -395,7 +370,7 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
* @param executeWithInitialResults boolean
* @return Object SelectResults in case of executeWithInitialResults
*/
- public Object executeCqOnRedundantsAndPrimary(boolean executeWithInitialResults)
+ private Object executeCqOnRedundantsAndPrimary(boolean executeWithInitialResults)
throws CqClosedException, RegionNotFoundException, CqException {
Object initialResults = null;
@@ -461,8 +436,7 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
} else {
String errMsg =
LocalizedStrings.CqQueryImpl_FAILED_TO_EXECUTE_THE_CQ_CQNAME_0_QUERY_STRING_IS_1_ERROR_FROM_LAST_SERVER_2
- .toLocalizedString(
- new Object[] {this.cqName, this.queryString, ex.getLocalizedMessage()});
+ .toLocalizedString(this.cqName, this.queryString, ex.getLocalizedMessage());
if (logger.isDebugEnabled()) {
logger.debug(errMsg, ex);
}
@@ -498,8 +472,8 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
}
}
// Update CQ-base region for book keeping.
- this.cqService.stats.incCqsActive();
- this.cqService.stats.decCqsStopped();
+ this.cqService.stats().incCqsActive();
+ this.cqService.stats().decCqsStopped();
return initialResults;
}
@@ -509,23 +483,22 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
* @return true if shutdown in progress else false.
*/
private boolean shutdownInProgress() {
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = cqService.getInternalCache();
if (cache == null || cache.isClosed()) {
return true; // bail, things are shutting down
}
-
String reason = cqProxy.getPool().getCancelCriterion().cancelInProgress();
if (reason != null) {
return true;
}
return false;
-
}
/**
* Stop or pause executing the query.
*/
+ @Override
public void stop() throws CqClosedException, CqException {
boolean isStopped = false;
synchronized (this.cqState) {
@@ -558,8 +531,8 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
if (cqProxy == null || isStopped) {
// Change state and stats on the client side
this.cqState.setState(CqStateImpl.STOPPED);
- this.cqService.stats.incCqsStopped();
- this.cqService.stats.decCqsActive();
+ this.cqService.stats().incCqsStopped();
+ this.cqService.stats().decCqsActive();
if (logger.isDebugEnabled()) {
logger.debug("Successfully stopped the CQ. {}", cqName);
}
@@ -568,7 +541,7 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
if (exception != null) {
throw new CqException(
LocalizedStrings.CqQueryImpl_FAILED_TO_STOP_THE_CQ_CQNAME_0_ERROR_FROM_LAST_SERVER_1
- .toLocalizedString(new Object[] {this.cqName, exception.getLocalizedMessage()}),
+ .toLocalizedString(this.cqName, exception.getLocalizedMessage()),
exception.getCause());
} else {
throw new CqException(
@@ -579,24 +552,15 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
}
}
+ @Override
public CqAttributesMutator getCqAttributesMutator() {
return (CqAttributesMutator) this.cqAttributes;
}
-
- public ConcurrentLinkedQueue<CqEventImpl> getQueuedEvents() {
+ ConcurrentLinkedQueue<CqEventImpl> getQueuedEvents() {
return this.queuedEvents;
}
-
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.cache.query.internal.InternalCqQuery2#setProxyCache(org.apache.geode.cache.
- * client.internal.ProxyCache)
- */
@Override
public void setProxyCache(ProxyCache proxyCache) {
this.proxyCache = proxyCache;
@@ -612,7 +576,6 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
@Override
public void createOn(Connection conn, boolean isDurable) {
-
byte regionDataPolicyOrdinal = getCqBaseRegion() == null ? (byte) 0
: getCqBaseRegion().getAttributes().getDataPolicy().ordinal;
@@ -620,6 +583,4 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
this.cqProxy.createOn(getName(), conn, getQueryString(), state, isDurable,
regionDataPolicyOrdinal);
}
-
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
index 22b4137..07e3171 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
@@ -21,11 +21,9 @@ import java.util.Set;
import org.apache.logging.log4j.Logger;
import org.apache.geode.StatisticsFactory;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.query.CqClosedException;
import org.apache.geode.cache.query.CqEvent;
import org.apache.geode.cache.query.CqException;
-import org.apache.geode.cache.query.CqExistsException;
import org.apache.geode.cache.query.CqState;
import org.apache.geode.cache.query.CqStatistics;
import org.apache.geode.cache.query.Query;
@@ -38,7 +36,7 @@ import org.apache.geode.cache.query.internal.CqStateImpl;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.ExecutionContext;
import org.apache.geode.cache.query.internal.QueryExecutionContext;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.InternalLogWriter;
@@ -58,13 +56,13 @@ public abstract class CqQueryImpl implements InternalCqQuery {
protected String queryString;
- protected static final Object TOKEN = new Object();
+ static final Object TOKEN = new Object();
- protected LocalRegion cqBaseRegion;
+ LocalRegion cqBaseRegion;
protected Query query = null;
- protected InternalLogWriter securityLogWriter;
+ InternalLogWriter securityLogWriter;
protected CqServiceImpl cqService;
@@ -72,14 +70,14 @@ public abstract class CqQueryImpl implements InternalCqQuery {
protected boolean isDurable = false;
- // Stats counters
- protected CqStatisticsImpl cqStats;
+ /** Stats counters */
+ private CqStatisticsImpl cqStats;
protected CqQueryVsdStats stats;
protected final CqStateImpl cqState = new CqStateImpl();
- protected ExecutionContext queryExecutionContext = null;
+ private ExecutionContext queryExecutionContext = null;
public static TestHook testHook = null;
@@ -100,6 +98,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* returns CQ name
*/
+ @Override
public String getName() {
return this.cqName;
}
@@ -109,6 +108,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
this.cqName = cqName;
}
+ @Override
public void setCqService(CqService cqService) {
this.cqService = (CqServiceImpl) cqService;
}
@@ -121,25 +121,24 @@ public abstract class CqQueryImpl implements InternalCqQuery {
return this.regionName;
}
- public void updateCqCreateStats() {
+ void updateCqCreateStats() {
// Initialize the VSD statistics
StatisticsFactory factory = cqService.getCache().getDistributedSystem();
this.stats = new CqQueryVsdStats(factory, getServerCqName());
this.cqStats = new CqStatisticsImpl(this);
// Update statistics with CQ creation.
- this.cqService.stats.incCqsStopped();
- this.cqService.stats.incCqsCreated();
- this.cqService.stats.incCqsOnClient();
+ this.cqService.stats().incCqsStopped();
+ this.cqService.stats().incCqsCreated();
+ this.cqService.stats().incCqsOnClient();
}
/**
* Validates the CQ. Checks for cq constraints. Also sets the base region name.
*/
- public void validateCq() {
- Cache cache = cqService.getCache();
- DefaultQuery locQuery =
- (DefaultQuery) ((GemFireCacheImpl) cache).getLocalQueryService().newQuery(this.queryString);
+ void validateCq() {
+ InternalCache cache = cqService.getInternalCache();
+ DefaultQuery locQuery = (DefaultQuery) cache.getLocalQueryService().newQuery(this.queryString);
this.query = locQuery;
// assert locQuery != null;
@@ -221,10 +220,8 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* Removes the CQ from CQ repository.
- *
- * @throws CqException
*/
- protected void removeFromCqMap() throws CqException {
+ void removeFromCqMap() throws CqException {
try {
cqService.removeCq(this.getServerCqName());
} catch (Exception ex) {
@@ -243,6 +240,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* Returns the QueryString of this CQ.
*/
+ @Override
public String getQueryString() {
return queryString;
}
@@ -252,23 +250,16 @@ public abstract class CqQueryImpl implements InternalCqQuery {
*
* @return the Query for the query string
*/
+ @Override
public Query getQuery() {
return query;
}
-
- /**
- * @see org.apache.geode.cache.query.CqQuery#getStatistics()
- */
+ @Override
public CqStatistics getStatistics() {
return cqStats;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqQuery2#getCqBaseRegion()
- */
@Override
public LocalRegion getCqBaseRegion() {
return this.cqBaseRegion;
@@ -279,11 +270,12 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* @return Returns the Region name on which this cq is created.
*/
- public String getBaseRegionName() {
+ String getBaseRegionName() {
return this.regionName;
}
+ @Override
public abstract String getServerCqName();
/**
@@ -291,15 +283,11 @@ public abstract class CqQueryImpl implements InternalCqQuery {
*
* @return STOPPED RUNNING or CLOSED
*/
+ @Override
public CqState getState() {
return this.cqState;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqQuery2#setCqState(int)
- */
@Override
public void setCqState(int state) {
if (this.isClosed()) {
@@ -309,18 +297,13 @@ public abstract class CqQueryImpl implements InternalCqQuery {
synchronized (cqState) {
if (state == CqStateImpl.RUNNING) {
- if (this.isRunning()) {
- // throw new
- // IllegalStateException(LocalizedStrings.CqQueryImpl_CQ_IS_NOT_IN_RUNNING_STATE_STOP_CQ_DOES_NOT_APPLY_CQNAME_0
- // .toLocalizedString(this.cqName));
- }
this.cqState.setState(CqStateImpl.RUNNING);
- this.cqService.stats.incCqsActive();
- this.cqService.stats.decCqsStopped();
+ this.cqService.stats().incCqsActive();
+ this.cqService.stats().decCqsStopped();
} else if (state == CqStateImpl.STOPPED) {
this.cqState.setState(CqStateImpl.STOPPED);
- this.cqService.stats.incCqsStopped();
- this.cqService.stats.decCqsActive();
+ this.cqService.stats().incCqsStopped();
+ this.cqService.stats().decCqsActive();
} else if (state == CqStateImpl.CLOSING) {
this.cqState.setState(state);
}
@@ -332,7 +315,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
*
* @param cqEvent object
*/
- public void updateStats(CqEvent cqEvent) {
+ void updateStats(CqEvent cqEvent) {
this.stats.updateStats(cqEvent); // Stats for VSD
}
@@ -341,15 +324,17 @@ public abstract class CqQueryImpl implements InternalCqQuery {
*
* @return true if running, false otherwise
*/
+ @Override
public boolean isRunning() {
return this.cqState.isRunning();
}
/**
- * Return true if the CQ is in Sstopped state
+ * Return true if the CQ is in stopped state
*
* @return true if stopped, false otherwise
*/
+ @Override
public boolean isStopped() {
return this.cqState.isStopped();
}
@@ -359,6 +344,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
*
* @return true if closed, false otherwise
*/
+ @Override
public boolean isClosed() {
return this.cqState.isClosed();
}
@@ -377,6 +363,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
*
* @return true if durable, false otherwise
*/
+ @Override
public boolean isDurable() {
return this.isDurable;
}
@@ -391,22 +378,22 @@ public abstract class CqQueryImpl implements InternalCqQuery {
return stats;
}
- public ExecutionContext getQueryExecutionContext() {
+ ExecutionContext getQueryExecutionContext() {
return queryExecutionContext;
}
- public void setQueryExecutionContext(ExecutionContext queryExecutionContext) {
+ private void setQueryExecutionContext(ExecutionContext queryExecutionContext) {
this.queryExecutionContext = queryExecutionContext;
}
/** Test Hook */
public interface TestHook {
- public void pauseUntilReady();
+ void pauseUntilReady();
- public void ready();
+ void ready();
- public int numQueuedEvents();
+ int numQueuedEvents();
- public void setEventCount(int count);
+ void setEventCount(int count);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceFactoryImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceFactoryImpl.java
index db90632..9cc2eea 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceFactoryImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceFactoryImpl.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.geode.cache.query.internal.cq.spi.CqServiceFactory;
import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.CommandInitializer;
@@ -36,14 +36,13 @@ import org.apache.geode.internal.cache.tier.sockets.command.StopCQ;
public class CqServiceFactoryImpl implements CqServiceFactory {
+ @Override
public void initialize() {
- {
- Map<Version, Command> versions = new HashMap<Version, Command>();
- versions.put(Version.GFE_57, ExecuteCQ.getCommand());
- versions.put(Version.GFE_61, ExecuteCQ61.getCommand());
- CommandInitializer.registerCommand(MessageType.EXECUTECQ_MSG_TYPE, versions);
- CommandInitializer.registerCommand(MessageType.EXECUTECQ_WITH_IR_MSG_TYPE, versions);
- }
+ Map<Version, Command> versions = new HashMap<>();
+ versions.put(Version.GFE_57, ExecuteCQ.getCommand());
+ versions.put(Version.GFE_61, ExecuteCQ61.getCommand());
+ CommandInitializer.registerCommand(MessageType.EXECUTECQ_MSG_TYPE, versions);
+ CommandInitializer.registerCommand(MessageType.EXECUTECQ_WITH_IR_MSG_TYPE, versions);
CommandInitializer.registerCommand(MessageType.GETCQSTATS_MSG_TYPE,
Collections.singletonMap(Version.GFE_57, GetCQStats.getCommand()));
@@ -58,7 +57,7 @@ public class CqServiceFactoryImpl implements CqServiceFactory {
}
@Override
- public CqService create(GemFireCacheImpl cache) {
+ public CqService create(InternalCache cache) {
return new CqServiceImpl(cache);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
index f1ca832..570c06c 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
@@ -14,19 +14,63 @@
*/
package org.apache.geode.cache.query.internal.cq;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.InvalidDeltaException;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheEvent;
+import org.apache.geode.cache.CacheLoaderException;
+import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.TimeoutException;
import org.apache.geode.cache.client.Pool;
-import org.apache.geode.cache.client.internal.*;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.internal.*;
+import org.apache.geode.cache.client.internal.GetEventValueOp;
+import org.apache.geode.cache.client.internal.InternalPool;
+import org.apache.geode.cache.client.internal.QueueManager;
+import org.apache.geode.cache.client.internal.ServerCQProxyImpl;
+import org.apache.geode.cache.client.internal.UserAttributes;
+import org.apache.geode.cache.query.CqAttributes;
+import org.apache.geode.cache.query.CqClosedException;
+import org.apache.geode.cache.query.CqException;
+import org.apache.geode.cache.query.CqExistsException;
+import org.apache.geode.cache.query.CqListener;
+import org.apache.geode.cache.query.CqQuery;
+import org.apache.geode.cache.query.CqServiceStatistics;
+import org.apache.geode.cache.query.CqStatusListener;
+import org.apache.geode.cache.query.QueryException;
+import org.apache.geode.cache.query.QueryInvalidException;
+import org.apache.geode.cache.query.RegionNotFoundException;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.internal.CompiledSelect;
+import org.apache.geode.cache.query.internal.CqQueryVsdStats;
+import org.apache.geode.cache.query.internal.CqStateImpl;
+import org.apache.geode.cache.query.internal.DefaultQuery;
+import org.apache.geode.cache.query.internal.ExecutionContext;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.cache.CacheDistributionAdvisor.CacheProfile;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.FilterProfile;
+import org.apache.geode.internal.cache.FilterRoutingInfo;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
@@ -35,57 +79,43 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
/**
- * @since GemFire 5.5
- *
- * Implements the CqService functionality.
- *
- */
-/**
+ * Implements the CqService functionality.
*
+ * @since GemFire 5.5
*/
public final class CqServiceImpl implements CqService {
private static final Logger logger = LogService.getLogger();
- private static final Integer MESSAGE_TYPE_LOCAL_CREATE =
- Integer.valueOf(MessageType.LOCAL_CREATE);
- private static final Integer MESSAGE_TYPE_LOCAL_UPDATE =
- Integer.valueOf(MessageType.LOCAL_UPDATE);
- private static final Integer MESSAGE_TYPE_LOCAL_DESTROY =
- Integer.valueOf(MessageType.LOCAL_DESTROY);
- private static final Integer MESSAGE_TYPE_EXCEPTION = Integer.valueOf(MessageType.EXCEPTION);
+ private static final Integer MESSAGE_TYPE_LOCAL_CREATE = MessageType.LOCAL_CREATE;
+ private static final Integer MESSAGE_TYPE_LOCAL_UPDATE = MessageType.LOCAL_UPDATE;
+ private static final Integer MESSAGE_TYPE_LOCAL_DESTROY = MessageType.LOCAL_DESTROY;
+ private static final Integer MESSAGE_TYPE_EXCEPTION = MessageType.EXCEPTION;
/**
* System property to evaluate the query even though the initial results are not required when cq
* is executed using the execute() method.
*/
- public static boolean EXECUTE_QUERY_DURING_INIT = Boolean
- .valueOf(System
- .getProperty(DistributionConfig.GEMFIRE_PREFIX + "cq.EXECUTE_QUERY_DURING_INIT", "true"))
- .booleanValue();
+ public static boolean EXECUTE_QUERY_DURING_INIT = Boolean.valueOf(System
+ .getProperty(DistributionConfig.GEMFIRE_PREFIX + "cq.EXECUTE_QUERY_DURING_INIT", "true"));
private static final String CQ_NAME_PREFIX = "GfCq";
- private final Cache cache;
+ private final InternalCache cache;
/**
* Manages cq pools to determine if a status of connect or disconnect needs to be sent out
*/
- private final HashMap<String, Boolean> cqPoolsConnected = new HashMap<String, Boolean>();
-
+ private final HashMap<String, Boolean> cqPoolsConnected = new HashMap<>();
/**
* Manages CQ objects. uses serverCqName as key and CqQueryImpl as value
*
- * @guarded.By cqQueryMapLock
+ * GuardedBy cqQueryMapLock
*/
- private volatile HashMap<String, CqQueryImpl> cqQueryMap = new HashMap<String, CqQueryImpl>();
+ private volatile HashMap<String, CqQueryImpl> cqQueryMap = new HashMap<>();
+
private final Object cqQueryMapLock = new Object();
private volatile boolean isRunning = false;
@@ -93,36 +123,21 @@ public final class CqServiceImpl implements CqService {
/**
* Used by client when multiuser-authentication is true.
*/
- private final HashMap<String, UserAttributes> cqNameToUserAttributesMap =
- new HashMap<String, UserAttributes>();
-
- // private boolean isServer = true;
-
- /*
- * // Map to manage CQ to satisfied CQ events (keys) for optimizing updates. private final HashMap
- * cqToCqEventKeysMap = CqService.MAINTAIN_KEYS ? new HashMap() : null;
- */
+ private final HashMap<String, UserAttributes> cqNameToUserAttributesMap = new HashMap<>();
// Map to manage the similar CQs (having same query - performance optimization).
// With query as key and Set of CQs as values.
private final ConcurrentHashMap matchingCqMap;
// CQ Service statistics
- public final CqServiceStatisticsImpl cqServiceStats;
- public final CqServiceVsdStats stats;
+ private final CqServiceStatisticsImpl cqServiceStats;
+ private final CqServiceVsdStats stats;
// CQ identifier, also used in auto generated CQ names
private volatile long cqId = 1;
- /**
- * Used to synchronize access to CQs in the repository
- */
- final Object cqSync = new Object();
-
/* This is to manage region to CQs map, client side book keeping. */
- private HashMap<String, ArrayList<String>> baseRegionToCqNameMap =
- new HashMap<String, ArrayList<String>>();
-
+ private HashMap<String, ArrayList<String>> baseRegionToCqNameMap = new HashMap<>();
/**
* Access and modification to the contents of this map do not necessarily need to be lock
@@ -135,33 +150,24 @@ public final class CqServiceImpl implements CqService {
/**
* Constructor.
- *
- * @param c The cache used for the service
+ *
+ * @param cache The cache used for the service
*/
- public CqServiceImpl(final Cache c) {
- if (c == null) {
+ public CqServiceImpl(final InternalCache cache) {
+ if (cache == null) {
throw new IllegalStateException(LocalizedStrings.CqService_CACHE_IS_NULL.toLocalizedString());
}
- GemFireCacheImpl gfc = (GemFireCacheImpl) c;
- gfc.getCancelCriterion().checkCancelInProgress(null);
-
- this.cache = gfc;
+ cache.getCancelCriterion().checkCancelInProgress(null);
+ this.cache = cache;
// Initialize the Map which maintains the matching cqs.
this.matchingCqMap = new ConcurrentHashMap<String, HashSet<String>>();
// Initialize the VSD statistics
- StatisticsFactory factory = cache.getDistributedSystem();
+ StatisticsFactory factory = this.cache.getDistributedSystem();
this.stats = new CqServiceVsdStats(factory);
this.cqServiceStats = new CqServiceStatisticsImpl(this);
-
- // final LoggingThreadGroup group =
- // LoggingThreadGroup.createThreadGroup("CqExecutor Threads", logger);
-
- // if (this.cache.getCacheServers().isEmpty()) {
- // isServer = false;
- // }
}
/**
@@ -171,13 +177,14 @@ public final class CqServiceImpl implements CqService {
return this.cache;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#newCq(java.lang.String,
- * java.lang.String, org.apache.geode.cache.query.CqAttributes,
- * org.apache.geode.cache.client.internal.ServerCQProxy, boolean)
- */
+ public InternalCache getInternalCache() {
+ return this.cache;
+ }
+
+ public CqServiceVsdStats stats() {
+ return this.stats;
+ }
+
@Override
public synchronized ClientCQ newCq(String cqName, String queryString, CqAttributes cqAttributes,
InternalPool pool, boolean isDurable)
@@ -242,22 +249,15 @@ public final class CqServiceImpl implements CqService {
return cQuery;
}
-
/**
* Executes the given CqQuery, if the CqQuery for that name is not there it registers the one and
* executes. This is called on the Server.
*
- * @param cqName
- * @param queryString
- * @param cqState
- * @param clientProxyId
- * @param ccn
* @param manageEmptyRegions whether to update the 6.1 emptyRegions map held in the CCN
* @param regionDataPolicy the data policy of the region associated with the query. This is only
* needed if manageEmptyRegions is true.
* @param emptyRegionsMap map of empty regions.
* @throws IllegalStateException if this is called at client side.
- * @throws CqException
*/
@Override
public synchronized ServerCQ executeCq(String cqName, String queryString, int cqState,
@@ -271,7 +271,7 @@ public final class CqServiceImpl implements CqService {
}
String serverCqName = constructServerCqName(cqName, clientProxyId);
- ServerCQImpl cQuery = null;
+ ServerCQImpl cQuery;
// If this CQ is not yet registered in Server, register CQ.
if (!isCqExists(serverCqName)) {
@@ -292,7 +292,6 @@ public final class CqServiceImpl implements CqService {
logger.info(LocalizedMessage.create(
LocalizedStrings.CqService_EXCEPTION_WHILE_REGISTERING_CQ_ON_SERVER_CQNAME___0,
cQuery.getName()));
- cQuery = null;
throw cqe;
}
@@ -308,6 +307,7 @@ public final class CqServiceImpl implements CqService {
return cQuery;
}
+ @Override
public void resumeCQ(int cqState, ServerCQ cQuery) {
// Initialize the state of CQ.
if (((CqStateImpl) cQuery.getState()).getState() != cqState) {
@@ -324,25 +324,10 @@ public final class CqServiceImpl implements CqService {
}
}
- /*
- * public void addToCqEventKeysMap(CqQuery cq){ if (cqToCqEventKeysMap != null) { synchronized
- * (cqToCqEventKeysMap){ String serverCqName = ((CqQueryImpl)cq).getServerCqName(); if
- * (!cqToCqEventKeysMap.containsKey(serverCqName)){ cqToCqEventKeysMap.put(serverCqName, new
- * HashSet()); if (_logger.isDebugEnabled()) {
- * _logger.debug("CQ Event key maintenance for CQ, CqName: " + serverCqName + " is Enabled." +
- * " key maintenance map size is: " + cqToCqEventKeysMap.size()); } } } // synchronized } }
- */
-
- public boolean hasCq() {
- HashMap<String, CqQueryImpl> cqMap = cqQueryMap;
- return (cqMap.size() > 0);
- }
-
-
/**
* Adds the given CQ and cqQuery object into the CQ map.
*/
- public void addToCqMap(CqQueryImpl cq) throws CqExistsException, CqException {
+ void addToCqMap(CqQueryImpl cq) throws CqExistsException, CqException {
// On server side cqName will be server side cqName.
String sCqName = cq.getServerCqName();
if (logger.isDebugEnabled()) {
@@ -355,7 +340,7 @@ public final class CqServiceImpl implements CqService {
.toLocalizedString(sCqName));
}
synchronized (cqQueryMapLock) {
- HashMap<String, CqQueryImpl> tmpCqQueryMap = new HashMap<String, CqQueryImpl>(cqQueryMap);
+ HashMap<String, CqQueryImpl> tmpCqQueryMap = new HashMap<>(cqQueryMap);
try {
tmpCqQueryMap.put(sCqName, cq);
} catch (Exception ex) {
@@ -377,66 +362,34 @@ public final class CqServiceImpl implements CqService {
/**
* Removes given CQ from the cqMap..
*/
- public void removeCq(String cqName) {
+ void removeCq(String cqName) {
// On server side cqName will be server side cqName.
synchronized (cqQueryMapLock) {
- HashMap<String, CqQueryImpl> tmpCqQueryMap = new HashMap<String, CqQueryImpl>(cqQueryMap);
+ HashMap<String, CqQueryImpl> tmpCqQueryMap = new HashMap<>(cqQueryMap);
tmpCqQueryMap.remove(cqName);
this.cqNameToUserAttributesMap.remove(cqName);
cqQueryMap = tmpCqQueryMap;
}
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.cache.query.internal.InternalCqService#getClientCqFromServer(org.apache.geode.
- * internal.cache.tier.sockets.ClientProxyMembershipID, java.lang.String)
- */
@Override
public CqQuery getClientCqFromServer(ClientProxyMembershipID clientProxyId, String clientCqName) {
// On server side cqName will be server side cqName.
HashMap<String, CqQueryImpl> cqMap = cqQueryMap;
- return (CqQuery) cqMap.get(this.constructServerCqName(clientCqName, clientProxyId));
+ return cqMap.get(this.constructServerCqName(clientCqName, clientProxyId));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#getCq(java.lang.String)
- */
@Override
public InternalCqQuery getCq(String cqName) {
// On server side cqName will be server side cqName.
- return (InternalCqQuery) cqQueryMap.get(cqName);
+ return cqQueryMap.get(cqName);
}
- /**
- * Clears the CQ Query Map.
- */
- public void clearCqQueryMap() {
- // On server side cqName will be server side cqName.
- synchronized (cqQueryMapLock) {
- cqQueryMap = new HashMap<String, CqQueryImpl>();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#getAllCqs()
- */
@Override
public Collection<? extends InternalCqQuery> getAllCqs() {
return cqQueryMap.values();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#getAllCqs(java.lang.String)
- */
@Override
public Collection<? extends InternalCqQuery> getAllCqs(final String regionName)
throws CqException {
@@ -445,7 +398,7 @@ public final class CqServiceImpl implements CqService {
LocalizedStrings.CqService_NULL_ARGUMENT_0.toLocalizedString("regionName"));
}
- String[] cqNames = null;
+ String[] cqNames;
synchronized (this.baseRegionToCqNameMap) {
ArrayList<String> cqs = this.baseRegionToCqNameMap.get(regionName);
@@ -456,7 +409,7 @@ public final class CqServiceImpl implements CqService {
cqs.toArray(cqNames);
}
- ArrayList<InternalCqQuery> cQueryList = new ArrayList<InternalCqQuery>();
+ ArrayList<InternalCqQuery> cQueryList = new ArrayList<>();
for (int cqCnt = 0; cqCnt < cqNames.length; cqCnt++) {
InternalCqQuery cq = getCq(cqNames[cqCnt]);
if (cq != null) {
@@ -467,34 +420,16 @@ public final class CqServiceImpl implements CqService {
return cQueryList;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#executeAllClientCqs()
- */
@Override
public synchronized void executeAllClientCqs() throws CqException {
executeCqs(this.getAllCqs());
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.cache.query.internal.InternalCqService#executeAllRegionCqs(java.lang.String)
- */
@Override
public synchronized void executeAllRegionCqs(final String regionName) throws CqException {
executeCqs(getAllCqs(regionName));
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.cache.query.internal.InternalCqService#executeCqs(org.apache.geode.cache.query
- * .CqQuery[])
- */
@Override
public synchronized void executeCqs(Collection<? extends InternalCqQuery> cqs)
throws CqException {
@@ -503,53 +438,31 @@ public final class CqServiceImpl implements CqService {
}
String cqName = null;
for (InternalCqQuery internalCq : cqs) {
- CqQuery cq = (CqQuery) internalCq;
+ CqQuery cq = internalCq;
if (!cq.isClosed() && cq.isStopped()) {
try {
cqName = cq.getName();
cq.execute();
- } catch (QueryException qe) {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed to execute the CQ, CqName : {} Error : {}", cqName,
- qe.getMessage());
- }
- } catch (CqClosedException cce) {
+ } catch (QueryException | CqClosedException e) {
if (logger.isDebugEnabled()) {
logger.debug("Failed to execute the CQ, CqName : {} Error : {}", cqName,
- cce.getMessage());
+ e.getMessage());
}
}
}
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#stopAllClientCqs()
- */
@Override
public synchronized void stopAllClientCqs() throws CqException {
stopCqs(this.getAllCqs());
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#stopAllRegionCqs(java.lang.String)
- */
@Override
public synchronized void stopAllRegionCqs(final String regionName) throws CqException {
stopCqs(this.getAllCqs(regionName));
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.cache.query.internal.InternalCqService#stopCqs(org.apache.geode.cache.query.
- * CqQuery[])
- */
@Override
public synchronized void stopCqs(Collection<? extends InternalCqQuery> cqs) throws CqException {
final boolean isDebugEnabled = logger.isDebugEnabled();
@@ -567,29 +480,20 @@ public final class CqServiceImpl implements CqService {
String cqName = null;
for (InternalCqQuery internalCqQuery : cqs) {
- CqQuery cq = (CqQuery) internalCqQuery;
+ CqQuery cq = internalCqQuery;
if (!cq.isClosed() && cq.isRunning()) {
try {
cqName = cq.getName();
cq.stop();
- } catch (QueryException qe) {
- if (isDebugEnabled) {
- logger.debug("Failed to stop the CQ, CqName : {} Error : {}", cqName, qe.getMessage());
- }
- } catch (CqClosedException cce) {
+ } catch (QueryException | CqClosedException e) {
if (isDebugEnabled) {
- logger.debug("Failed to stop the CQ, CqName : {} Error : {}", cqName, cce.getMessage());
+ logger.debug("Failed to stop the CQ, CqName : {} Error : {}", cqName, e.getMessage());
}
}
}
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#closeCqs(java.lang.String)
- */
@Override
public void closeCqs(final String regionName) throws CqException {
Collection<? extends InternalCqQuery> cqs = this.getAllCqs(regionName);
@@ -603,8 +507,8 @@ public final class CqServiceImpl implements CqService {
// invoked on the server
cq.close(false);
} else {
- // @todo grid: if regionName has a pool check its keepAlive
- boolean keepAlive = ((GemFireCacheImpl) this.cache).keepDurableSubscriptionsAlive();
+ // TODO: grid: if regionName has a pool check its keepAlive
+ boolean keepAlive = this.cache.keepDurableSubscriptionsAlive();
if (cq.isDurable() && keepAlive) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.CqService_NOT_SENDING_CQ_CLOSE_TO_THE_SERVER_AS_IT_IS_A_DURABLE_CQ));
@@ -614,14 +518,9 @@ public final class CqServiceImpl implements CqService {
}
}
- } catch (QueryException qe) {
+ } catch (QueryException | CqClosedException e) {
if (logger.isDebugEnabled()) {
- logger.debug("Failed to close the CQ, CqName : {} Error : {}", cqName, qe.getMessage());
- }
- } catch (CqClosedException cce) {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed to close the CQ, CqName : {} Error : {}", cqName,
- cce.getMessage());
+ logger.debug("Failed to close the CQ, CqName : {} Error : {}", cqName, e.getMessage());
}
}
}
@@ -630,10 +529,6 @@ public final class CqServiceImpl implements CqService {
/**
* Called directly on server side.
- *
- * @param cqName
- * @param clientId
- * @throws CqException
*/
@Override
public void stopCq(String cqName, ClientProxyMembershipID clientId) throws CqException {
@@ -650,8 +545,6 @@ public final class CqServiceImpl implements CqService {
try {
HashMap<String, CqQueryImpl> cqMap = cqQueryMap;
if (!cqMap.containsKey(serverCqName)) {
- // throw new
- // CqException(LocalizedStrings.CqService_CQ_NOT_FOUND_FAILED_TO_STOP_THE_SPECIFIED_CQ_0.toLocalizedString(serverCqName));
/*
* gregp 052808: We should silently fail here instead of throwing error. This is to deal
* with races in recovery
@@ -689,15 +582,8 @@ public final class CqServiceImpl implements CqService {
}
// Send stop message to peers.
cQuery.getCqBaseRegion().getFilterProfile().stopCq(cQuery);
-
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#closeCq(java.lang.String,
- * org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID)
- */
@Override
public void closeCq(String cqName, ClientProxyMembershipID clientProxyId) throws CqException {
String serverCqName = cqName;
@@ -713,9 +599,6 @@ public final class CqServiceImpl implements CqService {
try {
HashMap<String, CqQueryImpl> cqMap = cqQueryMap;
if (!cqMap.containsKey(serverCqName)) {
- // throw new
- // CqException(LocalizedStrings.CqService_CQ_NOT_FOUND_FAILED_TO_CLOSE_THE_SPECIFIED_CQ_0
- // .toLocalizedString(serverCqName));
/*
* gregp 052808: We should silently fail here instead of throwing error. This is to deal
* with races in recovery
@@ -791,12 +674,6 @@ public final class CqServiceImpl implements CqService {
}
}
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#closeAllCqs(boolean)
- */
@Override
public void closeAllCqs(boolean clientInitiated) {
closeAllCqs(clientInitiated, getAllCqs());
@@ -807,21 +684,13 @@ public final class CqServiceImpl implements CqService {
* CqQuerys created by other VMs are unaffected.
*/
private void closeAllCqs(boolean clientInitiated, Collection<? extends InternalCqQuery> cqs) {
- closeAllCqs(clientInitiated, cqs,
- ((GemFireCacheImpl) this.cache).keepDurableSubscriptionsAlive());
+ closeAllCqs(clientInitiated, cqs, this.cache.keepDurableSubscriptionsAlive());
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#closeAllCqs(boolean,
- * org.apache.geode.cache.query.CqQuery[], boolean)
- */
@Override
public void closeAllCqs(boolean clientInitiated, Collection<? extends InternalCqQuery> cqs,
boolean keepAlive) {
- // CqQuery[] cqs = getAllCqs();
if (cqs != null) {
String cqName = null;
if (logger.isDebugEnabled()) {
@@ -830,7 +699,6 @@ public final class CqServiceImpl implements CqService {
for (InternalCqQuery cQuery : cqs) {
try {
cqName = cQuery.getName();
- // boolean keepAlive = ((GemFireCache)this.cache).keepDurableSubscriptionsAlive();
if (isServer()) {
cQuery.close(false);
@@ -847,47 +715,26 @@ public final class CqServiceImpl implements CqService {
}
}
}
- } catch (QueryException cqe) {
+ } catch (QueryException | CqClosedException e) {
if (!isRunning()) {
// Not cache shutdown
logger
.warn(LocalizedMessage.create(LocalizedStrings.CqService_FAILED_TO_CLOSE_CQ__0___1,
- new Object[] {cqName, cqe.getMessage()}));
+ new Object[] {cqName, e.getMessage()}));
}
if (logger.isDebugEnabled()) {
- logger.debug(cqe.getMessage(), cqe);
- }
- } catch (CqClosedException cqe) {
- if (!isRunning()) {
- // Not cache shutdown
- logger
- .warn(LocalizedMessage.create(LocalizedStrings.CqService_FAILED_TO_CLOSE_CQ__0___1,
- new Object[] {cqName, cqe.getMessage()}));
- }
- if (logger.isDebugEnabled()) {
- logger.debug(cqe.getMessage(), cqe);
+ logger.debug(e.getMessage(), e);
}
}
}
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#getCqStatistics()
- */
@Override
public CqServiceStatistics getCqStatistics() {
return cqServiceStats;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#closeClientCqs(org.apache.geode.
- * internal.cache.tier.sockets.ClientProxyMembershipID)
- */
@Override
public void closeClientCqs(ClientProxyMembershipID clientProxyId) throws CqException {
final boolean isDebugEnabled = logger.isDebugEnabled();
@@ -899,30 +746,19 @@ public final class CqServiceImpl implements CqService {
CqQueryImpl cQuery = (CqQueryImpl) cq;
try {
cQuery.close(false);
- } catch (QueryException qe) {
+ } catch (QueryException | CqClosedException e) {
if (isDebugEnabled) {
logger.debug("Failed to close the CQ, CqName : {} Error : {}", cQuery.getName(),
- qe.getMessage());
- }
- } catch (CqClosedException cce) {
- if (isDebugEnabled) {
- logger.debug("Failed to close the CQ, CqName : {} Error : {}", cQuery.getName(),
- cce.getMessage());
+ e.getMessage());
}
}
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.cache.query.internal.InternalCqService#getAllClientCqs(org.apache.geode.
- * internal.cache.tier.sockets.ClientProxyMembershipID)
- */
@Override
public List<ServerCQ> getAllClientCqs(ClientProxyMembershipID clientProxyId) {
Collection<? extends InternalCqQuery> cqs = getAllCqs();
- ArrayList<ServerCQ> clientCqs = new ArrayList<ServerCQ>();
+ ArrayList<ServerCQ> clientCqs = new ArrayList<>();
for (InternalCqQuery cq : cqs) {
ServerCQImpl cQuery = (ServerCQImpl) cq;
@@ -934,23 +770,16 @@ public final class CqServiceImpl implements CqService {
return clientCqs;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.cache.query.internal.InternalCqService#getAllDurableClientCqs(org.apache.geode
- * .internal.cache.tier.sockets.ClientProxyMembershipID)
- */
@Override
public List<String> getAllDurableClientCqs(ClientProxyMembershipID clientProxyId)
throws CqException {
if (clientProxyId == null) {
throw new CqException(
LocalizedStrings.CqService_UNABLE_TO_RETRIEVE_DURABLE_CQS_FOR_CLIENT_PROXY_ID
- .toLocalizedString(clientProxyId));
+ .toLocalizedString(null));
}
List<ServerCQ> cqs = getAllClientCqs(clientProxyId);
- ArrayList<String> durableClientCqs = new ArrayList<String>();
+ ArrayList<String> durableClientCqs = new ArrayList<>();
for (ServerCQ cq : cqs) {
ServerCQImpl cQuery = (ServerCQImpl) cq;
@@ -966,9 +795,6 @@ public final class CqServiceImpl implements CqService {
/**
* Server side method. Closes non-durable CQs for the given client proxy id.
- *
- * @param clientProxyId
- * @throws CqException
*/
@Override
public void closeNonDurableClientCqs(ClientProxyMembershipID clientProxyId) throws CqException {
@@ -983,15 +809,10 @@ public final class CqServiceImpl implements CqService {
if (!cQuery.isDurable()) {
cQuery.close(false);
}
- } catch (QueryException qe) {
- if (isDebugEnabled) {
- logger.debug("Failed to close the CQ, CqName : {} Error : {}", cQuery.getName(),
- qe.getMessage());
- }
- } catch (CqClosedException cce) {
+ } catch (QueryException | CqClosedException e) {
if (isDebugEnabled) {
logger.debug("Failed to close the CQ, CqName : {} Error : {}", cQuery.getName(),
- cce.getMessage());
+ e.getMessage());
}
}
}
@@ -1028,6 +849,7 @@ public final class CqServiceImpl implements CqService {
return this.isRunning;
}
+ @Override
public void start() {
this.isRunning = true;
}
@@ -1035,9 +857,10 @@ public final class CqServiceImpl implements CqService {
/**
* @return Returns the serverCqName.
*/
+ @Override
public String constructServerCqName(String cqName, ClientProxyMembershipID clientProxyId) {
- ConcurrentHashMap<ClientProxyMembershipID, String> cache = serverCqNameCache
- .computeIfAbsent(cqName, key -> new ConcurrentHashMap<ClientProxyMembershipID, String>());
+ ConcurrentHashMap<ClientProxyMembershipID, String> cache =
+ serverCqNameCache.computeIfAbsent(cqName, key -> new ConcurrentHashMap<>());
String cName = cache.get(clientProxyId);
if (null == cName) {
@@ -1065,7 +888,7 @@ public final class CqServiceImpl implements CqService {
}
}
- /*
+ /**
* Checks if CQ with the given name already exists.
*
* @param cqName name of the CQ.
@@ -1073,17 +896,15 @@ public final class CqServiceImpl implements CqService {
* @return true if exists else false.
*/
private synchronized boolean isCqExists(String cqName) {
- boolean status = false;
HashMap<String, CqQueryImpl> cqMap = cqQueryMap;
- status = cqMap.containsKey(cqName);
- return status;
+ return cqMap.containsKey(cqName);
}
- /*
+ /**
* Generates a name for CQ. Checks if CQ with that name already exists if so generates a new
* cqName.
*/
- public synchronized String generateCqName() {
+ private synchronized String generateCqName() {
while (true) {
String cqName = CQ_NAME_PREFIX + (cqId++);
if (!isCqExists(cqName)) {
@@ -1092,18 +913,9 @@ public final class CqServiceImpl implements CqService {
}
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.cache.query.internal.InternalCqService#dispatchCqListeners(java.util.HashMap,
- * int, java.lang.Object, java.lang.Object, byte[],
- * org.apache.geode.cache.client.internal.QueueManager, org.apache.geode.internal.cache.EventID)
- */
@Override
public void dispatchCqListeners(HashMap<String, Integer> cqs, int messageType, Object key,
Object value, byte[] delta, QueueManager qManager, EventID eventId) {
- ClientCQImpl cQuery = null;
Object[] fullValue = new Object[1];
Iterator<Map.Entry<String, Integer>> iter = cqs.entrySet().iterator();
String cqName = null;
@@ -1112,7 +924,7 @@ public final class CqServiceImpl implements CqService {
try {
Map.Entry<String, Integer> entry = iter.next();
cqName = entry.getKey();
- cQuery = (ClientCQImpl) this.getCq(cqName);
+ ClientCQImpl cQuery = (ClientCQImpl) this.getCq(cqName);
if (cQuery == null || (!cQuery.isRunning() && cQuery.getQueuedEvents() == null)) {
if (isDebugEnabled) {
@@ -1122,7 +934,7 @@ public final class CqServiceImpl implements CqService {
continue;
}
- Integer cqOp = (Integer) entry.getValue();
+ Integer cqOp = entry.getValue();
// If Region destroy event, close the cq.
if (cqOp.intValue() == MessageType.DESTROY_REGION) {
@@ -1136,8 +948,7 @@ public final class CqServiceImpl implements CqService {
}
// Construct CqEvent.
- CqEventImpl cqEvent = null;
- cqEvent = new CqEventImpl(cQuery, getOperation(messageType), getOperation(cqOp.intValue()),
+ CqEventImpl cqEvent = new CqEventImpl(cQuery, getOperation(messageType), getOperation(cqOp),
key, value, delta, qManager, eventId);
// Update statistics
@@ -1181,11 +992,11 @@ public final class CqServiceImpl implements CqService {
} // iteration.
}
- public void invokeListeners(String cqName, ClientCQImpl cQuery, CqEventImpl cqEvent) {
+ void invokeListeners(String cqName, ClientCQImpl cQuery, CqEventImpl cqEvent) {
invokeListeners(cqName, cQuery, cqEvent, null);
}
- public void invokeListeners(String cqName, ClientCQImpl cQuery, CqEventImpl cqEvent,
+ private void invokeListeners(String cqName, ClientCQImpl cQuery, CqEventImpl cqEvent,
Object[] fullValue) {
if (!cQuery.isRunning() || cQuery.getCqAttributes() == null) {
return;
@@ -1217,8 +1028,8 @@ public final class CqServiceImpl implements CqService {
}
Part result = (Part) GetEventValueOp
.executeOnPrimary(cqEvent.getQueueManager().getPool(), cqEvent.getEventID(), null);
- Object newVal = null;
- if (result == null || (newVal = result.getObject()) == null) {
+ Object newVal = result.getObject();
+ if (result == null || newVal == null) {
if (!cache.getCancelCriterion().isCancelInProgress()) {
Exception ex =
new Exception("Failed to retrieve full value from server for eventID "
@@ -1231,7 +1042,7 @@ public final class CqServiceImpl implements CqService {
}
}
} else {
- ((GemFireCacheImpl) this.cache).getCachePerfStats().incDeltaFullValuesRequested();
+ this.cache.getCachePerfStats().incDeltaFullValuesRequested();
cqEvent = new CqEventImpl(cQuery, cqEvent.getBaseOperation(),
cqEvent.getQueryOperation(), cqEvent.getKey(), newVal, cqEvent.getDeltaValue(),
cqEvent.getQueueManager(), cqEvent.getEventID());
@@ -1278,7 +1089,7 @@ public final class CqServiceImpl implements CqService {
}
}
- public void invokeCqConnectedListeners(String cqName, ClientCQImpl cQuery, boolean connected) {
+ private void invokeCqConnectedListeners(String cqName, ClientCQImpl cQuery, boolean connected) {
if (!cQuery.isRunning() || cQuery.getCqAttributes() == null) {
return;
}
@@ -1335,12 +1146,8 @@ public final class CqServiceImpl implements CqService {
}
}
-
/**
* Returns the Operation for the given EnumListenerEvent type.
- *
- * @param eventType
- * @return Operation
*/
private Operation getOperation(int eventType) {
Operation op = null;
@@ -1372,15 +1179,6 @@ public final class CqServiceImpl implements CqService {
return op;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.cache.query.internal.InternalCqService#processEvents(org.apache.geode.cache.
- * CacheEvent, org.apache.geode.distributed.internal.DistributionAdvisor.Profile,
- * org.apache.geode.distributed.internal.DistributionAdvisor.Profile[],
- * org.apache.geode.internal.cache.FilterRoutingInfo)
- */
@Override
public void processEvents(CacheEvent event, Profile localProfile, Profile[] profiles,
FilterRoutingInfo frInfo) throws CqException {
@@ -1421,7 +1219,7 @@ public final class CqServiceImpl implements CqService {
continue;
}
Map cqs = pf.getCqMap();
- HashMap<Long, Integer> cqInfo = new HashMap<Long, Integer>();
+ HashMap<Long, Integer> cqInfo = new HashMap<>();
Iterator cqIter = cqs.entrySet().iterator();
while (cqIter.hasNext()) {
Map.Entry cqEntry = (Map.Entry) cqIter.next();
@@ -1454,10 +1252,10 @@ public final class CqServiceImpl implements CqService {
private void processEntryEvent(CacheEvent event, Profile localProfile, Profile[] profiles,
FilterRoutingInfo frInfo) throws CqException {
final boolean isDebugEnabled = logger.isDebugEnabled();
- HashSet<Object> cqUnfilteredEventsSet_newValue = new HashSet<Object>();
- HashSet<Object> cqUnfilteredEventsSet_oldValue = new HashSet<Object>();
- boolean b_cqResults_newValue = false;
- boolean b_cqResults_oldValue = false;
+ HashSet<Object> cqUnfilteredEventsSet_newValue = new HashSet<>();
+ HashSet<Object> cqUnfilteredEventsSet_oldValue = new HashSet<>();
+ boolean b_cqResults_newValue;
+ boolean b_cqResults_oldValue;
boolean queryOldValue;
EntryEvent entryEvent = (EntryEvent) event;
Object eventKey = entryEvent.getKey();
@@ -1472,8 +1270,8 @@ public final class CqServiceImpl implements CqService {
|| event.getOperation().isDestroy() || event.getOperation().isInvalidate()
|| (event.getOperation().isCreate() && isDupEvent));
- HashMap<String, Integer> matchedCqs = new HashMap<String, Integer>();
- long executionStartTime = 0;
+ HashMap<String, Integer> matchedCqs = new HashMap<>();
+ long executionStartTime;
for (int i = -1; i < profiles.length; i++) {
CacheProfile cf;
if (i < 0) {
@@ -1498,7 +1296,6 @@ public final class CqServiceImpl implements CqService {
continue;
}
-
// Get new value. If its not retrieved.
if (cqUnfilteredEventsSet_newValue.isEmpty()
&& (event.getOperation().isCreate() || event.getOperation().isUpdate())) {
@@ -1509,7 +1306,7 @@ public final class CqServiceImpl implements CqService {
}
}
- HashMap<Long, Integer> cqInfo = new HashMap<Long, Integer>();
+ HashMap<Long, Integer> cqInfo = new HashMap<>();
Iterator cqIter = cqs.entrySet().iterator();
while (cqIter.hasNext()) {
@@ -1546,7 +1343,6 @@ public final class CqServiceImpl implements CqService {
}
} else {
boolean error = false;
- // synchronized (cQuery)
{
try {
synchronized (cQuery) {
@@ -1644,7 +1440,7 @@ public final class CqServiceImpl implements CqService {
cQuery.markAsDestroyedInCqResultKeys(eventKey);
}
}
- } // end synchronized(cQuery)
+ }
// Get the matching CQs if any.
// synchronized (this.matchingCqMap){
@@ -1663,7 +1459,6 @@ public final class CqServiceImpl implements CqService {
}
}
}
- // }
}
if (cqEvent != null && cQuery.isRunning()) {
@@ -1694,153 +1489,35 @@ public final class CqServiceImpl implements CqService {
} // iteration over Profiles.
}
-
- /*
- * public void processEvents (EnumListenerEvent operation, CacheEvent event, ClientUpdateMessage
- * clientMessage, CM<ClientProxyMembershipID, CM<CqQuery, Boolean>> clientIds) throws CqException
- * {
- *
- * //Is this a region event or an entry event if (event instanceof RegionEvent){
- * processRegionEvent(operation, event, clientMessage, clientIds); } else { processEntryEvent
- * (operation, event, clientMessage, clientIds); }
- *
- * }
- *
- * private void processRegionEvent(EnumListenerEvent operation, CacheEvent event,
- * ClientUpdateMessage clientMessage, CM<ClientProxyMembershipID, CM<CqQuery, Boolean>> clientIds)
- * throws CqException {
- *
- * if (logger.isDebugEnabled()) { logger.debug("Processing region event for region " +
- * ((LocalRegion)(event.getRegion())).getName()); } HashMap filteredCqs = new HashMap(); Integer
- * cqRegionEvent = generateCqRegionEvent(operation); Iterator it =
- * clientIds.entrySet().iterator(); while (it.hasNext()) { Map.Entry me = (Map.Entry)it.next();
- * ClientProxyMembershipID clientId = (ClientProxyMembershipID)me.getKey(); CM cqsToBooleans =
- * (CM)me.getValue(); if (cqsToBooleans == null) { continue; } Set<CqQuery> cqs =
- * cqsToBooleans.keySet(); if (cqs.isEmpty()) { continue; } filteredCqs.clear(); Iterator cqIt =
- * cqs.iterator(); while (cqIt.hasNext()) { CqQueryImpl cQuery = (CqQueryImpl)cqIt.next(); if
- * (operation == EnumListenerEvent.AFTER_REGION_DESTROY) { try { if (logger.isDebugEnabled()){
- * logger.debug("Closing CQ on region destroy event. CqName :" + cQuery.getName()); }
- * cQuery.close(false); } catch (Exception ex) {
- * logger.debug("Failed to Close CQ on region destroy. CqName :" + cQuery.getName(), ex); }
- *
- * } filteredCqs.put(cQuery.cqName, cqRegionEvent);
- * cQuery.getVsdStats().updateStats(cqRegionEvent);
- *
- * } if (!filteredCqs.isEmpty()){ ((ClientUpdateMessageImpl)clientMessage).addClientCqs( clientId,
- * filteredCqs); }
- *
- * }
- *
- * }
- *
- * private void processEntryEvent(EnumListenerEvent operation, CacheEvent event,
- * ClientUpdateMessage clientMessage, CM<ClientProxyMembershipID, CM<CqQuery, Boolean>> clientIds)
- * throws CqException { HashSet cqUnfilteredEventsSet_newValue = new HashSet(); HashSet
- * cqUnfilteredEventsSet_oldValue = new HashSet(); boolean b_cqResults_newValue = false; boolean
- * b_cqResults_oldValue = false; EntryEvent entryEvent = (EntryEvent)event; Object eventKey =
- * entryEvent.getKey(); if (operation == EnumListenerEvent.AFTER_CREATE || operation ==
- * EnumListenerEvent.AFTER_UPDATE) { if (entryEvent.getNewValue() != null) { //We have a new value
- * to run the query on cqUnfilteredEventsSet_newValue.clear();
- * cqUnfilteredEventsSet_newValue.add(entryEvent.getNewValue()); } }
- *
- * HashMap matchedCqs = new HashMap(); long executionStartTime = 0; Iterator it =
- * clientIds.entrySet().iterator(); while (it.hasNext()) { Map.Entry me = (Map.Entry)it.next();
- * ClientProxyMembershipID clientId = (ClientProxyMembershipID)me.getKey(); if
- * (logger.isDebugEnabled()) { logger.debug("Processing event for CQ filter, ClientId : " +
- * clientId); } CM cqsToBooleans = (CM)me.getValue(); if (cqsToBooleans == null) { continue; }
- * Set<CqQuery> cqs = cqsToBooleans.keySet(); if (cqs.isEmpty()) { continue; } HashMap filteredCqs
- * = new HashMap(); Iterator cqIt = cqs.iterator(); while (cqIt.hasNext()) { CqQueryImpl cQuery =
- * (CqQueryImpl)cqIt.next(); b_cqResults_newValue = false; b_cqResults_oldValue = false; if
- * (cQuery == null || !(cQuery.isRunning())){ continue; } String cqName =
- * cQuery.getServerCqName(); Integer cqEvent = null; if (matchedCqs.containsKey(cqName)) { if
- * (logger.isDebugEnabled()){ logger.
- * debug("Similar cq/query is already processed, getting the cq event-type from the matched cq.");
- * } cqEvent = (Integer)matchedCqs.get(cqName); } else { boolean error = false; boolean
- * hasSeenEvent = false; HashSet cqEventKeys = null; synchronized (cQuery) { try { // Apply query
- * on new value. if (!cqUnfilteredEventsSet_newValue.isEmpty()) { executionStartTime =
- * this.stats.startCqQueryExecution(); b_cqResults_newValue = evaluateQuery(cQuery, new Object[]
- * {cqUnfilteredEventsSet_newValue}); this.stats.endCqQueryExecution(executionStartTime); } //
- * Check if old value is cached, if not apply query on old value. if (cqToCqEventKeysMap != null)
- * { synchronized (cqToCqEventKeysMap) { if ((cqEventKeys =
- * (HashSet)cqToCqEventKeysMap.get(cqName)) != null) { hasSeenEvent =
- * cqEventKeys.contains(eventKey); } } } if (!hasSeenEvent) { // get the oldValue. // In case of
- * Update, destroy and invalidate. if (operation == EnumListenerEvent.AFTER_UPDATE || operation ==
- * EnumListenerEvent.AFTER_DESTROY || operation == EnumListenerEvent.AFTER_INVALIDATE) { if
- * (entryEvent.getOldValue() != null) { cqUnfilteredEventsSet_oldValue.clear();
- * cqUnfilteredEventsSet_oldValue.add(entryEvent.getOldValue()); // Apply query on old value.
- * executionStartTime = this.stats.startCqQueryExecution(); b_cqResults_oldValue =
- * evaluateQuery(cQuery, new Object[] {cqUnfilteredEventsSet_oldValue});
- * this.stats.endCqQueryExecution(executionStartTime); } } } } catch (Exception ex) { //Any
- * exception in running the query // should be caught here and buried //because this code is
- * running inline with the //message processing code and we don't want to //kill that thread error
- * = true; logger.info( LocalizedStrings.
- * CqService_ERROR_WHILE_PROCESSING_CQ_ON_THE_EVENT_KEY_0_CQNAME_1_CLIENTID_2_ERROR_3, new
- * Object[] { ((EntryEvent)event).getKey(), cQuery.getName(), clientId,
- * ex.getLocalizedMessage()}); }
- *
- * if (error) { cqEvent = Integer.valueOf(MessageType.EXCEPTION); } else { if
- * (b_cqResults_newValue) { if (hasSeenEvent || b_cqResults_oldValue) { cqEvent =
- * Integer.valueOf(MessageType.LOCAL_UPDATE); } else { cqEvent =
- * Integer.valueOf(MessageType.LOCAL_CREATE); } // If its create and caching is enabled, cache the
- * key for this CQ. if (!hasSeenEvent && cqEventKeys != null) { cqEventKeys.add(eventKey); } }
- * else if (hasSeenEvent || (b_cqResults_oldValue)) { // Base invalidate operation is treated as
- * destroy. // When the invalidate comes through, the entry will no longer satisfy // the query
- * and will need to be deleted. cqEvent = Integer.valueOf(MessageType.LOCAL_DESTROY); // If
- * caching is enabled, remove this event's key from the cache. if (hasSeenEvent && cqEventKeys !=
- * null) { cqEventKeys.remove(eventKey); } } }
- *
- * } //end synchronized(cQuery)
- *
- * // Get the matching CQs if any. synchronized (this.matchingCqMap){ String query =
- * cQuery.getQueryString(); ArrayList matchingCqs = (ArrayList)matchingCqMap.get(query); if
- * (matchingCqs != null) { Iterator iter = matchingCqs.iterator(); while (iter.hasNext()) { String
- * matchingCqName = (String)iter.next(); if (!matchingCqName.equals(cqName)){
- * matchedCqs.put(matchingCqName, cqEvent); } } } }
- *
- * }
- *
- * if (cqEvent != null){ if (logger.isDebugEnabled()) {
- * logger.debug("Event is added for the CQ, CqName (clientside): " + cQuery.cqName +
- * " With CQ Op : " + cqEvent + " for Client : " + clientId); } filteredCqs.put(cQuery.cqName,
- * cqEvent); cQuery.getVsdStats().updateStats(cqEvent); }
- *
- * } // iteration over cqsToBooleans.keySet() if (!filteredCqs.isEmpty()){
- * logger.debug("Adding event map for client : "+clientId +
- * " with event map size : "+filteredCqs.size());
- * ((ClientUpdateMessageImpl)clientMessage).addClientCqs(clientId, filteredCqs); } } // iteration
- * over clientIds.entrySet() }
- */
-
private Integer generateCqRegionEvent(CacheEvent event) {
Integer cqEvent = null;
if (event.getOperation().isRegionDestroy()) {
- cqEvent = Integer.valueOf(MessageType.DESTROY_REGION);
+ cqEvent = MessageType.DESTROY_REGION;
} else if (event.getOperation().isRegionInvalidate()) {
- cqEvent = Integer.valueOf(MessageType.INVALIDATE_REGION);
+ cqEvent = MessageType.INVALIDATE_REGION;
} else if (event.getOperation().isClear()) {
- cqEvent = Integer.valueOf(MessageType.CLEAR_REGION);
+ cqEvent = MessageType.CLEAR_REGION;
}
return cqEvent;
}
-
/**
* Manages the CQs created for the base region. This is managed here, instead of on the base
* region; since the cq could be created on the base region, before base region is created (using
* newCq()).
*/
- public void addToBaseRegionToCqNameMap(String regionName, String cqName) {
+ private void addToBaseRegionToCqNameMap(String regionName, String cqName) {
synchronized (this.baseRegionToCqNameMap) {
ArrayList<String> cqs = this.baseRegionToCqNameMap.get(regionName);
if (cqs == null) {
- cqs = new ArrayList<String>();
+ cqs = new ArrayList<>();
}
cqs.add(cqName);
this.baseRegionToCqNameMap.put(regionName, cqs);
}
}
- public void removeFromBaseRegionToCqNameMap(String regionName, String cqName) {
+ void removeFromBaseRegionToCqNameMap(String regionName, String cqName) {
synchronized (this.baseRegionToCqNameMap) {
ArrayList<String> cqs = this.baseRegionToCqNameMap.get(regionName);
if (cqs != null) {
@@ -1864,37 +1541,12 @@ public final class CqServiceImpl implements CqService {
}
/**
- * Removes this CQ from CQ event Cache map. This disables the caching events for this CQ.
- *
- * @param cqName
- */
- /*
- * synchronized public void removeCQFromCaching(String cqName){ if (cqToCqEventKeysMap != null) {
- * // Take a lock on CqQuery object. In processEvents the maps are // handled under CqQuery
- * object. if (cqToCqEventKeysMap != null){ synchronized (cqToCqEventKeysMap) {
- * cqToCqEventKeysMap.remove(cqName); } } } }
- */
-
- /**
- * Returns the CQ event cache map.
- *
- * @return HashMap cqToCqEventKeysMap
- *
- * Caller must synchronize on the returned value in order to inspect.
- */
- /*
- * public HashMap getCqToCqEventKeysMap(){ return cqToCqEventKeysMap; }
- */
-
- /**
* Adds the query from the given CQ to the matched CQ map.
- *
- * @param cq
*/
- public void addToMatchingCqMap(CqQueryImpl cq) {
+ void addToMatchingCqMap(CqQueryImpl cq) {
synchronized (this.matchingCqMap) {
String cqQuery = cq.getQueryString();
- Set<String> matchingCQs = null;
+ Set<String> matchingCQs;
if (!matchingCqMap.containsKey(cqQuery)) {
matchingCQs = Collections.newSetFromMap(new ConcurrentHashMap());
matchingCqMap.put(cqQuery, matchingCQs);
@@ -1912,10 +1564,8 @@ public final class CqServiceImpl implements CqService {
/**
* Removes the query from the given CQ from the matched CQ map.
- *
- * @param cq
*/
- public void removeFromMatchingCqMap(CqQueryImpl cq) {
+ private void removeFromMatchingCqMap(CqQueryImpl cq) {
synchronized (this.matchingCqMap) {
String cqQuery = cq.getQueryString();
if (matchingCqMap.containsKey(cqQuery)) {
@@ -1947,10 +1597,6 @@ public final class CqServiceImpl implements CqService {
* Applies the query on the event. This method takes care of the performance related changed done
* to improve the CQ-query performance. When CQ-query is executed first time, it saves the query
* related information in the execution context and uses that info in later executions.
- *
- * @param cQuery
- * @param event
- * @return boolean
*/
private boolean evaluateQuery(CqQueryImpl cQuery, Object[] event) throws Exception {
ExecutionContext execContext = cQuery.getQueryExecutionContext();
@@ -1983,19 +1629,6 @@ public final class CqServiceImpl implements CqService {
return this.cqNameToUserAttributesMap.get(cqName);
}
- // public static void memberLeft(String poolName) {
- // if (cqServiceSingleton != null && !cqServiceSingleton.isServer()) {
- // cqServiceSingleton.sendMemberDisconnectedMessageToCqs(poolName);
- // }
- // }
- //
- // public static void memberCrashed(String poolName) {
- // if (cqServiceSingleton != null && !cqServiceSingleton.isServer()) {
- // cqServiceSingleton.sendMemberDisconnectedMessageToCqs(poolName);
- // }
- // }
- //
-
@Override
public void cqsDisconnected(Pool pool) {
invokeCqsConnected(pool, false);
@@ -2014,7 +1647,7 @@ public final class CqServiceImpl implements CqService {
// Check to see if we are already connected/disconnected.
// If state has not changed, do not invoke another connected/disconnected
synchronized (cqPoolsConnected) {
- // don't repeatily send same connect/disconnect message to cq's on repeated fails of
+ // don't repeatedly send same connect/disconnect message to cq's on repeated fails of
// RedundancySatisfier
if (cqPoolsConnected.containsKey(poolName) && connected == cqPoolsConnected.get(poolName)) {
return;
@@ -2059,13 +1692,6 @@ public final class CqServiceImpl implements CqService {
SystemFailure.checkFailure();
logger.warn(LocalizedMessage
.create(LocalizedStrings.CqService_ERROR_SENDING_CQ_CONNECTION_STATUS, cqName), t);
-
- if (t instanceof VirtualMachineError) {
- logger.warn(LocalizedMessage.create(
- LocalizedStrings.CqService_VIRTUALMACHINEERROR_PROCESSING_CQLISTENER_FOR_CQ_0,
- cqName), t);
- return;
- }
}
}
}
@@ -2075,7 +1701,4 @@ public final class CqServiceImpl implements CqService {
public List<String> getAllDurableCqsFromServer(InternalPool pool) {
return new ServerCQProxyImpl(pool).getAllDurableCqsFromServer();
}
-
-
}
-
http://git-wip-us.apache.org/repos/asf/geode/blob/bbb3b153/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceStatisticsImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceStatisticsImpl.java
index ba71143..a675162 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceStatisticsImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceStatisticsImpl.java
@@ -14,11 +14,9 @@
*/
package org.apache.geode.cache.query.internal.cq;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.query.CqServiceStatistics;
import org.apache.geode.cache.query.CqQuery;
import org.apache.geode.cache.query.internal.DefaultQueryService;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
/**
* Provides statistical information about CqService.
@@ -26,24 +24,22 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
* @since GemFire 5.5
*/
public class CqServiceStatisticsImpl implements CqServiceStatistics {
+
private CqServiceImpl cqService;
- // private long activeCqs;
- // private long stoppedCqs;
- // private long closedCqs;
- // private long createdCqs;
/**
* Constructor for CqStatisticsImpl
*
* @param cqs - CqService
*/
- public CqServiceStatisticsImpl(CqServiceImpl cqs) {
+ CqServiceStatisticsImpl(CqServiceImpl cqs) {
cqService = cqs;
}
/**
* Returns the number of CQs currently executing
*/
+ @Override
public long numCqsActive() {
return this.cqService.getCqServiceVsdStats().getNumCqsActive();
}
@@ -53,6 +49,7 @@ public class CqServiceStatisticsImpl implements CqServiceStatistics {
*
* @return long number of cqs created.
*/
+ @Override
public long numCqsCreated() {
return this.cqService.getCqServiceVsdStats().getNumCqsCreated();
}
@@ -60,6 +57,7 @@ public class CqServiceStatisticsImpl implements CqServiceStatistics {
/**
* Returns number of Cqs that are closed.
*/
+ @Override
public long numCqsClosed() {
return this.cqService.getCqServiceVsdStats().getNumCqsClosed();
}
@@ -67,6 +65,7 @@ public class CqServiceStatisticsImpl implements CqServiceStatistics {
/**
* Returns number of Cqs that are stopped.
*/
+ @Override
public long numCqsStopped() {
return this.cqService.getCqServiceVsdStats().getNumCqsStopped();
}
@@ -74,20 +73,18 @@ public class CqServiceStatisticsImpl implements CqServiceStatistics {
/**
* Returns number of CQs created from the client.
*/
+ @Override
public long numCqsOnClient() {
return this.cqService.getCqServiceVsdStats().getNumCqsOnClient();
}
/**
* Returns the number of CQs (active + suspended) on the given region.
- *
- * @param regionName
*/
+ @Override
public long numCqsOnRegion(String regionName) {
-
DefaultQueryService queryService =
- (DefaultQueryService) ((GemFireCacheImpl) CacheFactory.getAnyInstance())
- .getLocalQueryService();
+ (DefaultQueryService) cqService.getInternalCache().getLocalQueryService();
try {
CqQuery[] cqs = queryService.getCqs(regionName);