You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/11/24 09:20:25 UTC
[50/50] [abbrv] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1924
Merge remote-tracking branch 'remotes/origin/master' into ignite-1924
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/036122e5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/036122e5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/036122e5
Branch: refs/heads/ignite-1924
Commit: 036122e508571ea525a33208b0df9133cd7735b3
Parents: a40c649 a144b84
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Nov 24 11:19:05 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Nov 24 11:19:05 2015 +0300
----------------------------------------------------------------------
.../datastructures/IgniteSemaphoreExample.java | 168 ++
.../ignite/examples/CacheExamplesSelfTest.java | 10 +-
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 | 418 ++++
.../camel/IgniteCamelStreamerTestSuite.java | 47 +
.../src/test/resources/camel.test.properties | 18 +
.../ignite/codegen/MessageCodeGenerator.java | 11 +-
.../src/main/java/org/apache/ignite/Ignite.java | 17 +
.../java/org/apache/ignite/IgniteCache.java | 3 +-
.../java/org/apache/ignite/IgniteCompute.java | 3 +-
.../java/org/apache/ignite/IgniteSemaphore.java | 312 +++
.../org/apache/ignite/compute/ComputeJob.java | 2 +-
.../apache/ignite/events/DiscoveryEvent.java | 6 +-
.../internal/GridEventConsumeHandler.java | 22 +-
.../internal/GridMessageListenHandler.java | 18 +
.../ignite/internal/GridUpdateNotifier.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 30 +-
.../internal/MarshallerContextAdapter.java | 4 +-
.../internal/direct/DirectByteBufferStream.java | 1499 ------------
.../internal/direct/DirectMessageReader.java | 144 +-
.../internal/direct/DirectMessageWriter.java | 65 +-
.../direct/DirectMessageWriterState.java | 123 -
.../direct/state/DirectMessageState.java | 98 +
.../direct/state/DirectMessageStateItem.java | 28 +
.../direct/stream/DirectByteBufferStream.java | 316 +++
.../stream/v1/DirectByteBufferStreamImplV1.java | 1360 +++++++++++
.../stream/v2/DirectByteBufferStreamImplV2.java | 1583 +++++++++++++
.../managers/communication/GridIoManager.java | 64 +-
.../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 | 93 +-
.../cache/GridCacheSharedContext.java | 38 +-
.../cache/GridCacheUpdateAtomicResult.java | 15 +-
.../cache/GridCacheUpdateTxResult.java | 24 +-
.../processors/cache/GridCacheUtils.java | 39 +-
.../processors/cache/IgniteCacheProxy.java | 3 +
.../CacheDataStructuresManager.java | 2 +-
.../distributed/GridCacheTxRecoveryFuture.java | 54 +-
.../distributed/GridDistributedBaseMessage.java | 56 -
.../distributed/GridDistributedLockRequest.java | 6 -
.../GridDistributedLockResponse.java | 32 +-
.../distributed/GridDistributedTxMapping.java | 78 -
.../GridDistributedTxPrepareRequest.java | 67 +-
.../GridDistributedTxRemoteAdapter.java | 158 +-
.../GridFutureRemapTimeoutObject.java | 72 -
.../dht/CacheDistributedGetFutureAdapter.java | 27 +-
.../cache/distributed/dht/CacheGetFuture.java | 32 +
.../dht/GridClientPartitionTopology.java | 74 +-
.../distributed/dht/GridDhtCacheAdapter.java | 141 ++
.../distributed/dht/GridDhtLocalPartition.java | 35 +
.../distributed/dht/GridDhtLockFuture.java | 80 +-
.../distributed/dht/GridDhtLockRequest.java | 2 +-
.../dht/GridDhtPartitionTopology.java | 34 +-
.../dht/GridDhtPartitionTopologyImpl.java | 155 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 15 +-
.../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 | 137 +-
.../dht/GridDhtTxPrepareRequest.java | 54 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 29 +-
.../dht/GridPartitionedGetFuture.java | 97 +-
.../dht/GridPartitionedSingleGetFuture.java | 697 ++++++
.../dht/atomic/GridDhtAtomicCache.java | 206 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 159 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 151 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 5 -
.../dht/colocated/GridDhtColocatedCache.java | 162 +-
.../colocated/GridDhtColocatedLockFuture.java | 82 +-
.../dht/preloader/GridDhtPartitionFullMap.java | 41 +-
.../dht/preloader/GridDhtPartitionMap.java | 148 +-
.../dht/preloader/GridDhtPartitionMap2.java | 306 +++
.../GridDhtPartitionsExchangeFuture.java | 59 +-
.../preloader/GridDhtPartitionsFullMessage.java | 64 +-
.../GridDhtPartitionsSingleMessage.java | 62 +-
.../distributed/near/CacheVersionedValue.java | 2 +-
.../distributed/near/GridNearAtomicCache.java | 10 +-
.../distributed/near/GridNearCacheAdapter.java | 5 +-
.../distributed/near/GridNearGetFuture.java | 87 +-
.../distributed/near/GridNearGetRequest.java | 1 -
.../distributed/near/GridNearGetResponse.java | 2 -
.../distributed/near/GridNearLockFuture.java | 74 +-
.../distributed/near/GridNearLockRequest.java | 4 +-
...arOptimisticSerializableTxPrepareFuture.java | 125 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 169 +-
...ridNearOptimisticTxPrepareFutureAdapter.java | 72 +-
.../GridNearPessimisticTxPrepareFuture.java | 59 +-
.../near/GridNearSingleGetRequest.java | 396 ++++
.../near/GridNearSingleGetResponse.java | 321 +++
.../near/GridNearTransactionalCache.java | 10 +-
.../near/GridNearTxFinishFuture.java | 105 +-
.../cache/distributed/near/GridNearTxLocal.java | 273 ++-
.../near/GridNearTxPrepareFutureAdapter.java | 20 +-
.../near/GridNearTxPrepareRequest.java | 61 +-
.../distributed/near/GridNearTxRemote.java | 34 +-
.../distributed/near/IgniteTxMappings.java | 75 +
.../distributed/near/IgniteTxMappingsImpl.java | 92 +
.../near/IgniteTxMappingsSingleImpl.java | 101 +
.../processors/cache/local/GridLocalCache.java | 5 +-
.../cache/local/GridLocalLockFuture.java | 7 -
.../CacheContinuousQueryBatchAck.java | 163 ++
.../continuous/CacheContinuousQueryEntry.java | 196 +-
.../continuous/CacheContinuousQueryEvent.java | 3 +-
.../continuous/CacheContinuousQueryHandler.java | 811 ++++++-
.../CacheContinuousQueryListener.java | 35 +
.../continuous/CacheContinuousQueryManager.java | 151 +-
.../cache/transactions/IgniteInternalTx.java | 12 +-
.../cache/transactions/IgniteTxAdapter.java | 67 +-
.../cache/transactions/IgniteTxEntry.java | 29 +-
.../cache/transactions/IgniteTxHandler.java | 38 +-
.../IgniteTxImplicitSingleStateImpl.java | 281 +++
.../transactions/IgniteTxLocalAdapter.java | 1419 ++++++-----
.../cache/transactions/IgniteTxLocalEx.java | 30 +-
.../cache/transactions/IgniteTxLocalState.java | 44 +
.../transactions/IgniteTxLocalStateAdapter.java | 41 +
.../cache/transactions/IgniteTxManager.java | 20 +-
.../cache/transactions/IgniteTxMap.java | 3 +-
.../cache/transactions/IgniteTxRemoteEx.java | 18 +-
.../IgniteTxRemoteSingleStateImpl.java | 119 +
.../cache/transactions/IgniteTxRemoteState.java | 34 +
.../IgniteTxRemoteStateAdapter.java | 115 +
.../transactions/IgniteTxRemoteStateImpl.java | 124 +
.../cache/transactions/IgniteTxState.java | 177 ++
.../cache/transactions/IgniteTxStateImpl.java | 413 ++++
.../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 +-
.../datastructures/DataStructuresProcessor.java | 240 +-
.../GridAtomicCacheQueueImpl.java | 126 +-
.../GridCacheAtomicReferenceImpl.java | 10 +-
.../GridCacheCountDownLatchImpl.java | 15 +-
.../datastructures/GridCacheQueueAdapter.java | 32 +-
.../datastructures/GridCacheSemaphoreEx.java | 47 +
.../datastructures/GridCacheSemaphoreImpl.java | 763 ++++++
.../datastructures/GridCacheSemaphoreState.java | 144 ++
.../GridTransactionalCacheQueueImpl.java | 193 +-
.../ignite/internal/util/IgniteUtils.java | 31 +
.../internal/util/UUIDCollectionMessage.java | 114 +
.../util/future/GridCompoundFuture.java | 15 +-
.../internal/util/ipc/IpcToNioAdapter.java | 14 +-
.../ignite/internal/util/lang/GridFunc.java | 8 +-
.../util/nio/GridCommunicationClient.java | 4 +-
.../internal/util/nio/GridDirectParser.java | 37 +-
.../util/nio/GridNioMessageReaderFactory.java | 37 +
.../util/nio/GridNioMessageWriterFactory.java | 35 +
.../ignite/internal/util/nio/GridNioServer.java | 60 +-
.../util/nio/GridShmemCommunicationClient.java | 12 +-
.../ignite/internal/visor/cache/VisorCache.java | 6 +-
.../ignite/marshaller/MarshallerExclusions.java | 4 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +-
.../communication/MessageFormatter.java | 15 +-
.../extensions/communication/MessageReader.java | 26 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 6 +-
.../communication/tcp/TcpCommunicationSpi.java | 80 +-
.../ignite/spi/discovery/DiscoverySpi.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 396 +++-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 95 +-
.../messages/TcpDiscoveryAbstractMessage.java | 37 +
.../TcpDiscoveryStatusCheckMessage.java | 11 +
.../org/apache/ignite/stream/StreamAdapter.java | 20 +-
.../resources/META-INF/classnames.properties | 1 +
.../GridCacheLoadOnlyStoreAdapterSelfTest.java | 145 +-
.../IgniteClientReconnectAtomicsTest.java | 44 +-
.../IgniteClientReconnectCacheTest.java | 11 +-
.../CacheDeferredDeleteSanitySelfTest.java | 98 +
.../cache/GridCacheAbstractFullApiSelfTest.java | 75 +
.../GridCacheConcurrentTxMultiNodeTest.java | 15 -
.../cache/GridCachePartitionedGetSelfTest.java | 3 +-
.../processors/cache/GridCacheTestEntryEx.java | 10 +-
.../IgniteCacheAbstractStopBusySelfTest.java | 27 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 184 +-
...eAbstractDataStructuresFailoverSelfTest.java | 1065 +++++----
.../IgniteClientDataStructuresAbstractTest.java | 59 +-
.../IgniteDataStructureUniqueNameTest.java | 14 +-
.../IgniteSemaphoreAbstractSelfTest.java | 411 ++++
.../local/IgniteLocalSemaphoreSelfTest.java | 98 +
...rtitionedDataStructuresFailoverSelfTest.java | 7 +-
...edOffheapDataStructuresFailoverSelfTest.java | 12 +-
.../IgnitePartitionedSemaphoreSelfTest.java | 33 +
...eplicatedDataStructuresFailoverSelfTest.java | 7 +-
.../IgniteReplicatedSemaphoreSelfTest.java | 33 +
.../CacheGetFutureHangsSelfTest.java | 6 +
.../GridCacheAbstractNodeRestartSelfTest.java | 2 +
.../IgniteCacheSingleGetMessageTest.java | 357 +++
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 12 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 4 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 8 +-
...gniteAtomicLongChangingTopologySelfTest.java | 2 +
...cingDelayedPartitionMapExchangeSelfTest.java | 178 ++
.../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 +
.../cache/GridCacheDataStructuresLoadTest.java | 283 ++-
.../p2p/GridP2PSameClassLoaderSelfTest.java | 16 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 4 +-
...lientDiscoverySpiFailureTimeoutSelfTest.java | 4 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 158 +-
.../discovery/tcp/TcpDiscoveryRestartTest.java | 10 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 549 ++++-
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 28 +-
.../testframework/GridSpiTestContext.java | 12 +-
.../testframework/junits/GridAbstractTest.java | 37 +-
.../ignite/testframework/junits/IgniteMock.java | 10 +
.../junits/common/GridCommonAbstractTest.java | 3 +
.../junits/multijvm/IgniteProcessProxy.java | 7 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +-
.../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 +
.../h2/twostep/GridReduceQueryExecutor.java | 4 +-
...niteCacheP2pUnmarshallingQueryErrorTest.java | 7 +-
.../IgniteCacheQuerySelfTestSuite.java | 16 +-
.../org/apache/ignite/IgniteSpringBean.java | 12 +
.../spring/IgniteTransactionHolder.java | 97 +
.../spring/SpringTransactionManager.java | 522 ++++
.../transactions/spring/package-info.java | 22 +
.../test/java/config/spring-transactions.xml | 36 +
.../GridSpringResourceInjectionSelfTest.java | 143 ++
.../processors/resource/spring-resource.xml | 27 +
.../testsuites/IgniteResourceSelfTestSuite.java | 2 +
.../testsuites/IgniteSpringTestSuite.java | 5 +-
.../GridSpringTransactionManagerSelfTest.java | 165 ++
.../spring/GridSpringTransactionService.java | 68 +
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 | 10 +-
.../benchmark-query-put-separated.properties | 87 +
.../yardstick/IgniteBenchmarkArguments.java | 2 +-
.../yardstick/cache/CacheEntryEventProbe.java | 156 ++
.../cache/IgnitePutGetTxBenchmark.java | 41 +-
.../cache/IgniteSqlQueryPutBenchmark.java | 20 +
.../IgniteSqlQueryPutSeparatedBenchmark.java | 84 +
.../cache/WaitMapExchangeFinishCallable.java | 4 +-
.../IgniteFailoverAbstractBenchmark.java | 4 +-
parent/pom.xml | 5 +-
pom.xml | 3 +
284 files changed, 25838 insertions(+), 6058 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/036122e5/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------