Repository: asterixdb-bad Updated Branches: refs/heads/master 0fb6b2302 -> c6c98ce96
[ASTERIXDB-2249][BAD] Coordinated Change Change-Id: I5287c0b291f2344bd2eeb55e0cb92c387b400ada Project: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/commit/c6c98ce9 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/tree/c6c98ce9 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/diff/c6c98ce9 Branch: refs/heads/master Commit: c6c98ce96edc218b61df2f1f0a42cff7b4ff30f6 Parents: 0fb6b23 Author: Murtadha Hubail <[email protected]> Authored: Wed Jan 17 18:34:11 2018 +0300 Committer: Murtadha Hubail <[email protected]> Committed: Wed Jan 17 18:34:11 2018 +0300 ---------------------------------------------------------------------- .../asterix/bad/lang/statement/ChannelSubscribeStatement.java | 3 ++- .../asterix/bad/lang/statement/CreateProcedureStatement.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/c6c98ce9/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 fcd0c07..bab6ad2 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 @@ -187,7 +187,7 @@ public class ChannelSubscribeStatement implements IExtensionStatement { metadataProvider.getDefaultDataverse()); tempMdProvider.getConfig().putAll(metadataProvider.getConfig()); - final ResultDelivery resultDelivery = requestParameters.getResultDelivery(); + final ResultDelivery resultDelivery = requestParameters.getResultProperties().getDelivery(); final IHyracksDataset hdc = requestParameters.getHyracksDataset(); final Stats stats = requestParameters.getStats(); if (subscriptionId == null) { @@ -207,6 +207,7 @@ public class ChannelSubscribeStatement implements IExtensionStatement { tempMdProvider .setResultSerializerFactoryProvider(metadataProvider.getResultSerializerFactoryProvider()); tempMdProvider.setOutputFile(metadataProvider.getOutputFile()); + tempMdProvider.setMaxResultReads(requestParameters.getResultProperties().getMaxReads()); InsertStatement insert = new InsertStatement(new Identifier(dataverse), new Identifier(subscriptionsDatasetName), subscriptionTuple, varCounter, resultVar, accessor); http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/c6c98ce9/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 adfa485..b93f778 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 @@ -262,7 +262,7 @@ public class CreateProcedureStatement implements IExtensionStatement { metadataProvider.getDefaultDataverse()); tempMdProvider.getConfig().putAll(metadataProvider.getConfig()); metadataProvider.setResultSetId(new ResultSetId(resultSetId++)); - final ResultDelivery resultDelivery = requestParameters.getResultDelivery(); + final ResultDelivery resultDelivery = requestParameters.getResultProperties().getDelivery(); final IHyracksDataset hdc = requestParameters.getHyracksDataset(); final Stats stats = requestParameters.getStats(); boolean resultsAsync = resultDelivery == ResultDelivery.ASYNC || resultDelivery == ResultDelivery.DEFERRED; @@ -272,7 +272,7 @@ public class CreateProcedureStatement implements IExtensionStatement { tempMdProvider.setWriterFactory(metadataProvider.getWriterFactory()); tempMdProvider.setResultSerializerFactoryProvider(metadataProvider.getResultSerializerFactoryProvider()); tempMdProvider.setOutputFile(metadataProvider.getOutputFile()); - + tempMdProvider.setMaxResultReads(requestParameters.getResultProperties().getMaxReads()); //Create Procedure Internal Job Pair<JobSpecification, PrecompiledType> procedureJobSpec = createProcedureJob(statementExecutor, tempMdProvider, hcc, hdc, stats);
