TransactionStore move

h2/src/main/org/h2/engine/Session.java

@@ -32,8 +32,8 @@ import org.h2.message.Trace;
 import org.h2.message.TraceSystem;
 import org.h2.mvstore.db.MVTable;
 import org.h2.mvstore.db.MVTableEngine;
-import org.h2.mvstore.db.TransactionStore.Change;
-import org.h2.mvstore.db.TransactionStore.Transaction;
+import org.h2.mvstore.tx.TransactionStore.Change;
+import org.h2.mvstore.tx.TransactionStore.Transaction;
 import org.h2.result.ResultInterface;
 import org.h2.result.Row;
 import org.h2.result.SortOrder;

h2/src/main/org/h2/mvstore/db/MVPrimaryIndex.java

@@ -19,8 +19,8 @@ import org.h2.index.Cursor;
 import org.h2.index.IndexType;
 import org.h2.message.DbException;
 import org.h2.mvstore.DataUtils;
-import org.h2.mvstore.db.TransactionStore.Transaction;
-import org.h2.mvstore.db.TransactionStore.TransactionMap;
+import org.h2.mvstore.tx.TransactionStore.Transaction;
+import org.h2.mvstore.tx.TransactionStore.TransactionMap;
 import org.h2.result.Row;
 import org.h2.result.SearchRow;
 import org.h2.result.SortOrder;

h2/src/main/org/h2/mvstore/db/MVSecondaryIndex.java

@@ -20,8 +20,8 @@ import org.h2.index.Cursor;
 import org.h2.index.IndexType;
 import org.h2.message.DbException;
 import org.h2.mvstore.MVMap;
-import org.h2.mvstore.db.TransactionStore.Transaction;
-import org.h2.mvstore.db.TransactionStore.TransactionMap;
+import org.h2.mvstore.tx.TransactionStore.Transaction;
+import org.h2.mvstore.tx.TransactionStore.TransactionMap;
 import org.h2.result.Row;
 import org.h2.result.SearchRow;
 import org.h2.result.SortOrder;

h2/src/main/org/h2/mvstore/db/MVSpatialIndex.java

@@ -17,10 +17,10 @@ import org.h2.index.IndexType;
 import org.h2.index.SpatialIndex;
 import org.h2.index.SpatialTreeIndex;
 import org.h2.message.DbException;
-import org.h2.mvstore.db.TransactionStore.Transaction;
-import org.h2.mvstore.db.TransactionStore.TransactionMap;
-import org.h2.mvstore.db.TransactionStore.VersionedValue;
-import org.h2.mvstore.db.TransactionStore.VersionedValueType;
+import org.h2.mvstore.tx.TransactionStore.Transaction;
+import org.h2.mvstore.tx.TransactionStore.TransactionMap;
+import org.h2.mvstore.tx.TransactionStore.VersionedValue;
+import org.h2.mvstore.tx.TransactionStore.VersionedValueType;
 import org.h2.mvstore.rtree.MVRTreeMap;
 import org.h2.mvstore.rtree.MVRTreeMap.RTreeCursor;
 import org.h2.mvstore.rtree.SpatialKey;

h2/src/main/org/h2/mvstore/db/MVTable.java

@@ -30,7 +30,8 @@ import org.h2.message.DbException;
 import org.h2.message.Trace;
 import org.h2.mvstore.DataUtils;
 import org.h2.mvstore.db.MVTableEngine.Store;
-import org.h2.mvstore.db.TransactionStore.Transaction;
+import org.h2.mvstore.tx.TransactionStore;
+import org.h2.mvstore.tx.TransactionStore.Transaction;
 import org.h2.result.Row;
 import org.h2.result.SortOrder;
 import org.h2.schema.SchemaObject;

h2/src/main/org/h2/mvstore/db/MVTableEngine.java

