From 35fa137633c8e00541e955668e119b9ea7e63c37 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 18 Oct 2023 17:12:29 -0500 Subject: [PATCH] fixup jdbc after merging into 5.21 --- .../adapter/jdbc/JDBCDriverAdapter.java | 3 +- .../jdbc/utils/JDBCDriverAdapterLoader.java | 33 +++++++++++++++++ .../vectormath/PgvecUtilsPluginInfo.java | 36 ------------------- .../pgvector/PGVectorDriverAdapter.java | 17 +++++++++ 4 files changed, 52 insertions(+), 37 deletions(-) create mode 100644 adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCDriverAdapterLoader.java delete mode 100644 adapter-jdbc/src/main/java/io/nosqlbench/engine/extensions/vectormath/PgvecUtilsPluginInfo.java diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCDriverAdapter.java b/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCDriverAdapter.java index d754f940d..8044f78dc 100644 --- a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCDriverAdapter.java +++ b/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCDriverAdapter.java @@ -31,7 +31,6 @@ import org.apache.logging.log4j.Logger; import java.util.function.Function; -@Service(value = DriverAdapter.class, selector = "jdbc") public class JDBCDriverAdapter extends BaseDriverAdapter { private final static Logger logger = LogManager.getLogger(JDBCDriverAdapter.class); @@ -55,4 +54,6 @@ public class JDBCDriverAdapter extends BaseDriverAdapter { public NBConfigModel getConfigModel() { return super.getConfigModel().add(JDBCSpace.getConfigModel()); } + + } diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCDriverAdapterLoader.java b/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCDriverAdapterLoader.java new file mode 100644 index 000000000..8558692fb --- /dev/null +++ b/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCDriverAdapterLoader.java @@ -0,0 +1,33 @@ +package io.nosqlbench.adapter.jdbc.utils; + +/* + * Copyright (c) 2022 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. + */ + + +import io.nosqlbench.adapter.diag.DriverAdapterLoader; +import io.nosqlbench.adapter.jdbc.JDBCDriverAdapter; +import io.nosqlbench.api.labels.NBLabels; +import io.nosqlbench.components.NBComponent; +import io.nosqlbench.nb.annotations.Service; + +@Service(value = DriverAdapterLoader.class, selector = "jdbc") +public class JDBCDriverAdapterLoader implements DriverAdapterLoader { + @Override + public JDBCDriverAdapter load(NBComponent parent, NBLabels childLabels) { + return new JDBCDriverAdapter(parent, childLabels); + } +} diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/engine/extensions/vectormath/PgvecUtilsPluginInfo.java b/adapter-jdbc/src/main/java/io/nosqlbench/engine/extensions/vectormath/PgvecUtilsPluginInfo.java deleted file mode 100644 index 3ef5d8807..000000000 --- a/adapter-jdbc/src/main/java/io/nosqlbench/engine/extensions/vectormath/PgvecUtilsPluginInfo.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2023 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.extensions.vectormath; - -import com.codahale.metrics.MetricRegistry; -import io.nosqlbench.api.config.LabeledScenarioContext; -import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo; -import io.nosqlbench.nb.annotations.Service; -import org.apache.logging.log4j.Logger; - -@Service(value = ScriptingExtensionPluginInfo.class,selector = "pgvec_utils") -public class PgvecUtilsPluginInfo implements ScriptingExtensionPluginInfo { - @Override - public String getDescription() { - return "various methods and utilities for working with vector math in a scripted environment"; - } - - @Override - public PgvecUtils getExtensionObject(Logger logger, MetricRegistry metricRegistry, LabeledScenarioContext scriptContext) { - return new PgvecUtils(); - } -} diff --git a/adapter-pgvector/src/main/java/io/nosqlbench/adapter/pgvector/PGVectorDriverAdapter.java b/adapter-pgvector/src/main/java/io/nosqlbench/adapter/pgvector/PGVectorDriverAdapter.java index e69de29bb..49be37cd5 100644 --- a/adapter-pgvector/src/main/java/io/nosqlbench/adapter/pgvector/PGVectorDriverAdapter.java +++ b/adapter-pgvector/src/main/java/io/nosqlbench/adapter/pgvector/PGVectorDriverAdapter.java @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2022 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. + */ +