ddanielr commented on code in PR #4083:
URL: https://github.com/apache/accumulo/pull/4083#discussion_r1430848137
##########
core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionServicesConfig.java:
##########
@@ -97,54 +70,21 @@ public CompactionServicesConfig(AccumuloConfiguration
aconf) {
this(getConfiguration(aconf::getAllPropertiesWithPrefixStripped),
aconf::isPropertySet);
}
- @SuppressWarnings("removal")
private CompactionServicesConfig(Map<String,Map<String,String>> configs,
Predicate<Property> isSetPredicate) {
configs.forEach((prefix, props) -> {
props.forEach((prop, val) -> {
String[] tokens = prop.split("\\.");
if (tokens.length == 2 && tokens[1].equals("planner")) {
- if (prefix.equals(oldPrefix.getKey())) {
- // Log a warning if the old prefix planner is defined by a user.
- Property userDefined = null;
- try {
- userDefined = Property.valueOf(prefix + prop);
- } catch (IllegalArgumentException e) {
- log.trace("Property: {} is not set by default configuration",
prefix + prop);
- }
- boolean isPropSet = true;
- if (userDefined != null) {
- isPropSet = isSetPredicate.test(userDefined);
- }
- if (isPropSet) {
- log.warn(
- "Found compaction planner '{}' using a deprecated prefix.
Please update property to use the '{}' prefix",
- tokens[0], newPrefix);
- }
- }
plannerPrefixes.put(tokens[0], prefix);
planners.put(tokens[0], val);
- }
- });
- });
-
- // Now find all compaction planner options.
- configs.forEach((prefix, props) -> {
- props.forEach((prop, val) -> {
- String[] tokens = prop.split("\\.");
- if (!plannerPrefixes.containsKey(tokens[0])) {
- throw new IllegalArgumentException(
- "Incomplete compaction service definition, missing planner
class: " + prop);
- }
- if (tokens.length == 4 && tokens[1].equals("planner") &&
tokens[2].equals("opts")) {
+ } else if (tokens.length == 4 && tokens[1].equals("planner") &&
tokens[2].equals("opts")) {
Review Comment:
Yes, that happens on lines 94-99. I removed all the dual prefix validation
bits.
https://github.com/apache/accumulo/pull/4083/files#diff-ba8ebe6daae5454d3fd92a0f328ed7a6b40a5796994831c314f5ad0a6dd5aa8aR94-R99
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@accumulo.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
