From b2651885e34dc40d6b959118d2b36dacc8d4c08b Mon Sep 17 00:00:00 2001 From: workdone0 Date: Wed, 24 Apr 2024 19:37:51 +0530 Subject: [PATCH 1/7] Added check to see if the driver is invalid --- .../engine/core/lifecycle/session/CmdParser.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java index 91ced2c371..b9c875a53c 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java @@ -16,8 +16,10 @@ package io.nosqlbench.engine.core.lifecycle.session; +import io.nosqlbench.adapter.diag.DriverAdapterLoader; import io.nosqlbench.engine.cmdstream.Cmd; import io.nosqlbench.engine.cmdstream.CmdArg; +import io.nosqlbench.nb.annotations.ServiceSelector; import io.nosqlbench.nb.api.errors.BasicError; import java.util.*; @@ -72,6 +74,13 @@ public static LinkedList parseArgvCommands(LinkedList args) { cmdstructs.removeFirst(); Map params = new LinkedHashMap<>(); while (cmdstructs.peekFirst() instanceof parameter param) { + if (Objects.equals(param.name(), "driver")) { + Optional driverAdapter = + ServiceSelector.of(param.value(), ServiceLoader.load(DriverAdapterLoader.class)).get(); + if (driverAdapter.isEmpty()) { + throw new BasicError("Unable to load default driver adapter '" + param.value() + '\''); + } + } cmdstructs.removeFirst(); params.put(param.name(),CmdArg.of(cmd.name(),param.name(),param.op(),param.value())); } From 4c17d22ae36bb6eeba582a27bd4dbb2e17033bed Mon Sep 17 00:00:00 2001 From: workdone0 Date: Thu, 25 Apr 2024 13:10:19 +0530 Subject: [PATCH 2/7] Moved the verify logic to NBCli --- .../main/java/io/nosqlbench/engine/cli/NBCLI.java | 15 +++++++++++++++ .../engine/core/lifecycle/session/CmdParser.java | 7 ------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java index eca8b8c582..767a199599 100644 --- a/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java +++ b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java @@ -18,7 +18,9 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import io.nosqlbench.adapter.diag.DriverAdapterLoader; import io.nosqlbench.adapters.api.activityconfig.rawyaml.RawOpsLoader; +import io.nosqlbench.engine.cmdstream.Cmd; import io.nosqlbench.engine.cmdstream.CmdType; import io.nosqlbench.nb.api.annotations.Annotation; import io.nosqlbench.nb.api.annotations.Layer; @@ -218,6 +220,19 @@ public Integer applyDirect(final String[] args) { } final NBCLIOptions options = new NBCLIOptions(args, Mode.ParseAllOptions); + + for (Cmd cmd : options.getCommands()) { + Map cmdArgMap = cmd.getArgMap(); + if (cmdArgMap.containsKey("driver")) { + String driverName = cmdArgMap.get("driver"); + Optional driverAdapter = + ServiceSelector.of(driverName, ServiceLoader.load(DriverAdapterLoader.class)).get(); + if (driverAdapter.isEmpty()) { + throw new BasicError("Unable to load default driver adapter '" + driverName + '\''); + } + } + } + NBCLI.logger = LogManager.getLogger("NBCLI"); NBIO.addGlobalIncludes(options.wantsIncludes()); diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java index db04aa2070..2eeb1ed949 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java @@ -73,13 +73,6 @@ public static LinkedList parseArgvCommands(LinkedList args) { cmdstructs.removeFirst(); Map params = new LinkedHashMap<>(); while (cmdstructs.peekFirst() instanceof parameter param) { - if (Objects.equals(param.name(), "driver")) { - Optional driverAdapter = - ServiceSelector.of(param.value(), ServiceLoader.load(DriverAdapterLoader.class)).get(); - if (driverAdapter.isEmpty()) { - throw new BasicError("Unable to load default driver adapter '" + param.value() + '\''); - } - } cmdstructs.removeFirst(); if (params.containsKey(param.name())) { throw new BasicError("Duplicate occurrence of option: " + param.name()); From 8b3bde96b8c415013aa636345a3437fb1a9731e6 Mon Sep 17 00:00:00 2001 From: workdone0 Date: Thu, 25 Apr 2024 13:11:15 +0530 Subject: [PATCH 3/7] Removed unused imports --- .../io/nosqlbench/engine/core/lifecycle/session/CmdParser.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java index 2eeb1ed949..24a5def537 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java @@ -16,10 +16,8 @@ package io.nosqlbench.engine.core.lifecycle.session; -import io.nosqlbench.adapter.diag.DriverAdapterLoader; import io.nosqlbench.engine.cmdstream.Cmd; import io.nosqlbench.engine.cmdstream.CmdArg; -import io.nosqlbench.nb.annotations.ServiceSelector; import io.nosqlbench.nb.api.errors.BasicError; import java.util.*; From 362b3afcc71da8297143a58c8afb781f8d71fd4f Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Fri, 26 Apr 2024 13:34:28 -0400 Subject: [PATCH 4/7] Unit test for using non-existent driver --- .../io/nosqlbench/engine/cli/NBCLITest.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLITest.java diff --git a/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLITest.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLITest.java new file mode 100644 index 0000000000..405a413087 --- /dev/null +++ b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLITest.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2020-2024 nosqlbench + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.nosqlbench.engine.cli; + +import io.nosqlbench.nb.api.errors.BasicError; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; + +public class NBCLITest { + + @Test + public void testNonExistentDriverThrowsError() { + assertThatExceptionOfType(BasicError.class) + .isThrownBy(() -> new NBCLI("run driver=nonexistent --show-stacktraces")) + .withMessageContaining("Unable to load default driver adapter 'nonexistent'"); + } +} + From 34dc3264ec178752f19414253074e1f49f244903 Mon Sep 17 00:00:00 2001 From: workdone0 Date: Mon, 29 Apr 2024 16:44:25 +0530 Subject: [PATCH 5/7] Fixed the test for NonExistentDriver --- .../src/test/java/io/nosqlbench/engine/cli/NBCLITest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLITest.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLITest.java index 405a413087..c8b866c13a 100644 --- a/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLITest.java +++ b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLITest.java @@ -25,9 +25,10 @@ public class NBCLITest { @Test public void testNonExistentDriverThrowsError() { + final NBCLI cli = new NBCLI("nb5"); assertThatExceptionOfType(BasicError.class) - .isThrownBy(() -> new NBCLI("run driver=nonexistent --show-stacktraces")) - .withMessageContaining("Unable to load default driver adapter 'nonexistent'"); + .isThrownBy(() -> cli.applyDirect(new String[] {"run", "driver=nonexistent"})) + .withMessageContaining("Unable to load default driver adapter 'nonexistent'");; } } From 0efa075f995810aecb7f5344b378ebf3e921db16 Mon Sep 17 00:00:00 2001 From: workdone0 Date: Mon, 6 May 2024 01:08:14 +0530 Subject: [PATCH 6/7] Moved the invalid driver checker to CmdParser --- .../java/io/nosqlbench/engine/cli/NBCLI.java | 12 +------ .../io/nosqlbench/engine/cli/NBCLITest.java | 34 ------------------- .../core/lifecycle/session/CmdParser.java | 10 ++++++ .../core/lifecycle/session/CmdParserTest.java | 7 ++++ 4 files changed, 18 insertions(+), 45 deletions(-) delete mode 100644 nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLITest.java diff --git a/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java index 767a199599..454da64113 100644 --- a/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java +++ b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java @@ -221,17 +221,7 @@ public Integer applyDirect(final String[] args) { final NBCLIOptions options = new NBCLIOptions(args, Mode.ParseAllOptions); - for (Cmd cmd : options.getCommands()) { - Map cmdArgMap = cmd.getArgMap(); - if (cmdArgMap.containsKey("driver")) { - String driverName = cmdArgMap.get("driver"); - Optional driverAdapter = - ServiceSelector.of(driverName, ServiceLoader.load(DriverAdapterLoader.class)).get(); - if (driverAdapter.isEmpty()) { - throw new BasicError("Unable to load default driver adapter '" + driverName + '\''); - } - } - } + NBCLI.logger = LogManager.getLogger("NBCLI"); diff --git a/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLITest.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLITest.java deleted file mode 100644 index c8b866c13a..0000000000 --- a/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLITest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2020-2024 nosqlbench - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.nosqlbench.engine.cli; - -import io.nosqlbench.nb.api.errors.BasicError; -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; - -public class NBCLITest { - - @Test - public void testNonExistentDriverThrowsError() { - final NBCLI cli = new NBCLI("nb5"); - assertThatExceptionOfType(BasicError.class) - .isThrownBy(() -> cli.applyDirect(new String[] {"run", "driver=nonexistent"})) - .withMessageContaining("Unable to load default driver adapter 'nonexistent'");; - } -} - diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java index 24a5def537..bcec58386a 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java @@ -16,8 +16,10 @@ package io.nosqlbench.engine.core.lifecycle.session; +import io.nosqlbench.adapter.diag.DriverAdapterLoader; import io.nosqlbench.engine.cmdstream.Cmd; import io.nosqlbench.engine.cmdstream.CmdArg; +import io.nosqlbench.nb.annotations.ServiceSelector; import io.nosqlbench.nb.api.errors.BasicError; import java.util.*; @@ -75,6 +77,14 @@ public static LinkedList parseArgvCommands(LinkedList args) { if (params.containsKey(param.name())) { throw new BasicError("Duplicate occurrence of option: " + param.name()); } + if (Objects.equals(param.name(), "driver")) { + String driverName = param.value(); + Optional driverAdapter = + ServiceSelector.of(driverName, ServiceLoader.load(DriverAdapterLoader.class)).get(); + if (driverAdapter.isEmpty()) { + throw new BasicError("Unable to load default driver adapter '" + driverName + '\''); + } + } params.put(param.name(),CmdArg.of(cmd.name(),param.name(),param.op(),param.value())); } cmds.add(new Cmd(cmd.name(),params)); diff --git a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/CmdParserTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/CmdParserTest.java index 59f846fefa..949039b2b3 100644 --- a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/CmdParserTest.java +++ b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/CmdParserTest.java @@ -106,4 +106,11 @@ public void testThatDuplicateParameterThrowsBasicError() { .withMessageContaining("Duplicate occurrence of option: threads"); } + @Test + public void testNonExistentDriverThrowsError() { + assertThatExceptionOfType(BasicError.class) + .isThrownBy(() -> CmdParser.parseArgvCommands(new LinkedList<>(List.of("run", "driver=nonexistant")))) + .withMessageContaining("Unable to load default driver adapter 'nonexistant'"); + } + } From aec0273b26afdfa16df757280a6167f06c646f27 Mon Sep 17 00:00:00 2001 From: workdone0 Date: Mon, 6 May 2024 01:21:39 +0530 Subject: [PATCH 7/7] removed unused imports --- .../src/main/java/io/nosqlbench/engine/cli/NBCLI.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java index 454da64113..eca8b8c582 100644 --- a/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java +++ b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java @@ -18,9 +18,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import io.nosqlbench.adapter.diag.DriverAdapterLoader; import io.nosqlbench.adapters.api.activityconfig.rawyaml.RawOpsLoader; -import io.nosqlbench.engine.cmdstream.Cmd; import io.nosqlbench.engine.cmdstream.CmdType; import io.nosqlbench.nb.api.annotations.Annotation; import io.nosqlbench.nb.api.annotations.Layer; @@ -220,9 +218,6 @@ public Integer applyDirect(final String[] args) { } final NBCLIOptions options = new NBCLIOptions(args, Mode.ParseAllOptions); - - - NBCLI.logger = LogManager.getLogger("NBCLI"); NBIO.addGlobalIncludes(options.wantsIncludes());