@@ -25,11 +25,10 @@ import org.h2.engine.Session;
 import org.h2.message.DbException;
 import org.h2.mvstore.DataUtils;
 import org.h2.mvstore.FileStore;
-import org.h2.mvstore.MVMap;
 import org.h2.mvstore.MVStore;
 import org.h2.mvstore.MVStoreTool;
-import org.h2.mvstore.db.TransactionStore.Transaction;
-import org.h2.mvstore.db.TransactionStore.TransactionMap;
+import org.h2.mvstore.tx.TransactionStore;
+import org.h2.mvstore.tx.TransactionStore.Transaction;
 import org.h2.store.InDoubtTransaction;
 import org.h2.store.fs.FileChannelInputStream;
 import org.h2.store.fs.FileUtils;

h2/src/main/org/h2/mvstore/db/TransactionStore.java → h2/src/main/org/h2/mvstore/tx/TransactionStore.java

@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.mvstore.db;
+package org.h2.mvstore.tx;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -903,7 +903,7 @@ public class TransactionStore {
         /**
          * The map id.
          */
-        public final int mapId;
+        final int mapId;
 
         /**
          * If a record was read that was updated by this transaction, and the
@@ -919,7 +919,7 @@ public class TransactionStore {
          * Key: key the key of the data.
          * Value: { transactionId, oldVersion, value }
          */
-        final MVMap<K, VersionedValue> map;
+        public final MVMap<K, VersionedValue> map;
 
         /**
          * The transaction which is used for this map.

h2/src/main/org/h2/mvstore/tx/package.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+Copyright 2004-2014 H2 Group. Multiple-Licensed under the MPL 2.0, Version 1.0,
+and under the Eclipse Public License, Version 1.0
+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>
+
+Helper classes to use the MVStore in a transactional manner.
+
+</p></body></html>
\ No newline at end of file

h2/src/main/org/h2/tools/Recover.java

@@ -42,8 +42,8 @@ import org.h2.mvstore.MVMap;
 import org.h2.mvstore.MVStore;
 import org.h2.mvstore.MVStoreTool;
 import org.h2.mvstore.StreamStore;
-import org.h2.mvstore.db.TransactionStore;
-import org.h2.mvstore.db.TransactionStore.TransactionMap;
+import org.h2.mvstore.tx.TransactionStore;
+import org.h2.mvstore.tx.TransactionStore.TransactionMap;
 import org.h2.mvstore.db.ValueDataType;
 import org.h2.result.Row;
 import org.h2.result.RowFactory;

h2/src/test/org/h2/test/store/TestMVTableEngine.java

@@ -26,7 +26,7 @@ import org.h2.engine.Database;
 import org.h2.jdbc.JdbcConnection;
 import org.h2.mvstore.MVMap;
 import org.h2.mvstore.MVStore;
-import org.h2.mvstore.db.TransactionStore;
+import org.h2.mvstore.tx.TransactionStore;
 import org.h2.store.fs.FileUtils;
 import org.h2.test.TestBase;
 import org.h2.tools.Recover;

h2/src/test/org/h2/test/store/TestTransactionStore.java

@@ -18,10 +18,10 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.h2.mvstore.DataUtils;
 import org.h2.mvstore.MVMap;
 import org.h2.mvstore.MVStore;
-import org.h2.mvstore.db.TransactionStore;
-import org.h2.mvstore.db.TransactionStore.Change;
-import org.h2.mvstore.db.TransactionStore.Transaction;
-import org.h2.mvstore.db.TransactionStore.TransactionMap;
+import org.h2.mvstore.tx.TransactionStore;
+import org.h2.mvstore.tx.TransactionStore.Change;
+import org.h2.mvstore.tx.TransactionStore.Transaction;
+import org.h2.mvstore.tx.TransactionStore.TransactionMap;
 import org.h2.mvstore.type.ObjectDataType;
 import org.h2.store.fs.FileUtils;
 import org.h2.test.TestBase;