Repository: asterixdb Updated Branches: refs/heads/master 4ff6a36d1 -> e19da1fc3
[NO ISSUE] Only close the index in the close of the Upsert Operator - user model changes: no - storage format changes: no - interface changes: no details: - Previously, a failure in the opening of the upsert operator will cause the index to be closed twice. - After this change, we only close the index in the close call of the operator. Change-Id: I1d76de2781362ef5c80aa926e1112e7872049c71 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2378 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: abdullah alamoudi <bamou...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/e19da1fc Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/e19da1fc Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/e19da1fc Branch: refs/heads/master Commit: e19da1fc3ae763ba0adbd5b85fec2163ed23f86b Parents: 4ff6a36 Author: Abdullah Alamoudi <bamou...@gmail.com> Authored: Fri Feb 9 16:11:49 2018 -0800 Committer: abdullah alamoudi <bamou...@gmail.com> Committed: Mon Feb 12 18:03:08 2018 -0800 ---------------------------------------------------------------------- .../operators/LSMPrimaryUpsertOperatorNodePushable.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e19da1fc/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java ---------------------------------------------------------------------- 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 6bd9d99..e33dfb6 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 @@ -244,10 +244,8 @@ public class LSMPrimaryUpsertOperatorNodePushable extends LSMIndexInsertUpdateDe appender.write(writer, true); } }; - - } catch (Exception e) { - indexHelper.close(); - throw new HyracksDataException(e); + } catch (Throwable e) { // NOSONAR: Re-thrown + throw HyracksDataException.create(e); } }