diff --git a/example/jdbc/src/main/java/org/apache/iotdb/JDBCCharsetExample.java b/example/jdbc/src/main/java/org/apache/iotdb/JDBCCharsetExample.java index 79ae881e3017c..3ecb9c0564629 100644 --- a/example/jdbc/src/main/java/org/apache/iotdb/JDBCCharsetExample.java +++ b/example/jdbc/src/main/java/org/apache/iotdb/JDBCCharsetExample.java @@ -45,7 +45,7 @@ public static void main(String[] args) throws Exception { final IoTDBStatement statement = (IoTDBStatement) connection.createStatement()) { final String insertSQLWithGB18030 = - "insert into root.测试(timestamp, 维语, 彝语, 繁体, 蒙文, 简体, 标点符号, 藏语) values(1, 'ئۇيغۇر تىلى', 'ꆈꌠꉙ', \"繁體\", 'ᠮᠣᠩᠭᠣᠯ ᠬᠡᠯᠡ', '简体', '——?!', \"བོད་སྐད།\");"; + "insert into root.测试(timestamp, 彝语, 繁体, 蒙文, 简体, 标点符号, 藏语) values(1, 'ꆈꌠꉙ', \"繁體\", 'ᠮᠣᠩᠭᠣᠯ ᠬᠡᠯᠡ', '简体', '——?!', \"བོད་སྐད།\");"; final byte[] insertSQLWithGB18030Bytes = insertSQLWithGB18030.getBytes("GB18030"); statement.execute(insertSQLWithGB18030Bytes); } catch (IoTDBSQLException e) { diff --git a/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java b/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java index 60fa9c98373ca..ab6009343aa5d 100644 --- a/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java +++ b/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java @@ -377,7 +377,11 @@ public byte getByte(String columnName) throws SQLException { @Override public byte[] getBytes(int columnIndex) throws SQLException { try { - return ioTDBRpcDataSet.getDataType(columnIndex).equals(TSDataType.BLOB) + final TSDataType dataType = ioTDBRpcDataSet.getDataType(columnIndex); + if (dataType == null) { + return null; + } + return dataType.equals(TSDataType.BLOB) ? ioTDBRpcDataSet.getBinary(columnIndex).getValues() : ioTDBRpcDataSet.getString(columnIndex).getBytes(charset); } catch (StatementExecutionException e) { @@ -388,7 +392,11 @@ public byte[] getBytes(int columnIndex) throws SQLException { @Override public byte[] getBytes(String columnName) throws SQLException { try { - return ioTDBRpcDataSet.getDataType(columnName).equals(TSDataType.BLOB) + final TSDataType dataType = ioTDBRpcDataSet.getDataType(columnName); + if (dataType == null) { + return null; + } + return dataType.equals(TSDataType.BLOB) ? ioTDBRpcDataSet.getBinary(columnName).getValues() : ioTDBRpcDataSet.getString(columnName).getBytes(charset); } catch (StatementExecutionException e) { diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java index c32e310b65f4e..014c5eedae1f5 100644 --- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java +++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java @@ -528,7 +528,13 @@ public TSDataType getDataType(int columnIndex) throws StatementExecutionExceptio } public TSDataType getDataType(String columnName) throws StatementExecutionException { - return columnTypeDeduplicatedList.get(columnOrdinalMap.get(columnName) - START_INDEX); + if (columnName.equals(TIMESTAMP_STR)) { + return TSDataType.INT64; + } + final int index = columnOrdinalMap.get(columnName) - START_INDEX; + return index < 0 || index >= columnTypeDeduplicatedList.size() + ? null + : columnTypeDeduplicatedList.get(index); } public int findColumn(String columnName) {