Skip to content

H
h2database
提交 ac6b7643 authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov
浏览文件
操作

Use one common null check in PgServerThread.writeDataColumn()

上级 0200afe4
隐藏空白字符变更
内嵌 并排
正在显示 包含 71 行增加 和 113 行删除
h2/src/main/org/h2/jdbc/JdbcResultSet.java
浏览文件 @ ac6b7643
...@@ -3222,7 +3222,14 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS ...@@ -3222,7 +3222,14 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
} }
} }
private Value get(int columnIndex) { /**
* INTERNAL
*
* @param columnIndex
* index of a column
* @return internal representation of the value in the specified column
*/
public Value get(int columnIndex) {
checkColumnIndex(columnIndex); checkColumnIndex(columnIndex);
checkOnValidRow(); checkOnValidRow();
Value[] list; Value[] list;
......
h2/src/main/org/h2/server/pg/PgServerThread.java
浏览文件 @ ac6b7643
...@@ -40,6 +40,7 @@ import org.h2.engine.ConnectionInfo; ...@@ -40,6 +40,7 @@ import org.h2.engine.ConnectionInfo;
import org.h2.engine.SysProperties; import org.h2.engine.SysProperties;
import org.h2.jdbc.JdbcConnection; import org.h2.jdbc.JdbcConnection;
import org.h2.jdbc.JdbcPreparedStatement; import org.h2.jdbc.JdbcPreparedStatement;
import org.h2.jdbc.JdbcResultSet;
import org.h2.jdbc.JdbcStatement; import org.h2.jdbc.JdbcStatement;
import org.h2.message.DbException; import org.h2.message.DbException;
import org.h2.mvstore.DataUtils; import org.h2.mvstore.DataUtils;
...@@ -49,6 +50,8 @@ import org.h2.util.ScriptReader; ...@@ -49,6 +50,8 @@ import org.h2.util.ScriptReader;
import org.h2.util.StringUtils; import org.h2.util.StringUtils;
import org.h2.util.Utils; import org.h2.util.Utils;
import org.h2.value.CaseInsensitiveMap; import org.h2.value.CaseInsensitiveMap;
import org.h2.value.Value;
import org.h2.value.ValueNull;
/** /**
* One server thread is opened for each client. * One server thread is opened for each client.
...@@ -534,146 +537,94 @@ public class PgServerThread implements Runnable { ...@@ -534,146 +537,94 @@ public class PgServerThread implements Runnable {
private void writeDataColumn(ResultSet rs, int column, int pgType, boolean text) private void writeDataColumn(ResultSet rs, int column, int pgType, boolean text)
throws Exception { throws Exception {
Value v = ((JdbcResultSet) rs).get(column);
if (v == ValueNull.INSTANCE) {
writeInt(-1);
return;
}
if (text) { if (text) {
// plain text // plain text
switch (pgType) { switch (pgType) {
case PgServer.PG_TYPE_BOOL: { case PgServer.PG_TYPE_BOOL:
boolean b = rs.getBoolean(column); writeInt(1);
if (rs.wasNull()) { dataOut.writeByte(v.getBoolean() ? 't' : 'f');
writeInt(-1);
} else {
writeInt(1);
dataOut.writeByte(b ? 't' : 'f');
}
break; break;
}
default: default:
String s = rs.getString(column); byte[] data = v.getString().getBytes(getEncoding());
if (s == null) { writeInt(data.length);
writeInt(-1); write(data);
} else {
byte[] data = s.getBytes(getEncoding());
writeInt(data.length);
write(data);
}
} }
} else { } else {
// binary // binary
switch (pgType) { switch (pgType) {
case PgServer.PG_TYPE_INT2: { case PgServer.PG_TYPE_INT2:
short s = rs.getShort(column); writeInt(2);
if (rs.wasNull()) { writeShort(v.getShort());
writeInt(-1);
} else {
writeInt(2);
writeShort(s);
}
break; break;
} case PgServer.PG_TYPE_INT4:
case PgServer.PG_TYPE_INT4: { writeInt(4);
int i = rs.getInt(column); writeInt(v.getInt());
if (rs.wasNull()) {
writeInt(-1);
} else {
writeInt(4);
writeInt(i);
}
break; break;
} case PgServer.PG_TYPE_INT8:
case PgServer.PG_TYPE_INT8: { writeInt(8);
long l = rs.getLong(column); dataOut.writeLong(v.getLong());
if (rs.wasNull()) {
writeInt(-1);
} else {
writeInt(8);
dataOut.writeLong(l);
}
break; break;
} case PgServer.PG_TYPE_FLOAT4:
case PgServer.PG_TYPE_FLOAT4: { writeInt(4);
float f = rs.getFloat(column); dataOut.writeFloat(v.getFloat());
if (rs.wasNull()) {
writeInt(-1);
} else {
writeInt(4);
dataOut.writeFloat(f);
}
break; break;
} case PgServer.PG_TYPE_FLOAT8:
case PgServer.PG_TYPE_FLOAT8: { writeInt(8);
double d = rs.getDouble(column); dataOut.writeDouble(v.getDouble());
if (rs.wasNull()) {
writeInt(-1);
} else {
writeInt(8);
dataOut.writeDouble(d);
}
break; break;
}
case PgServer.PG_TYPE_BYTEA: { case PgServer.PG_TYPE_BYTEA: {
byte[] data = rs.getBytes(column); byte[] data = v.getBytesNoCopy();
if (data == null) { writeInt(data.length);
writeInt(-1); write(data);
} else {
writeInt(data.length);
write(data);
}
break; break;
} }
case PgServer.PG_TYPE_DATE: { case PgServer.PG_TYPE_DATE: {
Date d = rs.getDate(column); Date d = v.getDate();
if (d == null) { writeInt(4);
writeInt(-1); long millis = d.getTime();
} else { millis += TimeZone.getDefault().getOffset(millis);
writeInt(4); writeInt((int) (toPostgreSeconds(millis) / 86400));
long millis = d.getTime();
millis += TimeZone.getDefault().getOffset(millis);
writeInt((int) (toPostgreSeconds(millis) / 86400));
}
break; break;
} }
case PgServer.PG_TYPE_TIME: { case PgServer.PG_TYPE_TIME: {
Time t = rs.getTime(column); Time t = v.getTime();
if (t == null) { writeInt(8);
writeInt(-1); long m = t.getTime();
m += TimeZone.getDefault().getOffset(m);
if (INTEGER_DATE_TYPES) {
// long format
m *= 1000;
} else { } else {
writeInt(8); // double format
long m = t.getTime(); m /= 1000;
m += TimeZone.getDefault().getOffset(m); m = Double.doubleToLongBits(m);
if (INTEGER_DATE_TYPES) {
// long format
m *= 1000;
} else {
// double format
m /= 1000;
m = Double.doubleToLongBits(m);
}
dataOut.writeLong(m);
} }
dataOut.writeLong(m);
break; break;
} }
case PgServer.PG_TYPE_TIMESTAMP_NO_TMZONE: { case PgServer.PG_TYPE_TIMESTAMP_NO_TMZONE: {
Timestamp t = rs.getTimestamp(column); Timestamp t = v.getTimestamp();
if (t == null) { writeInt(8);
writeInt(-1); long m = t.getTime();
m += TimeZone.getDefault().getOffset(m);
m = toPostgreSeconds(m);
int nanos = t.getNanos();
if (m < 0 && nanos != 0) {
m--;
}
if (INTEGER_DATE_TYPES) {
// long format
m = m * 1000000 + nanos / 1000;
} else { } else {
writeInt(8); // double format
long m = t.getTime(); m = Double.doubleToLongBits(m + nanos * 0.000000001);
m += TimeZone.getDefault().getOffset(m);
m = toPostgreSeconds(m);
int nanos = t.getNanos();
if (m < 0 && nanos != 0) {
m--;
}
if (INTEGER_DATE_TYPES) {
// long format
m = m * 1000000 + nanos / 1000;
} else {
// double format
m = Double.doubleToLongBits(m + nanos * 0.000000001);
}
dataOut.writeLong(m);
} }
dataOut.writeLong(m);
break; break;
} }
default: throw new IllegalStateException("output binary format is undefined"); default: throw new IllegalStateException("output binary format is undefined");
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论