AMashenkov commented on code in PR #6276:
URL: https://github.com/apache/ignite-3/pull/6276#discussion_r2218765200
##########
modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigurationTreeComparator.java:
##########
@@ -232,12 +230,444 @@ public static ComparisonContext
create(Set<ConfigurationModule> configurationMod
private final KeyIgnorer deletedItems;
+ private final Set<String> skipAddRemoveKeys = new HashSet<>();
+
ComparisonContext(Collection<String> deletedPrefixes) {
this.deletedItems =
KeyIgnorer.fromDeletedPrefixes(deletedPrefixes);
}
boolean shouldIgnore(String path) {
return deletedItems.shouldIgnore(path);
}
+
+ boolean shouldIgnore(ConfigNode node, String childName) {
+ return shouldIgnore(node.path() + "." + childName);
+ }
+
+ boolean ignoreAddOrRemove(String path) {
+ return skipAddRemoveKeys.contains(path);
+ }
+
+ boolean ignoreAddOrRemove(ConfigNode node, String childName) {
+ return ignoreAddOrRemove(node.path() + "." + childName);
+ }
+ }
+
+ private static void validateConfigNode(
+ @Nullable String instanceType,
+ ConfigNode original,
+ ConfigNode updated,
+ ComparisonContext context,
+ Errors errors
+ ) {
+ errors.push(instanceType);
+ doValidateConfigNode(original, updated, context, errors);
+ errors.pop();
Review Comment:
I'd split logic for tracking the current path and error handling.
Use stack structure for path using push\pop operations.
And use separate list for errors.
Maybe both could be incapsulated into ComparisonContext.
```
context.enter(nodeName);
...
context.reportError(error);
....
context.leave();
```
--
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...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
