geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [20/50] [abbrv] incubator-geode git commit: Merge branch 'develop' into feature/GEODE-17-2
Date Tue, 03 May 2016 21:52:09 GMT
Merge branch 'develop' into feature/GEODE-17-2

# Conflicts:
#	geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7e8294d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7e8294d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7e8294d7

Branch: refs/heads/feature/GEODE-1255
Commit: 7e8294d736dbdc3103dacbb42e9be2519d4e3e81
Parents: 7927758 46535f2
Author: Jinmei Liao <jiliao@pivotal.io>
Authored: Wed Apr 27 14:13:38 2016 -0700
Committer: Jinmei Liao <jiliao@pivotal.io>
Committed: Wed Apr 27 14:13:38 2016 -0700

----------------------------------------------------------------------
 geode-core/build.gradle                         |   22 -
 .../gemfire/cache/AttributesFactory.java        |   58 -
 .../gemfire/cache/AttributesMutator.java        |   14 -
 .../gemfire/cache/CustomEvictionAttributes.java |   78 -
 .../com/gemstone/gemfire/cache/DataPolicy.java  |   11 -
 .../gemfire/cache/EvictionCriteria.java         |   57 -
 .../com/gemstone/gemfire/cache/Operation.java   |   13 -
 .../gemfire/cache/RegionAttributes.java         |   23 -
 .../gemstone/gemfire/cache/RegionFactory.java   |   24 -
 .../internal/AsyncEventQueueFactoryImpl.java    |    5 -
 .../gemfire/cache/hdfs/HDFSIOException.java     |   52 -
 .../gemstone/gemfire/cache/hdfs/HDFSStore.java  |  341 --
 .../gemfire/cache/hdfs/HDFSStoreFactory.java    |  203 -
 .../gemfire/cache/hdfs/HDFSStoreMutator.java    |  196 -
 .../cache/hdfs/StoreExistsException.java        |   32 -
 .../cache/hdfs/internal/FailureTracker.java     |   96 -
 .../cache/hdfs/internal/FlushObserver.java      |   53 -
 .../hdfs/internal/HDFSBucketRegionQueue.java    | 1232 ------
 .../cache/hdfs/internal/HDFSEntriesSet.java     |  329 --
 .../cache/hdfs/internal/HDFSEventListener.java  |  179 -
 .../hdfs/internal/HDFSEventQueueFilter.java     |   73 -
 .../hdfs/internal/HDFSGatewayEventImpl.java     |  180 -
 .../hdfs/internal/HDFSIntegrationUtil.java      |  117 -
 .../HDFSParallelGatewaySenderQueue.java         |  471 ---
 .../hdfs/internal/HDFSStoreConfigHolder.java    |  559 ---
 .../cache/hdfs/internal/HDFSStoreCreation.java  |  198 -
 .../hdfs/internal/HDFSStoreFactoryImpl.java     |   77 -
 .../cache/hdfs/internal/HDFSStoreImpl.java      |  638 ---
 .../hdfs/internal/HDFSStoreMutatorImpl.java     |  200 -
 .../HDFSWriteOnlyStoreEventListener.java        |  184 -
 .../hdfs/internal/HoplogListenerForRegion.java  |   72 -
 .../cache/hdfs/internal/PersistedEventImpl.java |  202 -
 .../hdfs/internal/QueuedPersistentEvent.java    |   27 -
 .../hdfs/internal/SignalledFlushObserver.java   |  122 -
 .../internal/SortedHDFSQueuePersistedEvent.java |   86 -
 .../internal/SortedHoplogPersistedEvent.java    |  114 -
 .../UnsortedHDFSQueuePersistedEvent.java        |   76 -
 .../internal/UnsortedHoplogPersistedEvent.java  |   92 -
 .../hdfs/internal/hoplog/AbstractHoplog.java    |  357 --
 .../hoplog/AbstractHoplogOrganizer.java         |  430 --
 .../cache/hdfs/internal/hoplog/BloomFilter.java |   36 -
 .../hoplog/CloseTmpHoplogsTimerTask.java        |  108 -
 .../hdfs/internal/hoplog/CompactionStatus.java  |   72 -
 .../cache/hdfs/internal/hoplog/FlushStatus.java |   72 -
 .../internal/hoplog/HDFSCompactionManager.java  |  330 --
 .../internal/hoplog/HDFSFlushQueueArgs.java     |   93 -
 .../internal/hoplog/HDFSFlushQueueFunction.java |  287 --
 .../hoplog/HDFSForceCompactionArgs.java         |  107 -
 .../hoplog/HDFSForceCompactionFunction.java     |  129 -
 .../HDFSForceCompactionResultCollector.java     |  131 -
 .../hoplog/HDFSLastCompactionTimeFunction.java  |   56 -
 .../internal/hoplog/HDFSRegionDirector.java     |  480 ---
 .../hdfs/internal/hoplog/HDFSStoreDirector.java |   78 -
 .../hoplog/HDFSUnsortedHoplogOrganizer.java     |  447 ---
 .../hdfs/internal/hoplog/HFileSortedOplog.java  |  853 ----
 .../hoplog/HdfsSortedOplogOrganizer.java        | 2004 ----------
 .../cache/hdfs/internal/hoplog/Hoplog.java      |  263 --
 .../hdfs/internal/hoplog/HoplogConfig.java      |   74 -
 .../hdfs/internal/hoplog/HoplogListener.java    |   47 -
 .../hdfs/internal/hoplog/HoplogOrganizer.java   |  123 -
 .../hdfs/internal/hoplog/HoplogSetIterator.java |  166 -
 .../hdfs/internal/hoplog/HoplogSetReader.java   |  114 -
 .../internal/hoplog/SequenceFileHoplog.java     |  395 --
 .../hoplog/mapred/AbstractGFRecordReader.java   |  106 -
 .../internal/hoplog/mapred/GFInputFormat.java   |   95 -
 .../internal/hoplog/mapred/GFOutputFormat.java  |   75 -
 .../mapreduce/AbstractGFRecordReader.java       |  140 -
 .../hoplog/mapreduce/GFInputFormat.java         |  124 -
 .../hdfs/internal/hoplog/mapreduce/GFKey.java   |   72 -
 .../hoplog/mapreduce/GFOutputFormat.java        |  198 -
 .../hoplog/mapreduce/HDFSSplitIterator.java     |  197 -
 .../internal/hoplog/mapreduce/HoplogUtil.java   |  463 ---
 .../hoplog/mapreduce/RWSplitIterator.java       |   48 -
 .../hoplog/mapreduce/StreamSplitIterator.java   |   46 -
 .../org/apache/hadoop/io/SequenceFile.java      | 3726 ------------------
 .../query/internal/index/DummyQRegion.java      |    3 -
 .../cache/query/internal/index/HashIndex.java   |    1 -
 .../query/internal/index/IndexManager.java      |    8 -
 .../gemfire/cache/wan/GatewaySender.java        |    2 -
 .../gemstone/gemfire/internal/DSFIDFactory.java |    3 -
 .../internal/DataSerializableFixedID.java       |    1 -
 .../gemfire/internal/HeapDataOutputStream.java  |    3 -
 .../admin/remote/RemoteRegionAttributes.java    |   25 -
 .../cache/AbstractBucketRegionQueue.java        |   18 +-
 .../gemfire/internal/cache/AbstractRegion.java  |  147 -
 .../internal/cache/AbstractRegionEntry.java     |   36 +-
 .../internal/cache/AbstractRegionMap.java       |   86 +-
 .../gemfire/internal/cache/BucketAdvisor.java   |    1 -
 .../gemfire/internal/cache/BucketRegion.java    |  212 +-
 .../internal/cache/BucketRegionQueue.java       |    6 +-
 .../cache/CacheDistributionAdvisor.java         |   22 +-
 .../gemfire/internal/cache/CachePerfStats.java  |   75 -
 .../internal/cache/ColocationHelper.java        |    3 -
 .../cache/CustomEvictionAttributesImpl.java     |   35 -
 .../gemfire/internal/cache/DiskEntry.java       |    1 -
 .../gemfire/internal/cache/DistTXState.java     |    2 +-
 .../cache/DistributedCacheOperation.java        |    7 +-
 .../cache/DistributedPutAllOperation.java       |   33 +-
 .../internal/cache/DistributedRegion.java       |   31 +-
 .../cache/DistributedRemoveAllOperation.java    |   19 +-
 .../gemfire/internal/cache/EntryEventImpl.java  |   55 +-
 .../gemfire/internal/cache/EvictorService.java  |  284 --
 .../gemfire/internal/cache/FilterProfile.java   |   13 +-
 .../internal/cache/GemFireCacheImpl.java        |   99 -
 .../gemfire/internal/cache/HARegion.java        |   15 +-
 .../internal/cache/HDFSLRURegionMap.java        |  111 -
 .../gemfire/internal/cache/HDFSRegionMap.java   |   32 -
 .../internal/cache/HDFSRegionMapDelegate.java   |  540 ---
 .../internal/cache/HDFSRegionMapImpl.java       |   74 -
 .../gemfire/internal/cache/InternalCache.java   |    4 -
 .../internal/cache/InternalDataView.java        |   28 +-
 .../internal/cache/InternalRegionArguments.java |   16 -
 .../gemfire/internal/cache/LocalRegion.java     |  288 +-
 .../internal/cache/LocalRegionDataView.java     |   35 +-
 .../internal/cache/NonLocalRegionEntry.java     |   20 -
 .../gemstone/gemfire/internal/cache/Oplog.java  |   14 -
 .../gemfire/internal/cache/OverflowOplog.java   |    1 -
 .../internal/cache/PartitionedRegion.java       |  482 +--
 .../cache/PartitionedRegionDataStore.java       |   49 +-
 .../cache/PartitionedRegionDataView.java        |   27 +-
 .../gemfire/internal/cache/ProxyRegionMap.java  |   21 -
 .../gemfire/internal/cache/RegionEntry.java     |   20 -
 .../internal/cache/RegionMapFactory.java        |    6 -
 .../internal/cache/RemoteDestroyMessage.java    |    2 +-
 .../internal/cache/RemoteGetMessage.java        |    2 +-
 .../internal/cache/RemotePutMessage.java        |    2 +-
 .../gemfire/internal/cache/TXEntry.java         |    3 +-
 .../gemfire/internal/cache/TXEntryState.java    |   14 -
 .../gemfire/internal/cache/TXState.java         |   38 +-
 .../internal/cache/TXStateInterface.java        |   10 +-
 .../internal/cache/TXStateProxyImpl.java        |   30 +-
 .../gemfire/internal/cache/TXStateStub.java     |   32 +-
 .../gemfire/internal/cache/UpdateOperation.java |    3 -
 .../cache/UserSpecifiedRegionAttributes.java    |   24 +-
 .../cache/VMStatsDiskLRURegionEntryHeap.java    |    2 +-
 .../cache/VMStatsDiskLRURegionEntryOffHeap.java |    2 +-
 .../cache/VMStatsDiskRegionEntryHeap.java       |    2 +-
 .../cache/VMStatsDiskRegionEntryOffHeap.java    |    2 +-
 .../cache/VMStatsLRURegionEntryHeap.java        |    2 +-
 .../cache/VMStatsLRURegionEntryOffHeap.java     |    2 +-
 .../internal/cache/VMStatsRegionEntryHeap.java  |    2 +-
 .../cache/VMStatsRegionEntryOffHeap.java        |    2 +-
 .../cache/VMThinDiskLRURegionEntryHeap.java     |    2 +-
 .../cache/VMThinDiskLRURegionEntryOffHeap.java  |    2 +-
 .../cache/VMThinDiskRegionEntryHeap.java        |    2 +-
 .../cache/VMThinDiskRegionEntryOffHeap.java     |    2 +-
 .../cache/VMThinLRURegionEntryHeap.java         |    2 +-
 .../cache/VMThinLRURegionEntryOffHeap.java      |    2 +-
 .../internal/cache/VMThinRegionEntryHeap.java   |    2 +-
 .../cache/VMThinRegionEntryOffHeap.java         |    2 +-
 .../internal/cache/ValidatingDiskRegion.java    |   13 -
 .../VersionedStatsDiskLRURegionEntryHeap.java   |    2 +-
 ...VersionedStatsDiskLRURegionEntryOffHeap.java |    2 +-
 .../VersionedStatsDiskRegionEntryHeap.java      |    2 +-
 .../VersionedStatsDiskRegionEntryOffHeap.java   |    2 +-
 .../cache/VersionedStatsLRURegionEntryHeap.java |    2 +-
 .../VersionedStatsLRURegionEntryOffHeap.java    |    2 +-
 .../cache/VersionedStatsRegionEntryHeap.java    |    2 +-
 .../cache/VersionedStatsRegionEntryOffHeap.java |    2 +-
 .../VersionedThinDiskLRURegionEntryHeap.java    |    2 +-
 .../VersionedThinDiskLRURegionEntryOffHeap.java |    2 +-
 .../cache/VersionedThinDiskRegionEntryHeap.java |    2 +-
 .../VersionedThinDiskRegionEntryOffHeap.java    |    2 +-
 .../cache/VersionedThinLRURegionEntryHeap.java  |    2 +-
 .../VersionedThinLRURegionEntryOffHeap.java     |    2 +-
 .../cache/VersionedThinRegionEntryHeap.java     |    2 +-
 .../cache/VersionedThinRegionEntryOffHeap.java  |    2 +-
 .../cache/control/InternalResourceManager.java  |   10 -
 .../cache/partitioned/DestroyMessage.java       |    2 +-
 .../partitioned/FetchBulkEntriesMessage.java    |    2 +-
 .../internal/cache/partitioned/GetMessage.java  |   22 +-
 .../cache/partitioned/PutAllPRMessage.java      |   16 +-
 .../internal/cache/partitioned/PutMessage.java  |   12 +-
 .../persistence/soplog/ByteComparator.java      |   55 -
 .../persistence/soplog/CursorIterator.java      |   81 -
 .../soplog/DelegatingSerializedComparator.java  |   37 -
 .../soplog/HFileStoreStatistics.java            |  205 -
 .../persistence/soplog/KeyValueIterator.java    |   42 -
 .../soplog/SortedOplogStatistics.java           |  505 ---
 .../cache/persistence/soplog/SortedReader.java  |  255 --
 .../persistence/soplog/TrackedReference.java    |  153 -
 .../cache/tier/sockets/BaseCommand.java         |   11 +-
 .../internal/cache/tier/sockets/Message.java    |   16 -
 .../cache/tier/sockets/command/Destroy65.java   |    2 +-
 .../cache/tier/sockets/command/Get70.java       |    4 +-
 .../cache/tier/sockets/command/Request.java     |    4 +-
 .../internal/cache/tx/ClientTXRegionStub.java   |    4 +-
 .../cache/tx/DistributedTXRegionStub.java       |   14 +-
 .../cache/tx/PartitionedTXRegionStub.java       |    8 +-
 .../gemfire/internal/cache/tx/TXRegionStub.java |    4 +-
 .../cache/wan/AbstractGatewaySender.java        |   22 +-
 .../cache/wan/GatewaySenderAttributes.java      |    5 -
 .../cache/wan/GatewaySenderEventImpl.java       |    5 -
 ...rentParallelGatewaySenderEventProcessor.java |    3 -
 .../ConcurrentParallelGatewaySenderQueue.java   |   12 -
 .../ParallelGatewaySenderEventProcessor.java    |   22 +-
 .../parallel/ParallelGatewaySenderQueue.java    |   21 +-
 .../cache/xmlcache/AsyncEventQueueCreation.java |    9 -
 .../internal/cache/xmlcache/CacheCreation.java  |   39 +-
 .../internal/cache/xmlcache/CacheXml.java       |   31 -
 .../internal/cache/xmlcache/CacheXmlParser.java |  170 -
 .../xmlcache/RegionAttributesCreation.java      |   55 +-
 .../gemfire/internal/i18n/LocalizedStrings.java |   30 -
 .../internal/offheap/AbstractStoredObject.java  |    1 -
 .../internal/offheap/FreeListManager.java       |    7 -
 .../internal/offheap/OffHeapStoredObject.java   |    6 -
 .../internal/offheap/TinyStoredObject.java      |    4 -
 .../gemfire/internal/tcp/MsgStreamer.java       |   11 -
 .../management/DistributedRegionMXBean.java     |   11 -
 .../management/DistributedSystemMXBean.java     |    8 -
 .../gemfire/management/MemberMXBean.java        |    7 -
 .../gemfire/management/RegionMXBean.java        |   10 -
 .../internal/beans/DistributedRegionBridge.java |    5 -
 .../internal/beans/DistributedRegionMBean.java  |    5 -
 .../internal/beans/DistributedSystemBridge.java |   19 -
 .../internal/beans/DistributedSystemMBean.java  |    7 -
 .../internal/beans/HDFSRegionBridge.java        |  173 -
 .../management/internal/beans/MemberMBean.java  |    5 -
 .../internal/beans/MemberMBeanBridge.java       |   27 -
 .../internal/beans/PartitionedRegionBridge.java |   13 +-
 .../management/internal/beans/RegionMBean.java  |    5 -
 .../internal/beans/RegionMBeanBridge.java       |    5 -
 .../beans/stats/RegionClusterStatsMonitor.java  |    7 -
 .../cli/domain/RegionAttributesInfo.java        |   21 +-
 .../functions/DescribeHDFSStoreFunction.java    |   86 -
 .../cli/util/HDFSStoreNotFoundException.java    |   47 -
 .../cli/util/RegionAttributesNames.java         |    4 +-
 .../support/MemberMXBeanAdapter.java            |    5 -
 .../gemfire/pdx/internal/PdxReaderImpl.java     |    3 -
 .../geode.apache.org/schema/cache/cache-1.0.xsd |   31 -
 .../SignalledFlushObserverJUnitTest.java        |   97 -
 .../SortedListForAsyncQueueJUnitTest.java       |  564 ---
 .../GetOperationContextImplJUnitTest.java       |    1 -
 .../gemfire/cache30/Bug38741DUnitTest.java      |    2 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |   31 +
 .../ParallelGatewaySenderQueueJUnitTest.java    |    2 +-
 .../domain/CacheElementJUnitTest.java           |    1 -
 .../internal/JUnit4DistributedTestCase.java     |    3 -
 .../sanctionedDataSerializables.txt             |   92 +-
 .../codeAnalysis/sanctionedSerializables.txt    |   15 +-
 .../cache/query/internal/cq/CqServiceImpl.java  |    2 +-
 geode-lucene/build.gradle                       |    4 -
 .../tools/pulse/internal/data/Cluster.java      |    9 -
 .../pulse/internal/data/PulseConstants.java     |    1 -
 .../internal/service/ClusterRegionService.java  |   11 -
 .../internal/service/ClusterRegionsService.java |   11 -
 .../service/ClusterSelectedRegionService.java   |    6 -
 .../scripts/pulsescript/PulseCallbacks.js       |    2 -
 .../webapp/scripts/pulsescript/clusterDetail.js |    7 +-
 .../controllers/PulseControllerJUnitTest.java   |    3 -
 .../gemfire/tools/pulse/tests/Region.java       |    9 +-
 geode-pulse/src/test/resources/test.properties  |    6 +-
 geode-rebalancer/build.gradle                   |    7 -
 .../cache/wan/GatewaySenderFactoryImpl.java     |    4 -
 .../internal/cache/UpdateVersionDUnitTest.java  |    6 +-
 255 files changed, 542 insertions(+), 25074 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e8294d7/geode-core/build.gradle
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e8294d7/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedRegionMXBean.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e8294d7/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedSystemMXBean.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e8294d7/geode-core/src/main/java/com/gemstone/gemfire/management/MemberMXBean.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e8294d7/geode-core/src/main/java/com/gemstone/gemfire/management/RegionMXBean.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e8294d7/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e8294d7/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e8294d7/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e8294d7/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConstants.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e8294d7/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java
----------------------------------------------------------------------


Mime
View raw message