Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DRILL-8502: some boot options with drill.exec.options prefix are missed in configuration options #2923

Merged
merged 3 commits into from
Jul 19, 2024
Merged

DRILL-8502: some boot options with drill.exec.options prefix are missed in configuration options #2923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
683bc7f
Clean duplicated and unused options
rymarm Jul 9, 2024
62eff9d
Revert "DRILL-2867: Add ControlsValidator to VALIDATORS only if asser…
rymarm Dec 7, 2023
fdaf8c1
Bring back drill.exec.testing.controls default value
rymarm Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand All @@ -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;
}

Expand Down
5 changes: 0 additions & 5 deletions exec/java-exec/src/main/resources/drill-module.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down Expand Up @@ -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: "",
Expand Down
Loading