# Merge remote-tracking branch 'remotes/origin/master' into ignite-426
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4c634ed2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4c634ed2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4c634ed2 Branch: refs/heads/ignite-426 Commit: 4c634ed2a08695d53e10b3e6c823f3f47a8f1fc2 Parents: ebd576c 0d70112 Author: sboikov <sboi...@gridgain.com> Authored: Mon Aug 17 09:35:46 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Aug 17 09:35:46 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/cache/CacheEntry.java | 94 ++++ .../org/apache/ignite/internal/IgnitionEx.java | 10 +- .../processors/cache/CacheEntryImpl.java | 20 + .../processors/cache/CacheEntryImpl0.java | 5 + .../processors/cache/CacheEntryImplEx.java | 83 +++ .../processors/cache/CacheInvokeEntry.java | 27 +- .../cache/CacheVersionedEntryImpl.java | 80 --- .../processors/cache/GridCacheAdapter.java | 13 +- .../processors/cache/GridCacheEntryEx.java | 2 +- .../processors/cache/GridCacheGateway.java | 5 +- .../processors/cache/GridCacheMapEntry.java | 28 +- .../processors/cache/GridCacheSwapManager.java | 82 ++- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../local/atomic/GridLocalAtomicCache.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 16 +- .../cache/transactions/IgniteTxEntry.java | 16 +- .../transactions/IgniteTxLocalAdapter.java | 83 ++- .../cache/version/GridCacheVersion.java | 2 +- .../cache/version/GridCacheVersionAware.java | 30 + .../cache/version/GridCacheVersionManager.java | 5 +- .../clock/GridClockSyncProcessor.java | 2 +- .../continuous/GridContinuousProcessor.java | 60 +- .../ignite/internal/util/GridArgumentCheck.java | 17 + .../ignite/internal/util/nio/GridNioServer.java | 4 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 91 +-- .../resources/META-INF/classnames.properties | 3 +- .../processors/cache/GridCacheTestEntryEx.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- .../IgniteCacheContinuousQueryClientTest.java | 137 +++++ .../CacheVersionedEntryAbstractTest.java | 170 ++++++ ...nedEntryLocalAtomicSwapDisabledSelfTest.java | 45 ++ ...ersionedEntryLocalTransactionalSelfTest.java | 40 ++ ...edEntryPartitionedAtomicOffHeapSelfTest.java | 35 ++ ...VersionedEntryPartitionedAtomicSelfTest.java | 35 ++ ...PartitionedTransactionalOffHeapSelfTest.java | 36 ++ ...edEntryPartitionedTransactionalSelfTest.java | 35 ++ ...nedEntryReplicatedAtomicOffHeapSelfTest.java | 35 ++ ...eVersionedEntryReplicatedAtomicSelfTest.java | 35 ++ ...yReplicatedTransactionalOffHeapSelfTest.java | 36 ++ ...nedEntryReplicatedTransactionalSelfTest.java | 35 ++ .../continuous/GridEventConsumeSelfTest.java | 4 +- .../testsuites/IgniteCacheTestSuite4.java | 13 + .../IgniteCacheQuerySelfTestSuite.java | 1 + modules/jms11/pom.xml | 98 ++++ .../apache/ignite/stream/jms11/JmsStreamer.java | 524 ++++++++++++++++++ .../ignite/stream/jms11/MessageTransformer.java | 43 ++ .../stream/jms11/IgniteJmsStreamerTest.java | 551 +++++++++++++++++++ .../jms11/IgniteJmsStreamerTestSuite.java | 34 ++ .../ignite/stream/jms11/TestTransformers.java | 123 +++++ .../apache/ignite/logger/log4j/Log4JLogger.java | 4 + .../java/org/apache/ignite/IgniteSpring.java | 8 +- pom.xml | 1 + scripts/git-format-patch.sh | 2 +- 54 files changed, 2663 insertions(+), 207 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c634ed2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c634ed2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c634ed2/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c634ed2/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c634ed2/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c634ed2/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ---------------------------------------------------------------------- diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java index 8a7039e,a3849d7..f0f1703 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java @@@ -98,11 -98,7 +98,12 @@@ public class IgniteCacheQuerySelfTestSu suite.addTestSuite(GridCacheContinuousQueryAtomicSelfTest.class); suite.addTestSuite(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class); suite.addTestSuite(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class); + suite.addTestSuite(CacheContinuousQueryFailoverAtomicTest.class); + suite.addTestSuite(CacheContinuousQueryFailoverAtomicPrimaryWriteOrderTest.class); + suite.addTestSuite(CacheContinuousQueryFailoverAtomicReplicatedTest.class); + suite.addTestSuite(CacheContinuousQueryFailoverTxTest.class); + suite.addTestSuite(CacheContinuousQueryFailoverTxReplicatedTest.class); + suite.addTestSuite(IgniteCacheContinuousQueryClientTest.class); // Reduce fields queries. suite.addTestSuite(GridCacheReduceFieldsQueryLocalSelfTest.class);
