IGNITE-7199 Visor CMD: minor refactoring.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cd195646 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cd195646 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cd195646 Branch: refs/heads/ignite-zk-ce Commit: cd1956461a0f310c9c6eaf600553015d4d7571f7 Parents: e08d19c Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Thu Dec 14 12:08:58 2017 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Thu Dec 14 12:08:58 2017 +0700 ---------------------------------------------------------------------- .../commands/tasks/VisorTasksCommand.scala | 34 +++++++++----------- .../scala/org/apache/ignite/visor/visor.scala | 1 - 2 files changed, 15 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cd195646/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala index 0d6753e..966bd64 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala @@ -17,23 +17,21 @@ package org.apache.ignite.visor.commands.tasks +import java.util.UUID + import org.apache.ignite._ import org.apache.ignite.events.EventType._ import org.apache.ignite.internal.util.scala.impl import org.apache.ignite.internal.util.typedef.X import org.apache.ignite.internal.util.{IgniteUtils => U} +import org.apache.ignite.internal.visor.event.{VisorGridEvent, VisorGridJobEvent, VisorGridTaskEvent} +import org.apache.ignite.internal.visor.node.{VisorNodeEventsCollectorTask, VisorNodeEventsCollectorTaskArg} +import org.apache.ignite.internal.visor.util.{VisorTaskUtils => TU} import org.apache.ignite.lang.IgniteUuid import org.apache.ignite.visor.VisorTag import org.apache.ignite.visor.commands.common.{VisorConsoleCommand, VisorTextTable} import org.apache.ignite.visor.visor._ -import java.util.UUID - -import org.apache.ignite.internal.visor.event.{VisorGridEvent, VisorGridJobEvent, VisorGridTaskEvent} -import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask -import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTaskArg -import org.apache.ignite.internal.visor.util.VisorTaskUtils._ - import scala.collection.JavaConversions._ import scala.language.implicitConversions import scala.util.control.Breaks._ @@ -1217,15 +1215,13 @@ class VisorTasksCommand extends VisorConsoleCommand { eLst.foreach(e => { e.nodeIds.foreach(id => { - val host = sortAddresses(ignite.cluster.node(id).addresses).headOption - - if (host.isDefined) { - var eSet = hMap.getOrElse(host.get, Set.empty[VisorExecution]) + TU.sortAddresses(ignite.cluster.node(id).addresses).headOption.foreach(host => { + var eSet = hMap.getOrElse(host, Set.empty[VisorExecution]) eSet += e - hMap += (host.get -> eSet) - } + hMap += (host -> eSet) + }) }) }) @@ -1239,11 +1235,11 @@ class VisorTasksCommand extends VisorConsoleCommand { tasksT.maxCellWidth = 55 - tasksT #=( + tasksT #= ( "Task Name(@), Oldest/Latest & Rate", "Duration", "Executions" - ) + ) println("Tasks executed on host " + host + ":") @@ -1266,7 +1262,7 @@ class VisorTasksCommand extends VisorConsoleCommand { val n = t.execs.size - tasksT +=( + tasksT += ( ( t.taskNameVar, " ", @@ -1274,12 +1270,12 @@ class VisorTasksCommand extends VisorConsoleCommand { "Latest: " + formatDateTime(t.latest), " ", "Exec. Rate: " + n + " in " + X.timeSpan2HMSM(t.timeframe) - ), + ), ( "min: " + X.timeSpan2HMSM(t.minDuration), "avg: " + X.timeSpan2HMSM(t.avgDuration), "max: " + X.timeSpan2HMSM(t.maxDuration) - ), + ), ( "Total: " + n, " ", @@ -1288,8 +1284,8 @@ class VisorTasksCommand extends VisorConsoleCommand { "Fa: " + eE + " (" + formatInt(100 * eE / n) + "%)", "Un: " + uE + " (" + formatInt(100 * uE / n) + "%)", "Ti: " + tE + " (" + formatInt(100 * tE / n) + "%)" - ) ) + ) }) tasksT.render() http://git-wip-us.apache.org/repos/asf/ignite/blob/cd195646/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala index 41a14d0..5765579 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala @@ -35,7 +35,6 @@ import jline.console.ConsoleReader import org.jetbrains.annotations.Nullable import java.io._ import java.lang.{Boolean => JavaBoolean} -import java.net._ import java.text._ import java.util.concurrent._ import java.util.{Collection => JavaCollection, HashSet => JavaHashSet, _}
