aboutsummaryrefslogtreecommitdiff
path: root/exec/java-exec/src/main
diff options
context:
space:
mode:
authorJacques Nadeau <jacques@apache.org>2014-08-10 15:14:08 -0700
committerJacques Nadeau <jacques@apache.org>2014-08-11 21:07:59 -0700
commitd215801022def22c4dce3f58751ab4dc2853482d (patch)
tree3e870c12d289f97119f976969eb81c1474611531 /exec/java-exec/src/main
parent8c66525735d011c763a4ed913d46e07cd60aea23 (diff)
Reenable producer/consumer.
Diffstat (limited to 'exec/java-exec/src/main')
-rw-r--r--exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java7
1 files changed, 2 insertions, 5 deletions
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 0c7580985..177331d9a 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)