TAJO-862: Restore failure of dumped relations. (jihoon)
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/d6e37127 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/d6e37127 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/d6e37127 Branch: refs/heads/window_function Commit: d6e37127bb597fb9bceb745ee644ea43a25c2751 Parents: 07225fa Author: Jihoon Son <[email protected]> Authored: Tue Jun 17 11:43:33 2014 +0900 Committer: Jihoon Son <[email protected]> Committed: Tue Jun 17 11:43:33 2014 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ tajo-client/src/main/java/org/apache/tajo/cli/SimpleParser.java | 1 + tajo-client/src/main/java/org/apache/tajo/client/TajoDump.java | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/d6e37127/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 2772aee..9441263 100644 --- a/CHANGES +++ b/CHANGES @@ -68,6 +68,8 @@ Release 0.9.0 - unreleased BUG FIXES + TAJO-862: Restore failure of dumped relations. (jihoon) + TAJO-861: tajo-dump script are not executable. (jinho) TAJO-839: If all tables participate in the BROADCAST JOIN, there is some http://git-wip-us.apache.org/repos/asf/tajo/blob/d6e37127/tajo-client/src/main/java/org/apache/tajo/cli/SimpleParser.java ---------------------------------------------------------------------- diff --git a/tajo-client/src/main/java/org/apache/tajo/cli/SimpleParser.java b/tajo-client/src/main/java/org/apache/tajo/cli/SimpleParser.java index afb8a59..0beaec8 100644 --- a/tajo-client/src/main/java/org/apache/tajo/cli/SimpleParser.java +++ b/tajo-client/src/main/java/org/apache/tajo/cli/SimpleParser.java @@ -148,6 +148,7 @@ public class SimpleParser { } else if (isStatementContinue() || isStatementStart(chars[idx])) { if (!isStatementContinue()) { // TOK_START -> STATEMENT state = ParsingState.STATEMENT; + rawAppender.append("\n"); } while (!isTerminateState(state) && idx < chars.length) { http://git-wip-us.apache.org/repos/asf/tajo/blob/d6e37127/tajo-client/src/main/java/org/apache/tajo/client/TajoDump.java ---------------------------------------------------------------------- diff --git a/tajo-client/src/main/java/org/apache/tajo/client/TajoDump.java b/tajo-client/src/main/java/org/apache/tajo/client/TajoDump.java index d1d93b2..7628d9d 100644 --- a/tajo-client/src/main/java/org/apache/tajo/client/TajoDump.java +++ b/tajo-client/src/main/java/org/apache/tajo/client/TajoDump.java @@ -139,10 +139,10 @@ public class TajoDump { writer.write("--\n"); writer.write("-- Tajo database dump\n"); if (includeUSerName) { - writer.write("--\nDump user: " + userInfo.getUserName() + "\n"); + writer.write("--\n-- Dump user: " + userInfo.getUserName() + "\n"); } if (includeDate) { - writer.write("\n-- Dump date: " + toDateString() + "\n"); + writer.write("--\n-- Dump date: " + toDateString() + "\n"); } writer.write("--\n"); writer.write("\n");
