Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1758
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7a04f32 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7a04f32 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7a04f32 Branch: refs/heads/ignite-1758 Commit: e7a04f3249fb28fde3d9115b88b49ecf844bb303 Parents: f7e040e 3de9d47 Author: sboikov <sboi...@gridgain.com> Authored: Tue Nov 10 10:14:30 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Nov 10 10:14:30 2015 +0300 ---------------------------------------------------------------------- .../java8/messaging/MessagingExample.java | 7 +- .../rest/AbstractRestProcessorSelfTest.java | 5 +- .../JettyRestProcessorAbstractSelfTest.java | 142 +- .../src/main/java/org/apache/ignite/Ignite.java | 12 +- .../java/org/apache/ignite/IgniteCache.java | 1 + .../eviction/random/RandomEvictionPolicy.java | 4 + .../configuration/CacheConfiguration.java | 54 +- .../configuration/ConnectorConfiguration.java | 61 +- .../configuration/IgniteConfiguration.java | 32 +- .../apache/ignite/internal/IgniteKernal.java | 54 +- .../org/apache/ignite/internal/IgnitionEx.java | 3 + .../managers/communication/GridIoMessage.java | 4 +- .../communication/GridIoMessageFactory.java | 10 +- .../discovery/GridDiscoveryManager.java | 5 +- .../affinity/GridAffinityAssignmentCache.java | 13 + .../processors/cache/GridCacheAdapter.java | 22 +- .../cache/GridCacheAffinityManager.java | 10 + .../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 | 188 ++- .../processors/cache/GridCachePreloader.java | 60 +- .../cache/GridCachePreloaderAdapter.java | 45 +- .../processors/cache/GridCacheProcessor.java | 74 +- .../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 | 13 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 43 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 78 +- .../cache/distributed/dht/GridDhtTxRemote.java | 45 +- .../dht/atomic/GridDhtAtomicCache.java | 1 - .../dht/colocated/GridDhtColocatedCache.java | 7 +- .../dht/preloader/GridDhtForceKeysFuture.java | 14 + .../GridDhtPartitionDemandMessage.java | 14 +- .../preloader/GridDhtPartitionDemandPool.java | 1192 --------------- .../dht/preloader/GridDhtPartitionDemander.java | 1389 ++++++++++++++++++ .../dht/preloader/GridDhtPartitionSupplier.java | 1034 +++++++++++++ .../GridDhtPartitionSupplyMessageV2.java | 380 +++++ .../preloader/GridDhtPartitionSupplyPool.java | 555 ------- .../GridDhtPartitionsExchangeFuture.java | 2 + .../dht/preloader/GridDhtPreloader.java | 299 +++- .../near/GridNearOptimisticTxPrepareFuture.java | 11 +- .../near/GridNearTransactionalCache.java | 7 +- .../near/GridNearTxFinishFuture.java | 157 +- .../cache/distributed/near/GridNearTxLocal.java | 21 +- .../cache/transactions/IgniteInternalTx.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 251 ++-- .../cache/transactions/IgniteTxHandler.java | 37 +- .../transactions/IgniteTxLocalAdapter.java | 26 +- .../cache/transactions/IgniteTxManager.java | 171 ++- .../datastructures/DataStructuresProcessor.java | 3 + .../processors/job/GridJobProcessor.java | 96 +- .../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 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../java/org/jsr166/ConcurrentHashMap8.java | 2 +- .../java/org/jsr166/ConcurrentLinkedDeque8.java | 2 +- .../org/jsr166/ConcurrentLinkedHashMap.java | 195 ++- .../GridCacheAffinityBackupsSelfTest.java | 8 + .../GridTaskFailoverAffinityRunTest.java | 3 + .../processors/cache/CacheNamesSelfTest.java | 69 + .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../GridCacheMissingCommitVersionSelfTest.java | 40 +- .../processors/cache/GridCacheTestEntryEx.java | 3 +- .../IgniteCacheP2pUnmarshallingErrorTest.java | 2 +- .../cache/IgniteCacheTxPeekModesTest.java | 5 + ...niteCacheClientNodeChangingTopologyTest.java | 4 +- .../dht/GridCacheTxNodeFailureSelfTest.java | 21 +- .../near/GridCacheNearTxExceptionSelfTest.java | 11 + ...achePartitionedMultiNodeFullApiSelfTest.java | 2 +- .../GridCacheRebalancingAsyncSelfTest.java | 68 + .../GridCacheRebalancingSyncSelfTest.java | 506 +++++++ ...eRebalancingUnmarshallingFailedSelfTest.java | 147 ++ .../GridCacheReplicatedPreloadSelfTest.java | 22 +- .../continuous/GridEventConsumeSelfTest.java | 2 +- ...dBoundedConcurrentLinkedHashMapSelfTest.java | 2 +- .../GridConcurrentLinkedHashMapSelfTest.java | 62 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 17 - .../spi/discovery/tcp/TestTcpDiscoverySpi.java | 46 + .../testframework/junits/GridAbstractTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 5 + .../junits/common/GridCommonAbstractTest.java | 25 +- .../junits/multijvm/IgniteProcessProxy.java | 7 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../testsuites/IgniteCacheTestSuite3.java | 4 + ...rrentLinkedHashMapMultiThreadedSelfTest.java | 104 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 18 +- modules/rest-http/pom.xml | 6 + .../http/jetty/GridJettyRestProtocol.java | 4 +- .../scala/org/apache/ignite/spark/Entity.scala | 2 +- .../org/apache/ignite/spark/IgniteRDDSpec.scala | 249 ++++ .../org/apache/ignite/spark/IgniteRddSpec.scala | 249 ---- .../org/apache/ignite/IgniteSpringBean.java | 10 +- modules/ssh/pom.xml | 2 +- .../visor/commands/open/VisorOpenCommand.scala | 14 +- .../yardstick/cache/IgnitePutTxBenchmark.java | 10 + .../cache/IgnitePutTxPrimaryOnlyBenchmark.java | 65 + .../IgnitePutTxSkipLocalBackupBenchmark.java | 65 + .../cache/WaitMapExchangeFinishCallable.java | 95 ++ 118 files changed, 6592 insertions(+), 3265 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e7a04f32/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e7a04f32/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e7a04f32/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ----------------------------------------------------------------------
