Repository: tajo Updated Branches: refs/heads/branch-0.11.0 d49a56feb -> 65c491772
TAJO-1861: TSQL should change line after printout error message during connecting other database. Signed-off-by: Jihoon Son <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/65c49177 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/65c49177 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/65c49177 Branch: refs/heads/branch-0.11.0 Commit: 65c4917721ea731449ed1114f1dd954593b711bc Parents: d49a56f Author: Dongkyu Hwangbo <[email protected]> Authored: Tue Sep 22 13:36:29 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Tue Sep 22 13:36:43 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../org/apache/tajo/cli/tsql/commands/ConnectDatabaseCommand.java | 2 +- .../test/java/org/apache/tajo/cli/tsql/TestTajoCliNegatives.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/65c49177/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 20f11db..ad7f1cc 100644 --- a/CHANGES +++ b/CHANGES @@ -273,6 +273,9 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1861: TSQL should change line after printout error message during + connecting other database. (jihoon) + TAJO-1873: Fix NPE in QueryExecutorServlet. (jinho) TAJO-1871: '-DskipTests' flag does not work. (jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/65c49177/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/ConnectDatabaseCommand.java ---------------------------------------------------------------------- diff --git a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/ConnectDatabaseCommand.java b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/ConnectDatabaseCommand.java index 819f848..a997051 100644 --- a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/ConnectDatabaseCommand.java +++ b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/ConnectDatabaseCommand.java @@ -60,7 +60,7 @@ public class ConnectDatabaseCommand extends TajoShellCommand { ); } catch (TajoException se) { - context.getOutput().write("ERROR: " + se.getMessage()); + context.getOutput().write(String.format("ERROR: %s%n", se.getMessage())); } } } http://git-wip-us.apache.org/repos/asf/tajo/blob/65c49177/tajo-core-tests/src/test/java/org/apache/tajo/cli/tsql/TestTajoCliNegatives.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/cli/tsql/TestTajoCliNegatives.java b/tajo-core-tests/src/test/java/org/apache/tajo/cli/tsql/TestTajoCliNegatives.java index 689caa7..3ebbafa 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/cli/tsql/TestTajoCliNegatives.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/cli/tsql/TestTajoCliNegatives.java @@ -79,7 +79,7 @@ public class TestTajoCliNegatives extends QueryTestCaseBase { @Test public void testConnectDatabase() throws Exception { - assertMetaCommandFailure("\\c unknown_db", "ERROR: database 'unknown_db' does not exist"); + assertMetaCommandFailure("\\c unknown_db", "ERROR: database 'unknown_db' does not exist\n"); } @Test
