You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2019/11/19 20:46:31 UTC
[asterixdb] branch master updated (54c0601 -> cae4794)
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git.
from 54c0601 [NO ISSUE] Support multipart dataverse names
new f5cf736 [NO ISSUE][RT] Fail Fast When Interrupted on Frame Write Attempt
new d9a9c14 Merge branch 'gerrit/stabilization-f69489' into 'gerrit/mad-hatter'
new cae4794 Merge branch 'gerrit/mad-hatter' into 'master'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../hyracks/dataflow/common/comm/io/AbstractFrameAppender.java | 7 +++++++
.../hyracks/dataflow/common/io/MessagingFrameTupleAppender.java | 1 +
2 files changed, 8 insertions(+)
[asterixdb] 02/03: Merge branch 'gerrit/stabilization-f69489' into
'gerrit/mad-hatter'
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit d9a9c14d7df5bffd60417a9d796e641a48008a4c
Merge: d6814e6 f5cf736
Author: Michael Blow <mb...@apache.org>
AuthorDate: Tue Nov 19 12:24:14 2019 -0500
Merge branch 'gerrit/stabilization-f69489' into 'gerrit/mad-hatter'
Change-Id: I5ce1030bd01df920f4faa3317e6e5a31d67e0dc4
.../hyracks/dataflow/common/comm/io/AbstractFrameAppender.java | 7 +++++++
.../hyracks/dataflow/common/io/MessagingFrameTupleAppender.java | 1 +
2 files changed, 8 insertions(+)
[asterixdb] 03/03: Merge branch 'gerrit/mad-hatter' into 'master'
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit cae4794786d9d7e1a396c4d0b05d322fbaf3f8ff
Merge: 54c0601 d9a9c14
Author: Michael Blow <mb...@apache.org>
AuthorDate: Tue Nov 19 13:54:57 2019 -0500
Merge branch 'gerrit/mad-hatter' into 'master'
Change-Id: Ib34a495b7e8c7d70b41429db99948aec9de9b010
.../hyracks/dataflow/common/comm/io/AbstractFrameAppender.java | 7 +++++++
.../hyracks/dataflow/common/io/MessagingFrameTupleAppender.java | 1 +
2 files changed, 8 insertions(+)
[asterixdb] 01/03: [NO ISSUE][RT] Fail Fast When Interrupted on
Frame Write Attempt
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit f5cf736db8e43446ccc07d0afeab458a249be45d
Author: Murtadha Hubail <mh...@apache.org>
AuthorDate: Mon Nov 18 06:14:25 2019 +0300
[NO ISSUE][RT] Fail Fast When Interrupted on Frame Write Attempt
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Before writing a frame to the next operator, check the thread
interrupted status and fail fast if the thread is interrupted.
This ensures that queries that were aborted will fail as soon
as they attempt to write a frame.
Change-Id: If4f154f11305e2f8286e0707b5b3adec905633a4
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/4203
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Reviewed-by: Till Westmann <ti...@apache.org>
---
.../hyracks/dataflow/common/comm/io/AbstractFrameAppender.java | 7 +++++++
.../hyracks/dataflow/common/io/MessagingFrameTupleAppender.java | 1 +
2 files changed, 8 insertions(+)
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/AbstractFrameAppender.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/AbstractFrameAppender.java
index 18ddf3e..a9371e9 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/AbstractFrameAppender.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/AbstractFrameAppender.java
@@ -89,6 +89,7 @@ public class AbstractFrameAppender implements IFrameAppender {
@Override
public void write(IFrameWriter outWriter, boolean clearFrame) throws HyracksDataException {
+ failIfInterrupted();
getBuffer().clear();
outWriter.nextFrame(getBuffer());
if (clearFrame) {
@@ -126,4 +127,10 @@ public class AbstractFrameAppender implements IFrameAppender {
tracer.durationE(tid, traceCategory, args);
}
}
+
+ protected void failIfInterrupted() throws HyracksDataException {
+ if (Thread.currentThread().isInterrupted()) {
+ throw HyracksDataException.create(new InterruptedException());
+ }
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/io/MessagingFrameTupleAppender.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/io/MessagingFrameTupleAppender.java
index 77020f8..c27a7e6 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/io/MessagingFrameTupleAppender.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/io/MessagingFrameTupleAppender.java
@@ -110,6 +110,7 @@ public class MessagingFrameTupleAppender extends FrameTupleAppender {
@Override
public void write(IFrameWriter outWriter, boolean clearFrame) throws HyracksDataException {
+ failIfInterrupted();
if (!initialized) {
init();
}