From 1607eaf3c1c8799503e609eb5df50abb7ec972b6 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 24 Feb 2021 18:23:16 -0600 Subject: [PATCH] revert parser fix, a better solution is needed --- .../nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java index dbe14607e..da3e133c4 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java @@ -385,9 +385,12 @@ public class NBCLIScenarioParser { Matcher innerMatcher = innerTemplatePattern.matcher(match); String[] matchArray = match.split(","); +// if (matchArray.length!=2) { +// throw new BasicError("TEMPLATE form must have two arguments separated by a comma, like 'TEMPLATE(a,b), not '" + match +"'"); +// } //TODO: support recursive matches if (innerMatcher.find()) { - String[] innerMatch = innerMatcher.group(1).split(","); + String[] innerMatch = innerMatcher.group(1).split("[,:]"); //We want the outer name with the inner default value templates.put(matchArray[0], innerMatch[1]);