IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

allow argsfile to retain comments, provide safe warnings

Browse Source
This commit is contained in:
Jonathan Shook 2023-09-10 19:17:50 -05:00
parent 0668d1db0c
commit 3b1022b1eb
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
View File

@ -181,7 +181,7 @@ public class NBCLIArgsFile {
}
}
pinAndUnpin();
return composed;
return new LinkedList<>(composed.stream().filter(s -> !s.startsWith("#")).toList());
}
private void pinAndUnpin() {
@ -213,8 +213,7 @@ public class NBCLIArgsFile {
LinkedHashSet<String> toUnpin,
LinkedHashSet<String> extant) {
LinkedHashSet<String> merged = new LinkedHashSet<>();
merged.addAll(extant);
LinkedHashSet<String> merged = new LinkedHashSet<>(extant);
for (String arg : toPin) {
if (argsToUnpin.contains(arg)) {
@ -234,6 +233,10 @@ public class NBCLIArgsFile {
if (logger != null) {
logger.warn(() -> "Requested to pin argument again: '" + toAdd + "', ignoring");
}
} else if (merged.stream().anyMatch(l -> l.matches("# *"+toAdd))) {
if (logger != null) {
logger.warn(() -> "Requested to pin argument which is already commented (disabled?): '" + toAdd + "'");
}
} else {
if (logger != null) {
logger.info(() -> "Pinning option '" + toAdd + "' to '" + this.argsPath.toString() + "'");
@ -248,6 +251,10 @@ public class NBCLIArgsFile {
logger.info(() -> "Unpinning '" + toDel + "' from '" + this.argsPath.toString() + "'");
}
merged.remove(toDel);
} else if (merged.stream().anyMatch(l -> l.matches("# *"+toDel))) {
if (logger != null) {
logger.warn(() -> "Requested to unpin argument which is commented (disabled?): '" + toDel + "'. If you want to purge this option completely, edit " + argsPath.toString());
}
} else {
if (logger != null) {
logger.warn(() -> "Requested to unpin argument '" + toDel + "' which was not found in " + argsPath.toString());
@ -280,7 +287,7 @@ public class NBCLIArgsFile {
.collect(Collectors.toList());
LinkedList<String> inArgvForm = linesToArgs(interpolated);
this.args.addAll(inArgvForm);
this.args.addAll(inArgvForm.stream().filter(l -> !l.startsWith("#")).toList());
return concat(inArgvForm, commandline);
}
@ -336,7 +343,7 @@ public class NBCLIArgsFile {
throw new RuntimeException(e);
}
List<String> content = lines.stream()
.filter(s -> !s.startsWith("#"))
// .filter(s -> !s.startsWith("#"))
.filter(s -> !s.startsWith("/"))
.filter(s -> !s.isBlank())
.filter(s -> !s.isEmpty())
@ -460,6 +467,7 @@ public class NBCLIArgsFile {
LinkedList<String> linesToArgs(Collection<String> lines) {
LinkedList<String> args = new LinkedList<>();
for (String line : lines) {
// if (line.startsWith("#")) continue;
if (line.startsWith("-")) {
String[] words = line.split(" ", 2);
args.addAll(Arrays.asList(words));