You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ke...@apache.org on 2013/03/21 18:06:19 UTC
svn commit: r1459401 - in /hive/trunk: eclipse-templates/.classpath
jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java
Author: kevinwilfong
Date: Thu Mar 21 17:06:18 2013
New Revision: 1459401
URL: http://svn.apache.org/r1459401
Log:
HIVE-4188. TestJdbcDriver2.testDescribeTable failing consistently. (Prasad Mujumdar via kevinwilfong)
Modified:
hive/trunk/eclipse-templates/.classpath
hive/trunk/jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java
Modified: hive/trunk/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/.classpath?rev=1459401&r1=1459400&r2=1459401&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/.classpath (original)
+++ hive/trunk/eclipse-templates/.classpath Thu Mar 21 17:06:18 2013
@@ -45,6 +45,7 @@
<classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/oro-2.0.8.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/servlet-api-2.5-6.1.14.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/xmlenc-0.52.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/guava-@guava-hadoop20.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/avro-@avro.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/avro-mapred-@avro.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/jline-@jline.version@.jar"/>
@@ -57,7 +58,6 @@
<classpathentry kind="lib" path="build/ivy/lib/default/commons-logging-api-@commons-logging-api.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/commons-io-@commons-io.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/derby-@derby.version@.jar"/>
- <classpathentry kind="lib" path="build/ivy/lib/default/guava-@guava-hadoop20.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/hbase-@hbase.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/hbase-@hbase.version@-tests.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/libfb303-@libfb303.version@.jar"/>
@@ -88,10 +88,12 @@
<classpathentry kind="lib" path="build/ivy/lib/default/mockito-all-@mockito-all.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/stringtemplate-@stringtemplate.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/snappy-@snappy.version@.jar"/>
+ <classpathentry kind="lib" path="build/beeline/hive-beeline-@HIVE_VERSION@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/tempus-fugit-@tempus-fugit.version@.jar"/>
<classpathentry kind="lib" path="build/builtins/hive-builtins-@HIVE_VERSION@.jar"/>
<classpathentry kind="src" path="build/contrib/test/src"/>
<classpathentry kind="src" path="build/metastore/gen/antlr/gen-java"/>
+ <classpathentry kind="lib" path="build/testutils/hive-testutils-@HIVE_VERSION@.jar"/>
<classpathentry kind="src" path="build/ql/test/src"/>
<classpathentry kind="src" path="build/ql/gen/antlr/gen-java"/>
<classpathentry kind="src" path="beeline/src/java"/>
Modified: hive/trunk/jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java
URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java?rev=1459401&r1=1459400&r2=1459401&view=diff
==============================================================================
--- hive/trunk/jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java (original)
+++ hive/trunk/jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java Thu Mar 21 17:06:18 2013
@@ -811,17 +811,19 @@ public class TestJdbcDriver2 extends Tes
ResultSet res = stmt.executeQuery("describe " + tableName);
+ res.next(); // skip header 1
+ res.next(); // skip header 2
+
res.next();
- assertEquals("Column name 'under_col' not found", "under_col", res.getString(1));
+ assertEquals("Column name 'under_col' not found", "under_col", res.getString(1).trim());
assertEquals("Column type 'under_col' for column under_col not found", "int", res
- .getString(2));
+ .getString(2).trim());
res.next();
- assertEquals("Column name 'value' not found", "value", res.getString(1));
+ assertEquals("Column name 'value' not found", "value", res.getString(1).trim());
assertEquals("Column type 'string' for column key not found", "string", res
- .getString(2));
+ .getString(2).trim());
assertFalse("More results found than expected", res.next());
-
}
public void testDatabaseMetaData() throws SQLException {