From 4c838b2504f9fca2c81d89616de85ce6b37c23ba Mon Sep 17 00:00:00 2001 From: Yuming Wang Date: Thu, 8 Aug 2019 00:30:29 +0800 Subject: [PATCH] Port HIVE-10646 --- .../thriftserver/SparkThriftServerProtocolVersionsSuite.scala | 3 +-- .../src/main/java/org/apache/hive/service/cli/ColumnValue.java | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/SparkThriftServerProtocolVersionsSuite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/SparkThriftServerProtocolVersionsSuite.scala index e33e42f3cc8c..f30efe0488be 100644 --- a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/SparkThriftServerProtocolVersionsSuite.scala +++ b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/SparkThriftServerProtocolVersionsSuite.scala @@ -245,8 +245,7 @@ class SparkThriftServerProtocolVersionsSuite extends HiveThriftJdbcTest { } } - // TODO: enable this test case after port HIVE-10646 - ignore(s"$version get void") { + test(s"$version get void") { testExecuteStatementWithProtocolVersion(version, "SELECT null") { rs => assert(rs.next()) assert(rs.getString(1) === null) diff --git a/sql/hive-thriftserver/v1.2.1/src/main/java/org/apache/hive/service/cli/ColumnValue.java b/sql/hive-thriftserver/v1.2.1/src/main/java/org/apache/hive/service/cli/ColumnValue.java index 40144cfe33fa..662bd9315e8e 100644 --- a/sql/hive-thriftserver/v1.2.1/src/main/java/org/apache/hive/service/cli/ColumnValue.java +++ b/sql/hive-thriftserver/v1.2.1/src/main/java/org/apache/hive/service/cli/ColumnValue.java @@ -202,6 +202,8 @@ public static TColumnValue toTColumnValue(Type type, Object value) { case UNION_TYPE: case USER_DEFINED_TYPE: return stringValue((String)value); + case NULL_TYPE: + return stringValue((String)value); default: return null; }