WriteBuffer和DataType移到common模块

lealone · May 8, 2015 · 2a570b1 · 2a570b1
1 parent a64748b
commit 2a570b1
Show file tree

Hide file tree

Showing 29 changed files with 40 additions and 35 deletions.
diff --git a/...va/org/lealone/mvstore/type/DataType.java → ...ain/java/org/lealone/engine/DataType.java b/...va/org/lealone/mvstore/type/DataType.java → ...ain/java/org/lealone/engine/DataType.java
@@ -3,11 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.mvstore.type;
+package org.lealone.engine;
 
 import java.nio.ByteBuffer;
 
-import org.lealone.mvstore.WriteBuffer;
 
 /**
  * A data type.

diff --git a/...java/org/lealone/mvstore/WriteBuffer.java → .../java/org/lealone/engine/WriteBuffer.java b/...java/org/lealone/mvstore/WriteBuffer.java → .../java/org/lealone/engine/WriteBuffer.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.mvstore;
+package org.lealone.engine;
 
 import java.nio.ByteBuffer;
 

diff --git a/lealone-mvdb/src/main/java/org/lealone/mvdb/dbobject/index/ValueDataType.java b/lealone-mvdb/src/main/java/org/lealone/mvdb/dbobject/index/ValueDataType.java
@@ -15,9 +15,9 @@
 
 import org.lealone.api.ErrorCode;
 import org.lealone.engine.DataHandler;
+import org.lealone.engine.DataType;
+import org.lealone.engine.WriteBuffer;
 import org.lealone.message.DbException;
-import org.lealone.mvstore.WriteBuffer;
-import org.lealone.mvstore.type.DataType;
 import org.lealone.result.SimpleResultSet;
 import org.lealone.result.SortOrder;
 import org.lealone.util.DataUtils;

diff --git a/lealone-mvdb/src/main/java/org/lealone/mvdb/engine/TransactionMap.java b/lealone-mvdb/src/main/java/org/lealone/mvdb/engine/TransactionMap.java
@@ -21,8 +21,8 @@
 import java.util.Iterator;
 import java.util.Map.Entry;
 
+import org.lealone.engine.DataType;
 import org.lealone.engine.Session;
-import org.lealone.mvstore.type.DataType;
 
 public interface TransactionMap<K, V> {
     /**

diff --git a/lealone-mvdb/src/main/java/org/lealone/mvdb/engine/TransactionStorageEngine.java b/lealone-mvdb/src/main/java/org/lealone/mvdb/engine/TransactionStorageEngine.java
@@ -18,10 +18,10 @@
  */
 package org.lealone.mvdb.engine;
 
+import org.lealone.engine.DataType;
 import org.lealone.engine.Database;
 import org.lealone.engine.Session;
 import org.lealone.mvdb.dbobject.table.MVTable;
