You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2021/10/13 14:31:52 UTC
[phoenix] branch 4.x updated: PHOENIX-6568 NullPointerException in
phoenix-queryserver-client not in phoenix-client-hbase
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new d2dbd81 PHOENIX-6568 NullPointerException in phoenix-queryserver-client not in phoenix-client-hbase
d2dbd81 is described below
commit d2dbd8112633cc126464537d69fe6a5c7697788f
Author: Istvan Toth <st...@apache.org>
AuthorDate: Wed Oct 13 13:54:02 2021 +0200
PHOENIX-6568 NullPointerException in phoenix-queryserver-client not in phoenix-client-hbase
return "NULL" instead of null in ResultSetMetaData.getColumnTypeName() for null type
---
.../java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java | 2 +-
.../org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java
index 8ecb52c..b1d42dc 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java
@@ -117,7 +117,7 @@ public class PhoenixResultSetMetaData implements ResultSetMetaData {
@Override
public String getColumnTypeName(int column) throws SQLException {
PDataType type = rowProjector.getColumnProjector(column-1).getExpression().getDataType();
- return type == null ? null : type.getSqlTypeName();
+ return type == null ? "NULL" : type.getSqlTypeName();
}
@Override
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java
index 17b3794..5653b7c 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java
@@ -24,7 +24,6 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import org.apache.phoenix.query.BaseConnectionlessQueryTest;
-import org.apache.phoenix.query.QueryConstants;
import org.junit.Test;
public class PhoenixResultSetMetadataTest extends BaseConnectionlessQueryTest {
@@ -42,4 +41,12 @@ public class PhoenixResultSetMetadataTest extends BaseConnectionlessQueryTest {
assertEquals(conn.unwrap(PhoenixConnection.class).getDatePattern().length(), rs.getMetaData().getColumnDisplaySize(4));
assertEquals(40, rs.getMetaData().getColumnDisplaySize(5));
}
+
+ @Test
+ public void testNullTypeName() throws Exception {
+ Connection conn = DriverManager.getConnection(getUrl());
+ ResultSet rs = conn.createStatement().executeQuery("select null");
+
+ assertEquals("NULL", rs.getMetaData().getColumnTypeName(1));
+ }
}