A persistent multi-version map: move to the main source tree

f23e48cd · Thomas Mueller · f5ed1487 · f23e48cd · f23e48cd · f23e48cd
--- a/h2/src/main/org/h2/mvstore/rtree/package.html
+++ b/h2/src/main/org/h2/mvstore/rtree/package.html
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+Copyright 2004-2011 H2 Group. Multiple-Licensed under the H2 License, Version 1.0,
+and under the Eclipse Public License, Version 1.0
+(http://h2database.com/html/license.html).
+Initial Developer: H2 Group
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" /><title>
+Javadoc package documentation
+</title></head><body style="font: 9pt/130% Tahoma, Arial, Helvetica, sans-serif; font-weight: normal;"><p>
+
+An R-tree implementation
+
+</p></body></html>
\ No newline at end of file
--- a/h2/src/main/org/h2/mvstore/type/package.html
+++ b/h2/src/main/org/h2/mvstore/type/package.html
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+Copyright 2004-2011 H2 Group. Multiple-Licensed under the H2 License, Version 1.0,
+and under the Eclipse Public License, Version 1.0
+(http://h2database.com/html/license.html).
+Initial Developer: H2 Group
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" /><title>
+Javadoc package documentation
+</title></head><body style="font: 9pt/130% Tahoma, Arial, Helvetica, sans-serif; font-weight: normal;"><p>
+
+Data types and serialization / deserialization
+
+</p></body></html>
\ No newline at end of file
--- a/h2/src/test/org/h2/test/store/RowType.java
+++ b/h2/src/test/org/h2/test/store/RowType.java
@@ -7,9 +7,9 @@
 package org.h2.test.store;

 import java.nio.ByteBuffer;
-import org.h2.dev.store.btree.DataUtils;
-import org.h2.dev.store.type.DataType;
-import org.h2.dev.store.type.DataTypeFactory;
+import org.h2.mvstore.DataUtils;
+import org.h2.mvstore.type.DataType;
+import org.h2.mvstore.type.DataTypeFactory;
 import org.h2.util.StringUtils;

 /**

--- a/h2/src/test/org/h2/test/store/SampleTypeFactory.java
+++ b/h2/src/test/org/h2/test/store/SampleTypeFactory.java
@@ -5,8 +5,8 @@
 */
 package org.h2.test.store;

-import org.h2.dev.store.type.DataType;
-import org.h2.dev.store.type.DataTypeFactory;
+import org.h2.mvstore.type.DataType;
+import org.h2.mvstore.type.DataTypeFactory;
 /**
 * A data type factory.
 */

--- a/h2/src/test/org/h2/test/store/SequenceMap.java
+++ b/h2/src/test/org/h2/test/store/SequenceMap.java
@@ -10,8 +10,8 @@ import java.util.AbstractSet;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Set;
-import org.h2.dev.store.btree.MVMap;
-import org.h2.dev.store.btree.MVStore;
+import org.h2.mvstore.MVMap;
+import org.h2.mvstore.MVStore;

 /**
 * A custom map returning the keys and values values 1 .. 10.

--- a/h2/src/test/org/h2/test/store/TestCacheConcurrentLIRS.java
+++ b/h2/src/test/org/h2/test/store/TestCacheConcurrentLIRS.java
@@ -8,7 +8,7 @@ package org.h2.test.store;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.h2.dev.store.cache.CacheLongKeyLIRS;
+import org.h2.mvstore.cache.CacheLongKeyLIRS;
 import org.h2.test.TestBase;
 import org.h2.util.Task;


--- a/h2/src/test/org/h2/test/store/TestCacheLIRS.java
+++ b/h2/src/test/org/h2/test/store/TestCacheLIRS.java
@@ -10,7 +10,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Random;
-import org.h2.dev.store.cache.CacheLIRS;
+import org.h2.mvstore.cache.CacheLIRS;
 import org.h2.test.TestBase;
 import org.h2.util.New;


--- a/h2/src/test/org/h2/test/store/TestCacheLongKeyLIRS.java
+++ b/h2/src/test/org/h2/test/store/TestCacheLongKeyLIRS.java
@@ -10,7 +10,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Random;
-import org.h2.dev.store.cache.CacheLongKeyLIRS;
+import org.h2.mvstore.cache.CacheLongKeyLIRS;
 import org.h2.test.TestBase;
 import org.h2.util.New;


--- a/h2/src/test/org/h2/test/store/TestConcurrent.java
+++ b/h2/src/test/org/h2/test/store/TestConcurrent.java
@@ -14,10 +14,10 @@ import java.nio.channels.FileChannel;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Random;
-import org.h2.dev.store.btree.MVMap;
-import org.h2.dev.store.btree.MVStore;
-import org.h2.dev.store.btree.MVStoreBuilder;
-import org.h2.dev.store.type.ObjectTypeFactory;
+import org.h2.mvstore.MVMap;
+import org.h2.mvstore.MVStore;
+import org.h2.mvstore.MVStoreBuilder;
+import org.h2.mvstore.type.ObjectTypeFactory;
 import org.h2.store.fs.FileUtils;
 import org.h2.test.TestBase;
 import org.h2.util.Task;

--- a/h2/src/test/org/h2/test/store/TestDataUtils.java
+++ b/h2/src/test/org/h2/test/store/TestDataUtils.java
@@ -10,7 +10,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.HashMap;
-import org.h2.dev.store.btree.DataUtils;
+import org.h2.mvstore.DataUtils;
 import org.h2.test.TestBase;

 /**

--- a/h2/src/test/org/h2/test/store/TestMVRTree.java
+++ b/h2/src/test/org/h2/test/store/TestMVRTree.java
@@ -20,11 +20,11 @@ import java.util.Random;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageWriter;
 import javax.imageio.stream.FileImageOutputStream;
-import org.h2.dev.store.btree.MVStore;
-import org.h2.dev.store.rtree.MVRTreeMap;
-import org.h2.dev.store.rtree.SpatialKey;
-import org.h2.dev.store.type.ObjectType;
-import org.h2.dev.store.type.StringType;
+import org.h2.mvstore.MVStore;
+import org.h2.mvstore.rtree.MVRTreeMap;
+import org.h2.mvstore.rtree.SpatialKey;
+import org.h2.mvstore.type.ObjectType;
+import org.h2.mvstore.type.StringType;
 import org.h2.store.fs.FileUtils;
 import org.h2.test.TestBase;
 import org.h2.util.New;

--- a/h2/src/test/org/h2/test/store/TestMVStore.java
+++ b/h2/src/test/org/h2/test/store/TestMVStore.java
@@ -13,14 +13,14 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Random;
 import java.util.TreeMap;
-import org.h2.dev.store.btree.Cursor;
-import org.h2.dev.store.btree.MVMap;
-import org.h2.dev.store.btree.MVStore;
-import org.h2.dev.store.btree.MVStoreBuilder;
-import org.h2.dev.store.type.DataType;
-import org.h2.dev.store.type.ObjectType;
-import org.h2.dev.store.type.ObjectTypeFactory;
-import org.h2.dev.store.type.StringType;
+import org.h2.mvstore.Cursor;
+import org.h2.mvstore.MVMap;
+import org.h2.mvstore.MVStore;
+import org.h2.mvstore.MVStoreBuilder;
+import org.h2.mvstore.type.DataType;
+import org.h2.mvstore.type.ObjectType;
+import org.h2.mvstore.type.ObjectTypeFactory;
+import org.h2.mvstore.type.StringType;
 import org.h2.store.fs.FilePath;
 import org.h2.store.fs.FileUtils;
 import org.h2.test.TestBase;

--- a/h2/src/test/org/h2/test/store/TestObjectType.java
+++ b/h2/src/test/org/h2/test/store/TestObjectType.java
@@ -13,7 +13,7 @@ import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.Random;
 import java.util.UUID;
-import org.h2.dev.store.type.ObjectType;
+import org.h2.mvstore.type.ObjectType;
 import org.h2.test.TestBase;

 /**

--- a/h2/src/test/org/h2/test/store/TestStreamStore.java
+++ b/h2/src/test/org/h2/test/store/TestStreamStore.java
@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.h2.dev.store.btree.StreamStore;
+import org.h2.mvstore.StreamStore;
 import org.h2.test.TestBase;
 import org.h2.util.IOUtils;
 import org.h2.util.New;