You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2015/01/05 06:30:40 UTC
[1/3] tajo git commit: TAJO-1276: Link to tsql guide 404s in tajo
cli. (Jakob Homan via jihoon)
Repository: tajo
Updated Branches:
refs/heads/index_support f4ca97cee -> dfaf6a542
TAJO-1276: Link to tsql guide 404s in tajo cli. (Jakob Homan via jihoon)
Closes #328
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/14e7529e
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/14e7529e
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/14e7529e
Branch: refs/heads/index_support
Commit: 14e7529e3a414766d5337919f377effaccf9ac4c
Parents: 9e329a5
Author: Jihoon Son <ji...@apache.org>
Authored: Mon Jan 5 13:54:49 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Mon Jan 5 13:55:07 2015 +0900
----------------------------------------------------------------------
CHANGES | 2 ++
README | 2 +-
.../main/java/org/apache/tajo/cli/tsql/commands/HelpCommand.java | 2 +-
tajo-docs/src/main/sphinx/tsql/meta_command.rst | 2 +-
tajo-project/src/site/markdown/mailing-lists.md | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/14e7529e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 547f373..a025270 100644
--- a/CHANGES
+++ b/CHANGES
@@ -134,6 +134,8 @@ Release 0.9.1 - unreleased
BUG FIXES
+ TAJO-1276: Link to tsql guide 404s in tajo cli. (Jakob Homan via jihoon)
+
TAJO-1275: Optimizer pushs down non-equi filter as theta join qualifier.
(Keuntae Park)
http://git-wip-us.apache.org/repos/asf/tajo/blob/14e7529e/README
----------------------------------------------------------------------
diff --git a/README b/README
index 29af190..d904eaf 100644
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ Documents
* Configuration Guide (http://tajo.apache.org/docs/current/configuration.html)
* Backup and Restore Guide (http://tajo.apache.org/docs/current/backup_and_restore.html)
* Functions (http://tajo.apache.org/docs/current/functions.html)
-* Tajo Interactive Shell (http://tajo.apache.org/docs/current/cli.html)
+* Tajo Interactive Shell (http://tajo.apache.org/docs/current/tsql.html)
Requirements
============
http://git-wip-us.apache.org/repos/asf/tajo/blob/14e7529e/tajo-client/src/main/java/org/apache/tajo/cli/tsql/commands/HelpCommand.java
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/java/org/apache/tajo/cli/tsql/commands/HelpCommand.java b/tajo-client/src/main/java/org/apache/tajo/cli/tsql/commands/HelpCommand.java
index 76f8561..5d41e41 100644
--- a/tajo-client/src/main/java/org/apache/tajo/cli/tsql/commands/HelpCommand.java
+++ b/tajo-client/src/main/java/org/apache/tajo/cli/tsql/commands/HelpCommand.java
@@ -85,7 +85,7 @@ public class HelpCommand extends TajoShellCommand {
sout.println();
sout.println("Documentations");
- sout.println(" tsql guide http://tajo.apache.org/docs/" + targetDocVersion + "/cli.html");
+ sout.println(" tsql guide http://tajo.apache.org/docs/" + targetDocVersion + "/tsql.html");
sout.println(" Query language http://tajo.apache.org/docs/" + targetDocVersion + "/sql_language.html");
sout.println(" Functions http://tajo.apache.org/docs/" + targetDocVersion + "/functions.html");
sout.println(" Backup & restore http://tajo.apache.org/docs/" + targetDocVersion + "/backup_and_restore.html");
http://git-wip-us.apache.org/repos/asf/tajo/blob/14e7529e/tajo-docs/src/main/sphinx/tsql/meta_command.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/tsql/meta_command.rst b/tajo-docs/src/main/sphinx/tsql/meta_command.rst
index 1c92f4e..15701fa 100644
--- a/tajo-docs/src/main/sphinx/tsql/meta_command.rst
+++ b/tajo-docs/src/main/sphinx/tsql/meta_command.rst
@@ -41,7 +41,7 @@ In the current implementation, there are meta commands as follows: ::
Documentations
- tsql guide http://tajo.apache.org/docs/current/cli.html
+ tsql guide http://tajo.apache.org/docs/current/tsql.html
Query language http://tajo.apache.org/docs/current/sql_language.html
Functions http://tajo.apache.org/docs/current/functions.html
Backup & restore http://tajo.apache.org/docs/current/backup_and_restore.html
http://git-wip-us.apache.org/repos/asf/tajo/blob/14e7529e/tajo-project/src/site/markdown/mailing-lists.md
----------------------------------------------------------------------
diff --git a/tajo-project/src/site/markdown/mailing-lists.md b/tajo-project/src/site/markdown/mailing-lists.md
index 7fbe461..161503d 100644
--- a/tajo-project/src/site/markdown/mailing-lists.md
+++ b/tajo-project/src/site/markdown/mailing-lists.md
@@ -31,7 +31,7 @@ The Tajo user mailing list is : user@tajo.apache.org.
* [Unsubscribe from List] (mailto:user-unsubscribe@tajo.apache.org)
* [Archives] (http://mail-archives.apache.org/mod_mbox/tajo-user/)
-### Devlopers
+### Developers
If you'd like to contribute to Tajo, please subscribe to the Tajo developer mailing list.
[3/3] tajo git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo into index_support
Posted by ji...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/dfaf6a54
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/dfaf6a54
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/dfaf6a54
Branch: refs/heads/index_support
Commit: dfaf6a542317bcc59729f8f4d921ddb8e55d79fc
Parents: f4ca97c c420ced
Author: Jihoon Son <ji...@apache.org>
Authored: Mon Jan 5 14:30:28 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Mon Jan 5 14:30:28 2015 +0900
----------------------------------------------------------------------
CHANGES | 5 +++++
README | 2 +-
.../main/java/org/apache/tajo/cli/tsql/TajoFileHistory.java | 6 +++++-
.../java/org/apache/tajo/cli/tsql/commands/ExitCommand.java | 5 ++++-
.../java/org/apache/tajo/cli/tsql/commands/HelpCommand.java | 2 +-
tajo-docs/src/main/sphinx/tsql/meta_command.rst | 2 +-
tajo-project/src/site/markdown/mailing-lists.md | 2 +-
7 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/3] tajo git commit: TAJO-967: tajoCli doesn't remeber the last
'\q' command. (Jaewoong Jung via jihoon)
Posted by ji...@apache.org.
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 <ji...@apache.org>
Authored: Mon Jan 5 14:10:05 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
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