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

nosqlbench-1071 NBIO should favor finding exactly specified file path as a short circuit

Browse Source
This commit is contained in:
Jonathan Shook
2023-02-10 10:20:45 -06:00
parent 756e1e5ff0
commit 70408621dd
29 changed files with 555 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java
View File

@@ -50,10 +50,10 @@ public class NBCLIScenarioParser {
public static boolean isFoundWorkload(String workload, String... includes) {
Optional<Content<?>> found = NBIO.all()
.prefix("activities")
.prefix(includes)
.name(workload)
.extension(RawOpsLoader.YAML_EXTENSIONS)
.searchPrefixes("activities")
.searchPrefixes(includes)
.pathname(workload)
.extensionSet(RawOpsLoader.YAML_EXTENSIONS)
.first();
return found.isPresent();
}
@@ -64,10 +64,10 @@ public class NBCLIScenarioParser {
String workloadName = arglist.removeFirst();
Optional<Content<?>> found = NBIO.all()
.prefix("activities")
.prefix(includes)
.name(workloadName)
.extension(RawOpsLoader.YAML_EXTENSIONS)
.searchPrefixes("activities")
.searchPrefixes(includes)
.pathname(workloadName)
.extensionSet(RawOpsLoader.YAML_EXTENSIONS)
.first();
//
Content<?> workloadContent = found.orElseThrow();
@@ -108,10 +108,10 @@ public class NBCLIScenarioParser {
// Load in named scenario
Content<?> yamlWithNamedScenarios = NBIO.all()
.prefix(SEARCH_IN)
.prefix(includes)
.name(workloadName)
.extension(RawOpsLoader.YAML_EXTENSIONS)
.searchPrefixes(SEARCH_IN)
.searchPrefixes(includes)
.pathname(workloadName)
.extensionSet(RawOpsLoader.YAML_EXTENSIONS)
.first().orElseThrow();
// TODO: The yaml needs to be parsed with arguments from each command independently to support template vars
OpsDocList scenariosYaml = OpsLoader.loadContent(yamlWithNamedScenarios, new LinkedHashMap<>(userProvidedParams));
@@ -320,8 +320,8 @@ public class NBCLIScenarioParser {
}
}
Content<?> content = NBIO.all().prefix(SEARCH_IN)
.name(referenced).extension(RawOpsLoader.YAML_EXTENSIONS)
Content<?> content = NBIO.all().searchPrefixes(SEARCH_IN)
.pathname(referenced).extensionSet(RawOpsLoader.YAML_EXTENSIONS)
.one();
OpsDocList stmts = null;
@@ -379,14 +379,14 @@ public class NBCLIScenarioParser {
public static List<WorkloadDesc> getWorkloadsWithScenarioScripts(boolean defaultIncludes, String... includes) {
NBPathsAPI.GetPrefix searchin = NBIO.all();
NBPathsAPI.GetPrefixes searchin = NBIO.all();
if (defaultIncludes) {
searchin = searchin.prefix(SEARCH_IN);
searchin = searchin.searchPrefixes(SEARCH_IN);
}
List<Content<?>> activities = searchin
.prefix(includes)
.extension(RawOpsLoader.YAML_EXTENSIONS)
.searchPrefixes(includes)
.extensionSet(RawOpsLoader.YAML_EXTENSIONS)
.list();
return filterForScenarios(activities);
@@ -395,15 +395,15 @@ public class NBCLIScenarioParser {
public static List<String> getScripts(boolean defaultIncludes, String... includes) {
NBPathsAPI.GetPrefix searchin = NBIO.all();
NBPathsAPI.GetPrefixes searchin = NBIO.all();
if (defaultIncludes) {
searchin = searchin.prefix(SEARCH_IN);
searchin = searchin.searchPrefixes(SEARCH_IN);
}
List<Path> scriptPaths = searchin
.prefix("scripts/auto")
.prefix(includes)
.extension("js")
.searchPrefixes("scripts/auto")
.searchPrefixes(includes)
.extensionSet("js")
.list().stream().map(Content::asPath).collect(Collectors.toList());
List<String> scriptNames = new ArrayList();