Adapted inverted index lifecycle calls to latest interfaces.
git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_inverted_index_updates_new@1881 123451ca-8445-de46-9d55-352943316053
diff --git a/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexBulkLoadOperatorNodePushable.java b/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexBulkLoadOperatorNodePushable.java
index 856749a..6fa447c 100644
--- a/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexBulkLoadOperatorNodePushable.java
+++ b/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexBulkLoadOperatorNodePushable.java
@@ -24,7 +24,6 @@
import edu.uci.ics.hyracks.dataflow.std.base.AbstractUnaryInputSinkOperatorNodePushable;
import edu.uci.ics.hyracks.storage.am.btree.impls.BTree;
import edu.uci.ics.hyracks.storage.am.common.api.IIndexBulkLoader;
-import edu.uci.ics.hyracks.storage.am.common.api.IIndexLifecycleManager;
import edu.uci.ics.hyracks.storage.am.common.api.IndexException;
import edu.uci.ics.hyracks.storage.am.common.tuples.PermutingFrameTupleReference;
import edu.uci.ics.hyracks.storage.am.lsm.invertedindex.ondisk.OnDiskInvertedIndex;
@@ -32,7 +31,6 @@
public class InvertedIndexBulkLoadOperatorNodePushable extends AbstractUnaryInputSinkOperatorNodePushable {
private final AbstractInvertedIndexOperatorDescriptor opDesc;
private final IHyracksTaskContext ctx;
- private final IIndexLifecycleManager lcManager;
private final InvertedIndexDataflowHelper invIndexDataflowHelper;
private OnDiskInvertedIndex invIndex;
private IIndexBulkLoader bulkLoader;
@@ -46,7 +44,6 @@
IHyracksTaskContext ctx, int partition, int[] fieldPermutation, IRecordDescriptorProvider recordDescProvider) {
this.opDesc = opDesc;
this.ctx = ctx;
- this.lcManager = opDesc.getLifecycleManagerProvider().getLifecycleManager(ctx);
this.invIndexDataflowHelper = new InvertedIndexDataflowHelper(opDesc, ctx, partition);
this.recordDescProvider = recordDescProvider;
tuple.setFieldPermutation(fieldPermutation);
@@ -56,12 +53,13 @@
public void open() throws HyracksDataException {
RecordDescriptor recDesc = recordDescProvider.getInputRecordDescriptor(opDesc.getActivityId(), 0);
accessor = new FrameTupleAccessor(ctx.getFrameSize(), recDesc);
-
- invIndex = (OnDiskInvertedIndex) lcManager.open(invIndexDataflowHelper);
+
+ invIndexDataflowHelper.open();
+ invIndex = (OnDiskInvertedIndex) invIndexDataflowHelper.getIndexInstance();
try {
bulkLoader = invIndex.createBulkLoader(BTree.DEFAULT_FILL_FACTOR, false);
- } catch (IndexException e) {
- lcManager.close(invIndexDataflowHelper);
+ } catch (Exception e) {
+ invIndexDataflowHelper.close();
throw new HyracksDataException(e);
}
}
@@ -87,7 +85,7 @@
} catch (IndexException e) {
throw new HyracksDataException(e);
} finally {
- lcManager.close(invIndexDataflowHelper);
+ invIndexDataflowHelper.close();
}
}
diff --git a/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexCreateOperatorNodePushable.java b/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexCreateOperatorNodePushable.java
index 599e85c..5ad4f15 100644
--- a/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexCreateOperatorNodePushable.java
+++ b/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexCreateOperatorNodePushable.java
@@ -19,15 +19,12 @@
import edu.uci.ics.hyracks.api.dataflow.value.RecordDescriptor;
import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
import edu.uci.ics.hyracks.dataflow.std.base.AbstractOperatorNodePushable;
-import edu.uci.ics.hyracks.storage.am.common.api.IIndexLifecycleManager;
public class InvertedIndexCreateOperatorNodePushable extends AbstractOperatorNodePushable {
- private final IIndexLifecycleManager lcManager;
private final InvertedIndexDataflowHelper invIndexDataflowHelper;
public InvertedIndexCreateOperatorNodePushable(AbstractInvertedIndexOperatorDescriptor opDesc,
IHyracksTaskContext ctx, int partition) {
- this.lcManager = opDesc.getLifecycleManagerProvider().getLifecycleManager(ctx);
this.invIndexDataflowHelper = new InvertedIndexDataflowHelper(opDesc, ctx, partition);
}
@@ -47,7 +44,7 @@
@Override
public void initialize() throws HyracksDataException {
- lcManager.create(invIndexDataflowHelper);
+ invIndexDataflowHelper.create();
}
@Override
diff --git a/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexDataflowHelper.java b/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexDataflowHelper.java
index bca30fc..b515122 100644
--- a/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexDataflowHelper.java
+++ b/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexDataflowHelper.java
@@ -35,7 +35,7 @@
}
@Override
- public IIndex getIndexInstance() throws HyracksDataException {
+ public IIndex createIndexInstance() throws HyracksDataException {
IInvertedIndexOperatorDescriptor invIndexOpDesc = (IInvertedIndexOperatorDescriptor) opDesc;
IInvertedListBuilder invListBuilder = new FixedSizeElementInvertedListBuilder(
invIndexOpDesc.getInvListsTypeTraits());
diff --git a/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexSearchOperatorNodePushable.java b/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexSearchOperatorNodePushable.java
index 008c1ea..2b79b6b 100644
--- a/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexSearchOperatorNodePushable.java
+++ b/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/dataflow/InvertedIndexSearchOperatorNodePushable.java
@@ -31,7 +31,6 @@
import edu.uci.ics.hyracks.dataflow.std.base.AbstractUnaryInputUnaryOutputOperatorNodePushable;
import edu.uci.ics.hyracks.storage.am.common.api.IIndexAccessor;
import edu.uci.ics.hyracks.storage.am.common.api.IIndexCursor;
-import edu.uci.ics.hyracks.storage.am.common.api.IIndexLifecycleManager;
import edu.uci.ics.hyracks.storage.am.common.impls.NoOpOperationCallback;
import edu.uci.ics.hyracks.storage.am.lsm.invertedindex.api.IInvertedIndexSearchModifier;
import edu.uci.ics.hyracks.storage.am.lsm.invertedindex.exceptions.OccurrenceThresholdPanicException;
@@ -41,7 +40,6 @@
public class InvertedIndexSearchOperatorNodePushable extends AbstractUnaryInputUnaryOutputOperatorNodePushable {
private final AbstractInvertedIndexOperatorDescriptor opDesc;
private final IHyracksTaskContext ctx;
- private final IIndexLifecycleManager lcManager;
private final InvertedIndexDataflowHelper invIndexDataflowHelper;
private final int queryField;
private FrameTupleAccessor accessor;
@@ -65,7 +63,6 @@
IRecordDescriptorProvider recordDescProvider) {
this.opDesc = opDesc;
this.ctx = ctx;
- this.lcManager = opDesc.getLifecycleManagerProvider().getLifecycleManager(ctx);
this.invIndexDataflowHelper = new InvertedIndexDataflowHelper(opDesc, ctx, partition);
this.queryField = queryField;
this.searchPred = new InvertedIndexSearchPredicate(opDesc.getTokenizerFactory().createTokenizer(),
@@ -80,7 +77,8 @@
accessor = new FrameTupleAccessor(ctx.getFrameSize(), inputRecDesc);
tuple = new FrameTupleReference();
- invIndex = (OnDiskInvertedIndex) lcManager.open(invIndexDataflowHelper);
+ invIndexDataflowHelper.open();
+ invIndex = (OnDiskInvertedIndex) invIndexDataflowHelper.getIndexInstance();
try {
writeBuffer = ctx.allocateFrame();
tb = new ArrayTupleBuilder(recordDesc.getFieldCount());
@@ -92,7 +90,7 @@
resultCursor = indexAccessor.createSearchCursor();
writer.open();
} catch (HyracksDataException e) {
- lcManager.close(invIndexDataflowHelper);
+ invIndexDataflowHelper.close();
throw e;
}
}
@@ -159,7 +157,7 @@
}
writer.close();
} finally {
- lcManager.close(invIndexDataflowHelper);
+ invIndexDataflowHelper.close();
}
}
}