Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

TAJO-1681 Fix TajoDump invalid null check for database name #628

Closed
charsyam wants to merge 2 commits into from
Closed

TAJO-1681 Fix TajoDump invalid null check for database name #628

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7209ea5
fix invalid null check
Jul 13, 2015
94bc862
remove testcase and fix indent
Jul 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -122,7 +120,7 @@ public static void main(String [] args) throws ParseException, IOException, Serv
}

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,
Expand All @@ -141,7 +139,9 @@ public static void dump(TajoClient client, UserRoleInfo userInfo, String baseDat
}
}
} else {
dumpDatabase(client, baseDatabaseName, out);
if (isAcceptableDumpingDatabase(baseDatabaseName)) {
dumpDatabase(client, baseDatabaseName, out);
}
}
out.flush();
}
Expand Down