This is an automated email from the ASF dual-hosted git repository. vitalii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit 6823a8f241a58a4ae1dc1c6e84ba6a9920cc1643 Author: Salim Achouche <[email protected]> AuthorDate: Tue Jun 19 13:10:06 2018 -0700 DRILL-6513: Max query memory per node set to Drillbit's maximum direct memory closes #1329 --- exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java index 776c469..35cc351 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java @@ -17,6 +17,7 @@ */ package org.apache.drill.exec; +import org.apache.drill.common.config.DrillConfig; import org.apache.drill.exec.physical.impl.common.HashTable; import org.apache.drill.exec.rpc.user.InboundImpersonationManager; import org.apache.drill.exec.server.options.OptionValidator; @@ -440,7 +441,7 @@ public final class ExecConstants { * DEFAULT: 2048 MB */ public static final String MAX_QUERY_MEMORY_PER_NODE_KEY = "planner.memory.max_query_memory_per_node"; - public static final LongValidator MAX_QUERY_MEMORY_PER_NODE = new RangeLongValidator(MAX_QUERY_MEMORY_PER_NODE_KEY, 1024 * 1024, Long.MAX_VALUE); + public static final LongValidator MAX_QUERY_MEMORY_PER_NODE = new RangeLongValidator(MAX_QUERY_MEMORY_PER_NODE_KEY, 1024 * 1024, DrillConfig.getMaxDirectMemory()); /** * Alternative way to compute per-query-per-node memory as a percent
