diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneOpDispenser.java index e79cefc82..687a9b91a 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneOpDispenser.java @@ -58,6 +58,8 @@ public class DataApiFindOneOpDispenser extends DataApiOpDispenser { float[] vector = getVectorValues(op, l); if (sort != null) { options = vector != null ? options.sort(vector, sort) : options.sort(sort); + } else if (vector != null) { + options = options.sort(vector); } Projection[] projection = getProjectionFromOp(op, l); if (projection != null) { diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOpDispenser.java index 4c7bfd3c7..99dcb95ad 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOpDispenser.java @@ -55,8 +55,11 @@ public class DataApiFindOpDispenser extends DataApiOpDispenser { private FindOptions getFindOptions(ParsedOp op, long l) { FindOptions options = new FindOptions(); Sort sort = getSortFromOp(op, l); + float[] vector = getVectorValues(op, l); if (sort != null) { - options = options.sort(sort); + options = vector != null ? options.sort(vector, sort) : options.sort(sort); + } else if (vector != null) { + options = options.sort(vector); } Projection[] projection = getProjectionFromOp(op, l); if (projection != null) { diff --git a/nb-adapters/adapter-dataapi/src/main/resources/activities/find.yaml b/nb-adapters/adapter-dataapi/src/main/resources/activities/find.yaml index b98337a6f..72b406dcd 100644 --- a/nb-adapters/adapter-dataapi/src/main/resources/activities/find.yaml +++ b/nb-adapters/adapter-dataapi/src/main/resources/activities/find.yaml @@ -19,6 +19,7 @@ blocks: sort: type: "asc" field: "field1" + vector: "1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0,9.0,10.0" projection: include: - "field1" diff --git a/nb-adapters/adapter-dataapi/src/main/resources/activities/find_one.yaml b/nb-adapters/adapter-dataapi/src/main/resources/activities/find_one.yaml index e1337fc81..e86bb16a3 100644 --- a/nb-adapters/adapter-dataapi/src/main/resources/activities/find_one.yaml +++ b/nb-adapters/adapter-dataapi/src/main/resources/activities/find_one.yaml @@ -19,6 +19,7 @@ blocks: sort: type: "asc" field: "field1" + vector: "1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0,9.0,10.0" projection: include: - "field1"