Repository: asterixdb-bad Updated Branches: refs/heads/master d5ef650f9 -> ed4aea217
[ASTERIXDB-1973][BAD] Coordinated changes for IStatementExecutor Change-Id: I392d7cda45e2bd39a85c037959ae5483eb48c9ee Project: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/commit/ed4aea21 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/tree/ed4aea21 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/diff/ed4aea21 Branch: refs/heads/master Commit: ed4aea2174ed67ab08340674e4036a6c77475d11 Parents: d5ef650 Author: Murtadha Hubail <[email protected]> Authored: Tue Sep 19 11:52:05 2017 -0700 Committer: Murtadha Hubail <[email protected]> Committed: Tue Sep 19 11:52:05 2017 -0700 ---------------------------------------------------------------------- .../apache/asterix/bad/lang/BADStatementExecutor.java | 9 ++++++--- .../bad/lang/statement/BrokerDropStatement.java | 10 ++++------ .../bad/lang/statement/ChannelDropStatement.java | 10 ++++------ .../bad/lang/statement/ChannelSubscribeStatement.java | 14 +++++++++----- .../lang/statement/ChannelUnsubscribeStatement.java | 10 ++++------ .../bad/lang/statement/CreateBrokerStatement.java | 10 ++++------ .../bad/lang/statement/CreateChannelStatement.java | 10 ++++++---- .../bad/lang/statement/CreateProcedureStatement.java | 12 ++++++++---- .../bad/lang/statement/ExecuteProcedureStatement.java | 9 ++++----- .../bad/lang/statement/ProcedureDropStatement.java | 10 ++++------ 10 files changed, 53 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/ed4aea21/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java ---------------------------------------------------------------------- diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java index 56de450..28f7f00 100644 --- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java +++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java @@ -21,6 +21,7 @@ package org.apache.asterix.bad.lang; import java.util.List; import java.util.concurrent.ExecutorService; +import org.apache.asterix.app.translator.RequestParameters; import org.apache.asterix.app.translator.QueryTranslator; import org.apache.asterix.bad.lang.statement.BrokerDropStatement; import org.apache.asterix.bad.lang.statement.ChannelDropStatement; @@ -37,6 +38,7 @@ import org.apache.asterix.lang.common.struct.Identifier; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.declared.MetadataProvider; +import org.apache.asterix.translator.IRequestParameters; import org.apache.asterix.translator.SessionOutput; import org.apache.hyracks.api.client.IHyracksClientConnection; @@ -59,24 +61,25 @@ public class BADStatementExecutor extends QueryTranslator { List<Broker> brokers = BADLangExtension.getBrokers(mdTxnCtx, dvId.getValue()); MetadataProvider tempMdProvider = new MetadataProvider(appCtx, metadataProvider.getDefaultDataverse()); tempMdProvider.getConfig().putAll(metadataProvider.getConfig()); + final IRequestParameters requestParameters = new RequestParameters(null, null, null, null, null, null); for (Broker broker : brokers) { tempMdProvider.getLocks().reset(); BrokerDropStatement drop = new BrokerDropStatement(dvId, new Identifier(broker.getBrokerName()), false); - drop.handle(this, tempMdProvider, hcc, null, null, null, 0); + drop.handle(hcc, this, requestParameters, tempMdProvider, 0); } List<Channel> channels = BADLangExtension.getChannels(mdTxnCtx, dvId.getValue()); for (Channel channel : channels) { tempMdProvider.getLocks().reset(); ChannelDropStatement drop = new ChannelDropStatement(dvId, new Identifier(channel.getChannelId().getEntityName()), false); - drop.handle(this, tempMdProvider, hcc, null, null, null, 0); + drop.handle(hcc, this, requestParameters, tempMdProvider, 0); } List<Procedure> procedures = BADLangExtension.getProcedures(mdTxnCtx, dvId.getValue()); for (Procedure procedure : procedures) { tempMdProvider.getLocks().reset(); ProcedureDropStatement drop = new ProcedureDropStatement(new FunctionSignature(dvId.getValue(), procedure.getEntityId().getEntityName(), procedure.getArity()), false); - drop.handle(this, tempMdProvider, hcc, null, null, null, 0); + drop.handle(hcc, this, requestParameters, tempMdProvider, 0); } MetadataManager.INSTANCE.commitTransaction(mdTxnCtx); } http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/ed4aea21/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/BrokerDropStatement.java ---------------------------------------------------------------------- diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/BrokerDropStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/BrokerDropStatement.java index 5b81903..90beef7 100644 --- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/BrokerDropStatement.java +++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/BrokerDropStatement.java @@ -28,12 +28,10 @@ import org.apache.asterix.lang.common.visitor.base.ILangVisitor; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.declared.MetadataProvider; +import org.apache.asterix.translator.IRequestParameters; import org.apache.asterix.translator.IStatementExecutor; -import org.apache.asterix.translator.IStatementExecutor.ResultDelivery; -import org.apache.asterix.translator.IStatementExecutor.Stats; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.client.IHyracksClientConnection; -import org.apache.hyracks.api.dataset.IHyracksDataset; import org.apache.hyracks.api.exceptions.HyracksDataException; public class BrokerDropStatement implements IExtensionStatement { @@ -76,9 +74,9 @@ public class BrokerDropStatement implements IExtensionStatement { } @Override - public void handle(IStatementExecutor statementExecutor, MetadataProvider metadataProvider, - IHyracksClientConnection hcc, IHyracksDataset hdc, ResultDelivery resultDelivery, Stats stats, - int resultSetIdCounter) throws HyracksDataException, AlgebricksException { + public void handle(IHyracksClientConnection hcc, IStatementExecutor statementExecutor, + IRequestParameters requestParameters, MetadataProvider metadataProvider, int resultSetId) + throws HyracksDataException, AlgebricksException { //TODO: dont drop a broker that's being used String dataverse = ((QueryTranslator) statementExecutor).getActiveDataverse(dataverseName); MetadataTransactionContext mdTxnCtx = null; http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/ed4aea21/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java ---------------------------------------------------------------------- diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java index 7b676a7..43aa161 100644 --- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java +++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java @@ -34,12 +34,10 @@ import org.apache.asterix.lang.common.visitor.base.ILangVisitor; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.declared.MetadataProvider; +import org.apache.asterix.translator.IRequestParameters; import org.apache.asterix.translator.IStatementExecutor; -import org.apache.asterix.translator.IStatementExecutor.ResultDelivery; -import org.apache.asterix.translator.IStatementExecutor.Stats; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.client.IHyracksClientConnection; -import org.apache.hyracks.api.dataset.IHyracksDataset; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.job.JobId; @@ -83,9 +81,9 @@ public class ChannelDropStatement implements IExtensionStatement { } @Override - public void handle(IStatementExecutor statementExecutor, MetadataProvider metadataProvider, - IHyracksClientConnection hcc, IHyracksDataset hdc, ResultDelivery resultDelivery, Stats stats, - int resultSetIdCounter) throws HyracksDataException, AlgebricksException { + public void handle(IHyracksClientConnection hcc, IStatementExecutor statementExecutor, + IRequestParameters requestParameters, MetadataProvider metadataProvider, int resultSetId) + throws HyracksDataException, AlgebricksException { String dataverse = ((QueryTranslator) statementExecutor).getActiveDataverse(dataverseName); boolean txnActive = false; EntityId entityId = new EntityId(BADConstants.CHANNEL_EXTENSION_NAME, dataverse, channelName.getValue()); http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/ed4aea21/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java ---------------------------------------------------------------------- diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java index c5f6319..fcd0c07 100644 --- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java +++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java @@ -48,6 +48,7 @@ import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.om.functions.BuiltinFunctions; +import org.apache.asterix.translator.IRequestParameters; import org.apache.asterix.translator.IStatementExecutor; import org.apache.asterix.translator.IStatementExecutor.ResultDelivery; import org.apache.asterix.translator.IStatementExecutor.Stats; @@ -123,10 +124,9 @@ public class ChannelSubscribeStatement implements IExtensionStatement { } @Override - public void handle(IStatementExecutor statementExecutor, MetadataProvider metadataProvider, - IHyracksClientConnection hcc, IHyracksDataset hdc, ResultDelivery resultDelivery, Stats stats, - int resultSetIdCounter) throws HyracksDataException, AlgebricksException { - + public void handle(IHyracksClientConnection hcc, IStatementExecutor statementExecutor, + IRequestParameters requestParameters, MetadataProvider metadataProvider, int resultSetId) + throws HyracksDataException, AlgebricksException { String dataverse = ((QueryTranslator) statementExecutor).getActiveDataverse(dataverseName); String brokerDataverse = ((QueryTranslator) statementExecutor).getActiveDataverse(brokerDataverseName); @@ -186,6 +186,10 @@ public class ChannelSubscribeStatement implements IExtensionStatement { MetadataProvider tempMdProvider = new MetadataProvider(metadataProvider.getApplicationContext(), metadataProvider.getDefaultDataverse()); tempMdProvider.getConfig().putAll(metadataProvider.getConfig()); + + final ResultDelivery resultDelivery = requestParameters.getResultDelivery(); + final IHyracksDataset hdc = requestParameters.getHyracksDataset(); + final Stats stats = requestParameters.getStats(); if (subscriptionId == null) { //To create a new subscription VariableExpr resultVar = new VariableExpr(new VarIdentifier("$result", 0)); @@ -193,7 +197,7 @@ public class ChannelSubscribeStatement implements IExtensionStatement { useResultVar.setIsNewVar(false); FieldAccessor accessor = new FieldAccessor(useResultVar, new Identifier(BADConstants.SubscriptionId)); - metadataProvider.setResultSetId(new ResultSetId(resultSetIdCounter)); + metadataProvider.setResultSetId(new ResultSetId(resultSetId)); boolean resultsAsync = resultDelivery == ResultDelivery.ASYNC || resultDelivery == ResultDelivery.DEFERRED; metadataProvider.setResultAsyncMode(resultsAsync); http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/ed4aea21/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelUnsubscribeStatement.java ---------------------------------------------------------------------- diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelUnsubscribeStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelUnsubscribeStatement.java index 100ff5f..e456768 100644 --- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelUnsubscribeStatement.java +++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelUnsubscribeStatement.java @@ -44,13 +44,11 @@ import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.om.functions.BuiltinFunctions; +import org.apache.asterix.translator.IRequestParameters; import org.apache.asterix.translator.IStatementExecutor; -import org.apache.asterix.translator.IStatementExecutor.ResultDelivery; -import org.apache.asterix.translator.IStatementExecutor.Stats; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; import org.apache.hyracks.api.client.IHyracksClientConnection; -import org.apache.hyracks.api.dataset.IHyracksDataset; import org.apache.hyracks.api.exceptions.HyracksDataException; public class ChannelUnsubscribeStatement implements IExtensionStatement { @@ -106,9 +104,9 @@ public class ChannelUnsubscribeStatement implements IExtensionStatement { } @Override - public void handle(IStatementExecutor statementExecutor, MetadataProvider metadataProvider, - IHyracksClientConnection hcc, IHyracksDataset hdc, ResultDelivery resultDelivery, Stats stats, - int resultSetIdCounter) throws HyracksDataException, AlgebricksException { + public void handle(IHyracksClientConnection hcc, IStatementExecutor statementExecutor, + IRequestParameters requestParameters, MetadataProvider metadataProvider, int resultSetId) + throws HyracksDataException, AlgebricksException { String dataverse = ((QueryTranslator) statementExecutor).getActiveDataverse(dataverseName); MetadataTransactionContext mdTxnCtx = null; http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/ed4aea21/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateBrokerStatement.java ---------------------------------------------------------------------- diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateBrokerStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateBrokerStatement.java index b4f3eae..6369854 100644 --- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateBrokerStatement.java +++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateBrokerStatement.java @@ -31,12 +31,10 @@ import org.apache.asterix.lang.common.visitor.base.ILangVisitor; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.declared.MetadataProvider; +import org.apache.asterix.translator.IRequestParameters; import org.apache.asterix.translator.IStatementExecutor; -import org.apache.asterix.translator.IStatementExecutor.ResultDelivery; -import org.apache.asterix.translator.IStatementExecutor.Stats; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.client.IHyracksClientConnection; -import org.apache.hyracks.api.dataset.IHyracksDataset; import org.apache.hyracks.api.exceptions.HyracksDataException; public class CreateBrokerStatement implements IExtensionStatement { @@ -80,9 +78,9 @@ public class CreateBrokerStatement implements IExtensionStatement { } @Override - public void handle(IStatementExecutor statementExecutor, MetadataProvider metadataProvider, - IHyracksClientConnection hcc, IHyracksDataset hdc, ResultDelivery resultDelivery, Stats stats, - int resultSetIdCounter) throws HyracksDataException, AlgebricksException { + public void handle(IHyracksClientConnection hcc, IStatementExecutor statementExecutor, + IRequestParameters requestParameters, MetadataProvider metadataProvider, int resultSetId) + throws HyracksDataException, AlgebricksException { String dataverse = ((QueryTranslator) statementExecutor).getActiveDataverse(dataverseName); MetadataTransactionContext mdTxnCtx = null; try { http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/ed4aea21/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java ---------------------------------------------------------------------- diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java index 8c0a146..5c92cb5 100644 --- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java +++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java @@ -64,6 +64,7 @@ import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Function; import org.apache.asterix.om.base.temporal.ADurationParserFactory; +import org.apache.asterix.translator.IRequestParameters; import org.apache.asterix.translator.IStatementExecutor; import org.apache.asterix.translator.IStatementExecutor.ResultDelivery; import org.apache.asterix.translator.IStatementExecutor.Stats; @@ -253,10 +254,9 @@ public class CreateChannelStatement implements IExtensionStatement { } @Override - public void handle(IStatementExecutor statementExecutor, MetadataProvider metadataProvider, - IHyracksClientConnection hcc, IHyracksDataset hdc, ResultDelivery resultDelivery, Stats stats, - int resultSetIdCounter) throws HyracksDataException, AlgebricksException { - + public void handle(IHyracksClientConnection hcc, IStatementExecutor statementExecutor, + IRequestParameters requestContext, MetadataProvider metadataProvider, int resultSetId) + throws HyracksDataException, AlgebricksException { //This function performs three tasks: //1. Create datasets for the Channel //2. Create and run the Channel Job @@ -306,6 +306,8 @@ public class CreateChannelStatement implements IExtensionStatement { MetadataProvider tempMdProvider = new MetadataProvider(metadataProvider.getApplicationContext(), metadataProvider.getDefaultDataverse()); tempMdProvider.getConfig().putAll(metadataProvider.getConfig()); + final IHyracksDataset hdc = requestContext.getHyracksDataset(); + final Stats stats = requestContext.getStats(); //Create Channel Datasets createDatasets(statementExecutor, subscriptionsName, resultsName, tempMdProvider, hcc, hdc, dataverse); tempMdProvider.getLocks().reset(); http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/ed4aea21/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java ---------------------------------------------------------------------- diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java index 35eae6c..0666b38 100644 --- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java +++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java @@ -57,6 +57,7 @@ import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Function; import org.apache.asterix.om.base.temporal.ADurationParserFactory; +import org.apache.asterix.translator.IRequestParameters; import org.apache.asterix.translator.IStatementExecutor; import org.apache.asterix.translator.IStatementExecutor.ResultDelivery; import org.apache.asterix.translator.IStatementExecutor.Stats; @@ -197,9 +198,9 @@ public class CreateProcedureStatement implements IExtensionStatement { } @Override - public void handle(IStatementExecutor statementExecutor, MetadataProvider metadataProvider, - IHyracksClientConnection hcc, IHyracksDataset hdc, ResultDelivery resultDelivery, Stats stats, - int resultSetIdCounter) throws HyracksDataException, AlgebricksException { + public void handle(IHyracksClientConnection hcc, IStatementExecutor statementExecutor, + IRequestParameters requestParameters, MetadataProvider metadataProvider, int resultSetId) + throws HyracksDataException, AlgebricksException { ICcApplicationContext appCtx = metadataProvider.getApplicationContext(); ActiveNotificationHandler activeEventHandler = (ActiveNotificationHandler) appCtx.getActiveNotificationHandler(); @@ -231,7 +232,10 @@ public class CreateProcedureStatement implements IExtensionStatement { MetadataProvider tempMdProvider = new MetadataProvider(metadataProvider.getApplicationContext(), metadataProvider.getDefaultDataverse()); tempMdProvider.getConfig().putAll(metadataProvider.getConfig()); - metadataProvider.setResultSetId(new ResultSetId(resultSetIdCounter++)); + metadataProvider.setResultSetId(new ResultSetId(resultSetId++)); + final ResultDelivery resultDelivery = requestParameters.getResultDelivery(); + final IHyracksDataset hdc = requestParameters.getHyracksDataset(); + final Stats stats = requestParameters.getStats(); boolean resultsAsync = resultDelivery == ResultDelivery.ASYNC || resultDelivery == ResultDelivery.DEFERRED; metadataProvider.setResultAsyncMode(resultsAsync); tempMdProvider.setResultSetId(metadataProvider.getResultSetId()); http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/ed4aea21/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java ---------------------------------------------------------------------- diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java index e60570c..0dbd0a3 100644 --- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java +++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ExecuteProcedureStatement.java @@ -40,12 +40,11 @@ import org.apache.asterix.lang.common.visitor.base.ILangVisitor; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.declared.MetadataProvider; +import org.apache.asterix.translator.IRequestParameters; import org.apache.asterix.translator.IStatementExecutor; -import org.apache.asterix.translator.IStatementExecutor.ResultDelivery; import org.apache.asterix.translator.IStatementExecutor.Stats; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.client.IHyracksClientConnection; -import org.apache.hyracks.api.dataset.IHyracksDataset; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.job.JobFlag; import org.apache.hyracks.api.job.JobId; @@ -90,9 +89,9 @@ public class ExecuteProcedureStatement implements IExtensionStatement { } @Override - public void handle(IStatementExecutor statementExecutor, MetadataProvider metadataProvider, - IHyracksClientConnection hcc, IHyracksDataset hdc, ResultDelivery resultDelivery, Stats stats, - int resultSetIdCounter) throws HyracksDataException, AlgebricksException { + public void handle(IHyracksClientConnection hcc, IStatementExecutor statementExecutor, + IRequestParameters requestParameters, MetadataProvider metadataProvider, int resultSetId) + throws HyracksDataException, AlgebricksException { ICcApplicationContext appCtx = metadataProvider.getApplicationContext(); ActiveNotificationHandler activeEventHandler = (ActiveNotificationHandler) appCtx.getActiveNotificationHandler(); http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/ed4aea21/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ProcedureDropStatement.java ---------------------------------------------------------------------- diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ProcedureDropStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ProcedureDropStatement.java index a1bf0d3..3c618ae 100644 --- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ProcedureDropStatement.java +++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ProcedureDropStatement.java @@ -34,12 +34,10 @@ import org.apache.asterix.lang.common.visitor.base.ILangVisitor; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.declared.MetadataProvider; +import org.apache.asterix.translator.IRequestParameters; import org.apache.asterix.translator.IStatementExecutor; -import org.apache.asterix.translator.IStatementExecutor.ResultDelivery; -import org.apache.asterix.translator.IStatementExecutor.Stats; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.client.IHyracksClientConnection; -import org.apache.hyracks.api.dataset.IHyracksDataset; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.job.JobId; @@ -77,9 +75,9 @@ public class ProcedureDropStatement implements IExtensionStatement { } @Override - public void handle(IStatementExecutor statementExecutor, MetadataProvider metadataProvider, - IHyracksClientConnection hcc, IHyracksDataset hdc, ResultDelivery resultDelivery, Stats stats, - int resultSetIdCounter) throws HyracksDataException, AlgebricksException { + public void handle(IHyracksClientConnection hcc, IStatementExecutor statementExecutor, + IRequestParameters requestParameters, MetadataProvider metadataProvider, int resultSetId) + throws HyracksDataException, AlgebricksException { ICcApplicationContext appCtx = metadataProvider.getApplicationContext(); ActiveNotificationHandler activeEventHandler = (ActiveNotificationHandler) appCtx.getActiveNotificationHandler();
