Repository: incubator-drill Updated Branches: refs/heads/master 8c6652573 -> 687b9b0b6
Reenable producer/consumer. Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/d2158010 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/d2158010 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/d2158010 Branch: refs/heads/master Commit: d215801022def22c4dce3f58751ab4dc2853482d Parents: 8c66525 Author: Jacques Nadeau <[email protected]> Authored: Sun Aug 10 15:14:08 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Mon Aug 11 21:07:59 2014 -0700 ---------------------------------------------------------------------- .../drill/exec/planner/sql/handlers/DefaultSqlHandler.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/d2158010/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java index 0c75809..177331d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java @@ -163,10 +163,10 @@ public class DefaultSqlHandler extends AbstractSqlHandler { * under screen operator. The project on top of scan will rename from * to T1*, while the top project * will rename T1* to *, before it output the final result. Only the top project will allow * duplicate columns, since user could "explicitly" ask for duplicate columns ( select *, col, *). - * The rest of projects will remove the duplicate column when we generate POP in json format. + * The rest of projects will remove the duplicate column when we generate POP in json format. */ phyRelNode = StarColumnConverter.insertRenameProject(phyRelNode, phyRelNode.getRowType()); - + /* * 1.) * Join might cause naming conflicts from its left and right child. @@ -201,13 +201,10 @@ public class DefaultSqlHandler extends AbstractSqlHandler { * Add ProducerConsumer after each scan if the option is set * Use the configured queueSize */ - // Disabling for now, as this causes memory leaks. See DRILL-1202 - /* if (context.getOptions().getOption(PlannerSettings.PRODUCER_CONSUMER.getOptionName()).bool_val) { long queueSize = context.getOptions().getOption(PlannerSettings.PRODUCER_CONSUMER_QUEUE_SIZE.getOptionName()).num_val; phyRelNode = ProducerConsumerPrelVisitor.addProducerConsumerToScans(phyRelNode, (int) queueSize); } - */ /* 6.) * if the client does not support complex types (Map, Repeated)
