Merge branch 'master' into resultsFinalVersion
Project: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/commit/376a1454 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/tree/376a1454 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/diff/376a1454 Branch: refs/heads/resultsFinalVersion Commit: 376a1454df1d8275516f5eafa2e3f77547851ffc Parents: 99837b1 40b70a1 Author: Steven Glenn Jacobs <sjaco...@ucr.edu> Authored: Thu Jul 26 10:28:44 2018 -0700 Committer: Steven Glenn Jacobs <sjaco...@ucr.edu> Committed: Thu Jul 26 10:28:44 2018 -0700 ---------------------------------------------------------------------- asterix-bad/pom.xml | 7 +++++++ .../apache/asterix/bad/lang/BADStatementExecutor.java | 7 +++---- .../bad/lang/statement/BrokerDropStatement.java | 5 +++-- .../bad/lang/statement/ChannelDropStatement.java | 10 +++++----- .../bad/lang/statement/ChannelSubscribeStatement.java | 5 +++-- .../lang/statement/ChannelUnsubscribeStatement.java | 8 ++++---- .../bad/lang/statement/CreateBrokerStatement.java | 5 +++-- .../bad/lang/statement/CreateChannelStatement.java | 8 ++++---- .../bad/lang/statement/CreateProcedureStatement.java | 14 ++++++-------- .../bad/lang/statement/ExecuteProcedureStatement.java | 13 ++++++------- .../bad/lang/statement/ProcedureDropStatement.java | 10 +++++----- .../org/apache/asterix/bad/test/BADExecutionTest.java | 2 ++ 12 files changed, 51 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/376a1454/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/376a1454/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java ---------------------------------------------------------------------- diff --cc asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java index c55cbe8,cff1eaa..2bf1bea --- 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 @@@ -40,7 -52,9 +40,8 @@@ import org.apache.asterix.translator.IR import org.apache.asterix.translator.IStatementExecutor; import org.apache.asterix.translator.IStatementExecutor.ResultDelivery; import org.apache.asterix.translator.IStatementExecutor.Stats; + import org.apache.asterix.translator.IStatementExecutorContext; 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.dataset.ResultSetId; http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/376a1454/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelUnsubscribeStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/376a1454/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java ----------------------------------------------------------------------
