大量简化设计(BTreeMap和BTreePage不再需要维护版本号信息)

lealone · Oct 28, 2015 · a003719 · a003719
1 parent 1e16e28
commit a003719
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 246 deletions.
diff --git a/lealone-common/src/main/java/org/lealone/storage/StorageMap.java b/lealone-common/src/main/java/org/lealone/storage/StorageMap.java
@@ -188,6 +188,10 @@ public interface StorageMap<K, V> {
 
     boolean isClosed();
 
+    /**
+     * Close the map. Accessing the data is still possible (to allow concurrent
+     * reads), but it is marked as closed.
+     */
     void close();
 
     void save();

diff --git a/lealone-storage/src/main/java/org/lealone/storage/btree/BTreeChunk.java b/lealone-storage/src/main/java/org/lealone/storage/btree/BTreeChunk.java
@@ -33,11 +33,6 @@ public class BTreeChunk {
      */
     public final int id;
 
-    /**
-     * The version stored in this chunk.
-     */
-    public long version;
-
     /**
      * The position of the root page.
      */
@@ -126,7 +121,6 @@ public StringBuilder asStringBuilder() {
         StringBuilder buff = new StringBuilder();
 
         DataUtils.appendMap(buff, "id", id);
-        DataUtils.appendMap(buff, "version", version);
         DataUtils.appendMap(buff, "rootPagePos", rootPagePos);
 
         DataUtils.appendMap(buff, "blockCount", blockCount);
@@ -159,7 +153,6 @@ public static BTreeChunk fromString(String s) {
         HashMap<String, String> map = DataUtils.parseMap(s);
         int id = DataUtils.readHexInt(map, "id", 0);
         BTreeChunk c = new BTreeChunk(id);
-        c.version = DataUtils.readHexLong(map, "version", id);
         c.rootPagePos = DataUtils.readHexLong(map, "rootPagePos", 0);
 
         c.blockCount = DataUtils.readHexInt(map, "blockCount", 0);