cqld4 adapter updates for vector branch

2025-02-25 18:55:28 -06:00 · 2023-07-25 11:50:47 -05:00 · 2023-07-25 11:50:47 -05:00 · ed4f620a85
commit ed4f620a85
parent f53f52efa4
35 changed files with 324 additions and 203 deletions
--- a/adapter-cqld4/pom.xml
+++ b/adapter-cqld4/pom.xml
@ -42,9 +42,8 @@
        </dependency>

        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
            <artifactId>groovy</artifactId>
-            <version>3.0.17</version>
        </dependency>

        <dependency>
@ -61,13 +60,13 @@
        <dependency>
            <groupId>com.datastax.oss</groupId>
            <artifactId>java-driver-core</artifactId>
-            <version>4.16.0</version>
+            <version>4.17.0</version>
        </dependency>

        <dependency>
            <groupId>com.datastax.oss</groupId>
            <artifactId>java-driver-query-builder</artifactId>
-            <version>4.16.0</version>
+            <version>4.17.0</version>
        </dependency>

        <dependency>
@ -100,7 +99,7 @@
            <plugin>
                <groupId>org.antlr</groupId>
                <artifactId>antlr4-maven-plugin</artifactId>
-                <version>4.12.0</version>
+                <version>4.13.0</version>
                <configuration>
                    <sourceDirectory>src/main/java/io/nosqlbench/cqlgen/grammars
                    </sourceDirectory>
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterStub.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterStub.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -16,7 +16,7 @@

 package io.nosqlbench.adapter.cqld4;

-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
 import io.nosqlbench.nb.annotations.Service;

@Service(value = DriverAdapter.class, selector = "cql")
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapter.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapter.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,11 +19,11 @@ package io.nosqlbench.adapter.cqld4;
 import io.nosqlbench.adapter.cqld4.opmappers.Cqld4CoreOpMapper;
 import io.nosqlbench.api.config.standard.NBConfigModel;
 import io.nosqlbench.api.config.standard.NBConfiguration;
-import io.nosqlbench.engine.api.activityimpl.OpMapper;
-import io.nosqlbench.engine.api.activityimpl.uniform.BaseDriverAdapter;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverSpaceCache;
-import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op;
+import io.nosqlbench.adapters.api.activityimpl.OpMapper;
+import io.nosqlbench.adapters.api.activityimpl.uniform.BaseDriverAdapter;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverSpaceCache;
+import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.Op;
 import io.nosqlbench.nb.annotations.Service;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/RSProcessors.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/RSProcessors.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +18,7 @@ package io.nosqlbench.adapter.cqld4;

 import com.datastax.oss.driver.api.core.cql.ResultSet;
 import com.datastax.oss.driver.api.core.cql.Row;
-import io.nosqlbench.engine.api.activityimpl.uniform.ResultProcessor;
+import io.nosqlbench.adapters.api.activityimpl.uniform.ResultProcessor;

 import java.util.ArrayList;
 import java.util.List;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/ResultSetProcessor.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/ResultSetProcessor.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +18,7 @@ package io.nosqlbench.adapter.cqld4;

 import com.datastax.oss.driver.api.core.cql.ResultSet;
 import com.datastax.oss.driver.api.core.cql.Row;
-import io.nosqlbench.engine.api.activityimpl.uniform.ResultProcessor;
+import io.nosqlbench.adapters.api.activityimpl.uniform.ResultProcessor;

 public interface ResultSetProcessor extends ResultProcessor<ResultSet, Row> {
 }
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CQLD4PreparedStmtDiagnostics.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CQLD4PreparedStmtDiagnostics.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package io.nosqlbench.adapter.cqld4.opdispensers;
+package io.nosqlbench.adapter.cqld4.diagnostics;

 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.cql.BoundStatement;
@ -25,8 +25,10 @@ import com.datastax.oss.driver.api.core.data.CqlDuration;
 import com.datastax.oss.driver.api.core.data.CqlVector;
 import com.datastax.oss.driver.api.core.data.TupleValue;
 import com.datastax.oss.driver.api.core.data.UdtValue;
