diff --git cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java index 0d609e4..79c5bc1 100644 --- cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java +++ cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java @@ -487,16 +487,6 @@ public class CliDriver { ss.setIsSilent(saveSilent); } - public void processSelectDatabase(CliSessionState ss) throws IOException { - String database = ss.database; - if (database != null) { - int rc = processLine("use " + database + ";"); - if (rc != 0) { - System.exit(rc); - } - } - } - public static Completor getCommandCompletor () { // SimpleCompletor matches against a pre-defined wordlist // We start with an empty wordlist and build it up @@ -645,9 +635,6 @@ public class CliDriver { CliDriver cli = new CliDriver(); cli.setHiveVariables(oproc.getHiveVariables()); - // use the specified database if specified - cli.processSelectDatabase(ss); - // Execute -i init files (always in silent mode) cli.processInitFiles(ss); diff --git cli/src/java/org/apache/hadoop/hive/cli/CliSessionState.java cli/src/java/org/apache/hadoop/hive/cli/CliSessionState.java index dfb30e2..a36a53c 100644 --- cli/src/java/org/apache/hadoop/hive/cli/CliSessionState.java +++ cli/src/java/org/apache/hadoop/hive/cli/CliSessionState.java @@ -40,11 +40,6 @@ import org.apache.thrift.transport.TTransportException; */ public class CliSessionState extends SessionState { /** - * -database option if any that the session has been invoked with. - */ - public String database; - - /** * -e option if any that the session has been invoked with. */ public String execString; diff --git cli/src/java/org/apache/hadoop/hive/cli/OptionsProcessor.java cli/src/java/org/apache/hadoop/hive/cli/OptionsProcessor.java index 865848a..d9ec9d7 100644 --- cli/src/java/org/apache/hadoop/hive/cli/OptionsProcessor.java +++ cli/src/java/org/apache/hadoop/hive/cli/OptionsProcessor.java @@ -45,14 +45,6 @@ public class OptionsProcessor { @SuppressWarnings("static-access") public OptionsProcessor() { - // -database database - options.addOption(OptionBuilder - .hasArg() - .withArgName("databasename") - .withLongOpt("database") - .withDescription("Specify the database to use") - .create()); - // -e 'quoted-query-string' options.addOption(OptionBuilder .hasArg() @@ -161,8 +153,6 @@ public class OptionsProcessor { ss.setIsSilent(commandLine.hasOption('S')); - ss.database = commandLine.getOptionValue("database"); - ss.execString = commandLine.getOptionValue('e'); ss.fileName = commandLine.getOptionValue('f');