abdullah alamoudi has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/2536
Change subject: [NO ISSUE][RT] Inherit Closeable in IFrameOperationCallback
......................................................................
[NO ISSUE][RT] Inherit Closeable in IFrameOperationCallback
- user model changes: no
- storage format changes: no
- interface changes: yes
Details:
- Primary upsert operator uses an IFrameOperationCallback
to perform per frame operations. In this change,
IFrameOperationCallback extends Closeable and allow the
callback to release resources on the close of the pipeline.
Change-Id: Iaacd6538c27d5498868256616a793e0ebcec3729
---
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/NoOpFrameOperationCallbackFactory.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IIndexDataflowHelper.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/IFrameOperationCallback.java
5 files changed, 30 insertions(+), 13 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/36/2536/1
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java
index 9ec13ef..b7af0b6 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java
@@ -74,4 +74,8 @@
dsInfo.untouch();
dsInfo.getIndexes().get(resourceId).untouch();
}
+
+ public DatasetInfo getDatasetInfo() {
+ return dsInfo;
+ }
}
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/NoOpFrameOperationCallbackFactory.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/NoOpFrameOperationCallbackFactory.java
index 5e3879f..8f28752 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/NoOpFrameOperationCallbackFactory.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/NoOpFrameOperationCallbackFactory.java
@@ -18,6 +18,8 @@
*/
package org.apache.asterix.common.dataflow;
+import java.io.IOException;
+
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.lsm.common.api.IFrameOperationCallback;
@@ -43,5 +45,10 @@
public void frameCompleted() throws HyracksDataException {
// No Op
}
+
+ @Override
+ public void close() throws IOException {
+ // No Op
+ }
}
}
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
index e33dfb6..029f82c 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
@@ -40,6 +40,7 @@
import org.apache.hyracks.api.dataflow.value.IMissingWriterFactory;
import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.util.CleanupUtils;
import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder;
import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleReference;
import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAccessor;
@@ -243,6 +244,11 @@
callback.frameCompleted();
appender.write(writer, true);
}
+
+ @Override
+ public void close() throws IOException {
+ callback.close();
+ }
};
} catch (Throwable e) { // NOSONAR: Re-thrown
throw HyracksDataException.create(e);
@@ -360,16 +366,12 @@
@Override
public void close() throws HyracksDataException {
- try {
- try {
- if (cursor != null) {
- cursor.destroy();
- }
- } finally {
- writer.close();
- }
- } finally {
- indexHelper.close();
+ Throwable failure = CleanupUtils.close(frameOpCallback, null);
+ failure = CleanupUtils.destroy(failure, cursor);
+ failure = CleanupUtils.close(writer, failure);
+ failure = CleanupUtils.close(indexHelper, failure);
+ if (failure != null) {
+ throw HyracksDataException.create(failure);
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IIndexDataflowHelper.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IIndexDataflowHelper.java
index be10b27..9e65eb2 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IIndexDataflowHelper.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IIndexDataflowHelper.java
@@ -18,11 +18,13 @@
*/
package org.apache.hyracks.storage.am.common.api;
+import java.io.Closeable;
+
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.common.IIndex;
import org.apache.hyracks.storage.common.LocalResource;
-public interface IIndexDataflowHelper {
+public interface IIndexDataflowHelper extends Closeable {
/**
* If open throws an exception, it means that the index was not opened
successfully.
@@ -36,6 +38,7 @@
*
* @throws HyracksDataException
*/
+ @Override
void close() throws HyracksDataException;
/**
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/IFrameOperationCallback.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/IFrameOperationCallback.java
index 96eb559..df78c53 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/IFrameOperationCallback.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/IFrameOperationCallback.java
@@ -18,13 +18,14 @@
*/
package org.apache.hyracks.storage.am.lsm.common.api;
+import java.io.Closeable;
+
import org.apache.hyracks.api.exceptions.HyracksDataException;
/**
* An interface that is used to enable frame level operation on indexes
*/
-@FunctionalInterface
-public interface IFrameOperationCallback {
+public interface IFrameOperationCallback extends Closeable {
/**
* Called once processing the frame is done before calling nextFrame on
the next IFrameWriter in
* the pipeline
--
To view, visit https://asterix-gerrit.ics.uci.edu/2536
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaacd6538c27d5498868256616a793e0ebcec3729
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.9.4-pre-rc
Gerrit-Owner: abdullah alamoudi <bamou...@gmail.com>
