You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by am...@apache.org on 2017/08/27 17:11:21 UTC
asterixdb git commit: [NO ISSUE][*DB] Prevent Cancellation for DMLs
Repository: asterixdb
Updated Branches:
refs/heads/master a5843a277 -> 71589e574
[NO ISSUE][*DB] Prevent Cancellation for DMLs
- user model changes: The only cancellable jobs are queries.
- storage format changes: no
- interface changes: no
details:
- Before this change, DML jobs were added to the job execution
context.
- This job passes a dummy job execution context to disallow
registration and cancellation of DMLs.
Change-Id: I3bb1a737c6ec6dd5a79fc25db25325ab60d838b9
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1977
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Michael Blow <mb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/71589e57
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/71589e57
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/71589e57
Branch: refs/heads/master
Commit: 71589e5748f2953196674e852713d3cae6ac34f9
Parents: a5843a2
Author: Abdullah Alamoudi <ba...@gmail.com>
Authored: Sat Aug 26 20:46:59 2017 -0700
Committer: abdullah alamoudi <ba...@gmail.com>
Committed: Sun Aug 27 10:11:04 2017 -0700
----------------------------------------------------------------------
.../NoOpStatementExecutorContext.java | 45 ++++++++++++++++++++
.../asterix/app/translator/QueryTranslator.java | 8 ++--
2 files changed, 49 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/71589e57/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/NoOpStatementExecutorContext.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/NoOpStatementExecutorContext.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/NoOpStatementExecutorContext.java
new file mode 100644
index 0000000..ec181bb
--- /dev/null
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/NoOpStatementExecutorContext.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.translator;
+
+import org.apache.hyracks.api.job.JobId;
+
+public class NoOpStatementExecutorContext implements IStatementExecutorContext {
+
+ public static final NoOpStatementExecutorContext INSTANCE = new NoOpStatementExecutorContext();
+
+ private NoOpStatementExecutorContext() {
+ }
+
+ @Override
+ public JobId getJobIdFromClientContextId(String clientContextId) {
+ return null;
+ }
+
+ @Override
+ public void put(String clientContextId, JobId jobId) {
+ // Dummy for when a statement doesn't support cancellation
+ }
+
+ @Override
+ public JobId removeJobIdFromClientContextId(String clientContextId) {
+ return null;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/71589e57/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index b97c014..e0d56a0 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -162,6 +162,7 @@ import org.apache.asterix.translator.CompiledStatements.CompiledUpsertStatement;
import org.apache.asterix.translator.CompiledStatements.ICompiledDmlStatement;
import org.apache.asterix.translator.IStatementExecutor;
import org.apache.asterix.translator.IStatementExecutorContext;
+import org.apache.asterix.translator.NoOpStatementExecutorContext;
import org.apache.asterix.translator.SessionConfig;
import org.apache.asterix.translator.SessionOutput;
import org.apache.asterix.translator.TypeTranslator;
@@ -334,7 +335,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen
|| resultDelivery == ResultDelivery.DEFERRED);
}
handleInsertUpsertStatement(metadataProvider, stmt, hcc, hdc, resultDelivery, outMetadata,
- stats, false, clientContextId, ctx);
+ stats, false, clientContextId);
break;
case Statement.Kind.DELETE:
handleDeleteStatement(metadataProvider, stmt, hcc, false);
@@ -1727,8 +1728,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen
public JobSpecification handleInsertUpsertStatement(MetadataProvider metadataProvider, Statement stmt,
IHyracksClientConnection hcc, IHyracksDataset hdc, ResultDelivery resultDelivery,
- ResultMetadata outMetadata, Stats stats, boolean compileOnly, String clientContextId,
- IStatementExecutorContext ctx) throws Exception {
+ ResultMetadata outMetadata, Stats stats, boolean compileOnly, String clientContextId) throws Exception {
InsertStatement stmtInsertUpsert = (InsertStatement) stmt;
String dataverseName = getActiveDataverse(stmtInsertUpsert.getDataverseName());
final IMetadataLocker locker = new IMetadataLocker() {
@@ -1771,7 +1771,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen
if (stmtInsertUpsert.getReturnExpression() != null) {
deliverResult(hcc, hdc, compiler, metadataProvider, locker, resultDelivery, outMetadata, stats,
- clientContextId, ctx);
+ clientContextId, NoOpStatementExecutorContext.INSTANCE);
} else {
locker.lock();
try {