Merge branch 'develop' into feature/GEODE-9
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b73127ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b73127ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b73127ce Branch: refs/heads/develop Commit: b73127ce793ecff664d9cdae9132b641c7c9edd0 Parents: 70448c5 77d7fa5 Author: Jason Huynh <jhu...@pivotal.io> Authored: Wed Jul 22 16:25:16 2015 -0700 Committer: Jason Huynh <jhu...@pivotal.io> Committed: Wed Jul 22 16:25:16 2015 -0700 ---------------------------------------------------------------------- build.gradle | 6 +- etc/eclipseFormatterProfile.xml | 11 +- .../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 +- .../query/internal/index/AbstractIndex.java | 4 +- .../jgroup/JGroupMembershipManager.java | 2 +- .../gemfire/internal/cache/BucketRegion.java | 10 + .../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 | 26 +- .../gemfire/internal/cache/EntryEventImpl.java | 2 +- .../internal/cache/GemFireCacheImpl.java | 6 +- .../gemfire/internal/cache/LocalRegion.java | 9 +- .../internal/cache/PartitionedRegion.java | 1 + .../internal/cache/PartitionedRegionStats.java | 12 +- .../gemfire/internal/cache/PoolFactoryImpl.java | 3 +- .../internal/cache/RemoteOperationMessage.java | 2 + .../gemfire/internal/cache/TXCommitMessage.java | 64 +- .../gemfire/internal/cache/TXRegionState.java | 50 +- .../cache/control/InternalResourceManager.java | 15 +- .../control/PartitionRebalanceDetailsImpl.java | 8 +- .../cache/control/RebalanceOperationImpl.java | 157 +- .../cache/control/RebalanceResultsImpl.java | 16 +- .../cache/partitioned/PartitionMessage.java | 2 + .../PartitionedRegionRebalanceOp.java | 100 +- .../cache/partitioned/PutAllPRMessage.java | 37 + .../partitioned/rebalance/BucketOperator.java | 46 +- .../rebalance/ParallelBucketOperator.java | 145 ++ .../rebalance/PartitionedRegionLoadModel.java | 45 +- .../rebalance/SatisfyRedundancy.java | 7 +- .../rebalance/SatisfyRedundancyFPR.java | 1 + .../rebalance/SimulatedBucketOperator.java | 11 +- .../internal/cache/tx/DistTxEntryEvent.java | 70 +- .../cache/wan/GatewaySenderAdvisor.java | 1 - .../internal/cache/xmlcache/CacheCreation.java | 2 +- .../internal/cache/xmlcache/CacheXmlParser.java | 108 +- .../gemfire/internal/i18n/LocalizedStrings.java | 2 +- .../cli/commands/HDFSStoreCommands.java | 81 +- .../cli/functions/AlterHDFSStoreFunction.java | 24 +- .../cli/functions/CreateHDFSStoreFunction.java | 18 +- .../ColocatedRegionWithHDFSDUnitTest.java | 18 +- .../hdfs/internal/HDFSConfigJUnitTest.java | 146 +- .../internal/HdfsStoreMutatorJUnitTest.java | 147 +- .../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 | 48 +- .../internal/index/RangeIndexAPIJUnitTest.java | 32 +- .../cache30/BridgeMembershipDUnitTest.java | 109 +- .../PartitionedRegionCompressionDUnitTest.java | 4 - .../gemfire/cache30/RegionTestCase.java | 167 +- .../ServerLauncherWithSpringJUnitTest.java | 3 + .../gemfire/disttx/CacheMapDistTXDUnitTest.java | 9 +- .../gemfire/disttx/DistTXDebugDUnitTest.java | 5 - .../disttx/DistTXDistributedTestSuite.java | 5 +- .../gemfire/disttx/DistTXOrderDUnitTest.java | 13 +- .../disttx/DistTXPersistentDebugDUnitTest.java | 4 - .../disttx/DistTXRestrictionsDUnitTest.java | 1 - .../disttx/DistTXWithDeltaDUnitTest.java | 22 + .../disttx/DistributedTransactionDUnitTest.java | 793 +++++++++- .../gemfire/disttx/PRDistTXDUnitTest.java | 49 + .../disttx/PRDistTXWithVersionsDUnitTest.java | 50 + .../cache/HDFSRegionOperationsJUnitTest.java | 5 +- .../cache/PartitionedRegionStatsJUnitTest.java | 320 +++- .../cache/PartitionedRegionTestHelper.java | 3 +- .../control/RebalanceOperationDUnitTest.java | 460 +++++- .../execute/SingleHopGetAllPutAllDUnitTest.java | 18 +- .../PartitionedRegionLoadModelJUnitTest.java | 97 +- .../cache/tier/sockets/HAInterestBaseTest.java | 1435 ++++++++---------- .../sockets/HAInterestDistributedTestCase.java | 15 + .../tier/sockets/HAInterestPart1DUnitTest.java | 210 ++- .../tier/sockets/HAInterestPart2DUnitTest.java | 506 +++--- .../commands/HDFSStoreCommandsJUnitTest.java | 124 +- .../AlterHDFSStoreFunctionJUnitTest.java | 146 +- .../CreateHDFSStoreFunctionJUnitTest.java | 156 +- .../DescribeHDFSStoreFunctionJUnitTest.java | 98 +- .../test/java/dunit/DistributedTestCase.java | 4 +- .../sanctionedDataSerializables.txt | 16 +- .../codeAnalysis/sanctionedSerializables.txt | 6 +- .../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 +- 107 files changed, 5385 insertions(+), 4104 deletions(-) ----------------------------------------------------------------------
