提交 62a20456 authored 作者: noelgrandin's avatar noelgrandin

remove optimisation to ArrayType#write - this code is only used to write undolog…

remove optimisation to ArrayType#write - this code is only used to write undolog entries, which hardly ever hit disk anyway
上级 922e3a7b
...@@ -1680,68 +1680,16 @@ public class TransactionStore { ...@@ -1680,68 +1680,16 @@ public class TransactionStore {
@Override @Override
public void read(ByteBuffer buff, Object[] obj, public void read(ByteBuffer buff, Object[] obj,
int len, boolean key) { int len, boolean key) {
if (PACK_DATA2) { for (int i = 0; i < len; i++) {
// Read the not-null-indicators. obj[i] = read(buff);
final byte[] notNullIndicators = new byte[(len * arrayLength + 7) / 8];
buff.get(notNullIndicators, 0, notNullIndicators.length);
// Read the values.
for (int i = 0; i < len; i++) {
Object[] array = new Object[arrayLength];
obj[i] = array;
for (int j = 0; j < arrayLength; j++) {
int x = notNullIndicators[(i * arrayLength + j) / 8] & 0xff;
x = x >> ((i * arrayLength + j) % 8);
x = x & 1;
if (x == 1) {
array[j] = elementTypes[j].read(buff);
}
}
}
} else {
for (int i = 0; i < len; i++) {
obj[i] = read(buff);
}
} }
} }
@Override @Override
public void write(WriteBuffer buff, Object[] obj, public void write(WriteBuffer buff, Object[] obj,
int len, boolean key) { int len, boolean key) {
if (PACK_DATA2) { for (int i = 0; i < len; i++) {
// Write the null/not-null indicators as a bit-packed array write(buff, obj[i]);
int x = 0;
int byteIdx = 0;
for (int i = 0; i < len; i++) {
Object[] array = (Object[]) obj[i];
for (int j = 0; j < arrayLength; j++) {
if (array[j] != null) {
x |= 1 << byteIdx;
}
byteIdx++;
if (byteIdx == 8) {
buff.put((byte) x);
byteIdx = 0;
x = 0;
}
}
}
if (byteIdx != 0) {
buff.put((byte) x);
}
// Write the values.
for (int i = 0; i < len; i++) {
Object[] array = (Object[]) obj[i];
for (int j = 0; j < arrayLength; j++) {
if (array[j] != null) {
elementTypes[j].write(buff, array[j]);
}
}
}
} else {
for (int i = 0; i < len; i++) {
write(buff, obj[i]);
}
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论