提交 d41bc89b authored 作者: Thomas Mueller's avatar Thomas Mueller

Fix formatting

上级 3e613ede
......@@ -64,7 +64,7 @@ public class MVMap<K, V> extends AbstractMap<K, V>
this.valueType = valueType;
this.root = Page.createEmpty(this, -1);
}
/**
* Get the metadata key for the root of the given map id.
*
......@@ -1032,9 +1032,10 @@ public class MVMap<K, V> extends AbstractMap<K, V>
;
// TODO work in progress
if(oldRoots.size() - list.size() > 1) {
// System.out.println("reduced! from " + oldRoots.size() + " to " + list.size() +" " + getClass());
// System.out.println("reduced! from " +
// oldRoots.size() + " to " + list.size() +" " + getClass());
}
oldRoots = list;
}
......@@ -1297,19 +1298,19 @@ public class MVMap<K, V> extends AbstractMap<K, V>
void setWriteVersion(long writeVersion) {
this.writeVersion = writeVersion;
}
void copyFrom(MVMap<K, V> sourceMap) {
; // TODO work in progress
root = copy(sourceMap.root, null);
}
private Page copy(Page source, CursorPos parent) {
Page target = Page.create(this, writeVersion, source);
for (CursorPos p = parent; p != null; p = p.parent) {
p.page.setChild(p.index, target);
}
if (!target.isLeaf()) {
CursorPos pos = new CursorPos(target, 0, parent);
CursorPos pos = new CursorPos(target, 0, parent);
target = copyOnWrite(target, writeVersion);
for (int i = 0; i < target.getChildPageCount(); i++) {
Page sourceChild = source.getChildPage(i);
......
......@@ -297,8 +297,9 @@ public class MVStoreTool {
}
/**
* Compress the store by creating a new file and copying the live pages there.
*
* Compress the store by creating a new file and copying the live pages
* there.
*
* @param fileName the file name
*/
public static void compress(String fileName) {
......@@ -307,10 +308,10 @@ public class MVStoreTool {
FileUtils.moveTo(fileName, fileName);
FileUtils.delete(fileName + ".old");
}
/**
* Copy all live pages from the source store to the target store.
*
*
* @param sourceFileName the name of the source store
* @param targetFileName the name of the target store
*/
......@@ -337,7 +338,7 @@ public class MVStoreTool {
}
}
for (String mapName : source.getMapNames()) {
MVMap.Builder<Object, Object> mp =
MVMap.Builder<Object, Object> mp =
new MVMap.Builder<Object, Object>().
keyType(new GenericDataType()).
valueType(new GenericDataType());
......
......@@ -163,7 +163,7 @@ public class Page {
}
return p;
}
public static Page create(MVMap<?, ?> map, long version, Page source) {
Page p = new Page(map, version);
// the position is 0
......
......@@ -119,6 +119,7 @@ import org.h2.test.store.TestKillProcessWhileWriting;
import org.h2.test.store.TestMVRTree;
import org.h2.test.store.TestMVStore;
import org.h2.test.store.TestMVStoreBenchmark;
import org.h2.test.store.TestMVStoreTool;
import org.h2.test.store.TestMVTableEngine;
import org.h2.test.store.TestObjectDataType;
import org.h2.test.store.TestRandomMapOps;
......@@ -746,6 +747,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
new TestMVRTree().runTest(this);
new TestMVStore().runTest(this);
new TestMVStoreBenchmark().runTest(this);
new TestMVStoreTool().runTest(this);
new TestMVTableEngine().runTest(this);
new TestObjectDataType().runTest(this);
new TestRandomMapOps().runTest(this);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论