hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sp...@apache.org
Subject hive git commit: HIVE-14123: Add beeline configuration option to show database in the prompt (Peter Vary, reviewed by Aihua Xu)
Date Tue, 26 Jul 2016 14:54:46 GMT
Repository: hive
Updated Branches:
  refs/heads/master 30b40c49a -> dcfc31b83


HIVE-14123: Add beeline configuration option to show database in the prompt (Peter Vary, reviewed
by Aihua Xu)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/dcfc31b8
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/dcfc31b8
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/dcfc31b8

Branch: refs/heads/master
Commit: dcfc31b83b8b605c689a975cf17f29eacdc3e24f
Parents: 30b40c4
Author: Peter Vary <pvary@cloudera.com>
Authored: Tue Jul 26 09:53:57 2016 -0500
Committer: Sergio Pena <sergio.pena@cloudera.com>
Committed: Tue Jul 26 09:53:57 2016 -0500

----------------------------------------------------------------------
 beeline/pom.xml                                 |   5 +
 .../java/org/apache/hive/beeline/BeeLine.java   |  12 +--
 .../org/apache/hive/beeline/BeeLineOpts.java    |  19 ++++
 .../hive/beeline/ClientCommandHookFactory.java  | 102 +++++++++++++++----
 .../java/org/apache/hive/beeline/Commands.java  |   5 +-
 .../hive/beeline/ReflectiveCommandHandler.java  |  14 ++-
 beeline/src/main/resources/BeeLine.properties   |   1 +
 .../hive/beeline/TestBeelineArgParsing.java     |  19 ++++
 .../beeline/TestClientCommandHookFactory.java   | 102 ++++++++++++++++++-
 .../hive/beeline/TestBeeLineWithArgs.java       |  20 +++-
 jdbc/src/java/org/apache/hive/jdbc/Utils.java   |   4 +
 11 files changed, 266 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/dcfc31b8/beeline/pom.xml
----------------------------------------------------------------------
diff --git a/beeline/pom.xml b/beeline/pom.xml
index 5503add..dc89e81 100644
--- a/beeline/pom.xml
+++ b/beeline/pom.xml
@@ -124,6 +124,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>postgresql</groupId>
       <artifactId>postgresql</artifactId>
       <version>9.1-901.jdbc4</version>

