From 6e60ee82fd5e8a4e18540b474ef72b2ffdec7469 Mon Sep 17 00:00:00 2001
From: unknown <Maxim.Mossienko@.Labs.IntelliJ.Net>
Date: Tue, 19 Jul 2011 15:04:33 +0400
Subject: [PATCH] cleanup

---
 .../com/intellij/util/io/IntToIntBtree.java   | 19 ++++++++-----
 .../util/io/PersistentBTreeEnumerator.java    | 27 ++++++++++---------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/platform/util/src/com/intellij/util/io/IntToIntBtree.java b/platform/util/src/com/intellij/util/io/IntToIntBtree.java
index 40df880bb5f3..8671e4b92a43 100644
--- a/platform/util/src/com/intellij/util/io/IntToIntBtree.java
+++ b/platform/util/src/com/intellij/util/io/IntToIntBtree.java
@@ -27,7 +27,7 @@ abstract class IntToIntBtree {
   private final TIntObjectHashMap<byte[]> pagesCache = new TIntObjectHashMap<byte[]>(100);
   private boolean isLarge = true;
 
-  public IntToIntBtree(int _pageSize, int rootAdress) {
+  public IntToIntBtree(int _pageSize, int rootAdress, boolean initial) {
     pageSize = _pageSize;
     buffer = new byte[_pageSize];
     root = new BtreeIndexNodeView(this);
@@ -37,19 +37,24 @@ abstract class IntToIntBtree {
     assert i < Short.MAX_VALUE && i % 2 == 0;
     maxInteriorNodes = (short)i;
     pagesCount = 1;
+
+    if (initial) {
+      root.setIndexLeaf(true);
+      root.sync();
+    }
   }
 
-  protected abstract int allocPage();
+  protected abstract int allocEmptyPage();
 
   private int nextPage() {
-    int address = allocPage();
+    int address = allocEmptyPage();
     ++pagesCount;
     return address;
   }
 
-  protected abstract void saveBytes(int address, byte[] buffer, int offset, int length);
+  protected abstract void savePage(int address, byte[] pageBuffer);
 
-  protected abstract void loadBytes(int address, byte[] buffer, int offset, int length);
+  protected abstract void loadPageContent(int address, byte[] pageBuffer);
 
   public int get(int key) {
     BtreeIndexNodeView currentIndexNode = new BtreeIndexNodeView(this);
@@ -173,7 +178,7 @@ abstract class IntToIntBtree {
         buffer = bytes;
       } else {
         buffer = new byte[btree.pageSize];
-        btree.loadBytes(address, buffer, 0, btree.pageSize);
+        btree.loadPageContent(address, buffer);
         btree.pagesCache.put(address, buffer);
       }
     }
@@ -188,7 +193,7 @@ abstract class IntToIntBtree {
 
     void sync() {
       if (buffer != null) {
-        btree.saveBytes(address, buffer, 0, buffer.length);
+        btree.savePage(address, buffer);
       }
     }
 
diff --git a/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java b/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java
index 52445e3d2db1..c24a013b885f 100644
--- a/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java
+++ b/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java
@@ -45,25 +45,27 @@ public class PersistentBTreeEnumerator<Data> extends PersistentEnumeratorBase<Da
     super(file, new MappedFileEnumeratorStorage(file, initialSize), dataDescriptor, initialSize);
 
     storeVars(false);
-    if (btree == null) initBtree();
+    if (btree == null) initBtree(false);
   }
 
-  private void initBtree() {
-    btree = new IntToIntBtree(PAGE_SIZE, myRootNodeStart) {
+  private void initBtree(boolean initial) {
+    btree = new IntToIntBtree(PAGE_SIZE, myRootNodeStart, initial) {
 
       @Override
-      protected int allocPage() {
+      protected int allocEmptyPage() {
         return PersistentBTreeEnumerator.this.allocPage();
       }
 
       @Override
-      protected void saveBytes(int address, byte[] buffer, int offset, int length) {
-        myStorage.put(address, buffer, offset, length);
+      protected void savePage(int address, byte[] pageBuffer) {
+        if (doSanityCheck) myAssert(pageBuffer.length == PAGE_SIZE);
+        myStorage.put(address, pageBuffer, 0, pageBuffer.length);
       }
 
       @Override
-      protected void loadBytes(int address, byte[] buffer, int offset, int length) {
-        myStorage.get(address, buffer, offset, length);
+      protected void loadPageContent(int address, byte[] pageBuffer) {
+        if (doSanityCheck) myAssert(pageBuffer.length == PAGE_SIZE);
+        myStorage.get(address, pageBuffer, 0, pageBuffer.length);
       }
 
       @Override
@@ -103,14 +105,13 @@ public class PersistentBTreeEnumerator<Data> extends PersistentEnumeratorBase<Da
     myLogicalFileLength = PAGE_SIZE;
     myRootNodeStart = (DATA_START / PAGE_SIZE + 1) * PAGE_SIZE;
 
-    allocPage(myRootNodeStart);
+    allocEmptyPage(myRootNodeStart);
     myFirstPageStart = myDataPageStart = -1;
     myDuplicatedValuesPageStart = -1;
 
     storeVars(true);
 
-    initBtree();
-    btree.root.setIndexLeaf(true);
+    initBtree(true);
     btree.root.sync();
   }
 
@@ -120,7 +121,7 @@ public class PersistentBTreeEnumerator<Data> extends PersistentEnumeratorBase<Da
     super.doClose();
   }
 
-  private int allocPage(int pageStart) {
+  private int allocEmptyPage(int pageStart) {
     if (myStorage instanceof MappedFileEnumeratorStorage) {
       myStorage.putInt(pageStart + PAGE_SIZE - 4, 0);
     } else {
@@ -132,7 +133,7 @@ public class PersistentBTreeEnumerator<Data> extends PersistentEnumeratorBase<Da
   }
 
   private int allocPage() {
-    return allocPage(myLogicalFileLength);
+    return allocEmptyPage(myLogicalFileLength);
   }
 
   @Override