mirror of
https://github.com/nosqlbench/nosqlbench.git
synced 2025-02-25 18:55:28 -06:00
#169 fix template preprocessor regression
This commit is contained in:
parent
e7daf97d91
commit
5ca319e761
@ -20,6 +20,7 @@ package io.nosqlbench.engine.api.activityconfig;
|
|||||||
import io.nosqlbench.engine.api.activityconfig.rawyaml.RawStmtsDocList;
|
import io.nosqlbench.engine.api.activityconfig.rawyaml.RawStmtsDocList;
|
||||||
import io.nosqlbench.engine.api.activityconfig.rawyaml.RawStmtsLoader;
|
import io.nosqlbench.engine.api.activityconfig.rawyaml.RawStmtsLoader;
|
||||||
import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
|
import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
|
||||||
|
import io.nosqlbench.engine.api.templating.StrInterpolator;
|
||||||
import io.nosqlbench.nb.api.content.Content;
|
import io.nosqlbench.nb.api.content.Content;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@ -37,6 +38,7 @@ public class StatementsLoader {
|
|||||||
|
|
||||||
public static StmtsDocList loadString(String yamlContent) {
|
public static StmtsDocList loadString(String yamlContent) {
|
||||||
RawStmtsLoader loader = new RawStmtsLoader();
|
RawStmtsLoader loader = new RawStmtsLoader();
|
||||||
|
loader.addTransformer(new StrInterpolator());
|
||||||
RawStmtsDocList rawDocList = loader.loadString(logger, yamlContent);
|
RawStmtsDocList rawDocList = loader.loadString(logger, yamlContent);
|
||||||
StmtsDocList layered = new StmtsDocList(rawDocList);
|
StmtsDocList layered = new StmtsDocList(rawDocList);
|
||||||
return layered;
|
return layered;
|
||||||
@ -46,6 +48,7 @@ public class StatementsLoader {
|
|||||||
Logger logger,
|
Logger logger,
|
||||||
Content<?> content) {
|
Content<?> content) {
|
||||||
RawStmtsLoader loader = new RawStmtsLoader();
|
RawStmtsLoader loader = new RawStmtsLoader();
|
||||||
|
loader.addTransformer(new StrInterpolator());
|
||||||
RawStmtsDocList rawDocList = loader.loadString(logger, content.get().toString());
|
RawStmtsDocList rawDocList = loader.loadString(logger, content.get().toString());
|
||||||
StmtsDocList layered = new StmtsDocList(rawDocList);
|
StmtsDocList layered = new StmtsDocList(rawDocList);
|
||||||
return layered;
|
return layered;
|
||||||
@ -58,6 +61,8 @@ public class StatementsLoader {
|
|||||||
RawStmtsDocList list = null;
|
RawStmtsDocList list = null;
|
||||||
|
|
||||||
RawStmtsLoader gloaderImpl = new RawStmtsLoader();
|
RawStmtsLoader gloaderImpl = new RawStmtsLoader();
|
||||||
|
gloaderImpl.addTransformer(new StrInterpolator());
|
||||||
|
|
||||||
list = gloaderImpl.loadPath(logger, path, searchPaths);
|
list = gloaderImpl.loadPath(logger, path, searchPaths);
|
||||||
return new StmtsDocList(list);
|
return new StmtsDocList(list);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user