Return-Path: X-Original-To: apmail-tajo-commits-archive@minotaur.apache.org Delivered-To: apmail-tajo-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 61C92108EC for ; Mon, 5 Jan 2015 05:30:40 +0000 (UTC) Received: (qmail 35378 invoked by uid 500); 5 Jan 2015 05:30:41 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 35344 invoked by uid 500); 5 Jan 2015 05:30:41 -0000 Mailing-List: contact commits-help@tajo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tajo.apache.org Delivered-To: mailing list commits@tajo.apache.org Received: (qmail 35282 invoked by uid 99); 5 Jan 2015 05:30:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2015 05:30:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EFFF3A3EE8A; Mon, 5 Jan 2015 05:30:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jihoonson@apache.org To: commits@tajo.apache.org Date: Mon, 05 Jan 2015 05:30:41 -0000 Message-Id: In-Reply-To: <1cffe502688e423c8a5e4101995056d1@git.apache.org> References: <1cffe502688e423c8a5e4101995056d1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] tajo git commit: TAJO-967: tajoCli doesn't remeber the last '\q' command. (Jaewoong Jung via jihoon) TAJO-967: tajoCli doesn't remeber the last '\q' command. (Jaewoong Jung via jihoon) Closes #325 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/c420ced1 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/c420ced1 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/c420ced1 Branch: refs/heads/index_support Commit: c420ced1b8a9e777fd0d5558236050a4515d8a45 Parents: 14e7529 Author: Jihoon Son Authored: Mon Jan 5 14:10:05 2015 +0900 Committer: Jihoon Son Committed: Mon Jan 5 14:10:05 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../main/java/org/apache/tajo/cli/tsql/TajoFileHistory.java | 6 +++++- .../java/org/apache/tajo/cli/tsql/commands/ExitCommand.java | 5 ++++- 3 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/c420ced1/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index a025270..cbd2f8b 100644 --- a/CHANGES +++ b/CHANGES @@ -243,6 +243,9 @@ Release 0.9.1 - unreleased TASKS + TAJO-967: tajoCli doesn't remeber the last '\q' command. + (Jaewoong Jung via jihoon) + TAJO-1272: Change snapshot version from 0.9.1 to 0.10. (hyunsik) TAJO-1267: Remove LazyTaskScheduler. (DaeMyung Kang via jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/c420ced1/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoFileHistory.java ---------------------------------------------------------------------- diff --git a/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoFileHistory.java b/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoFileHistory.java index 9b1a5b8..c780a77 100644 --- a/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoFileHistory.java +++ b/tajo-client/src/main/java/org/apache/tajo/cli/tsql/TajoFileHistory.java @@ -19,6 +19,7 @@ package org.apache.tajo.cli.tsql; import jline.console.history.FileHistory; +import org.apache.tajo.cli.tsql.commands.ExitCommand; import java.io.File; import java.io.IOException; @@ -31,7 +32,10 @@ public class TajoFileHistory extends FileHistory { @Override public void add(CharSequence item) { - // TODO: Filter out the quit command. Users wouldn't want it in the history. + // Don't store an exit command. Most users wouldn't want it. + if (item.equals(ExitCommand.COMMAND_STRING)) { + return; + } super.add(item); } } http://git-wip-us.apache.org/repos/asf/tajo/blob/c420ced1/tajo-client/src/main/java/org/apache/tajo/cli/tsql/commands/ExitCommand.java ---------------------------------------------------------------------- diff --git a/tajo-client/src/main/java/org/apache/tajo/cli/tsql/commands/ExitCommand.java b/tajo-client/src/main/java/org/apache/tajo/cli/tsql/commands/ExitCommand.java index 499e92a..d882b2f 100644 --- a/tajo-client/src/main/java/org/apache/tajo/cli/tsql/commands/ExitCommand.java +++ b/tajo-client/src/main/java/org/apache/tajo/cli/tsql/commands/ExitCommand.java @@ -22,13 +22,16 @@ import org.apache.tajo.cli.tsql.TajoCli; public class ExitCommand extends TajoShellCommand { + // Sharing the exit command string publicly to filter it out from the command history. + public static final String COMMAND_STRING = "\\q"; + public ExitCommand(TajoCli.TajoCliContext context) { super(context); } @Override public String getCommand() { - return "\\q"; + return COMMAND_STRING; } @Override