DRILL-8502: some boot options with drill.exec.options prefix are miss…

…ed in configuration options (#2923)
apache · Jul 19, 2024 · e2e59a4 · e2e59a4
1 parent 6d1221c
commit e2e59a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -29,7 +29,6 @@
 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 static CaseInsensitiveMap<OptionDefinition> createDefaultOptionDefinition
       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 static CaseInsensitiveMap<OptionDefinition> createDefaultOptionDefinition
         (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
@@ -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: "",