You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ra...@apache.org on 2015/11/24 18:51:32 UTC
[16/51] [abbrv] ignite git commit: Merge branch ignite-1.5 into
ignite-1282
Merge branch ignite-1.5 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/3d8c4c0f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3d8c4c0f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3d8c4c0f
Branch: refs/heads/ignite-1270
Commit: 3d8c4c0f0cf7eda1544969dcc5663a9da0d6f9d2
Parents: ae5fb3e 457ca6f
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Sat Nov 21 12:25:43 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Sat Nov 21 12:25:43 2015 +0300
----------------------------------------------------------------------
.../datastructures/IgniteSemaphoreExample.java | 168 ++
.../ignite/examples/CacheExamplesSelfTest.java | 10 +-
.../stream/camel/IgniteCamelStreamerTest.java | 16 +-
.../camel/IgniteCamelStreamerTestSuite.java | 1 -
.../src/main/java/org/apache/ignite/Ignite.java | 17 +
.../java/org/apache/ignite/IgniteSemaphore.java | 312 ++++
.../apache/ignite/events/DiscoveryEvent.java | 6 +-
.../apache/ignite/internal/IgniteKernal.java | 21 +
.../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 +-
.../GridCachePartitionExchangeManager.java | 34 +-
.../processors/cache/GridCacheUtils.java | 39 +-
.../CacheDataStructuresManager.java | 2 +-
.../GridFutureRemapTimeoutObject.java | 72 -
.../dht/GridClientPartitionTopology.java | 38 +-
.../distributed/dht/GridDhtLockFuture.java | 1 -
.../dht/GridDhtPartitionTopology.java | 12 +-
.../dht/GridDhtPartitionTopologyImpl.java | 45 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 1 -
.../dht/GridPartitionedGetFuture.java | 30 +-
.../colocated/GridDhtColocatedLockFuture.java | 1 -
.../dht/preloader/GridDhtPartitionFullMap.java | 41 +-
.../dht/preloader/GridDhtPartitionMap.java | 148 +-
.../dht/preloader/GridDhtPartitionMap2.java | 306 ++++
.../GridDhtPartitionsExchangeFuture.java | 24 +-
.../GridDhtPartitionsSingleMessage.java | 6 +-
.../distributed/near/GridNearCacheAdapter.java | 1 -
.../distributed/near/GridNearGetFuture.java | 30 +-
.../distributed/near/GridNearLockFuture.java | 2 -
...arOptimisticSerializableTxPrepareFuture.java | 3 -
.../near/GridNearOptimisticTxPrepareFuture.java | 1 -
.../near/GridNearTxFinishFuture.java | 4 -
.../distributed/near/GridNearTxRemote.java | 1 -
.../processors/cache/local/GridLocalCache.java | 1 -
.../cache/local/GridLocalLockFuture.java | 2 -
.../cache/transactions/IgniteInternalTx.java | 1 -
.../cache/transactions/IgniteTxAdapter.java | 1 -
.../IgniteTxImplicitSingleStateImpl.java | 29 +-
.../cache/transactions/IgniteTxManager.java | 1 -
.../IgniteTxRemoteSingleStateImpl.java | 19 +-
.../cache/transactions/IgniteTxStateImpl.java | 1 -
.../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/ipc/IpcToNioAdapter.java | 14 +-
.../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 | 47 +-
.../util/nio/GridShmemCommunicationClient.java | 12 +-
.../ignite/internal/visor/cache/VisorCache.java | 6 +-
.../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 | 36 +
.../org/apache/ignite/stream/StreamAdapter.java | 1 -
.../apache/ignite/stream/StreamTransformer.java | 9 +-
.../resources/META-INF/classnames.properties | 1 +
.../IgniteClientReconnectAtomicsTest.java | 44 +-
...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 +
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 12 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 4 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 8 +-
...gniteAtomicLongChangingTopologySelfTest.java | 2 +
...cingDelayedPartitionMapExchangeSelfTest.java | 178 ++
.../cache/GridCacheDataStructuresLoadTest.java | 283 ++--
...GridTcpCommunicationSpiRecoverySelfTest.java | 4 +-
...lientDiscoverySpiFailureTimeoutSelfTest.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 90 +-
.../testframework/GridSpiTestContext.java | 12 +-
.../testframework/junits/GridAbstractTest.java | 6 +-
.../ignite/testframework/junits/IgniteMock.java | 10 +
.../junits/multijvm/IgniteProcessProxy.java | 7 +
.../testsuites/IgniteCacheTestSuite3.java | 2 +
.../h2/twostep/GridReduceQueryExecutor.java | 4 +-
.../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 +
.../testsuites/IgniteSpringTestSuite.java | 5 +-
.../GridSpringTransactionManagerSelfTest.java | 165 ++
.../spring/GridSpringTransactionService.java | 68 +
.../cache/WaitMapExchangeFinishCallable.java | 4 +-
.../IgniteFailoverAbstractBenchmark.java | 4 +-
parent/pom.xml | 4 +-
114 files changed, 9013 insertions(+), 3036 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --cc modules/core/src/main/resources/META-INF/classnames.properties
index 94deec2,065a72b..96be534
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@@ -645,10 -629,10 +645,11 @@@ org.apache.ignite.internal.processors.c
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap
+org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplier$1
+org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplier$SupplyContextPhase
+ org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap2
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessage
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyPool$1
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyPool$DemandMessage
+org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessageV2
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsAbstractMessage
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture$1
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture$2
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d8c4c0f/parent/pom.xml
----------------------------------------------------------------------