You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/05/20 17:24:56 UTC
[21/22] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-709_2' into ignite-709_2
Merge remote-tracking branch 'origin/ignite-709_2' into ignite-709_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7862514e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7862514e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7862514e
Branch: refs/heads/ignite-709_2
Commit: 7862514eb28f686b37a6c205ecf9af476c77b9b5
Parents: a902bc1 b20bd02
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed May 20 18:22:31 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed May 20 18:22:31 2015 +0300
----------------------------------------------------------------------
.../socket/WordsSocketStreamerServer.java | 2 +-
.../configuration/CacheConfiguration.java | 26 +-
.../ignite/internal/ClusterMetricsSnapshot.java | 14 +
.../apache/ignite/internal/IgniteKernal.java | 21 +-
.../org/apache/ignite/internal/IgnitionEx.java | 150 +---
.../ignite/internal/MarshallerContextImpl.java | 2 +-
.../internal/events/DiscoveryCustomEvent.java | 18 +-
.../internal/interop/InteropBootstrap.java | 34 +
.../interop/InteropBootstrapFactory.java | 39 +
.../internal/interop/InteropIgnition.java | 166 ++++
.../internal/interop/InteropProcessor.java | 36 +
.../managers/discovery/CustomEventListener.java | 31 +
.../discovery/CustomMessageWrapper.java | 58 ++
.../discovery/DiscoveryCustomMessage.java | 43 +
.../discovery/GridDiscoveryManager.java | 138 ++--
.../cache/DynamicCacheChangeBatch.java | 15 +-
.../cache/DynamicCacheDescriptor.java | 2 +
.../processors/cache/GridCacheAdapter.java | 8 +-
.../processors/cache/GridCacheMapEntry.java | 35 +-
.../GridCachePartitionExchangeManager.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 50 +-
.../processors/cache/GridCacheUtils.java | 56 +-
.../cache/affinity/GridCacheAffinityImpl.java | 10 +-
.../CacheDataStructuresManager.java | 2 +-
.../distributed/GridDistributedLockRequest.java | 111 +--
.../GridDistributedTxFinishRequest.java | 70 +-
.../GridDistributedTxPrepareRequest.java | 112 +--
.../GridDistributedTxRemoteAdapter.java | 20 +-
.../distributed/dht/GridDhtLockFuture.java | 2 -
.../distributed/dht/GridDhtLockRequest.java | 45 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 6 -
.../distributed/dht/GridDhtTxFinishFuture.java | 3 -
.../distributed/dht/GridDhtTxFinishRequest.java | 43 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 6 -
.../distributed/dht/GridDhtTxLocalAdapter.java | 68 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 18 +-
.../dht/GridDhtTxPrepareRequest.java | 60 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 8 +-
.../colocated/GridDhtColocatedLockFuture.java | 6 -
.../GridDhtPartitionsExchangeFuture.java | 29 +-
.../distributed/near/GridNearAtomicCache.java | 5 +
.../distributed/near/GridNearGetFuture.java | 2 +-
.../distributed/near/GridNearLockFuture.java | 6 -
.../distributed/near/GridNearLockRequest.java | 61 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 15 +-
.../GridNearPessimisticTxPrepareFuture.java | 2 -
.../near/GridNearTransactionalCache.java | 4 -
.../near/GridNearTxFinishRequest.java | 28 +-
.../cache/distributed/near/GridNearTxLocal.java | 20 +-
.../near/GridNearTxPrepareRequest.java | 52 +-
.../distributed/near/GridNearTxRemote.java | 24 +-
.../cache/transactions/IgniteInternalTx.java | 10 -
.../transactions/IgniteTransactionsImpl.java | 4 +-
.../cache/transactions/IgniteTxAdapter.java | 72 +-
.../cache/transactions/IgniteTxEntry.java | 48 +-
.../cache/transactions/IgniteTxHandler.java | 6 -
.../transactions/IgniteTxLocalAdapter.java | 165 +---
.../cache/transactions/IgniteTxLocalEx.java | 21 +-
.../cache/transactions/IgniteTxManager.java | 62 +-
.../continuous/GridContinuousMessageType.java | 12 -
.../continuous/GridContinuousProcessor.java | 796 ++++---------------
.../processors/continuous/StartRequestData.java | 267 +++++++
.../StartRoutineAckDiscoveryMessage.java | 71 ++
.../StartRoutineDiscoveryMessage.java | 94 +++
.../StopRoutineAckDiscoveryMessage.java | 58 ++
.../continuous/StopRoutineDiscoveryMessage.java | 58 ++
.../datastructures/DataStructuresProcessor.java | 4 +-
.../service/GridServiceProcessor.java | 4 +-
.../internal/util/future/SettableFuture.java | 94 ---
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../ignite/spi/discovery/DiscoverySpi.java | 7 +-
.../discovery/DiscoverySpiCustomMessage.java | 35 +
.../spi/discovery/DiscoverySpiListener.java | 5 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 175 ++--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 314 ++++----
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 64 +-
.../tcp/internal/TcpDiscoveryNode.java | 7 +-
.../messages/TcpDiscoveryAbstractMessage.java | 24 +-
.../TcpDiscoveryClientHeartbeatMessage.java | 67 ++
.../TcpDiscoveryCustomEventMessage.java | 9 +-
.../messages/TcpDiscoveryHeartbeatMessage.java | 21 +-
.../TcpDiscoveryNodeAddFinishedMessage.java | 43 +
.../affinity/IgniteClientNodeAffinityTest.java | 182 +++++
.../internal/GridDiscoveryEventSelfTest.java | 7 +-
.../GridProjectionForCachesSelfTest.java | 11 +-
.../internal/GridReleaseTypeSelfTest.java | 92 ++-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 12 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 130 +--
.../discovery/GridDiscoveryManagerSelfTest.java | 54 +-
...acheTcpClientDiscoveryMultiThreadedTest.java | 7 +-
.../GridCacheVariableTopologySelfTest.java | 12 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 29 +-
...gniteCacheP2pUnmarshallingNearErrorTest.java | 13 +-
.../IgniteDynamicClientCacheStartSelfTest.java | 283 +++++++
.../cache/IgniteSystemCacheOnClientTest.java | 97 +++
.../GridCacheQueueApiSelfAbstractTest.java | 4 +-
.../IgniteClientDataStructuresAbstractTest.java | 115 ++-
.../GridCacheClientModesAbstractSelfTest.java | 63 +-
...ientModesTcpClientDiscoveryAbstractTest.java | 18 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +
.../near/IgniteCacheNearOnlyTxTest.java | 190 +++++
...heNearOnlyLruNearEvictionPolicySelfTest.java | 19 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 6 +-
.../continuous/GridEventConsumeSelfTest.java | 89 +--
.../igfs/IgfsClientCacheSelfTest.java | 3 +-
.../processors/igfs/IgfsCommonAbstractTest.java | 10 -
.../service/GridServiceClientNodeTest.java | 81 ++
.../OptimizedMarshallerNodeFailoverTest.java | 4 +-
...GridMessagingNoPeerClassLoadingSelfTest.java | 7 +-
.../ignite/messaging/GridMessagingSelfTest.java | 13 +-
.../discovery/AbstractDiscoverySelfTest.java | 8 +-
...pClientDiscoveryMarshallerCheckSelfTest.java | 32 +-
.../tcp/TcpClientDiscoverySpiSelfTest.java | 52 +-
.../tcp/TcpDiscoveryConcurrentStartTest.java | 59 +-
.../ignite/testframework/GridTestUtils.java | 15 +
.../testframework/junits/GridAbstractTest.java | 52 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +-
...gniteCacheP2pUnmarshallingErrorTestSuit.java | 41 -
...niteCacheP2pUnmarshallingErrorTestSuite.java | 41 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +
.../testsuites/IgniteCacheTestSuite4.java | 2 +
.../testsuites/IgniteKernalSelfTestSuite.java | 7 +-
.../processors/cache/jta/CacheJtaManager.java | 4 +-
pom.xml | 2 +
124 files changed, 3617 insertions(+), 2662 deletions(-)
----------------------------------------------------------------------