Merge remote-tracking branch 'apache/ignite-1.5' into 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/c85d1f5f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c85d1f5f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c85d1f5f Branch: refs/heads/ignite-801 Commit: c85d1f5fed821d0fa5e354d19d7da3fd7f9ac87c Parents: 96483be f708c1a Author: ashutak <[email protected]> Authored: Thu Nov 19 19:32:31 2015 +0300 Committer: ashutak <[email protected]> Committed: Thu Nov 19 19:32:31 2015 +0300 ---------------------------------------------------------------------- modules/camel/README.txt | 34 + modules/camel/licenses/apache-2.0.txt | 202 ++++++ modules/camel/pom.xml | 102 +++ .../ignite/stream/camel/CamelStreamer.java | 237 +++++++ .../stream/camel/IgniteCamelStreamerTest.java | 420 +++++++++++ .../camel/IgniteCamelStreamerTestSuite.java | 48 ++ .../src/test/resources/camel.test.properties | 18 + .../ignite/codegen/MessageCodeGenerator.java | 11 +- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../java/org/apache/ignite/IgniteCompute.java | 3 +- .../org/apache/ignite/compute/ComputeJob.java | 2 +- .../ignite/internal/GridUpdateNotifier.java | 2 +- .../communication/GridIoMessageFactory.java | 18 + .../discovery/GridDiscoveryManager.java | 2 +- .../processors/cache/GridCacheAdapter.java | 103 ++- .../processors/cache/GridCacheAtomicFuture.java | 6 + .../cache/GridCacheDeploymentManager.java | 2 +- .../processors/cache/GridCacheFuture.java | 13 - .../processors/cache/GridCacheGateway.java | 1 - .../processors/cache/GridCacheIoManager.java | 50 +- .../processors/cache/GridCacheMessage.java | 20 +- .../processors/cache/GridCacheMvcc.java | 7 - .../processors/cache/GridCacheMvccFuture.java | 7 + .../processors/cache/GridCacheMvccManager.java | 150 ++-- .../GridCachePartitionExchangeManager.java | 55 +- .../cache/GridCacheSharedContext.java | 7 +- .../processors/cache/IgniteCacheProxy.java | 3 + .../distributed/GridCacheTxRecoveryFuture.java | 54 +- .../distributed/GridDistributedBaseMessage.java | 56 -- .../distributed/GridDistributedLockRequest.java | 6 - .../GridDistributedLockResponse.java | 32 +- .../GridDistributedTxPrepareRequest.java | 67 +- .../dht/CacheDistributedGetFutureAdapter.java | 27 +- .../cache/distributed/dht/CacheGetFuture.java | 32 + .../distributed/dht/GridDhtCacheAdapter.java | 141 ++++ .../distributed/dht/GridDhtLockFuture.java | 79 ++- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../dht/GridDhtTransactionalCacheAdapter.java | 14 +- .../distributed/dht/GridDhtTxFinishFuture.java | 24 +- .../cache/distributed/dht/GridDhtTxLocal.java | 4 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 9 + .../distributed/dht/GridDhtTxPrepareFuture.java | 77 +- .../dht/GridDhtTxPrepareRequest.java | 54 +- .../dht/GridPartitionedGetFuture.java | 69 +- .../dht/GridPartitionedSingleGetFuture.java | 697 +++++++++++++++++++ .../dht/atomic/GridDhtAtomicCache.java | 127 +++- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 84 +-- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 11 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 5 - .../dht/colocated/GridDhtColocatedCache.java | 162 ++++- .../colocated/GridDhtColocatedLockFuture.java | 81 ++- .../distributed/near/CacheVersionedValue.java | 2 +- .../distributed/near/GridNearCacheAdapter.java | 4 +- .../distributed/near/GridNearGetFuture.java | 57 +- .../distributed/near/GridNearGetRequest.java | 1 - .../distributed/near/GridNearGetResponse.java | 2 - .../distributed/near/GridNearLockFuture.java | 72 +- .../distributed/near/GridNearLockRequest.java | 4 +- ...arOptimisticSerializableTxPrepareFuture.java | 108 +-- .../near/GridNearOptimisticTxPrepareFuture.java | 69 +- .../GridNearPessimisticTxPrepareFuture.java | 58 +- .../near/GridNearSingleGetRequest.java | 396 +++++++++++ .../near/GridNearSingleGetResponse.java | 321 +++++++++ .../near/GridNearTransactionalCache.java | 9 +- .../near/GridNearTxFinishFuture.java | 42 +- .../cache/distributed/near/GridNearTxLocal.java | 164 +++-- .../near/GridNearTxPrepareFutureAdapter.java | 20 +- .../near/GridNearTxPrepareRequest.java | 52 +- .../processors/cache/local/GridLocalCache.java | 4 +- .../cache/local/GridLocalLockFuture.java | 5 - .../cache/transactions/IgniteInternalTx.java | 1 + .../cache/transactions/IgniteTxAdapter.java | 1 + .../cache/transactions/IgniteTxEntry.java | 9 +- .../cache/transactions/IgniteTxHandler.java | 19 +- .../IgniteTxImplicitSingleStateImpl.java | 7 + .../transactions/IgniteTxLocalAdapter.java | 14 +- .../cache/transactions/IgniteTxManager.java | 3 +- .../IgniteTxRemoteStateAdapter.java | 5 + .../cache/transactions/IgniteTxState.java | 6 + .../cache/transactions/IgniteTxStateImpl.java | 69 +- .../clock/GridClockSyncProcessor.java | 28 +- .../internal/util/UUIDCollectionMessage.java | 114 +++ .../util/future/GridCompoundFuture.java | 15 +- .../ignite/internal/util/lang/GridFunc.java | 8 +- .../ignite/internal/util/nio/GridNioServer.java | 13 +- .../ignite/marshaller/MarshallerExclusions.java | 4 +- .../org/apache/ignite/stream/StreamAdapter.java | 19 +- .../IgniteClientReconnectCacheTest.java | 11 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 75 ++ .../GridCacheConcurrentTxMultiNodeTest.java | 15 - .../cache/GridCachePartitionedGetSelfTest.java | 3 +- .../IgniteCacheAbstractStopBusySelfTest.java | 27 +- .../IgniteCacheP2pUnmarshallingErrorTest.java | 184 +++-- .../CacheGetFutureHangsSelfTest.java | 6 + .../GridCacheAbstractNodeRestartSelfTest.java | 2 + .../IgniteCacheSingleGetMessageTest.java | 357 ++++++++++ .../GridCacheReplicatedMetricsSelfTest.java | 9 - .../IgniteCacheTxStoreSessionTest.java | 2 +- .../testsuites/IgniteCacheTestSuite3.java | 2 + .../testsuites/IgniteCacheTestSuite4.java | 3 + modules/flume/README.md | 40 -- modules/flume/README.txt | 72 ++ modules/flume/licenses/apache-2.0.txt | 202 ++++++ modules/twitter/README.txt | 32 + modules/twitter/licenses/apache-2.0.txt | 202 ++++++ modules/twitter/pom.xml | 122 ++++ .../ignite/stream/twitter/OAuthSettings.java | 86 +++ .../ignite/stream/twitter/TwitterStreamer.java | 295 ++++++++ .../twitter/IgniteTwitterStreamerTest.java | 234 +++++++ .../twitter/IgniteTwitterStreamerTestSuite.java | 32 + .../stream/twitter/TwitterStreamerImpl.java | 79 +++ pom.xml | 2 + 112 files changed, 6152 insertions(+), 1107 deletions(-) ----------------------------------------------------------------------
