IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2024-11-25 10:10:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

allow configurable delimiter in params parser

Browse Source
This commit is contained in:
Jonathan Shook 2020-11-16 17:30:30 -06:00
parent a09efbe994
commit c2cec2357c
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParser.java → nb-api/src/main/java/io/nosqlbench/nb/api/config/ParamsParser.java
View File

@ -15,11 +15,10 @@
* /
*/
package io.nosqlbench.engine.api.activityimpl.motor;
package io.nosqlbench.nb.api.config;
import io.nosqlbench.nb.api.config.Synonyms;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import java.util.*;
@ -74,9 +73,13 @@ import java.util.*;
*
*/
public class ParamsParser {
private final static Logger logger = LoggerFactory.getLogger(ParamsParser.class);
private final static Logger logger = LogManager.getLogger(ParamsParser.class);
public static Map<String, String> parse(String input, boolean canonicalize) {
return parse(input, "=:", canonicalize);
}
/**
* Parse a string input as a loose-form param=value list, and be reasonable about formatting
* conventions that most users would follow in the absence of detailed rules.
@ -86,7 +89,7 @@ public class ParamsParser {
* @param canonicalize Whether or not to replace synonyms with modern forms and to warn when old forms are used
* @return A map of extracted keys and values
*/
public static Map<String, String> parse(String input, boolean canonicalize) {
public static Map<String, String> parse(String input, String assignmentCharacters, boolean canonicalize) {
ParseState s = ParseState.expectingName;
@ -131,13 +134,13 @@ public class ParamsParser {
isEscaped = true;
} else if (c == ' ') {
String partial = parms.get(lastVarname);
if (partial==null) {
if (partial == null) {
throw new RuntimeException("space continuation while reading name or value, but no prior " +
"for " + lastVarname + " exists");
"for " + lastVarname + " exists");
}
parms.put(lastVarname,partial+" "+varname);
parms.put(lastVarname, partial + " " + varname);
varname.setLength(0);
} else if (c != '=') {
} else if (assignmentCharacters.indexOf(c) == -1) {
varname.append(c);
} else {
s = ParseState.expectingVal;

1
engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java → nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java
View File

@ -17,6 +17,7 @@
package io.nosqlbench.engine.api.activityimpl.motor;
import io.nosqlbench.nb.api.config.ParamsParser;
import org.junit.Test;
import java.util.Map;