Merge branch 'ignite-sprint-7' into ignite-648
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de9acc3a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de9acc3a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de9acc3a Branch: refs/heads/ignite-648 Commit: de9acc3a67f80d31fcfed98f5e31677ad48d39a6 Parents: 05a5821 188cd82 Author: ashutak <ashu...@gridgain.com> Authored: Fri Jun 19 18:28:44 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Fri Jun 19 18:28:44 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 2 +- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 4 +- .../s3/S3CheckpointSpiStartStopSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../s3/TcpDiscoveryS3IpFinderSelfTest.java | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../apache/ignite/cache/query/ScanQuery.java | 20 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 22 +- .../store/jdbc/CacheJdbcBlobStoreFactory.java | 290 +++++++++ .../cache/store/jdbc/CacheJdbcPojoStore.java | 6 +- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 148 +++++ .../configuration/CacheConfiguration.java | 3 +- .../apache/ignite/internal/IgniteKernal.java | 14 +- .../client/GridClientConfiguration.java | 2 +- .../GridClientOptimizedMarshaller.java | 21 + .../impl/GridTcpRouterNioListenerAdapter.java | 2 +- .../internal/interop/InteropBootstrap.java | 3 +- .../internal/interop/InteropIgnition.java | 5 +- .../discovery/GridDiscoveryManager.java | 9 +- .../affinity/AffinityTopologyVersion.java | 7 - .../processors/cache/GridCacheAdapter.java | 4 + .../processors/cache/GridCacheProcessor.java | 34 +- .../processors/cache/GridCacheUtils.java | 9 + .../processors/cache/IgniteCacheProxy.java | 12 + .../distributed/dht/GridDhtLocalPartition.java | 56 +- .../dht/GridDhtPartitionTopologyImpl.java | 4 +- .../dht/GridDhtPartitionsReservation.java | 292 +++++++++ .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../cache/distributed/dht/GridReservable.java | 35 + .../dht/preloader/GridDhtPartitionMap.java | 26 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../cache/query/GridCacheQueryManager.java | 33 - .../cache/query/GridCacheTwoStepQuery.java | 22 +- .../cache/transactions/IgniteTxHandler.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 12 +- .../dr/IgniteDrDataStreamerCacheUpdater.java | 7 +- .../processors/query/GridQueryIndexing.java | 14 +- .../processors/query/GridQueryProcessor.java | 123 ++-- .../messages/GridQueryNextPageResponse.java | 34 +- .../h2/twostep/messages/GridQueryRequest.java | 111 +++- .../rest/protocols/tcp/GridTcpRestProtocol.java | 3 +- .../processors/task/GridTaskProcessor.java | 23 +- .../apache/ignite/internal/util/GridDebug.java | 19 + .../ignite/internal/util/IgniteUtils.java | 21 + .../util/spring/IgniteSpringHelper.java | 10 + .../SpringApplicationContextResource.java | 4 +- .../apache/ignite/resources/SpringResource.java | 6 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 28 +- .../communication/tcp/TcpCommunicationSpi.java | 44 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 498 +++++++++----- .../ignite/spi/discovery/tcp/ServerImpl.java | 256 +++++--- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 66 ++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 42 +- .../tcp/internal/TcpDiscoveryNode.java | 18 + .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 34 +- .../TcpDiscoveryMulticastIpFinder.java | 19 +- .../messages/TcpDiscoveryAbstractMessage.java | 10 +- .../core/src/main/resources/ignite.properties | 2 +- .../apache/ignite/internal/GridSelfTest.java | 28 +- .../GridTaskFailoverAffinityRunTest.java | 170 +++++ .../GridDiscoveryManagerAliveCacheSelfTest.java | 17 +- .../cache/CacheClientStoreSelfTest.java | 228 +++++++ ...acheReadOnlyTransactionalClientSelfTest.java | 327 ---------- .../CacheStoreUsageMultinodeAbstractTest.java | 305 +++++++++ ...eUsageMultinodeDynamicStartAbstractTest.java | 169 +++++ ...oreUsageMultinodeDynamicStartAtomicTest.java | 32 + ...heStoreUsageMultinodeDynamicStartTxTest.java | 32 + ...reUsageMultinodeStaticStartAbstractTest.java | 158 +++++ ...toreUsageMultinodeStaticStartAtomicTest.java | 32 + ...cheStoreUsageMultinodeStaticStartTxTest.java | 32 + .../GridCacheAbstractFailoverSelfTest.java | 2 + .../cache/GridCacheAbstractFullApiSelfTest.java | 24 +- ...ridCacheMultinodeUpdateAbstractSelfTest.java | 9 + .../cache/GridCacheVersionMultinodeTest.java | 8 +- .../IgniteCacheAbstractStopBusySelfTest.java | 30 +- .../IgniteCacheAtomicStopBusySelfTest.java | 8 +- ...CacheP2pUnmarshallingRebalanceErrorTest.java | 15 +- .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 19 +- ...gniteCacheTransactionalStopBusySelfTest.java | 8 +- ...ridCachePartitionNotLoadedEventSelfTest.java | 82 +++ .../IgniteCacheClientNodeConcurrentStart.java | 14 +- .../distributed/IgniteCacheManyClientsTest.java | 190 +++++- .../IgniteCacheTxMessageRecoveryTest.java | 5 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../GridCachePartitionedTxSalvageSelfTest.java | 37 +- ...CacheClientWriteBehindStoreAbstractTest.java | 104 +++ ...teCacheClientWriteBehindStoreAtomicTest.java | 38 ++ .../IgnteCacheClientWriteBehindStoreTxTest.java | 32 + .../DataStreamerMultiThreadedSelfTest.java | 3 + .../tcp/TcpClientDiscoverySpiSelfTest.java | 73 ++- .../junits/GridTestKernalContext.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 15 +- .../IgniteCacheFailoverTestSuite.java | 8 - .../IgniteCacheFailoverTestSuite2.java | 47 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 4 +- .../testsuites/IgniteCacheTestSuite4.java | 10 +- .../IgniteCacheWriteBehindTestSuite.java | 2 + .../testsuites/IgniteComputeGridTestSuite.java | 1 + .../ignite/util/TestTcpCommunicationSpi.java | 21 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 16 +- .../hibernate/CacheHibernateBlobStore.java | 87 +-- .../CacheHibernateBlobStoreFactory.java | 235 +++++++ .../hibernate/src/test/config/factory-cache.xml | 59 ++ .../src/test/config/factory-cache1.xml | 61 ++ .../config/factory-incorrect-store-cache.xml | 56 ++ .../CacheHibernateStoreFactorySelfTest.java | 273 ++++++++ .../testsuites/IgniteHibernateTestSuite.java | 2 + modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 79 ++- .../query/h2/sql/GridSqlQuerySplitter.java | 49 +- .../query/h2/twostep/GridMapQueryExecutor.java | 332 +++++++--- .../query/h2/twostep/GridMergeIndex.java | 17 +- .../h2/twostep/GridMergeIndexUnsorted.java | 7 +- .../h2/twostep/GridReduceQueryExecutor.java | 650 ++++++++++++++++--- .../query/h2/twostep/GridResultPage.java | 21 +- .../CacheAbstractQueryMetricsSelfTest.java | 205 ++++++ .../CachePartitionedQueryMetricsSelfTest.java | 32 + .../CacheReplicatedQueryMetricsSelfTest.java | 32 + .../cache/GridCacheCrossCacheQuerySelfTest.java | 3 +- .../cache/GridCacheQueryMetricsSelfTest.java | 206 ------ .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 - ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 + ...lientQueryReplicatedNodeRestartSelfTest.java | 419 ++++++++++++ .../IgniteCacheQueryNodeRestartSelfTest.java | 36 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 383 +++++++++++ .../query/h2/sql/BaseH2CompareQueryTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 8 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 9 +- .../GridResourceSpringBeanInjector.java | 2 +- .../util/spring/IgniteSpringHelperImpl.java | 17 + .../src/test/config/incorrect-store-cache.xml | 57 ++ modules/spring/src/test/config/node.xml | 43 ++ modules/spring/src/test/config/node1.xml | 45 ++ .../test/config/pojo-incorrect-store-cache.xml | 56 ++ modules/spring/src/test/config/store-cache.xml | 59 ++ modules/spring/src/test/config/store-cache1.xml | 62 ++ .../jdbc/CacheJdbcBlobStoreFactorySelfTest.java | 172 +++++ .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 193 ++++++ .../testsuites/IgniteSpringTestSuite.java | 5 + modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../IgniteWebSessionSelfTestSuite.java | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 173 files changed, 7381 insertions(+), 1531 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de9acc3a/modules/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de9acc3a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ----------------------------------------------------------------------
