Skip to content

H
h2database
提交 619817be authored 作者: Thomas Mueller's avatar Thomas Mueller
浏览文件
操作

MVStore: the file format was changed slightly.

上级 94d4218f
显示空白字符变更
内嵌 并排
正在显示 包含 276 行增加 和 163 行删除
h2/src/docsrc/html/changelog.html
浏览文件 @ 619817be
......@@ -20,6 +20,7 @@ Change Log
<h2>Next Version (unreleased)</h2>
<ul><li>Issue 545: Unnecessary duplicate code was removed.
</li><li>The profiler tool can now process files with full thread dumps.
</li><li>MVStore: the file format was changed slightly.
</li><li>MVStore mode: the CLOB and BLOB storage was re-implemented and is
now much faster than with the PageStore (which is still the default storage).
</li><li>MVStore mode: creating indexes is now much faster
......
h2/src/main/org/h2/mvstore/Chunk.java
浏览文件 @ 619817be
......@@ -15,7 +15,7 @@ import java.util.HashMap;
* Chunks are page aligned (each page is usually 4096 bytes).
* There are at most 67 million (2^26) chunks,
* each chunk is at most 2 GB large.
* File format:
* Chunk format:
* 1 byte: 'c'
* 4 bytes: length
* 4 bytes: chunk id (an incrementing number)
......@@ -26,6 +26,11 @@ import java.util.HashMap;
*/
public class Chunk {
/**
* The maximum length of a chunk header, in bytes.
*/
static final int MAX_HEADER_LENGTH = 1024;
/**
* The chunk id.
*/
......@@ -93,26 +98,23 @@ public class Chunk {
* @return the chunk
*/
static Chunk fromHeader(ByteBuffer buff, long start) {
if (buff.get() != 'c') {
int pos = buff.position();
if (buff.get() != '{') {
throw DataUtils.newIllegalStateException(
DataUtils.ERROR_FILE_CORRUPT,
"File corrupt reading chunk at position {0}", start);
}
int length = buff.getInt();
int chunkId = buff.getInt();
int pageCount = buff.getInt();
long metaRootPos = buff.getLong();
long maxLength = buff.getLong();
long maxLengthLive = buff.getLong();
Chunk c = new Chunk(chunkId);
c.length = length;
c.pageCount = pageCount;
c.pageCountLive = pageCount;
c.start = start;
c.metaRootPos = metaRootPos;
c.maxLength = maxLength;
c.maxLengthLive = maxLengthLive;
return c;
byte[] data = new byte[Math.min(buff.remaining(), MAX_HEADER_LENGTH)];
// set the position to the start of the first page
buff.get(data);
for (int i = 0; i < data.length; i++) {
if (data[i] == '\n') {
buff.position(pos + i + 2);
break;
}
}
String s = new String(data, 0, data.length, DataUtils.UTF8);
return fromString(s);
}
/**
......@@ -121,13 +123,10 @@ public class Chunk {
* @param buff the target buffer
*/
void writeHeader(WriteBuffer buff) {
buff.put((byte) 'c').
putInt(length).
putInt(id).
putInt(pageCount).
putLong(metaRootPos).
putLong(maxLength).
putLong(maxLengthLive);
buff.put((byte) '{');
buff.put(asString().getBytes(DataUtils.UTF8));
buff.put((byte) '}');
buff.put((byte) ' ');
}
/**
......@@ -138,7 +137,7 @@ public class Chunk {
*/
public static Chunk fromString(String s) {
HashMap<String, String> map = DataUtils.parseMap(s);
int id = Integer.parseInt(map.get("id"));
int id = Integer.parseInt(map.get("chunk"));
Chunk c = new Chunk(id);
c.start = Long.parseLong(map.get("start"));
c.length = Integer.parseInt(map.get("length"));
......@@ -173,7 +172,7 @@ public class Chunk {
*/
public String asString() {
return
"id:" + id + "," +
"chunk:" + id + "," +
"length:" + length + "," +
"maxLength:" + maxLength + "," +
"maxLengthLive:" + maxLengthLive + "," +
......
h2/src/main/org/h2/mvstore/DataUtils.java
浏览文件 @ 619817be
......@@ -570,7 +570,7 @@ public class DataUtils {
}
buff.append(key).append(':');
String v = value.toString();
if (v.indexOf(',') < 0 && v.indexOf('\"') < 0) {
if (v.indexOf(',') < 0 && v.indexOf('\"') < 0 && v.indexOf('}') < 0) {
buff.append(value);
} else {
buff.append('\"');
......@@ -595,6 +595,9 @@ public class DataUtils {
public static HashMap<String, String> parseMap(String s) {
HashMap<String, String> map = New.hashMap();
for (int i = 0, size = s.length(); i < size;) {
if (s.charAt(i) == '}') {
break;
}
int startKey = i;
i = s.indexOf(':', i);
if (i < 0) {
......@@ -607,6 +610,9 @@ public class DataUtils {
char c = s.charAt(i++);
if (c == ',') {
break;
} else if (c == '}') {
i--;
break;
} else if (c == '\"') {
while (i < size) {
c = s.charAt(i++);
......@@ -641,7 +647,8 @@ public class DataUtils {
public static int getFletcher32(byte[] bytes, int length) {
int s1 = 0xffff, s2 = 0xffff;
for (int i = 0; i < length;) {
for (int end = Math.min(i + 718, length); i < end;) {
// reduce after 360 words (each word is two bytes)
for (int end = Math.min(i + 720, length); i < end;) {
int x = ((bytes[i++] & 0xff) << 8) | (bytes[i++] & 0xff);
s2 += s1 += x;
}
......@@ -735,8 +742,8 @@ public class DataUtils {
Object a = arguments[i];
if (!(a instanceof Exception)) {
String s = a == null ? "null" : a.toString();
if (s.length() > 100) {
s = s.substring(0, 100);
if (s.length() > 1000) {
s = s.substring(0, 1000) + "...";
}
arguments[i] = s;
}
......
h2/src/main/org/h2/mvstore/MVStore.java
浏览文件 @ 619817be
......@@ -30,13 +30,15 @@ import org.h2.util.New;
/*
File format:
header: (blockSize) bytes
header: (blockSize) bytes
store header: (blockSize) bytes
store header: (blockSize) bytes
[ chunk ] *
(there are two headers for security at the beginning of the file,
and there is a header after each chunk)
header:
H:3,...
and there is a store header at the end of each chunk)
store header:
{H:2,...
Format:
Current store header:
......@@ -63,8 +65,6 @@ pageCountLive -> livePages, maxLength -> max, maxLengthLive -> liveMax,
metaRootPos -> root (offset))
+, if different: maxLive:1030,pagesLive:30
compression: support multiple algorithms
TODO:
Documentation
......@@ -148,8 +148,7 @@ MVStore:
specially for large pages (when using the StreamStore)
- StreamStore: split blocks similar to rsync crypto, where the split is made
"if the sum of the past 8196 bytes divides by 4096 with zero remainder"
- Compression: try using a bloom filter before trying to match
- DataType: change to reading and writing arrays, not individual entries
- Compression: try using a bloom filter (64 bit) before trying to match
*/
......@@ -336,7 +335,6 @@ public class MVStore {
creationTime = 0;
creationTime = getTime();
lastCommitTime = creationTime;
storeHeader.put("H", "3");
storeHeader.put("blockSize", "" + BLOCK_SIZE);
storeHeader.put("format", "" + FORMAT_WRITE);
storeHeader.put("creationTime", "" + creationTime);
......@@ -625,7 +623,7 @@ public class MVStore {
HashMap<String, String> m;
try {
m = DataUtils.parseMap(s);
} catch (IllegalArgumentException e) {
} catch (IllegalStateException e) {
continue;
}
String f = m.remove("fletcher");
......@@ -664,7 +662,7 @@ public class MVStore {
}
private byte[] getStoreHeaderBytes() {
StringBuilder buff = new StringBuilder();
StringBuilder buff = new StringBuilder("{H:2");
storeHeader.put("lastMapId", "" + lastMapId);
storeHeader.put("chunk", "" + lastChunkId);
storeHeader.put("rootChunk", "" + rootChunkStart);
......@@ -673,6 +671,7 @@ public class MVStore {
byte[] bytes = buff.toString().getBytes(DataUtils.UTF8);
int checksum = DataUtils.getFletcher32(bytes, bytes.length / 2 * 2);
DataUtils.appendMap(buff, "fletcher", Integer.toHexString(checksum));
buff.append("}\n");
bytes = buff.toString().getBytes(DataUtils.UTF8);
if (bytes.length > BLOCK_SIZE) {
throw DataUtils.newIllegalStateException(
......@@ -887,8 +886,11 @@ public class MVStore {
}
Chunk c;
c = new Chunk(++lastChunkId);
c.pageCount = Integer.MAX_VALUE;
c.pageCountLive = Integer.MAX_VALUE;
c.maxLength = Long.MAX_VALUE;
c.maxLengthLive = Long.MAX_VALUE;
c.metaRootPos = Long.MAX_VALUE;
c.start = Long.MAX_VALUE;
c.length = Integer.MAX_VALUE;
c.time = time;
......@@ -924,6 +926,9 @@ public class MVStore {
WriteBuffer buff = getWriteBuffer();
// need to patch the header later
c.writeHeader(buff);
long endHeader = buff.position();
c.pageCount = 0;
c.pageCountLive = 0;
c.maxLength = 0;
c.maxLengthLive = 0;
for (MVMap<?, ?> m : changed) {
......@@ -973,6 +978,10 @@ public class MVStore {
c.metaRootPos = metaRoot.getPos();
buff.position(0);
c.writeHeader(buff);
while (buff.position() < endHeader - 1) {
buff.put((byte) ' ');
}
buff.put((byte) '\n');
rootChunkStart = filePos;
revertTemp(storeVersion);
......@@ -1185,7 +1194,7 @@ public class MVStore {
}
private Chunk readChunkHeader(long start) {
ByteBuffer buff = fileStore.readFully(start, 40);
ByteBuffer buff = fileStore.readFully(start, Chunk.MAX_HEADER_LENGTH);
return Chunk.fromHeader(buff, start);
}
......
h2/src/main/org/h2/mvstore/MVStoreTool.java
浏览文件 @ 619817be
......@@ -73,30 +73,24 @@ public class MVStoreTool {
block.rewind();
DataUtils.readFully(file, pos, block);
block.rewind();
int tag = block.get();
if (tag == 'H') {
pw.println(" header at " + pos);
if (block.get() != '{') {
continue;
}
byte headerType = block.get();
if (headerType == 'H') {
pw.println(" store header at " + pos);
pw.println(" " + new String(block.array(), "UTF-8").trim());
pos += blockSize;
continue;
}
if (tag != 'c') {
if (headerType != 'c') {
pos += blockSize;
continue;
}
int chunkLength = block.getInt();
int chunkId = block.getInt();
int pageCount = block.getInt();
long metaRootPos = block.getLong();
long maxLength = block.getLong();
long maxLengthLive = block.getLong();
pw.println(" chunk " + chunkId +
" at " + pos +
" length " + chunkLength +
" pageCount " + pageCount +
" root " + getPosString(metaRootPos) +
" maxLength " + maxLength +
" maxLengthLive " + maxLengthLive);
block.position(0);
Chunk c = Chunk.fromHeader(block, pos);
int chunkLength = c.length;
pw.println(" " + c.toString());
ByteBuffer chunk = ByteBuffer.allocate(chunkLength);
DataUtils.readFully(file, pos, chunk);
int p = block.position();
......
h2/src/main/org/h2/mvstore/Page.java
浏览文件 @ 619817be
......@@ -758,11 +758,7 @@ public class Page {
buff = ByteBuffer.allocate(l);
compressor.expand(comp, 0, compLen, buff.array(), buff.arrayOffset(), l);
}
DataType keyType = map.getKeyType();
for (int i = 0; i < len; i++) {
Object k = keyType.read(buff);
keys[i] = k;
}
map.getKeyType().read(buff, keys, len, true);
if (node) {
childCount = len + 1;
children = new long[len + 1];
......@@ -780,11 +776,7 @@ public class Page {
totalCount = total;
} else {
values = new Object[len];
DataType valueType = map.getValueType();
for (int i = 0; i < len; i++) {
Object v = valueType.read(buff);
values[i] = v;
}
map.getValueType().read(buff, values, len, false);
totalCount = len;
}
recalculateMemory();
......@@ -807,10 +799,7 @@ public class Page {
putVarInt(len).
put((byte) type);
int compressStart = buff.position();
DataType keyType = map.getKeyType();
for (int i = 0; i < len; i++) {
keyType.write(buff, keys[i]);
}
map.getKeyType().write(buff, keys, len, true);
if (type == DataUtils.PAGE_TYPE_NODE) {
for (int i = 0; i <= len; i++) {
buff.putLong(children[i]);
......@@ -819,10 +808,7 @@ public class Page {
buff.putVarLong(counts[i]);
}
} else {
DataType valueType = map.getValueType();
for (int i = 0; i < len; i++) {
valueType.write(buff, values[i]);
}
map.getValueType().write(buff, values, len, false);
}
MVStore store = map.getStore();
if (store.getCompress()) {
......
h2/src/main/org/h2/mvstore/db/TransactionStore.java
浏览文件 @ 619817be
......@@ -1509,6 +1509,20 @@ public class TransactionStore {
return Long.signum(comp);
}
@Override
public void read(ByteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
obj[i] = read(buff);
}
}
@Override
public void write(WriteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
write(buff, obj[i]);
}
}
@Override
public void write(WriteBuffer buff, Object obj) {
VersionedValue v = (VersionedValue) obj;
......@@ -1578,6 +1592,20 @@ public class TransactionStore {
return 0;
}
@Override
public void read(ByteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
obj[i] = read(buff);
}
}
@Override
public void write(WriteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
write(buff, obj[i]);
}
}
@Override
public void write(WriteBuffer buff, Object obj) {
Object[] array = (Object[]) obj;
......
h2/src/main/org/h2/mvstore/db/ValueDataType.java
浏览文件 @ 619817be
......@@ -144,6 +144,20 @@ public class ValueDataType implements DataType {
return v == null ? 0 : v.getMemory();
}
@Override
public void read(ByteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
obj[i] = read(buff);
}
}
@Override
public void write(WriteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
write(buff, obj[i]);
}
}
@Override
public Object read(ByteBuffer buff) {
return readValue(buff);
......
h2/src/main/org/h2/mvstore/rtree/SpatialDataType.java
浏览文件 @ 619817be
......@@ -53,6 +53,20 @@ public class SpatialDataType implements DataType {
return 40 + dimensions * 4;
}
@Override
public void read(ByteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
obj[i] = read(buff);
}
}
@Override
public void write(WriteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
write(buff, obj[i]);
}
}
@Override
public void write(WriteBuffer buff, Object obj) {
SpatialKey k = (SpatialKey) obj;
......
h2/src/main/org/h2/mvstore/type/DataType.java
浏览文件 @ 619817be
......@@ -34,13 +34,23 @@ public interface DataType {
int getMemory(Object obj);
/**
* Write the object.
* Write an object.
*
* @param buff the target buffer
* @param obj the value
*/
void write(WriteBuffer buff, Object obj);
/**
* Write a list of objects.
*
* @param buff the target buffer
* @param obj the objects
* @param len the number of objects to write
* @param key whether the objects are keys
*/
void write(WriteBuffer buff, Object[] obj, int len, boolean key);
/**
* Read an object.
*
......@@ -49,5 +59,15 @@ public interface DataType {
*/
Object read(ByteBuffer buff);
/**
* Read a list of objects.
*
* @param buff the target buffer
* @param obj the objects
* @param len the number of objects to read
* @param key whether the objects are keys
*/
void read(ByteBuffer buff, Object[] obj, int len, boolean key);
}
h2/src/main/org/h2/mvstore/type/ObjectDataType.java
浏览文件 @ 619817be
......@@ -95,7 +95,8 @@ public class ObjectDataType implements DataType {
Float.class, Double.class, BigDecimal.class, String.class,
UUID.class, Date.class };
private static final HashMap<Class<?>, Integer> COMMON_CLASSES_MAP = New.hashMap();
private static final HashMap<Class<?>, Integer> COMMON_CLASSES_MAP = New
.hashMap();
private AutoDetectDataType last = new StringType(this);
......@@ -109,6 +110,20 @@ public class ObjectDataType implements DataType {
return last.getMemory(obj);
}
@Override
public void read(ByteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
obj[i] = read(buff);
}
}
@Override
public void write(WriteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
write(buff, obj[i]);
}
}
@Override
public void write(WriteBuffer buff, Object obj) {
last.write(buff, obj);
......@@ -149,8 +164,7 @@ public class ObjectDataType implements DataType {
case TYPE_SERIALIZED_OBJECT:
return new SerializedObjectType(this);
}
throw DataUtils.newIllegalStateException(
DataUtils.ERROR_INTERNAL,
throw DataUtils.newIllegalStateException(DataUtils.ERROR_INTERNAL,
"Unsupported type {0}", typeId);
}
......@@ -161,7 +175,7 @@ public class ObjectDataType implements DataType {
if (tag <= TYPE_SERIALIZED_OBJECT) {
typeId = tag;
} else {
switch(tag) {
switch (tag) {
case TAG_BOOLEAN_TRUE:
typeId = TYPE_BOOLEAN;
break;
......@@ -197,16 +211,18 @@ public class ObjectDataType implements DataType {
default:
if (tag >= TAG_INTEGER_0_15 && tag <= TAG_INTEGER_0_15 + 15) {
typeId = TYPE_INT;
} else if (tag >= TAG_STRING_0_15 && tag <= TAG_STRING_0_15 + 15) {
} else if (tag >= TAG_STRING_0_15
&& tag <= TAG_STRING_0_15 + 15) {
typeId = TYPE_STRING;
} else if (tag >= TAG_LONG_0_7 && tag <= TAG_LONG_0_7 + 7) {
typeId = TYPE_LONG;
} else if (tag >= TAG_BYTE_ARRAY_0_15 && tag <= TAG_BYTE_ARRAY_0_15 + 15) {
} else if (tag >= TAG_BYTE_ARRAY_0_15
&& tag <= TAG_BYTE_ARRAY_0_15 + 15) {
typeId = TYPE_ARRAY;
} else {
throw DataUtils.newIllegalStateException(
DataUtils.ERROR_FILE_CORRUPT,
"Unknown tag {0}", tag);
DataUtils.ERROR_FILE_CORRUPT, "Unknown tag {0}",
tag);
}
}
}
......@@ -415,15 +431,28 @@ public class ObjectDataType implements DataType {
return Integer.signum(typeDiff);
}
@Override
public void write(WriteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
write(buff, obj[i]);
}
}
@Override
public void write(WriteBuffer buff, Object o) {
getType(o).write(buff, o);
}
@Override
public void read(ByteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
obj[i] = read(buff);
}
}
@Override
public final Object read(ByteBuffer buff) {
throw DataUtils.newIllegalStateException(
DataUtils.ERROR_INTERNAL,
throw DataUtils.newIllegalStateException(DataUtils.ERROR_INTERNAL,
"Internal error");
}
......@@ -688,20 +717,16 @@ public class ObjectDataType implements DataType {
if (x < 0) {
// -Integer.MIN_VALUE is smaller than 0
if (-x < 0 || -x > DataUtils.COMPRESSED_VAR_INT_MAX) {
buff.put((byte) TAG_INTEGER_FIXED).
putInt(x);
buff.put((byte) TAG_INTEGER_FIXED).putInt(x);
} else {
buff.put((byte) TAG_INTEGER_NEGATIVE).
putVarInt(-x);
buff.put((byte) TAG_INTEGER_NEGATIVE).putVarInt(-x);
}
} else if (x <= 15) {
buff.put((byte) (TAG_INTEGER_0_15 + x));
} else if (x <= DataUtils.COMPRESSED_VAR_INT_MAX) {
buff.put((byte) TYPE_INT).
putVarInt(x);
buff.put((byte) TYPE_INT).putVarInt(x);
} else {
buff.put((byte) TAG_INTEGER_FIXED).
putInt(x);
buff.put((byte) TAG_INTEGER_FIXED).putInt(x);
}
}
......@@ -825,11 +850,9 @@ public class ObjectDataType implements DataType {
} else {
int value = Integer.reverse(f);
if (value >= 0 && value <= DataUtils.COMPRESSED_VAR_INT_MAX) {
buff.put((byte) TYPE_FLOAT).
putVarInt(value);
buff.put((byte) TYPE_FLOAT).putVarInt(value);
} else {
buff.put((byte) TAG_FLOAT_FIXED).
putFloat(x);
buff.put((byte) TAG_FLOAT_FIXED).putFloat(x);
}
}
}
......@@ -844,7 +867,8 @@ public class ObjectDataType implements DataType {
case TAG_FLOAT_FIXED:
return buff.getFloat();
}
return Float.intBitsToFloat(Integer.reverse(DataUtils.readVarInt(buff)));
return Float.intBitsToFloat(Integer.reverse(DataUtils
.readVarInt(buff)));
}
}
......@@ -907,7 +931,8 @@ public class ObjectDataType implements DataType {
case TAG_DOUBLE_FIXED:
return buff.getDouble();
}
return Double.longBitsToDouble(Long.reverse(DataUtils.readVarLong(buff)));
return Double.longBitsToDouble(Long.reverse(DataUtils
.readVarLong(buff)));
}
}
......@@ -950,13 +975,12 @@ public class ObjectDataType implements DataType {
} else {
int bits = x.bitLength();
if (bits <= 63) {
buff.put((byte) TAG_BIG_INTEGER_SMALL).
putVarLong(x.longValue());
buff.put((byte) TAG_BIG_INTEGER_SMALL).putVarLong(
x.longValue());
} else {
byte[] bytes = x.toByteArray();
buff.put((byte) TYPE_BIG_INTEGER).
putVarInt(bytes.length).
put(bytes);
buff.put((byte) TYPE_BIG_INTEGER).putVarInt(bytes.length)
.put(bytes);
}
}
}
......@@ -1022,16 +1046,14 @@ public class ObjectDataType implements DataType {
if (scale == 0) {
buff.put((byte) TAG_BIG_DECIMAL_SMALL);
} else {
buff.put((byte) TAG_BIG_DECIMAL_SMALL_SCALED).
putVarInt(scale);
buff.put((byte) TAG_BIG_DECIMAL_SMALL_SCALED)
.putVarInt(scale);
}
buff.putVarLong(b.longValue());
} else {
byte[] bytes = b.toByteArray();
buff.put((byte) TYPE_BIG_DECIMAL).
putVarInt(scale).
putVarInt(bytes.length).
put(bytes);
buff.put((byte) TYPE_BIG_DECIMAL).putVarInt(scale)
.putVarInt(bytes.length).put(bytes);
}
}
}
......@@ -1095,8 +1117,7 @@ public class ObjectDataType implements DataType {
if (len <= 15) {
buff.put((byte) (TAG_STRING_0_15 + len));
} else {
buff.put((byte) TYPE_STRING).
putVarInt(len);
buff.put((byte) TYPE_STRING).putVarInt(len);
}
buff.putStringData(s, len);
}
......@@ -1283,28 +1304,23 @@ public class ObjectDataType implements DataType {
for (int i = 0; i < len; i++) {
int x;
if (type == boolean.class) {
x = Integer.signum(
(((boolean[]) aObj)[i] ? 1 : 0) -
(((boolean[]) bObj)[i] ? 1 : 0));
x = Integer.signum((((boolean[]) aObj)[i] ? 1 : 0)
- (((boolean[]) bObj)[i] ? 1 : 0));
} else if (type == char.class) {
x = Integer.signum(
(((char[]) aObj)[i]) -
(((char[]) bObj)[i]));
x = Integer.signum((((char[]) aObj)[i])
- (((char[]) bObj)[i]));
} else if (type == short.class) {
x = Integer.signum(
(((short[]) aObj)[i]) -
(((short[]) bObj)[i]));
x = Integer.signum((((short[]) aObj)[i])
- (((short[]) bObj)[i]));
} else if (type == int.class) {
int a = ((int[]) aObj)[i];
int b = ((int[]) bObj)[i];
x = a == b ? 0 : a < b ? -1 : 1;
} else if (type == float.class) {
x = Float.compare(
((float[]) aObj)[i],
x = Float.compare(((float[]) aObj)[i],
((float[]) bObj)[i]);
} else if (type == double.class) {
x = Double.compare(
((double[]) aObj)[i],
x = Double.compare(((double[]) aObj)[i],
((double[]) bObj)[i]);
} else {
long a = ((long[]) aObj)[i];
......@@ -1344,17 +1360,16 @@ public class ObjectDataType implements DataType {
if (len <= 15) {
buff.put((byte) (TAG_BYTE_ARRAY_0_15 + len));
} else {
buff.put((byte) TYPE_ARRAY).
put((byte) classId.intValue()).
putVarInt(len);
buff.put((byte) TYPE_ARRAY)
.put((byte) classId.intValue())
.putVarInt(len);
}
buff.put(data);
return;
}
int len = Array.getLength(obj);
buff.put((byte) TYPE_ARRAY).
put((byte) classId.intValue()).
putVarInt(len);
buff.put((byte) TYPE_ARRAY).put((byte) classId.intValue())
.putVarInt(len);
for (int i = 0; i < len; i++) {
if (type == boolean.class) {
buff.put((byte) (((boolean[]) obj)[i] ? 1 : 0));
......@@ -1374,11 +1389,9 @@ public class ObjectDataType implements DataType {
}
return;
}
buff.put((byte) TYPE_ARRAY).
put((byte) classId.intValue());
buff.put((byte) TYPE_ARRAY).put((byte) classId.intValue());
} else {
buff.put((byte) TYPE_ARRAY).
put((byte) -1);
buff.put((byte) TYPE_ARRAY).put((byte) -1);
String c = type.getName();
StringDataType.INSTANCE.write(buff, c);
}
......@@ -1409,8 +1422,7 @@ public class ObjectDataType implements DataType {
} catch (Exception e) {
throw DataUtils.newIllegalStateException(
DataUtils.ERROR_SERIALIZATION,
"Could not get class {0}",
componentType, e);
"Could not get class {0}", componentType, e);
}
} else {
clazz = COMMON_CLASSES[ct];
......@@ -1421,8 +1433,8 @@ public class ObjectDataType implements DataType {
} catch (Exception e) {
throw DataUtils.newIllegalStateException(
DataUtils.ERROR_SERIALIZATION,
"Could not create array of type {0} length {1}",
clazz, len, e);
"Could not create array of type {0} length {1}", clazz,
len, e);
}
if (clazz.isPrimitive()) {
for (int i = 0; i < len; i++) {
......@@ -1509,9 +1521,8 @@ public class ObjectDataType implements DataType {
return;
}
byte[] data = serialize(obj);
buff.put((byte) TYPE_SERIALIZED_OBJECT).
putVarInt(data.length).
put(data);
buff.put((byte) TYPE_SERIALIZED_OBJECT).putVarInt(data.length)
.put(data);
}
@Override
......
h2/src/main/org/h2/mvstore/type/StringDataType.java
浏览文件 @ 619817be
......@@ -27,6 +27,20 @@ public class StringDataType implements DataType {
return 24 + 2 * obj.toString().length();
}
@Override
public void read(ByteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
obj[i] = read(buff);
}
}
@Override
public void write(WriteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
write(buff, obj[i]);
}
}
@Override
public String read(ByteBuffer buff) {
int len = DataUtils.readVarInt(buff);
......
h2/src/test/org/h2/test/store/RowDataType.java
浏览文件 @ 619817be
......@@ -59,6 +59,20 @@ public class RowDataType implements DataType {
return memory;
}
@Override
public void read(ByteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
obj[i] = read(buff);
}
}
@Override
public void write(WriteBuffer buff, Object[] obj, int len, boolean key) {
for (int i = 0; i < len; i++) {
write(buff, obj[i]);
}
}
@Override
public Object[] read(ByteBuffer buff) {
int len = DataUtils.readVarInt(buff);
......
h2/src/test/org/h2/test/store/TestDataUtils.java
浏览文件 @ 619817be
......@@ -79,15 +79,17 @@ public class TestDataUtils extends TestBase {
DataUtils.appendMap(buff, "b", ",");
DataUtils.appendMap(buff, "c", "1,2");
DataUtils.appendMap(buff, "d", "\"test\"");
assertEquals(":,a:1,b:\",\",c:\"1,2\",d:\"\\\"test\\\"\"", buff.toString());
DataUtils.appendMap(buff, "e", "}");
assertEquals(":,a:1,b:\",\",c:\"1,2\",d:\"\\\"test\\\"\",e:\"}\"", buff.toString());
HashMap<String, String> m = DataUtils.parseMap(buff.toString());
assertEquals(5, m.size());
assertEquals(6, m.size());
assertEquals("", m.get(""));
assertEquals("1", m.get("a"));
assertEquals(",", m.get("b"));
assertEquals("1,2", m.get("c"));
assertEquals("\"test\"", m.get("d"));
assertEquals("}", m.get("e"));
}
private void testMapRandomized() {
......
h2/src/test/org/h2/test/store/TestMVStore.java
浏览文件 @ 619817be
......@@ -597,7 +597,7 @@ public class TestMVStore extends TestBase {
}
s.close();
int[] expectedReadsForCacheSize = {
3406, 2590, 1924, 1440, 1102, 956, 918
3407, 2590, 1924, 1440, 1096, 956, 918
};
for (int cacheSize = 0; cacheSize <= 6; cacheSize += 4) {
int cacheMB = 1 + 3 * cacheSize;
......@@ -647,7 +647,7 @@ public class TestMVStore extends TestBase {
String fileName = getBaseDir() + "/testFileHeader.h3";
MVStore s = openStore(fileName);
long time = System.currentTimeMillis();
assertEquals("3", s.getStoreHeader().get("H"));
assertEquals("1", s.getStoreHeader().get("format"));
long creationTime = Long.parseLong(s.getStoreHeader()
.get("creationTime"));
assertTrue(Math.abs(time - creationTime) < 100);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论