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

canonicalize paths in --list commands

Browse Source
This commit is contained in:
Jonathan Shook 2020-04-20 02:04:30 -05:00
parent 38381e7edb
commit b1822a3548
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.nio.file.FileSystems;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.*; import java.util.*;
@ -289,10 +290,12 @@ public class NBCLIScenarioParser {
List<WorkloadDesc> workloadDescriptions = new ArrayList<>(); List<WorkloadDesc> workloadDescriptions = new ArrayList<>();
for (Path yamlPath : yamlPathList) { for (Path yamlPath : yamlPathList) {
String referencedWorkloadName = yamlPath.toString().substring(1); String referenced = yamlPath.toString();
referenced = referenced.startsWith("/") ? referenced.substring(1) :
referenced;
Content<?> content = NBIO.all().prefix(SEARCH_IN) Content<?> content = NBIO.all().prefix(SEARCH_IN)
.name(referencedWorkloadName).extension("yaml") .name(referenced).extension("yaml")
.one(); .one();
StmtsDocList stmts = StatementsLoader.load(logger,content); StmtsDocList stmts = StatementsLoader.load(logger,content);
@ -313,7 +316,9 @@ public class NBCLIScenarioParser {
List<String> scenarioNames = scenarios.getScenarioNames(); List<String> scenarioNames = scenarios.getScenarioNames();
if (scenarioNames != null && scenarioNames.size() >0){ if (scenarioNames != null && scenarioNames.size() >0){
workloadDescriptions.add(new WorkloadDesc(yamlPath.getFileName().toString(), scenarioNames, templates)); String path = yamlPath.toString();
path = path.startsWith(FileSystems.getDefault().getSeparator()) ? path.substring(1) : path;
workloadDescriptions.add(new WorkloadDesc(path, scenarioNames, templates));
} }
} }