-import com.datastax.oss.driver.api.core.type.CqlVectorType;
 import com.datastax.oss.driver.api.core.type.DataType;
+import com.datastax.oss.driver.api.core.type.VectorType;
+import com.datastax.oss.driver.api.core.type.codec.ExtraTypeCodecs;
+import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp;
 import io.nosqlbench.api.errors.OpConfigError;
 import org.apache.logging.log4j.LogManager;
@ -41,10 +43,12 @@ import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.UUID;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.LongFunction;

 import static com.datastax.oss.protocol.internal.ProtocolConstants.DataType.*;

+
 /**
 * This should only be used when there is an exception thrown by some higher level logic.
 * The purpose of this class is to do a more thorough job of checking each step of binding
@ -53,18 +57,28 @@ import static com.datastax.oss.protocol.internal.ProtocolConstants.DataType.*;
 */
 public class CQLD4PreparedStmtDiagnostics {
    private static final Logger logger = LogManager.getLogger(CQLD4PreparedStmtDiagnostics.class);
+    private static final ConcurrentHashMap<VectorType, TypeCodec<float[]>> vectorCodecs = new ConcurrentHashMap<>();

-    public static BoundStatement bindStatement(BoundStatement bound, CqlIdentifier colname,
-                                               Object colval, DataType coltype) {
-
+    public static BoundStatement bindStatement(
+        BoundStatement bound,
+        CqlIdentifier colname,
+        Object colval,
+        DataType coltype
+    ) {
        return switch (coltype.getProtocolCode()) {
            case CUSTOM -> {
-                if (coltype instanceof CqlVectorType) {
-                    yield bound.setCqlVector(colname, (CqlVector<?>) colval);
+                if (coltype instanceof VectorType vt) {
+                    if (colval instanceof CqlVector cv) {
+                        yield bound.setVector(colname, cv, cv.get(0).getClass());
+                    } else if (colval instanceof float[] floatAry) {
+                        TypeCodec<float[]> codec = vectorCodecs.computeIfAbsent(vt, v -> ExtraTypeCodecs.floatVectorToArray(v.getDimensions()));
+                        yield bound.set(colname, floatAry, codec);
+                    } else {
+                        throw new RuntimeException("Unrecognized vector Java type to bind to " + coltype.asCql(true, true) + " value=" +colval.getClass().getSimpleName());
+                    }
+                } else {
+                    throw new RuntimeException("Unrecognized custom type for diagnostics: " + coltype.asCql(true, true) + " value= " +colval.getClass().getSimpleName());
                }
-                throw new RuntimeException("Unhandled CUSTOM type for diagnostic: "
-                        + coltype.getClass().getSimpleName());
-
            }
            case ASCII, VARCHAR -> bound.setString(colname, (String) colval);
            case BIGINT, COUNTER -> bound.setLong(colname, (long) colval);
@ -112,22 +126,22 @@ public class CQLD4PreparedStmtDiagnostics {
                yield bound.setTupleValue(colname, tuple);
            }
            default -> throw new RuntimeException("Unknown CQL type for diagnostic " +
-                    "(type:'" + coltype + "',code:'" + coltype.getProtocolCode() + "'");
+                "(type:'" + coltype + "',code:'" + coltype.getProtocolCode() + "'");
        };
    }

    public static Cqld4CqlOp rebindWithDiagnostics(
-            PreparedStatement preparedStmt,
-            LongFunction<Object[]> fieldsF,
-            long cycle,
-            Exception exception
+        PreparedStatement preparedStmt,
+        LongFunction<Object[]> fieldsF,
+        long cycle,
+        Exception exception
    ) {
        logger.error(exception);
        ColumnDefinitions defs = preparedStmt.getVariableDefinitions();
        Object[] values = fieldsF.apply(cycle);
        if (defs.size() != values.length) {
            throw new OpConfigError("There are " + defs.size() + " anchors in statement '" + preparedStmt.getQuery() + "'" +
-                    "but " + values.length + " values were provided. These must match.");
+                "but " + values.length + " values were provided. These must match.");
        }

        BoundStatement bound = preparedStmt.bind();
@ -143,11 +157,11 @@ public class CQLD4PreparedStmtDiagnostics {
                String fullValue = value.toString();
                String valueToPrint = fullValue.length() > 100 ? fullValue.substring(0, 100) + " ... (abbreviated for console, since the size is " + fullValue.length() + ")" : fullValue;
                String errormsg = String.format(
-                        "Unable to bind column '%s' to cql type '%s' with value '%s' (class '%s')",
-                        defname,
-                        type.asCql(false, false),
-                        valueToPrint,
-                        value.getClass().getCanonicalName()
+                    "Unable to bind column '%s' to cql type '%s' with value '%s' (class '%s')",
+                    defname,
+                    type.asCql(false, false),
+                    valueToPrint,
+                    value.getClass().getCanonicalName()
                );
                logger.error(errormsg);
                throw new OpConfigError(errormsg, e);
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4RainbowTableDispenser.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4RainbowTableDispenser.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,8 +18,8 @@ package io.nosqlbench.adapter.cqld4.opdispensers;

 import com.datastax.oss.driver.api.core.CqlSession;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.templating.ParsedOp;

 import java.util.function.LongFunction;

--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java
@ -26,9 +26,9 @@ import com.datastax.oss.driver.api.core.metadata.token.Token;
 import io.nosqlbench.adapter.cqld4.Cqld4OpMetrics;
 import io.nosqlbench.adapter.cqld4.Cqld4Space;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp;
-import io.nosqlbench.engine.api.activityimpl.BaseOpDispenser;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.BaseOpDispenser;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.templating.ParsedOp;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4FluentGraphOpDispenser.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4FluentGraphOpDispenser.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -22,10 +22,10 @@ import com.datastax.oss.driver.api.core.CqlSession;
 import groovy.lang.Script;
 import io.nosqlbench.adapter.cqld4.Cqld4Space;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4FluentGraphOp;
-import io.nosqlbench.engine.api.activityimpl.BaseOpDispenser;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.BaseOpDispenser;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.Op;
+import io.nosqlbench.adapters.api.templating.ParsedOp;
 import io.nosqlbench.virtdata.core.bindings.Bindings;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4GremlinOpDispenser.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4GremlinOpDispenser.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -21,9 +21,9 @@ import com.datastax.dse.driver.api.core.graph.ScriptGraphStatementBuilder;
 import com.datastax.oss.driver.api.core.CqlSession;
 import io.nosqlbench.adapter.cqld4.Cqld4Space;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4ScriptGraphOp;
-import io.nosqlbench.engine.api.activityimpl.BaseOpDispenser;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.BaseOpDispenser;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.templating.ParsedOp;

 import java.util.Optional;
 import java.util.function.LongFunction;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java
@ -21,10 +21,11 @@ import com.datastax.oss.driver.api.core.cql.BoundStatement;
 import com.datastax.oss.driver.api.core.cql.PreparedStatement;
 import com.datastax.oss.driver.api.core.cql.Statement;
 import io.nosqlbench.adapter.cqld4.RSProcessors;
+import io.nosqlbench.adapter.cqld4.diagnostics.CQLD4PreparedStmtDiagnostics;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlPreparedStatement;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.templating.ParsedOp;
 import io.nosqlbench.api.errors.OpConfigError;
 import io.nosqlbench.virtdata.core.templates.ParsedTemplateString;
 import org.apache.logging.log4j.LogManager;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java
@ -22,8 +22,8 @@ import com.datastax.oss.driver.api.core.cql.SimpleStatementBuilder;
 import com.datastax.oss.driver.api.core.cql.Statement;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlSimpleStatement;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.templating.ParsedOp;

 import java.util.function.LongFunction;

--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java
@ -20,8 +20,8 @@ import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.core.cql.Statement;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlSimpleStatement;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.templating.ParsedOp;

 import java.util.function.LongFunction;

--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SsTableDispenser.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SsTableDispenser.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.Statement;
 import io.nosqlbench.adapter.cqld4.Cqld4DriverAdapter;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.templating.ParsedOp;

 import java.util.function.LongFunction;

--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4CqlSimpleStmtMapper.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4CqlSimpleStmtMapper.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,10 +19,10 @@ package io.nosqlbench.adapter.cqld4.opmappers;
 import com.datastax.oss.driver.api.core.CqlSession;
 import io.nosqlbench.adapter.cqld4.opdispensers.Cqld4SimpleCqlStmtDispenser;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp;
-import io.nosqlbench.engine.api.activityimpl.OpDispenser;
-import io.nosqlbench.engine.api.activityimpl.OpMapper;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.OpDispenser;
+import io.nosqlbench.adapters.api.activityimpl.OpMapper;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.templating.ParsedOp;

 import java.util.function.LongFunction;

--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4PreparedStmtMapper.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4PreparedStmtMapper.java
@ -23,10 +23,10 @@ import io.nosqlbench.adapter.cqld4.ResultSetProcessor;
 import io.nosqlbench.adapter.cqld4.opdispensers.Cqld4PreparedStmtDispenser;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp;
 import io.nosqlbench.adapter.cqld4.processors.CqlFieldCaptureProcessor;
-import io.nosqlbench.engine.api.activityimpl.OpDispenser;
-import io.nosqlbench.engine.api.activityimpl.OpMapper;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.OpDispenser;
+import io.nosqlbench.adapters.api.activityimpl.OpMapper;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.templating.ParsedOp;
 import io.nosqlbench.engine.api.templating.TypeAndTarget;
 import io.nosqlbench.api.config.params.ParamsParser;
 import io.nosqlbench.api.errors.BasicError;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RainbowTableMapper.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RainbowTableMapper.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,10 +18,10 @@ package io.nosqlbench.adapter.cqld4.opmappers;

 import com.datastax.oss.driver.api.core.CqlSession;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4RainbowTableOp;
-import io.nosqlbench.engine.api.activityimpl.OpDispenser;
-import io.nosqlbench.engine.api.activityimpl.OpMapper;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.OpDispenser;
+import io.nosqlbench.adapters.api.activityimpl.OpMapper;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.templating.ParsedOp;

 import java.util.function.LongFunction;

--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RawStmtMapper.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RawStmtMapper.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,10 +19,10 @@ package io.nosqlbench.adapter.cqld4.opmappers;
 import com.datastax.oss.driver.api.core.CqlSession;
 import io.nosqlbench.adapter.cqld4.opdispensers.Cqld4RawStmtDispenser;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp;
-import io.nosqlbench.engine.api.activityimpl.OpDispenser;
-import io.nosqlbench.engine.api.activityimpl.OpMapper;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.OpDispenser;
+import io.nosqlbench.adapters.api.activityimpl.OpMapper;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.templating.ParsedOp;

 import java.util.function.LongFunction;

--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,12 +19,12 @@ package io.nosqlbench.adapter.cqld4.opmappers;
 import com.datastax.oss.driver.api.core.CqlSession;
 import io.nosqlbench.adapter.cqld4.Cqld4Space;
 import io.nosqlbench.api.config.standard.NBConfiguration;
-import io.nosqlbench.engine.api.activityimpl.OpDispenser;
-import io.nosqlbench.engine.api.activityimpl.OpMapper;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverSpaceCache;
-import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.OpDispenser;
+import io.nosqlbench.adapters.api.activityimpl.OpMapper;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverSpaceCache;
+import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.Op;
+import io.nosqlbench.adapters.api.templating.ParsedOp;
 import io.nosqlbench.engine.api.templating.TypeAndTarget;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4FluentGraphOpMapper.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4FluentGraphOpMapper.java
@ -22,11 +22,11 @@ import groovy.lang.Binding;
 import groovy.lang.GroovyShell;
 import groovy.lang.Script;
 import io.nosqlbench.adapter.cqld4.opdispensers.Cqld4FluentGraphOpDispenser;
-import io.nosqlbench.engine.api.activityimpl.OpDispenser;
-import io.nosqlbench.engine.api.activityimpl.OpMapper;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.OpDispenser;
+import io.nosqlbench.adapters.api.activityimpl.OpMapper;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.Op;
+import io.nosqlbench.adapters.api.templating.ParsedOp;
 import io.nosqlbench.engine.api.templating.TypeAndTarget;
 import io.nosqlbench.api.errors.OpConfigError;
 import io.nosqlbench.virtdata.core.bindings.Bindings;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4GremlinOpMapper.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4GremlinOpMapper.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,10 +19,10 @@ package io.nosqlbench.adapter.cqld4.opmappers;
 import com.datastax.oss.driver.api.core.CqlSession;
 import io.nosqlbench.adapter.cqld4.opdispensers.Cqld4GremlinOpDispenser;
 import io.nosqlbench.adapter.cqld4.optypes.Cqld4ScriptGraphOp;
-import io.nosqlbench.engine.api.activityimpl.OpDispenser;
-import io.nosqlbench.engine.api.activityimpl.OpMapper;
-import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
-import io.nosqlbench.engine.api.templating.ParsedOp;
+import io.nosqlbench.adapters.api.activityimpl.OpDispenser;
+import io.nosqlbench.adapters.api.activityimpl.OpMapper;
+import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
+import io.nosqlbench.adapters.api.templating.ParsedOp;

 import java.util.function.LongFunction;

--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java
@ -26,7 +26,7 @@ import io.nosqlbench.adapter.cqld4.exceptions.ChangeUnappliedCycleException;
 import io.nosqlbench.adapter.cqld4.exceptions.ExceededRetryReplaceException;
 import io.nosqlbench.adapter.cqld4.exceptions.UndefinedResultSetException;
 import io.nosqlbench.adapter.cqld4.exceptions.UnexpectedPagingException;
-import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.*;
+import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.*;

 import java.util.ArrayList;
 import java.util.Iterator;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4FluentGraphOp.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4FluentGraphOp.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,8 +19,8 @@ package io.nosqlbench.adapter.cqld4.optypes;
 import com.datastax.dse.driver.api.core.graph.FluentGraphStatement;
 import com.datastax.dse.driver.api.core.graph.GraphResultSet;
 import com.datastax.oss.driver.api.core.CqlSession;
-import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.CycleOp;
-import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.OpResultSize;
+import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.CycleOp;
+import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.OpResultSize;

 public class Cqld4FluentGraphOp implements CycleOp<GraphResultSet>, OpResultSize {
    private final CqlSession session;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4RainbowTableOp.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4RainbowTableOp.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -17,7 +17,7 @@
 package io.nosqlbench.adapter.cqld4.optypes;

 import com.datastax.oss.driver.api.core.cql.ResultSet;
-import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.*;
+import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.*;

 import java.util.Map;

--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4ScriptGraphOp.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4ScriptGraphOp.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,8 +19,8 @@ package io.nosqlbench.adapter.cqld4.optypes;
 import com.datastax.dse.driver.api.core.graph.GraphResultSet;
 import com.datastax.dse.driver.api.core.graph.ScriptGraphStatement;
 import com.datastax.oss.driver.api.core.CqlSession;
-import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.CycleOp;
-import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.OpResultSize;
+import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.CycleOp;
+import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.OpResultSize;

 public class Cqld4ScriptGraphOp implements CycleOp<GraphResultSet>, OpResultSize {
    private final CqlSession session;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGDefaultCqlBindings.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGDefaultCqlBindings.java
@ -21,8 +21,8 @@ import io.nosqlbench.api.content.NBIO;
 import io.nosqlbench.cqlgen.api.BindingsLibrary;
 import io.nosqlbench.cqlgen.binders.Binding;
 import io.nosqlbench.cqlgen.model.CqlColumnBase;
-import io.nosqlbench.engine.api.activityconfig.OpsLoader;
-import io.nosqlbench.engine.api.activityconfig.yaml.OpsDocList;
+import io.nosqlbench.adapters.api.activityconfig.OpsLoader;
+import io.nosqlbench.adapters.api.activityconfig.yaml.OpsDocList;

 import java.io.File;
 import java.io.InputStream;
--- a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/NormalizeCqlVector.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/NormalizeCqlVector.java
@ -23,7 +23,7 @@ import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import io.nosqlbench.virtdata.library.basics.shared.from_long.to_vector.NormalizeDoubleListVector;
 import io.nosqlbench.virtdata.library.basics.shared.from_long.to_vector.NormalizeFloatListVector;

-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;

@ -33,37 +33,28 @@ import java.util.function.Function;
 */
@ThreadSafeMapper
@Categories(Category.experimental)
-public class NormalizeCqlVector implements Function<com.datastax.oss.driver.api.core.data.CqlVector, com.datastax.oss.driver.api.core.data.CqlVector> {
+public class NormalizeCqlVector implements Function<CqlVector, CqlVector> {
    private final NormalizeDoubleListVector ndv = new NormalizeDoubleListVector();
    private final NormalizeFloatListVector nfv = new NormalizeFloatListVector();

    @Override
-    public com.datastax.oss.driver.api.core.data.CqlVector apply(CqlVector cqlVector) {
-
-        CqlVector.Builder builder = CqlVector.builder();
-        Iterable values = cqlVector.getValues();
-        List<Object> list = new ArrayList<>();
-        values.forEach(list::add);
-
-        if (list.isEmpty()) {
-
-            builder.add(List.of());
-        } else if (list.get(0) instanceof Float) {
-            List<Float> floats = new ArrayList<>();
-            list.forEach(o -> floats.add((Float) o));
-            for (Float fv : floats) {
-                builder.add(fv);
-            }
-
-        } else if (list.get(0) instanceof Double) {
-            List<Double> doubles = new ArrayList<>();
-            list.forEach(o -> doubles.add((Double) o));
-            for (Double dv : doubles) {
-                builder.add(dv);
-            }
-        } else {
-            throw new RuntimeException("Only Doubles and Floats are recognized.");
+    public CqlVector apply(CqlVector cqlVector) {
+        double[] vals = new double[cqlVector.size()];
+        double accumulator= 0.0d;
+        for (int i = 0; i < vals.length; i++) {
+            vals[i]=cqlVector.get(i).doubleValue();
+            accumulator+=vals[i]*vals[i];
+        }
+        double factor = 1.0d/Math.sqrt(Arrays.stream(vals).map(d -> d * d).sum());
+
+        if (cqlVector.get(0) instanceof Float) {
+            List<Float> list = Arrays.stream(vals).mapToObj(d -> Float.valueOf((float) (d * factor))).toList();
+            return CqlVector.newInstance(list);
+        } else if (cqlVector.get(0) instanceof Double) {
+            List<Double> list = Arrays.stream(vals).mapToObj(d -> Double.valueOf((float) (d * factor))).toList();
+            return CqlVector.newInstance(list);
+        } else {
+            throw new RuntimeException(NormalizeCqlVector.class.getCanonicalName()+ " only supports Double and Float type");
        }
-        return builder.build();
    }
 }
--- a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/CqlVector.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/CqlVector.java
@ -43,8 +43,7 @@ public class CqlVector implements LongFunction<com.datastax.oss.driver.api.core.
    @Override
    public com.datastax.oss.driver.api.core.data.CqlVector apply(long cycle) {
        List components = func.apply(cycle);
-        com.datastax.oss.driver.api.core.data.CqlVector.Builder vbuilder = com.datastax.oss.driver.api.core.data.CqlVector.builder();
-        vbuilder.add(components.toArray());
-        return vbuilder.build();
+        com.datastax.oss.driver.api.core.data.CqlVector vector = com.datastax.oss.driver.api.core.data.CqlVector.newInstance(components);
+        return vector;
    }
 }
--- a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/ToCqlVector.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/ToCqlVector.java
@ -1,53 +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.datamappers.functions.to_cqlvector;
-
-import com.datastax.oss.driver.api.core.data.CqlVector;
-import io.nosqlbench.virtdata.api.annotations.Categories;
-import io.nosqlbench.virtdata.api.annotations.Category;
-import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
-
-import java.util.function.Function;
-import java.util.List;
-
-/**
- * Convert the incoming object List, Number, or Array to a CqlVector
- * using {@link CqlVector.Builder#add(Object[])}}. If any numeric value
- * is passed in, then it becomes the only component of a 1D vector.
- * Otherwise, the individual values are added as vector components.
- */
-@ThreadSafeMapper
-@Categories(Category.experimental)
-public class ToCqlVector implements Function<Object, CqlVector> {
-
-    @Override
-    public CqlVector apply(Object object) {
-        Object[] ary = null;
-        if (object instanceof List list) {
-            ary = list.toArray();
-        } else if (object instanceof Number number) {
-            ary = new Object[]{number.floatValue()};
-        } else if (object.getClass().isArray()) {
-            ary = (Object[]) object;
-        } else {
-            throw new RuntimeException("Unsupported input type for CqlVector: " + object.getClass().getCanonicalName());
-        }
-        CqlVector.Builder vbuilder = CqlVector.builder();
-        vbuilder.add(ary);
-        return vbuilder.build();
-    }
-}
--- a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_double_ary/ToCqlVector.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_double_ary/ToCqlVector.java
@ -0,0 +1,38 @@
+/*
+ * 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.datamappers.functions.to_cqlvector.from_double_ary;
+
+import com.datastax.oss.driver.api.core.data.CqlVector;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
+
+import java.util.function.Function;
+
+@ThreadSafeMapper
+@Categories(Category.experimental)
+public class ToCqlVector implements Function<double[], CqlVector> {
+
+    @Override
+    public CqlVector apply(double[] doubles) {
+        Double[] numbers = new Double[doubles.length];
+        for (int i = 0; i < doubles.length; i++) {
+            numbers[i]=doubles[i];
+        }
+        return CqlVector.newInstance(numbers);
+    }
+}
--- a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_float_ary/ToCqlVector.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_float_ary/ToCqlVector.java
@ -0,0 +1,38 @@
+/*
+ * 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.datamappers.functions.to_cqlvector.from_float_ary;
+
+import com.datastax.oss.driver.api.core.data.CqlVector;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
+
+import java.util.function.Function;
+
+@ThreadSafeMapper
+@Categories(Category.experimental)
+public class ToCqlVector implements Function<float[], CqlVector> {
+
+    @Override
+    public CqlVector apply(float[] floats) {
+        Float[] numbers = new Float[floats.length];
+        for (int i = 0; i < floats.length; i++) {
+            numbers[i]=floats[i];
+        }
+        return CqlVector.newInstance(numbers);
+    }
+}
--- a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_number_list/ToCqlVector.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_number_list/ToCqlVector.java
@ -0,0 +1,38 @@
+/*
+ * 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.datamappers.functions.to_cqlvector.from_number_list;
+
+import com.datastax.oss.driver.api.core.data.CqlVector;
+import io.nosqlbench.virtdata.api.annotations.Categories;
+import io.nosqlbench.virtdata.api.annotations.Category;
+import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
+
+import java.util.List;
+import java.util.function.Function;
+
+@ThreadSafeMapper
+@Categories(Category.experimental)
+public class ToCqlVector implements Function<List, CqlVector> {
+
+    @Override
+    public CqlVector apply(List objects) {
+        if (objects.size()==0) {
+            throw new RuntimeException("Empty lists are not supported for vectors.");
+        }
+        return CqlVector.newInstance((List<Number>)objects);
+    }
+}
--- a/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/geometry/NormalizeCqlVectorTest.java
+++ b/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/geometry/NormalizeCqlVectorTest.java
@ -0,0 +1,60 @@
+/*
+ * 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.datamappers.functions.geometry;
+
+import com.datastax.oss.driver.api.core.data.CqlVector;
+import org.assertj.core.data.Offset;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class NormalizeCqlVectorTest {
+
+    @Test
+    public void normalizeCqlVectorFloats() {
+        CqlVector square = CqlVector.newInstance(1.0f, 1.0f);
+        NormalizeCqlVector nv = new NormalizeCqlVector();
+        CqlVector normaled = nv.apply(square);
+
+        List sides = new ArrayList();
+        for (int i = 0; i < normaled.size(); i++) {
+            sides.add(normaled.get(i));
+        }
+        assertThat(sides.size()).isEqualTo(2);
+        assertThat(sides.get(0)).isInstanceOf(Float.class);
+        assertThat(sides.get(1)).isInstanceOf(Float.class);
+        assertThat(((Float)sides.get(0)).doubleValue()).isCloseTo(0.707, Offset.offset(0.001d));
+        assertThat(((Float)sides.get(1)).doubleValue()).isCloseTo(0.707, Offset.offset(0.001d));
+    }
+
+    @Test
+    public void normalizeCqlVectorDoubles() {
+        CqlVector square = CqlVector.newInstance(1.0d, 1.0d);
+        NormalizeCqlVector nv = new NormalizeCqlVector();
+        CqlVector normaled = nv.apply(square);
+
+        assertThat(normaled.size()).isEqualTo(2);
+        assertThat(normaled.get(0)).isInstanceOf(Double.class);
+        assertThat(normaled.get(1)).isInstanceOf(Double.class);
+        assertThat(normaled.get(0).doubleValue()).isCloseTo(0.707, Offset.offset(0.001d));
+        assertThat(normaled.get(1).doubleValue()).isCloseTo(0.707, Offset.offset(0.001d));
+    }
+
+}
--- a/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_cqlvector/CqlVectorTest.java
+++ b/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_cqlvector/CqlVectorTest.java
@ -16,26 +16,21 @@

 package io.nosqlbench.datamappers.functions.to_cqlvector;

-import io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection.ListSized;
+import io.nosqlbench.virtdata.library.basics.shared.from_long.to_collection.ListSizedStepped;
 import io.nosqlbench.virtdata.library.basics.shared.from_long.to_float.HashRange;
 import org.junit.jupiter.api.Test;

-import java.util.ArrayList;
-import java.util.List;
-
 import static org.assertj.core.api.Assertions.assertThat;

 public class CqlVectorTest {

    @Test
    public void testCqlVector() {
-        CqlVector func = new CqlVector(new ListSized(2, new HashRange(0.2f, 5.0f)));
-        com.datastax.oss.driver.api.core.data.CqlVector result = func.apply(23L);
-        List<Object> values = new ArrayList<>();
-        for (Object value : result.getValues()) {
-            values.add(value);
+        CqlVector func = new CqlVector(new ListSizedStepped(2, new HashRange(0.2f, 5.0f)));
+        com.datastax.oss.driver.api.core.data.CqlVector vector = func.apply(23L);
+        for (Object value : vector) {
+            assertThat(value).isInstanceOf(Float.class);
        }
-        assertThat(values.get(0)).isInstanceOf(Float.class);
    }

 }
--- a/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_cqlvector/ToCqlVectorTest.java
+++ b/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_cqlvector/ToCqlVectorTest.java
@ -17,6 +17,7 @@
 package io.nosqlbench.datamappers.functions.to_cqlvector;

 import com.datastax.oss.driver.api.core.data.CqlVector;
+import io.nosqlbench.datamappers.functions.to_cqlvector.from_number_list.ToCqlVector;
 import org.junit.jupiter.api.Test;

 import java.util.List;