asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjaco...@apache.org
Subject asterixdb-bad git commit: Match SessionOutput changes from Asterix
Date Mon, 15 May 2017 03:38:58 GMT
Repository: asterixdb-bad
Updated Branches:
  refs/heads/master dcbd6d1f5 -> 74191538f


Match SessionOutput changes from Asterix

Change-Id: I0b64141926b5161dcb44bb6edbc19c2d0cdf2860


Project: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/commit/74191538
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/tree/74191538
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/diff/74191538

Branch: refs/heads/master
Commit: 74191538f02880ba503c736d1ac4292957723396
Parents: dcbd6d1
Author: Till Westmann <tillw@apache.org>
Authored: Thu May 11 17:28:39 2017 -0700
Committer: Till Westmann <tillw@apache.org>
Committed: Thu May 11 17:28:39 2017 -0700

----------------------------------------------------------------------
 .../org/apache/asterix/bad/lang/BADQueryTranslatorFactory.java | 6 +++---
 .../java/org/apache/asterix/bad/lang/BADStatementExecutor.java | 6 +++---
 .../asterix/bad/lang/statement/ChannelSubscribeStatement.java  | 4 ++--
 .../asterix/bad/lang/statement/CreateChannelStatement.java     | 2 +-
 .../asterix/bad/lang/statement/CreateProcedureStatement.java   | 2 +-
 .../asterix/bad/lang/statement/ExecuteProcedureStatement.java  | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/74191538/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADQueryTranslatorFactory.java
----------------------------------------------------------------------
diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADQueryTranslatorFactory.java
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADQueryTranslatorFactory.java
index 0360ee3..09a436b 100644
--- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADQueryTranslatorFactory.java
+++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADQueryTranslatorFactory.java
@@ -26,14 +26,14 @@ import org.apache.asterix.common.context.IStorageComponentProvider;
 import org.apache.asterix.common.dataflow.ICcApplicationContext;
 import org.apache.asterix.compiler.provider.ILangCompilationProvider;
 import org.apache.asterix.lang.common.base.Statement;
-import org.apache.asterix.translator.SessionConfig;
+import org.apache.asterix.translator.SessionOutput;
 
 public class BADQueryTranslatorFactory extends DefaultStatementExecutorFactory {
 
     @Override
-    public QueryTranslator create(ICcApplicationContext appCtx, List<Statement> statements,
SessionConfig conf,
+    public QueryTranslator create(ICcApplicationContext appCtx, List<Statement> statements,
SessionOutput output,
             ILangCompilationProvider compilationProvider, IStorageComponentProvider storageComponentProvider)
{
-        return new BADStatementExecutor(appCtx, statements, conf, compilationProvider, storageComponentProvider,
+        return new BADStatementExecutor(appCtx, statements, output, compilationProvider,
storageComponentProvider,
                 executorService);
     }
 }

http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/74191538/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 0f2e212..5775e9b 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
@@ -38,15 +38,15 @@ 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.SessionConfig;
+import org.apache.asterix.translator.SessionOutput;
 import org.apache.hyracks.api.client.IHyracksClientConnection;
 
 public class BADStatementExecutor extends QueryTranslator {
 
-    public BADStatementExecutor(ICcApplicationContext appCtx, List<Statement> statements,
SessionConfig conf,
+    public BADStatementExecutor(ICcApplicationContext appCtx, List<Statement> statements,
SessionOutput output,
             ILangCompilationProvider compliationProvider, IStorageComponentProvider storageComponentProvider,
             ExecutorService executorService) {
-        super(appCtx, statements, conf, compliationProvider, storageComponentProvider, executorService);
+        super(appCtx, statements, output, compliationProvider, storageComponentProvider,
executorService);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/74191538/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 60f871e..5bf0690 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
@@ -210,13 +210,13 @@ public class ChannelSubscribeStatement implements IExtensionStatement
{
                 InsertStatement insert = new InsertStatement(new Identifier(dataverse),
                         new Identifier(subscriptionsDatasetName), subscriptionTuple, varCounter,
resultVar, accessor);
                 ((QueryTranslator) statementExecutor).handleInsertUpsertStatement(tempMdProvider,
insert, hcc, hdc,
-                        resultDelivery, stats, false, null, null);
+                        resultDelivery, null, stats, false, null, null);
             } else {
                 //To update an existing subscription
                 UpsertStatement upsert = new UpsertStatement(new Identifier(dataverse),
                         new Identifier(subscriptionsDatasetName), subscriptionTuple, varCounter,
null, null);
                 ((QueryTranslator) statementExecutor).handleInsertUpsertStatement(tempMdProvider,
upsert, hcc, hdc,
-                        resultDelivery, stats, false, null, null);
+                        resultDelivery, null, stats, false, null, null);
             }
 
             MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);

http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/74191538/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 ff115e9..09cc3e5 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
@@ -236,7 +236,7 @@ public class CreateChannelStatement implements IExtensionStatement {
         metadataProvider.getConfig().put(ss.getPropName(), ss.getPropValue());
 
         return ((QueryTranslator) statementExecutor).handleInsertUpsertStatement(metadataProvider,
fStatements.get(1),
-                hcc, hdc, ResultDelivery.ASYNC, stats, true, null, null);
+                hcc, hdc, ResultDelivery.ASYNC, null, stats, true, null, null);
     }
 
     private void setupExecutorJob(EntityId entityId, JobSpecification channeljobSpec, IHyracksClientConnection
hcc,

http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/74191538/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 7373337..dfc3ed3 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
@@ -172,7 +172,7 @@ public class CreateProcedureStatement implements IExtensionStatement {
         if (fStatements.get(0).getKind() == Statement.Kind.INSERT) {
             return new Pair<>(
                     ((QueryTranslator) statementExecutor).handleInsertUpsertStatement(metadataProvider,
-                            fStatements.get(0), hcc, hdc, ResultDelivery.ASYNC, stats, true,
null, null),
+                            fStatements.get(0), hcc, hdc, ResultDelivery.ASYNC, null, stats,
true, null, null),
                     PrecompiledType.INSERT);
         } else if (fStatements.get(0).getKind() == Statement.Kind.QUERY) {
             Pair<JobSpecification, PrecompiledType> pair =

http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/74191538/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 a8ec9aa..9bf3718 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
@@ -121,7 +121,7 @@ public class ExecuteProcedureStatement implements IExtensionStatement
{
                     hcc.waitForCompletion(hyracksJobId);
                     ResultReader resultReader = listener.getResultReader();
                     ResultUtil.printResults(appCtx, resultReader,
-                            ((QueryTranslator) statementExecutor).getSessionConfig(), new
Stats(), null);
+                            ((QueryTranslator) statementExecutor).getSessionOutput(), new
Stats(), null);
                 }
 
             } else {


Mime
View raw message