Author: thejas
Date: Thu Sep 25 23:19:53 2014
New Revision: 1627680
URL: http://svn.apache.org/r1627680
Log:
HIVE-7107 : Fix HiveServer1 JDBC Driver spec compliancy issue (Lars Francke via
Thejas Nair)
Modified:
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDriver.java
Modified:
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
URL:
http://svn.apache.org/viewvc/hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java?rev=1627680&r1=1627679&r2=1627680&view=diff
==============================================================================
---
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
(original)
+++
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
Thu Sep 25 23:19:53 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/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDriver.java
URL:
http://svn.apache.org/viewvc/hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDriver.java?rev=1627680&r1=1627679&r2=1627680&view=diff
==============================================================================
--- hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDriver.java
(original)
+++ hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDriver.java Thu
Sep 25 23:19:53 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;
}
/**
