Merge remote-tracking branch 'origin/develop' into feature/GEODE-12
Conflicts:
gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/AgentUtilJUnitTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/663379e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/663379e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/663379e2
Branch: refs/heads/feature/GEODE-12
Commit: 663379e288c8e5bfd01e53e0452c79a7e1a5caf0
Parents: a840a2a 16571a6
Author: Dan Smith <upthewatersp...@apache.org>
Authored: Wed Sep 9 16:55:00 2015 -0700
Committer: Dan Smith <upthewatersp...@apache.org>
Committed: Wed Sep 9 16:55:00 2015 -0700
----------------------------------------------------------------------
build.gradle | 9 +-
docker/Dockerfile | 56 +
docker/README.md | 67 +
etc/eclipseFormatterProfile.xml | 11 +-
gemfire-assembly/build.gradle | 3 +-
.../src/test/java/AgentUtilJUnitTest.java | 109 -
.../management/internal/AgentUtilJUnitTest.java | 108 +
gemfire-core/build.gradle | 30 +-
.../gemfire/cache/DiskStoreFactory.java | 15 +-
.../gemstone/gemfire/cache/RegionService.java | 2 +-
.../cache/client/ClientCacheFactory.java | 18 +-
.../gemfire/cache/client/PoolFactory.java | 18 +-
.../cache/hdfs/HDFSEventQueueAttributes.java | 72 -
.../hdfs/HDFSEventQueueAttributesFactory.java | 160 --
.../gemstone/gemfire/cache/hdfs/HDFSStore.java | 381 +++-
.../gemfire/cache/hdfs/HDFSStoreFactory.java | 271 +--
.../gemfire/cache/hdfs/HDFSStoreMutator.java | 315 ++-
.../internal/HDFSEventQueueAttributesImpl.java | 179 --
.../hdfs/internal/HDFSIntegrationUtil.java | 121 +-
.../hdfs/internal/HDFSStoreConfigHolder.java | 658 +++---
.../cache/hdfs/internal/HDFSStoreCreation.java | 189 +-
.../hdfs/internal/HDFSStoreFactoryImpl.java | 2 +
.../cache/hdfs/internal/HDFSStoreImpl.java | 87 +-
.../hdfs/internal/HDFSStoreMutatorImpl.java | 279 +--
.../SizeTieredHdfsCompactionConfigHolder.java | 74 -
.../internal/hoplog/HDFSCompactionManager.java | 27 +-
.../hoplog/HDFSUnsortedHoplogOrganizer.java | 10 +-
.../hoplog/HdfsSortedOplogOrganizer.java | 22 +-
.../cache/operations/GetOperationContext.java | 7 +-
.../operations/KeyValueOperationContext.java | 70 +-
.../internal/GetOperationContextImpl.java | 16 +-
.../cache/query/internal/CompiledSelect.java | 5 +-
.../cache/query/internal/RuntimeIterator.java | 3 -
.../query/internal/index/AbstractIndex.java | 4 +-
.../query/internal/index/AbstractMapIndex.java | 6 +-
.../internal/index/CompactMapRangeIndex.java | 7 +-
.../cache/query/internal/index/HashIndex.java | 11 +
.../gemfire/distributed/DistributedSystem.java | 6 +
.../internal/AbstractDistributionConfig.java | 21 +-
.../internal/DistributionConfig.java | 12 +
.../internal/DistributionConfigImpl.java | 15 +-
.../jgroup/JGroupMembershipManager.java | 2 +-
.../gemstone/gemfire/internal/NanoTimer.java | 37 +-
.../gemfire/internal/SharedLibrary.java | 20 +-
.../gemfire/internal/cache/AbstractRegion.java | 2 +-
.../internal/cache/AbstractRegionEntry.java | 2 +-
.../gemfire/internal/cache/BucketRegion.java | 10 +
.../gemfire/internal/cache/CacheConfig.java | 4 +-
.../gemfire/internal/cache/DiskEntry.java | 29 +-
.../gemfire/internal/cache/DiskRegion.java | 9 +
.../gemfire/internal/cache/DiskRegionStats.java | 22 +
.../cache/DistTXAdjunctCommitMessage.java | 35 +
.../internal/cache/DistTXCommitMessage.java | 12 +-
.../gemfire/internal/cache/DistTXState.java | 77 +-
.../DistTXStateProxyImplOnCoordinator.java | 28 +-
.../cache/DistributedCacheOperation.java | 2 +-
.../gemfire/internal/cache/EntryEventImpl.java | 10 +-
.../gemfire/internal/cache/ExpiryTask.java | 8 +-
.../internal/cache/GemFireCacheImpl.java | 9 +-
.../gemfire/internal/cache/LocalRegion.java | 32 +-
.../cache/MinimumSystemRequirements.java | 4 +-
.../internal/cache/PartitionedRegion.java | 11 +-
.../internal/cache/PartitionedRegionStats.java | 12 +-
.../gemfire/internal/cache/PoolFactoryImpl.java | 3 +-
.../internal/cache/RegionIdleExpiryTask.java | 5 +-
.../internal/cache/RegionTTLExpiryTask.java | 2 +-
.../internal/cache/RemoteOperationMessage.java | 2 +
.../gemfire/internal/cache/TXCommitMessage.java | 98 +-
.../gemfire/internal/cache/TXManagerImpl.java | 11 +-
.../gemfire/internal/cache/TXRegionState.java | 50 +-
.../cache/control/HeapMemoryMonitor.java | 14 +-
.../cache/control/InternalResourceManager.java | 15 +-
.../internal/cache/control/MemoryEvent.java | 9 +-
.../cache/control/OffHeapMemoryMonitor.java | 88 +-
.../control/PartitionRebalanceDetailsImpl.java | 8 +-
.../cache/control/RebalanceOperationImpl.java | 157 +-
.../cache/control/RebalanceResultsImpl.java | 16 +-
.../cache/control/ResourceManagerStats.java | 13 +
.../internal/cache/partitioned/GetMessage.java | 6 +
.../cache/partitioned/PartitionMessage.java | 4 +-
.../PartitionedRegionRebalanceOp.java | 100 +-
.../cache/partitioned/PutAllPRMessage.java | 37 +
.../partitioned/rebalance/BucketOperator.java | 46 +-
.../rebalance/ParallelBucketOperator.java | 151 ++
.../rebalance/PartitionedRegionLoadModel.java | 45 +-
.../rebalance/SatisfyRedundancy.java | 7 +-
.../rebalance/SatisfyRedundancyFPR.java | 1 +
.../rebalance/SimulatedBucketOperator.java | 11 +-
.../internal/cache/tx/DistTxEntryEvent.java | 70 +-
.../AbstractGatewaySenderEventProcessor.java | 1 +
.../cache/wan/GatewaySenderAdvisor.java | 1 -
.../parallel/ParallelGatewaySenderQueue.java | 41 +-
.../internal/cache/xmlcache/CacheCreation.java | 2 +-
.../internal/cache/xmlcache/CacheXmlParser.java | 134 +-
.../gemfire/internal/i18n/LocalizedStrings.java | 2 +-
.../gemfire/internal/lang/StringUtils.java | 364 +++-
.../gemfire/internal/lang/SystemUtils.java | 35 +-
.../gemfire/internal/logging/LogService.java | 56 +-
.../internal/logging/log4j/Configurator.java | 73 +-
.../internal/logging/log4j/FastLogger.java | 50 +-
.../offheap/OffHeapCachedDeserializable.java | 7 +-
.../offheap/SimpleMemoryAllocatorImpl.java | 10 +-
.../internal/redis/ByteArrayWrapper.java | 11 +-
.../internal/redis/ByteToCommandDecoder.java | 57 +-
.../gemstone/gemfire/internal/redis/Coder.java | 228 +-
.../gemfire/internal/redis/Command.java | 25 +-
.../gemfire/internal/redis/DoubleWrapper.java | 14 +-
.../internal/redis/ExecutionHandlerContext.java | 202 +-
.../gemfire/internal/redis/Executor.java | 2 +-
.../gemfire/internal/redis/Extendable.java | 6 +-
.../internal/redis/RedisCommandType.java | 21 +
.../gemfire/internal/redis/RedisConstants.java | 6 +-
.../gemfire/internal/redis/RedisDataType.java | 9 -
.../gemfire/internal/redis/RegionCache.java | 410 ----
.../internal/redis/RegionCreationException.java | 9 +-
.../gemfire/internal/redis/RegionProvider.java | 536 +++++
.../redis/executor/AbstractExecutor.java | 12 +-
.../redis/executor/AbstractScanExecutor.java | 2 +-
.../internal/redis/executor/AuthExecutor.java | 38 +
.../internal/redis/executor/DBSizeExecutor.java | 2 +-
.../internal/redis/executor/DelExecutor.java | 2 +-
.../internal/redis/executor/EchoExecutor.java | 2 +-
.../internal/redis/executor/ExistsExecutor.java | 2 +-
.../redis/executor/ExpirationExecutor.java | 6 +-
.../redis/executor/ExpireAtExecutor.java | 4 +-
.../internal/redis/executor/ExpireExecutor.java | 4 +-
.../redis/executor/FlushAllExecutor.java | 15 +-
.../internal/redis/executor/KeysExecutor.java | 7 +-
.../internal/redis/executor/ListQuery.java | 12 +-
.../redis/executor/PersistExecutor.java | 2 +-
.../internal/redis/executor/PingExecutor.java | 2 +-
.../internal/redis/executor/QuitExecutor.java | 2 +-
.../internal/redis/executor/ScanExecutor.java | 4 +-
.../internal/redis/executor/SortedSetQuery.java | 36 +-
.../internal/redis/executor/TTLExecutor.java | 4 +-
.../internal/redis/executor/TypeExecutor.java | 2 +-
.../internal/redis/executor/UnkownExecutor.java | 2 +-
.../redis/executor/hash/HDelExecutor.java | 2 +-
.../redis/executor/hash/HGetAllExecutor.java | 7 +-
.../redis/executor/hash/HKeysExecutor.java | 7 +-
.../redis/executor/hash/HScanExecutor.java | 5 +-
.../redis/executor/hash/HValsExecutor.java | 9 +-
.../redis/executor/hash/HashExecutor.java | 4 +-
.../redis/executor/hll/HllExecutor.java | 2 +-
.../redis/executor/hll/PFAddExecutor.java | 2 +-
.../redis/executor/hll/PFCountExecutor.java | 2 +-
.../redis/executor/hll/PFMergeExecutor.java | 4 +-
.../redis/executor/list/LIndexExecutor.java | 4 +-
.../redis/executor/list/LLenExecutor.java | 2 +-
.../redis/executor/list/LRangeExecutor.java | 10 +-
.../redis/executor/list/LRemExecutor.java | 4 +-
.../redis/executor/list/LSetExecutor.java | 4 +-
.../redis/executor/list/LTrimExecutor.java | 26 +-
.../redis/executor/list/ListExecutor.java | 26 +-
.../redis/executor/list/PopExecutor.java | 23 +-
.../redis/executor/list/PushExecutor.java | 2 +-
.../redis/executor/list/PushXExecutor.java | 2 +-
.../org/apache/hadoop/fs/GlobPattern.java | 164 --
.../redis/executor/set/SAddExecutor.java | 2 +-
.../redis/executor/set/SCardExecutor.java | 2 +-
.../redis/executor/set/SIsMemberExecutor.java | 2 +-
.../redis/executor/set/SMembersExecutor.java | 7 +-
.../redis/executor/set/SMoveExecutor.java | 2 +-
.../redis/executor/set/SPopExecutor.java | 4 +-
.../redis/executor/set/SRandMemberExecutor.java | 4 +-
.../redis/executor/set/SRemExecutor.java | 2 +-
.../redis/executor/set/SScanExecutor.java | 4 +-
.../redis/executor/set/SetOpExecutor.java | 9 +-
.../executor/sortedset/SortedSetExecutor.java | 4 +-
.../executor/sortedset/ZRangeByLexExecutor.java | 2 -
.../sortedset/ZRangeByScoreExecutor.java | 3 +-
.../redis/executor/sortedset/ZRemExecutor.java | 2 +-
.../sortedset/ZRemRangeByLexExecutor.java | 3 +-
.../sortedset/ZRemRangeByRankExecutor.java | 4 +-
.../sortedset/ZRemRangeByScoreExecutor.java | 4 +-
.../redis/executor/sortedset/ZScanExecutor.java | 5 +-
.../redis/executor/string/AppendExecutor.java | 2 +-
.../redis/executor/string/BitCountExecutor.java | 2 +-
.../redis/executor/string/BitOpExecutor.java | 2 +-
.../redis/executor/string/BitPosExecutor.java | 2 +-
.../redis/executor/string/DecrByExecutor.java | 2 +-
.../redis/executor/string/DecrExecutor.java | 4 +-
.../redis/executor/string/GetBitExecutor.java | 2 +-
.../redis/executor/string/GetExecutor.java | 2 +-
.../redis/executor/string/GetRangeExecutor.java | 2 +-
.../redis/executor/string/GetSetExecutor.java | 2 +-
.../redis/executor/string/IncrByExecutor.java | 2 +-
.../executor/string/IncrByFloatExecutor.java | 2 +-
.../redis/executor/string/IncrExecutor.java | 2 +-
.../redis/executor/string/MGetExecutor.java | 2 +-
.../redis/executor/string/MSetExecutor.java | 2 +-
.../redis/executor/string/MSetNXExecutor.java | 2 +-
.../redis/executor/string/SetBitExecutor.java | 2 +-
.../redis/executor/string/SetEXExecutor.java | 4 +-
.../redis/executor/string/SetExecutor.java | 4 +-
.../redis/executor/string/SetNXExecutor.java | 2 +-
.../redis/executor/string/SetRangeExecutor.java | 4 +-
.../redis/executor/string/StringExecutor.java | 4 +-
.../redis/executor/string/StrlenExecutor.java | 2 +-
.../redis/org/apache/hadoop/fs/GlobPattern.java | 164 ++
.../size/ReflectionSingleObjectSizer.java | 4 +-
.../gemfire/internal/tcp/MsgOutputStream.java | 4 +-
.../gfsh/aggregator/AggregateFunction.java | 67 -
.../tools/gfsh/aggregator/AggregateResults.java | 126 --
.../aggregator/AggregatorPartitionFunction.java | 54 -
.../tools/gfsh/app/CommandExecutable.java | 8 -
.../gemfire/internal/tools/gfsh/app/Gfsh.java | 2027 ------------------
.../internal/tools/gfsh/app/GfshVersion.java | 455 ----
.../internal/tools/gfsh/app/Nextable.java | 8 -
.../tools/gfsh/app/ServerExecutable.java | 11 -
.../app/aggregator/AggregateFunctionTask.java | 62 -
.../tools/gfsh/app/aggregator/Aggregator.java | 549 -----
.../app/aggregator/AggregatorException.java | 50 -
.../gfsh/app/aggregator/AggregatorPeer.java | 254 ---
.../functions/util/LocalRegionInfoFunction.java | 235 --
.../functions/util/RegionCreateFunction.java | 81 -
.../functions/util/RegionDestroyFunction.java | 86 -
.../tools/gfsh/app/cache/CacheBase.java | 178 --
.../gfsh/app/cache/InstantiatorClassLoader.java | 101 -
.../tools/gfsh/app/cache/data/GenericMap.java | 196 --
.../gfsh/app/cache/data/GenericMessage.java | 807 -------
.../app/cache/data/InvalidTypeException.java | 28 -
.../tools/gfsh/app/cache/data/ListMap.java | 197 --
.../gfsh/app/cache/data/ListMapMessage.java | 615 ------
.../tools/gfsh/app/cache/data/ListMessage.java | 594 -----
.../tools/gfsh/app/cache/data/Listable.java | 45 -
.../tools/gfsh/app/cache/data/MapMessage.java | 629 ------
.../tools/gfsh/app/cache/data/Mappable.java | 50 -
.../tools/gfsh/app/cache/index/EntryMap.java | 80 -
.../tools/gfsh/app/cache/index/IndexInfo.java | 52 -
.../tools/gfsh/app/cache/index/Indexer.java | 13 -
.../gfsh/app/cache/index/IndexerManager.java | 32 -
.../gfsh/app/cache/index/LookupService.java | 352 ---
.../app/cache/index/LookupServiceException.java | 64 -
.../gfsh/app/cache/index/task/ForceGCTask.java | 32 -
.../app/cache/index/task/IndexInfoTask.java | 131 --
.../app/cache/index/task/QuerySizeTask.java | 134 --
.../gfsh/app/cache/index/task/QueryTask.java | 323 ---
.../tools/gfsh/app/command/CommandClient.java | 417 ----
.../gfsh/app/command/CommandException.java | 31 -
.../app/command/CommandResultsListener.java | 15 -
.../tools/gfsh/app/command/task/EchoTask.java | 63 -
.../task/PartitionedRegionAttributeTask.java | 205 --
.../gfsh/app/command/task/QueryResults.java | 123 --
.../tools/gfsh/app/command/task/QueryTask.java | 522 -----
.../task/RefreshAggregatorRegionTask.java | 53 -
.../gfsh/app/command/task/RegionClearTask.java | 85 -
.../gfsh/app/command/task/RegionCreateTask.java | 162 --
.../app/command/task/RegionDestroyTask.java | 97 -
.../gfsh/app/command/task/RegionPathTask.java | 156 --
.../gfsh/app/command/task/RegionSizeTask.java | 70 -
.../gfsh/app/command/task/data/MemberInfo.java | 79 -
.../task/data/PartitionAttributeInfo.java | 124 --
.../command/task/data/RegionAttributeInfo.java | 286 ---
.../internal/tools/gfsh/app/commands/bcp.java | 527 -----
.../internal/tools/gfsh/app/commands/cd.java | 79 -
.../tools/gfsh/app/commands/classloader.java | 323 ---
.../internal/tools/gfsh/app/commands/clear.java | 197 --
.../tools/gfsh/app/commands/connect.java | 124 --
.../internal/tools/gfsh/app/commands/db.java | 312 ---
.../internal/tools/gfsh/app/commands/debug.java | 48 -
.../tools/gfsh/app/commands/deploy.java | 271 ---
.../internal/tools/gfsh/app/commands/echo.java | 59 -
.../internal/tools/gfsh/app/commands/fetch.java | 48 -
.../internal/tools/gfsh/app/commands/gc.java | 93 -
.../internal/tools/gfsh/app/commands/get.java | 143 --
.../internal/tools/gfsh/app/commands/help.java | 40 -
.../internal/tools/gfsh/app/commands/index.java | 395 ----
.../internal/tools/gfsh/app/commands/key.java | 67 -
.../internal/tools/gfsh/app/commands/local.java | 101 -
.../internal/tools/gfsh/app/commands/ls.java | 584 -----
.../internal/tools/gfsh/app/commands/mkdir.java | 253 ---
.../internal/tools/gfsh/app/commands/next.java | 63 -
.../tools/gfsh/app/commands/optional/look.java | 166 --
.../tools/gfsh/app/commands/optional/perf.java | 150 --
.../internal/tools/gfsh/app/commands/pr.java | 209 --
.../tools/gfsh/app/commands/property.java | 85 -
.../internal/tools/gfsh/app/commands/put.java | 490 -----
.../internal/tools/gfsh/app/commands/pwd.java | 37 -
.../tools/gfsh/app/commands/rebalance.java | 186 --
.../tools/gfsh/app/commands/refresh.java | 67 -
.../internal/tools/gfsh/app/commands/rm.java | 175 --
.../internal/tools/gfsh/app/commands/rmdir.java | 249 ---
.../tools/gfsh/app/commands/select.java | 139 --
.../internal/tools/gfsh/app/commands/show.java | 240 ---
.../internal/tools/gfsh/app/commands/size.java | 281 ---
.../internal/tools/gfsh/app/commands/value.java | 48 -
.../internal/tools/gfsh/app/commands/which.java | 189 --
.../internal/tools/gfsh/app/commands/zone.java | 49 -
.../tools/gfsh/app/function/GfshData.java | 86 -
.../tools/gfsh/app/function/GfshFunction.java | 149 --
.../tools/gfsh/app/function/command/clear.java | 95 -
.../tools/gfsh/app/function/command/deploy.java | 111 -
.../tools/gfsh/app/function/command/gc.java | 49 -
.../tools/gfsh/app/function/command/index.java | 199 --
.../tools/gfsh/app/function/command/ls.java | 80 -
.../tools/gfsh/app/function/command/pr.java | 118 -
.../gfsh/app/function/command/rebalance.java | 129 --
.../tools/gfsh/app/function/command/rm.java | 43 -
.../tools/gfsh/app/function/command/which.java | 159 --
.../tools/gfsh/app/misc/util/ClassFinder.java | 209 --
.../gfsh/app/misc/util/DataSerializerEx.java | 98 -
.../app/misc/util/QueueDispatcherListener.java | 11 -
.../app/misc/util/QueueDispatcherThread.java | 87 -
.../gfsh/app/misc/util/ReflectionUtil.java | 303 ---
.../tools/gfsh/app/misc/util/StringUtil.java | 142 --
.../app/misc/util/SystemClassPathManager.java | 171 --
.../gfsh/app/pogo/InvalidKeyException.java | 34 -
.../internal/tools/gfsh/app/pogo/KeyType.java | 96 -
.../tools/gfsh/app/pogo/KeyTypeManager.java | 199 --
.../internal/tools/gfsh/app/pogo/MapLite.java | 1136 ----------
.../tools/gfsh/app/pogo/MapLiteSerializer.java | 338 ---
.../internal/tools/gfsh/app/util/DBUtil.java | 1094 ----------
.../tools/gfsh/app/util/DBUtilException.java | 48 -
.../tools/gfsh/app/util/GfshResultsBag.java | 600 ------
.../tools/gfsh/app/util/ObjectUtil.java | 164 --
.../tools/gfsh/app/util/OutputUtil.java | 255 ---
.../internal/tools/gfsh/app/util/PrintUtil.java | 1683 ---------------
.../tools/gfsh/app/util/SimplePrintUtil.java | 1366 ------------
.../tools/gfsh/command/AbstractCommandTask.java | 136 --
.../tools/gfsh/command/CommandResults.java | 119 -
.../tools/gfsh/command/CommandTask.java | 23 -
.../internal/tools/gfsh/util/RegionUtil.java | 829 -------
.../internal/beans/MemberMBeanBridge.java | 11 +-
.../cli/commands/HDFSStoreCommands.java | 81 +-
.../cli/commands/LauncherLifecycleCommands.java | 5 +
.../internal/cli/commands/QueueCommands.java | 4 +-
.../cli/functions/AlterHDFSStoreFunction.java | 24 +-
.../CreateAsyncEventQueueFunction.java | 8 +-
.../cli/functions/CreateHDFSStoreFunction.java | 18 +-
.../internal/cli/i18n/CliStrings.java | 6 +-
.../controllers/QueueCommandsController.java | 6 +-
.../web/controllers/WanCommandsController.java | 2 +-
.../pdx/ReflectionBasedAutoSerializer.java | 9 +
.../pdx/internal/AutoSerializableManager.java | 8 -
.../gemfire/pdx/internal/TypeRegistry.java | 19 +-
.../gemfire/redis/GemFireRedisServer.java | 155 +-
.../gemfire/cache/RegionFactoryJUnitTest.java | 19 +-
.../ColocatedRegionWithHDFSDUnitTest.java | 20 +-
.../hdfs/internal/HDFSConfigJUnitTest.java | 146 +-
.../internal/HdfsStoreMutatorJUnitTest.java | 147 +-
.../hdfs/internal/RegionRecoveryDUnitTest.java | 415 ++++
.../internal/RegionWithHDFSBasicDUnitTest.java | 1594 ++++++++++++++
.../RegionWithHDFSOffHeapBasicDUnitTest.java | 114 +
...RegionWithHDFSPersistenceBasicDUnitTest.java | 77 +
.../hdfs/internal/RegionWithHDFSTestBase.java | 40 +-
.../internal/hoplog/BaseHoplogTestCase.java | 7 +-
.../hoplog/HDFSCacheLoaderJUnitTest.java | 4 +-
.../hoplog/HDFSCompactionManagerJUnitTest.java | 8 +-
.../HDFSUnsortedHoplogOrganizerJUnitTest.java | 2 +-
.../HdfsSortedOplogOrganizerJUnitTest.java | 10 +-
.../hoplog/TieredCompactionJUnitTest.java | 25 +-
.../hoplog/mapreduce/HoplogUtilJUnitTest.java | 7 +-
.../MemoryThresholdsOffHeapDUnitTest.java | 90 +-
.../PutOperationContextJUnitTest.java | 248 +++
.../GetOperationContextImplJUnitTest.java | 275 +++
.../query/dunit/CloseCacheAuthorization.java | 2 -
.../index/CopyOnReadIndexDUnitTest.java | 68 +-
.../index/CopyOnReadIndexJUnitTest.java | 5 +-
.../internal/index/HashIndexJUnitTest.java | 20 +-
.../MapRangeIndexMaintenanceJUnitTest.java | 50 +
.../internal/index/RangeIndexAPIJUnitTest.java | 32 +-
.../query/partitioned/PRQueryDUnitTest.java | 8 +-
.../query/partitioned/PRQueryJUnitTest.java | 30 +
.../cache30/BridgeMembershipDUnitTest.java | 139 +-
.../gemfire/cache30/CacheLoaderTestCase.java | 2 +-
.../DistributedNoAckRegionDUnitTest.java | 14 +
.../gemfire/cache30/MultiVMRegionTestCase.java | 376 ++--
.../PartitionedRegionCompressionDUnitTest.java | 4 -
.../gemfire/cache30/RegionTestCase.java | 943 ++++----
.../gemfire/cache30/TestCacheCallback.java | 13 +-
.../LocatorLauncherRemoteFileJUnitTest.java | 8 +-
.../LocatorLauncherRemoteJUnitTest.java | 57 +-
.../ServerLauncherLocalJUnitTest.java | 47 +-
.../ServerLauncherRemoteFileJUnitTest.java | 2 -
.../ServerLauncherRemoteJUnitTest.java | 2 +-
.../ServerLauncherWithSpringJUnitTest.java | 5 +
.../gemfire/disttx/CacheMapDistTXDUnitTest.java | 9 +-
.../gemfire/disttx/DistTXDebugDUnitTest.java | 8 +-
.../disttx/DistTXDistributedTestSuite.java | 5 +-
.../gemfire/disttx/DistTXOrderDUnitTest.java | 13 +-
.../disttx/DistTXPersistentDebugDUnitTest.java | 4 -
.../disttx/DistTXRestrictionsDUnitTest.java | 1 -
.../disttx/DistTXWithDeltaDUnitTest.java | 22 +
.../disttx/DistributedTransactionDUnitTest.java | 810 ++++++-
.../gemfire/disttx/PRDistTXDUnitTest.java | 49 +
.../disttx/PRDistTXWithVersionsDUnitTest.java | 50 +
.../gemfire/internal/NanoTimer2JUnitTest.java | 79 -
.../gemfire/internal/NanoTimerJUnitTest.java | 121 +-
.../internal/cache/Bug34011JUnitTest.java | 199 --
.../cache/ChunkValueWrapperJUnitTest.java | 2 +-
.../cache/ClientServerGetAllDUnitTest.java | 1 -
.../cache/ClientServerTransactionDUnitTest.java | 38 +-
.../ConcurrentRegionOperationsJUnitTest.java | 7 +-
.../internal/cache/DiskRegionJUnitTest.java | 30 +
.../cache/HDFSRegionOperationsJUnitTest.java | 5 +-
.../PartitionedRegionSingleHopDUnitTest.java | 4 -
.../cache/PartitionedRegionStatsJUnitTest.java | 320 ++-
.../cache/PartitionedRegionTestHelper.java | 3 +-
.../cache/RemoteTransactionDUnitTest.java | 181 +-
.../control/RebalanceOperationDUnitTest.java | 463 +++-
.../execute/SingleHopGetAllPutAllDUnitTest.java | 18 +-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 1 +
.../PartitionedRegionLoadModelJUnitTest.java | 97 +-
.../cache/tier/sockets/HAInterestBaseTest.java | 1435 ++++++-------
.../sockets/HAInterestDistributedTestCase.java | 15 +
.../tier/sockets/HAInterestPart1DUnitTest.java | 210 +-
.../tier/sockets/HAInterestPart2DUnitTest.java | 506 +++--
.../compression/SnappyCompressorJUnitTest.java | 2 +-
.../internal/lang/StringUtilsJUnitTest.java | 33 +
.../DistributedSystemLogFileJUnitTest.java | 20 +-
.../logging/LogServiceIntegrationJUnitTest.java | 209 ++
.../LogServiceIntegrationTestSupport.java | 24 +
.../internal/logging/LogServiceJUnitTest.java | 190 +-
.../LogServiceUserDirIntegrationJUnitTest.java | 70 +
.../logging/LoggingIntegrationTestSuite.java | 15 +
.../internal/logging/LoggingUnitTestSuite.java | 13 +
.../log4j/FastLoggerIntegrationJUnitTest.java | 557 +++++
.../logging/log4j/FastLoggerJUnitTest.java | 274 +--
.../FastLoggerWithDefaultConfigJUnitTest.java | 74 +
.../log4j/Log4jIntegrationTestSuite.java | 12 +
.../logging/log4j/Log4jUnitTestSuite.java | 16 +
.../offheap/OffHeapValidationJUnitTest.java | 45 +-
.../internal/size/ObjectSizerJUnitTest.java | 14 +-
.../commands/HDFSStoreCommandsJUnitTest.java | 124 +-
.../AlterHDFSStoreFunctionJUnitTest.java | 146 +-
.../CreateHDFSStoreFunctionJUnitTest.java | 156 +-
.../DescribeHDFSStoreFunctionJUnitTest.java | 98 +-
.../WanCommandsControllerJUnitTest.java | 124 ++
.../gemfire/pdx/AutoSerializableJUnitTest.java | 2 +-
.../gemstone/gemfire/redis/AuthJUnitTest.java | 144 ++
.../gemfire/redis/ConcurrentStartTest.java | 58 +
.../gemstone/gemfire/redis/HashesJUnitTest.java | 175 ++
.../gemstone/gemfire/redis/ListsJUnitTest.java | 238 ++
.../gemfire/redis/RedisDistDUnitTest.java | 234 ++
.../gemstone/gemfire/redis/SetsJUnitTest.java | 242 +++
.../gemfire/redis/SortedSetsJUnitTest.java | 414 ++++
.../gemfire/redis/StringsJunitTest.java | 296 +++
.../gemfire/test/golden/ExecutableProcess.java | 8 +
.../gemfire/test/golden/FailOutputTestCase.java | 22 +-
.../golden/FailWithErrorInOutputJUnitTest.java | 18 +-
.../FailWithExtraLineInOutputJUnitTest.java | 41 +-
...WithLineMissingFromEndOfOutputJUnitTest.java | 39 +-
...hLineMissingFromMiddleOfOutputJUnitTest.java | 39 +-
.../FailWithLoggerErrorInOutputJUnitTest.java | 18 +-
.../FailWithLoggerFatalInOutputJUnitTest.java | 18 +-
.../FailWithLoggerWarnInOutputJUnitTest.java | 18 +-
.../golden/FailWithProblemInOutputTestCase.java | 30 +-
.../golden/FailWithSevereInOutputJUnitTest.java | 18 +-
...hTimeoutOfWaitForOutputToMatchJUnitTest.java | 42 +-
.../FailWithWarningInOutputJUnitTest.java | 18 +-
.../gemfire/test/golden/GoldenComparator.java | 64 +-
.../test/golden/GoldenStringComparator.java | 5 +-
.../gemfire/test/golden/GoldenTestCase.java | 108 +-
.../golden/GoldenTestFrameworkTestSuite.java | 27 +
.../gemfire/test/golden/PassJUnitTest.java | 50 +-
.../golden/PassWithExpectedErrorJUnitTest.java | 18 +-
.../golden/PassWithExpectedProblemTestCase.java | 58 +-
.../golden/PassWithExpectedSevereJUnitTest.java | 18 +-
.../PassWithExpectedWarningJUnitTest.java | 18 +-
.../test/golden/RegexGoldenComparator.java | 10 +-
.../test/golden/StringGoldenComparator.java | 4 +-
.../process/ProcessTestFrameworkTestSuite.java | 12 +
.../gemfire/test/process/ProcessWrapper.java | 251 ++-
.../test/process/ProcessWrapperJUnitTest.java | 19 +-
.../test/java/dunit/DistributedTestCase.java | 28 +-
.../java/dunit/standalone/DUnitLauncher.java | 8 +-
.../sanctionedDataSerializables.txt | 16 +-
.../codeAnalysis/sanctionedSerializables.txt | 7 +-
.../gemfire/test/golden/log4j2-test.xml | 18 +
.../gemstone/org/jgroups/protocols/FRAG2.java | 2 +-
.../gemstone/org/jgroups/protocols/SMACK.java | 3 +-
.../gemstone/org/jgroups/protocols/UDP_NIO.java | 4 +-
.../org/jgroups/protocols/VIEW_ENFORCER.java | 2 +-
gemfire-rebalancer/build.gradle | 12 +
.../gemfire/cache/util/AutoBalancer.java | 512 +++++
.../cache/util/AutoBalancerJUnitTest.java | 803 +++++++
gemfire-spark-connector/.gitignore | 1 +
gemfire-spark-connector/README.md | 32 +
gemfire-spark-connector/doc/10_demos.md | 84 +
gemfire-spark-connector/doc/1_building.md | 34 +
gemfire-spark-connector/doc/2_quick.md | 178 ++
gemfire-spark-connector/doc/3_connecting.md | 55 +
gemfire-spark-connector/doc/4_loading.md | 108 +
gemfire-spark-connector/doc/5_rdd_join.md | 237 ++
gemfire-spark-connector/doc/6_save_rdd.md | 81 +
gemfire-spark-connector/doc/7_save_dstream.md | 68 +
gemfire-spark-connector/doc/8_oql.md | 58 +
gemfire-spark-connector/doc/9_java_api.md | 129 ++
.../connector/internal/RegionMetadata.java | 77 +
.../gemfirefunctions/QueryFunction.java | 83 +
.../RetrieveRegionFunction.java | 192 ++
.../RetrieveRegionMetadataFunction.java | 102 +
.../StructStreamingResultSender.java | 203 ++
.../gemfire/spark/connector/Employee.java | 38 +
.../spark/connector/JavaApiIntegrationTest.java | 408 ++++
.../gemfire/spark/connector/Portfolio.java | 93 +
.../gemfire/spark/connector/Position.java | 57 +
.../src/it/resources/test-regions.xml | 32 +
.../src/it/resources/test-retrieve-regions.xml | 40 +
.../spark/connector/BasicIntegrationTest.scala | 582 +++++
.../RDDJoinRegionIntegrationTest.scala | 284 +++
.../RetrieveRegionIntegrationTest.scala | 237 ++
.../gemfire/spark/connector/package.scala | 13 +
.../connector/testkit/GemFireCluster.scala | 31 +
.../spark/connector/testkit/GemFireRunner.scala | 132 ++
.../spark/connector/testkit/IOUtils.scala | 78 +
.../spark/streaming/ManualClockHelper.scala | 12 +
.../spark/streaming/TestInputDStream.scala | 28 +
.../javaapi/GemFireJavaDStreamFunctions.java | 70 +
.../GemFireJavaPairDStreamFunctions.java | 61 +
.../javaapi/GemFireJavaPairRDDFunctions.java | 222 ++
.../javaapi/GemFireJavaRDDFunctions.java | 162 ++
.../javaapi/GemFireJavaSQLContextFunctions.java | 33 +
.../GemFireJavaSparkContextFunctions.java | 71 +
.../connector/javaapi/GemFireJavaUtil.java | 106 +
.../spark/connector/GemFireConnection.scala | 51 +
.../spark/connector/GemFireConnectionConf.scala | 57 +
.../connector/GemFireConnectionManager.scala | 15 +
.../connector/GemFireFunctionDeployer.scala | 65 +
.../connector/GemFireKryoRegistrator.scala | 13 +
.../connector/GemFirePairRDDFunctions.scala | 124 ++
.../spark/connector/GemFireRDDFunctions.scala | 104 +
.../connector/GemFireSQLContextFunctions.scala | 26 +
.../GemFireSparkContextFunctions.scala | 23 +
.../internal/DefaultGemFireConnection.scala | 148 ++
.../DefaultGemFireConnectionManager.scala | 61 +
.../connector/internal/LocatorHelper.scala | 119 +
.../StructStreamingResultCollector.scala | 136 ++
.../connector/internal/oql/QueryParser.scala | 42 +
.../spark/connector/internal/oql/QueryRDD.scala | 67 +
.../internal/oql/QueryResultCollector.scala | 53 +
.../connector/internal/oql/RDDConverter.scala | 24 +
.../connector/internal/oql/RowBuilder.scala | 22 +
.../connector/internal/oql/SchemaBuilder.scala | 57 +
.../internal/oql/UndefinedSerializer.scala | 30 +
.../connector/internal/rdd/GemFireJoinRDD.scala | 51 +
.../internal/rdd/GemFireOuterJoinRDD.scala | 53 +
.../internal/rdd/GemFireRDDPartition.scala | 20 +
.../internal/rdd/GemFireRDDPartitioner.scala | 43 +
.../rdd/GemFireRDDPartitionerImpl.scala | 73 +
.../internal/rdd/GemFireRDDWriter.scala | 66 +
.../internal/rdd/GemFireRegionRDD.scala | 122 ++
.../javaapi/GemFireJavaRegionRDD.scala | 10 +
.../spark/connector/javaapi/JavaAPIHelper.scala | 37 +
.../gemfire/spark/connector/package.scala | 53 +
.../streaming/GemFireDStreamFunctions.scala | 73 +
.../spark/connector/streaming/package.scala | 16 +
.../gemfire/spark/connector/JavaAPITest.java | 147 ++
.../connector/GemFireFunctionDeployerTest.scala | 42 +
.../DefaultGemFireConnectionManagerTest.scala | 66 +
...tStreamingResultSenderAndCollectorTest.scala | 238 ++
.../internal/oql/QueryParserTest.scala | 67 +
.../connector/ConnectorImplicitsTest.scala | 34 +
.../connector/GemFireConnectionConfTest.scala | 84 +
.../connector/GemFireDStreamFunctionsTest.scala | 63 +
.../connector/GemFireRDDFunctionsTest.scala | 123 ++
.../spark/connector/LocatorHelperTest.scala | 152 ++
.../rdd/GemFireRDDPartitionerTest.scala | 174 ++
.../connector/rdd/GemFireRegionRDDTest.scala | 101 +
.../basic-demos/src/main/java/demo/Emp.java | 79 +
.../src/main/java/demo/OQLJavaDemo.java | 43 +
.../src/main/java/demo/PairRDDSaveJavaDemo.java | 70 +
.../src/main/java/demo/RDDSaveJavaDemo.java | 69 +
.../src/main/java/demo/RegionToRDDJavaDemo.java | 41 +
.../src/main/scala/demo/NetworkWordCount.scala | 59 +
.../project/Dependencies.scala | 29 +
.../project/GemFireSparkBuild.scala | 60 +
gemfire-spark-connector/project/Settings.scala | 41 +
.../project/build.properties | 1 +
gemfire-spark-connector/project/plugins.sbt | 8 +
gemfire-spark-connector/scalastyle-config.xml | 117 +
settings.gradle | 1 +
573 files changed, 25123 insertions(+), 35674 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/663379e2/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/663379e2/gemfire-assembly/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/663379e2/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/AgentUtilJUnitTest.java
----------------------------------------------------------------------
diff --cc
gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/AgentUtilJUnitTest.java
index 0000000,cd2c429..fe426cb
mode 000000,100644..100644
---
a/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/AgentUtilJUnitTest.java
+++
b/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/AgentUtilJUnitTest.java
@@@ -1,0 -1,106 +1,108 @@@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ package com.gemstone.gemfire.management.internal;
+
+ import com.gemstone.gemfire.management.internal.AgentUtil;
+ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+ import org.junit.Before;
+ import org.junit.Ignore;
+ import org.junit.Test;
+ import org.junit.experimental.categories.Category;
+
+ import java.io.File;
+ import java.io.FileInputStream;
+ import java.io.FileNotFoundException;
+ import java.io.IOException;
+ import java.io.InputStream;
+ import java.util.Properties;
+
+ import static org.junit.Assert.*;
+
+ @Category(IntegrationTest.class)
+ public class AgentUtilJUnitTest {
+
+ private AgentUtil agentUtil;
+ private String version;
+
+ @Before
+ public void setUp() {
+ version = getGemfireVersion();
+ agentUtil = new AgentUtil(version);
+ }
+
+ @Test
+ public void testRESTApiExists() {
+ String gemFireWarLocation = agentUtil.getGemFireWebApiWarLocation();
+ assertNotNull(gemFireWarLocation, "GemFire REST API WAR File was not
found");
+ }
+
- @Ignore("This test should be activated when pulse gets added to Geode")
++ /*
++ * This test should be activated when pulse gets added to Geode
++ */
+ @Test
+ public void testPulseWarExists() {
+ String gemFireWarLocation = agentUtil.getPulseWarLocation();
+ assertNotNull(gemFireWarLocation, "Pulse WAR File was not found");
+ }
+
+ private String getGemfireVersion() {
+ String version = null;
+
+ Properties prop = new Properties();
+ InputStream inputStream = null;
+ String pathPrefix = null;
+ try {
+ pathPrefix = calculatePathPrefixToProjectRoot("gemfire-assembly/");
+ inputStream = new FileInputStream(pathPrefix + "gradle.properties");
+ } catch (FileNotFoundException e1) {
+ try {
+ pathPrefix = calculatePathPrefixToProjectRoot("gemfire-core/");
+ inputStream = new FileInputStream(pathPrefix + "gradle.properties");
+ } catch (FileNotFoundException e) {
+ }
+ }
+
+ if (inputStream != null) {
+ try {
+ prop.load(inputStream);
+ version = prop.getProperty("version");
+ } catch (FileNotFoundException e) {
+ } catch (IOException e) {
+ }
+ }
+ return version;
+ }
+
+ private String calculatePathPrefixToProjectRoot(String subDirectory) {
+ String pathPrefix = "";
+
+ String currentDirectoryPath = new File(".").getAbsolutePath();
+ int gemfireCoreLocationIx = currentDirectoryPath.indexOf(subDirectory);
+ if (gemfireCoreLocationIx < 0) {
+ return pathPrefix;
+ }
+
+ String pathFromRoot =
currentDirectoryPath.substring(gemfireCoreLocationIx);
+ int segmentsCount = pathFromRoot.split("/").length - 1;
+
+ for (int i = 0; i < segmentsCount; i++) {
+ pathPrefix = pathPrefix + "../";
+ }
+ return pathPrefix;
+ }
+ }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/663379e2/settings.gradle
----------------------------------------------------------------------
diff --cc settings.gradle
index 082cee5,4b2da7b..a3b34bb
--- a/settings.gradle
+++ b/settings.gradle
@@@ -7,8 -7,8 +7,9 @@@ include 'gemfire-junit
include 'gemfire-core'
include 'gemfire-web'
include 'gemfire-web-api'
+include 'pulse'
include 'gemfire-assembly'
+ include 'gemfire-rebalancer'
def minimumGradleVersion = '2.3'
if (GradleVersion.current() < GradleVersion.version(minimumGradleVersion)) {
