Merge remote-tracking branch 'remotes/origin/ignite-1.5'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8d77c18c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8d77c18c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8d77c18c Branch: refs/heads/ignite-1924 Commit: 8d77c18c7004f40e9b48fa19e9abd5d893967449 Parents: f6ecc48 4c9ea58 Author: Anton Vinogradov <a...@apache.org> Authored: Wed Nov 18 11:35:00 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Wed Nov 18 11:35:00 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 9 +- .../processors/cache/GridCacheAdapter.java | 48 +- .../processors/cache/GridCacheMapEntry.java | 11 +- .../cache/GridCacheSharedContext.java | 31 +- .../distributed/GridDistributedTxMapping.java | 78 - .../GridDistributedTxRemoteAdapter.java | 136 +- .../dht/GridDhtTransactionalCacheAdapter.java | 1 - .../cache/distributed/dht/GridDhtTxLocal.java | 24 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 80 +- .../cache/distributed/dht/GridDhtTxMapping.java | 134 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 59 +- .../cache/distributed/dht/GridDhtTxRemote.java | 29 +- ...arOptimisticSerializableTxPrepareFuture.java | 16 - .../near/GridNearOptimisticTxPrepareFuture.java | 103 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 72 +- .../GridNearPessimisticTxPrepareFuture.java | 1 - .../near/GridNearTransactionalCache.java | 1 - .../near/GridNearTxFinishFuture.java | 61 +- .../cache/distributed/near/GridNearTxLocal.java | 109 +- .../near/GridNearTxPrepareRequest.java | 9 - .../distributed/near/GridNearTxRemote.java | 26 +- .../distributed/near/IgniteTxMappings.java | 75 + .../distributed/near/IgniteTxMappingsImpl.java | 92 ++ .../near/IgniteTxMappingsSingleImpl.java | 101 ++ .../cache/transactions/IgniteInternalTx.java | 12 +- .../cache/transactions/IgniteTxAdapter.java | 67 +- .../cache/transactions/IgniteTxHandler.java | 16 +- .../IgniteTxImplicitSingleStateImpl.java | 259 ++++ .../transactions/IgniteTxLocalAdapter.java | 1388 ++++++++++-------- .../cache/transactions/IgniteTxLocalEx.java | 30 +- .../cache/transactions/IgniteTxLocalState.java | 44 + .../transactions/IgniteTxLocalStateAdapter.java | 41 + .../cache/transactions/IgniteTxManager.java | 18 +- .../cache/transactions/IgniteTxMap.java | 3 +- .../cache/transactions/IgniteTxRemoteEx.java | 17 +- .../IgniteTxRemoteSingleStateImpl.java | 108 ++ .../cache/transactions/IgniteTxRemoteState.java | 34 + .../IgniteTxRemoteStateAdapter.java | 110 ++ .../transactions/IgniteTxRemoteStateImpl.java | 124 ++ .../cache/transactions/IgniteTxState.java | 171 +++ .../cache/transactions/IgniteTxStateImpl.java | 375 +++++ .../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 360 +++-- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 95 +- .../messages/TcpDiscoveryAbstractMessage.java | 37 + .../TcpDiscoveryStatusCheckMessage.java | 11 + .../GridCacheLoadOnlyStoreAdapterSelfTest.java | 145 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 158 +- .../discovery/tcp/TcpDiscoveryRestartTest.java | 10 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 459 +++++- .../TcpDiscoveryMulticastIpFinderSelfTest.java | 28 +- .../testframework/junits/GridAbstractTest.java | 29 +- .../ignite/util/mbeans/GridMBeanSelfTest.java | 33 +- modules/flume/README.md | 40 + modules/flume/pom.xml | 77 + .../ignite/stream/flume/EventTransformer.java | 36 + .../apache/ignite/stream/flume/IgniteSink.java | 186 +++ .../stream/flume/IgniteSinkConstants.java | 35 + .../ignite/stream/flume/IgniteSinkTest.java | 142 ++ .../stream/flume/IgniteSinkTestSuite.java | 37 + .../stream/flume/TestEventTransformer.java | 66 + .../flume/src/test/resources/example-ignite.xml | 71 + .../GridSpringResourceInjectionSelfTest.java | 143 ++ .../processors/resource/spring-resource.xml | 27 + .../testsuites/IgniteResourceSelfTestSuite.java | 2 + .../config/benchmark-multicast.properties | 4 +- .../yardstick/IgniteBenchmarkArguments.java | 2 +- .../cache/IgnitePutGetTxBenchmark.java | 41 +- parent/pom.xml | 1 + pom.xml | 1 + 71 files changed, 4722 insertions(+), 1689 deletions(-) ----------------------------------------------------------------------