fixing previous commit
git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_lsm_tree@1699 123451ca-8445-de46-9d55-352943316053
diff --git a/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java b/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
index 2fe4258..3e50873 100644
--- a/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
+++ b/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
@@ -63,7 +63,6 @@
import edu.uci.ics.hyracks.storage.am.lsm.common.impls.TreeFactory;
import edu.uci.ics.hyracks.storage.am.lsm.common.impls.TreeIndexComponentFinalizer;
import edu.uci.ics.hyracks.storage.common.buffercache.IBufferCache;
-import edu.uci.ics.hyracks.storage.common.buffercache.IInMemoryBufferCache;
import edu.uci.ics.hyracks.storage.common.file.IFileMapProvider;
public class LSMBTree implements ILSMIndex, ITreeIndex {
@@ -146,7 +145,7 @@
return;
}
- ((IInMemoryBufferCache) memBTree.getBufferCache()).open();
+ ((InMemoryBufferCache) memBTree.getBufferCache()).open();
memBTree.create();
memBTree.open();
List<Object> validFileNames = fileManager.cleanupAndGetValidFiles(componentFinalizer);
@@ -172,7 +171,7 @@
diskBTrees.clear();
memBTree.close();
memBTree.destroy();
- ((IInMemoryBufferCache) memBTree.getBufferCache()).close();
+ ((InMemoryBufferCache) memBTree.getBufferCache()).close();
isOpen = false;
}
diff --git a/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/freepage/InMemoryBufferCache.java b/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/freepage/InMemoryBufferCache.java
index b6a71bb..8e629e6 100644
--- a/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/freepage/InMemoryBufferCache.java
+++ b/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/freepage/InMemoryBufferCache.java
@@ -23,22 +23,22 @@
import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
import edu.uci.ics.hyracks.api.io.FileReference;
+import edu.uci.ics.hyracks.storage.common.buffercache.IBufferCacheInternal;
import edu.uci.ics.hyracks.storage.common.buffercache.ICacheMemoryAllocator;
import edu.uci.ics.hyracks.storage.common.buffercache.ICachedPage;
import edu.uci.ics.hyracks.storage.common.buffercache.ICachedPageInternal;
-import edu.uci.ics.hyracks.storage.common.buffercache.IInMemoryBufferCache;
import edu.uci.ics.hyracks.storage.common.file.BufferedFileHandle;
import edu.uci.ics.hyracks.storage.common.file.IFileMapManager;
import edu.uci.ics.hyracks.storage.common.file.IFileMapProvider;
-public class InMemoryBufferCache implements IInMemoryBufferCache {
+public class InMemoryBufferCache implements IBufferCacheInternal {
protected final ICacheMemoryAllocator allocator;
protected final IFileMapManager fileMapManager;
protected final int pageSize;
protected final int numPages;
protected final List<CachedPage> overflowPages = new ArrayList<CachedPage>();
protected CachedPage[] pages;
-
+
public InMemoryBufferCache(ICacheMemoryAllocator allocator, int pageSize, int numPages,
IFileMapManager fileMapManager) {
this.allocator = allocator;
@@ -47,7 +47,6 @@
this.numPages = numPages;
}
- @Override
public void open() {
pages = new CachedPage[numPages];
ByteBuffer[] buffers = allocator.allocate(pageSize, numPages);
diff --git a/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java b/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java
index 515707c..fd578fd 100644
--- a/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java
+++ b/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java
@@ -52,7 +52,6 @@
import edu.uci.ics.hyracks.storage.am.rtree.api.IRTreeLeafFrame;
import edu.uci.ics.hyracks.storage.am.rtree.impls.RTree;
import edu.uci.ics.hyracks.storage.common.buffercache.IBufferCache;
-import edu.uci.ics.hyracks.storage.common.buffercache.IInMemoryBufferCache;
import edu.uci.ics.hyracks.storage.common.file.IFileMapProvider;
public abstract class AbstractLSMRTree implements ILSMIndex, ITreeIndex {