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 3F21D17F9A for ; Wed, 29 Apr 2015 10:22:54 +0000 (UTC) Received: (qmail 94903 invoked by uid 500); 29 Apr 2015 10:09:58 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 94857 invoked by uid 500); 29 Apr 2015 10:09:58 -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 94790 invoked by uid 99); 29 Apr 2015 10:09:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 10:09:58 +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: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 10:09:53 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 35E6C2837C for ; Wed, 29 Apr 2015 10:09:33 +0000 (UTC) Received: (qmail 88975 invoked by uid 99); 29 Apr 2015 06:29:10 -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; Wed, 29 Apr 2015 06:29:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3757E3596; Wed, 29 Apr 2015 06:29:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 29 Apr 2015 06:29:54 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [46/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/48c12bb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/48c12bb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/48c12bb7 Branch: refs/heads/ignite-776 Commit: 48c12bb753d86f9fbe20d8fc23672f29b6f790bf Parents: daf8364 3a2e2d2 Author: Yakov Zhdanov Authored: Tue Apr 28 18:03:26 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Apr 28 18:03:26 2015 +0300 ---------------------------------------------------------------------- .../internal/cluster/ClusterGroupAdapter.java | 16 + .../processors/cache/GridCacheMvccManager.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 59 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtTxFinishFuture.java | 102 +++- .../cache/distributed/dht/GridDhtTxLocal.java | 6 + .../distributed/dht/GridDhtTxLocalAdapter.java | 23 + .../cache/distributed/dht/GridDhtTxRemote.java | 7 + .../cache/distributed/near/GridNearTxLocal.java | 6 + .../cache/transactions/IgniteInternalTx.java | 5 + .../cache/transactions/IgniteTxAdapter.java | 10 + .../cache/transactions/IgniteTxHandler.java | 57 +- .../cache/transactions/IgniteTxManager.java | 117 +++- .../visor/cache/VisorCacheConfiguration.java | 7 - .../visor/cache/VisorCacheNodesTask.java | 74 +++ .../cache/VisorCacheStoreConfiguration.java | 35 -- .../cache/VisorCacheTypeFieldMetadata.java | 36 +- .../visor/cache/VisorCacheTypeMetadata.java | 99 +--- .../internal/visor/igfs/VisorIgfsMetrics.java | 128 +---- .../node/VisorNodeEventsCollectorTask.java | 58 +- .../internal/visor/query/VisorQueryArg.java | 19 +- .../internal/visor/query/VisorQueryCursor.java | 1 - .../internal/visor/query/VisorQueryJob.java | 9 +- .../internal/visor/query/VisorQueryTask.java | 41 -- .../internal/visor/util/VisorEventMapper.java | 13 + .../internal/visor/util/VisorTaskUtils.java | 2 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 +++++ .../cache/IgniteCachePutAllRestartTest.java | 203 +++++++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 7 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 2 - .../near/IgniteCacheNearTxRollbackTest.java | 133 +++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteCacheFailoverTestSuite.java | 8 +- .../testsuites/IgniteCacheRestartTestSuite.java | 3 +- .../ignite/visor/commands/VisorConsole.scala | 314 ++++++----- .../visor/commands/VisorConsoleCommand.scala | 77 --- .../ignite/visor/commands/VisorTextTable.scala | 539 ------------------ .../visor/commands/ack/VisorAckCommand.scala | 42 +- .../commands/alert/VisorAlertCommand.scala | 35 +- .../commands/cache/VisorCacheClearCommand.scala | 51 +- .../commands/cache/VisorCacheCommand.scala | 34 +- .../commands/cache/VisorCacheScanCommand.scala | 60 +- .../commands/cache/VisorCacheStopCommand.scala | 30 +- .../commands/cache/VisorCacheSwapCommand.scala | 66 +-- .../commands/common/VisorConsoleCommand.scala | 90 +++ .../visor/commands/common/VisorTextTable.scala | 543 +++++++++++++++++++ .../config/VisorConfigurationCommand.scala | 439 +++++++-------- .../commands/deploy/VisorDeployCommand.scala | 47 +- .../commands/disco/VisorDiscoveryCommand.scala | 58 +- .../commands/events/VisorEventsCommand.scala | 338 +++++------- .../visor/commands/gc/VisorGcCommand.scala | 130 ++--- .../visor/commands/kill/VisorKillCommand.scala | 53 +- .../visor/commands/node/VisorNodeCommand.scala | 47 +- .../visor/commands/ping/VisorPingCommand.scala | 41 +- .../commands/start/VisorStartCommand.scala | 34 +- .../commands/tasks/VisorTasksCommand.scala | 76 +-- .../commands/top/VisorTopologyCommand.scala | 36 +- .../visor/commands/vvm/VisorVvmCommand.scala | 32 +- .../scala/org/apache/ignite/visor/visor.scala | 275 +++++++--- .../ignite/visor/VisorTextTableSpec.scala | 3 +- 62 files changed, 2719 insertions(+), 2261 deletions(-) ----------------------------------------------------------------------