You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2014/09/26 01:31:39 UTC

svn commit: r1627681 - in /hive/branches/branch-0.14: itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDriver.java

Author: thejas
Date: Thu Sep 25 23:31:39 2014
New Revision: 1627681

URL: http://svn.apache.org/r1627681
Log:
HIVE-7107 : Fix HiveServer1 JDBC Driver spec compliancy issue (Lars Francke via Thejas Nair)

Modified:
    hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
    hive/branches/branch-0.14/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDriver.java

Modified: hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java?rev=1627681&r1=1627680&r2=1627681&view=diff
==============================================================================
--- hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java (original)
+++ hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java Thu Sep 25 23:31:39 2014
@@ -1115,6 +1115,12 @@ public class TestJdbcDriver extends Test
 
   }
 
+  public void testInvalidUrl() throws SQLException {
+    HiveDriver driver = new HiveDriver();
+
+    assertNull(driver.connect("jdbc:hive2://localhost:1000", null));
+  }
+
   private static void assertDpi(DriverPropertyInfo dpi, String name,
       String value) {
     assertEquals("Invalid DriverPropertyInfo name", name, dpi.name);

Modified: hive/branches/branch-0.14/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDriver.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDriver.java?rev=1627681&r1=1627680&r2=1627681&view=diff
==============================================================================
--- hive/branches/branch-0.14/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDriver.java (original)
+++ hive/branches/branch-0.14/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDriver.java Thu Sep 25 23:31:39 2014
@@ -102,8 +102,9 @@ public class HiveDriver implements Drive
     return Pattern.matches(URL_PREFIX + ".*", url);
   }
 
+  @Override
   public Connection connect(String url, Properties info) throws SQLException {
-    return new HiveConnection(url, info);
+    return acceptsURL(url) ? new HiveConnection(url, info) : null;
   }
 
   /**