Repository: tajo Updated Branches: refs/heads/master 81ab265fd -> 7a9a3ec47
TAJO-2078: TestTajoCli.testSelectResultWithNullTrueDeprecated occasionally fails. Closes #964 Signed-off-by: JaeHwa Jung <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/7a9a3ec4 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/7a9a3ec4 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/7a9a3ec4 Branch: refs/heads/master Commit: 7a9a3ec47bd9793f006aa93c97b10f0ab0383c67 Parents: 81ab265 Author: Dongkyu Hwangbo <[email protected]> Authored: Fri Feb 19 14:34:56 2016 +0900 Committer: JaeHwa Jung <[email protected]> Committed: Fri Feb 19 14:34:56 2016 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../apache/tajo/cli/tsql/DefaultTajoCliOutputFormatter.java | 9 ++++++++- .../src/main/java/org/apache/tajo/cli/tsql/TajoCli.java | 9 +-------- 3 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/7a9a3ec4/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index b474205..b7b9e1d 100644 --- a/CHANGES +++ b/CHANGES @@ -106,6 +106,9 @@ Release 0.12.0 - unreleased BUG FIXES + TAJO-2078: TestTajoCli.testSelectResultWithNullTrueDeprecated occasionally + fails. (Dongkyu Hwangbo via jaehwa) + TAJO-2077: Join condition causes incorrect result, when a table has an empty row file. (jinho) http://git-wip-us.apache.org/repos/asf/tajo/blob/7a9a3ec4/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/DefaultTajoCliOutputFormatter.java ---------------------------------------------------------------------- diff --git a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/DefaultTajoCliOutputFormatter.java b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/DefaultTajoCliOutputFormatter.java index 0de0809..688e26b 100644 --- a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/DefaultTajoCliOutputFormatter.java +++ b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/DefaultTajoCliOutputFormatter.java @@ -199,21 +199,28 @@ public class DefaultTajoCliOutputFormatter implements TajoCliOutputFormatter { String lineFormat = "[%s] %d%% %s"; if (isRealTerminal()) { + boolean isLastLine = false; if (status.getState() == TajoProtos.QueryState.QUERY_SUCCEEDED) { progressBar = "@|green " + progressBar + "|@"; + isLastLine = true; } else if (status.getState() == TajoProtos.QueryState.QUERY_ERROR || status.getState() == TajoProtos.QueryState.QUERY_FAILED || status.getState() == TajoProtos.QueryState.QUERY_KILLED) { progressBar = "@|red " + progressBar + "|@"; + isLastLine = true; } String line = String.format(lineFormat, progressBar, progress, responseTime); out.print(ansi().eraseLine(Ansi.Erase.ALL).a('\r').render(line)); + + if (isLastLine) { + out.println(); + } } else { String line = String.format(lineFormat, progressBar, progress, responseTime); - out.print('\n' + line); + out.println(line); } out.flush(); http://git-wip-us.apache.org/repos/asf/tajo/blob/7a9a3ec4/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/TajoCli.java ---------------------------------------------------------------------- diff --git a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/TajoCli.java b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/TajoCli.java index 436b941..1fa7862 100644 --- a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/TajoCli.java +++ b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/TajoCli.java @@ -601,7 +601,6 @@ public class TajoCli implements Closeable { // query execute ResultSet res = null; QueryStatus status = null; - boolean isProgressPrinting = false; try { int initRetries = 0; @@ -616,12 +615,10 @@ public class TajoCli implements Closeable { if (TajoClientUtil.isQueryRunning(status.getState())) { displayFormatter.printProgress(sout, status); - if (!isProgressPrinting) { - isProgressPrinting = true; - } } if (TajoClientUtil.isQueryComplete(status.getState()) && status.getState() != QueryState.QUERY_KILL_WAIT) { + displayFormatter.printProgress(sout, status); break; } else { Thread.sleep(Math.min(200 * progressRetries, 1000)); @@ -629,10 +626,6 @@ public class TajoCli implements Closeable { } } - if (isProgressPrinting) { - displayFormatter.printProgress(sout, status); - sout.println(); // to print out query result in next line - } if (status.getState() == QueryState.QUERY_ERROR || status.getState() == QueryState.QUERY_FAILED) { displayFormatter.printErrorMessage(sout, status); wasError = true;
