Repository: tajo Updated Branches: refs/heads/master 59cb66fc4 -> ae9a8c9cb
TAJO-1681: Fix TajoDump invalid null check for database name Closes #628 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/ae9a8c9c Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/ae9a8c9c Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/ae9a8c9c Branch: refs/heads/master Commit: ae9a8c9cb608c5f95d68a06e07e5969b8c9cf2d6 Parents: 59cb66f Author: DaeMyung Kang <[email protected]> Authored: Tue Jul 28 15:13:36 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Tue Jul 28 15:14:43 2015 +0900 ---------------------------------------------------------------------- CHANGES | 5 ++++- .../src/main/java/org/apache/tajo/cli/tools/TajoDump.java | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/ae9a8c9c/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 1bf16f0..25a03e6 100644 --- a/CHANGES +++ b/CHANGES @@ -198,6 +198,9 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1681: Fix TajoDump invalid null check for database name. + (Contributed by DaeMyung Kang, Committed by jihoon) + TAJO-1702: Fix race condition in finished query cache. (jinho) TAJO-1597: Problem of ignoring theta join condition. (jihoon) @@ -209,7 +212,7 @@ Release 0.11.0 - unreleased TAJO-1657: Tajo Rest API /database/{database-name]/tables should return table names only without invalid external table info. - (Contributed by DaeMyung Kang, Committed by jihoon) + (Contributed by DaeMyung Kang, Committed by jihoon) TAJO-1644: When inserting empty data into a partitioned table, existing data would be removed. (jaehwa) http://git-wip-us.apache.org/repos/asf/tajo/blob/ae9a8c9c/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java ---------------------------------------------------------------------- diff --git a/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java b/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java index 7fefc5a..b48a9ec 100644 --- a/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java +++ b/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java @@ -19,14 +19,12 @@ package org.apache.tajo.cli.tools; import com.google.protobuf.ServiceException; - import org.apache.commons.cli.*; import org.apache.tajo.auth.UserRoleInfo; import org.apache.tajo.catalog.CatalogConstants; import org.apache.tajo.catalog.CatalogUtil; import org.apache.tajo.catalog.DDLBuilder; import org.apache.tajo.catalog.TableDesc; -import org.apache.tajo.catalog.proto.CatalogProtos.StoreType; import org.apache.tajo.client.TajoClient; import org.apache.tajo.client.TajoClientImpl; import org.apache.tajo.conf.TajoConf; @@ -122,7 +120,7 @@ public class TajoDump { } private static boolean isAcceptableDumpingDatabase(String databaseName) { - return (databaseName == null || !databaseName.equalsIgnoreCase(CatalogConstants.INFORMATION_SCHEMA_DB_NAME)); + return (databaseName != null && !databaseName.equalsIgnoreCase(CatalogConstants.INFORMATION_SCHEMA_DB_NAME)); } public static void dump(TajoClient client, UserRoleInfo userInfo, String baseDatabaseName, @@ -141,7 +139,9 @@ public class TajoDump { } } } else { - dumpDatabase(client, baseDatabaseName, out); + if (isAcceptableDumpingDatabase(baseDatabaseName)) { + dumpDatabase(client, baseDatabaseName, out); + } } out.flush(); }
