Murtadha Hubail has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/3411
Change subject: [NO ISSUE][BAD] Coordinated Change for ResponsePrinter ...................................................................... [NO ISSUE][BAD] Coordinated Change for ResponsePrinter - user model changes: no - storage format changes: no - interface changes: no Details: - Coordinated change for ResponsePrinter. Change-Id: I9255ef88ea03df629ffe3ca2f1d9b08504459f06 --- M asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADQueryTranslatorFactory.java M asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java M asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java 3 files changed, 13 insertions(+), 7 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb-bad refs/changes/11/3411/1 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 8f5d520..ab5a96e 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 @@ -22,6 +22,7 @@ import org.apache.asterix.app.translator.DefaultStatementExecutorFactory; import org.apache.asterix.app.translator.QueryTranslator; +import org.apache.asterix.common.api.IResponsePrinter; import org.apache.asterix.common.context.IStorageComponentProvider; import org.apache.asterix.common.dataflow.ICcApplicationContext; import org.apache.asterix.compiler.provider.ILangCompilationProvider; @@ -32,7 +33,8 @@ @Override public QueryTranslator create(ICcApplicationContext appCtx, List<Statement> statements, SessionOutput output, - ILangCompilationProvider compilationProvider, IStorageComponentProvider storageComponentProvider) { - return new BADStatementExecutor(appCtx, statements, output, compilationProvider, executorService); + ILangCompilationProvider compilationProvider, IStorageComponentProvider storageComponentProvider, + IResponsePrinter printer) { + return new BADStatementExecutor(appCtx, statements, output, compilationProvider, executorService, printer); } } 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 9cb57e1..e57a2e5 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 @@ -32,6 +32,7 @@ import org.apache.asterix.bad.metadata.Channel; import org.apache.asterix.bad.metadata.DeployedJobSpecEventListener; import org.apache.asterix.bad.metadata.Procedure; +import org.apache.asterix.common.api.IResponsePrinter; import org.apache.asterix.common.dataflow.ICcApplicationContext; import org.apache.asterix.common.exceptions.CompilationException; import org.apache.asterix.common.functions.FunctionSignature; @@ -57,8 +58,8 @@ public class BADStatementExecutor extends QueryTranslator { public BADStatementExecutor(ICcApplicationContext appCtx, List<Statement> statements, SessionOutput output, - ILangCompilationProvider compliationProvider, ExecutorService executorService) { - super(appCtx, statements, output, compliationProvider, executorService); + ILangCompilationProvider compliationProvider, ExecutorService executorService, IResponsePrinter printer) { + super(appCtx, statements, output, compliationProvider, executorService, printer); } //TODO: Most of this file could go away if we had metadata dependencies diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java b/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java index 38dc16d..0cc59e5 100644 --- a/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java +++ b/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java @@ -30,6 +30,7 @@ import org.apache.asterix.active.EntityId; import org.apache.asterix.active.IActiveEntityEventsListener; import org.apache.asterix.app.active.ActiveNotificationHandler; +import org.apache.asterix.app.result.ResponsePrinter; import org.apache.asterix.app.result.ResultReader; import org.apache.asterix.app.translator.DefaultStatementExecutorFactory; import org.apache.asterix.app.translator.RequestParameters; @@ -94,10 +95,12 @@ throws Exception { SessionConfig sessionConfig = new SessionConfig(SessionConfig.OutputFormat.ADM, true, true, true, SessionConfig.PlanFormat.STRING); - + final SessionOutput sessionOutput = new SessionOutput(sessionConfig, null); BADStatementExecutor badStatementExecutor = new BADStatementExecutor(appCtx, new ArrayList<>(), - new SessionOutput(sessionConfig, null), new BADCompilationProvider(), Executors.newSingleThreadExecutor( - new HyracksThreadFactory(DefaultStatementExecutorFactory.class.getSimpleName()))); + new SessionOutput(sessionConfig, null), new BADCompilationProvider(), + Executors.newSingleThreadExecutor( + new HyracksThreadFactory(DefaultStatementExecutorFactory.class.getSimpleName())), + new ResponsePrinter(sessionOutput)); ActiveNotificationHandler activeEventHandler = (ActiveNotificationHandler) appCtx.getActiveNotificationHandler(); -- To view, visit https://asterix-gerrit.ics.uci.edu/3411 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb-bad Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9255ef88ea03df629ffe3ca2f1d9b08504459f06 Gerrit-Change-Number: 3411 Gerrit-PatchSet: 1 Gerrit-Owner: Murtadha Hubail <mhub...@apache.org>