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 2016/06/07 21:53:14 UTC
[15/17] incubator-geode git commit: Merge remote-tracking branch
'origin/develop' into feature/GEODE-837
Merge remote-tracking branch 'origin/develop' into feature/GEODE-837
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5c048b38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5c048b38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5c048b38
Branch: refs/heads/feature/GEODE-837
Commit: 5c048b388d61ca3685af5f9425e53e406ee080cf
Parents: 1c41d7c 103a6bc
Author: Kirk Lund <kl...@apache.org>
Authored: Tue Jun 7 14:38:57 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue Jun 7 14:38:57 2016 -0700
----------------------------------------------------------------------
geode-assembly/src/main/dist/bin/gfsh.bat | 33 +-
.../cache/query/internal/IndexUpdater.java | 123 ----
.../internal/DistributionMessage.java | 2 +-
.../internal/InternalDistributedSystem.java | 43 +-
.../distributed/internal/ReplyProcessor21.java | 6 +-
.../com/gemstone/gemfire/internal/DSCODE.java | 16 +-
.../gemstone/gemfire/internal/DSFIDFactory.java | 187 -------
.../internal/DataSerializableFixedID.java | 58 +-
.../gemfire/internal/GemFireUtilLauncher.java | 165 ------
.../internal/InternalDataSerializer.java | 7 -
.../gemstone/gemfire/internal/SystemAdmin.java | 2 -
.../com/gemstone/gemfire/internal/Version.java | 21 +-
.../gemfire/internal/VersionedDataStream.java | 5 +-
.../internal/cache/AbstractDiskRegionEntry.java | 5 -
.../internal/cache/AbstractRegionEntry.java | 30 +-
.../internal/cache/AbstractRegionMap.java | 238 +-------
.../gemfire/internal/cache/BucketAdvisor.java | 6 -
.../gemfire/internal/cache/BucketRegion.java | 45 +-
.../cache/CacheDistributionAdvisor.java | 50 +-
.../internal/cache/CacheServerLauncher.java | 2 +-
.../internal/cache/CacheServiceProfile.java | 40 ++
.../cache/CachedDeserializableFactory.java | 7 -
.../internal/cache/ColocationHelper.java | 67 +--
.../internal/cache/CreateRegionProcessor.java | 23 +-
.../internal/cache/DestroyOperation.java | 3 -
.../gemfire/internal/cache/DiskEntry.java | 152 +----
.../gemfire/internal/cache/DiskInitFile.java | 2 -
.../gemfire/internal/cache/DiskRegion.java | 2 -
.../internal/cache/DiskWriteAttributesImpl.java | 91 ---
.../gemfire/internal/cache/DistTXState.java | 4 +-
.../cache/DistTXStateOnCoordinator.java | 2 +-
.../cache/DistributedCacheOperation.java | 31 +-
.../cache/DistributedPutAllOperation.java | 52 +-
.../internal/cache/DistributedRegion.java | 37 +-
...stributedRegionFunctionStreamingMessage.java | 2 -
.../cache/DistributedRemoveAllOperation.java | 24 +-
.../gemfire/internal/cache/EntryBits.java | 22 -
.../gemfire/internal/cache/EntryEventImpl.java | 255 +--------
.../internal/cache/EntryOperationImpl.java | 15 +-
.../internal/cache/GemFireCacheImpl.java | 161 +++---
.../gemfire/internal/cache/GridAdvisor.java | 6 +-
.../internal/cache/InitialImageOperation.java | 96 +---
.../internal/cache/InternalRegionArguments.java | 38 +-
.../internal/cache/InvalidateOperation.java | 3 -
.../gemfire/internal/cache/KeyInfo.java | 5 +-
.../internal/cache/KeyWithRegionContext.java | 70 ---
.../gemfire/internal/cache/ListOfDeltas.java | 100 ----
.../gemfire/internal/cache/LocalRegion.java | 142 +----
.../gemstone/gemfire/internal/cache/Oplog.java | 24 +-
.../internal/cache/PRHARedundancyProvider.java | 8 -
.../internal/cache/PartitionAttributesImpl.java | 10 -
.../internal/cache/PartitionedRegion.java | 288 +---------
.../cache/PartitionedRegionDataStore.java | 16 -
.../gemfire/internal/cache/ProxyRegionMap.java | 23 +-
.../gemfire/internal/cache/QueuedOperation.java | 16 +-
.../gemfire/internal/cache/RegionEntry.java | 6 +-
.../gemfire/internal/cache/RegionMap.java | 8 +-
.../cache/RemoteContainsKeyValueMessage.java | 3 -
.../internal/cache/RemoteDestroyMessage.java | 13 +-
.../internal/cache/RemoteFetchEntryMessage.java | 3 -
.../cache/RemoteFetchVersionMessage.java | 3 -
.../internal/cache/RemoteGetMessage.java | 3 -
.../internal/cache/RemoteInvalidateMessage.java | 3 -
.../internal/cache/RemotePutAllMessage.java | 15 +-
.../internal/cache/RemotePutMessage.java | 32 +-
.../internal/cache/RemoteRemoveAllMessage.java | 6 +-
.../cache/SearchLoadAndWriteProcessor.java | 3 -
.../gemfire/internal/cache/TXEntry.java | 11 -
.../gemfire/internal/cache/TXEntryState.java | 32 +-
.../gemfire/internal/cache/TXManagerImpl.java | 20 +-
.../internal/cache/TXRegionLockRequestImpl.java | 14 +-
.../gemfire/internal/cache/TXRegionState.java | 5 -
.../gemfire/internal/cache/TXState.java | 5 +-
.../internal/cache/TXStateInterface.java | 1 -
.../cache/UpdateAttributesProcessor.java | 9 +-
.../cache/UpdateEntryVersionOperation.java | 5 -
.../gemfire/internal/cache/UpdateOperation.java | 36 +-
.../internal/cache/ValidatingDiskRegion.java | 3 -
.../internal/cache/WrappedCallbackArgument.java | 26 +-
.../gemfire/internal/cache/delta/Delta.java | 56 --
.../cache/execute/AbstractExecution.java | 18 -
.../FunctionStreamingResultCollector.java | 3 +-
.../cache/execute/InternalExecution.java | 27 +-
.../cache/execute/InternalFunctionService.java | 2 +-
.../execute/InternalRegionFunctionContext.java | 5 -
.../cache/execute/MemberFunctionExecutor.java | 7 -
.../execute/MultiRegionFunctionExecutor.java | 7 -
.../execute/RegionFunctionContextImpl.java | 13 -
.../cache/execute/ServerFunctionExecutor.java | 7 -
.../partitioned/ContainsKeyValueMessage.java | 4 -
.../cache/partitioned/DestroyMessage.java | 4 -
.../partitioned/FetchBulkEntriesMessage.java | 6 -
.../cache/partitioned/FetchEntriesMessage.java | 6 -
.../cache/partitioned/FetchEntryMessage.java | 4 -
.../cache/partitioned/FetchKeysMessage.java | 6 -
.../internal/cache/partitioned/GetMessage.java | 16 +-
.../cache/partitioned/InvalidateMessage.java | 4 -
.../cache/partitioned/PREntriesIterator.java | 8 +-
.../PRUpdateEntryVersionMessage.java | 5 -
.../cache/partitioned/PartitionMessage.java | 20 +-
.../cache/partitioned/PutAllPRMessage.java | 26 +-
.../internal/cache/partitioned/PutMessage.java | 36 +-
.../cache/partitioned/RegionAdvisor.java | 17 -
.../partitioned/RemoteFetchKeysMessage.java | 6 -
.../cache/partitioned/RemoveAllPRMessage.java | 11 +-
.../rebalance/PartitionedRegionLoadModel.java | 19 +-
.../sockets/command/GatewayReceiverCommand.java | 13 -
.../tier/sockets/command/RollbackCommand.java | 5 +
.../internal/cache/tx/DistTxEntryEvent.java | 14 +-
.../cache/wan/AbstractGatewaySender.java | 2 +-
.../AbstractGatewaySenderEventProcessor.java | 2 +-
.../wan/GatewaySenderEventCallbackArgument.java | 8 +-
.../cache/wan/GatewaySenderEventImpl.java | 13 +-
.../parallel/ParallelGatewaySenderQueue.java | 9 +-
.../cache/xmlcache/AsyncEventQueueCreation.java | 3 +-
.../xmlcache/RegionAttributesCreation.java | 2 -
.../gemfire/internal/i18n/LocalizedStrings.java | 21 +-
.../internal/logging/LoggingThreadGroup.java | 2 -
.../internal/logging/ManagerLogWriter.java | 34 --
.../gemfire/internal/logging/PureLogWriter.java | 2 -
.../gemfire/internal/offheap/OffHeapHelper.java | 1 -
.../offheap/ReferenceCountHelperImpl.java | 1 -
.../offheap/annotations/OffHeapIdentifier.java | 4 -
.../gemfire/internal/shared/NativeCalls.java | 33 +-
.../gemfire/internal/util/ArrayUtils.java | 2 +-
.../CustomEntryConcurrentHashMap.java | 2 +-
.../gemfire/cache30/MultiVMRegionTestCase.java | 138 -----
.../gemfire/distributed/LocatorDUnitTest.java | 2 +-
.../disttx/DistributedTransactionDUnitTest.java | 13 -
...wardCompatibilitySerializationDUnitTest.java | 9 -
.../PartitionedRegionTestUtilsDUnitTest.java | 43 +-
.../internal/cache/TXManagerImplTest.java | 70 ++-
.../execute/PRCustomPartitioningDUnitTest.java | 3 +-
.../FetchEntriesMessageJUnitTest.java | 1 -
.../cache/wan/MyAsyncEventListener.java | 7 +-
.../cache/wan/MyGatewayEventFilter.java | 69 +++
.../AsyncEventQueueValidationsJUnitTest.java | 56 ++
.../gemfire/test/dunit/standalone/ChildVM.java | 28 +-
geode-core/src/test/java/hydra/GsRandom.java | 311 -----------
.../test/java/hydra/HydraRuntimeException.java | 33 --
geode-core/src/test/java/hydra/Log.java | 219 --------
.../src/test/java/hydra/LogVersionHelper.java | 45 --
.../src/test/java/hydra/log/AnyLogWriter.java | 555 -------------------
.../java/hydra/log/CircularOutputStream.java | 131 -----
.../parReg/query/unittest/NewPortfolio.java | 37 +-
.../src/test/java/perffmwk/Formatter.java | 14 +-
.../sanctionedDataSerializables.txt | 173 +++---
.../codeAnalysis/sanctionedSerializables.txt | 1 -
...ntQueueConfiguredFromXmlUsesFilter.cache.xml | 40 ++
...ntQueueConfiguredFromXmlUsesFilter.cache.xml | 40 ++
.../PartitionedRegionCqQueryDUnitTest.java | 135 ++---
.../DurableClientCommandsDUnitTest.java | 13 +-
.../internal/LuceneIndexCreationProfile.java | 189 +++++++
.../lucene/internal/LuceneServiceImpl.java | 15 +-
.../internal/xml/LuceneIndexCreation.java | 9 +-
.../gemfire/cache/lucene/LuceneDUnitTest.java | 38 ++
.../lucene/LuceneIndexCreationDUnitTest.java | 281 ++++++++++
.../gemfire/cache/lucene/LuceneQueriesBase.java | 18 +-
.../LuceneIndexCreationProfileJUnitTest.java | 144 +++++
.../cache/lucene/test/LuceneTestUtilities.java | 11 +
...ifferentFieldAnalyzerSizesFails1.1.cache.xml | 37 ++
...ifferentFieldAnalyzerSizesFails1.2.cache.xml | 36 ++
...ifferentFieldAnalyzerSizesFails2.1.cache.xml | 36 ++
...ifferentFieldAnalyzerSizesFails2.2.cache.xml | 37 ++
...ifyDifferentFieldAnalyzersFails1.1.cache.xml | 36 ++
...ifyDifferentFieldAnalyzersFails1.2.cache.xml | 36 ++
...ifyDifferentFieldAnalyzersFails2.1.cache.xml | 37 ++
...ifyDifferentFieldAnalyzersFails2.2.cache.xml | 37 ++
...ifyDifferentFieldAnalyzersFails3.1.cache.xml | 37 ++
...ifyDifferentFieldAnalyzersFails3.2.cache.xml | 37 ++
...tTest.verifyDifferentFieldsFails.1.cache.xml | 36 ++
...tTest.verifyDifferentFieldsFails.2.cache.xml | 37 ++
...t.verifyDifferentIndexNamesFails.1.cache.xml | 36 ++
...t.verifyDifferentIndexNamesFails.2.cache.xml | 36 ++
...est.verifyDifferentIndexesFails1.1.cache.xml | 36 ++
...est.verifyDifferentIndexesFails1.2.cache.xml | 32 ++
...est.verifyDifferentIndexesFails2.1.cache.xml | 36 ++
...est.verifyDifferentIndexesFails2.2.cache.xml | 39 ++
178 files changed, 2220 insertions(+), 4987 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5c048b38/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
index b56f84a,4ecf3e3..37ff587
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
@@@ -106,8 -107,9 +106,7 @@@ import com.gemstone.gemfire.internal.ca
import com.gemstone.gemfire.internal.cache.TXStateProxy;
import com.gemstone.gemfire.internal.cache.Token;
import com.gemstone.gemfire.internal.cache.TombstoneService;
- import com.gemstone.gemfire.internal.cache.delta.Delta;
-import com.gemstone.gemfire.internal.cache.versions.RegionVersionHolder;
import com.gemstone.gemfire.internal.cache.versions.RegionVersionVector;
-import com.gemstone.gemfire.internal.cache.versions.VMRegionVersionVector;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.internal.offheap.MemoryAllocatorImpl;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5c048b38/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5c048b38/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
index 76d5603,06d0e08..1684586
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
@@@ -59,22 -28,16 +59,19 @@@ import com.gemstone.gemfire.internal.ca
import com.gemstone.gemfire.internal.cache.execute.data.Customer;
import com.gemstone.gemfire.internal.cache.execute.data.Order;
import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
-import com.gemstone.gemfire.test.dunit.*;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.Invoke;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
- /**
- * Port of GemFireXD's corresponding test for distributed transactions
- */
@SuppressWarnings("deprecation")
-public class DistributedTransactionDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
+
final protected String CUSTOMER_PR = "customerPRRegion";
final protected String ORDER_PR = "orderPRRegion";
final protected String D_REFERENCE = "distrReference";
@@@ -374,15 -337,9 +371,7 @@@
});
}
--
--
--
- /**
- * From GemFireXD: testTransactionalInsertOnReplicatedTable
- *
- * @throws Exception
- */
+ @Test
public void testTransactionalPutOnReplicatedRegion() throws Exception {
Host host = Host.getHost(0);
VM server1 = host.getVM(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5c048b38/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5c048b38/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
index 3bb3ecb,d1083ad..1bd35f9
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
@@@ -17,26 -17,15 +17,20 @@@
package com.gemstone.gemfire.internal.cache;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
+import static org.junit.Assert.*;
+
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
- import hydra.GsRandom;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.io.Serializable;
- import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+ import java.util.Random;
import java.util.Set;
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
++
import com.gemstone.gemfire.DataSerializable;
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.Cache;
@@@ -49,27 -38,25 +43,23 @@@ import com.gemstone.gemfire.test.dunit.
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.VM;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
* Confirm that the utils used for testing work as advertised
-- * @since GemFire 5.0
*
++ * @since GemFire 5.0
*/
-public class PartitionedRegionTestUtilsDUnitTest extends
- PartitionedRegionDUnitTestCase
-{
+@Category(DistributedTest.class)
- public class PartitionedRegionTestUtilsDUnitTest extends
- PartitionedRegionDUnitTestCase
- {
++public class PartitionedRegionTestUtilsDUnitTest extends PartitionedRegionDUnitTestCase {
++
final int totalNumBuckets = 5;
- public PartitionedRegionTestUtilsDUnitTest() {
- super();
- public PartitionedRegionTestUtilsDUnitTest(String name) {
- super(name);
-- }
/**
* Test the {@link PartitionedRegion#getSomeKeys(java.util.Random)} method, making sure it
* returns keys when there are keys and {@link java.util.Collections#EMPTY_SET} when there are none.
-- * @throws Exception
*/
+ @Test
public void testGetKeys() throws Exception {
final String r = getUniqueName();
Host host = Host.getHost(0);
@@@ -153,7 -140,7 +143,6 @@@
* Verify that it returns nodes after a value has been placed into the PartitionedRegion.
* @see PartitionedRegion#getAllNodes()
*/
--
public static class TestGetNodesKey implements DataSerializable {
int hc;
public TestGetNodesKey(int hc) { this.hc = hc; }
@@@ -162,7 -149,6 +151,8 @@@
public void toData(DataOutput out) throws IOException {out.writeInt(this.hc); }
public void fromData(DataInput in) throws IOException, ClassNotFoundException { this.hc = in.readInt(); }
}
++
+ @Test
public void testGetNodes() throws Exception {
final String r = getUniqueName();
Host host = Host.getHost(0);
@@@ -202,7 -188,7 +192,6 @@@
}
};
--
validator.invoke(createAndTest);
validator.invoke(new CacheSerializableRunnable("AssertGetNodesCreation1") {
public void run2() throws CacheException
@@@ -243,15 -229,14 +232,13 @@@
}
/**
-- * Test the test utiltities that allow investigation of a PartitionedRegion's local cache.
-- * @throws Exception
++ * Test the test utilities that allow investigation of a PartitionedRegion's local cache.
*/
+ @Test
public void testLocalCacheOps() throws Exception {
final String r = getUniqueName();
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
--// VM vm1 = host.getVM(1);
VM vm2 = host.getVM(2);
vm0.invoke(new CacheSerializableRunnable("CreatePR") {
@@@ -358,10 -343,9 +345,8 @@@
* Test the test method PartitionedRegion.getAllNodes
* Verify that it returns nodes after a value has been placed into the PartitionedRegion.
* @see PartitionedRegion#getAllNodes()
-- *
-- * @throws Exception
*/
+ @Test
public void testGetBucketKeys() throws Exception {
final String r = getUniqueName();
Host host = Host.getHost(0);
@@@ -454,9 -438,8 +439,8 @@@
/**
* Test the test method {@link PartitionedRegion#getBucketOwnersForValidation(int)}
* Verify that the information it discovers is the same as the local advisor.
-- * @throws Exception
*/
+ @Test
public void testGetBucketOwners() throws Exception {
final String rName0 = getUniqueName() + "-r0";
final String rName1 = getUniqueName() + "-r1";
@@@ -585,6 -568,6 +569,5 @@@
datastore1.invoke(oneBucketOwner);
datastore2.invoke(oneBucketOwner);
datastore3.invoke(oneBucketOwner);
--
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5c048b38/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5c048b38/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
index e8ecdc9,3055c8e..5d2e8ac
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
@@@ -19,20 -19,39 +19,35 @@@
*/
package com.gemstone.gemfire.internal.cache.wan.asyncqueue;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import static junitparams.JUnitParamsRunner.*;
+import static org.junit.Assert.*;
+
++import java.util.List;
++import java.util.concurrent.TimeUnit;
++
++import com.jayway.awaitility.Awaitility;
++import junitparams.JUnitParamsRunner;
++import junitparams.Parameters;
++import org.junit.After;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
++import org.junit.runner.RunWith;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
+ import com.gemstone.gemfire.cache.Region;
+ import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory;
+ import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.internal.cache.wan.AsyncEventQueueConfigurationException;
+ import com.gemstone.gemfire.internal.cache.wan.MyGatewayEventFilter;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+ import com.gemstone.gemfire.util.test.TestUtil;
-import com.jayway.awaitility.Awaitility;
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.CACHE_XML_FILE;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
-import static junitparams.JUnitParamsRunner.$;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- *
- */
@Category(IntegrationTest.class)
+ @RunWith(JUnitParamsRunner.class)
public class AsyncEventQueueValidationsJUnitTest {
private Cache cache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5c048b38/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index 378986a,f306cb9..2b34dbd
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@@ -17,8 -17,6 +17,7 @@@
package com.gemstone.gemfire.cache.query.cq.dunit;
import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.test.dunit.Assert.*;
- import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
import java.io.IOException;
import java.util.HashSet;
@@@ -65,17 -59,20 +64,17 @@@ import com.gemstone.gemfire.test.junit.
*
* @since GemFire 5.5
*/
-public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PartitionedRegionCqQueryDUnitTest extends JUnit4CacheTestCase {
- public PartitionedRegionCqQueryDUnitTest(String name) {
- super(name);
- }
-
-- static public final String[] regions = new String[] {
++ public static final String[] regions = new String[] {
"regionA",
"regionB"
};
-
- static public final String KEY = "key-";
++
++ public static final String KEY = "key-";
- static public final String KEY = "key-";
-
- protected final CqQueryDUnitTest cqHelper = new CqQueryDUnitTest("HelperPartitonedRegionCqTest");
+ protected final CqQueryDUnitTest cqHelper = new CqQueryDUnitTest();
public final String[] cqs = new String [] {
//0 - Test for ">"
@@@ -167,7 -166,7 +166,6 @@@
cqHelper.closeClient(client);
Wait.pause(10 * 1000);
-- //cc1 = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCqCountFromRegionProfile());
cc2 = server2.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCqCountFromRegionProfile());
//assertIndexDetailsEquals("Should have one", 0, cc1);
@@@ -220,8 -218,8 +218,6 @@@
/* queryDeletes: */ 0,
/* totalEvents: */ size);
-- //size = 2;
--
// do updates
createValues(server1, regions[0], size);
@@@ -244,8 -243,9 +240,8 @@@
cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+numDestroys);
-- // validate cqs after destroyes on server2.
++ // validate cqs after destroys on server2.
-
cqHelper.validateCQ(client, "testCQEvents_0",
/* resultSize: */ CqQueryDUnitTest.noTest,
/* creates: */ size,
@@@ -256,30 -256,30 +252,6 @@@
/* queryDeletes: */ numDestroys,
/* totalEvents: */ (size+size+numDestroys));
-- // invalidate some entries.
-- /*final int numInvalidates = 5;
--
-- server2.invoke(new CacheSerializableRunnable("Invalidate values") {
-- public void run2() throws CacheException {
-- Region region1 = getRootRegion().getSubregion(regions[0]);
-- for (int i = numInvalidates; i <= (numInvalidates+4); i++) {
-- region1.invalidate(KEY+i);
-- }
-- }
-- });
--
-- cqHelper.waitForInvalidated(client, "testCQEvents_0", KEY+(numInvalidates+4));
-- */
-- // cqHelper.validateCQ(client, "testCQEvents_0",
-- // /* resultSize: */ cqHelper.noTest,
-- // /* creates: */ size,
-- // /* updates: */ size,
-- // /* deletes; */ (numDestroys+numInvalidates),
-- // /* queryInserts: */ size,
-- // /* queryUpdates: */ size,
-- // /* queryDeletes: */ (numDestroys+numInvalidates),
-- // /* totalEvents: */ (size+size+numDestroys + numInvalidates));
--
cqHelper.closeClient(client);
cqHelper.closeServer(server2);
cqHelper.closeServer(server1);
@@@ -334,8 -333,8 +306,6 @@@
/* queryDeletes: */ 0,
/* totalEvents: */ size);
-- //size = 2;
--
// do updates
createValues(server1, regions[0], size);
@@@ -363,9 -362,9 +333,8 @@@
cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
}
-- // validate cqs after destroyes on server2.
++ // validate cqs after destroys on server2.
--
cqHelper.validateCQ(client, "testCQEvents_0",
/* resultSize: */ CqQueryDUnitTest.noTest,
/* creates: */ size,
@@@ -425,8 -424,8 +394,6 @@@
/* queryDeletes: */ 0,
/* totalEvents: */ size);
-- //size = 2;
--
// do updates
createValues(server1, regions[0], size);
@@@ -445,7 -444,7 +412,6 @@@
/* queryDeletes: */ 0,
/* totalEvents: */ (size+size));
--
// destroy all the values.
int numDestroys = size;
cqHelper.deleteValues(server1,regions[0], numDestroys);
@@@ -631,7 -637,7 +597,6 @@@
/* queryDeletes: */ 0,
/* totalEvents: */ (size+size));
--
// invalidate all the values.
int numInvalidates = size;
cqHelper.invalidateValues(server2,regions[0], numInvalidates);
@@@ -911,8 -927,11 +876,7 @@@
// do updates
createValues(client2, regions[0], size);
createValues(client2, regions[1], size);
--
--
++
for (int i=1; i <= size; i++){
cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
cqHelper.waitForUpdated(client, "testCQEvents_1", KEY+i);
@@@ -1275,7 -1394,7 +1239,6 @@@
region.put("KEY-"+i, p);
}
}
--
});
client1.invokeAsync(new CacheSerializableRunnable("Wait for CqEvent") {
@@@ -1375,27 -1496,36 +1336,27 @@@
"Create Cache Server") {
public void run2() throws CacheException
{
-- LogWriterUtils.getLogWriter().info("### Create Cache Server. ###");
- //AttributesFactory factory = new AttributesFactory();
- //factory.setScope(Scope.DISTRIBUTED_ACK);
- //factory.setMirrorType(MirrorType.KEYS_VALUES);
-
- //int maxMem = 0;
-- AttributesFactory attr = new AttributesFactory();
- //attr.setValueConstraint(valueConstraint);
-- PartitionAttributesFactory paf = new PartitionAttributesFactory();
-- if (isAccessor){
-- paf.setLocalMaxMemory(0);
-- }
-- PartitionAttributes prAttr = paf.setTotalNumBuckets(197).setRedundantCopies(redundantCopies).create();
-- attr.setPartitionAttributes(prAttr);
--
-- assertFalse(getSystem().isLoner());
-- //assertTrue(getSystem().getDistributionManager().getOtherDistributionManagerIds().size() > 0);
-- for (int i = 0; i < regions.length; i++) {
-- Region r = createRegion(regions[i], attr.create());
-- LogWriterUtils.getLogWriter().info("Server created the region: "+r);
-- }
-// pause(2000);
-- try {
-- startBridgeServer(port, true);
-- }
-- catch (Exception ex) {
-- Assert.fail("While starting CacheServer", ex);
-- }
-// pause(2000);
-
++ LogWriterUtils.getLogWriter().info("### Create Cache Server. ###");
++ AttributesFactory attr = new AttributesFactory();
++ PartitionAttributesFactory paf = new PartitionAttributesFactory();
++ if (isAccessor){
++ paf.setLocalMaxMemory(0);
++ }
++ PartitionAttributes prAttr = paf.setTotalNumBuckets(197).setRedundantCopies(redundantCopies).create();
++ attr.setPartitionAttributes(prAttr);
++
++ assertFalse(getSystem().isLoner());
++ //assertTrue(getSystem().getDistributionManager().getOtherDistributionManagerIds().size() > 0);
++ for (int i = 0; i < regions.length; i++) {
++ Region r = createRegion(regions[i], attr.create());
++ LogWriterUtils.getLogWriter().info("Server created the region: "+r);
++ }
++ try {
++ startBridgeServer(port, true);
++ }
++ catch (Exception ex) {
++ Assert.fail("While starting CacheServer", ex);
++ }
}
};
@@@ -1415,27 -1545,35 +1376,27 @@@
"Create Cache Server") {
public void run2() throws CacheException
{
-- LogWriterUtils.getLogWriter().info("### Create Cache Server. ###");
- //AttributesFactory factory = new AttributesFactory();
- //factory.setScope(Scope.DISTRIBUTED_ACK);
- //factory.setMirrorType(MirrorType.KEYS_VALUES);
-
- //int maxMem = 0;
-- AttributesFactory attr = new AttributesFactory();
- //attr.setValueConstraint(valueConstraint);
-- PartitionAttributesFactory paf = new PartitionAttributesFactory();
-- if (isAccessor){
-- paf.setLocalMaxMemory(0);
-- }
-- PartitionAttributes prAttr = paf.setTotalNumBuckets(1).setRedundantCopies(redundantCopies).create();
-- attr.setPartitionAttributes(prAttr);
--
-- assertFalse(getSystem().isLoner());
-- //assertTrue(getSystem().getDistributionManager().getOtherDistributionManagerIds().size() > 0);
-- for (int i = 0; i < regions.length; i++) {
-- Region r = createRegionWithoutRoot(regions[i], attr.create());
-- LogWriterUtils.getLogWriter().info("Server created the region: "+r);
-- }
-// pause(2000);
-- try {
-- startBridgeServer(port, true);
-- }
-- catch (Exception ex) {
-- Assert.fail("While starting CacheServer", ex);
-- }
-// pause(2000);
++ LogWriterUtils.getLogWriter().info("### Create Cache Server. ###");
++ AttributesFactory attr = new AttributesFactory();
++ PartitionAttributesFactory paf = new PartitionAttributesFactory();
++ if (isAccessor){
++ paf.setLocalMaxMemory(0);
++ }
++ PartitionAttributes prAttr = paf.setTotalNumBuckets(1).setRedundantCopies(redundantCopies).create();
++ attr.setPartitionAttributes(prAttr);
++
++ assertFalse(getSystem().isLoner());
++ //assertTrue(getSystem().getDistributionManager().getOtherDistributionManagerIds().size() > 0);
++ for (int i = 0; i < regions.length; i++) {
++ Region r = createRegionWithoutRoot(regions[i], attr.create());
++ LogWriterUtils.getLogWriter().info("Server created the region: "+r);
++ }
++ try {
++ startBridgeServer(port, true);
++ }
++ catch (Exception ex) {
++ Assert.fail("While starting CacheServer", ex);
++ }
}
private Region createRegionWithoutRoot(String regionName,