(drill) branch master updated: DRILL-8502: some boot options with drill.exec.options prefix are missed in configuration options (#2923)

[cgivre]

This is an automated email from the ASF dual-hosted git repository.

cgivre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git


The following commit(s) were added to refs/heads/master by this push:
     new e2e59a4f23 DRILL-8502: some boot options with drill.exec.options 
prefix are missed in configuration options (#2923)
e2e59a4f23 is described below

commit e2e59a4f2324e62bb642e4f123202b56714258b4
Author: Maksym Rymar <rym...@apache.org>
AuthorDate: Fri Jul 19 03:49:26 2024 +0300

    DRILL-8502: some boot options with drill.exec.options prefix are missed in 
configuration options (#2923)
---
 .../apache/drill/exec/server/options/SystemOptionManager.java    | 9 ++-------
 exec/java-exec/src/main/resources/drill-module.conf              | 5 -----
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git 
a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
 
b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
index 321a35df5a..25e1651a76 100644
--- 
a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
+++ 
b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
@@ -29,7 +29,6 @@ import org.apache.drill.exec.store.sys.PersistentStore;
 import org.apache.drill.exec.store.sys.PersistentStoreConfig;
 import org.apache.drill.exec.store.sys.PersistentStoreProvider;
 import org.apache.drill.exec.store.sys.store.provider.InMemoryStoreProvider;
-import org.apache.drill.exec.util.AssertionUtil;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
@@ -323,7 +322,8 @@ public class SystemOptionManager extends BaseOptionManager 
implements AutoClosea
       new OptionDefinition(ExecConstants.ENABLE_ALIASES_VALIDATOR, new 
OptionMetaData(OptionValue.AccessibleScopes.SYSTEM, true, false)),
       new 
OptionDefinition(ExecConstants.STORAGE_PLUGIN_RETRY_ATTEMPTS_VALIDATOR, new 
OptionMetaData(OptionValue.AccessibleScopes.SYSTEM, true, false)),
       new OptionDefinition(ExecConstants.STORAGE_PLUGIN_RETRY_DELAY_VALIDATOR, 
new OptionMetaData(OptionValue.AccessibleScopes.SYSTEM, true, false)),
-      new 
OptionDefinition(ExecConstants.STORAGE_PLUGIN_AUTO_DISABLE_VALIDATOR, new 
OptionMetaData(OptionValue.AccessibleScopes.SYSTEM, true, false))
+      new 
OptionDefinition(ExecConstants.STORAGE_PLUGIN_AUTO_DISABLE_VALIDATOR, new 
OptionMetaData(OptionValue.AccessibleScopes.SYSTEM, true, false)),
+      new OptionDefinition(ExecConstants.DRILLBIT_CONTROLS_VALIDATOR)
     };
 
     CaseInsensitiveMap<OptionDefinition> map = Arrays.stream(definitions)
@@ -333,11 +333,6 @@ public class SystemOptionManager extends BaseOptionManager 
implements AutoClosea
         (o, n) -> n,
         CaseInsensitiveMap::newHashMap));
 
-
-    if (AssertionUtil.isAssertionsEnabled()) {
-      map.put(ExecConstants.DRILLBIT_CONTROL_INJECTIONS, new 
OptionDefinition(ExecConstants.DRILLBIT_CONTROLS_VALIDATOR));
-    }
-
     return map;
   }
 
diff --git a/exec/java-exec/src/main/resources/drill-module.conf 
b/exec/java-exec/src/main/resources/drill-module.conf
index c496b9e502..cdbf03ab7d 100644
--- a/exec/java-exec/src/main/resources/drill-module.conf
+++ b/exec/java-exec/src/main/resources/drill-module.conf
@@ -570,11 +570,9 @@ drill.exec.options: {
     exec.errors.verbose: false,
     exec.except_add_agg_below: false,
 
-    exec.hashagg.max_batches_in_memory: 65536,
     exec.hashagg.mem_limit: 0,
     exec.hashagg.min_batches_per_partition: 2,
     exec.hashagg.num_partitions: 32,
-    exec.hashagg.num_rows_in_batch: 128,
     exec.hashagg.use_memory_prediction: true,
 
     exec.hashjoin.bloom_filter.fpp: 0.75,
@@ -584,7 +582,6 @@ drill.exec.options: {
     exec.hashjoin.hash_double_factor: 2.0,
     exec.hashjoin.hash_table_calc_type: "LEAN",
     exec.hashjoin.max_batches_in_memory: 0,
-    exec.hashjoin.mem_limit: 0,
     exec.hashjoin.num_partitions: 32,
     exec.hashjoin.num_rows_in_batch: 1024,
     exec.hashjoin.runtime_filter.max.waiting.time: 300, #400 ms
@@ -793,9 +790,7 @@ drill.exec.options: {
 
     exec.query.max_rows: 0,
     exec.query.return_result_set_for_ddl: true,
-    exec.query.return_result_set_for_ddl: true,
     exec.query.rowkeyjoin_batchsize: 128,
-    exec.return_result_set_for_ddl: true,
 
     # ========= rm related options ===========
     exec.rm.queryTags: "",