Repository: asterixdb Updated Branches: refs/heads/master 9523e0ab8 -> 9e8f3bfa3
[NO ISSUE][STO] Make compact use the index io operation callback - user model changes: no - storage format changes: no - interface changes: no Change-Id: Ie06f480d729448de99dcce1912b72449940e4ea3 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2102 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Contrib: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/9e8f3bfa Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/9e8f3bfa Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/9e8f3bfa Branch: refs/heads/master Commit: 9e8f3bfa3178ccd36d84f41e22c4e76ecaf67121 Parents: 9523e0a Author: Abdullah Alamoudi <[email protected]> Authored: Sun Oct 29 15:33:49 2017 -0700 Committer: abdullah alamoudi <[email protected]> Committed: Mon Oct 30 09:37:23 2017 -0700 ---------------------------------------------------------------------- .../common/dataflow/LSMIndexCompactOperatorNodePushable.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9e8f3bfa/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java index 5ff3308..2860a8f 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java @@ -28,7 +28,6 @@ import org.apache.hyracks.storage.am.common.dataflow.IIndexDataflowHelperFactory import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor; -import org.apache.hyracks.storage.am.lsm.common.impls.NoOpIOOperationCallbackFactory; public class LSMIndexCompactOperatorNodePushable extends AbstractOperatorNodePushable { private final IIndexDataflowHelper indexHelper; @@ -59,12 +58,7 @@ public class LSMIndexCompactOperatorNodePushable extends AbstractOperatorNodePus ILSMIndex index = (ILSMIndex) indexHelper.getIndexInstance(); ILSMIndexAccessor accessor = index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE); - try { - accessor.scheduleFullMerge(NoOpIOOperationCallbackFactory.INSTANCE.createIoOpCallback()); - } catch (Exception e) { - indexHelper.close(); - throw new HyracksDataException(e); - } + accessor.scheduleFullMerge(index.getIOOperationCallback()); } @Override
