Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10123
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f28b03d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f28b03d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f28b03d4 Branch: refs/heads/ignite-gg-10123 Commit: f28b03d4786e4e65c04061816a56a11770e979bd Parents: f50157c 53f4cb7 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Tue Jun 16 18:41:16 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Tue Jun 16 18:41:16 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 2 +- .../apache/ignite/cache/query/ScanQuery.java | 23 +- .../apache/ignite/internal/IgniteKernal.java | 1 - .../internal/interop/InteropBootstrap.java | 3 +- .../internal/interop/InteropIgnition.java | 5 +- .../discovery/GridDiscoveryManager.java | 9 +- .../processors/cache/GridCacheProcessor.java | 11 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../datastructures/DataStructuresProcessor.java | 67 ++- .../processors/query/GridQueryProcessor.java | 102 ++-- .../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 | 498 +++++++++++++------ .../ignite/spi/discovery/tcp/ServerImpl.java | 221 ++++---- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 66 +++ .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 34 +- .../TcpDiscoveryMulticastIpFinder.java | 19 +- .../messages/TcpDiscoveryAbstractMessage.java | 10 +- .../apache/ignite/internal/GridSelfTest.java | 12 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 17 +- .../cache/CacheClientStoreSelfTest.java | 228 +++++++++ ...acheReadOnlyTransactionalClientSelfTest.java | 327 ------------ .../GridCacheAbstractFailoverSelfTest.java | 2 + ...ridCacheMultinodeUpdateAbstractSelfTest.java | 9 + .../cache/GridCacheVersionMultinodeTest.java | 8 +- ...CacheP2pUnmarshallingRebalanceErrorTest.java | 15 +- .../IgniteCacheClientNodeConcurrentStart.java | 14 +- .../distributed/IgniteCacheManyClientsTest.java | 189 ++++++- .../GridCachePartitionedTxSalvageSelfTest.java | 37 +- ...CacheClientWriteBehindStoreAbstractTest.java | 104 ++++ ...teCacheClientWriteBehindStoreAtomicTest.java | 38 ++ .../IgnteCacheClientWriteBehindStoreTxTest.java | 32 ++ .../tcp/TcpClientDiscoverySpiSelfTest.java | 73 ++- .../junits/common/GridCommonAbstractTest.java | 11 +- .../IgniteCacheFailoverTestSuite.java | 8 - .../IgniteCacheFailoverTestSuite2.java | 47 ++ .../testsuites/IgniteCacheTestSuite4.java | 6 +- .../IgniteCacheWriteBehindTestSuite.java | 2 + .../CacheAbstractQueryMetricsSelfTest.java | 205 ++++++++ .../CachePartitionedQueryMetricsSelfTest.java | 32 ++ .../CacheReplicatedQueryMetricsSelfTest.java | 32 ++ .../cache/GridCacheQueryMetricsSelfTest.java | 206 -------- .../query/h2/sql/BaseH2CompareQueryTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- .../ignite/tools/classgen/ClassesGenerator.java | 12 + 48 files changed, 1846 insertions(+), 971 deletions(-) ----------------------------------------------------------------------
