Merge branch 'develop' into hotfix/sangshuduo/TD-3147-insert-rate-mor…

…e-than-1s
taosdata · Mar 5, 2021 · 45cc4ca · 45cc4ca
2 parents 42e8a73 + b694b2c
commit 45cc4ca
Show file tree

Hide file tree

Showing 34 changed files with 503 additions and 238 deletions.
diff --git a/cmake/install.inc b/cmake/install.inc
@@ -32,7 +32,7 @@ ELSEIF (TD_WINDOWS)
   #INSTALL(TARGETS taos RUNTIME DESTINATION driver)
   #INSTALL(TARGETS shell RUNTIME DESTINATION .)
   IF (TD_MVN_INSTALLED)
-    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.20-dist.jar DESTINATION connector/jdbc)
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.21-dist.jar DESTINATION connector/jdbc)
   ENDIF ()
 ELSEIF (TD_DARWIN)
   SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")

diff --git a/src/connector/jdbc/CMakeLists.txt b/src/connector/jdbc/CMakeLists.txt
@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
   ADD_CUSTOM_COMMAND(OUTPUT ${JDBC_CMD_NAME}
     POST_BUILD
     COMMAND mvn -Dmaven.test.skip=true install -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.20-dist.jar ${LIBRARY_OUTPUT_PATH}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.21-dist.jar ${LIBRARY_OUTPUT_PATH}
     COMMAND mvn -Dmaven.test.skip=true clean -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
     COMMENT "build jdbc driver")
   ADD_CUSTOM_TARGET(${JDBC_TARGET_NAME} ALL WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} DEPENDS ${JDBC_CMD_NAME})

diff --git a/src/connector/jdbc/deploy-pom.xml b/src/connector/jdbc/deploy-pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>2.0.20</version>
+  <version>2.0.21</version>
   <packaging>jar</packaging>
 
   <name>JDBCDriver</name>

diff --git a/src/connector/jdbc/pom.xml b/src/connector/jdbc/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.taosdata.jdbc</groupId>
     <artifactId>taos-jdbcdriver</artifactId>
-    <version>2.0.20</version>
+    <version>2.0.21</version>
     <packaging>jar</packaging>
     <name>JDBCDriver</name>
     <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>

diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
@@ -308,7 +308,7 @@ public int findColumn(String columnLabel) throws SQLException {
                 return colMetaData.getColIndex() + 1;
             }
         }
-        throw new SQLException(TSDBConstants.INVALID_VARIABLES);
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
     }
 
     @Override

diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java
@@ -14,16 +14,13 @@
  *****************************************************************************/
 package com.taosdata.jdbc;
 