http://git-wip-us.apache.org/repos/asf/hive/blob/dcfc31b8/beeline/src/java/org/apache/hive/beeline/BeeLine.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLine.java b/beeline/src/java/org/apache/hive/beeline/BeeLine.java
index 66185f6..e0fa032 100644
--- a/beeline/src/java/org/apache/hive/beeline/BeeLine.java
+++ b/beeline/src/java/org/apache/hive/beeline/BeeLine.java
@@ -138,6 +138,7 @@ public class BeeLine implements Closeable {
   private String currentDatabase = null;
 
   private History history;
+  // Indicates if this instance of beeline is running in compatibility mode, or beeline mode
   private boolean isBeeLine = true;
 
   private static final Options options = new Options();
@@ -1432,18 +1433,17 @@ public class BeeLine implements Closeable {
     HiveConf conf = getCommands().getHiveConf(true);
     prompt = conf.getVar(HiveConf.ConfVars.CLIPROMPT);
     prompt = getCommands().substituteVariables(conf, prompt);
-    return prompt + getFormattedDb(conf) + "> ";
+    return prompt + getFormattedDb() + "> ";
   }
 
   /**
    * Retrieve the current database name string to display, based on the
    * configuration value.
    *
-   * @param conf storing whether or not to show current db
    * @return String to show user for current db value
    */
-  String getFormattedDb(HiveConf conf) {
-    if (!HiveConf.getBoolVar(conf, HiveConf.ConfVars.CLIPRINTCURRENTDB)) {
+  String getFormattedDb() {
+    if (!getOpts().getShowDbInPrompt()) {
       return "";
     }
     String currDb = getCurrentDatabase();
@@ -1461,11 +1461,10 @@ public class BeeLine implements Closeable {
     } else {
       String printClosed = getDatabaseConnection().isClosed() ? " (closed)" : "";
       return getPromptForBeeline(getDatabaseConnections().getIndex()
-          + ": " + getDatabaseConnection().getUrl()) + printClosed + "> ";
+          + ": " + getDatabaseConnection().getUrl()) + printClosed + getFormattedDb() + ">
";
     }
   }
 
-
   static String getPromptForBeeline(String url) {
     if (url == null || url.length() == 0) {
       url = "beeline";
@@ -1482,7 +1481,6 @@ public class BeeLine implements Closeable {
     return url;
   }
 
-
   /**
    * Try to obtain the current size of the specified {@link ResultSet} by jumping to the
last row
    * and getting the row number.

http://git-wip-us.apache.org/repos/asf/hive/blob/dcfc31b8/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java b/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
index e2bbbea..e6e24b1 100644
--- a/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
+++ b/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
@@ -67,6 +67,7 @@ class BeeLineOpts implements Completer {
   private boolean silent = false;
   private boolean color = false;
   private boolean showHeader = true;
+  private boolean showDbInPrompt = false;
   private int headerInterval = 100;
   private boolean fastConnect = true;
   private boolean autoCommit = false;
@@ -468,6 +469,24 @@ class BeeLineOpts implements Completer {
     }
   }
 
+  public void setShowDbInPrompt(boolean showDbInPrompt) {
+    this.showDbInPrompt = showDbInPrompt;
+  }
+
+  /**
+   * In beeline mode returns the beeline option provided by command line argument or config
file
+   * In compatibility mode returns the value of the hive.cli.print.current.db config variable
+   * @return Should the current db displayed in the prompt
+   */
+  public boolean getShowDbInPrompt() {
+    if (beeLine.isBeeLine()) {
+      return showDbInPrompt;
+    } else {
+      HiveConf conf = beeLine.getCommands().getHiveConf(true);
+      return HiveConf.getBoolVar(conf, HiveConf.ConfVars.CLIPRINTCURRENTDB);
+    }
+  }
+
   public void setHeaderInterval(int headerInterval) {
     this.headerInterval = headerInterval;
   }

http://git-wip-us.apache.org/repos/asf/hive/blob/dcfc31b8/beeline/src/java/org/apache/hive/beeline/ClientCommandHookFactory.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/ClientCommandHookFactory.java b/beeline/src/java/org/apache/hive/beeline/ClientCommandHookFactory.java
index c4d97bc..b883fc9 100644
--- a/beeline/src/java/org/apache/hive/beeline/ClientCommandHookFactory.java
+++ b/beeline/src/java/org/apache/hive/beeline/ClientCommandHookFactory.java
@@ -17,6 +17,10 @@
  */
 package org.apache.hive.beeline;
 
+import org.apache.hive.jdbc.Utils;
+
+import java.sql.SQLException;
+
 /**
  * We need to update some client side information after executing some Hive Commands
  */
@@ -52,34 +56,96 @@ public class ClientCommandHookFactory {
 
     @Override
     public void postHook(BeeLine beeLine) {
-      if (!beeLine.isBeeLine()) {
-        // Handler multi-line sql
-        String line = sql.replaceAll("\\s+", " ");
-        String strs[] = line.split(" ");
-        String dbName;
-        if (strs == null || strs.length != 2) {
-          // unable to parse the use command
+      // Handler multi-line sql
+      String line = sql.replaceAll("\\s+", " ");
+      String strs[] = line.split(" ");
+      String dbName;
+      if (strs == null || strs.length != 2) {
+        // unable to parse the use command
+        dbName = "";
+      } else {
+        dbName = strs[1];
+      }
+      beeLine.setCurrentDatabase(dbName);
+    }
+  }
+
+  public class ConnectCommandHook extends ClientHook {
+
+    public ConnectCommandHook(String sql) {
+      super(sql);
+    }
+
+    @Override
+    public void postHook(BeeLine beeLine) {
+      // Handler multi-line sql
+      String line = sql.replaceAll("\\s+", " ");
+      String strs[] = line.split(" ");
+      String dbName;
+      if (strs == null || strs.length < 1) {
+        // unable to parse the connect command
+        dbName = "";
+      } else {
+        try {
+          dbName = Utils.parseURL(strs[1]).getDbName();
+        } catch (Exception e) {
+          // unable to parse the connect command
           dbName = "";
-        } else {
-          dbName = strs[1];
         }
-        beeLine.setCurrentDatabase(dbName);
       }
+      beeLine.setCurrentDatabase(dbName);
     }
   }
 
-  public ClientHook getHook(String cmdLine) {
-    if (cmdLine.toLowerCase().startsWith("set")) {
-      // Only set A = B command needs updating the configuration stored in client side.
-      if (cmdLine.contains("=")) {
-        return new SetCommandHook(cmdLine);
+  public class GoCommandHook extends ClientHook {
+
+    public GoCommandHook(String sql) {
+      super(sql);
+    }
+
+    @Override
+    public void postHook(BeeLine beeLine) {
+      String dbName = "";
+      try {
+        dbName = beeLine.getDatabaseConnection().getConnection().getSchema();
+      } catch (SQLException e) {
+        // unable to get the database, set the dbName empty
+      }
+      beeLine.setCurrentDatabase(dbName);
+    }
+  }
+
+  public ClientHook getHook(BeeLine beeLine, String cmdLine) {
+    if (!beeLine.isBeeLine()) {
+      // In compatibility mode we need to hook to set, and use
+      if (cmdLine.toLowerCase().startsWith("set")) {
+        // Only set A = B command needs updating the configuration stored in client side.
+        if (cmdLine.contains("=")) {
+          return new SetCommandHook(cmdLine);
+        } else {
+          return null;
+        }
+      } else if (cmdLine.toLowerCase().startsWith("use")) {
+        return new UseCommandHook(cmdLine);
       } else {
         return null;
       }
-    } else if (cmdLine.toLowerCase().startsWith("use")) {
-      return new UseCommandHook(cmdLine);
     } else {
-      return null;
+      // In beeline mode we need to hook to use, connect, go, in case
+      // the ShowDbInPrompt is set, so the database name is needed
+      if (beeLine.getOpts().getShowDbInPrompt()) {
+        if (cmdLine.toLowerCase().startsWith("use")) {
+          return new UseCommandHook(cmdLine);
+        } else if (cmdLine.toLowerCase().startsWith("connect")) {
+          return new ConnectCommandHook(cmdLine);
+        } else if (cmdLine.toLowerCase().startsWith("go")) {
+          return new GoCommandHook(cmdLine);
+        } else {
+          return null;
+        }
+      } else {
+        return null;
+      }
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/hive/blob/dcfc31b8/beeline/src/java/org/apache/hive/beeline/Commands.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/Commands.java b/beeline/src/java/org/apache/hive/beeline/Commands.java
index ffd1775..a25e09b 100644
--- a/beeline/src/java/org/apache/hive/beeline/Commands.java
+++ b/beeline/src/java/org/apache/hive/beeline/Commands.java
@@ -952,10 +952,7 @@ public class Commands {
       return false;
     }
 
-    ClientHook hook = null;
-    if (!beeLine.isBeeLine()) {
-      hook = ClientCommandHookFactory.get().getHook(sql);
-    }
+    ClientHook hook = ClientCommandHookFactory.get().getHook(beeLine, sql);
 
     try {
       Statement stmnt = null;

http://git-wip-us.apache.org/repos/asf/hive/blob/dcfc31b8/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java b/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java
index 3b863ae..8205126 100644
--- a/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java
+++ b/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java
@@ -48,15 +48,23 @@ public class ReflectiveCommandHandler extends AbstractCommandHandler {
 
   public boolean execute(String line) {
     lastException = null;
+    ClientHook hook = ClientCommandHookFactory.get().getHook(beeLine, line);
+
     try {
       Object ob = beeLine.getCommands().getClass().getMethod(getName(),
           new Class[] {String.class})
           .invoke(beeLine.getCommands(), new Object[] {line});
-      return ob != null && ob instanceof Boolean
-          && ((Boolean) ob).booleanValue();
+
+      boolean result = (ob != null && ob instanceof Boolean && ((Boolean)
ob).booleanValue());
+
+      if (hook != null && result) {
+        hook.postHook(beeLine);
+      }
+
+      return result;
     } catch (Throwable e) {
       lastException = e;
       return beeLine.error(e);
     }
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hive/blob/dcfc31b8/beeline/src/main/resources/BeeLine.properties
----------------------------------------------------------------------
diff --git a/beeline/src/main/resources/BeeLine.properties b/beeline/src/main/resources/BeeLine.properties
index 7500df9..95b8fa1 100644
--- a/beeline/src/main/resources/BeeLine.properties
+++ b/beeline/src/main/resources/BeeLine.properties
@@ -167,6 +167,7 @@ cmd-usage: Usage: java org.apache.hive.cli.beeline.BeeLine \n \
 \  --autoCommit=[true/false]       enable/disable automatic transaction commit\n \
 \  --verbose=[true/false]          show verbose error messages and debug info\n \
 \  --showWarnings=[true/false]     display connection warnings\n \
+\  --showDbInPrompt=[true/false]   display the current database name in the prompt\n \
 \  --showNestedErrs=[true/false]   display nested errors\n \
 \  --numberFormat=[pattern]        format numbers using DecimalFormat pattern\n \
 \  --force=[true/false]            continue running script even after errors\n \

http://git-wip-us.apache.org/repos/asf/hive/blob/dcfc31b8/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
----------------------------------------------------------------------
diff --git a/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java b/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
index ce1f538..a83f925 100644
--- a/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
+++ b/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
@@ -187,6 +187,25 @@ public class TestBeelineArgParsing {
     Assert.assertTrue(bl.getOpts().getTruncateTable());
   }
 
+  @Test
+  public void testBeelineShowDbInPromptOptsDefault() throws Exception {
+    TestBeeline bl = new TestBeeline();
+    String args[] = new String[] { "-u", "url" };
+    Assert.assertEquals(0, bl.initArgs(args));
+    Assert.assertFalse(bl.getOpts().getShowDbInPrompt());
+    Assert.assertEquals("", bl.getFormattedDb());
+  }
+
+  @Test
+  public void testBeelineShowDbInPromptOptsTrue() throws Exception {
+    TestBeeline bl = new TestBeeline();
+    String args[] = new String[] { "-u", "url", "--showDbInPrompt=true" };
+    Assert.assertEquals(0, bl.initArgs(args));
+    Assert.assertTrue(bl.getOpts().getShowDbInPrompt());
+    Assert.assertEquals(" (default)", bl.getFormattedDb());
+  }
+
+
   /**
    * Test setting script file with -f option.
    */

http://git-wip-us.apache.org/repos/asf/hive/blob/dcfc31b8/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java
----------------------------------------------------------------------
diff --git a/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java b/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java
index c86de0a..0e55603 100644
--- a/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java
+++ b/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java
@@ -17,16 +17,110 @@
  */
 package org.apache.hive.beeline;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.times;
+
 import junit.framework.Assert;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.sql.Connection;
+import java.sql.SQLException;
 
 public class TestClientCommandHookFactory {
+  public BeeLine setupMockData(boolean isBeeLine, boolean showDbInPrompt) {
+    BeeLine mockBeeLine = mock(BeeLine.class);
+    DatabaseConnection mockDatabaseConnection = mock(DatabaseConnection.class);
+    Connection mockConnection = mock(Connection.class);
+    try {
+      when(mockConnection.getSchema()).thenReturn("newDatabase");
+      when(mockDatabaseConnection.getConnection()).thenReturn(mockConnection);
+    } catch(SQLException sqlException) {
+      // We do mnot test this
+    }
+    when(mockBeeLine.getDatabaseConnection()).thenReturn(mockDatabaseConnection);
+    BeeLineOpts mockBeeLineOpts = mock(BeeLineOpts.class);
+    when(mockBeeLineOpts.getShowDbInPrompt()).thenReturn(showDbInPrompt);
+    when(mockBeeLine.getOpts()).thenReturn(mockBeeLineOpts);
+    when(mockBeeLine.isBeeLine()).thenReturn(isBeeLine);
+
+    return mockBeeLine;
+  }
+  @BeforeClass
+  public static void setupMockData() {
+  }
+
   @Test
-  public void testGetHook() {
-    Assert.assertNull(ClientCommandHookFactory.get().getHook("set a;"));
+  public void testGetHookCli() {
+    BeeLine beeLine = setupMockData(false, false);
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "set a;"));
+    Assert.assertTrue(ClientCommandHookFactory.get()
+        .getHook(beeLine, "set a=b;") instanceof ClientCommandHookFactory.SetCommandHook);
+    Assert.assertTrue(ClientCommandHookFactory.get()
+        .getHook(beeLine, "USE a.b") instanceof ClientCommandHookFactory.UseCommandHook);
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "coNNect a.b"));
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "gO 1"));
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "g"));
+  }
+
+  @Test
+  public void testGetHookBeeLineWithShowDbInPrompt() {
+    BeeLine beeLine = setupMockData(true, true);
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "set a;"));
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "set a=b;"));
+    Assert.assertTrue(ClientCommandHookFactory.get()
+            .getHook(beeLine, "USE a.b") instanceof ClientCommandHookFactory.UseCommandHook);
     Assert.assertTrue(ClientCommandHookFactory.get()
-        .getHook("set a=b;") instanceof ClientCommandHookFactory.SetCommandHook);
+            .getHook(beeLine, "coNNect a.b") instanceof ClientCommandHookFactory.ConnectCommandHook);
     Assert.assertTrue(ClientCommandHookFactory.get()
-        .getHook("USE a.b") instanceof ClientCommandHookFactory.UseCommandHook);
+            .getHook(beeLine, "gO 1") instanceof ClientCommandHookFactory.GoCommandHook);
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "g"));
+  }
+
+  @Test
+  public void testGetHookBeeLineWithoutShowDbInPrompt() {
+    BeeLine beeLine = setupMockData(true, false);
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "set a;"));
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "set a=b;"));
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "USE a.b"));
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "coNNect a.b"));
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "gO 1"));
+    Assert.assertNull(ClientCommandHookFactory.get().getHook(beeLine, "g"));
+  }
+
+  @Test
+  public void testUseHook() {
+    BeeLine beeLine = setupMockData(true, true);
+    ClientHook hook = ClientCommandHookFactory.get().getHook(beeLine, "USE newDatabase1");
+    Assert.assertTrue(hook instanceof ClientCommandHookFactory.UseCommandHook);
+    hook.postHook(beeLine);
+    ArgumentCaptor<String> argument = ArgumentCaptor.forClass(String.class);
+    verify(beeLine).setCurrentDatabase(argument.capture());
+    Assert.assertEquals("newDatabase1", argument.getValue());
+  }
+
+  @Test
+  public void testConnectHook() {
+    BeeLine beeLine = setupMockData(true, true);
+    ClientHook hook = ClientCommandHookFactory.get().getHook(beeLine, "coNNect jdbc:hive2://localhost:10000/newDatabase2
a a");
+    Assert.assertTrue(hook instanceof ClientCommandHookFactory.ConnectCommandHook);
+    hook.postHook(beeLine);
+    ArgumentCaptor<String> argument = ArgumentCaptor.forClass(String.class);
+    verify(beeLine).setCurrentDatabase(argument.capture());
+    Assert.assertEquals("newDatabase2", argument.getValue());
+  }
+
+  @Test
+  public void testGoHook() {
+    BeeLine beeLine = setupMockData(true, true);
+    ClientHook hook = ClientCommandHookFactory.get().getHook(beeLine, "go 1");
+    Assert.assertTrue(hook instanceof ClientCommandHookFactory.GoCommandHook);
+    hook.postHook(beeLine);
+    ArgumentCaptor<String> argument = ArgumentCaptor.forClass(String.class);
+    verify(beeLine).setCurrentDatabase(argument.capture());
+    Assert.assertEquals("newDatabase", argument.getValue());
   }
 }

