From c2e73935497a2e5f898439b629165511e44c828a Mon Sep 17 00:00:00 2001 From: Mark Wolters Date: Thu, 15 Feb 2024 10:37:26 -0400 Subject: [PATCH] moving parser stuff to non adapter specific location --- .run/vectorsearch-consistency-levels.run.xml | 15 --------------- .../hdf_to_cql/HdfDatasetToCqlPredicates.java | 4 +++- .../hdf_to_cql/DefaultDatasetParserTest.java | 1 + .../predicate_parser}/DatasetParser.java | 7 +++++-- .../predicate_parser}/JAWDatasetParser.java | 8 ++++++-- .../predicate_parser}/NoopDatasetParser.java | 8 ++++++-- .../from_json/to_cql}/DefaultDatasetParser.java | 6 ++++-- 7 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 .run/vectorsearch-consistency-levels.run.xml rename {adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql => virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser}/DatasetParser.java (84%) rename {adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql => virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser}/JAWDatasetParser.java (84%) rename {adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql => virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser}/NoopDatasetParser.java (81%) rename {adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql => virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/to_cql}/DefaultDatasetParser.java (95%) diff --git a/.run/vectorsearch-consistency-levels.run.xml b/.run/vectorsearch-consistency-levels.run.xml deleted file mode 100644 index e0d44b78a..000000000 --- a/.run/vectorsearch-consistency-levels.run.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/HdfDatasetToCqlPredicates.java b/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/HdfDatasetToCqlPredicates.java index a592b0a81..d9d13ac4c 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/HdfDatasetToCqlPredicates.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/HdfDatasetToCqlPredicates.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 nosqlbench + * Copyright (c) 2023-2024 nosqlbench * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,6 +12,7 @@ * 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.hdf_to_cql; @@ -22,6 +23,7 @@ import io.nosqlbench.nb.api.nbio.NBIO; import io.nosqlbench.virtdata.api.annotations.Categories; import io.nosqlbench.virtdata.api.annotations.Category; import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; +import io.nosqlbench.virtdata.library.hdf5.from_long.to_string.predicate_parser.DatasetParser; import java.util.function.LongFunction; diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/hdf_to_cql/DefaultDatasetParserTest.java b/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/hdf_to_cql/DefaultDatasetParserTest.java index 70820a5ff..878c7e9d3 100644 --- a/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/hdf_to_cql/DefaultDatasetParserTest.java +++ b/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/hdf_to_cql/DefaultDatasetParserTest.java @@ -16,6 +16,7 @@ package io.nosqlbench.datamappers.functions.hdf_to_cql; +import io.nosqlbench.virtdata.library.hdf5.from_long.to_string.predicate_parser.from_json.to_cql.DefaultDatasetParser; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/DatasetParser.java b/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/DatasetParser.java similarity index 84% rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/DatasetParser.java rename to virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/DatasetParser.java index ccc767436..ea645d866 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/DatasetParser.java +++ b/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/DatasetParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 nosqlbench + * Copyright (c) 2023-2024 nosqlbench * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,9 +12,12 @@ * 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.hdf_to_cql; +package io.nosqlbench.virtdata.library.hdf5.from_long.to_string.predicate_parser; + +import io.nosqlbench.virtdata.library.hdf5.from_long.to_string.predicate_parser.from_json.to_cql.DefaultDatasetParser; /** * This interface is used to parse the raw JSON from the HDF dataset into a CQL predicate. diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/JAWDatasetParser.java b/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/JAWDatasetParser.java similarity index 84% rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/JAWDatasetParser.java rename to virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/JAWDatasetParser.java index ff2373475..5a6ebabfd 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/JAWDatasetParser.java +++ b/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/JAWDatasetParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 nosqlbench + * Copyright (c) 2023-2024 nosqlbench * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,9 +12,13 @@ * 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.hdf_to_cql; +package io.nosqlbench.virtdata.library.hdf5.from_long.to_string.predicate_parser; + +import io.nosqlbench.virtdata.library.hdf5.from_long.to_string.predicate_parser.DatasetParser; + /** * This class is used to parse the raw JSON from the HDF dataset into a CQL predicate. This implementation * accepts a string consisting of the desired CQL predicate as translated from the original jsonl files diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/NoopDatasetParser.java b/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/NoopDatasetParser.java similarity index 81% rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/NoopDatasetParser.java rename to virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/NoopDatasetParser.java index 3177140f1..6f9070ca9 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/NoopDatasetParser.java +++ b/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/NoopDatasetParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 nosqlbench + * Copyright (c) 2023-2024 nosqlbench * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,9 +12,13 @@ * 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.hdf_to_cql; +package io.nosqlbench.virtdata.library.hdf5.from_long.to_string.predicate_parser; + +import io.nosqlbench.virtdata.library.hdf5.from_long.to_string.predicate_parser.DatasetParser; + /** * This class is used to parse the raw JSON from the HDF dataset into a CQL predicate. This implementation * accepts a string consisting of the desired CQL predicate as translated from the original jsonl files and diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/DefaultDatasetParser.java b/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/to_cql/DefaultDatasetParser.java similarity index 95% rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/DefaultDatasetParser.java rename to virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/to_cql/DefaultDatasetParser.java index 688f86d23..237c7ef4c 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/DefaultDatasetParser.java +++ b/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/to_cql/DefaultDatasetParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 nosqlbench + * Copyright (c) 2023-2024 nosqlbench * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,13 +12,15 @@ * 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.hdf_to_cql; +package io.nosqlbench.virtdata.library.hdf5.from_long.to_string.predicate_parser.from_json.to_cql; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import io.nosqlbench.virtdata.library.hdf5.from_long.to_string.predicate_parser.DatasetParser; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger;