Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-gg-10411
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/207e2c7b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/207e2c7b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/207e2c7b Branch: refs/heads/ignite-gg-10411 Commit: 207e2c7b4044e50716af84a2291a4a2d65cfe4f2 Parents: 3f20d12 f4b1123 Author: ptupitsyn <ptupit...@gridgain.com> Authored: Tue Jun 16 11:11:36 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Tue Jun 16 11:11:36 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 12 + .../apache/ignite/cache/query/ScanQuery.java | 23 +- .../ignite/internal/GridKernalContextImpl.java | 5 +- .../apache/ignite/internal/IgniteKernal.java | 22 +- .../internal/MarshallerContextAdapter.java | 18 +- .../ignite/internal/MarshallerContextImpl.java | 14 +- .../GridClientOptimizedMarshaller.java | 5 + .../discovery/GridDiscoveryManager.java | 9 +- .../processors/cache/GridCacheProcessor.java | 11 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../datastructures/DataStructuresProcessor.java | 67 ++- .../plugin/IgnitePluginProcessor.java | 16 +- .../rest/client/message/GridRouterRequest.java | 18 + .../rest/client/message/GridRouterResponse.java | 18 + .../org/apache/ignite/spi/IgniteSpiAdapter.java | 28 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 439 ++++++++++++------- .../ignite/spi/discovery/tcp/ServerImpl.java | 221 ++++++---- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 66 +++ .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 34 +- .../TcpDiscoveryMulticastIpFinder.java | 19 +- .../messages/TcpDiscoveryAbstractMessage.java | 10 +- .../cache/CacheClientStoreSelfTest.java | 228 ++++++++++ ...acheReadOnlyTransactionalClientSelfTest.java | 327 -------------- .../cache/GridCachePutAllFailoverSelfTest.java | 5 - .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 14 +- .../distributed/IgniteCacheManyClientsTest.java | 142 +++++- .../dht/GridCacheColocatedFailoverSelfTest.java | 5 - .../GridCachePartitionedFailoverSelfTest.java | 5 - .../GridCacheReplicatedFailoverSelfTest.java | 5 - ...CacheClientWriteBehindStoreAbstractTest.java | 104 +++++ ...teCacheClientWriteBehindStoreAtomicTest.java | 38 ++ .../IgnteCacheClientWriteBehindStoreTxTest.java | 32 ++ .../DataStreamProcessorSelfTest.java | 3 +- .../marshaller/MarshallerContextTestImpl.java | 18 + .../tcp/TcpClientDiscoverySpiSelfTest.java | 73 ++- .../junits/GridTestKernalContext.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 6 +- .../IgniteCacheWriteBehindTestSuite.java | 2 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 +- .../ignite/tools/classgen/ClassesGenerator.java | 30 +- 42 files changed, 1405 insertions(+), 700 deletions(-) ----------------------------------------------------------------------
