Skip to content

H
h2database
Unverified 提交 db3622d0 authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov 提交者： GitHub
浏览文件
操作

Merge pull request #1690 from katzyn/value 

Use own constants for value types in storage backends and Transfer
上级 c0d55ffd 77d45c9c
隐藏空白字符变更
内嵌 并排
正在显示 包含 321 行增加 和 233 行删除
h2/src/docsrc/html/changelog.html
浏览文件 @ db3622d0
......@@ -21,6 +21,12 @@ Change Log
<h2>Next Version (unreleased)</h2>
<ul>
<li>Issue #1689: Use separate constants for data types in Data, ValueDataType, and Transfer
</li>
<li>PR #1687: MVMap minor cleanup
</li>
<li>PR #1686: Fix a regression with ENUM data type
</li>
<li>PR #1685: Fix CHAR in PostgreSQL mode and refactor some code
</li>
<li>Issue #1681: IN () doesn't work with row values when data types are not exactly the same
......
h2/src/main/org/h2/mvstore/db/ValueDataType.java
浏览文件 @ db3622d0
......@@ -60,22 +60,44 @@ import org.h2.value.ValueUuid;
*/
public class ValueDataType implements DataType {
/**
* Storage type for ValueRow.
*/
private static final int ROW = 27;
private static final int INT_0_15 = 32;
private static final int LONG_0_7 = 48;
private static final int DECIMAL_0_1 = 56;
private static final int DECIMAL_SMALL_0 = 58;
private static final int DECIMAL_SMALL = 59;
private static final int DOUBLE_0_1 = 60;
private static final int FLOAT_0_1 = 62;
private static final int BOOLEAN_FALSE = 64;
private static final int BOOLEAN_TRUE = 65;
private static final int INT_NEG = 66;
private static final int LONG_NEG = 67;
private static final int STRING_0_31 = 68;
private static final byte NULL = 0;
private static final byte BYTE = 2;
private static final byte SHORT = 3;
private static final byte INT = 4;
private static final byte LONG = 5;
private static final byte DECIMAL = 6;
private static final byte DOUBLE = 7;
private static final byte FLOAT = 8;
private static final byte TIME = 9;
private static final byte DATE = 10;
private static final byte TIMESTAMP = 11;
private static final byte BYTES = 12;
private static final byte STRING = 13;
private static final byte STRING_IGNORECASE = 14;
private static final byte BLOB = 15;
private static final byte CLOB = 16;
private static final byte ARRAY = 17;
private static final byte RESULT_SET = 18;
private static final byte JAVA_OBJECT = 19;
private static final byte UUID = 20;
private static final byte STRING_FIXED = 21;
private static final byte GEOMETRY = 22;
private static final byte TIMESTAMP_TZ = 24;
private static final byte ENUM = 25;
private static final byte INTERVAL = 26;
private static final byte ROW = 27;
private static final byte INT_0_15 = 32;
private static final byte LONG_0_7 = 48;
private static final byte DECIMAL_0_1 = 56;
private static final byte DECIMAL_SMALL_0 = 58;
private static final byte DECIMAL_SMALL = 59;
private static final byte DOUBLE_0_1 = 60;
private static final byte FLOAT_0_1 = 62;
private static final byte BOOLEAN_FALSE = 64;
private static final byte BOOLEAN_TRUE = 65;
private static final byte INT_NEG = 66;
private static final byte LONG_NEG = 67;
private static final byte STRING_0_31 = 68;
private static final int BYTES_0_31 = 100;
private static final int SPATIAL_KEY_2D = 132;
private static final int CUSTOM_DATA_TYPE = 133;
......@@ -210,41 +232,41 @@ public class ValueDataType implements DataType {
int type = v.getValueType();
switch (type) {
case Value.BOOLEAN:
buff.put((byte) (v.getBoolean() ? BOOLEAN_TRUE : BOOLEAN_FALSE));
buff.put(v.getBoolean() ? BOOLEAN_TRUE : BOOLEAN_FALSE);
break;
case Value.BYTE:
buff.put((byte) type).put(v.getByte());
buff.put(BYTE).put(v.getByte());
break;
case Value.SHORT:
buff.put((byte) type).putShort(v.getShort());
buff.put(SHORT).putShort(v.getShort());
break;
case Value.ENUM:
case Value.INT: {
int x = v.getInt();
if (x < 0) {
buff.put((byte) INT_NEG).putVarInt(-x);
buff.put(INT_NEG).putVarInt(-x);
} else if (x < 16) {
buff.put((byte) (INT_0_15 + x));
} else {
buff.put((byte) type).putVarInt(x);
buff.put(type == Value.INT ? INT : ENUM).putVarInt(x);
}
break;
}
case Value.LONG: {
long x = v.getLong();
if (x < 0) {
buff.put((byte) LONG_NEG).putVarLong(-x);
buff.put(LONG_NEG).putVarLong(-x);
} else if (x < 8) {
buff.put((byte) (LONG_0_7 + x));
} else {
buff.put((byte) type).putVarLong(x);
buff.put(LONG).putVarLong(x);
}
break;
}
case Value.DECIMAL: {
BigDecimal x = v.getBigDecimal();
if (BigDecimal.ZERO.equals(x)) {
buff.put((byte) DECIMAL_0_1);
buff.put(DECIMAL_0_1);
} else if (BigDecimal.ONE.equals(x)) {
buff.put((byte) (DECIMAL_0_1 + 1));
} else {
......@@ -253,16 +275,16 @@ public class ValueDataType implements DataType {
int bits = b.bitLength();
if (bits <= 63) {
if (scale == 0) {
buff.put((byte) DECIMAL_SMALL_0).
buff.put(DECIMAL_SMALL_0).
putVarLong(b.longValue());
} else {
buff.put((byte) DECIMAL_SMALL).
buff.put(DECIMAL_SMALL).
putVarInt(scale).
putVarLong(b.longValue());
}
} else {
byte[] bytes = b.toByteArray();
buff.put((byte) type).
buff.put(DECIMAL).
putVarInt(scale).
putVarInt(bytes.length).
put(bytes);
......@@ -275,14 +297,14 @@ public class ValueDataType implements DataType {
long nanos = t.getNanos();
long millis = nanos / 1000000;
nanos -= millis * 1000000;
buff.put((byte) type).
buff.put(TIME).
putVarLong(millis).
putVarLong(nanos);
break;
}
case Value.DATE: {
long x = ((ValueDate) v).getDateValue();
buff.put((byte) type).putVarLong(x);
buff.put(DATE).putVarLong(x);
break;
}
case Value.TIMESTAMP: {
......@@ -291,7 +313,7 @@ public class ValueDataType implements DataType {
long nanos = ts.getTimeNanos();
long millis = nanos / 1000000;
nanos -= millis * 1000000;
buff.put((byte) type).
buff.put(TIMESTAMP).
putVarLong(dateValue).
putVarLong(millis).
putVarLong(nanos);
......@@ -303,7 +325,7 @@ public class ValueDataType implements DataType {
long nanos = ts.getTimeNanos();
long millis = nanos / 1000000;
nanos -= millis * 1000000;
buff.put((byte) type).
buff.put(TIMESTAMP_TZ).
putVarLong(dateValue).
putVarLong(millis).
putVarLong(nanos).
......@@ -312,7 +334,7 @@ public class ValueDataType implements DataType {
}
case Value.JAVA_OBJECT: {
byte[] b = v.getBytesNoCopy();
buff.put((byte) type).
buff.put(JAVA_OBJECT).
putVarInt(b.length).
put(b);
break;
......@@ -324,7 +346,7 @@ public class ValueDataType implements DataType {
buff.put((byte) (BYTES_0_31 + len)).
put(b);
} else {
buff.put((byte) type).
buff.put(BYTES).
putVarInt(b.length).
put(b);
}
......@@ -332,7 +354,7 @@ public class ValueDataType implements DataType {
}
case Value.UUID: {
ValueUuid uuid = (ValueUuid) v;
buff.put((byte) type).
buff.put(UUID).
putLong(uuid.getHigh()).
putLong(uuid.getLow());
break;
......@@ -344,14 +366,17 @@ public class ValueDataType implements DataType {
buff.put((byte) (STRING_0_31 + len)).
putStringData(s, len);
} else {
buff.put((byte) type);
buff.put(STRING);
writeString(buff, s);
}
break;
}
case Value.STRING_IGNORECASE:
buff.put(STRING_IGNORECASE);
writeString(buff, v.getString());
break;
case Value.STRING_FIXED:
buff.put((byte) type);
buff.put(STRING_FIXED);
writeString(buff, v.getString());
break;
case Value.DOUBLE: {
......@@ -361,9 +386,9 @@ public class ValueDataType implements DataType {
} else {
long d = Double.doubleToLongBits(x);
if (d == ValueDouble.ZERO_BITS) {
buff.put((byte) DOUBLE_0_1);
buff.put(DOUBLE_0_1);
} else {
buff.put((byte) type).
buff.put(DOUBLE).
putVarLong(Long.reverse(d));
}
}
......@@ -376,9 +401,9 @@ public class ValueDataType implements DataType {
} else {
int f = Float.floatToIntBits(x);
if (f == ValueFloat.ZERO_BITS) {
buff.put((byte) FLOAT_0_1);
buff.put(FLOAT_0_1);
} else {
buff.put((byte) type).
buff.put(FLOAT).
putVarInt(Integer.reverse(f));
}
}
......@@ -386,7 +411,7 @@ public class ValueDataType implements DataType {
}
case Value.BLOB:
case Value.CLOB: {
buff.put((byte) type);
buff.put(type == Value.BLOB ? BLOB : CLOB);
ValueLobDb lob = (ValueLobDb) v;
byte[] small = lob.getSmall();
if (small == null) {
......@@ -403,7 +428,7 @@ public class ValueDataType implements DataType {
case Value.ARRAY:
case Value.ROW: {
Value[] list = ((ValueCollectionBase) v).getList();
buff.put((byte) (type == Value.ARRAY ? Value.ARRAY : /* Special storage type for ValueRow */ ROW))
buff.put(type == Value.ARRAY ? ARRAY : ROW)
.putVarInt(list.length);
for (Value x : list) {
writeValue(buff, x);
......@@ -411,7 +436,7 @@ public class ValueDataType implements DataType {
break;
}
case Value.RESULT_SET: {
buff.put((byte) type);
buff.put(RESULT_SET);
ResultInterface result = ((ValueResultSet) v).getResult();
int columnCount = result.getVisibleColumnCount();
buff.putVarInt(columnCount);
......@@ -436,7 +461,7 @@ public class ValueDataType implements DataType {
case Value.GEOMETRY: {
byte[] b = v.getBytes();
int len = b.length;
buff.put((byte) type).
buff.put(GEOMETRY).
putVarInt(len).
put(b);
break;
......@@ -451,7 +476,7 @@ public class ValueDataType implements DataType {
if (interval.isNegative()) {
ordinal = ~ordinal;
}
buff.put((byte) Value.INTERVAL_YEAR).
buff.put(INTERVAL).
put((byte) ordinal).
putVarLong(interval.getLeading());
break;
......@@ -469,7 +494,7 @@ public class ValueDataType implements DataType {
if (interval.isNegative()) {
ordinal = ~ordinal;
}
buff.put((byte) Value.INTERVAL_YEAR).
buff.put(INTERVAL).
put((byte) (ordinal)).
putVarLong(interval.getLeading()).
putVarLong(interval.getRemaining());
......@@ -501,7 +526,7 @@ public class ValueDataType implements DataType {
private Object readValue(ByteBuffer buff) {
int type = buff.get() & 255;
switch (type) {
case Value.NULL:
case NULL:
return ValueNull.INSTANCE;
case BOOLEAN_TRUE:
return ValueBoolean.TRUE;
......@@ -509,16 +534,16 @@ public class ValueDataType implements DataType {
return ValueBoolean.FALSE;
case INT_NEG:
return ValueInt.get(-readVarInt(buff));
case Value.ENUM:
case Value.INT:
case ENUM:
case INT:
return ValueInt.get(readVarInt(buff));
case LONG_NEG:
return ValueLong.get(-readVarLong(buff));
case Value.LONG:
case LONG:
return ValueLong.get(readVarLong(buff));
case Value.BYTE:
case BYTE:
return ValueByte.get(buff.get());
case Value.SHORT:
case SHORT:
return ValueShort.get(buff.getShort());
case DECIMAL_0_1:
return ValueDecimal.ZERO;
......@@ -532,7 +557,7 @@ public class ValueDataType implements DataType {
return ValueDecimal.get(BigDecimal.valueOf(
readVarLong(buff), scale));
}
case Value.DECIMAL: {
case DECIMAL: {
int scale = readVarInt(buff);
int len = readVarInt(buff);
byte[] buff2 = Utils.newBytes(len);
......@@ -540,45 +565,45 @@ public class ValueDataType implements DataType {
BigInteger b = new BigInteger(buff2);
return ValueDecimal.get(new BigDecimal(b, scale));
}
case Value.DATE: {
case DATE: {
return ValueDate.fromDateValue(readVarLong(buff));
}
case Value.TIME: {
case TIME: {
long nanos = readVarLong(buff) * 1000000 + readVarLong(buff);
return ValueTime.fromNanos(nanos);
}
case Value.TIMESTAMP: {
case TIMESTAMP: {
long dateValue = readVarLong(buff);
long nanos = readVarLong(buff) * 1000000 + readVarLong(buff);
return ValueTimestamp.fromDateValueAndNanos(dateValue, nanos);
}
case Value.TIMESTAMP_TZ: {
case TIMESTAMP_TZ: {
long dateValue = readVarLong(buff);
long nanos = readVarLong(buff) * 1000000 + readVarLong(buff);
short tz = (short) readVarInt(buff);
return ValueTimestampTimeZone.fromDateValueAndNanos(dateValue, nanos, tz);
}
case Value.BYTES: {
case BYTES: {
int len = readVarInt(buff);
byte[] b = Utils.newBytes(len);
buff.get(b, 0, len);
return ValueBytes.getNoCopy(b);
}
case Value.JAVA_OBJECT: {
case JAVA_OBJECT: {
int len = readVarInt(buff);
byte[] b = Utils.newBytes(len);
buff.get(b, 0, len);
return ValueJavaObject.getNoCopy(null, b, handler);
}
case Value.UUID:
case UUID:
return ValueUuid.get(buff.getLong(), buff.getLong());
case Value.STRING:
case STRING:
return ValueString.get(readString(buff));
case Value.STRING_IGNORECASE:
case STRING_IGNORECASE:
return ValueStringIgnoreCase.get(readString(buff));
case Value.STRING_FIXED:
case STRING_FIXED:
return ValueStringFixed.get(readString(buff));
case Value.INTERVAL_YEAR: {
case INTERVAL: {
int ordinal = buff.get();
boolean negative = ordinal < 0;
if (negative) {
......@@ -595,41 +620,38 @@ public class ValueDataType implements DataType {
return ValueDouble.ZERO;
case DOUBLE_0_1 + 1:
return ValueDouble.ONE;
case Value.DOUBLE:
return ValueDouble.get(Double.longBitsToDouble(
Long.reverse(readVarLong(buff))));
case Value.FLOAT:
return ValueFloat.get(Float.intBitsToFloat(
Integer.reverse(readVarInt(buff))));
case Value.BLOB:
case Value.CLOB: {
case DOUBLE:
return ValueDouble.get(Double.longBitsToDouble(Long.reverse(readVarLong(buff))));
case FLOAT:
return ValueFloat.get(Float.intBitsToFloat(Integer.reverse(readVarInt(buff))));
case BLOB:
case CLOB: {
int smallLen = readVarInt(buff);
if (smallLen >= 0) {
byte[] small = Utils.newBytes(smallLen);
buff.get(small, 0, smallLen);
return ValueLobDb.createSmallLob(type, small);
return ValueLobDb.createSmallLob(type == BLOB ? Value.BLOB : Value.CLOB, small);
} else if (smallLen == -3) {
int tableId = readVarInt(buff);
long lobId = readVarLong(buff);
long precision = readVarLong(buff);
return ValueLobDb.create(type,
return ValueLobDb.create(type == BLOB ? Value.BLOB : Value.CLOB,
handler, tableId, lobId, null, precision);
} else {
throw DbException.get(ErrorCode.FILE_CORRUPTED_1,
"lob type: " + smallLen);
}
}
case Value.ARRAY:
case ROW: // Special storage type for ValueRow
{
case ARRAY:
case ROW: {
int len = readVarInt(buff);
Value[] list = new Value[len];
for (int i = 0; i < len; i++) {
list[i] = (Value) readValue(buff);
}
return type == Value.ARRAY ? ValueArray.get(list) : ValueRow.get(list);
return type == ARRAY ? ValueArray.get(list) : ValueRow.get(list);
}
case Value.RESULT_SET: {
case RESULT_SET: {
SimpleResult rs = new SimpleResult();
int columns = readVarInt(buff);
for (int i = 0; i < columns; i++) {
......@@ -645,7 +667,7 @@ public class ValueDataType implements DataType {
}
return ValueResultSet.get(rs);
}
case Value.GEOMETRY: {
case GEOMETRY: {
int len = readVarInt(buff);
byte[] b = Utils.newBytes(len);
buff.get(b, 0, len);
......
h2/src/main/org/h2/store/Data.java
浏览文件 @ db3622d0
......@@ -76,27 +76,49 @@ public class Data {
*/
public static final int LENGTH_LONG = 8;
/**
* Storage type for ValueRow.
*/
private static final int ROW = 27;
private static final int INT_0_15 = 32;
private static final int LONG_0_7 = 48;
private static final int DECIMAL_0_1 = 56;
private static final int DECIMAL_SMALL_0 = 58;
private static final int DECIMAL_SMALL = 59;
private static final int DOUBLE_0_1 = 60;
private static final int FLOAT_0_1 = 62;
private static final int BOOLEAN_FALSE = 64;
private static final int BOOLEAN_TRUE = 65;
private static final int INT_NEG = 66;
private static final int LONG_NEG = 67;
private static final int STRING_0_31 = 68;
private static final byte NULL = 0;
private static final byte BYTE = 2;
private static final byte SHORT = 3;
private static final byte INT = 4;
private static final byte LONG = 5;
private static final byte DECIMAL = 6;
private static final byte DOUBLE = 7;
private static final byte FLOAT = 8;
private static final byte TIME = 9;
private static final byte DATE = 10;
private static final byte TIMESTAMP = 11;
private static final byte BYTES = 12;
private static final byte STRING = 13;
private static final byte STRING_IGNORECASE = 14;
private static final byte BLOB = 15;
private static final byte CLOB = 16;
private static final byte ARRAY = 17;
private static final byte RESULT_SET = 18;
private static final byte JAVA_OBJECT = 19;
private static final byte UUID = 20;
private static final byte STRING_FIXED = 21;
private static final byte GEOMETRY = 22;
private static final byte TIMESTAMP_TZ = 24;
private static final byte ENUM = 25;
private static final byte INTERVAL = 26;
private static final byte ROW = 27;
private static final byte INT_0_15 = 32;
private static final byte LONG_0_7 = 48;
private static final byte DECIMAL_0_1 = 56;
private static final byte DECIMAL_SMALL_0 = 58;
private static final byte DECIMAL_SMALL = 59;
private static final byte DOUBLE_0_1 = 60;
private static final byte FLOAT_0_1 = 62;
private static final byte BOOLEAN_FALSE = 64;
private static final byte BOOLEAN_TRUE = 65;
private static final byte INT_NEG = 66;
private static final byte LONG_NEG = 67;
private static final byte STRING_0_31 = 68;
private static final int BYTES_0_31 = 100;
private static final int LOCAL_TIME = 132;
private static final int LOCAL_DATE = 133;
private static final int LOCAL_TIMESTAMP = 134;
private static final byte CUSTOM_DATA_TYPE = (byte)135;
private static final int CUSTOM_DATA_TYPE = 135;
private static final long MILLIS_PER_MINUTE = 1000 * 60;
......@@ -421,32 +443,32 @@ public class Data {
public void writeValue(Value v) {
int start = pos;
if (v == ValueNull.INSTANCE) {
data[pos++] = 0;
data[pos++] = NULL;
return;
}
int type = v.getValueType();
switch (type) {
case Value.BOOLEAN:
writeByte((byte) (v.getBoolean() ? BOOLEAN_TRUE : BOOLEAN_FALSE));
writeByte(v.getBoolean() ? BOOLEAN_TRUE : BOOLEAN_FALSE);
break;
case Value.BYTE:
writeByte((byte) type);
writeByte(BYTE);
writeByte(v.getByte());
break;
case Value.SHORT:
writeByte((byte) type);
writeByte(SHORT);
writeShortInt(v.getShort());
break;
case Value.ENUM:
case Value.INT: {
int x = v.getInt();
if (x < 0) {
writeByte((byte) INT_NEG);
writeByte(INT_NEG);
writeVarInt(-x);
} else if (x < 16) {
writeByte((byte) (INT_0_15 + x));
} else {
writeByte((byte) type);
writeByte(type == Value.INT ? INT : ENUM);
writeVarInt(x);
}
break;
......@@ -454,12 +476,12 @@ public class Data {
case Value.LONG: {
long x = v.getLong();
if (x < 0) {
writeByte((byte) LONG_NEG);
writeByte(LONG_NEG);
writeVarLong(-x);
} else if (x < 8) {
writeByte((byte) (LONG_0_7 + x));
} else {
writeByte((byte) type);
writeByte(LONG);
writeVarLong(x);
}
break;
......@@ -467,7 +489,7 @@ public class Data {
case Value.DECIMAL: {
BigDecimal x = v.getBigDecimal();
if (BigDecimal.ZERO.equals(x)) {
writeByte((byte) DECIMAL_0_1);
writeByte(DECIMAL_0_1);
} else if (BigDecimal.ONE.equals(x)) {
writeByte((byte) (DECIMAL_0_1 + 1));
} else {
......@@ -476,15 +498,15 @@ public class Data {
int bits = b.bitLength();
if (bits <= 63) {
if (scale == 0) {
writeByte((byte) DECIMAL_SMALL_0);
writeByte(DECIMAL_SMALL_0);
writeVarLong(b.longValue());
} else {
writeByte((byte) DECIMAL_SMALL);
writeByte(DECIMAL_SMALL);
writeVarInt(scale);
writeVarLong(b.longValue());
}
} else {
writeByte((byte) type);
writeByte(DECIMAL);
writeVarInt(scale);
byte[] bytes = b.toByteArray();
writeVarInt(bytes.length);
......@@ -503,7 +525,7 @@ public class Data {
writeVarLong(millis);
writeVarLong(nanos);
} else {
writeByte((byte) type);
writeByte(TIME);
writeVarLong(DateTimeUtils.getTimeLocalWithoutDst(v.getTime()));
}
break;
......@@ -513,7 +535,7 @@ public class Data {
long x = ((ValueDate) v).getDateValue();
writeVarLong(x);
} else {
writeByte((byte) type);
writeByte(DATE);
long x = DateTimeUtils.getTimeLocalWithoutDst(v.getDate());
writeVarLong(x / MILLIS_PER_MINUTE);
}
......@@ -532,7 +554,7 @@ public class Data {
writeVarLong(nanos);
} else {
Timestamp ts = v.getTimestamp();
writeByte((byte) type);
writeByte(TIMESTAMP);
writeVarLong(DateTimeUtils.getTimeLocalWithoutDst(ts));
writeVarInt(ts.getNanos() % 1_000_000);
}
......@@ -540,7 +562,7 @@ public class Data {
}
case Value.TIMESTAMP_TZ: {
ValueTimestampTimeZone ts = (ValueTimestampTimeZone) v;
writeByte((byte) type);
writeByte(TIMESTAMP_TZ);
writeVarLong(ts.getDateValue());
writeVarLong(ts.getTimeNanos());
writeVarInt(ts.getTimeZoneOffsetMins());
......@@ -549,7 +571,7 @@ public class Data {
case Value.GEOMETRY:
// fall though
case Value.JAVA_OBJECT: {
writeByte((byte) type);
writeByte(type == Value.GEOMETRY ? GEOMETRY : JAVA_OBJECT);
byte[] b = v.getBytesNoCopy();
int len = b.length;
writeVarInt(len);
......@@ -563,14 +585,14 @@ public class Data {
writeByte((byte) (BYTES_0_31 + len));
write(b, 0, len);
} else {
writeByte((byte) type);
writeByte(BYTES);
writeVarInt(len);
write(b, 0, len);
}
break;
}
case Value.UUID: {
writeByte((byte) type);
writeByte(UUID);
ValueUuid uuid = (ValueUuid) v;
writeLong(uuid.getHigh());
writeLong(uuid.getLow());
......@@ -583,14 +605,17 @@ public class Data {
writeByte((byte) (STRING_0_31 + len));
writeStringWithoutLength(s, len);
} else {
writeByte((byte) type);
writeByte(STRING);
writeString(s);
}
break;
}
case Value.STRING_IGNORECASE:
writeByte(STRING_IGNORECASE);
writeString(v.getString());
break;
case Value.STRING_FIXED:
writeByte((byte) type);
writeByte(STRING_FIXED);
writeString(v.getString());
break;
case Value.DOUBLE: {
......@@ -600,9 +625,9 @@ public class Data {
} else {
long d = Double.doubleToLongBits(x);
if (d == ValueDouble.ZERO_BITS) {
writeByte((byte) DOUBLE_0_1);
writeByte(DOUBLE_0_1);
} else {
writeByte((byte) type);
writeByte(DOUBLE);
writeVarLong(Long.reverse(d));
}
}
......@@ -615,9 +640,9 @@ public class Data {
} else {
int f = Float.floatToIntBits(x);
if (f == ValueFloat.ZERO_BITS) {
writeByte((byte) FLOAT_0_1);
writeByte(FLOAT_0_1);
} else {
writeByte((byte) type);
writeByte(FLOAT);
writeVarInt(Integer.reverse(f));
}
}
......@@ -625,7 +650,7 @@ public class Data {
}
case Value.BLOB:
case Value.CLOB: {
writeByte((byte) type);
writeByte(type == Value.BLOB ? BLOB : CLOB);
if (v instanceof ValueLob) {
ValueLob lob = (ValueLob) v;
byte[] small = lob.getSmall();
......@@ -663,7 +688,7 @@ public class Data {
}
case Value.ARRAY:
case Value.ROW: {
writeByte((byte) (type == Value.ARRAY ? Value.ARRAY : /* Special storage type for ValueRow */ ROW));
writeByte(type == Value.ARRAY ? ARRAY : ROW);
Value[] list = ((ValueCollectionBase) v).getList();
writeVarInt(list.length);
for (Value x : list) {
......@@ -672,7 +697,7 @@ public class Data {
break;
}
case Value.RESULT_SET: {
writeByte((byte) type);
writeByte(RESULT_SET);
ResultInterface result = ((ValueResultSet) v).getResult();
result.reset();
int columnCount = result.getVisibleColumnCount();
......@@ -705,7 +730,7 @@ public class Data {
if (interval.isNegative()) {
ordinal = ~ordinal;
}
writeByte((byte) Value.INTERVAL_YEAR);
writeByte(INTERVAL);
writeByte((byte) ordinal);
writeVarLong(interval.getLeading());
break;
......@@ -723,7 +748,7 @@ public class Data {
if (interval.isNegative()) {
ordinal = ~ordinal;
}
writeByte((byte) Value.INTERVAL_YEAR);
writeByte(INTERVAL);
writeByte((byte) ordinal);
writeVarLong(interval.getLeading());
writeVarLong(interval.getRemaining());
......@@ -732,7 +757,7 @@ public class Data {
default:
if (JdbcUtils.customDataTypesHandler != null) {
byte[] b = v.getBytesNoCopy();
writeByte(CUSTOM_DATA_TYPE);
writeByte((byte) CUSTOM_DATA_TYPE);
writeVarInt(type);
writeVarInt(b.length);
write(b, 0, b.length);
......@@ -752,7 +777,7 @@ public class Data {
public Value readValue() {
int type = data[pos++] & 255;
switch (type) {
case Value.NULL:
case NULL:
return ValueNull.INSTANCE;
case BOOLEAN_TRUE:
return ValueBoolean.TRUE;
......@@ -760,16 +785,16 @@ public class Data {
return ValueBoolean.FALSE;
case INT_NEG:
return ValueInt.get(-readVarInt());
case Value.ENUM:
case Value.INT:
case ENUM:
case INT:
return ValueInt.get(readVarInt());
case LONG_NEG:
return ValueLong.get(-readVarLong());
case Value.LONG:
return ValueLong.get(readVarLong());
case Value.BYTE:
case BYTE:
return ValueByte.get(readByte());
case Value.SHORT:
case SHORT:
return ValueShort.get(readShortInt());
case DECIMAL_0_1:
return (ValueDecimal) ValueDecimal.ZERO;
......@@ -781,7 +806,7 @@ public class Data {
int scale = readVarInt();
return ValueDecimal.get(BigDecimal.valueOf(readVarLong(), scale));
}
case Value.DECIMAL: {
case DECIMAL: {
int scale = readVarInt();
int len = readVarInt();
byte[] buff = Utils.newBytes(len);
......@@ -792,7 +817,7 @@ public class Data {
case LOCAL_DATE: {
return ValueDate.fromDateValue(readVarLong());
}
case Value.DATE: {
case DATE: {
long x = readVarLong() * MILLIS_PER_MINUTE;
return ValueDate.fromMillis(DateTimeUtils.getTimeUTCWithoutDst(x));
}
......@@ -800,7 +825,7 @@ public class Data {
long nanos = readVarLong() * 1_000_000 + readVarLong();
return ValueTime.fromNanos(nanos);
}
case Value.TIME:
case TIME:
// need to normalize the year, month and day
return ValueTime.fromMillis(
DateTimeUtils.getTimeUTCWithoutDst(readVarLong()));
......@@ -809,42 +834,42 @@ public class Data {
long nanos = readVarLong() * 1_000_000 + readVarLong();
return ValueTimestamp.fromDateValueAndNanos(dateValue, nanos);
}
case Value.TIMESTAMP: {
case TIMESTAMP: {
return ValueTimestamp.fromMillisNanos(
DateTimeUtils.getTimeUTCWithoutDst(readVarLong()),
readVarInt() % 1_000_000);
}
case Value.TIMESTAMP_TZ: {
case TIMESTAMP_TZ: {
long dateValue = readVarLong();
long nanos = readVarLong();
short tz = (short) readVarInt();
return ValueTimestampTimeZone.fromDateValueAndNanos(dateValue, nanos, tz);
}
case Value.BYTES: {
case BYTES: {
int len = readVarInt();
byte[] b = Utils.newBytes(len);
read(b, 0, len);
return ValueBytes.getNoCopy(b);
}
case Value.GEOMETRY: {
case GEOMETRY: {
int len = readVarInt();
byte[] b = Utils.newBytes(len);
read(b, 0, len);
return ValueGeometry.get(b);
}
case Value.JAVA_OBJECT: {
case JAVA_OBJECT: {
int len = readVarInt();
byte[] b = Utils.newBytes(len);
read(b, 0, len);
return ValueJavaObject.getNoCopy(null, b, handler);
}
case Value.UUID:
case UUID:
return ValueUuid.get(readLong(), readLong());
case Value.STRING:
case STRING:
return ValueString.get(readString());
case Value.STRING_IGNORECASE:
case STRING_IGNORECASE:
return ValueStringIgnoreCase.get(readString());
case Value.STRING_FIXED:
case STRING_FIXED:
return ValueStringFixed.get(readString());
case FLOAT_0_1:
return ValueFloat.ZERO;
......@@ -854,24 +879,22 @@ public class Data {
return ValueDouble.ZERO;
case DOUBLE_0_1 + 1:
return ValueDouble.ONE;
case Value.DOUBLE:
return ValueDouble.get(Double.longBitsToDouble(
Long.reverse(readVarLong())));
case Value.FLOAT:
return ValueFloat.get(Float.intBitsToFloat(
Integer.reverse(readVarInt())));
case Value.BLOB:
case Value.CLOB: {
case DOUBLE:
return ValueDouble.get(Double.longBitsToDouble(Long.reverse(readVarLong())));
case FLOAT:
return ValueFloat.get(Float.intBitsToFloat(Integer.reverse(readVarInt())));
case BLOB:
case CLOB: {
int smallLen = readVarInt();
if (smallLen >= 0) {
byte[] small = Utils.newBytes(smallLen);
read(small, 0, smallLen);
return ValueLobDb.createSmallLob(type, small);
return ValueLobDb.createSmallLob(type == BLOB ? Value.BLOB : Value.CLOB, small);
} else if (smallLen == -3) {
int tableId = readVarInt();
long lobId = readVarLong();
long precision = readVarLong();
return ValueLobDb.create(type, handler, tableId,
return ValueLobDb.create(type == BLOB ? Value.BLOB : Value.CLOB, handler, tableId,
lobId, null, precision);
} else {
int tableId = readVarInt();
......@@ -886,14 +909,14 @@ public class Data {
}
if (smallLen == -2) {
String filename = readString();
return ValueLob.openUnlinked(type, handler, tableId,
return ValueLob.openUnlinked(type == BLOB ? Value.BLOB : Value.CLOB, handler, tableId,
objectId, precision, compression, filename);
}
return ValueLob.openLinked(type, handler, tableId,
return ValueLob.openLinked(type == BLOB ? Value.BLOB : Value.CLOB, handler, tableId,
objectId, precision, compression);
}
}
case Value.ARRAY:
case ARRAY:
case ROW: // Special storage type for ValueRow
{
int len = readVarInt();
......@@ -901,9 +924,9 @@ public class Data {
for (int i = 0; i < len; i++) {
list[i] = readValue();
}
return type == Value.ARRAY ? ValueArray.get(list) : ValueRow.get(list);
return type == ARRAY ? ValueArray.get(list) : ValueRow.get(list);
}
case Value.RESULT_SET: {
case RESULT_SET: {
SimpleResult rs = new SimpleResult();
int columns = readVarInt();
for (int i = 0; i < columns; i++) {
......@@ -918,7 +941,7 @@ public class Data {
}
return ValueResultSet.get(rs);
}
case Value.INTERVAL_YEAR: {
case INTERVAL: {
int ordinal = readByte();
boolean negative = ordinal < 0;
if (negative) {
......
h2/src/main/org/h2/value/Transfer.java
浏览文件 @ db3622d0
......@@ -42,6 +42,34 @@ public class Transfer {
private static final int LOB_MAGIC = 0x1234;
private static final int LOB_MAC_SALT_LENGTH = 16;
private static final int NULL = 0;
private static final int BOOLEAN = 1;
private static final int BYTE = 2;
private static final int SHORT = 3;
private static final int INT = 4;
private static final int LONG = 5;
private static final int DECIMAL = 6;
private static final int DOUBLE = 7;
private static final int FLOAT = 8;
private static final int TIME = 9;
private static final int DATE = 10;
private static final int TIMESTAMP = 11;
private static final int BYTES = 12;
private static final int STRING = 13;
private static final int STRING_IGNORECASE = 14;
private static final int BLOB = 15;
private static final int CLOB = 16;
private static final int ARRAY = 17;
private static final int RESULT_SET = 18;
private static final int JAVA_OBJECT = 19;
private static final int UUID = 20;
private static final int STRING_FIXED = 21;
private static final int GEOMETRY = 22;
private static final int TIMESTAMP_TZ = 24;
private static final int ENUM = 25;
private static final int INTERVAL = 26;
private static final int ROW = 27;
private Socket socket;
private DataInputStream in;
private DataOutputStream out;
......@@ -322,45 +350,48 @@ public class Transfer {
int type = v.getValueType();
switch (type) {
case Value.NULL:
writeInt(Value.NULL);
writeInt(NULL);
break;
case Value.BYTES:
writeInt(BYTES);
writeBytes(v.getBytesNoCopy());
break;
case Value.JAVA_OBJECT:
writeInt(type);
writeInt(JAVA_OBJECT);
writeBytes(v.getBytesNoCopy());
break;
case Value.UUID: {
writeInt(Value.UUID);
writeInt(UUID);
ValueUuid uuid = (ValueUuid) v;
writeLong(uuid.getHigh());
writeLong(uuid.getLow());
break;
}
case Value.BOOLEAN:
writeInt(Value.BOOLEAN);
writeInt(BOOLEAN);
writeBoolean(v.getBoolean());
break;
case Value.BYTE:
writeInt(Value.BYTE);
writeInt(BYTE);
writeByte(v.getByte());
break;
case Value.TIME:
writeInt(Value.TIME);
writeInt(TIME);
writeLong(((ValueTime) v).getNanos());
break;
case Value.DATE:
writeInt(Value.DATE);
writeInt(DATE);
writeLong(((ValueDate) v).getDateValue());
break;
case Value.TIMESTAMP: {
writeInt(Value.TIMESTAMP);
writeInt(TIMESTAMP);
ValueTimestamp ts = (ValueTimestamp) v;
writeLong(ts.getDateValue());
writeLong(ts.getTimeNanos());
break;
}
case Value.TIMESTAMP_TZ: {
writeInt(Value.TIMESTAMP_TZ);
writeInt(TIMESTAMP_TZ);
ValueTimestampTimeZone ts = (ValueTimestampTimeZone) v;
writeLong(ts.getDateValue());
writeLong(ts.getTimeNanos());
......@@ -368,37 +399,43 @@ public class Transfer {
break;
}
case Value.DECIMAL:
writeInt(Value.DECIMAL);
writeInt(DECIMAL);
writeString(v.getString());
break;
case Value.DOUBLE:
writeInt(Value.DOUBLE);
writeInt(DOUBLE);
writeDouble(v.getDouble());
break;
case Value.FLOAT:
writeInt(Value.FLOAT);
writeInt(FLOAT);
writeFloat(v.getFloat());
break;
case Value.INT:
writeInt(Value.INT);
writeInt(INT);
writeInt(v.getInt());
break;
case Value.LONG:
writeInt(Value.LONG);
writeInt(LONG);
writeLong(v.getLong());
break;
case Value.SHORT:
writeInt(Value.SHORT);
writeInt(SHORT);
writeInt(v.getShort());
break;
case Value.STRING:
writeInt(STRING);
writeString(v.getString());
break;
case Value.STRING_IGNORECASE:
writeInt(STRING_IGNORECASE);
writeString(v.getString());
break;
case Value.STRING_FIXED:
writeInt(type);
writeInt(STRING_FIXED);
writeString(v.getString());
break;
case Value.BLOB: {
writeInt(Value.BLOB);
writeInt(BLOB);
if (version >= Constants.TCP_PROTOCOL_VERSION_11) {
if (v instanceof ValueLobDb) {
ValueLobDb lob = (ValueLobDb) v;
......@@ -429,7 +466,7 @@ public class Transfer {
break;
}
case Value.CLOB: {
writeInt(Value.CLOB);
writeInt(CLOB);
if (version >= Constants.TCP_PROTOCOL_VERSION_11) {
if (v instanceof ValueLobDb) {
ValueLobDb lob = (ValueLobDb) v;
......@@ -457,7 +494,7 @@ public class Transfer {
break;
}
case Value.ARRAY: {
writeInt(Value.ARRAY);
writeInt(ARRAY);
ValueArray va = (ValueArray) v;
Value[] list = va.getList();
int len = list.length;
......@@ -474,7 +511,7 @@ public class Transfer {
break;
}
case Value.ROW: {
writeInt(version >= Constants.TCP_PROTOCOL_VERSION_18 ? Value.ROW : Value.ARRAY);
writeInt(version >= Constants.TCP_PROTOCOL_VERSION_18 ? ROW : ARRAY);
ValueRow va = (ValueRow) v;
Value[] list = va.getList();
int len = list.length;
......@@ -485,13 +522,13 @@ public class Transfer {
break;
}
case Value.ENUM: {
writeInt(Value.ENUM);
writeInt(ENUM);
writeInt(v.getInt());
writeString(v.getString());
break;
}
case Value.RESULT_SET: {
writeInt(Value.RESULT_SET);
writeInt(RESULT_SET);
ResultInterface result = ((ValueResultSet) v).getResult();
int columnCount = result.getVisibleColumnCount();
writeInt(columnCount);
......@@ -520,7 +557,7 @@ public class Transfer {
break;
}
case Value.GEOMETRY:
writeInt(Value.GEOMETRY);
writeInt(GEOMETRY);
if (version >= Constants.TCP_PROTOCOL_VERSION_14) {
writeBytes(v.getBytesNoCopy());
} else {
......@@ -533,12 +570,16 @@ public class Transfer {
case Value.INTERVAL_HOUR:
case Value.INTERVAL_MINUTE:
if (version >= Constants.TCP_PROTOCOL_VERSION_18) {
writeInt(type);
ValueInterval interval = (ValueInterval) v;
writeBoolean(interval.isNegative());
int ordinal = type - Value.INTERVAL_YEAR;
if (interval.isNegative()) {
ordinal = ~ordinal;
}
writeInt(INTERVAL);
writeByte((byte) ordinal);
writeLong(interval.getLeading());
} else {
writeInt(Value.STRING);
writeInt(STRING);
writeString(v.getString());
}
break;
......@@ -551,13 +592,17 @@ public class Transfer {
case Value.INTERVAL_HOUR_TO_SECOND:
case Value.INTERVAL_MINUTE_TO_SECOND:
if (version >= Constants.TCP_PROTOCOL_VERSION_18) {
writeInt(type);
ValueInterval interval = (ValueInterval) v;
writeBoolean(interval.isNegative());
int ordinal = type - Value.INTERVAL_YEAR;
if (interval.isNegative()) {
ordinal = ~ordinal;
}
writeInt(INTERVAL);
writeByte((byte) ordinal);
writeLong(interval.getLeading());
writeLong(interval.getRemaining());
} else {
writeInt(Value.STRING);
writeInt(STRING);
writeString(v.getString());
}
break;
......@@ -579,51 +624,51 @@ public class Transfer {
public Value readValue() throws IOException {
int type = readInt();
switch (type) {
case Value.NULL:
case NULL:
return ValueNull.INSTANCE;
case Value.BYTES:
case BYTES:
return ValueBytes.getNoCopy(readBytes());
case Value.UUID:
case UUID:
return ValueUuid.get(readLong(), readLong());
case Value.JAVA_OBJECT:
case JAVA_OBJECT:
return ValueJavaObject.getNoCopy(null, readBytes(), session.getDataHandler());
case Value.BOOLEAN:
case BOOLEAN:
return ValueBoolean.get(readBoolean());
case Value.BYTE:
case BYTE:
return ValueByte.get(readByte());
case Value.DATE:
case DATE:
return ValueDate.fromDateValue(readLong());
case Value.TIME:
case TIME:
return ValueTime.fromNanos(readLong());
case Value.TIMESTAMP:
case TIMESTAMP:
return ValueTimestamp.fromDateValueAndNanos(readLong(), readLong());
case Value.TIMESTAMP_TZ: {
case TIMESTAMP_TZ: {
return ValueTimestampTimeZone.fromDateValueAndNanos(readLong(), readLong(), (short) readInt());
}
case Value.DECIMAL:
case DECIMAL:
return ValueDecimal.get(new BigDecimal(readString()));
case Value.DOUBLE:
case DOUBLE:
return ValueDouble.get(readDouble());
case Value.FLOAT:
case FLOAT:
return ValueFloat.get(readFloat());
case Value.ENUM: {
case ENUM: {
final int ordinal = readInt();
final String label = readString();
return ValueEnumBase.get(label, ordinal);
}
case Value.INT:
case INT:
return ValueInt.get(readInt());
case Value.LONG:
case LONG:
return ValueLong.get(readLong());
case Value.SHORT:
case SHORT:
return ValueShort.get((short) readInt());
case Value.STRING:
case STRING:
return ValueString.get(readString());
case Value.STRING_IGNORECASE:
case STRING_IGNORECASE:
return ValueStringIgnoreCase.get(readString());
case Value.STRING_FIXED:
case STRING_FIXED:
return ValueStringFixed.get(readString());
case Value.BLOB: {
case BLOB: {
long length = readLong();
if (version >= Constants.TCP_PROTOCOL_VERSION_11) {
if (length == -1) {
......@@ -648,7 +693,7 @@ public class Transfer {
}
return v;
}
case Value.CLOB: {
case CLOB: {
long length = readLong();
if (version >= Constants.TCP_PROTOCOL_VERSION_11) {
if (length == -1) {
......@@ -678,7 +723,7 @@ public class Transfer {
}
return v;
}
case Value.ARRAY: {
case ARRAY: {
int len = readInt();
Class<?> componentType = Object.class;
if (len < 0) {
......@@ -691,7 +736,7 @@ public class Transfer {
}
return ValueArray.get(componentType, list);
}
case Value.ROW: {
case ROW: {
int len = readInt();
Value[] list = new Value[len];
for (int i = 0; i < len; i++) {
......@@ -699,7 +744,7 @@ public class Transfer {
}
return ValueRow.get(list);
}
case Value.RESULT_SET: {
case RESULT_SET: {
SimpleResult rs = new SimpleResult();
int columns = readInt();
for (int i = 0; i < columns; i++) {
......@@ -719,28 +764,20 @@ public class Transfer {
}
return ValueResultSet.get(rs);
}
case Value.GEOMETRY:
case GEOMETRY:
if (version >= Constants.TCP_PROTOCOL_VERSION_14) {
return ValueGeometry.get(readBytes());
}
return ValueGeometry.get(readString());
case Value.INTERVAL_YEAR:
case Value.INTERVAL_MONTH:
case Value.INTERVAL_DAY:
case Value.INTERVAL_HOUR:
case Value.INTERVAL_MINUTE:
return ValueInterval.from(IntervalQualifier.valueOf(type - Value.INTERVAL_YEAR), readBoolean(), readLong(),
0L);
case Value.INTERVAL_SECOND:
case Value.INTERVAL_YEAR_TO_MONTH:
case Value.INTERVAL_DAY_TO_HOUR:
case Value.INTERVAL_DAY_TO_MINUTE:
case Value.INTERVAL_DAY_TO_SECOND:
case Value.INTERVAL_HOUR_TO_MINUTE:
case Value.INTERVAL_HOUR_TO_SECOND:
case Value.INTERVAL_MINUTE_TO_SECOND:
return ValueInterval.from(IntervalQualifier.valueOf(type - Value.INTERVAL_YEAR), readBoolean(), readLong(),
readLong());
case INTERVAL: {
int ordinal = readByte();
boolean negative = ordinal < 0;
if (negative) {
ordinal = ~ordinal;
}
return ValueInterval.from(IntervalQualifier.valueOf(ordinal), negative, readLong(),
ordinal < 5 ? 0 : readLong());
}
default:
if (JdbcUtils.customDataTypesHandler != null) {
return JdbcUtils.customDataTypesHandler.convert(
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论