Merge branch 'master' into ignite-gg-9615-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/da306521 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/da306521 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/da306521 Branch: refs/heads/ignite-gg-9615-1 Commit: da306521295cfdaaa84d51ebe69f2478d818ca0b Parents: b73750b 09da9c2 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Aug 19 10:08:43 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Aug 19 10:08:43 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/cache/CacheEntry.java | 94 ++++ .../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +- .../configuration/IgniteConfiguration.java | 5 +- .../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 +- .../CachePartialUpdateCheckedException.java | 29 +- .../cache/CacheVersionedEntryImpl.java | 80 --- .../processors/cache/GridCacheAdapter.java | 174 +++++- .../processors/cache/GridCacheEntryEx.java | 2 +- .../processors/cache/GridCacheGateway.java | 5 +- .../processors/cache/GridCacheMapEntry.java | 32 +- .../processors/cache/GridCacheSwapManager.java | 82 ++- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../GridDhtUnreservedPartitionException.java | 66 +++ .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 63 ++- .../near/GridNearOptimisticTxPrepareFuture.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 3 +- .../cache/query/GridCacheQueryAdapter.java | 56 +- .../cache/query/GridCacheQueryManager.java | 71 ++- .../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 | 83 ++- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 49 +- .../tcp/internal/TcpDiscoveryNode.java | 18 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 23 + .../resources/META-INF/classnames.properties | 3 +- ...cheDhtLocalPartitionAfterRemoveSelfTest.java | 33 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 1 - .../processors/cache/GridCacheTestEntryEx.java | 2 +- .../IgniteCacheSizeFailoverTest.java | 115 ++++ .../IgniteCachePutRetryAbstractSelfTest.java | 120 +++- ...PutRetryAtomicPrimaryWriteOrderSelfTest.java | 32 ++ ...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 +- .../tcp/IgniteCacheSslStartStopSelfTest.java | 1 + .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 152 ++++- .../TcpDiscoverySpiFailureTimeoutSelfTest.java | 8 +- .../IgniteCacheFailoverTestSuite.java | 3 + .../testsuites/IgniteCacheTestSuite2.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 13 + .../query/h2/sql/GridSqlQuerySplitter.java | 3 + .../query/h2/twostep/GridMergeTable.java | 7 +- .../query/h2/twostep/GridThreadLocalTable.java | 22 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 96 ++++ .../query/IgniteSqlSplitterSelfTest.java | 152 +++++ .../IgniteCacheQuerySelfTestSuite.java | 3 + 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 +- .../util/spring/IgniteSpringHelperImpl.java | 4 +- pom.xml | 1 + scripts/git-format-patch.sh | 2 +- 82 files changed, 3837 insertions(+), 330 deletions(-) ----------------------------------------------------------------------