+import java.sql.SQLException;
+import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
 
 public abstract class TSDBConstants {
 
-    public static final String STATEMENT_CLOSED = "statement is closed";
-    public static final String UNSUPPORTED_METHOD_EXCEPTION_MSG = "this operation is NOT supported currently!";
-    public static final String INVALID_VARIABLES = "invalid variables";
-    public static final String RESULT_SET_IS_CLOSED = "resultSet is closed";
-
     public static final String DEFAULT_PORT = "6200";
     public static Map<Integer, String> DATATYPE_MAP = null;
 
@@ -77,8 +74,65 @@ public static String FixErrMsg(int code) {
         return WrapErrMsg("unkown error!");
     }
 
+    public static int taosType2JdbcType(int taosType) throws SQLException {
+        switch (taosType) {
+            case TSDBConstants.TSDB_DATA_TYPE_NULL:
+                return Types.NULL;
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+                return Types.BOOLEAN;
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+                return Types.TINYINT;
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+                return Types.SMALLINT;
+            case TSDBConstants.TSDB_DATA_TYPE_INT:
+                return Types.INTEGER;
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+                return Types.BIGINT;
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+                return Types.FLOAT;
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
+                return Types.DOUBLE;
+            case TSDBConstants.TSDB_DATA_TYPE_BINARY:
+                return Types.BINARY;
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
+                return Types.TIMESTAMP;
+            case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
+                return Types.NCHAR;
+        }
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE);
+    }
+
+    public static int jdbcType2TaosType(int jdbcType) throws SQLException {
+        switch (jdbcType){
+            case Types.NULL:
+                return TSDBConstants.TSDB_DATA_TYPE_NULL;
+            case Types.BOOLEAN:
+                return TSDBConstants.TSDB_DATA_TYPE_BOOL;
+            case Types.TINYINT:
+                return TSDBConstants.TSDB_DATA_TYPE_TINYINT;
+            case Types.SMALLINT:
+                return TSDBConstants.TSDB_DATA_TYPE_SMALLINT;
+            case Types.INTEGER:
+                return TSDBConstants.TSDB_DATA_TYPE_INT;
+            case Types.BIGINT:
+                return TSDBConstants.TSDB_DATA_TYPE_BIGINT;
+            case Types.FLOAT:
+                return TSDBConstants.TSDB_DATA_TYPE_FLOAT;
+            case Types.DOUBLE:
+                return TSDBConstants.TSDB_DATA_TYPE_DOUBLE;
+            case Types.BINARY:
+                return TSDBConstants.TSDB_DATA_TYPE_BINARY;
+            case Types.TIMESTAMP:
+                return TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP;
+            case Types.NCHAR:
+                return TSDBConstants.TSDB_DATA_TYPE_NCHAR;
+        }
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE);
+    }
+
     static {
         DATATYPE_MAP = new HashMap<>();
+        DATATYPE_MAP.put(0, "NULL");
         DATATYPE_MAP.put(1, "BOOL");
         DATATYPE_MAP.put(2, "TINYINT");
         DATATYPE_MAP.put(3, "SMALLINT");
@@ -90,4 +144,8 @@ public static String FixErrMsg(int code) {
         DATATYPE_MAP.put(9, "TIMESTAMP");
         DATATYPE_MAP.put(10, "NCHAR");
     }
+
+    public static String jdbcType2TaosTypeName(int type) throws SQLException {
+        return DATATYPE_MAP.get(jdbcType2TaosType(type));
+    }
 }
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
@@ -18,6 +18,7 @@ public class TSDBErrorNumbers {
     public static final int ERROR_INVALID_FOR_EXECUTE = 0x230c;         //not a valid sql for execute: (SQL)
     public static final int ERROR_PARAMETER_INDEX_OUT_RANGE = 0x230d; // parameter index out of range
     public static final int ERROR_SQLCLIENT_EXCEPTION_ON_CONNECTION_CLOSED = 0x230e;    // connection already closed
+    public static final int ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE = 0x230f;        //unknown sql type in tdengine
 
     public static final int ERROR_UNKNOWN = 0x2350;    //unknown error
 
@@ -49,6 +50,7 @@ public class TSDBErrorNumbers {
         errorNumbers.add(ERROR_INVALID_FOR_EXECUTE);
         errorNumbers.add(ERROR_PARAMETER_INDEX_OUT_RANGE);
         errorNumbers.add(ERROR_SQLCLIENT_EXCEPTION_ON_CONNECTION_CLOSED);
+        errorNumbers.add(ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE);
 
         /*****************************************************/
         errorNumbers.add(ERROR_SUBSCRIBE_FAILED);

diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetMetaData.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetMetaData.java
@@ -20,22 +20,14 @@
 import java.sql.Types;
 import java.util.List;
 
-public class TSDBResultSetMetaData implements ResultSetMetaData {
+public class TSDBResultSetMetaData extends WrapperImpl implements ResultSetMetaData {
 
 	List<ColumnMetaData> colMetaDataList = null;
 
 	public TSDBResultSetMetaData(List<ColumnMetaData> metaDataList) {
 		this.colMetaDataList = metaDataList;
 	}
 
-	public <T> T unwrap(Class<T> iface) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
-	}
-
-	public boolean isWrapperFor(Class<?> iface) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
-	}
-
 	public int getColumnCount() throws SQLException {
 		return colMetaDataList.size();
 	}
@@ -94,7 +86,7 @@ public String getColumnName(int column) throws SQLException {
 	}
 
 	public String getSchemaName(int column) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
+		throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
 	}
 
 	public int getPrecision(int column) throws SQLException {
@@ -125,18 +117,18 @@ public int getScale(int column) throws SQLException {
 	}
 
 	public String getTableName(int column) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
+		throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
 	}
 
 	public String getCatalogName(int column) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
+		throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
 	}
 
 	public int getColumnType(int column) throws SQLException {
 		ColumnMetaData meta = this.colMetaDataList.get(column - 1);
 		switch (meta.getColType()) {
 		case TSDBConstants.TSDB_DATA_TYPE_BOOL:
-			return java.sql.Types.BIT;
+			return Types.BOOLEAN;
 		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
 			return java.sql.Types.TINYINT;
 		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
@@ -150,13 +142,13 @@ public int getColumnType(int column) throws SQLException {
 		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
 			return java.sql.Types.DOUBLE;
 		case TSDBConstants.TSDB_DATA_TYPE_BINARY:
-			return java.sql.Types.CHAR;
+			return Types.BINARY;
 		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
-			return java.sql.Types.BIGINT;
+			return java.sql.Types.TIMESTAMP;
 		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
-			return java.sql.Types.CHAR;
+			return Types.NCHAR;
 		}
-		throw new SQLException(TSDBConstants.INVALID_VARIABLES);
+		throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
 	}
 
 	public String getColumnTypeName(int column) throws SQLException {
@@ -173,7 +165,7 @@ public boolean isWritable(int column) throws SQLException {
 	}
 
 	public boolean isDefinitelyWritable(int column) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
+		throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
 	}
 
 	public String getColumnClassName(int column) throws SQLException {

diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetWrapper.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetWrapper.java
@@ -1153,11 +1153,11 @@ public void updateNClob(String columnLabel, Reader reader) throws SQLException {
     }
 
     public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
-        throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
     }
 
     public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
-        throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
     }
 
     @Override

diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java
@@ -14,12 +14,11 @@
  *****************************************************************************/
 package com.taosdata.jdbc;
 
-import javax.management.OperationsException;
 import java.sql.SQLException;
 
 public class TSDBSubscribe {
-    private TSDBJNIConnector connecter = null;
-    private long id = 0;
+    private final TSDBJNIConnector connecter;
+    private final long id;
 
     TSDBSubscribe(TSDBJNIConnector connecter, long id) throws SQLException {
         if (null != connecter) {