commit 9d10e272922a3529b2e478a7e36a207f2bc70b83
author zheilbron <zheilbron@123451ca-8445-de46-9d55-352943316053> Tue Jul 17 02:15:52 2012 +0000
committer zheilbron <zheilbron@123451ca-8445-de46-9d55-352943316053> Tue Jul 17 02:15:52 2012 +0000
tree 3636f9d41d6c2d0217e91d4b271a43552e06bc93
parent 43126e28e6959e7039cb2fb98340d888d4d9d6ed

change lsm btree merge cleanup to use proper lifecycle calls for destroying an index

git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_lsm_tree@1729 123451ca-8445-de46-9d55-352943316053

hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java

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 6b5f07a..4a3f7bf 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
@@ -407,9 +407,8 @@
     public void cleanUpAfterMerge(List<Object> mergedComponents) throws HyracksDataException {
         for (Object o : mergedComponents) {
             BTree oldBTree = (BTree) o;
-            FileReference fileRef = diskFileMapProvider.lookupFileName(oldBTree.getFileId());
             oldBTree.deactivate();
-            fileRef.getFile().delete();
+            oldBTree.destroy();
         }
     }