Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 33AAD175C5 for ; Tue, 30 Jun 2015 08:04:24 +0000 (UTC) Received: (qmail 92738 invoked by uid 500); 30 Jun 2015 08:04:24 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 92707 invoked by uid 500); 30 Jun 2015 08:04:24 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 92698 invoked by uid 99); 30 Jun 2015 08:04:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jun 2015 08:04:24 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 30 Jun 2015 08:02:07 +0000 Received: (qmail 89030 invoked by uid 99); 30 Jun 2015 08:03:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jun 2015 08:03:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6083BE35D2; Tue, 30 Jun 2015 08:03:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 30 Jun 2015 08:04:16 -0000 Message-Id: <0ad24a25cacb431ea321b62461c1c29f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [23/45] incubator-ignite git commit: Merge branches 'ignite-gg-10404' and 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10404 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-gg-10404' and 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10404 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/50a46264 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/50a46264 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/50a46264 Branch: refs/heads/ignite-961 Commit: 50a4626439afcf9c8113476da0a425d35409f153 Parents: c62c410 6e23608 Author: AKuznetsov Authored: Fri Jun 26 20:53:15 2015 +0700 Committer: AKuznetsov Committed: Fri Jun 26 20:53:15 2015 +0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 12 + 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 +- .../ClientAbstractConnectivitySelfTest.java | 4 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../apache/ignite/IgniteSystemProperties.java | 3 + .../apache/ignite/cache/query/ScanQuery.java | 23 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 22 +- .../store/jdbc/CacheJdbcBlobStoreFactory.java | 290 +++++++ .../cache/store/jdbc/CacheJdbcPojoStore.java | 6 +- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 148 ++++ .../org/apache/ignite/cluster/ClusterGroup.java | 9 + .../org/apache/ignite/cluster/ClusterNode.java | 2 + .../ignite/compute/ComputeTaskSplitAdapter.java | 2 +- .../configuration/CacheConfiguration.java | 3 +- .../configuration/IgniteReflectionFactory.java | 81 +- .../ignite/internal/GridKernalContextImpl.java | 8 +- .../apache/ignite/internal/IgniteKernal.java | 11 +- .../internal/MarshallerContextAdapter.java | 18 +- .../ignite/internal/MarshallerContextImpl.java | 26 +- .../client/GridClientConfiguration.java | 2 +- .../GridClientOptimizedMarshaller.java | 26 + .../impl/GridTcpRouterNioListenerAdapter.java | 2 +- .../internal/cluster/ClusterGroupAdapter.java | 38 + .../cluster/IgniteClusterAsyncImpl.java | 5 + .../internal/interop/InteropBootstrap.java | 3 +- .../internal/interop/InteropIgnition.java | 5 +- .../internal/managers/GridManagerAdapter.java | 8 +- .../discovery/GridDiscoveryManager.java | 39 +- .../affinity/AffinityTopologyVersion.java | 7 - .../processors/cache/GridCacheAdapter.java | 4 + .../processors/cache/GridCacheContext.java | 2 +- .../processors/cache/GridCacheIoManager.java | 64 +- .../GridCachePartitionExchangeManager.java | 77 +- .../processors/cache/GridCacheProcessor.java | 34 +- .../processors/cache/GridCacheSwapManager.java | 12 +- .../processors/cache/GridCacheUtils.java | 9 + .../processors/cache/IgniteCacheProxy.java | 12 + .../distributed/GridCacheTxRecoveryRequest.java | 26 +- .../GridCacheTxRecoveryResponse.java | 14 +- .../distributed/GridDistributedBaseMessage.java | 77 +- .../distributed/GridDistributedLockRequest.java | 54 +- .../GridDistributedLockResponse.java | 14 +- .../GridDistributedTxFinishRequest.java | 46 +- .../GridDistributedTxPrepareRequest.java | 62 +- .../GridDistributedTxPrepareResponse.java | 64 +- .../GridDistributedUnlockRequest.java | 6 +- .../distributed/dht/GridDhtLocalPartition.java | 59 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtLockRequest.java | 72 +- .../distributed/dht/GridDhtLockResponse.java | 18 +- .../dht/GridDhtPartitionTopologyImpl.java | 4 +- .../dht/GridDhtPartitionsReservation.java | 292 +++++++ .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../distributed/dht/GridDhtTxFinishRequest.java | 38 +- .../dht/GridDhtTxPrepareRequest.java | 54 +- .../dht/GridDhtTxPrepareResponse.java | 22 +- .../distributed/dht/GridDhtUnlockRequest.java | 6 +- .../cache/distributed/dht/GridReservable.java | 35 + .../dht/atomic/GridDhtAtomicCache.java | 9 +- .../dht/preloader/GridDhtPartitionMap.java | 26 +- .../GridDhtPartitionsExchangeFuture.java | 95 ++- .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearLockRequest.java | 58 +- .../distributed/near/GridNearLockResponse.java | 26 +- .../near/GridNearTxFinishRequest.java | 26 +- .../near/GridNearTxPrepareRequest.java | 50 +- .../near/GridNearTxPrepareResponse.java | 46 +- .../distributed/near/GridNearUnlockRequest.java | 2 +- .../cache/query/GridCacheQueryManager.java | 33 - .../cache/query/GridCacheTwoStepQuery.java | 22 +- .../continuous/CacheContinuousQueryHandler.java | 8 + .../cache/transactions/IgniteTxHandler.java | 5 +- .../transactions/IgniteTxLocalAdapter.java | 12 +- .../datastructures/DataStructuresProcessor.java | 129 +-- .../dr/IgniteDrDataStreamerCacheUpdater.java | 7 +- .../processors/hadoop/HadoopJobInfo.java | 4 +- .../hadoop/counter/HadoopCounterWriter.java | 5 +- .../offheap/GridOffHeapProcessor.java | 19 +- .../processors/plugin/CachePluginManager.java | 10 +- .../plugin/IgnitePluginProcessor.java | 16 +- .../processors/query/GridQueryIndexing.java | 14 +- .../processors/query/GridQueryProcessor.java | 123 ++- .../messages/GridQueryNextPageResponse.java | 35 +- .../h2/twostep/messages/GridQueryRequest.java | 111 ++- .../rest/client/message/GridRouterRequest.java | 18 + .../rest/client/message/GridRouterResponse.java | 18 + .../rest/protocols/tcp/GridTcpRestProtocol.java | 3 +- .../processors/task/GridTaskProcessor.java | 23 +- .../internal/util/GridConfigurationFinder.java | 55 +- .../apache/ignite/internal/util/GridDebug.java | 48 +- .../ignite/internal/util/IgniteUtils.java | 27 +- .../ignite/internal/util/nio/GridNioServer.java | 64 +- .../util/spring/IgniteSpringHelper.java | 10 + .../SpringApplicationContextResource.java | 4 +- .../apache/ignite/resources/SpringResource.java | 6 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 35 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 9 +- .../communication/tcp/TcpCommunicationSpi.java | 148 +++- .../tcp/TcpCommunicationSpiMBean.java | 19 + .../ignite/spi/discovery/DiscoverySpi.java | 3 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 657 +++++++++++----- .../ignite/spi/discovery/tcp/ServerImpl.java | 376 ++++++--- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 69 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 51 +- .../tcp/internal/TcpDiscoveryNode.java | 18 + .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 34 +- .../TcpDiscoveryMulticastIpFinder.java | 19 +- .../messages/TcpDiscoveryAbstractMessage.java | 10 +- .../messages/TcpDiscoveryNodeFailedMessage.java | 18 + .../core/src/main/resources/ignite.properties | 2 +- .../internal/ClusterForHostsSelfTest.java | 113 +++ .../internal/ClusterGroupAbstractTest.java | 777 ++++++++++++++++++ .../ignite/internal/ClusterGroupSelfTest.java | 251 ++++++ .../internal/GridDiscoveryEventSelfTest.java | 12 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 17 +- .../internal/GridProjectionAbstractTest.java | 784 ------------------- .../ignite/internal/GridProjectionSelfTest.java | 251 ------ .../apache/ignite/internal/GridSelfTest.java | 30 +- .../GridTaskFailoverAffinityRunTest.java | 170 ++++ .../IgniteSlowClientDetectionSelfTest.java | 187 +++++ .../GridDiscoveryManagerAliveCacheSelfTest.java | 17 +- .../cache/CacheClientStoreSelfTest.java | 228 ++++++ ...acheReadOnlyTransactionalClientSelfTest.java | 327 -------- .../CacheReadThroughAtomicRestartSelfTest.java | 32 + ...heReadThroughLocalAtomicRestartSelfTest.java | 32 + .../CacheReadThroughLocalRestartSelfTest.java | 32 + ...dThroughReplicatedAtomicRestartSelfTest.java | 32 + ...cheReadThroughReplicatedRestartSelfTest.java | 32 + .../cache/CacheReadThroughRestartSelfTest.java | 133 ++++ .../CacheStoreUsageMultinodeAbstractTest.java | 305 ++++++++ ...eUsageMultinodeDynamicStartAbstractTest.java | 169 ++++ ...oreUsageMultinodeDynamicStartAtomicTest.java | 32 + ...heStoreUsageMultinodeDynamicStartTxTest.java | 32 + ...reUsageMultinodeStaticStartAbstractTest.java | 158 ++++ ...toreUsageMultinodeStaticStartAtomicTest.java | 32 + ...cheStoreUsageMultinodeStaticStartTxTest.java | 32 + .../GridCacheAbstractFailoverSelfTest.java | 8 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 24 +- .../cache/GridCacheAbstractSelfTest.java | 2 +- .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 +++ ...ridCacheMultinodeUpdateAbstractSelfTest.java | 9 + .../cache/GridCachePutAllFailoverSelfTest.java | 5 - .../cache/GridCacheVersionMultinodeTest.java | 8 +- .../IgniteCacheAbstractStopBusySelfTest.java | 30 +- .../IgniteCacheAtomicStopBusySelfTest.java | 8 +- ...CacheP2pUnmarshallingRebalanceErrorTest.java | 15 +- .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 25 +- ...gniteCacheTransactionalStopBusySelfTest.java | 8 +- ...eDynamicCacheStartNoExchangeTimeoutTest.java | 466 +++++++++++ .../cache/IgniteDynamicCacheStartSelfTest.java | 37 + ...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +- .../GridCacheSetAbstractSelfTest.java | 22 +- .../IgniteDataStructureWithJobTest.java | 111 +++ ...ridCachePartitionNotLoadedEventSelfTest.java | 82 ++ .../distributed/IgniteCache150ClientsTest.java | 189 +++++ .../IgniteCacheClientNodeConcurrentStart.java | 14 +- ...teCacheClientNodePartitionsExchangeTest.java | 1 + .../distributed/IgniteCacheManyClientsTest.java | 191 ++++- .../IgniteCacheTxMessageRecoveryTest.java | 5 + .../dht/GridCacheColocatedFailoverSelfTest.java | 5 - ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 - .../GridCachePartitionedFailoverSelfTest.java | 5 - ...achePartitionedMultiNodeFullApiSelfTest.java | 53 +- .../GridCachePartitionedTxSalvageSelfTest.java | 37 +- .../GridCacheReplicatedFailoverSelfTest.java | 2 +- .../IgniteCacheTxStoreSessionTest.java | 4 + ...CacheClientWriteBehindStoreAbstractTest.java | 104 +++ ...teCacheClientWriteBehindStoreAtomicTest.java | 38 + .../IgnteCacheClientWriteBehindStoreTxTest.java | 32 + .../DataStreamProcessorSelfTest.java | 3 +- .../DataStreamerMultiThreadedSelfTest.java | 3 + .../internal/util/IgniteUtilsSelfTest.java | 22 + .../marshaller/MarshallerContextTestImpl.java | 18 + .../GridTcpCommunicationSpiConfigSelfTest.java | 1 - .../tcp/TcpClientDiscoverySpiSelfTest.java | 338 +++++++- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 +- .../testframework/GridSpiTestContext.java | 7 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../junits/GridTestKernalContext.java | 3 +- .../junits/common/GridCommonAbstractTest.java | 15 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 7 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 1 + .../IgniteCacheFailoverTestSuite.java | 8 - .../IgniteCacheFailoverTestSuite2.java | 47 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 4 +- .../testsuites/IgniteCacheTestSuite3.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 18 +- .../IgniteCacheWriteBehindTestSuite.java | 2 + .../testsuites/IgniteClientTestSuite.java | 38 + .../testsuites/IgniteComputeGridTestSuite.java | 1 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 +- .../ignite/util/TestTcpCommunicationSpi.java | 21 + modules/extdata/p2p/pom.xml | 2 +- .../p2p/GridP2PContinuousDeploymentTask1.java | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 80 +- .../fs/IgniteHadoopFileSystemCounterWriter.java | 9 +- .../processors/hadoop/HadoopClassLoader.java | 29 + .../processors/hadoop/HadoopDefaultJobInfo.java | 27 +- .../internal/processors/hadoop/HadoopUtils.java | 237 ------ .../hadoop/SecondaryFileSystemProvider.java | 3 +- .../hadoop/fs/HadoopFileSystemCacheUtils.java | 241 ++++++ .../hadoop/fs/HadoopFileSystemsUtils.java | 11 + .../hadoop/fs/HadoopLazyConcurrentMap.java | 5 + .../hadoop/jobtracker/HadoopJobTracker.java | 25 +- .../child/HadoopChildProcessRunner.java | 3 +- .../processors/hadoop/v2/HadoopV2Job.java | 84 +- .../hadoop/v2/HadoopV2JobResourceManager.java | 22 +- .../hadoop/v2/HadoopV2TaskContext.java | 37 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 5 +- .../processors/hadoop/HadoopMapReduceTest.java | 2 +- .../processors/hadoop/HadoopTasksV1Test.java | 7 +- .../processors/hadoop/HadoopTasksV2Test.java | 7 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 3 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../IgniteIgfsLinuxAndMacOSTestSuite.java | 3 +- 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 | 81 +- .../query/h2/sql/GridSqlQuerySplitter.java | 49 +- .../query/h2/twostep/GridMapQueryExecutor.java | 321 ++++++-- .../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 ----- .../cache/IgniteCacheOffheapEvictQueryTest.java | 196 +++++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 - ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 + ...lientQueryReplicatedNodeRestartSelfTest.java | 419 ++++++++++ .../IgniteCacheQueryNodeRestartSelfTest.java | 36 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 383 +++++++++ .../query/h2/sql/BaseH2CompareQueryTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 9 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- .../cache/jta/GridCacheXAResource.java | 18 +- .../processors/cache/GridCacheJtaSelfTest.java | 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 +- .../ignite/tools/classgen/ClassesGenerator.java | 30 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- .../commands/cache/VisorCacheCommand.scala | 7 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../IgniteWebSessionSelfTestSuite.java | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- scripts/git-patch-prop.sh | 2 +- 297 files changed, 12522 insertions(+), 3763 deletions(-) ----------------------------------------------------------------------