You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/11/17 14:35:24 UTC
[46/46] ignite git commit: Merge branches 'ignite-1282' and
'ignite-1753-1282' of https://git-wip-us.apache.org/repos/asf/ignite into
ignite-1753-1282
Merge branches 'ignite-1282' and 'ignite-1753-1282' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1753-1282
Conflicts:
modules/yardstick/config/ignite-store-config.xml
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59fd5cec
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59fd5cec
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59fd5cec
Branch: refs/heads/ignite-1753-1282
Commit: 59fd5cecc241ec1115c177a7131e3b5e9e5e14a1
Parents: dbf83b9 c00e4ac
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Nov 17 20:34:17 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Nov 17 20:34:17 2015 +0700
----------------------------------------------------------------------
.../rest/AbstractRestProcessorSelfTest.java | 5 +-
.../JettyRestProcessorAbstractSelfTest.java | 142 +-
.../java/org/apache/ignite/IgniteCache.java | 3 +-
.../eviction/random/RandomEvictionPolicy.java | 4 +
.../cache/store/CacheStoreSessionListener.java | 9 +-
.../jdbc/CacheJdbcStoreSessionListener.java | 8 +-
.../configuration/CacheConfiguration.java | 121 +-
.../configuration/ConnectorConfiguration.java | 61 +-
.../configuration/IgniteConfiguration.java | 32 +-
.../apache/ignite/internal/IgniteKernal.java | 21 +
.../org/apache/ignite/internal/IgnitionEx.java | 3 +
.../managers/communication/GridIoMessage.java | 4 +-
.../communication/GridIoMessageFactory.java | 10 +-
.../discovery/GridDiscoveryManager.java | 5 +-
.../internal/portable/PortableContext.java | 4 +-
.../cache/CacheStoreBalancingWrapper.java | 5 +-
.../processors/cache/GridCacheAdapter.java | 22 +-
.../processors/cache/GridCacheContext.java | 29 +-
.../processors/cache/GridCacheEntryEx.java | 4 +-
.../processors/cache/GridCacheIoManager.java | 19 +-
.../processors/cache/GridCacheMapEntry.java | 91 +-
.../processors/cache/GridCacheMvccManager.java | 145 +-
.../GridCachePartitionExchangeManager.java | 184 ++-
.../processors/cache/GridCachePreloader.java | 55 +-
.../cache/GridCachePreloaderAdapter.java | 40 +-
.../processors/cache/GridCacheProcessor.java | 59 +-
.../processors/cache/IgniteCacheProxy.java | 6 +
.../distributed/GridDistributedCacheEntry.java | 2 +-
.../distributed/GridDistributedTxMapping.java | 8 +-
.../GridDistributedTxRemoteAdapter.java | 5 +-
.../distributed/dht/GridDhtCacheEntry.java | 11 +-
.../distributed/dht/GridDhtLocalPartition.java | 63 +-
.../distributed/dht/GridDhtLockFuture.java | 7 +-
.../dht/GridDhtPartitionsReservation.java | 2 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 12 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 39 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 78 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 33 +-
.../dht/colocated/GridDhtColocatedCache.java | 7 +-
.../GridDhtPartitionDemandMessage.java | 14 +-
.../preloader/GridDhtPartitionDemandPool.java | 1192 ---------------
.../dht/preloader/GridDhtPartitionDemander.java | 1408 ++++++++++++++++++
.../dht/preloader/GridDhtPartitionSupplier.java | 1037 +++++++++++++
.../GridDhtPartitionSupplyMessageV2.java | 380 +++++
.../preloader/GridDhtPartitionSupplyPool.java | 555 -------
.../GridDhtPartitionsExchangeFuture.java | 2 +
.../dht/preloader/GridDhtPreloader.java | 282 +++-
.../near/GridNearOptimisticTxPrepareFuture.java | 11 +-
.../near/GridNearTransactionalCache.java | 7 +-
.../near/GridNearTxFinishFuture.java | 157 +-
.../cache/distributed/near/GridNearTxLocal.java | 21 +-
.../CacheObjectBinaryProcessorImpl.java | 2 +-
.../cache/store/CacheOsStoreManager.java | 2 +-
.../store/GridCacheStoreManagerAdapter.java | 29 +-
.../cache/transactions/IgniteInternalTx.java | 3 +-
.../cache/transactions/IgniteTxAdapter.java | 251 ++--
.../cache/transactions/IgniteTxHandler.java | 37 +-
.../transactions/IgniteTxLocalAdapter.java | 22 +-
.../cache/transactions/IgniteTxManager.java | 171 ++-
.../datastructures/DataStructuresProcessor.java | 3 +
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../processors/igfs/IgfsMetaManager.java | 2 +-
.../handlers/cache/GridCacheCommandHandler.java | 128 +-
.../handlers/query/QueryCommandHandler.java | 254 +++-
.../top/GridTopologyCommandHandler.java | 4 -
.../processors/task/GridTaskWorker.java | 4 +-
.../GridBoundedConcurrentLinkedHashMap.java | 7 +-
.../GridBoundedConcurrentLinkedHashSet.java | 7 +-
.../util/GridBoundedConcurrentOrderedMap.java | 39 +-
.../internal/util/GridConcurrentFactory.java | 11 +-
.../util/GridConcurrentLinkedHashSet.java | 9 +-
.../ignite/internal/util/IgniteUuidCache.java | 6 +-
.../util/future/GridCompoundFuture.java | 155 +-
.../ignite/internal/util/lang/GridTuple4.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 360 +++--
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 95 +-
.../messages/TcpDiscoveryAbstractMessage.java | 37 +
.../TcpDiscoveryStatusCheckMessage.java | 11 +
.../java/org/jsr166/ConcurrentHashMap8.java | 2 +-
.../java/org/jsr166/ConcurrentLinkedDeque8.java | 2 +-
.../org/jsr166/ConcurrentLinkedHashMap.java | 195 ++-
.../resources/META-INF/classnames.properties | 196 ++-
.../GridCacheAffinityBackupsSelfTest.java | 8 +
.../store/GridCacheBalancingStoreSelfTest.java | 220 ++-
.../GridCacheLoadOnlyStoreAdapterSelfTest.java | 145 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 +-
.../GridCacheMissingCommitVersionSelfTest.java | 40 +-
.../processors/cache/GridCacheTestEntryEx.java | 3 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 2 +-
...CacheAtomicReferenceApiSelfAbstractTest.java | 20 +-
.../dht/GridCacheTxNodeFailureSelfTest.java | 21 +-
...gniteCachePutRetryTransactionalSelfTest.java | 10 +
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +-
.../GridCacheRebalancingAsyncSelfTest.java | 68 +
.../GridCacheRebalancingSyncSelfTest.java | 506 +++++++
...eRebalancingUnmarshallingFailedSelfTest.java | 147 ++
.../GridCacheReplicatedPreloadSelfTest.java | 22 +-
.../GridCachePortableStoreAbstractSelfTest.java | 2 +-
.../continuous/GridEventConsumeSelfTest.java | 2 +-
...dBoundedConcurrentLinkedHashMapSelfTest.java | 2 +-
.../GridConcurrentLinkedHashMapSelfTest.java | 62 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 158 +-
.../discovery/tcp/TcpDiscoveryRestartTest.java | 10 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 476 +++++-
.../spi/discovery/tcp/TestTcpDiscoverySpi.java | 46 +
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 28 +-
.../testframework/junits/GridAbstractTest.java | 32 +-
.../junits/common/GridCommonAbstractTest.java | 25 +-
.../testsuites/IgniteCacheTestSuite3.java | 4 +
...rrentLinkedHashMapMultiThreadedSelfTest.java | 104 +-
.../tcp/GridOrderedMessageCancelSelfTest.java | 18 +-
modules/rest-http/pom.xml | 11 +
.../visor/commands/open/VisorOpenCommand.scala | 14 +-
.../scala/org/apache/ignite/visor/visor.scala | 3 +-
modules/yardstick/README.txt | 16 +-
.../config/benchmark-multicast.properties | 9 +-
.../yardstick/IgniteBenchmarkArguments.java | 2 +-
.../ignite/yardstick/IgniteBenchmarkUtils.java | 75 +
.../IgniteAccountSerializableTxBenchmark.java | 11 +-
.../cache/IgniteAccountTxBenchmark.java | 11 +-
.../cache/IgniteGetAllPutAllTxBenchmark.java | 73 +
.../cache/IgnitePutGetTxBenchmark.java | 41 +-
.../yardstick/cache/IgnitePutTxBenchmark.java | 10 +
.../cache/IgnitePutTxPrimaryOnlyBenchmark.java | 65 +
.../IgnitePutTxSkipLocalBackupBenchmark.java | 65 +
.../cache/WaitMapExchangeFinishCallable.java | 95 ++
...IgniteTransactionalWriteInvokeBenchmark.java | 41 +-
.../IgniteTransactionalWriteReadBenchmark.java | 41 +-
modules/zookeeper/pom.xml | 2 +-
131 files changed, 7825 insertions(+), 3423 deletions(-)
----------------------------------------------------------------------