http://git-wip-us.apache.org/repos/asf/hive/blob/dcfc31b8/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
b/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
index 3b40d71..892c733 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
@@ -277,7 +277,7 @@ public class TestBeeLineWithArgs {
     List<String> argList = getBaseArgs(miniHS2.getBaseJdbcURL());
     testScriptFile( SCRIPT_TEXT, EXPECTED_PATTERN, true, argList);
   }
-  
+
   /**
    * Test Beeline -hivevar option. User can specify --hivevar name=value on Beeline command
line.
    * In the script, user should be able to use it in the form of ${name}, which will be substituted
with
@@ -884,4 +884,22 @@ public class TestBeeLineWithArgs {
     argList.add("--outputformat=tsv2");
     testScriptFile(SCRIPT_TEXT, EXPECTED_PATTERN, true, argList);
   }
+
+  /**
+   * Attempt to execute a simple script file with the usage of user & password variables
in URL.
+   * Test for presence of an expected pattern
+   * in the output (stdout or stderr), fail if not found
+   * Print PASSED or FAILED
+   */
+  @Test
+  public void testShowDbInPrompt() throws Throwable {
+    final String EXPECTED_PATTERN = " (default)>";
+    List<String> argList = new ArrayList<String>();
+    argList.add("--showDbInPrompt");
+    argList.add("-u");
+    argList.add(miniHS2.getBaseJdbcURL() + ";user=hivetest;password=hive");
+    String SCRIPT_TEXT = "select current_user();";
+
+    testScriptFile( SCRIPT_TEXT, EXPECTED_PATTERN, true, argList);
+  }
 }

http://git-wip-us.apache.org/repos/asf/hive/blob/dcfc31b8/jdbc/src/java/org/apache/hive/jdbc/Utils.java
----------------------------------------------------------------------
diff --git a/jdbc/src/java/org/apache/hive/jdbc/Utils.java b/jdbc/src/java/org/apache/hive/jdbc/Utils.java
index 7ea6309..3161566 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/Utils.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/Utils.java
@@ -266,6 +266,10 @@ public class Utils {
     throw new HiveSQLException(status);
   }
 
+  public static JdbcConnectionParams parseURL(String uri) throws JdbcUriParseException,
+          SQLException, ZooKeeperHiveClientException {
+    return parseURL(uri, new Properties());
+  }
   /**
    * Parse JDBC connection URL
    * The new format of the URL is:


Mime
View raw message