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

[TD-225] fix memory leaks.

This commit is contained in:
Haojun Liao 2020-11-18 18:58:50 +08:00
parent 07bd21e6c6
commit 65e904b7a7
1 changed files with 46 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

237
src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java
View File

@ -224,11 +224,19 @@ public class TSDBResultSetBlockData {
} }
private boolean isBinaryNull(byte[] val, int length) { private boolean isBinaryNull(byte[] val, int length) {
return val[0] == 0xFF && length == 1; if (length != 1) {
return false;
}
return val[0] == 0xFF;
} }
private boolean isNcharNull(byte[] val, int length) { private boolean isNcharNull(byte[] val, int length) {
return (val[0] & val[1] & val[2] & val[3]) == 0xFF && length == 4; if (length != 4) {
return false;
}
return (val[0] & val[1] & val[2] & val[3]) == 0xFF ;
} }
public int getInt(int col) { public int getInt(int col) {
@ -304,109 +312,32 @@ public class TSDBResultSetBlockData {
} }
public long getLong(int col) throws SQLException { public long getLong(int col) throws SQLException {
int fieldSize = this.columnMetaDataList.get(col).getColSize(); Object obj = get(col);
ByteBuffer bb = (ByteBuffer) this.colData.get(col); if (obj == null) {
return 0;
switch (this.columnMetaDataList.get(col).getColType()) {
case TSDBConstants.TSDB_DATA_TYPE_BOOL: {
byte val = bb.get(this.rowIndex);
if (isBooleanNull(val)) {
return 0;
}
return (val == 0x0) ? 0 : 1;
}
case TSDBConstants.TSDB_DATA_TYPE_TINYINT: {
byte val = bb.get(this.rowIndex);
if (isTinyIntNull(val)) {
return 0;
}
return val;
}
case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
ShortBuffer sb = (ShortBuffer) this.colData.get(col);
short val = sb.get(this.rowIndex);
if (isSmallIntNull(val)) {
return 0;
}
return val;
} }
int type = this.columnMetaDataList.get(col).getColType();
switch (type) {
case TSDBConstants.TSDB_DATA_TYPE_BOOL:
case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
case TSDBConstants.TSDB_DATA_TYPE_INT: { case TSDBConstants.TSDB_DATA_TYPE_INT: {
IntBuffer ib = (IntBuffer) this.colData.get(col); return (int) obj;
int val = ib.get(this.rowIndex); }
if (isIntNull(val)) { case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
return 0; case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
} return (long) obj;
return val;
}
case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
LongBuffer lb = (LongBuffer) this.colData.get(col);
long val = lb.get(this.rowIndex);
if (isBigIntNull(val)) {
return 0;
}
return (long) val;
}
case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
FloatBuffer fb = (FloatBuffer) this.colData.get(col);
float val = fb.get(this.rowIndex);
if (isFloatNull(val)) {
return 0;
}
return (long) val;
} }
case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: { case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
DoubleBuffer lb = (DoubleBuffer) this.colData.get(col); return ((Double) obj).longValue();
double val = lb.get(this.rowIndex);
if (isDoubleNull(val)) {
return 0;
}
return (long) val;
} }
case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
case TSDBConstants.TSDB_DATA_TYPE_BINARY: { case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
bb.position(fieldSize * this.rowIndex); return Long.parseLong((String) obj);
int length = bb.getShort();
byte[] dest = new byte[length];
bb.get(dest, 0, length);
if (isBinaryNull(dest, length)) {
return 0;
}
return Long.parseLong(new String(dest));
}
case TSDBConstants.TSDB_DATA_TYPE_NCHAR: {
bb.position(fieldSize * this.rowIndex);
int length = bb.getShort();
byte[] dest = new byte[length];
bb.get(dest, 0, length);
if (isNcharNull(dest, length)) {
return 0;
}
try {
return Long.parseLong(new String(dest, TaosGlobalConfig.getCharset()));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
} }
} }
@ -424,109 +355,32 @@ public class TSDBResultSetBlockData {
} }
public double getDouble(int col) { public double getDouble(int col) {
int fieldSize = this.columnMetaDataList.get(col).getColSize(); Object obj = get(col);
ByteBuffer bb = (ByteBuffer) this.colData.get(col); if (obj == null) {
return 0;
switch (this.columnMetaDataList.get(col).getColType()) {
case TSDBConstants.TSDB_DATA_TYPE_BOOL: {
byte val = bb.get(this.rowIndex);
if (isBooleanNull(val)) {
return 0;
}
return (val == 0x0) ? 0 : 1;
}
case TSDBConstants.TSDB_DATA_TYPE_TINYINT: {
byte val = bb.get(this.rowIndex);
if (isTinyIntNull(val)) {
return 0;
}
return val;
}
case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
ShortBuffer sb = (ShortBuffer) this.colData.get(col);
short val = sb.get(this.rowIndex);
if (isSmallIntNull(val)) {
return 0;
}
return val;
} }
int type = this.columnMetaDataList.get(col).getColType();
switch (type) {
case TSDBConstants.TSDB_DATA_TYPE_BOOL:
case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
case TSDBConstants.TSDB_DATA_TYPE_INT: { case TSDBConstants.TSDB_DATA_TYPE_INT: {
IntBuffer ib = (IntBuffer) this.colData.get(col); return (int) obj;
int val = ib.get(this.rowIndex); }
if (isIntNull(val)) { case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
return 0; case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
} return (long) obj;
return val;
}
case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
LongBuffer lb = (LongBuffer) this.colData.get(col);
long val = lb.get(this.rowIndex);
if (isBigIntNull(val)) {
return 0;
}
return (long) val;
}
case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
FloatBuffer fb = (FloatBuffer) this.colData.get(col);
float val = fb.get(this.rowIndex);
if (isFloatNull(val)) {
return 0;
}
return (long) val;
} }
case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: { case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
DoubleBuffer lb = (DoubleBuffer) this.colData.get(col); return (double) obj;
double val = lb.get(this.rowIndex);
if (isDoubleNull(val)) {
return 0;
}
return (long) val;
} }
case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
case TSDBConstants.TSDB_DATA_TYPE_BINARY: { case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
bb.position(fieldSize * this.rowIndex); return Double.parseDouble((String) obj);
int length = bb.getShort();
byte[] dest = new byte[length];
bb.get(dest, 0, length);
if (isBinaryNull(dest, length)) {
return 0;
}
return Double.parseDouble(new String(dest));
}
case TSDBConstants.TSDB_DATA_TYPE_NCHAR: {
bb.position(fieldSize * this.rowIndex);
int length = bb.getShort();
byte[] dest = new byte[length];
bb.get(dest, 0, length);
if (isNcharNull(dest, length)) {
return 0;
}
try {
return Double.parseDouble(new String(dest, TaosGlobalConfig.getCharset()));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
} }
} }
@ -638,7 +492,8 @@ public class TSDBResultSetBlockData {
} }
try { try {
return new String(dest, TaosGlobalConfig.getCharset()); String ss = TaosGlobalConfig.getCharset();
return new String(dest, ss);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();
} }