From 9642a2b545e39575d99ff4ae1007b428d58bd08e Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Fri, 27 Mar 2020 08:43:57 -0500 Subject: [PATCH] partial work for search within --- .../cql/statements/core/YamlCQLStatementLoader.java | 4 ++-- .../api/activityconfig/rawyaml/RawYamlStatementLoader.java | 5 ++--- .../engine/api/util/{NosqlBenchFiles.java => NBFiles.java} | 6 +++--- .../api/util/{NosqlBenchFilesTest.java => NBFilesTest.java} | 6 +++--- .../src/main/java/io/nosqlbench/engine/cli/NBCLI.java | 6 +++--- .../main/java/io/nosqlbench/engine/cli/NBCLIOptions.java | 4 ++-- .../java/io/nosqlbench/engine/cli/NBCLIScenarioParser.java | 6 +++--- .../java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java | 4 ++-- .../io/nosqlbench/engine/docker/DockerMetricsManager.java | 4 ++-- .../main/java/io/nosqlbench/engine/docker/RestHelper.java | 4 ++-- .../io/nosqlbench/engine/extensions/files/FileAccess.java | 4 ++-- 11 files changed, 26 insertions(+), 27 deletions(-) rename engine-api/src/main/java/io/nosqlbench/engine/api/util/{NosqlBenchFiles.java => NBFiles.java} (98%) rename engine-api/src/test/java/io/nosqlbench/engine/api/util/{NosqlBenchFilesTest.java => NBFilesTest.java} (89%) diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java index 8f21f908b..20ffc1cf7 100644 --- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java +++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java @@ -1,7 +1,7 @@ package io.nosqlbench.activitytype.cql.statements.core; import io.nosqlbench.engine.api.activityimpl.ActivityInitializationError; -import io.nosqlbench.engine.api.util.NosqlBenchFiles; +import io.nosqlbench.engine.api.util.NBFiles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.TypeDescription; @@ -32,7 +32,7 @@ public class YamlCQLStatementLoader { public AvailableCQLStatements load(String fromPath, String... searchPaths) { - InputStream stream = NosqlBenchFiles.findRequiredStreamOrFile(fromPath, + InputStream stream = NBFiles.findRequiredStreamOrFile(fromPath, "yaml", searchPaths); String data = ""; try (BufferedReader buffer = new BufferedReader(new InputStreamReader(stream))) { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoader.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoader.java index 4f2124264..2a30b1e1a 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoader.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlStatementLoader.java @@ -19,7 +19,7 @@ package io.nosqlbench.engine.api.activityconfig.rawyaml; import io.nosqlbench.engine.api.activityconfig.snakecharmer.SnakeYamlCharmer; import io.nosqlbench.engine.api.activityimpl.ActivityInitializationError; -import io.nosqlbench.engine.api.util.NosqlBenchFiles; +import io.nosqlbench.engine.api.util.NBFiles; import org.slf4j.Logger; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; @@ -27,7 +27,6 @@ import org.yaml.snakeyaml.Yaml; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; -import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -56,7 +55,7 @@ public class RawYamlStatementLoader { } protected String loadRawFile(Logger logger, String fromPath, String... searchPaths) { - InputStream stream = NosqlBenchFiles.findRequiredStreamOrFile(fromPath, "yaml", searchPaths); + InputStream stream = NBFiles.findRequiredStreamOrFile(fromPath, "yaml", searchPaths); try (BufferedReader buffer = new BufferedReader(new InputStreamReader(stream))) { return buffer.lines().collect(Collectors.joining("\n")); } catch (Exception e) { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/util/NosqlBenchFiles.java b/engine-api/src/main/java/io/nosqlbench/engine/api/util/NBFiles.java similarity index 98% rename from engine-api/src/main/java/io/nosqlbench/engine/api/util/NosqlBenchFiles.java rename to engine-api/src/main/java/io/nosqlbench/engine/api/util/NBFiles.java index 702324b08..3e7da3f45 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/util/NosqlBenchFiles.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/util/NBFiles.java @@ -34,9 +34,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -public class NosqlBenchFiles { +public class NBFiles { - private final static Logger logger = LoggerFactory.getLogger(NosqlBenchFiles.class); + private final static Logger logger = LoggerFactory.getLogger(NBFiles.class); private static Pattern templatePattern = Pattern.compile("TEMPLATE\\((.+?)\\)"); private static Pattern templatePattern2 = Pattern.compile("<<(.+?)>>"); @@ -127,7 +127,7 @@ public class NosqlBenchFiles { } // Classpath - ClassLoader classLoader = NosqlBenchFiles.class.getClassLoader(); + ClassLoader classLoader = NBFiles.class.getClassLoader(); InputStream stream = classLoader.getResourceAsStream(path); if (stream != null) { return Optional.of(stream); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/util/NosqlBenchFilesTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java similarity index 89% rename from engine-api/src/test/java/io/nosqlbench/engine/api/util/NosqlBenchFilesTest.java rename to engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java index ca527e2cb..bde5c302f 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/util/NosqlBenchFilesTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/util/NBFilesTest.java @@ -25,11 +25,11 @@ import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; @Test -public class NosqlBenchFilesTest { +public class NBFilesTest { @Test public void testNestedClasspathLoading() { - Optional optionalStreamOrFile = NosqlBenchFiles.findOptionalStreamOrFile("nested/testfile", "txt", "activities"); + Optional optionalStreamOrFile = NBFiles.findOptionalStreamOrFile("nested/testfile", "txt", "activities"); assertThat(optionalStreamOrFile).isPresent(); } @@ -46,4 +46,4 @@ public class NosqlBenchFilesTest { // Optional inputStream = NosqlBenchFiles.getInputStream(url); // assertThat(inputStream).isPresent(); // } -} \ No newline at end of file +} diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java index 5f2030fd6..ab6eab671 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java @@ -6,7 +6,7 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog.CycleLogIm import io.nosqlbench.engine.api.activityapi.input.InputType; import io.nosqlbench.engine.api.activityapi.output.OutputType; import io.nosqlbench.engine.api.exceptions.BasicError; -import io.nosqlbench.engine.api.util.NosqlBenchFiles; +import io.nosqlbench.engine.api.util.NBFiles; import io.nosqlbench.engine.core.MarkdownDocInfo; import io.nosqlbench.engine.core.ScenarioLogger; import io.nosqlbench.engine.core.ScenariosResults; @@ -233,8 +233,8 @@ public class NBCLI { } public void printWorkloads() { - List workloads = NosqlBenchFiles.getWorkloadsWithScenarioScripts(); - for (NosqlBenchFiles.WorkloadDesc workload : workloads) { + List workloads = NBFiles.getWorkloadsWithScenarioScripts(); + for (NBFiles.WorkloadDesc workload : workloads) { System.out.println("\n# from: "+ workload.getYamlPath()); List scenarioList = workload.getScenarioNames(); String workloadName = workload.getYamlPath().replaceAll("\\.yaml", "") ; diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java index 4bc0ee293..c8c1cbf06 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java @@ -2,7 +2,7 @@ package io.nosqlbench.engine.cli; import ch.qos.logback.classic.Level; import io.nosqlbench.engine.api.metrics.IndicatorMode; -import io.nosqlbench.engine.api.util.NosqlBenchFiles; +import io.nosqlbench.engine.api.util.NBFiles; import io.nosqlbench.engine.api.util.Unit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -303,7 +303,7 @@ public class NBCLIOptions { break; default: Optional optionalScript = - NosqlBenchFiles.findOptionalStreamOrFile(word, "js", "scripts/auto"); + NBFiles.findOptionalStreamOrFile(word, "js", "scripts/auto"); //Script if (optionalScript.isPresent()) { arglist.removeFirst(); diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarioParser.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarioParser.java index ad8c76d5d..f4a404bb1 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarioParser.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarioParser.java @@ -4,7 +4,7 @@ import io.nosqlbench.engine.api.activityconfig.StatementsLoader; import io.nosqlbench.engine.api.activityconfig.yaml.Scenarios; import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList; import io.nosqlbench.engine.api.exceptions.BasicError; -import io.nosqlbench.engine.api.util.NosqlBenchFiles; +import io.nosqlbench.engine.api.util.NBFiles; import io.nosqlbench.engine.api.util.StrInterpolator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,14 +23,14 @@ public class NBCLIScenarioParser { private final static Logger logger = LoggerFactory.getLogger(NBCLIScenarioParser.class); public static boolean isFoundWorkload(String word) { - Optional workloadPath = NosqlBenchFiles.findOptionalPath(word, "yaml", "activities"); + Optional workloadPath = NBFiles.findOptionalPath(word, "yaml", false, "activities"); return workloadPath.isPresent(); } public static void parseScenarioCommand(LinkedList arglist) { String workloadName = arglist.removeFirst(); - Optional workloadPathSearch = NosqlBenchFiles.findOptionalPath(workloadName, "yaml", "activities"); + Optional workloadPathSearch = NBFiles.findOptionalPath(workloadName, "yaml", false, "activities"); Path workloadPath = workloadPathSearch.orElseThrow(); List scenarioNames = new ArrayList<>(); diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java index d58468c45..f3836d08e 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScriptAssembly.java @@ -1,7 +1,7 @@ package io.nosqlbench.engine.cli; import io.nosqlbench.engine.api.activityimpl.ActivityDef; -import io.nosqlbench.engine.api.util.NosqlBenchFiles; +import io.nosqlbench.engine.api.util.NBFiles; import io.nosqlbench.engine.api.util.StrInterpolator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,7 +81,7 @@ public class NBCLIScriptAssembly { } catch (IOException ignored) { } - InputStream resourceAsStream = NosqlBenchFiles.findRequiredStreamOrFile(cmd.getCmdSpec(), "js", "scripts"); + InputStream resourceAsStream = NBFiles.findRequiredStreamOrFile(cmd.getCmdSpec(), "js", "scripts"); try (BufferedReader buffer = new BufferedReader(new InputStreamReader(resourceAsStream))) { scriptData = buffer.lines().collect(Collectors.joining("\n")); diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java index 377f60da0..b692d27be 100644 --- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java +++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java @@ -12,7 +12,7 @@ import com.github.dockerjava.api.model.ContainerNetworkSettings; import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.core.async.ResultCallbackTemplate; import com.github.dockerjava.core.command.LogContainerResultCallback; -import io.nosqlbench.engine.api.util.NosqlBenchFiles; +import io.nosqlbench.engine.api.util.NBFiles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -147,7 +147,7 @@ public class DockerMetricsManager { } private void setupPromFiles(String ip) { - String datasource = NosqlBenchFiles.readFile("docker/prometheus/prometheus.yml"); + String datasource = NBFiles.readFile("docker/prometheus/prometheus.yml"); if (ip == null) { logger.error("IP for graphite container not found"); diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/RestHelper.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/RestHelper.java index 9d72cfe4f..972adf90e 100644 --- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/RestHelper.java +++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/RestHelper.java @@ -1,7 +1,7 @@ package io.nosqlbench.engine.docker; import io.nosqlbench.engine.api.exceptions.BasicError; -import io.nosqlbench.engine.api.util.NosqlBenchFiles; +import io.nosqlbench.engine.api.util.NBFiles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +36,7 @@ public class RestHelper { if (path !=null) { logger.debug("POSTing " + path + " to " + url); - String dashboard = NosqlBenchFiles.readFile(path); + String dashboard = NBFiles.readFile(path); logger.debug("length of content for " + path + " is " + dashboard.length()); builder = builder.POST(HttpRequest.BodyPublishers.ofString(dashboard)); builder.setHeader("Content-Type", "application/json"); diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccess.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccess.java index ace87abce..7bc7b88f6 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccess.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccess.java @@ -17,12 +17,12 @@ package io.nosqlbench.engine.extensions.files; -import io.nosqlbench.engine.api.util.NosqlBenchFiles; +import io.nosqlbench.engine.api.util.NBFiles; public class FileAccess extends FileAccessPluginData { public String read(String filepath) { - String filedata = NosqlBenchFiles.readFile(filepath); + String filedata = NBFiles.readFile(filepath); return filedata; }