xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #2939 from taosdata/hotfix/TD-1045-java-connector 

[TD-1045] fixbug java connector
This commit is contained in:
Shengliang Guan 2020-08-06 09:49:49 +08:00 committed by GitHub
parent 55dcfb48ef ec63aa2f2d
commit 61935939a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
View File

@ -97,7 +97,7 @@ public class TSDBJNIConnector {
this.taos = this.connectImp(host, port, dbName, user, password); this.taos = this.connectImp(host, port, dbName, user, password);
if (this.taos == TSDBConstants.JNI_NULL_POINTER) { if (this.taos == TSDBConstants.JNI_NULL_POINTER) {
throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg(null)), "", this.getErrCode(null)); throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg(0L)), "", this.getErrCode(0l));
} }
return true; return true;
@ -115,7 +115,7 @@ public class TSDBJNIConnector {
freeResultSet(taosResultSetPointer); freeResultSet(taosResultSetPointer);
} }
long pSql = 0l; Long pSql = 0l;
try { try {
pSql = this.executeQueryImp(sql.getBytes(TaosGlobalConfig.getCharset()), this.taos); pSql = this.executeQueryImp(sql.getBytes(TaosGlobalConfig.getCharset()), this.taos);
} catch (Exception e) { } catch (Exception e) {
@ -124,16 +124,11 @@ public class TSDBJNIConnector {
throw new SQLException(TSDBConstants.WrapErrMsg("Unsupported encoding")); throw new SQLException(TSDBConstants.WrapErrMsg("Unsupported encoding"));
} }
int code = this.getErrCode(pSql); int code = this.getErrCode(pSql);
if (code != 0) {
if (code < 0) {
affectedRows = -1; affectedRows = -1;
if (code == TSDBConstants.JNI_TDENGINE_ERROR) { String err_msg = this.getErrMsg(pSql);
this.freeResultSet(pSql); this.freeResultSet(pSql);
throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg(pSql)), "", this.getErrCode(pSql)); throw new SQLException(TSDBConstants.WrapErrMsg(err_msg), "", code);
} else {
this.freeResultSet(pSql);
throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode(pSql));
}
} }
// Try retrieving result set for the executed SQL using the current connection pointer. If the executed // Try retrieving result set for the executed SQL using the current connection pointer. If the executed
@ -151,20 +146,20 @@ public class TSDBJNIConnector {
/** /**
* Get recent error code by connection * Get recent error code by connection
*/ */
public int getErrCode(Long pSql) { public int getErrCode(long pSql) {
return Math.abs(this.getErrCodeImp(this.taos, pSql)); return this.getErrCodeImp(this.taos, pSql);
} }
private native int getErrCodeImp(long connection, Long pSql); private native int getErrCodeImp(long connection, long pSql);
/** /**
* Get recent error message by connection * Get recent error message by connection
*/ */
public String getErrMsg(Long pSql) { public String getErrMsg(long pSql) {
return this.getErrMsgImp(this.taos, pSql); return this.getErrMsgImp(pSql);
} }
private native String getErrMsgImp(long connection, Long pSql); private native String getErrMsgImp(long pSql);
/** /**
* Get resultset pointer * Get resultset pointer
@ -248,7 +243,7 @@ public class TSDBJNIConnector {
public void closeConnection() throws SQLException { public void closeConnection() throws SQLException {
int code = this.closeConnectionImp(this.taos); int code = this.closeConnectionImp(this.taos);
if (code < 0) { if (code < 0) {
throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode(null)); throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode(0l));
} else if (code == 0) { } else if (code == 0) {
this.taos = TSDBConstants.JNI_NULL_POINTER; this.taos = TSDBConstants.JNI_NULL_POINTER;
} else { } else {