From 92f96f6bb40b36521867f397c5cacbed2ff6488b Mon Sep 17 00:00:00 2001 From: Mark Wolters Date: Wed, 12 Jun 2024 10:48:08 -0400 Subject: [PATCH] Find Distinct op --- .../adapter/dataapi/DataApiOpMapper.java | 1 + .../DataApiFindDistinctOpDispenser.java | 67 +++++++++++++++++++ .../DataApiUpdateManyOpDispenser.java | 2 +- .../DataApiUpdateOneOpDispenser.java | 2 +- .../dataapi/ops/DataApiFindDistinctOp.java | 42 ++++++++++++ .../adapter/dataapi/ops/DataApiOpType.java | 1 + 6 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindDistinctOpDispenser.java create mode 100644 nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/ops/DataApiFindDistinctOp.java diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/DataApiOpMapper.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/DataApiOpMapper.java index cdad5e57d..2703f8aad 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/DataApiOpMapper.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/DataApiOpMapper.java @@ -65,6 +65,7 @@ public class DataApiOpMapper implements OpMapper { case estimated_document_count -> new DataApiEstimatedDocumentCountOpDispenser(adapter, op, typeAndTarget.targetFunction); case find_by_id -> new DataApiFindByIdOpDispenser(adapter, op, typeAndTarget.targetFunction); + case find_distinct -> new DataApiFindDistinctOpDispenser(adapter, op, typeAndTarget.targetFunction); }; } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindDistinctOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindDistinctOpDispenser.java new file mode 100644 index 000000000..37eba4d89 --- /dev/null +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindDistinctOpDispenser.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 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.adapter.dataapi.opdispensers; + +import com.datastax.astra.client.Database; +import com.datastax.astra.client.model.Filter; +import io.nosqlbench.adapter.dataapi.DataApiDriverAdapter; +import io.nosqlbench.adapter.dataapi.ops.DataApiBaseOp; +import io.nosqlbench.adapter.dataapi.ops.DataApiFindDistinctOp; +import io.nosqlbench.adapters.api.templating.ParsedOp; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.function.LongFunction; + +public class DataApiFindDistinctOpDispenser extends DataApiOpDispenser { + private static final Logger logger = LogManager.getLogger(DataApiFindDistinctOpDispenser.class); + private final LongFunction opFunction; + public DataApiFindDistinctOpDispenser(DataApiDriverAdapter adapter, ParsedOp op, LongFunction targetFunction) { + super(adapter, op, targetFunction); + this.opFunction = createOpFunction(op); + } + + private LongFunction createOpFunction(ParsedOp op) { + return (l) -> { + Database db = spaceFunction.apply(l).getDatabase(); + Filter filter = getFilterFromOp(op, l); + Class targetClass = getTargetClass(op, l); + return new DataApiFindDistinctOp( + db, + db.getCollection(targetFunction.apply(l)), + op.getAsRequiredFunction("fieldName", String.class).apply(l), + filter, + targetClass + ); + }; + } + + private Class getTargetClass(ParsedOp op, long l) { + String className = op.getAsFunctionOr("resultClass", "java.lang.String").apply(l); + try { + return Class.forName(className); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + } + + @Override + public DataApiBaseOp getOp(long value) { + return opFunction.apply(value); + } +} diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateManyOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateManyOpDispenser.java index 253e22349..98b525499 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateManyOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateManyOpDispenser.java @@ -43,7 +43,7 @@ public class DataApiUpdateManyOpDispenser extends DataApiOpDispenser { Database db = spaceFunction.apply(l).getDatabase(); Filter filter = getFilterFromOp(op, l); UpdateManyOptions options = getUpdateManyOptions(op, l); - LongFunction> docMapFunc = op.getAsRequiredFunction("updates", Map.class); + LongFunction docMapFunc = op.getAsRequiredFunction("updates", Map.class); return new DataApiUpdateManyOp( db, diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateOneOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateOneOpDispenser.java index 88c2ab6e7..9eca42fef 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateOneOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateOneOpDispenser.java @@ -43,7 +43,7 @@ public class DataApiUpdateOneOpDispenser extends DataApiOpDispenser { Database db = spaceFunction.apply(l).getDatabase(); Filter filter = getFilterFromOp(op, l); UpdateOneOptions options = getUpdateOneOptions(op, l); - LongFunction> docMapFunc = op.getAsRequiredFunction("update", Map.class); + LongFunction docMapFunc = op.getAsRequiredFunction("update", Map.class); return new DataApiUpdateOneOp( db, diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/ops/DataApiFindDistinctOp.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/ops/DataApiFindDistinctOp.java new file mode 100644 index 000000000..898e2da81 --- /dev/null +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/ops/DataApiFindDistinctOp.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 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.adapter.dataapi.ops; + +import com.datastax.astra.client.Collection; +import com.datastax.astra.client.Database; +import com.datastax.astra.client.model.CollectionOptions; +import com.datastax.astra.client.model.Filter; + +public class DataApiFindDistinctOp extends DataApiBaseOp { + private final Collection collection; + private final String fieldName; + private final Filter filter; + private final Class resultClass; + + public DataApiFindDistinctOp(Database db, Collection collection, String fieldName, Filter filter, Class resultClass) { + super(db); + this.collection = collection; + this.fieldName = fieldName; + this.filter = filter; + this.resultClass = resultClass; + } + + @Override + public Object apply(long value) { + return collection.distinct(fieldName, filter, resultClass); + } +} diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/ops/DataApiOpType.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/ops/DataApiOpType.java index 99577c3c2..caf50cac7 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/ops/DataApiOpType.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/ops/DataApiOpType.java @@ -36,4 +36,5 @@ public enum DataApiOpType { list_collection_names, estimated_document_count, find_by_id, + find_distinct, }