Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0624118B4D for ; Fri, 20 Nov 2015 11:18:48 +0000 (UTC) Received: (qmail 82480 invoked by uid 500); 20 Nov 2015 11:18:48 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 82400 invoked by uid 500); 20 Nov 2015 11:18:48 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 82379 invoked by uid 99); 20 Nov 2015 11:18:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Nov 2015 11:18:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9BCDEDFAF5; Fri, 20 Nov 2015 11:18:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Fri, 20 Nov 2015 11:18:49 -0000 Message-Id: <71a9030a27ed4a8bbe7fcef2a1ef2671@git.apache.org> In-Reply-To: <9836f5534baa436fb18d825797727ed0@git.apache.org> References: <9836f5534baa436fb18d825797727ed0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-1282' into ignite-1282 Merge remote-tracking branch 'origin/ignite-1282' into ignite-1282 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/911ca9dc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/911ca9dc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/911ca9dc Branch: refs/heads/ignite-1282 Commit: 911ca9dc876955fa219022e514dda5885d1e0d47 Parents: 3430586 6d4ecfd Author: vozerov-gridgain Authored: Fri Nov 20 14:19:32 2015 +0300 Committer: vozerov-gridgain Committed: Fri Nov 20 14:19:32 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 | 1 + .../java/org/apache/ignite/IgniteCache.java | 3 +- .../java/org/apache/ignite/IgniteCompute.java | 3 +- .../org/apache/ignite/compute/ComputeJob.java | 2 +- .../internal/GridEventConsumeHandler.java | 22 +- .../internal/GridMessageListenHandler.java | 18 + .../ignite/internal/GridUpdateNotifier.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 9 +- .../communication/GridIoMessageFactory.java | 26 +- .../discovery/GridDiscoveryManager.java | 2 +- .../processors/cache/GridCacheAdapter.java | 151 +- .../processors/cache/GridCacheAtomicFuture.java | 6 + .../cache/GridCacheDeploymentManager.java | 2 +- .../processors/cache/GridCacheEntryEx.java | 12 +- .../processors/cache/GridCacheFuture.java | 13 - .../processors/cache/GridCacheGateway.java | 1 - .../processors/cache/GridCacheIoManager.java | 50 +- .../processors/cache/GridCacheMapEntry.java | 158 +- .../processors/cache/GridCacheMessage.java | 20 +- .../processors/cache/GridCacheMvcc.java | 7 - .../processors/cache/GridCacheMvccFuture.java | 7 + .../processors/cache/GridCacheMvccManager.java | 150 +- .../GridCachePartitionExchangeManager.java | 59 +- .../cache/GridCacheSharedContext.java | 38 +- .../cache/GridCacheUpdateAtomicResult.java | 15 +- .../cache/GridCacheUpdateTxResult.java | 24 +- .../processors/cache/IgniteCacheProxy.java | 3 + .../distributed/GridCacheTxRecoveryFuture.java | 54 +- .../distributed/GridDistributedBaseMessage.java | 56 - .../distributed/GridDistributedLockRequest.java | 6 - .../GridDistributedLockResponse.java | 32 +- .../distributed/GridDistributedTxMapping.java | 78 - .../GridDistributedTxPrepareRequest.java | 66 +- .../GridDistributedTxRemoteAdapter.java | 158 +- .../dht/CacheDistributedGetFutureAdapter.java | 27 +- .../cache/distributed/dht/CacheGetFuture.java | 32 + .../dht/GridClientPartitionTopology.java | 38 +- .../distributed/dht/GridDhtCacheAdapter.java | 141 ++ .../distributed/dht/GridDhtLocalPartition.java | 35 + .../distributed/dht/GridDhtLockFuture.java | 79 +- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../dht/GridDhtPartitionTopology.java | 26 +- .../dht/GridDhtPartitionTopologyImpl.java | 112 +- .../dht/GridDhtTransactionalCacheAdapter.java | 14 +- .../distributed/dht/GridDhtTxFinishFuture.java | 38 +- .../distributed/dht/GridDhtTxFinishRequest.java | 112 +- .../cache/distributed/dht/GridDhtTxLocal.java | 28 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 89 +- .../cache/distributed/dht/GridDhtTxMapping.java | 134 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 136 +- .../dht/GridDhtTxPrepareRequest.java | 54 +- .../cache/distributed/dht/GridDhtTxRemote.java | 29 +- .../dht/GridPartitionedGetFuture.java | 69 +- .../dht/GridPartitionedSingleGetFuture.java | 699 ++++++ .../dht/atomic/GridDhtAtomicCache.java | 206 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 159 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 121 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 5 - .../dht/colocated/GridDhtColocatedCache.java | 162 +- .../colocated/GridDhtColocatedLockFuture.java | 81 +- .../GridDhtPartitionsExchangeFuture.java | 35 +- .../preloader/GridDhtPartitionsFullMessage.java | 64 +- .../GridDhtPartitionsSingleMessage.java | 56 +- .../distributed/near/CacheVersionedValue.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 10 +- .../distributed/near/GridNearCacheAdapter.java | 4 +- .../distributed/near/GridNearGetFuture.java | 49 +- .../distributed/near/GridNearGetRequest.java | 1 - .../distributed/near/GridNearGetResponse.java | 2 - .../distributed/near/GridNearLockFuture.java | 72 +- .../distributed/near/GridNearLockRequest.java | 4 +- ...arOptimisticSerializableTxPrepareFuture.java | 124 +- .../near/GridNearOptimisticTxPrepareFuture.java | 170 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 72 +- .../GridNearPessimisticTxPrepareFuture.java | 59 +- .../near/GridNearSingleGetRequest.java | 396 ++++ .../near/GridNearSingleGetResponse.java | 321 +++ .../near/GridNearTransactionalCache.java | 10 +- .../near/GridNearTxFinishFuture.java | 103 +- .../cache/distributed/near/GridNearTxLocal.java | 273 ++- .../near/GridNearTxPrepareFutureAdapter.java | 20 +- .../near/GridNearTxPrepareRequest.java | 61 +- .../distributed/near/GridNearTxRemote.java | 33 +- .../distributed/near/IgniteTxMappings.java | 75 + .../distributed/near/IgniteTxMappingsImpl.java | 92 + .../near/IgniteTxMappingsSingleImpl.java | 101 + .../processors/cache/local/GridLocalCache.java | 4 +- .../cache/local/GridLocalLockFuture.java | 5 - .../CacheContinuousQueryBatchAck.java | 163 ++ .../continuous/CacheContinuousQueryEntry.java | 196 +- .../continuous/CacheContinuousQueryHandler.java | 811 ++++++- .../CacheContinuousQueryListener.java | 35 + .../continuous/CacheContinuousQueryManager.java | 151 +- .../cache/transactions/IgniteInternalTx.java | 13 +- .../cache/transactions/IgniteTxAdapter.java | 68 +- .../cache/transactions/IgniteTxEntry.java | 29 +- .../cache/transactions/IgniteTxHandler.java | 38 +- .../IgniteTxImplicitSingleStateImpl.java | 266 +++ .../transactions/IgniteTxLocalAdapter.java | 1441 ++++++----- .../cache/transactions/IgniteTxLocalEx.java | 30 +- .../cache/transactions/IgniteTxLocalState.java | 44 + .../transactions/IgniteTxLocalStateAdapter.java | 41 + .../cache/transactions/IgniteTxManager.java | 21 +- .../cache/transactions/IgniteTxMap.java | 3 +- .../cache/transactions/IgniteTxRemoteEx.java | 18 +- .../IgniteTxRemoteSingleStateImpl.java | 108 + .../cache/transactions/IgniteTxRemoteState.java | 34 + .../IgniteTxRemoteStateAdapter.java | 115 + .../transactions/IgniteTxRemoteStateImpl.java | 124 + .../cache/transactions/IgniteTxState.java | 177 ++ .../cache/transactions/IgniteTxStateImpl.java | 414 ++++ .../clock/GridClockSyncProcessor.java | 28 +- .../continuous/GridContinuousBatch.java | 44 + .../continuous/GridContinuousBatchAdapter.java | 46 + .../continuous/GridContinuousHandler.java | 22 + .../continuous/GridContinuousProcessor.java | 221 +- .../StartRoutineAckDiscoveryMessage.java | 14 +- .../StartRoutineDiscoveryMessage.java | 21 +- .../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/mxbean/IgniteMXBean.java | 8 +- .../org/apache/ignite/stream/StreamAdapter.java | 18 +- .../IgniteClientReconnectCacheTest.java | 11 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 75 + .../GridCacheConcurrentTxMultiNodeTest.java | 15 - .../cache/GridCachePartitionedGetSelfTest.java | 3 +- .../processors/cache/GridCacheTestEntryEx.java | 10 +- .../IgniteCacheAbstractStopBusySelfTest.java | 27 +- .../IgniteCacheP2pUnmarshallingErrorTest.java | 184 +- .../CacheGetFutureHangsSelfTest.java | 6 + .../GridCacheAbstractNodeRestartSelfTest.java | 2 + .../IgniteCacheSingleGetMessageTest.java | 357 +++ .../GridCacheReplicatedMetricsSelfTest.java | 9 - .../IgniteCacheTxStoreSessionTest.java | 2 +- ...ContinuousQueryFailoverAbstractSelfTest.java | 2235 ++++++++++++++++++ ...ryFailoverAtomicNearEnabledSelfSelfTest.java | 46 + ...FailoverAtomicPrimaryWriteOrderSelfTest.java | 44 + ...usQueryFailoverAtomicReplicatedSelfTest.java | 40 + ...inuousQueryFailoverTxReplicatedSelfTest.java | 32 + .../CacheContinuousQueryFailoverTxSelfTest.java | 39 + ...ridCacheContinuousQueryAbstractSelfTest.java | 153 +- .../GridCacheContinuousQueryTxSelfTest.java | 49 + ...CacheContinuousQueryClientReconnectTest.java | 187 ++ .../IgniteCacheContinuousQueryClientTest.java | 157 +- ...cheContinuousQueryClientTxReconnectTest.java | 32 + .../p2p/GridP2PSameClassLoaderSelfTest.java | 16 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 3 + .../testsuites/IgniteCacheTestSuite3.java | 2 + .../testsuites/IgniteCacheTestSuite4.java | 3 + .../ignite/util/mbeans/GridMBeanSelfTest.java | 33 +- modules/flume/README.txt | 72 + modules/flume/licenses/apache-2.0.txt | 202 ++ 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 + .../IgniteCacheQuerySelfTestSuite.java | 16 +- .../GridSpringResourceInjectionSelfTest.java | 143 ++ .../processors/resource/spring-resource.xml | 27 + .../testsuites/IgniteResourceSelfTestSuite.java | 2 + 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 + .../config/benchmark-multicast.properties | 6 +- .../benchmark-query-put-separated.properties | 87 + .../yardstick/cache/CacheEntryEventProbe.java | 156 ++ .../cache/IgniteSqlQueryPutBenchmark.java | 31 +- .../IgniteSqlQueryPutSeparatedBenchmark.java | 84 + parent/pom.xml | 1 + pom.xml | 3 + 190 files changed, 15622 insertions(+), 2791 deletions(-) ----------------------------------------------------------------------