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 1F20117B02 for ; Thu, 23 Apr 2015 20:10:56 +0000 (UTC) Received: (qmail 28773 invoked by uid 500); 23 Apr 2015 20:10:43 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 28708 invoked by uid 500); 23 Apr 2015 20:10:43 -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 28541 invoked by uid 99); 23 Apr 2015 20:10:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2015 20:10:43 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.164.171.186 as permitted sender) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2015 20:10:37 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id A935043E99 for ; Thu, 23 Apr 2015 20:09:49 +0000 (UTC) Received: (qmail 24350 invoked by uid 99); 23 Apr 2015 20:09:49 -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; Thu, 23 Apr 2015 20:09:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2C180E17DD; Thu, 23 Apr 2015 20:09:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 23 Apr 2015 20:10:34 -0000 Message-Id: In-Reply-To: <46d64ecd25564ab896de3363d198edd0@git.apache.org> References: <46d64ecd25564ab896de3363d198edd0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [47/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5a1faf98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a1faf98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a1faf98 Branch: refs/heads/ignite-709_1 Commit: 5a1faf9868690b61ae09cda101289852c934aa5c Parents: bd58183 bc89338 Author: Yakov Zhdanov Authored: Thu Apr 23 18:40:20 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Apr 23 18:40:20 2015 +0300 ---------------------------------------------------------------------- .../aop/aspectj/GridifyAspectJAspect.java | 2 +- .../aspectj/GridifySetToSetAspectJAspect.java | 2 +- .../aspectj/GridifySetToValueAspectJAspect.java | 2 +- .../aop/spring/GridifySetToSetSpringAspect.java | 2 +- .../spring/GridifySetToValueSpringAspect.java | 2 +- .../gridify/aop/spring/GridifySpringAspect.java | 2 +- .../apache/ignite/cache/CachingProvider.java | 3 + .../configuration/CacheConfiguration.java | 20 ++ .../ignite/configuration/TopologyValidator.java | 35 ++++ .../ignite/events/CacheQueryExecutedEvent.java | 3 +- .../ignite/events/CacheQueryReadEvent.java | 3 +- .../apache/ignite/internal/IgniteKernal.java | 15 +- .../org/apache/ignite/internal/IgnitionEx.java | 6 + .../deployment/GridDeploymentClassLoader.java | 2 +- .../discovery/GridDiscoveryManager.java | 3 + .../eventstorage/GridEventStorageManager.java | 6 + .../cache/CacheStoreBalancingWrapper.java | 6 + .../processors/cache/GridCacheIoManager.java | 6 + .../GridCachePartitionExchangeManager.java | 5 +- .../GridDistributedTxRemoteAdapter.java | 3 + .../distributed/dht/GridDhtTopologyFuture.java | 8 + .../cache/distributed/dht/GridDhtTxLocal.java | 3 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 7 + .../colocated/GridDhtColocatedLockFuture.java | 24 ++- .../GridDhtPartitionsExchangeFuture.java | 20 ++ .../distributed/near/GridNearLockFuture.java | 26 ++- .../near/GridNearTxFinishFuture.java | 3 + .../near/GridNearTxPrepareFuture.java | 20 ++ .../query/GridCacheDistributedQueryManager.java | 3 + .../cache/query/GridCacheLocalQueryFuture.java | 3 + .../query/GridCacheQueryFutureAdapter.java | 3 + .../cache/query/GridCacheQueryManager.java | 9 + .../jdbc/GridCacheQueryJdbcMetadataTask.java | 3 + .../cache/transactions/IgniteTxAdapter.java | 7 +- .../cache/transactions/IgniteTxHandler.java | 27 ++- .../transactions/IgniteTxLocalAdapter.java | 12 ++ .../closure/GridClosureProcessor.java | 16 +- .../processors/igfs/IgfsFileWorkerBatch.java | 3 + .../internal/processors/igfs/IgfsThread.java | 8 +- .../internal/processors/job/GridJobWorker.java | 9 + .../processors/query/GridQueryIndexing.java | 4 +- .../processors/query/GridQueryProcessor.java | 5 +- .../processors/rest/GridRestProcessor.java | 3 + .../service/GridServiceProcessor.java | 9 + .../processors/task/GridTaskWorker.java | 12 ++ .../timeout/GridTimeoutProcessor.java | 3 + .../ignite/internal/util/IgniteUtils.java | 2 +- .../util/ipc/loopback/IpcServerTcpEndpoint.java | 2 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 12 +- .../ignite/internal/util/nio/GridNioServer.java | 6 + .../apache/ignite/internal/util/typedef/X.java | 2 +- .../ignite/internal/util/worker/GridWorker.java | 3 + .../visor/misc/VisorResolveHostNameTask.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 9 + .../ignite/messaging/MessagingListenActor.java | 3 + .../org/apache/ignite/spi/IgniteSpiThread.java | 3 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 + .../startup/cmdline/CommandLineStartup.java | 5 +- .../startup/cmdline/CommandLineTransformer.java | 3 + .../cache/IgniteExcangeFutureHistoryTest.java | 74 ++++++++ ...gniteTopologyValidatorAbstractCacheTest.java | 183 +++++++++++++++++++ ...iteTopologyValidatorAbstractTxCacheTest.java | 125 +++++++++++++ ...ValidatorNearPartitionedAtomicCacheTest.java | 30 +++ ...logyValidatorNearPartitionedTxCacheTest.java | 30 +++ ...logyValidatorPartitionedAtomicCacheTest.java | 49 +++++ ...TopologyValidatorPartitionedTxCacheTest.java | 30 +++ ...ologyValidatorReplicatedAtomicCacheTest.java | 49 +++++ ...eTopologyValidatorReplicatedTxCacheTest.java | 30 +++ .../GridCacheLocalIsolatedNodesSelfTest.java | 102 +++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 6 + .../IgniteTopologyValidatorTestSuit.java | 43 +++++ .../processors/hadoop/HadoopDefaultJobInfo.java | 3 + .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 3 + .../hadoop/jobtracker/HadoopJobTracker.java | 5 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 3 + .../external/HadoopExternalTaskExecutor.java | 3 + .../processors/hadoop/v2/HadoopV2Job.java | 11 +- .../hadoop/v2/HadoopV2TaskContext.java | 9 + .../processors/query/h2/IgniteH2Indexing.java | 6 +- .../query/h2/twostep/GridMapQueryExecutor.java | 37 +++- .../h2/twostep/GridReduceQueryExecutor.java | 34 +++- .../h2/GridIndexingSpiAbstractSelfTest.java | 2 +- .../http/jetty/GridJettyRestHandler.java | 3 + .../ignite/schema/ui/SchemaImportApp.java | 8 +- .../uri/GridUriDeploymentClassLoader.java | 4 +- 86 files changed, 1257 insertions(+), 60 deletions(-) ----------------------------------------------------------------------