[3/3] incubator-geode git commit: Author: Lise Storc <lst...@pivotal.io> Date: Thu Jun 4 14:43:01 2015 -0700
Author: Lise StorcDate: Thu Jun 4 14:43:01 2015 -0700 Reunite open and closed source hydra classes and various other test classes. This is to remove the hydra dependency on gemfire-core test. Moved some classes around and duplicated others as part of reuniting packages. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2efff3f0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2efff3f0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2efff3f0 Branch: refs/heads/GEODE-308 Commit: 2efff3f0146ea47f55ec8033b0c8b280546b25f5 Parents: ba74e9e Author: Lynn Gallinat Authored: Thu Sep 24 09:46:15 2015 -0700 Committer: Lynn Gallinat Committed: Thu Sep 24 09:46:15 2015 -0700 -- .../batterytest/greplogs/ExpectedStrings.java | 179 -- .../java/batterytest/greplogs/LogConsumer.java | 288 -- .../gemstone/gemfire/TestDataSerializer.java| 2 +- .../com/gemstone/gemfire/UnitTestDoclet.java| 21 +- .../management/MemoryThresholdsDUnitTest.java | 3 +- .../gemfire/cache/query/data/NewPortfolio.java | 246 + .../gemfire/cache/query/data/NewPosition.java | 153 ++ ...esourceManagerWithQueryMonitorDUnitTest.java | 3 +- .../cache/query/functional/MiscJUnitTest.java | 2 +- .../index/CompactRangeIndexJUnitTest.java | 2 +- .../PRColocatedEquiJoinDUnitTest.java | 5 +- .../query/partitioned/PRQueryDUnitHelper.java | 6 +- .../cache30/CacheSerializableRunnable.java | 1 - .../gemfire/cache30/SearchAndLoadDUnitTest.java | 1 - .../gemfire/distributed/internal/LDM.java | 2 +- .../PartitionedRegionTestUtilsDUnitTest.java| 5 +- .../internal/cache/SystemFailureDUnitTest.java | 3 +- .../cache/control/MemoryMonitorJUnitTest.java | 2 +- .../cache/execute/MyTransactionFunction.java| 2 +- .../cache/execute/PRTransactionDUnitTest.java | 3 +- .../cache/ha/HARQueueNewImplDUnitTest.java | 3 +- .../cache/ha/HARegionQueueDUnitTest.java| 3 +- .../PersistentRVVRecoveryDUnitTest.java | 3 +- .../DestroyEntryPropagationDUnitTest.java | 3 +- .../gemfire/pdx/VersionClassLoader.java | 1 - .../src/test/java/dunit/MethExecutor.java | 384 + .../src/test/java/dunit/MethExecutorResult.java | 184 +++ .../src/test/java/dunit/RemoteDUnitVMIF.java| 2 +- .../src/test/java/dunit/TestException.java | 27 + gemfire-core/src/test/java/dunit/VM.java| 2 - .../src/test/java/dunit/standalone/ChildVM.java | 13 - .../java/dunit/standalone/DUnitLauncher.java| 11 +- .../java/dunit/standalone/RemoteDUnitVM.java| 5 +- gemfire-core/src/test/java/hydra/GsRandom.java | 303 -- .../test/java/hydra/HydraRuntimeException.java | 24 - gemfire-core/src/test/java/hydra/Log.java | 210 --- .../src/test/java/hydra/LogVersionHelper.java | 36 -- .../src/test/java/hydra/MethExecutor.java | 383 - .../src/test/java/hydra/MethExecutorResult.java | 177 -- .../src/test/java/hydra/SchedulingOrder.java| 27 - .../src/test/java/hydra/log/AnyLogWriter.java | 546 --- .../java/hydra/log/CircularOutputStream.java| 122 - .../parReg/query/unittest/NewPortfolio.java | 263 - .../java/parReg/query/unittest/Position.java| 154 -- .../src/test/java/perffmwk/Formatter.java | 139 - .../src/test/java/util/TestException.java | 26 - .../test/junit/greplogs/ExpectedStrings.java| 180 ++ .../test/junit/greplogs/LogConsumer.java| 289 ++ 48 files changed, 1508 insertions(+), 2941 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2efff3f0/gemfire-core/src/test/java/batterytest/greplogs/ExpectedStrings.java -- diff --git a/gemfire-core/src/test/java/batterytest/greplogs/ExpectedStrings.java b/gemfire-core/src/test/java/batterytest/greplogs/ExpectedStrings.java deleted file mode 100644 index 3bb47d4..000 --- a/gemfire-core/src/test/java/batterytest/greplogs/ExpectedStrings.java +++ /dev/null @@ -1,179 +0,0 @@ -/*= - * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved. - * This product is protected by U.S. and international copyright - * and intellectual property laws. Pivotal products are covered by - * one or more patents listed at http://www.pivotal.io/patents. - *= - */ -/** - * - */ -package batterytest.greplogs; - -import java.util.List; -import
[2/2] incubator-geode git commit: GEODE-77 fixes for failing unit and integration tests
GEODE-77 fixes for failing unit and integration tests if the coordinator returned by locators doesn't work we now ask other members in the view returned by the locator leave & crash events now ack the view currently being installed so that it won't wait for the associated members views are always installed using the two-phase protocol. GemFire did this and some algorithms, such as rebalancing, are thrown off if departed members are in the view when a rebalance starts. views are always transmitted by the View Creator thread. GMSJoinLeave.becomeCoordinator() installs an initial view into the View Creator before starting it if there is a view to prepare and install. Rebalance operations targetting a new member were failing to achieve balance if an old ID for that member was still in the membership view. We now detect those old IDs and remove them when the new member joins. ClientProxyMembershipID was not being deserialized properly after being transmitted from one member to another. HealthMonitor classes with Ping in their names are renamed to Check. I've found that Ping confuses people - they sometimes think that gemfire is using network ping protocol HealthMonitor beSick/playDead were tightened up HealthMonitor was not recording activity from other members unless it was currently watching that member. This caused a lot of unnecessary suspicion when switching from one member to another. HealthMonitor wasn't clear about who was raising suspicion and who was the target of the suspicion. FindCoordinatorRequest was using java serialization for rejected coordinator IDs. GMSMembershipManager's latestViewLock use wasn't quite the same as in the membership manager in GemFire 8.2 and caused a deadlock. fixing GEODE-360: PRTombstoneMessage should ignore ForceReattemptException LogFileParser wasn't recognizing timestamps for thread dumps, causing them to be mis-sorted when merging log files. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/eab327f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/eab327f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/eab327f6 Branch: refs/heads/feature/GEODE-77 Commit: eab327f6a2b9bc2ca715464f61b4388ce304df2f Parents: 99e50c1 Author: Bruce SchuchardtAuthored: Thu Sep 24 15:54:30 2015 -0700 Committer: Bruce Schuchardt Committed: Thu Sep 24 15:54:30 2015 -0700 -- .../internal/DistributionManager.java | 5 +- .../internal/InternalDistributedSystem.java | 2 - .../distributed/internal/InternalLocator.java | 4 - .../internal/membership/MembershipManager.java | 3 +- .../internal/membership/NetView.java| 4 +- .../internal/membership/gms/Services.java | 2 +- .../membership/gms/fd/GMSHealthMonitor.java | 149 +++-- .../gms/locator/FindCoordinatorRequest.java | 24 +- .../gms/locator/FindCoordinatorResponse.java| 71 ++- .../membership/gms/locator/GMSLocator.java | 41 +- .../membership/gms/membership/GMSJoinLeave.java | 584 ++- .../gms/messages/CheckRequestMessage.java | 64 ++ .../gms/messages/CheckResponseMessage.java | 54 ++ .../gms/messages/InstallViewMessage.java| 3 +- .../gms/messages/LeaveRequestMessage.java | 3 +- .../gms/messages/PingRequestMessage.java| 64 -- .../gms/messages/PingResponseMessage.java | 54 -- .../gms/messages/RemoveMemberMessage.java | 3 +- .../gms/messenger/JGroupsMessenger.java | 2 + .../gms/mgr/GMSMembershipManager.java | 98 ++-- .../gemstone/gemfire/internal/DSFIDFactory.java | 8 +- .../internal/DataSerializableFixedID.java | 4 +- .../cache/partitioned/PRTombstoneMessage.java | 3 +- .../cache/tier/sockets/CacheClientNotifier.java | 8 +- .../tier/sockets/ClientProxyMembershipID.java | 9 + .../cache/tier/sockets/ServerConnection.java| 2 +- .../gemfire/internal/logging/LogFileParser.java | 8 + ...ckOverflowRegionCCECompressionDUnitTest.java | 61 -- ...PersistentRegionCCECompressionDUnitTest.java | 62 -- ...tributedNoAckRegionCompressionDUnitTest.java | 62 -- .../GlobalRegionCompressionDUnitTest.java | 61 -- .../gemfire/distributed/LocatorDUnitTest.java | 42 +- .../membership/MembershipJUnitTest.java | 20 +- .../membership/gms/MembershipManagerHelper.java | 9 +- .../membership/GMSHealthMonitorJUnitTest.java | 44 +- .../gms/membership/GMSJoinLeaveJUnitTest.java | 42 ++ .../PRFunctionExecutionTimeOutDUnitTest.java| 1 + .../java/dunit/standalone/DUnitLauncher.java| 4 +- 38 files changed, 969 insertions(+), 715 deletions(-)
incubator-geode git commit: GEODE-77 adding interface missing from previous commit
Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-77 eab327f6a -> ad7fc9ce8 GEODE-77 adding interface missing from previous commit Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ad7fc9ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ad7fc9ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ad7fc9ce Branch: refs/heads/feature/GEODE-77 Commit: ad7fc9ce881cfbe01124e0b3460252f79778398c Parents: eab327f Author: Bruce SchuchardtAuthored: Thu Sep 24 15:56:33 2015 -0700 Committer: Bruce Schuchardt Committed: Thu Sep 24 15:56:33 2015 -0700 -- .../internal/membership/gms/messages/HasMemberID.java | 9 + 1 file changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fc9ce/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/HasMemberID.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/HasMemberID.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/HasMemberID.java new file mode 100755 index 000..f6d22a1 --- /dev/null +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/HasMemberID.java @@ -0,0 +1,9 @@ +package com.gemstone.gemfire.distributed.internal.membership.gms.messages; + +import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; + +public interface HasMemberID { + + public InternalDistributedMember getMemberID(); + +}
[21/21] incubator-geode git commit: GEODE-196: Remove unneeded system out in RuntimeIterator
GEODE-196: Remove unneeded system out in RuntimeIterator Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d420f7e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d420f7e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d420f7e8 Branch: refs/heads/feature/GEODE-189 Commit: d420f7e87b0d5f913556965cf151a7658970c36c Parents: bd8317e Author: Jason HuynhAuthored: Thu Aug 13 11:13:51 2015 -0700 Committer: Kirk Lund Committed: Thu Aug 13 11:39:50 2015 -0700 -- .../gemstone/gemfire/cache/query/internal/RuntimeIterator.java| 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d420f7e8/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/RuntimeIterator.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/RuntimeIterator.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/RuntimeIterator.java index 5b3944a..6bf0da2 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/RuntimeIterator.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/RuntimeIterator.java @@ -137,9 +137,6 @@ public class RuntimeIterator extends AbstractCompiledValue { } public Object evaluate(ExecutionContext context) { -if(current == UNINITIALIZED) { - System.out.println("asif"); -} Support.Assert(current != UNINITIALIZED, "error to evaluate RuntimeIterator without setting current first"); return this.current;
[18/21] incubator-geode git commit: GEODE-116: CopyOnReadIndexDUnitTest.testPRQueryOnLocalNode fails assertion
GEODE-116: CopyOnReadIndexDUnitTest.testPRQueryOnLocalNode fails assertion Use a wait criterion incase the indexes are async for some reason Check index size instead of local pr size when comparing instance counts Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/75fa0d98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/75fa0d98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/75fa0d98 Branch: refs/heads/feature/GEODE-189 Commit: 75fa0d980801a48fedb0a3b06344e6cd9ffb18b5 Parents: da878cf Author: Jason HuynhAuthored: Tue Aug 11 14:01:15 2015 -0700 Committer: Kirk Lund Committed: Thu Aug 13 11:39:48 2015 -0700 -- .../index/CopyOnReadIndexDUnitTest.java | 68 1 file changed, 41 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/75fa0d98/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java -- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java index 11cce7e..61bb55d 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java @@ -24,6 +24,7 @@ import com.gemstone.gemfire.cache.CommitConflictException; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientCacheFactory; +import com.gemstone.gemfire.cache.query.Index; import com.gemstone.gemfire.cache.query.Query; import com.gemstone.gemfire.cache.query.QueryService; import com.gemstone.gemfire.cache.query.QueryTestUtils; @@ -31,7 +32,6 @@ import com.gemstone.gemfire.cache.query.SelectResults; import com.gemstone.gemfire.cache.query.Struct; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.data.Position; -import com.gemstone.gemfire.cache.query.internal.DefaultQueryService; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; @@ -39,8 +39,8 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.PartitionedRegion; -import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil; +import dunit.DistributedTestCase; import dunit.Host; import dunit.SerializableCallable; import dunit.SerializableRunnable; @@ -157,13 +157,14 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase { //operations we have done on this vm consist of: //numPortfoliosPerVM instances of Portfolio created for put operation //Due to index, we have deserialized all of the entries this vm currently host - assertEquals("Incorrect number of portfolio instances"+ Portfolio.instanceCount.get(),((PartitionedRegion)region).getLocalSize() + numPortfoliosPerVM , Portfolio.instanceCount.get()); + Index index = getCache().getQueryService().getIndex(region, "idIndex"); + DistributedTestCase.waitForCriterion(verifyPortfolioCount((int)index.getStatistics().getNumberOfValues() + numPortfoliosPerVM), 5000, 200, true); } else { //operations we have done on this vm consist of: //numPortfoliosPerVM instances of Portfolio created for put operation //We do not have an index, so we have not deserialized any values - assertEquals("Incorrect number of portfolio instances"+ Portfolio.instanceCount.get(), numPortfoliosPerVM , Portfolio.instanceCount.get()); + DistributedTestCase.waitForCriterion(verifyPortfolioCount(numPortfoliosPerVM), 5000, 200, true); } return null; } @@ -184,13 +185,14 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase { //operations we have done on this vm consist of: //numPortfoliosPerVM instances of Portfolio created for put operation //Due to index, we have deserialized all of the entries this vm currently host - assertEquals("Incorrect number of portfolio instances"+ Portfolio.instanceCount.get(), ((PartitionedRegion)region).getLocalSize() + numPortfoliosPerVM,
[10/21] incubator-geode git commit: Fix for GEODE-109
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d2296bb/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/FlushAllExecutor.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/FlushAllExecutor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/FlushAllExecutor.java index 7f8d4e0..40c22b6 100755 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/FlushAllExecutor.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/FlushAllExecutor.java @@ -2,6 +2,7 @@ package com.gemstone.gemfire.internal.redis.executor; import java.util.Map.Entry; +import com.gemstone.gemfire.cache.EntryDestroyedException; import com.gemstone.gemfire.cache.UnsupportedOperationInTransactionException; import com.gemstone.gemfire.internal.redis.Coder; import com.gemstone.gemfire.internal.redis.Command; @@ -15,11 +16,15 @@ public class FlushAllExecutor extends AbstractExecutor { if (context.hasTransaction()) throw new UnsupportedOperationInTransactionException(); -for (Entrye: context.getRegionCache().metaEntrySet()) { - String skey = e.getKey(); - RedisDataType type = e.getValue(); - removeEntry(Coder.stringToByteWrapper(skey), type, context); - +for (Entry e: context.getRegionProvider().metaEntrySet()) { + try { +String skey = e.getKey(); +RedisDataType type = e.getValue(); +removeEntry(Coder.stringToByteWrapper(skey), type, context); + } catch (EntryDestroyedException e1) { +continue; + } + } command.setResponse(Coder.getSimpleStringResponse(context.getByteBufAllocator(), "OK")); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d2296bb/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/KeysExecutor.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/KeysExecutor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/KeysExecutor.java index 4276e9f..2588217 100755 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/KeysExecutor.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/KeysExecutor.java @@ -11,7 +11,7 @@ import com.gemstone.gemfire.internal.redis.Command; import com.gemstone.gemfire.internal.redis.ExecutionHandlerContext; import com.gemstone.gemfire.internal.redis.RedisConstants; import com.gemstone.gemfire.internal.redis.RedisConstants.ArityDef; -import com.gemstone.gemfire.internal.redis.executor.org.apache.hadoop.fs.GlobPattern; +import com.gemstone.gemfire.internal.redis.org.apache.hadoop.fs.GlobPattern; import com.gemstone.gemfire.redis.GemFireRedisServer; public class KeysExecutor extends AbstractExecutor { @@ -25,7 +25,7 @@ public class KeysExecutor extends AbstractExecutor { } String glob = Coder.bytesToString(commandElems.get(1)); -Set allKeys = context.getRegionCache().metaKeySet(); +Set allKeys = context.getRegionProvider().metaKeySet(); List matchingKeys = new ArrayList(); Pattern pattern; @@ -37,8 +37,7 @@ public class KeysExecutor extends AbstractExecutor { } for (String key: allKeys) { - if (!(key.equals(GemFireRedisServer.LISTS_META_DATA_REGION) || - key.equals(GemFireRedisServer.REDIS_META_DATA_REGION) || + if (!(key.equals(GemFireRedisServer.REDIS_META_DATA_REGION) || key.equals(GemFireRedisServer.STRING_REGION) || key.equals(GemFireRedisServer.HLL_REGION)) && pattern.matcher(key).matches()) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d2296bb/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/ListQuery.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/ListQuery.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/ListQuery.java index 3980061..4ae9990 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/ListQuery.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/ListQuery.java @@ -4,19 +4,19 @@ public enum ListQuery { LINDEX { public String getQueryString(String fullpath) { - return "SELECT DISTINCT entry.key, entry.value FROM " + fullpath + ".entrySet entry ORDER BY key asc LIMIT $1"; + return "SELECT DISTINCT entry.key, entry.value FROM " + fullpath + ".entrySet entry WHERE key != 'head' AND key != 'tail' ORDER BY key asc LIMIT $1"; } }, LRANGE { public String getQueryString(String fullpath) { -
[20/21] incubator-geode git commit: GEODE-195: Remove debug logging from CloseCacheAuthorization
GEODE-195: Remove debug logging from CloseCacheAuthorization Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bd8317e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bd8317e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bd8317e2 Branch: refs/heads/feature/GEODE-189 Commit: bd8317e2440fe5e501e57910aa9d633ab890932b Parents: 12e1c1d Author: Jason HuynhAuthored: Thu Aug 13 11:10:08 2015 -0700 Committer: Kirk Lund Committed: Thu Aug 13 11:39:50 2015 -0700 -- .../gemfire/cache/query/dunit/CloseCacheAuthorization.java | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd8317e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CloseCacheAuthorization.java -- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CloseCacheAuthorization.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CloseCacheAuthorization.java index d269ddc..b259c60 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CloseCacheAuthorization.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CloseCacheAuthorization.java @@ -36,8 +36,6 @@ public class CloseCacheAuthorization extends TestCase implements AccessControl { @Override public boolean authorizeOperation(String regionName, OperationContext context) { -this.logger.info(" JASON Authorizing request " + context.getOperationCode() + " class:" + context.getClass().getName()); -new Exception("JASON authz stack").printStackTrace(); if (context instanceof ExecuteCQOperationContext) { cache.close(); //return false;
[01/21] incubator-geode git commit: Fix GEODE-186 by removing sleeps in tests
Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-189 84824e99c -> d420f7e87 Fix GEODE-186 by removing sleeps in tests The old test scheduled tx suspension to timeout after 1 minute. So the test always run for at least 1 minute. A test hook now exists that allows the test to specify a different time unit (default is still minutes) for tx suspension expiration. The sleeps in a bunch of other tests were not needed since the tx operation is synchronous. So those sleeps have simply been removed. A couple of sleeps in clients waiting for something to arrive that was done on a server have been converted to a wait since server to client distribution is async. Reviewed by Swapnil. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4c9ed50c Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4c9ed50c Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4c9ed50c Branch: refs/heads/feature/GEODE-189 Commit: 4c9ed50ccf9ae0f706700d2cfe30d6b71417232e Parents: 84824e9 Author: Darrel SchneiderAuthored: Tue Aug 4 11:43:39 2015 -0700 Committer: Kirk Lund Committed: Thu Aug 13 11:39:38 2015 -0700 -- .../gemfire/internal/cache/TXManagerImpl.java | 11 +-- .../cache/ClientServerTransactionDUnitTest.java | 32 ++-- .../cache/RemoteTransactionDUnitTest.java | 30 -- 3 files changed, 45 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4c9ed50c/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java index 88714b0..dde3793 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java @@ -1117,6 +1117,10 @@ public final class TXManagerImpl implements CacheTransactionManager, private ConcurrentMap suspendedTXs = new ConcurrentHashMap (); public TransactionId suspend() { +return suspend(TimeUnit.MINUTES); + } + + TransactionId suspend(TimeUnit expiryTimeUnit) { TXStateProxy result = getTXState(); if (result != null) { TransactionId txId = result.getTransactionId(); @@ -1137,7 +1141,7 @@ public final class TXManagerImpl implements CacheTransactionManager, LockSupport.unpark(waitingThread); } } - scheduleExpiry(txId); + scheduleExpiry(txId, expiryTimeUnit); return txId; } return null; @@ -1266,8 +1270,9 @@ public final class TXManagerImpl implements CacheTransactionManager, /** * schedules the transaction to expire after {@link #suspendedTXTimeout} * @param txId + * @param expiryTimeUnit the time unit to use when scheduling the expiration */ - private void scheduleExpiry(TransactionId txId) { + private void scheduleExpiry(TransactionId txId, TimeUnit expiryTimeUnit) { final GemFireCacheImpl cache = (GemFireCacheImpl) this.cache; if (suspendedTXTimeout < 0) { if (logger.isDebugEnabled()) { @@ -1279,7 +1284,7 @@ public final class TXManagerImpl implements CacheTransactionManager, if (logger.isDebugEnabled()) { logger.debug("TX: scheduling transaction: {} to expire after:{}", txId, suspendedTXTimeout); } -cache.getCCPTimer().schedule(task, suspendedTXTimeout*60*1000); +cache.getCCPTimer().schedule(task, TimeUnit.MILLISECONDS.convert(suspendedTXTimeout, expiryTimeUnit)); this.expiryTasks.put(txId, task); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4c9ed50c/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java -- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java index 3ce8cec..d80f6bb 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java @@ -16,6 +16,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import javax.naming.Context; import
[08/21] incubator-geode git commit: Fix for GEODE-109
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d2296bb/gemfire-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java -- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java new file mode 100755 index 000..4adfe07 --- /dev/null +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java @@ -0,0 +1,414 @@ +package com.gemstone.gemfire.redis; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Random; +import java.util.Set; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import redis.clients.jedis.Jedis; +import redis.clients.jedis.Tuple; + +import com.gemstone.gemfire.cache.CacheFactory; +import com.gemstone.gemfire.cache.GemFireCache; +import com.gemstone.gemfire.internal.AvailablePortHelper; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; + +@Category(IntegrationTest.class) +public class SortedSetsJUnitTest { + private static Jedis jedis; + private static GemFireRedisServer server; + private static GemFireCache cache; + private static Random rand; + private static int port = 6379; + + @BeforeClass + public static void setUp() throws IOException { +rand = new Random(); +CacheFactory cf = new CacheFactory(); +//cf.set("log-file", "redis.log"); +cf.set("log-level", "error"); +cf.set("mcast-port", "0"); +cf.set("locators", ""); +cache = cf.create(); +port = AvailablePortHelper.getRandomAvailableTCPPort(); +server = new GemFireRedisServer("localhost", port); + +server.start(); +jedis = new Jedis("localhost", port, 1000); + } + + @Test + public void testZAddZRange() { +int numMembers = 10; +String key = randString(); +MapscoreMembers = new HashMap (); + +for (int i = 0; i < numMembers; i++) + scoreMembers.put(randString(), rand.nextDouble()); + +jedis.zadd(key, scoreMembers); +int k = 0; +for (String entry: scoreMembers.keySet()) + assertNotNull(jedis.zscore(key, entry)); + +Set results = jedis.zrangeWithScores(key, 0, -1); +Map resultMap = new HashMap (); +for (Tuple t: results) { + resultMap.put(t.getElement(), t.getScore()); +} + +assertEquals(scoreMembers, resultMap); + +for (int i = 0; i < 10; i++) { + int start; + int stop; + do { +start = rand.nextInt(numMembers); +stop = rand.nextInt(numMembers); + } while (start > stop); + results = jedis.zrangeWithScores(key, start, stop); + List > resultList = new ArrayList >(); + for (Tuple t: results) +resultList.add(new AbstractMap.SimpleEntry (t.getElement(), t.getScore())); + List > list = new ArrayList >(scoreMembers.entrySet()); + Collections.sort(list, new EntryCmp()); + list = list.subList(start, stop + 1); + assertEquals(list, resultList); +} + } + + @Test + public void testZRevRange() { +int numMembers = 10; +String key = randString(); + +Map scoreMembers = new HashMap (); + +for (int i = 0; i < numMembers; i++) + scoreMembers.put(randString(), rand.nextDouble()); + +jedis.zadd(key, scoreMembers); + +Set results; + +for (int i = 0; i < 10; i++) { + int start; + int stop; + do { +start = rand.nextInt(numMembers); +stop = rand.nextInt(numMembers); + } while (start > stop); + results = jedis.zrevrangeWithScores(key, start, stop); + List > resultList = new ArrayList >(); + for (Tuple t: results) +resultList.add(new AbstractMap.SimpleEntry (t.getElement(), t.getScore())); + List > list = new ArrayList >(scoreMembers.entrySet()); + Collections.sort(list, new EntryRevCmp()); + list = list.subList(start, stop + 1); + assertEquals(list, resultList); +} + } + + @Test + public void testZCount() { +int num = 10; +int runs = 2; +for (int i = 0; i < runs; i++) { + Double min; + Double max; + do { +min = rand.nextDouble(); +max =
[14/21] incubator-geode git commit: GEODE-138: remove race condition from testEventDelivery
GEODE-138: remove race condition from testEventDelivery The race due to the test expecting local event delivery to be synchronous but the implementation of off-heap resource manager events being async. The test has been changed to always use a wait criteria when waiting for a memory event to arrive. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7d510f5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7d510f5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7d510f5b Branch: refs/heads/feature/GEODE-189 Commit: 7d510f5b9d5b99fc81844cafcb15ab40fb0da1ec Parents: 15c62f3 Author: Darrel SchneiderAuthored: Mon Aug 10 14:24:58 2015 -0700 Committer: Kirk Lund Committed: Thu Aug 13 11:39:46 2015 -0700 -- .../MemoryThresholdsOffHeapDUnitTest.java | 42 ++-- 1 file changed, 22 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d510f5b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java -- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java index 0b704a6..83b8608 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java @@ -146,14 +146,14 @@ public class MemoryThresholdsOffHeapDUnitTest extends BridgeTestCase { // NORMAL -> EVICTION setUsageAboveEvictionThreshold(server2, regionName); verifyListenerValue(server1, MemoryState.EVICTION, 1, true); -verifyListenerValue(server2, MemoryState.EVICTION, 1, false); +verifyListenerValue(server2, MemoryState.EVICTION, 1, true); // EVICTION -> CRITICAL setUsageAboveCriticalThreshold(server2, regionName); verifyListenerValue(server1, MemoryState.CRITICAL, 1, true); -verifyListenerValue(server2, MemoryState.CRITICAL, 1, false); +verifyListenerValue(server2, MemoryState.CRITICAL, 1, true); verifyListenerValue(server1, MemoryState.EVICTION, 2, true); -verifyListenerValue(server2, MemoryState.EVICTION, 2, false); +verifyListenerValue(server2, MemoryState.EVICTION, 2, true); // CRITICAL -> CRITICAL server2.invoke(new SerializableCallable() { @@ -168,9 +168,9 @@ public class MemoryThresholdsOffHeapDUnitTest extends BridgeTestCase { } }); verifyListenerValue(server1, MemoryState.CRITICAL, 1, true); -verifyListenerValue(server2, MemoryState.CRITICAL, 1, false); +verifyListenerValue(server2, MemoryState.CRITICAL, 1, true); verifyListenerValue(server1, MemoryState.EVICTION, 2, true); -verifyListenerValue(server2, MemoryState.EVICTION, 2, false); +verifyListenerValue(server2, MemoryState.EVICTION, 2, true); // CRITICAL -> EVICTION server2.invoke(new SerializableCallable() { @@ -185,7 +185,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends BridgeTestCase { } }); verifyListenerValue(server1, MemoryState.EVICTION, 3, true); -verifyListenerValue(server2, MemoryState.EVICTION, 3, false); +verifyListenerValue(server2, MemoryState.EVICTION, 3, true); // EVICTION -> EVICTION server2.invoke(new SerializableCallable() { @@ -198,7 +198,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends BridgeTestCase { } }); verifyListenerValue(server1, MemoryState.EVICTION, 3, true); -verifyListenerValue(server2, MemoryState.EVICTION, 3, false); +verifyListenerValue(server2, MemoryState.EVICTION, 3, true); // EVICTION -> NORMAL server2.invoke(new SerializableCallable() { @@ -215,9 +215,9 @@ public class MemoryThresholdsOffHeapDUnitTest extends BridgeTestCase { verifyListenerValue(server1, MemoryState.EVICTION, 3, true); verifyListenerValue(server1, MemoryState.NORMAL, 1, true); -verifyListenerValue(server2, MemoryState.CRITICAL, 1, false); -verifyListenerValue(server2, MemoryState.EVICTION, 3, false); -verifyListenerValue(server2, MemoryState.NORMAL, 1, false); +verifyListenerValue(server2, MemoryState.CRITICAL, 1, true); +verifyListenerValue(server2, MemoryState.EVICTION, 3, true); +verifyListenerValue(server2, MemoryState.NORMAL, 1, true); } /** @@ -245,23 +245,23 @@ public class MemoryThresholdsOffHeapDUnitTest extends BridgeTestCase { registerTestMemoryThresholdListener(server2);
[2/3] incubator-geode git commit: Author: Lise Storc <lst...@pivotal.io> Date: Thu Jun 4 14:43:01 2015 -0700
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2efff3f0/gemfire-core/src/test/java/hydra/GsRandom.java -- diff --git a/gemfire-core/src/test/java/hydra/GsRandom.java b/gemfire-core/src/test/java/hydra/GsRandom.java deleted file mode 100644 index 272958a..000 --- a/gemfire-core/src/test/java/hydra/GsRandom.java +++ /dev/null @@ -1,303 +0,0 @@ -/*= - * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved. - * This product is protected by U.S. and international copyright - * and intellectual property laws. Pivotal products are covered by - * more patents listed at http://www.pivotal.io/patents. - * - */ - -package hydra; - -import java.io.*; -import java.util.*; - -/** - * This is a simple extension of java.util.Random that allows for the - * generation of random numbers within ranges. It also allows for the - * generation of random strings (within ranges as well). - * @see java.lang.Math#random() - * @see java.util.Random - * @since JDK1.0 - */ - -public class GsRandom extends java.util.Random implements Serializable { - - /** -* -* ourString is a privately held instance of a String with -* with some junk characters -* -*/ - - static protected String ourString = "854ku45Q985a.lsdk;,.ifpq4z58Ao45u.sdflkjsdgkjqwJKL:EIUR[p4pnm,.zxc239*h1@0*Fn/~5.+3(.3K-c/2bd(kb1.(=wvz!/56NIwk-4/(#mDhn%kd#9jas9_n!KC0-c>3*(fbn3Fl)Fhaw.2?nz~l;1q3=Fbak1>ah1Bci23fripB319v*bnFl2Ba-cH$lfb?A)_2bgFo2_+Vv$al+b124kasbFV[2G}b@9ASFbCk2.KIhb4K"; - - /** -* Creates a new random number generator. Its seed is initialized to -* a value based on the current time. -* -* @see java.lang.System#currentTimeMillis() -* @see java.util.Random#Random() -*/ - - public GsRandom() { -super(); - } - - /** -* Creates a new random number generator using a single -* long seed. -* -* @param seed the initial seed. -* @see java.util.Random#Random(long) -*/ - - public GsRandom(long seed) { -super(seed); - } - - /** -* Returns the next pseudorandom, uniformly distributed boolean -* value from this random number generator's sequence -* -* @return the next pseudorandom, uniformly distributed boolean -* value from this random number generator's sequence. -*/ - - public boolean nextBoolean() { - -return (this.next(1) == 0); - } - - /** -* Returns the next pseudorandom, uniformly distributed char -* value from this random number generator's sequence -* There is a hack here to prevent '}' so as to eliminate the possiblity -* of generating a sequence which would falsely get marked as a suspect -* string while we are matching the pattern {[0-9]+}. -* {@link https://svn.gemstone.com/trac/gemfire/ticket/40415} -* @return the next pseudorandom, uniformly distributed char -* value from this random number generator's sequence. -*/ - - public char nextChar() { - -char c = (char) this.next(16); -if( c == '}' ) c = nextChar(); //prevent right bracket, try again -return c; - } - - /** -* Returns the next pseudorandom, uniformly distributed byte -* value from this random number generator's sequence -* -* @return the next pseudorandom, uniformly distributed byte -* value from this random number generator's sequence. -*/ - - public byte nextByte() { - -return (byte) this.next(8); - } - - /** -* Returns the next pseudorandom, uniformly distributed double -* value from this random number generator's sequence within a range -* from 0 to max. -* -* @param max the maximum range (inclusive) for the pseudorandom. -* @return the next pseudorandom, uniformly distributed double -* value from this random number generator's sequence. -*/ - public double nextDouble(double max) { - -return nextDouble(0.0, max); - - } - - /** -* Returns the next pseudorandom, uniformly distributed double -* value from this random number generator's sequence within a range -* from min to max. -* -* @param min the minimum range (inclusive) for the pseudorandom. -* @param max the maximum range (inclusive) for the pseudorandom. -* @return the next pseudorandom, uniformly distributed double -* value from this random number generator's sequence. -*/ - - public double nextDouble(double min, double max) { - -return nextDouble() * (max - min) + min; - -// return nextDouble(max-min) + min; - } - - public short nextShort() { -return (short) this.nextChar(); - } - - /** -* Returns the next pseudorandom, uniformly distributed long -* value from this random number generator's sequence within a range
[1/3] incubator-geode git commit: GEODE-350: fixing suspect string from testReplaceOfflineMemberAndRestartCreateColocatedPRLate
Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-352 [created] 7f758b5ee GEODE-350: fixing suspect string from testReplaceOfflineMemberAndRestartCreateColocatedPRLate This test shuts down members, so it's reasonable to see a RegionDestroyedException in the logs. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ca660caa Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ca660caa Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ca660caa Branch: refs/heads/feature/GEODE-352 Commit: ca660caae5221b4ccdfec6d56dc1b4badd7f4a2d Parents: 8639b86 Author: Dan SmithAuthored: Thu Sep 24 15:55:06 2015 -0700 Committer: Dan Smith Committed: Thu Sep 24 15:55:06 2015 -0700 -- .../partitioned/PersistentColocatedPartitionedRegionDUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ca660caa/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java -- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java index 4dcc2cb..8e45a8f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java @@ -797,7 +797,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends */ public void replaceOfflineMemberAndRestartCreateColocatedPRLate(SerializableRunnable createParentPR, SerializableRunnable createChildPR) throws Throwable { addExpectedException("PartitionOfflineException"); -addExpectedException("PartitionOfflineException"); +addExpectedException("RegionDestroyedException"); Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1);
[06/21] incubator-geode git commit: GEODE-137: use local GemFire server to initialize ClientCache whenever possible.
GEODE-137: use local GemFire server to initialize ClientCache whenever possible. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7d99f4a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7d99f4a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7d99f4a4 Branch: refs/heads/feature/GEODE-189 Commit: 7d99f4a4806534946b3037944fc05e61311951e9 Parents: 7a8325b Author: Qihong ChenAuthored: Thu Aug 6 09:51:53 2015 -0700 Committer: Kirk Lund Committed: Thu Aug 13 11:39:42 2015 -0700 -- .../pivotal/gemfire/spark/connector/internal/LocatorHelper.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d99f4a4/gemfire-spark-connector/gemfire-spark-connector/src/main/scala/io/pivotal/gemfire/spark/connector/internal/LocatorHelper.scala -- diff --git a/gemfire-spark-connector/gemfire-spark-connector/src/main/scala/io/pivotal/gemfire/spark/connector/internal/LocatorHelper.scala b/gemfire-spark-connector/gemfire-spark-connector/src/main/scala/io/pivotal/gemfire/spark/connector/internal/LocatorHelper.scala index a010c62..3a094cc 100644 --- a/gemfire-spark-connector/gemfire-spark-connector/src/main/scala/io/pivotal/gemfire/spark/connector/internal/LocatorHelper.scala +++ b/gemfire-spark-connector/gemfire-spark-connector/src/main/scala/io/pivotal/gemfire/spark/connector/internal/LocatorHelper.scala @@ -65,8 +65,8 @@ object LocatorHelper extends Logging { * Pick up at most 3 preferred servers from all available servers based on * host name and Spark executor id. * - * This method is used by DefaultGemFireConnection to create LocalCache. Usually - * one server is enough to initialize LocalCacheFactory, but this provides two + * This method is used by DefaultGemFireConnection to create ClientCache. Usually + * one server is enough to initialize ClientCacheFactory, but this provides two * backup servers in case of the 1st server can't be connected. * * @param servers all available servers in the form of (hostname, port) pairs
[1/2] incubator-geode git commit: GEODE-77 fixes for failing unit and integration tests
Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-77 99e50c12a -> eab327f6a http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/eab327f6/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/LeaveRequestMessage.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/LeaveRequestMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/LeaveRequestMessage.java index df91a64..19eca77 100755 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/LeaveRequestMessage.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/LeaveRequestMessage.java @@ -11,7 +11,8 @@ import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.Version; -public class LeaveRequestMessage extends HighPriorityDistributionMessage { +public class LeaveRequestMessage extends HighPriorityDistributionMessage + implements HasMemberID { private InternalDistributedMember memberID; private String reason; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/eab327f6/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/PingRequestMessage.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/PingRequestMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/PingRequestMessage.java deleted file mode 100755 index a38c586..000 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/PingRequestMessage.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gemstone.gemfire.distributed.internal.membership.gms.messages; - -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; - -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.Version; - -public class PingRequestMessage extends HighPriorityDistributionMessage{ - - int requestId; - InternalDistributedMember target; - - public PingRequestMessage(InternalDistributedMember neighbour, int id) { -requestId = id; -this.target = neighbour; - } - - public PingRequestMessage(){} - - public InternalDistributedMember getTarget() { -return target; - } - - @Override - public int getDSFID() { -return PING_REQUEST; - } - - @Override - protected void process(DistributionManager dm) { -throw new IllegalStateException("this message is not intended to execute in a thread pool"); - } - - @Override - public String toString() { -return "PingRequestMessage [requestId=" + requestId + "] from " + getSender(); - } - - public int getRequestId() { -return requestId; - } - - @Override - public Version[] getSerializationVersions() { -return null; - } - - @Override - public void toData(DataOutput out) throws IOException { -out.writeInt(requestId); -DataSerializer.writeObject(target, out); - } - - @Override - public void fromData(DataInput in) throws IOException, ClassNotFoundException { -requestId = in.readInt(); -target = DataSerializer.readObject(in); - } -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/eab327f6/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/PingResponseMessage.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/PingResponseMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/PingResponseMessage.java deleted file mode 100755 index ef69e25..000 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/PingResponseMessage.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.gemstone.gemfire.distributed.internal.membership.gms.messages; - -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; - -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage; -import com.gemstone.gemfire.internal.Version; - -public class PingResponseMessage extends
[3/3] incubator-geode git commit: PutReplyMessage now defers deserialization of its value
PutReplyMessage now defers deserialization of its value Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7d5db1aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7d5db1aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7d5db1aa Branch: refs/heads/feature/GEODE-324 Commit: 7d5db1aa6192ef98abe1e519e736c82461d6b104 Parents: d5ceac5 Author: Darrel SchneiderAuthored: Thu Sep 24 16:48:54 2015 -0700 Committer: Darrel Schneider Committed: Thu Sep 24 16:48:54 2015 -0700 -- .../internal/InternalDataSerializer.java| 33 ++-- .../internal/cache/RemotePutMessage.java| 37 +++-- .../offheap/OffHeapCachedDeserializable.java| 10 ++ .../offheap/SimpleMemoryAllocatorImpl.java | 10 ++ .../gemfire/internal/offheap/StoredObject.java | 11 ++ .../cache/PutReplyMessageJUnitTest.java | 165 +++ 6 files changed, 240 insertions(+), 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d5db1aa/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java index 87ab28d..09f9280 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java @@ -1361,16 +1361,30 @@ public abstract class InternalDataSerializer extends DataSerializer implements D / START DataSerializer Implementation Methods /// + // Writes just the header of a DataSerializableFixedID to out. + public static final void writeDSFIDHeader(int dsfid, DataOutput out) throws IOException { +if (dsfid == DataSerializableFixedID.ILLEGAL) { + throw new IllegalStateException(LocalizedStrings.InternalDataSerializer_ATTEMPTED_TO_SERIALIZE_ILLEGAL_DSFID.toLocalizedString()); +} + if (dsfid <= Byte.MAX_VALUE && dsfid >= Byte.MIN_VALUE) { + out.writeByte(DS_FIXED_ID_BYTE); + out.writeByte(dsfid); +} else if (dsfid <= Short.MAX_VALUE && dsfid >= Short.MIN_VALUE) { + out.writeByte(DS_FIXED_ID_SHORT); + out.writeShort(dsfid); +} else { + out.writeByte(DS_FIXED_ID_INT); + out.writeInt(dsfid); +} + } + public static final void writeDSFID(DataSerializableFixedID o, DataOutput out) throws IOException { int dsfid = o.getDSFID(); -if (dsfid == DataSerializableFixedID.ILLEGAL) { - throw new IllegalStateException(LocalizedStrings.InternalDataSerializer_ATTEMPTED_TO_SERIALIZE_ILLEGAL_DSFID.toLocalizedString()); -} if (dsfidToClassMap != null && logger.isTraceEnabled(LogMarker.DEBUG_DSFID)) { logger.trace(LogMarker.DEBUG_DSFID, "writeDSFID {} class={}", dsfid, o.getClass()); - if (dsfid != DataSerializableFixedID.NO_FIXED_ID) { + if (dsfid != DataSerializableFixedID.NO_FIXED_ID && dsfid != DataSerializableFixedID.ILLEGAL) { // consistency check to make sure that the same DSFID is not used // for two different classes String newClassName = o.getClass().getName(); @@ -1380,18 +1394,11 @@ public abstract class InternalDataSerializer extends DataSerializer implements D } } } -if (dsfid <= Byte.MAX_VALUE && dsfid >= Byte.MIN_VALUE) { - out.writeByte(DS_FIXED_ID_BYTE); - out.writeByte(dsfid); -} else if (dsfid <= Short.MAX_VALUE && dsfid >= Short.MIN_VALUE) { - out.writeByte(DS_FIXED_ID_SHORT); - out.writeShort(dsfid); -} else if (dsfid == DataSerializableFixedID.NO_FIXED_ID) { +if (dsfid == DataSerializableFixedID.NO_FIXED_ID) { out.writeByte(DS_NO_FIXED_ID); DataSerializer.writeClass(o.getClass(), out); } else { - out.writeByte(DS_FIXED_ID_INT); - out.writeInt(dsfid); + writeDSFIDHeader(dsfid, out); } try { invokeToData(o, out); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d5db1aa/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java index 3f5efeb..20e3725 100755 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java +++
[1/3] incubator-geode git commit: ByteSourceJUnitTest is now a UnitTest instead of IntegrationTest
Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-324 [created] 7d5db1aa6 ByteSourceJUnitTest is now a UnitTest instead of IntegrationTest Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/35418eae Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/35418eae Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/35418eae Branch: refs/heads/feature/GEODE-324 Commit: 35418eae0d7067ca7c70192f73ba426330957a17 Parents: 1517f88 Author: Darrel SchneiderAuthored: Thu Sep 10 11:43:26 2015 -0700 Committer: Darrel Schneider Committed: Thu Sep 10 11:43:26 2015 -0700 -- .../test/java/com/gemstone/gemfire/pdx/ByteSourceJUnitTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/35418eae/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ByteSourceJUnitTest.java -- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ByteSourceJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ByteSourceJUnitTest.java index 0ef1bed..fc05868 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ByteSourceJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ByteSourceJUnitTest.java @@ -19,9 +19,9 @@ import com.gemstone.gemfire.internal.HeapDataOutputStream; import com.gemstone.gemfire.internal.Version; import com.gemstone.gemfire.internal.tcp.ByteBufferInputStream.ByteSource; import com.gemstone.gemfire.internal.tcp.ByteBufferInputStream.ByteSourceFactory; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import com.gemstone.gemfire.test.junit.categories.UnitTest; -@Category(IntegrationTest.class) +@Category(UnitTest.class) public class ByteSourceJUnitTest { protected ByteSource createByteSource(byte[] bytes) {
[2/3] incubator-geode git commit: writeObjectAsByteArray is now tested for off-heap StoredObject
writeObjectAsByteArray is now tested for off-heap StoredObject Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d5ceac56 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d5ceac56 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d5ceac56 Branch: refs/heads/feature/GEODE-324 Commit: d5ceac561e49b3954205fb6b31c996f85af20732 Parents: 35418ea Author: Darrel SchneiderAuthored: Thu Sep 10 16:15:47 2015 -0700 Committer: Darrel Schneider Committed: Thu Sep 10 16:15:47 2015 -0700 -- .../com/gemstone/gemfire/DataSerializer.java| 7 +- .../offheap/OffHeapCachedDeserializable.java| 10 ++ .../offheap/SimpleMemoryAllocatorImpl.java | 26 ++ .../gemfire/internal/offheap/StoredObject.java | 15 ++- .../OffHeapWriteObjectAsByteArrayJUnitTest.java | 96 5 files changed, 151 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5ceac56/gemfire-core/src/main/java/com/gemstone/gemfire/DataSerializer.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/DataSerializer.java b/gemfire-core/src/main/java/com/gemstone/gemfire/DataSerializer.java index 8f977d8..d8ed1b8 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/DataSerializer.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/DataSerializer.java @@ -1475,9 +1475,12 @@ public abstract class DataSerializer { throws IOException { Object object = obj; if (obj instanceof CachedDeserializable) { - // if( ( !(obj instanceof ByteSource) || ((StoredObject) obj).isSerialized())) { + if (obj instanceof StoredObject) { +StoredObject so = (StoredObject)obj; +so.sendAsByteArray(out); + } else { object = ((CachedDeserializable) obj).getSerializedValue(); - // } + } } if (logger.isTraceEnabled(LogMarker.SERIALIZER)) { if (object == null) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5ceac56/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapCachedDeserializable.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapCachedDeserializable.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapCachedDeserializable.java index 764a051..4b25da9 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapCachedDeserializable.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapCachedDeserializable.java @@ -106,6 +106,16 @@ public abstract class OffHeapCachedDeserializable implements MemoryChunkWithRefC DataSerializer.writeObject(objToSend, out); } } + @Override + public void sendAsByteArray(DataOutput out) throws IOException { +byte[] bytes; +if (isSerialized()) { + bytes = getSerializedValue(); +} else { + bytes = (byte[]) getDeserializedForReading(); +} +DataSerializer.writeByteArray(bytes, out); + } public boolean checkDataEquals(@Unretained OffHeapCachedDeserializable other) { if (this == other) { return true; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5ceac56/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorImpl.java -- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorImpl.java index 7cf1656..9d9a087 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorImpl.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorImpl.java @@ -527,6 +527,18 @@ public final class SimpleMemoryAllocatorImpl implements MemoryAllocator, MemoryI } @Override +public void sendAsByteArray(DataOutput out) throws IOException { + byte[] bytes; + if (isSerialized()) { +bytes = getSerializedValue(); + } else { +bytes = (byte[]) getDeserializedForReading(); + } + DataSerializer.writeByteArray(bytes, out); + +} + +@Override public boolean isSerialized() { return OffHeapRegionEntryHelper.isSerialized(this.address); } @@ -1816,6 +1828,20 @@ public final class SimpleMemoryAllocatorImpl implements MemoryAllocator, MemoryI } super.sendTo(out); } + +@Override +public void sendAsByteArray(DataOutput
incubator-geode git commit: Change FindBugs reportLevel to 'low' so all bugs are reported
Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-372 [created] ed12a3c16 Change FindBugs reportLevel to 'low' so all bugs are reported Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ed12a3c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ed12a3c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ed12a3c1 Branch: refs/heads/feature/GEODE-372 Commit: ed12a3c168252472fd431f12ebb5f49644c690ba Parents: 8639b86 Author: Mark BretlAuthored: Thu Sep 24 15:40:34 2015 -0700 Committer: Mark Bretl Committed: Thu Sep 24 15:40:34 2015 -0700 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ed12a3c1/build.gradle -- diff --git a/build.gradle b/build.gradle index d7b4965..eda7642 100755 --- a/build.gradle +++ b/build.gradle @@ -160,7 +160,7 @@ subprojects { dep.transitive = true } findbugs.effort = 'max' - findbugs.reportLevel = 'high' + findbugs.reportLevel = 'low' } tasks.withType(FindBugs) {