Github user paul-rogers commented on a diff in the pull request:
https://github.com/apache/drill/pull/923#discussion_r137937125
--- Diff:
exec/java-exec/src/main/java/org/apache/drill/exec/server/options/BaseOptionManager.java
---
@@ -17,44 +17,84 @@
*/
package org.apache.drill.exec.server.options;
-import
org.apache.drill.exec.server.options.TypeValidators.BooleanValidator;
-import org.apache.drill.exec.server.options.TypeValidators.DoubleValidator;
-import org.apache.drill.exec.server.options.TypeValidators.LongValidator;
-import org.apache.drill.exec.server.options.TypeValidators.StringValidator;
-
-public abstract class BaseOptionManager implements OptionSet {
-// private static final org.slf4j.Logger logger =
org.slf4j.LoggerFactory.getLogger(BaseOptionManager.class);
-
- /**
- * Gets the current option value given a validator.
- *
- * @param validator the validator
- * @return option value
- * @throws IllegalArgumentException - if the validator is not found
- */
- private OptionValue getOptionSafe(OptionValidator validator) {
- OptionValue value = getOption(validator.getOptionName());
- return value == null ? validator.getDefault() : value;
+import org.apache.drill.common.exceptions.UserException;
+
+import java.util.Iterator;
+
+/**
+ * This {@link OptionManager} implements some the basic methods and should
be extended by concrete implementations.
+ */
+public abstract class BaseOptionManager extends BaseOptionSet implements
OptionManager {
+ private static final org.slf4j.Logger logger =
org.slf4j.LoggerFactory.getLogger(BaseOptionManager.class);
+
+ @Override
+ public OptionList getInternalOptionList() {
+ return getAllOptionList(true);
}
@Override
- public boolean getOption(BooleanValidator validator) {
- return getOptionSafe(validator).bool_val;
+ public OptionList getPublicOptionList() {
+ return getAllOptionList(false);
}
@Override
- public double getOption(DoubleValidator validator) {
- return getOptionSafe(validator).float_val;
+ public void setLocalOption(String name, boolean value) {
+ setLocalOption(OptionValue.Kind.BOOLEAN, name,
Boolean.toString(value));
}
@Override
- public long getOption(LongValidator validator) {
- return getOptionSafe(validator).num_val;
+ public void setLocalOption(String name, long value) {
+ setLocalOption(OptionValue.Kind.LONG, name, Long.toString(value));
}
@Override
- public String getOption(StringValidator validator) {
- return getOptionSafe(validator).string_val;
+ public void setLocalOption(String name, double value) {
+ setLocalOption(OptionValue.Kind.DOUBLE, name, Double.toString(value));
}
+ @Override
+ public void setLocalOption(String name, String value) {
+ setLocalOption(OptionValue.Kind.STRING, name, value);
+ }
+
+ @Override
+ public void setLocalOption(OptionValue.Kind kind, String name, String
value) {
+ final OptionDefinition definition = getOptionDefinition(name);
+ final OptionValidator validator = definition.getValidator();
+ final OptionMetaData metaData = definition.getMetaData();
+ final OptionValue.OptionType type = definition.getMetaData().getType();
+ final OptionValue.OptionScope scope = getScope();
+ checkOptionPermissions(name, type, scope);
+ final OptionValue optionValue = OptionValue.create(kind, type, name,
value, scope);
+ validator.validate(optionValue, metaData, this);
+ setLocalOptionHelper(optionValue);
--- End diff --
Very nice and clean, does all the necessary steps in one place. Great
improvement!
---