-import org.lealone.mvstore.type.DataType;
 
 public interface TransactionStorageEngine {
     /**

diff --git a/lealone-storage/engine/src/main/java/org/lealone/mvdb/engine/MVMapBuilder.java b/lealone-storage/engine/src/main/java/org/lealone/mvdb/engine/MVMapBuilder.java
@@ -17,10 +17,10 @@
  */
 package org.lealone.mvdb.engine;
 
+import org.lealone.engine.DataType;
 import org.lealone.mvstore.StorageMap;
 import org.lealone.mvstore.MVMap;
 import org.lealone.mvstore.MVStore;
-import org.lealone.mvstore.type.DataType;
 
 public class MVMapBuilder implements org.lealone.mvstore.StorageMap.Builder {
     private final MVStore store;

diff --git a/lealone-storage/engine/src/main/java/org/lealone/mvdb/engine/MVStorageEngine.java b/lealone-storage/engine/src/main/java/org/lealone/mvdb/engine/MVStorageEngine.java
@@ -18,6 +18,7 @@
 import org.lealone.command.ddl.CreateTableData;
 import org.lealone.dbobject.table.Table;
 import org.lealone.engine.Constants;
+import org.lealone.engine.DataType;
 import org.lealone.engine.Database;
 import org.lealone.engine.InDoubtTransaction;
 import org.lealone.engine.Session;
@@ -32,7 +33,6 @@
 import org.lealone.mvstore.MVStore;
 import org.lealone.mvstore.MVStoreTool;
 import org.lealone.mvstore.StorageMap;
-import org.lealone.mvstore.type.DataType;
 import org.lealone.transaction2.DefaultTransactionEngine;
 import org.lealone.transaction2.DefaultTransactionMap;
 import org.lealone.transaction2.Transaction;

diff --git a/lealone-storage/engine/src/main/java/org/lealone/mvdb/engine/WTMap.java b/lealone-storage/engine/src/main/java/org/lealone/mvdb/engine/WTMap.java
@@ -24,10 +24,10 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.lealone.engine.DataType;
+import org.lealone.engine.WriteBuffer;
 import org.lealone.mvstore.Cursor;
 import org.lealone.mvstore.StorageMap;
-import org.lealone.mvstore.WriteBuffer;
-import org.lealone.mvstore.type.DataType;
 import org.lealone.mvstore.type.ObjectDataType;
 import org.lealone.util.DataUtils;
 

diff --git a/lealone-storage/engine/src/main/java/org/lealone/mvdb/engine/WTMapBuilder.java b/lealone-storage/engine/src/main/java/org/lealone/mvdb/engine/WTMapBuilder.java
@@ -17,8 +17,8 @@
  */
 package org.lealone.mvdb.engine;
 
+import org.lealone.engine.DataType;
 import org.lealone.mvstore.StorageMap;
-import org.lealone.mvstore.type.DataType;
 import org.lealone.mvstore.type.ObjectDataType;
 
 public class WTMapBuilder implements org.lealone.mvstore.StorageMap.Builder {

diff --git a/lealone-storage/mvdb/src/main/java/org/lealone/mvdb/dbobject/index/ValueDataType.java b/lealone-storage/mvdb/src/main/java/org/lealone/mvdb/dbobject/index/ValueDataType.java
@@ -15,9 +15,9 @@
 
 import org.lealone.api.ErrorCode;
 import org.lealone.engine.DataHandler;
+import org.lealone.engine.DataType;
+import org.lealone.engine.WriteBuffer;
 import org.lealone.message.DbException;
-import org.lealone.mvstore.WriteBuffer;
-import org.lealone.mvstore.type.DataType;
 import org.lealone.result.SimpleResultSet;
 import org.lealone.result.SortOrder;
 import org.lealone.util.DataUtils;

diff --git a/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/Chunk.java b/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/Chunk.java
@@ -8,6 +8,7 @@
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 
+import org.lealone.engine.WriteBuffer;
 import org.lealone.util.DataUtils;
 
 /**

diff --git a/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/LockFreeMVMap.java b/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/LockFreeMVMap.java
@@ -24,7 +24,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import org.lealone.mvstore.type.DataType;
+import org.lealone.engine.DataType;
 import org.lealone.mvstore.type.ObjectDataType;
 
 public class LockFreeMVMap<K, V> extends MVMap<K, V> implements Callable<Void> {

diff --git a/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/MVMap.java b/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/MVMap.java
@@ -15,7 +15,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 
-import org.lealone.mvstore.type.DataType;
+import org.lealone.engine.DataType;
 import org.lealone.mvstore.type.ObjectDataType;
 import org.lealone.util.DataUtils;
 import org.lealone.util.New;

diff --git a/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/MVStore.java b/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/MVStore.java
@@ -22,6 +22,7 @@
 import org.lealone.compress.CompressDeflate;
 import org.lealone.compress.CompressLZF;
 import org.lealone.compress.Compressor;
+import org.lealone.engine.WriteBuffer;
 import org.lealone.mvstore.Page.PageChildren;
 import org.lealone.mvstore.cache.CacheLongKeyLIRS;
 import org.lealone.mvstore.type.StringDataType;

diff --git a/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/MVStoreTool.java b/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/MVStoreTool.java
@@ -16,10 +16,11 @@
 import java.util.TreeMap;
 
 import org.lealone.engine.Constants;
+import org.lealone.engine.DataType;
+import org.lealone.engine.WriteBuffer;
 import org.lealone.fs.FilePath;
 import org.lealone.fs.FileUtils;
 import org.lealone.message.DbException;
-import org.lealone.mvstore.type.DataType;
 import org.lealone.mvstore.type.StringDataType;
 import org.lealone.util.DataUtils;
 

diff --git a/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/Page.java b/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/Page.java
@@ -10,7 +10,8 @@
 import java.util.Set;
 
 import org.lealone.compress.Compressor;
-import org.lealone.mvstore.type.DataType;
+import org.lealone.engine.DataType;
+import org.lealone.engine.WriteBuffer;
 import org.lealone.util.DataUtils;
 import org.lealone.util.New;
 

diff --git a/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/StorageMap.java b/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/StorageMap.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.lealone.mvstore.type.DataType;
+import org.lealone.engine.DataType;
 
 public interface StorageMap<K, V> {
 

diff --git a/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/type/ObjectDataType.java b/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/type/ObjectDataType.java
@@ -18,7 +18,8 @@
 import java.util.HashMap;
 import java.util.UUID;
 
-import org.lealone.mvstore.WriteBuffer;
+import org.lealone.engine.DataType;
+import org.lealone.engine.WriteBuffer;
 import org.lealone.util.DataUtils;
 import org.lealone.util.New;
 

diff --git a/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/type/StringDataType.java b/lealone-storage/mvstore/src/main/java/org/lealone/mvstore/type/StringDataType.java
@@ -7,7 +7,8 @@
 
 import java.nio.ByteBuffer;
 
-import org.lealone.mvstore.WriteBuffer;
+import org.lealone.engine.DataType;
+import org.lealone.engine.WriteBuffer;
 import org.lealone.util.DataUtils;
 
 /**

diff --git a/lealone-transaction/src/main/java/org/lealone/transaction/local/ArrayType.java b/lealone-transaction/src/main/java/org/lealone/transaction/local/ArrayType.java
@@ -7,8 +7,8 @@
 
 import java.nio.ByteBuffer;
 
-import org.lealone.mvstore.WriteBuffer;
-import org.lealone.mvstore.type.DataType;
+import org.lealone.engine.DataType;
+import org.lealone.engine.WriteBuffer;
 
 /**
  * A data type that contains an array of objects with the specified data

diff --git a/...one-transaction/src/main/java/org/lealone/transaction/local/DefaultTransactionEngine.java b/...one-transaction/src/main/java/org/lealone/transaction/local/DefaultTransactionEngine.java
@@ -11,11 +11,11 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.lealone.engine.DataType;
 import org.lealone.engine.Session;
 import org.lealone.engine.TransactionEngine;
 import org.lealone.mvstore.MVMap;
 import org.lealone.mvstore.MVStore;
-import org.lealone.mvstore.type.DataType;
 import org.lealone.mvstore.type.ObjectDataType;
 import org.lealone.transaction.TransactionManager;
 import org.lealone.transaction.TransactionStatusTable;

diff --git a/lealone-transaction/src/main/java/org/lealone/transaction/local/LocalTransaction.java b/lealone-transaction/src/main/java/org/lealone/transaction/local/LocalTransaction.java
@@ -7,9 +7,9 @@
 
 import java.util.Iterator;
 
+import org.lealone.engine.DataType;
 import org.lealone.engine.Session;
 import org.lealone.mvstore.MVMap;
-import org.lealone.mvstore.type.DataType;
 import org.lealone.transaction.TransactionBase;
 import org.lealone.transaction.TransactionManager;
 import org.lealone.util.DataUtils;

diff --git a/lealone-transaction/src/main/java/org/lealone/transaction/local/TransactionMap.java b/lealone-transaction/src/main/java/org/lealone/transaction/local/TransactionMap.java
@@ -8,9 +8,9 @@
 import java.util.Iterator;
 import java.util.Map.Entry;
 
+import org.lealone.engine.DataType;
 import org.lealone.mvstore.Cursor;
 import org.lealone.mvstore.MVMap;
-import org.lealone.mvstore.type.DataType;
 import org.lealone.util.DataUtils;
 
 /**

diff --git a/lealone-transaction/src/main/java/org/lealone/transaction/local/VersionedValueType.java b/lealone-transaction/src/main/java/org/lealone/transaction/local/VersionedValueType.java
@@ -7,8 +7,8 @@
 
 import java.nio.ByteBuffer;
 
-import org.lealone.mvstore.WriteBuffer;
-import org.lealone.mvstore.type.DataType;
+import org.lealone.engine.DataType;
+import org.lealone.engine.WriteBuffer;
 import org.lealone.util.DataUtils;
 
 /**

diff --git a/lealone-transaction2/src/main/java/org/lealone/transaction2/ArrayType.java b/lealone-transaction2/src/main/java/org/lealone/transaction2/ArrayType.java
@@ -7,8 +7,8 @@
 
 import java.nio.ByteBuffer;
 
-import org.lealone.mvstore.WriteBuffer;
-import org.lealone.mvstore.type.DataType;
+import org.lealone.engine.DataType;
+import org.lealone.engine.WriteBuffer;
 
 /**
  * A data type that contains an array of objects with the specified data

diff --git a/lealone-transaction2/src/main/java/org/lealone/transaction2/DefaultTransactionEngine.java b/lealone-transaction2/src/main/java/org/lealone/transaction2/DefaultTransactionEngine.java
@@ -11,11 +11,11 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.lealone.engine.DataType;
 import org.lealone.engine.Session;
 import org.lealone.engine.TransactionEngine;
 import org.lealone.mvstore.MVStore;
 import org.lealone.mvstore.StorageMap;
-import org.lealone.mvstore.type.DataType;
 import org.lealone.mvstore.type.ObjectDataType;
 import org.lealone.util.DataUtils;
 import org.lealone.util.New;

diff --git a/lealone-transaction2/src/main/java/org/lealone/transaction2/DefaultTransactionMap.java b/lealone-transaction2/src/main/java/org/lealone/transaction2/DefaultTransactionMap.java
@@ -8,11 +8,11 @@
 import java.util.Iterator;
 import java.util.Map.Entry;
 
+import org.lealone.engine.DataType;
 import org.lealone.engine.Session;
 import org.lealone.mvdb.engine.TransactionMap;
 import org.lealone.mvstore.Cursor;
 import org.lealone.mvstore.StorageMap;
-import org.lealone.mvstore.type.DataType;
 import org.lealone.util.DataUtils;
 
 /**

diff --git a/lealone-transaction2/src/main/java/org/lealone/transaction2/Transaction.java b/lealone-transaction2/src/main/java/org/lealone/transaction2/Transaction.java
@@ -7,9 +7,9 @@
 
 import java.util.Iterator;
 
+import org.lealone.engine.DataType;
 import org.lealone.engine.Session;
 import org.lealone.mvstore.StorageMap;
-import org.lealone.mvstore.type.DataType;
 import org.lealone.util.DataUtils;
 
 /**

diff --git a/lealone-transaction2/src/main/java/org/lealone/transaction2/VersionedValueType.java b/lealone-transaction2/src/main/java/org/lealone/transaction2/VersionedValueType.java
@@ -7,8 +7,8 @@
 
 import java.nio.ByteBuffer;
 
-import org.lealone.mvstore.WriteBuffer;
-import org.lealone.mvstore.type.DataType;
+import org.lealone.engine.DataType;
+import org.lealone.engine.WriteBuffer;
 import org.lealone.util.DataUtils;
 
 /**