Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added to check if the driver is invalid #1933

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Added to check if the driver is invalid #1933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b265188
Added check to see if the driver is invalid
workdone0 Apr 24, 2024
7656b25
Merge branch 'main' into invalid-driver
workdone0 Apr 24, 2024
4c17d22
Moved the verify logic to NBCli
workdone0 Apr 25, 2024
8b3bde9
Removed unused imports
workdone0 Apr 25, 2024
362b3af
Unit test for using non-existent driver
msmygit Apr 26, 2024
9a17655
Merge pull request #8 from msmygit/invalid-driver
workdone0 Apr 29, 2024
34dc326
Fixed the test for NonExistentDriver
workdone0 Apr 29, 2024
0efa075
Moved the invalid driver checker to CmdParser
workdone0 May 5, 2024
aec0273
removed unused imports
workdone0 May 5, 2024
a29248c
Merge branch 'main' into invalid-driver
workdone0 May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...e/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -75,6 +77,14 @@ public static LinkedList<Cmd> parseArgvCommands(LinkedList<String> 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<? extends DriverAdapterLoader> 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));
Expand Down
7 changes: 7 additions & 0 deletions ...-engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/CmdParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'");
}

}