diff --git a/src/main/java/couchbase/test/sdk/Loader.java b/src/main/java/Loader.java similarity index 97% rename from src/main/java/couchbase/test/sdk/Loader.java rename to src/main/java/Loader.java index 7149429..006b7b0 100644 --- a/src/main/java/couchbase/test/sdk/Loader.java +++ b/src/main/java/Loader.java @@ -1,4 +1,4 @@ -package couchbase.test.sdk; + import java.io.IOException; import java.util.HashMap; @@ -14,13 +14,15 @@ import org.apache.log4j.LogManager; import org.apache.log4j.Logger; -import couchbase.test.docgen.DRConstants; -import couchbase.test.docgen.DocRange; -import couchbase.test.docgen.DocumentGenerator; -import couchbase.test.docgen.WorkLoadSettings; -import couchbase.test.loadgen.WorkLoadGenerate; -import couchbase.test.taskmanager.TaskManager; +import couchbase.loadgen.WorkLoadGenerate; +import couchbase.sdk.SDKClient; +import couchbase.sdk.Server; import elasticsearch.EsClient; +import utils.docgen.DRConstants; +import utils.docgen.DocRange; +import utils.docgen.DocumentGenerator; +import utils.docgen.WorkLoadSettings; +import utils.taskmanager.TaskManager; public class Loader { static Logger logger = LogManager.getLogger(Loader.class); diff --git a/src/main/java/mongo/loader/MongoLoader.java b/src/main/java/MongoLoader.java similarity index 95% rename from src/main/java/mongo/loader/MongoLoader.java rename to src/main/java/MongoLoader.java index 052a818..e7a961d 100644 --- a/src/main/java/mongo/loader/MongoLoader.java +++ b/src/main/java/MongoLoader.java @@ -1,4 +1,4 @@ -package mongo.loader; + import java.util.ArrayList; import java.util.HashMap; @@ -14,11 +14,14 @@ import org.apache.log4j.LogManager; import org.apache.log4j.Logger; -import couchbase.test.docgen.DRConstants; -import couchbase.test.docgen.DocRange; -import couchbase.test.docgen.WorkLoadSettings; -import couchbase.test.sdk.Server; -import couchbase.test.taskmanager.TaskManager; +import couchbase.sdk.Server; +import mongo.loadgen.WorkLoadGenerate; +import mongo.sdk.MongoSDKClient; +import utils.docgen.DRConstants; +import utils.docgen.DocRange; +import utils.docgen.WorkLoadSettings; +import utils.taskmanager.TaskManager; +import utils.docgen.mongo.MongoDocumentGenerator; public class MongoLoader { static Logger logger = LogManager.getLogger(MongoLoader.class); @@ -202,9 +205,9 @@ public static void main(String[] args) { DocRange range = new DocRange(dr); ws.dr = range; - DocumentGenerator dg = null; + MongoDocumentGenerator dg = null; try { - dg = new DocumentGenerator(ws, ws.keyType, ws.valueType); + dg = new MongoDocumentGenerator(ws, ws.keyType, ws.valueType); } catch (ClassNotFoundException e1) { e1.printStackTrace(); } diff --git a/src/main/java/couchbase/test/sdk/SIFTLoader.java b/src/main/java/SIFTLoader.java similarity index 97% rename from src/main/java/couchbase/test/sdk/SIFTLoader.java rename to src/main/java/SIFTLoader.java index db9ad86..a752682 100644 --- a/src/main/java/couchbase/test/sdk/SIFTLoader.java +++ b/src/main/java/SIFTLoader.java @@ -1,10 +1,8 @@ -package couchbase.test.sdk; -import java.io.File; + import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; @@ -21,15 +19,16 @@ import org.apache.log4j.LogManager; import org.apache.log4j.Logger; -import couchbase.test.docgen.DRConstants; -import couchbase.test.docgen.DocRange; -import couchbase.test.docgen.DocumentGenerator; -import couchbase.test.docgen.WorkLoadSettings; -import couchbase.test.loadgen.WorkLoadGenerate; -import couchbase.test.taskmanager.Task; -import couchbase.test.taskmanager.TaskManager; +import couchbase.loadgen.WorkLoadGenerate; +import couchbase.sdk.SDKClientPool; +import couchbase.sdk.Server; import elasticsearch.EsClient; import utils.common.FileDownload; +import utils.docgen.DRConstants; +import utils.docgen.DocRange; +import utils.docgen.DocumentGenerator; +import utils.docgen.WorkLoadSettings; +import utils.taskmanager.TaskManager; public class SIFTLoader { static Logger logger = LogManager.getLogger(SIFTLoader.class); diff --git a/src/main/java/couchbase/test/loadgen/TransactionWorkLoadGenerate.java b/src/main/java/couchbase/loadgen/TransactionWorkLoadGenerate.java similarity index 97% rename from src/main/java/couchbase/test/loadgen/TransactionWorkLoadGenerate.java rename to src/main/java/couchbase/loadgen/TransactionWorkLoadGenerate.java index baaeab1..03b25a0 100644 --- a/src/main/java/couchbase/test/loadgen/TransactionWorkLoadGenerate.java +++ b/src/main/java/couchbase/loadgen/TransactionWorkLoadGenerate.java @@ -1,4 +1,4 @@ -package couchbase.test.loadgen; +package couchbase.loadgen; import java.util.ArrayList; import java.util.Collections; @@ -8,21 +8,21 @@ import java.util.concurrent.TimeUnit; import reactor.util.function.Tuple2; +import utils.docgen.DocumentGenerator; +import utils.taskmanager.Task; import com.couchbase.client.core.cnc.EventSubscription; import com.couchbase.client.java.Bucket; import com.couchbase.client.java.Cluster; import com.couchbase.client.java.Collection; -import couchbase.test.docgen.DocumentGenerator; -import couchbase.test.taskmanager.Task; -import couchbase.test.transactions.Transaction; - import com.couchbase.transactions.Transactions; import com.couchbase.transactions.TransactionGetResult; import com.couchbase.transactions.TransactionResult; import com.couchbase.transactions.error.TransactionFailed; import com.couchbase.transactions.log.LogDefer; +import couchbase.transactions.Transaction; + public class TransactionWorkLoadGenerate extends Task{ int batch_size; int num_transactions; diff --git a/src/main/java/couchbase/test/loadgen/WorkLoadGenerate.java b/src/main/java/couchbase/loadgen/WorkLoadGenerate.java similarity index 98% rename from src/main/java/couchbase/test/loadgen/WorkLoadGenerate.java rename to src/main/java/couchbase/loadgen/WorkLoadGenerate.java index e59c9c4..3211a4d 100644 --- a/src/main/java/couchbase/test/loadgen/WorkLoadGenerate.java +++ b/src/main/java/couchbase/loadgen/WorkLoadGenerate.java @@ -1,4 +1,4 @@ -package couchbase.test.loadgen; +package couchbase.loadgen; import java.time.Duration; import java.time.Instant; @@ -26,14 +26,14 @@ import com.couchbase.client.java.kv.RemoveOptions; import com.couchbase.client.java.kv.UpsertOptions; -import couchbase.test.docgen.DocumentGenerator; -import couchbase.test.sdk.DocOps; -import couchbase.test.sdk.Result; -import couchbase.test.sdk.SDKClient; -import couchbase.test.sdk.SDKClientPool; -import couchbase.test.taskmanager.Task; +import couchbase.sdk.DocOps; +import couchbase.sdk.Result; +import couchbase.sdk.SDKClient; +import couchbase.sdk.SDKClientPool; import elasticsearch.EsClient; import reactor.util.function.Tuple2; +import utils.docgen.DocumentGenerator; +import utils.taskmanager.Task; public class WorkLoadGenerate extends Task{ DocumentGenerator dg; diff --git a/src/main/java/couchbase/test/rest/RestClient.java b/src/main/java/couchbase/rest/RestClient.java similarity index 99% rename from src/main/java/couchbase/test/rest/RestClient.java rename to src/main/java/couchbase/rest/RestClient.java index 6906077..293db97 100644 --- a/src/main/java/couchbase/test/rest/RestClient.java +++ b/src/main/java/couchbase/rest/RestClient.java @@ -1,4 +1,4 @@ -package couchbase.test.rest; +package couchbase.rest; import java.io.BufferedReader; import java.io.DataOutputStream; diff --git a/src/main/java/couchbase/test/sdk/DocOps.java b/src/main/java/couchbase/sdk/DocOps.java similarity index 99% rename from src/main/java/couchbase/test/sdk/DocOps.java rename to src/main/java/couchbase/sdk/DocOps.java index bfdf674..64e1816 100644 --- a/src/main/java/couchbase/test/sdk/DocOps.java +++ b/src/main/java/couchbase/sdk/DocOps.java @@ -1,4 +1,4 @@ -package couchbase.test.sdk; +package couchbase.sdk; import java.time.Duration; import java.util.ArrayList; @@ -25,11 +25,11 @@ import com.couchbase.client.java.kv.TouchOptions; import com.couchbase.client.java.kv.UpsertOptions; -import couchbase.test.docgen.DocType.Person; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.util.function.Tuple2; import reactor.util.function.Tuples; +import utils.docgen.DocType.Person; public class DocOps { diff --git a/src/main/java/couchbase/test/sdk/Result.java b/src/main/java/couchbase/sdk/Result.java similarity index 95% rename from src/main/java/couchbase/test/sdk/Result.java rename to src/main/java/couchbase/sdk/Result.java index ec72165..6001c61 100644 --- a/src/main/java/couchbase/test/sdk/Result.java +++ b/src/main/java/couchbase/sdk/Result.java @@ -1,4 +1,4 @@ -package couchbase.test.sdk; +package couchbase.sdk; import reactor.util.annotation.Nullable; diff --git a/src/main/java/couchbase/test/sdk/SDKClient.java b/src/main/java/couchbase/sdk/SDKClient.java similarity index 99% rename from src/main/java/couchbase/test/sdk/SDKClient.java rename to src/main/java/couchbase/sdk/SDKClient.java index 0f8830e..fc783fd 100644 --- a/src/main/java/couchbase/test/sdk/SDKClient.java +++ b/src/main/java/couchbase/sdk/SDKClient.java @@ -1,4 +1,4 @@ -package couchbase.test.sdk; +package couchbase.sdk; import java.time.Duration; import java.util.Properties; diff --git a/src/main/java/couchbase/test/sdk/SDKClientPool.java b/src/main/java/couchbase/sdk/SDKClientPool.java similarity index 99% rename from src/main/java/couchbase/test/sdk/SDKClientPool.java rename to src/main/java/couchbase/sdk/SDKClientPool.java index 1551431..e65cb09 100644 --- a/src/main/java/couchbase/test/sdk/SDKClientPool.java +++ b/src/main/java/couchbase/sdk/SDKClientPool.java @@ -1,4 +1,4 @@ -package couchbase.test.sdk; +package couchbase.sdk; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/couchbase/test/sdk/Server.java b/src/main/java/couchbase/sdk/Server.java similarity index 95% rename from src/main/java/couchbase/test/sdk/Server.java rename to src/main/java/couchbase/sdk/Server.java index 6f7ecd8..3552df9 100644 --- a/src/main/java/couchbase/test/sdk/Server.java +++ b/src/main/java/couchbase/sdk/Server.java @@ -1,4 +1,4 @@ -package couchbase.test.sdk; +package couchbase.sdk; public class Server { public String ip; diff --git a/src/main/java/couchbase/test/docgen/HotLoadGenerator.java b/src/main/java/couchbase/test/docgen/HotLoadGenerator.java deleted file mode 100644 index 753700e..0000000 --- a/src/main/java/couchbase/test/docgen/HotLoadGenerator.java +++ /dev/null @@ -1,18 +0,0 @@ -package couchbase.test.docgen; - -import reactor.util.function.Tuple2; - -public class HotLoadGenerator extends KVGenerator { - - public HotLoadGenerator(WorkLoadSettings ws, String keyClass, String valClass) throws ClassNotFoundException { - super(ws, keyClass, valClass); - // TODO Auto-generated constructor stub - } - - @Override - Tuple2 next() { - // TODO Auto-generated method stub - return null; - } - -} diff --git a/src/main/java/couchbase/test/key/ColdKey.java b/src/main/java/couchbase/test/key/ColdKey.java deleted file mode 100644 index 2a59e90..0000000 --- a/src/main/java/couchbase/test/key/ColdKey.java +++ /dev/null @@ -1,5 +0,0 @@ -package couchbase.test.key; - -public class ColdKey { - -} diff --git a/src/main/java/couchbase/test/key/HotKey.java b/src/main/java/couchbase/test/key/HotKey.java deleted file mode 100644 index 6cd5c08..0000000 --- a/src/main/java/couchbase/test/key/HotKey.java +++ /dev/null @@ -1,5 +0,0 @@ -package couchbase.test.key; - -public class HotKey { - -} diff --git a/src/main/java/couchbase/test/transactions/SimpleTransaction.java b/src/main/java/couchbase/transactions/SimpleTransaction.java similarity index 99% rename from src/main/java/couchbase/test/transactions/SimpleTransaction.java rename to src/main/java/couchbase/transactions/SimpleTransaction.java index 7dadf7e..15bc6dc 100644 --- a/src/main/java/couchbase/test/transactions/SimpleTransaction.java +++ b/src/main/java/couchbase/transactions/SimpleTransaction.java @@ -1,4 +1,4 @@ -package couchbase.test.transactions; +package couchbase.transactions; import java.time.Duration; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/couchbase/test/transactions/Transaction.java b/src/main/java/couchbase/transactions/Transaction.java similarity index 99% rename from src/main/java/couchbase/test/transactions/Transaction.java rename to src/main/java/couchbase/transactions/Transaction.java index a742461..2a336b9 100644 --- a/src/main/java/couchbase/test/transactions/Transaction.java +++ b/src/main/java/couchbase/transactions/Transaction.java @@ -1,4 +1,4 @@ -package couchbase.test.transactions; +package couchbase.transactions; import java.time.Duration; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/elasticsearch/EsClient.java b/src/main/java/elasticsearch/EsClient.java index 10f73c2..e9d60df 100644 --- a/src/main/java/elasticsearch/EsClient.java +++ b/src/main/java/elasticsearch/EsClient.java @@ -210,10 +210,11 @@ public String performKNNSearch(String indexName, Response result = restClient.performRequest(request); InputStream inputStream = result.getEntity().getContent(); - String text = new BufferedReader( - new InputStreamReader(inputStream, StandardCharsets.UTF_8)) - .lines() - .collect(Collectors.joining("\n")); + String text; + try (BufferedReader reader = new BufferedReader( + new InputStreamReader(inputStream, StandardCharsets.UTF_8))) { + text = reader.lines().collect(Collectors.joining("\n")); + } return text; } } \ No newline at end of file diff --git a/src/main/java/mongo/loader/WorkLoadGenerate.java b/src/main/java/mongo/loadgen/WorkLoadGenerate.java similarity index 88% rename from src/main/java/mongo/loader/WorkLoadGenerate.java rename to src/main/java/mongo/loadgen/WorkLoadGenerate.java index cb3e98c..865b822 100644 --- a/src/main/java/mongo/loader/WorkLoadGenerate.java +++ b/src/main/java/mongo/loadgen/WorkLoadGenerate.java @@ -1,4 +1,4 @@ -package mongo.loader; +package mongo.loadgen; import java.time.Duration; import java.time.Instant; @@ -13,16 +13,18 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.model.InsertOneModel; -import couchbase.test.taskmanager.Task; +import mongo.sdk.MongoSDKClient; +import utils.docgen.mongo.MongoDocumentGenerator; +import utils.taskmanager.Task; public class WorkLoadGenerate extends Task{ - DocumentGenerator dg; + MongoDocumentGenerator dg; public MongoSDKClient sdk; public int exp; public String exp_unit; static Logger logger = LogManager.getLogger(WorkLoadGenerate.class); - public WorkLoadGenerate(String taskName, DocumentGenerator dg, MongoSDKClient client) { + public WorkLoadGenerate(String taskName, MongoDocumentGenerator dg, MongoSDKClient client) { super(taskName); this.dg = dg; this.sdk = client; diff --git a/src/main/java/mongo/loader/MongoSDKClient.java b/src/main/java/mongo/sdk/MongoSDKClient.java similarity index 96% rename from src/main/java/mongo/loader/MongoSDKClient.java rename to src/main/java/mongo/sdk/MongoSDKClient.java index 512c01a..ccac8b5 100644 --- a/src/main/java/mongo/loader/MongoSDKClient.java +++ b/src/main/java/mongo/sdk/MongoSDKClient.java @@ -1,4 +1,4 @@ -package mongo.loader; +package mongo.sdk; import org.apache.log4j.LogManager; @@ -13,7 +13,7 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; -import couchbase.test.sdk.Server; +import couchbase.sdk.Server; public class MongoSDKClient { diff --git a/src/main/java/couchbase/test/docgen/DRConstants.java b/src/main/java/utils/docgen/DRConstants.java similarity index 95% rename from src/main/java/couchbase/test/docgen/DRConstants.java rename to src/main/java/utils/docgen/DRConstants.java index 16218df..1f3bc73 100644 --- a/src/main/java/couchbase/test/docgen/DRConstants.java +++ b/src/main/java/utils/docgen/DRConstants.java @@ -1,4 +1,4 @@ -package couchbase.test.docgen; +package utils.docgen; public class DRConstants { public static String create_s = "create_s"; diff --git a/src/main/java/couchbase/test/docgen/DocRange.java b/src/main/java/utils/docgen/DocRange.java similarity index 98% rename from src/main/java/couchbase/test/docgen/DocRange.java rename to src/main/java/utils/docgen/DocRange.java index 796e88b..9cedab3 100644 --- a/src/main/java/couchbase/test/docgen/DocRange.java +++ b/src/main/java/utils/docgen/DocRange.java @@ -1,4 +1,4 @@ -package couchbase.test.docgen; +package utils.docgen; import java.util.HashMap; import java.util.concurrent.atomic.AtomicLong; diff --git a/src/main/java/couchbase/test/docgen/DocType.java b/src/main/java/utils/docgen/DocType.java similarity index 99% rename from src/main/java/couchbase/test/docgen/DocType.java rename to src/main/java/utils/docgen/DocType.java index 2c31991..e2aa149 100644 --- a/src/main/java/couchbase/test/docgen/DocType.java +++ b/src/main/java/utils/docgen/DocType.java @@ -1,4 +1,4 @@ -package couchbase.test.docgen; +package utils.docgen; import java.util.List; diff --git a/src/main/java/couchbase/test/docgen/DocumentGenerator.java b/src/main/java/utils/docgen/DocumentGenerator.java similarity index 94% rename from src/main/java/couchbase/test/docgen/DocumentGenerator.java rename to src/main/java/utils/docgen/DocumentGenerator.java index 047e44e..d639999 100644 --- a/src/main/java/couchbase/test/docgen/DocumentGenerator.java +++ b/src/main/java/utils/docgen/DocumentGenerator.java @@ -1,4 +1,4 @@ -package couchbase.test.docgen; +package utils.docgen; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -6,23 +6,24 @@ import java.util.List; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.TimeUnit; -import couchbase.test.key.CircularKey; -import couchbase.test.key.RandomKey; -import couchbase.test.key.RandomSizeKey; -import couchbase.test.key.ReverseKey; -import couchbase.test.key.SimpleKey; -import couchbase.test.val.Hotel; -import couchbase.test.val.MiniCars; -import couchbase.test.val.Cars; -import couchbase.test.val.NimbusM; -import couchbase.test.val.NimbusP; -import couchbase.test.val.Product; -import couchbase.test.val.SimpleValue; -import couchbase.test.val.Vector; -import couchbase.test.val.anySizeValue; -import couchbase.test.val.siftBigANN; + import reactor.util.function.Tuple2; import reactor.util.function.Tuples; +import utils.key.CircularKey; +import utils.key.RandomKey; +import utils.key.RandomSizeKey; +import utils.key.ReverseKey; +import utils.key.SimpleKey; +import utils.val.Cars; +import utils.val.Hotel; +import utils.val.MiniCars; +import utils.val.NimbusM; +import utils.val.NimbusP; +import utils.val.Product; +import utils.val.SimpleValue; +import utils.val.Vector; +import utils.val.anySizeValue; +import utils.val.siftBigANN; abstract class KVGenerator{ public WorkLoadSettings ws; diff --git a/src/main/java/couchbase/test/docgen/WorkLoadBase.java b/src/main/java/utils/docgen/WorkLoadBase.java similarity index 99% rename from src/main/java/couchbase/test/docgen/WorkLoadBase.java rename to src/main/java/utils/docgen/WorkLoadBase.java index 1ed04d0..b03c0c5 100644 --- a/src/main/java/couchbase/test/docgen/WorkLoadBase.java +++ b/src/main/java/utils/docgen/WorkLoadBase.java @@ -1,4 +1,4 @@ -package couchbase.test.docgen; +package utils.docgen; import java.time.Duration; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/couchbase/test/docgen/WorkLoadSettings.java b/src/main/java/utils/docgen/WorkLoadSettings.java similarity index 99% rename from src/main/java/couchbase/test/docgen/WorkLoadSettings.java rename to src/main/java/utils/docgen/WorkLoadSettings.java index 436c27a..999184b 100644 --- a/src/main/java/couchbase/test/docgen/WorkLoadSettings.java +++ b/src/main/java/utils/docgen/WorkLoadSettings.java @@ -1,4 +1,4 @@ -package couchbase.test.docgen; +package utils.docgen; import java.util.ArrayList; import java.util.HashMap; @@ -39,6 +39,7 @@ public class WorkLoadSettings extends WorkLoadBase { public Boolean commit_transaction; public Boolean rollback_transaction; public boolean elastic; + public boolean mongo; public String model; public boolean mockVector; public int dim; diff --git a/src/main/java/couchbase/test/docgen/anySize.java b/src/main/java/utils/docgen/anySize.java similarity index 96% rename from src/main/java/couchbase/test/docgen/anySize.java rename to src/main/java/utils/docgen/anySize.java index ca03582..85d3666 100644 --- a/src/main/java/couchbase/test/docgen/anySize.java +++ b/src/main/java/utils/docgen/anySize.java @@ -1,4 +1,4 @@ -package couchbase.test.docgen; +package utils.docgen; import java.util.List; diff --git a/src/main/java/mongo/loader/DocumentGenerator.java b/src/main/java/utils/docgen/mongo/MongoDocumentGenerator.java similarity index 94% rename from src/main/java/mongo/loader/DocumentGenerator.java rename to src/main/java/utils/docgen/mongo/MongoDocumentGenerator.java index 205b4d2..c2124eb 100644 --- a/src/main/java/mongo/loader/DocumentGenerator.java +++ b/src/main/java/utils/docgen/mongo/MongoDocumentGenerator.java @@ -1,4 +1,4 @@ -package mongo.loader; +package utils.docgen.mongo; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -10,14 +10,14 @@ import com.mongodb.client.model.InsertOneModel; -import couchbase.test.docgen.WorkLoadSettings; -import couchbase.test.key.CircularKey; -import couchbase.test.key.RandomKey; -import couchbase.test.key.RandomSizeKey; -import couchbase.test.key.ReverseKey; -import couchbase.test.key.SimpleKey; import reactor.util.function.Tuple2; import reactor.util.function.Tuples; +import utils.docgen.WorkLoadSettings; +import utils.key.CircularKey; +import utils.key.RandomKey; +import utils.key.RandomSizeKey; +import utils.key.ReverseKey; +import utils.key.SimpleKey; abstract class DocGenerator{ public WorkLoadSettings ws; @@ -44,7 +44,7 @@ else if(keyClass.equals(CircularKey.class.getSimpleName())) else this.keyInstance = SimpleKey.class; - this.valInstance = Hotel.class; + this.valInstance = MongoHotel.class; try { this.keys = keyInstance.getConstructor(WorkLoadSettings.class).newInstance(ws); @@ -123,10 +123,10 @@ void resetUpdate() { } } -public class DocumentGenerator extends DocGenerator{ +public class MongoDocumentGenerator extends DocGenerator{ boolean targetvB; - public DocumentGenerator(WorkLoadSettings ws, String keyClass, String valClass) throws ClassNotFoundException { + public MongoDocumentGenerator(WorkLoadSettings ws, String keyClass, String valClass) throws ClassNotFoundException { super(ws, keyClass, valClass); } diff --git a/src/main/java/mongo/loader/Hotel.java b/src/main/java/utils/docgen/mongo/MongoHotel.java similarity index 96% rename from src/main/java/mongo/loader/Hotel.java rename to src/main/java/utils/docgen/mongo/MongoHotel.java index e97711c..27c1158 100644 --- a/src/main/java/mongo/loader/Hotel.java +++ b/src/main/java/utils/docgen/mongo/MongoHotel.java @@ -1,4 +1,4 @@ -package mongo.loader; +package utils.docgen.mongo; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -12,9 +12,9 @@ import com.github.javafaker.Faker; -import couchbase.test.docgen.WorkLoadSettings; +import utils.docgen.WorkLoadSettings; -public class Hotel { +public class MongoHotel { Faker faker; private Random random; private ArrayList addresses = new ArrayList(); @@ -27,7 +27,7 @@ public class Hotel { private ArrayList url = new ArrayList(); private ArrayList> reviews = new ArrayList>(); - public Hotel(WorkLoadSettings ws) { + public MongoHotel(WorkLoadSettings ws) { super(); this.random = new Random(); this.random.setSeed(ws.keyPrefix.hashCode()); diff --git a/src/main/java/couchbase/test/key/CircularKey.java b/src/main/java/utils/key/CircularKey.java similarity index 77% rename from src/main/java/couchbase/test/key/CircularKey.java rename to src/main/java/utils/key/CircularKey.java index 0e0fcc1..654b82e 100644 --- a/src/main/java/couchbase/test/key/CircularKey.java +++ b/src/main/java/utils/key/CircularKey.java @@ -1,6 +1,6 @@ -package couchbase.test.key; +package utils.key; -import couchbase.test.docgen.WorkLoadSettings; +import utils.docgen.WorkLoadSettings; public class CircularKey extends RandomKey { public CircularKey() { diff --git a/src/main/java/utils/key/ColdKey.java b/src/main/java/utils/key/ColdKey.java new file mode 100644 index 0000000..28efcbf --- /dev/null +++ b/src/main/java/utils/key/ColdKey.java @@ -0,0 +1,5 @@ +package utils.key; + +public class ColdKey { + +} diff --git a/src/main/java/utils/key/HotKey.java b/src/main/java/utils/key/HotKey.java new file mode 100644 index 0000000..42dcefd --- /dev/null +++ b/src/main/java/utils/key/HotKey.java @@ -0,0 +1,5 @@ +package utils.key; + +public class HotKey { + +} diff --git a/src/main/java/couchbase/test/key/RandomKey.java b/src/main/java/utils/key/RandomKey.java similarity index 95% rename from src/main/java/couchbase/test/key/RandomKey.java rename to src/main/java/utils/key/RandomKey.java index 8b114c9..c5ec87d 100644 --- a/src/main/java/couchbase/test/key/RandomKey.java +++ b/src/main/java/utils/key/RandomKey.java @@ -1,9 +1,9 @@ -package couchbase.test.key; +package utils.key; import java.util.Locale; import java.util.Random; -import couchbase.test.docgen.WorkLoadSettings; +import utils.docgen.WorkLoadSettings; public class RandomKey extends SimpleKey{ // Value in bytes diff --git a/src/main/java/couchbase/test/key/RandomSizeKey.java b/src/main/java/utils/key/RandomSizeKey.java similarity index 54% rename from src/main/java/couchbase/test/key/RandomSizeKey.java rename to src/main/java/utils/key/RandomSizeKey.java index 6a79138..a23bbfd 100644 --- a/src/main/java/couchbase/test/key/RandomSizeKey.java +++ b/src/main/java/utils/key/RandomSizeKey.java @@ -1,4 +1,4 @@ -package couchbase.test.key; +package utils.key; public class RandomSizeKey { diff --git a/src/main/java/couchbase/test/key/ReverseKey.java b/src/main/java/utils/key/ReverseKey.java similarity index 91% rename from src/main/java/couchbase/test/key/ReverseKey.java rename to src/main/java/utils/key/ReverseKey.java index 7bd05f5..fed282d 100644 --- a/src/main/java/couchbase/test/key/ReverseKey.java +++ b/src/main/java/utils/key/ReverseKey.java @@ -1,6 +1,6 @@ -package couchbase.test.key; +package utils.key; -import couchbase.test.docgen.WorkLoadSettings; +import utils.docgen.WorkLoadSettings; public class ReverseKey { public WorkLoadSettings ws; diff --git a/src/main/java/couchbase/test/key/SimpleKey.java b/src/main/java/utils/key/SimpleKey.java similarity index 91% rename from src/main/java/couchbase/test/key/SimpleKey.java rename to src/main/java/utils/key/SimpleKey.java index e73b6f7..fd300b7 100644 --- a/src/main/java/couchbase/test/key/SimpleKey.java +++ b/src/main/java/utils/key/SimpleKey.java @@ -1,6 +1,6 @@ -package couchbase.test.key; +package utils.key; -import couchbase.test.docgen.WorkLoadSettings; +import utils.docgen.WorkLoadSettings; public class SimpleKey { public WorkLoadSettings ws; diff --git a/src/main/java/couchbase/test/taskmanager/Task.java b/src/main/java/utils/taskmanager/Task.java similarity index 92% rename from src/main/java/couchbase/test/taskmanager/Task.java rename to src/main/java/utils/taskmanager/Task.java index 0830053..06ccf9b 100644 --- a/src/main/java/couchbase/test/taskmanager/Task.java +++ b/src/main/java/utils/taskmanager/Task.java @@ -1,4 +1,4 @@ -package couchbase.test.taskmanager; +package utils.taskmanager; public abstract class Task implements Runnable{ diff --git a/src/main/java/couchbase/test/taskmanager/TaskManager.java b/src/main/java/utils/taskmanager/TaskManager.java similarity index 98% rename from src/main/java/couchbase/test/taskmanager/TaskManager.java rename to src/main/java/utils/taskmanager/TaskManager.java index 88534f7..f674ed2 100644 --- a/src/main/java/couchbase/test/taskmanager/TaskManager.java +++ b/src/main/java/utils/taskmanager/TaskManager.java @@ -1,4 +1,4 @@ -package couchbase.test.taskmanager; +package utils.taskmanager; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/couchbase/test/val/Cars.java b/src/main/java/utils/val/Cars.java similarity index 99% rename from src/main/java/couchbase/test/val/Cars.java rename to src/main/java/utils/val/Cars.java index 756efd4..9c45df8 100644 --- a/src/main/java/couchbase/test/val/Cars.java +++ b/src/main/java/utils/val/Cars.java @@ -1,4 +1,4 @@ -package couchbase.test.val; +package utils.val; import ai.djl.MalformedModelException; import ai.djl.huggingface.translator.TextEmbeddingTranslatorFactory; @@ -8,11 +8,12 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; +import utils.docgen.WorkLoadSettings; + import com.amazonaws.util.json.JSONException; import com.couchbase.client.java.json.JsonArray; import com.couchbase.client.java.json.JsonObject; import com.github.javafaker.Faker; -import couchbase.test.docgen.WorkLoadSettings; import java.awt.*; import java.io.IOException; @@ -26,7 +27,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; public class Cars { diff --git a/src/main/java/couchbase/test/dictionary/Dictionary.java b/src/main/java/utils/val/Dictionary.java similarity index 99% rename from src/main/java/couchbase/test/dictionary/Dictionary.java rename to src/main/java/utils/val/Dictionary.java index e2aa0a9..035a799 100644 --- a/src/main/java/couchbase/test/dictionary/Dictionary.java +++ b/src/main/java/utils/val/Dictionary.java @@ -1,4 +1,4 @@ -package couchbase.test.dictionary; +package couchbase.dictionary; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/couchbase/test/val/ESSiftIndex.json b/src/main/java/utils/val/ESSiftIndex.json similarity index 100% rename from src/main/java/couchbase/test/val/ESSiftIndex.json rename to src/main/java/utils/val/ESSiftIndex.json diff --git a/src/main/java/couchbase/test/val/Hotel.java b/src/main/java/utils/val/Hotel.java similarity index 99% rename from src/main/java/couchbase/test/val/Hotel.java rename to src/main/java/utils/val/Hotel.java index 8b7665d..d1c7fca 100644 --- a/src/main/java/couchbase/test/val/Hotel.java +++ b/src/main/java/utils/val/Hotel.java @@ -1,4 +1,4 @@ -package couchbase.test.val; +package utils.val; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -15,7 +15,7 @@ import com.couchbase.client.java.json.JsonObject; import com.github.javafaker.Faker; -import couchbase.test.docgen.WorkLoadSettings; +import utils.docgen.WorkLoadSettings; public class Hotel { Faker faker; diff --git a/src/main/java/couchbase/test/val/MiniCars.java b/src/main/java/utils/val/MiniCars.java similarity index 98% rename from src/main/java/couchbase/test/val/MiniCars.java rename to src/main/java/utils/val/MiniCars.java index 7b18c0b..40604a1 100644 --- a/src/main/java/couchbase/test/val/MiniCars.java +++ b/src/main/java/utils/val/MiniCars.java @@ -1,4 +1,4 @@ -package couchbase.test.val; +package utils.val; import ai.djl.MalformedModelException; import ai.djl.huggingface.translator.TextEmbeddingTranslatorFactory; @@ -8,11 +8,12 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; +import utils.docgen.WorkLoadSettings; + import com.amazonaws.util.json.JSONException; import com.couchbase.client.java.json.JsonArray; import com.couchbase.client.java.json.JsonObject; import com.github.javafaker.Faker; -import couchbase.test.docgen.WorkLoadSettings; import java.awt.*; import java.io.IOException; diff --git a/src/main/java/couchbase/test/val/NimbusM.java b/src/main/java/utils/val/NimbusM.java similarity index 97% rename from src/main/java/couchbase/test/val/NimbusM.java rename to src/main/java/utils/val/NimbusM.java index 8b935ce..dacc602 100644 --- a/src/main/java/couchbase/test/val/NimbusM.java +++ b/src/main/java/utils/val/NimbusM.java @@ -1,4 +1,4 @@ -package couchbase.test.val; +package utils.val; import java.sql.Timestamp; import java.util.ArrayList; @@ -8,7 +8,7 @@ import com.couchbase.client.java.json.JsonObject; import com.github.javafaker.Faker; -import couchbase.test.docgen.WorkLoadSettings; +import utils.docgen.WorkLoadSettings; public class NimbusM { Faker faker; diff --git a/src/main/java/couchbase/test/val/NimbusP.java b/src/main/java/utils/val/NimbusP.java similarity index 97% rename from src/main/java/couchbase/test/val/NimbusP.java rename to src/main/java/utils/val/NimbusP.java index 7c0d34b..5046205 100644 --- a/src/main/java/couchbase/test/val/NimbusP.java +++ b/src/main/java/utils/val/NimbusP.java @@ -1,4 +1,4 @@ -package couchbase.test.val; +package utils.val; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -11,7 +11,7 @@ import com.couchbase.client.java.json.JsonObject; import com.github.javafaker.Faker; -import couchbase.test.docgen.WorkLoadSettings; +import utils.docgen.WorkLoadSettings; public class NimbusP { Faker faker; diff --git a/src/main/java/couchbase/test/val/Product.java b/src/main/java/utils/val/Product.java similarity index 98% rename from src/main/java/couchbase/test/val/Product.java rename to src/main/java/utils/val/Product.java index 7e5400f..9aff26f 100644 --- a/src/main/java/couchbase/test/val/Product.java +++ b/src/main/java/utils/val/Product.java @@ -1,4 +1,4 @@ -package couchbase.test.val; +package utils.val; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -9,7 +9,7 @@ import com.couchbase.client.java.json.JsonObject; import com.github.javafaker.Faker; -import couchbase.test.docgen.WorkLoadSettings; +import utils.docgen.WorkLoadSettings; public class Product { Faker faker; diff --git a/src/main/java/couchbase/test/val/SimpleValue.java b/src/main/java/utils/val/SimpleValue.java similarity index 85% rename from src/main/java/couchbase/test/val/SimpleValue.java rename to src/main/java/utils/val/SimpleValue.java index 9e1c004..f7de4c3 100644 --- a/src/main/java/couchbase/test/val/SimpleValue.java +++ b/src/main/java/utils/val/SimpleValue.java @@ -1,19 +1,18 @@ -package couchbase.test.val; +package utils.val; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.Random; -import couchbase.test.docgen.DocType.Attributes; -import couchbase.test.docgen.DocType.Details; -import couchbase.test.docgen.DocType.Dimensions; -import couchbase.test.docgen.DocType.Hobby; -import couchbase.test.docgen.DocType.Location; -import couchbase.test.docgen.DocType.Person; -import couchbase.test.docgen.WorkLoadSettings; -import couchbase.test.dictionary.Dictionary; +import couchbase.dictionary.Dictionary; +import utils.docgen.WorkLoadSettings; +import utils.docgen.DocType.Attributes; +import utils.docgen.DocType.Details; +import utils.docgen.DocType.Dimensions; +import utils.docgen.DocType.Hobby; +import utils.docgen.DocType.Location; +import utils.docgen.DocType.Person; public class SimpleValue { public WorkLoadSettings ws; @@ -76,11 +75,6 @@ private String get_gender(Random random_obj) { return Dictionary.GENDER.get(num); } - private String get_name(Random random_obj) { - int num = random_obj.nextInt(this.randomStringLength); - return this.randomString.charAt(num) + "John"; - } - private String get_hobby(Random random_obj) { int num = random_obj.nextInt(Dictionary.HOBBY_LENGTH); return Dictionary.HOBBIES.get(num); diff --git a/src/main/java/couchbase/test/val/Vector.java b/src/main/java/utils/val/Vector.java similarity index 99% rename from src/main/java/couchbase/test/val/Vector.java rename to src/main/java/utils/val/Vector.java index 4eecc79..2f519b7 100644 --- a/src/main/java/couchbase/test/val/Vector.java +++ b/src/main/java/utils/val/Vector.java @@ -1,4 +1,4 @@ -package couchbase.test.val; +package utils.val; import java.io.IOException; import java.nio.ByteBuffer; @@ -18,8 +18,7 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; - -import couchbase.test.docgen.WorkLoadSettings; +import utils.docgen.WorkLoadSettings; public class Vector { public String[] colors = { "Abbey", "Absolute Zero", "Acadia", "Acapulco", "Acid Green", "Aero", "Aero Blue", "Affair", @@ -735,11 +734,11 @@ public void setEmbeddingsModel(String DJL_MODEL) { ZooModel model = null; try { model = criteria.loadModel(); + this.predictor = model.newPredictor(); } catch (ModelNotFoundException | MalformedModelException | IOException e) { // TODO Auto-generated catch block e.printStackTrace(); } - this.predictor = model.newPredictor(); } public static byte[] floatsToBytes(float[] floats) { diff --git a/src/main/java/couchbase/test/val/anySizeValue.java b/src/main/java/utils/val/anySizeValue.java similarity index 91% rename from src/main/java/couchbase/test/val/anySizeValue.java rename to src/main/java/utils/val/anySizeValue.java index 773cc48..245cc0d 100644 --- a/src/main/java/couchbase/test/val/anySizeValue.java +++ b/src/main/java/utils/val/anySizeValue.java @@ -1,13 +1,11 @@ -package couchbase.test.val; - -import couchbase.test.docgen.WorkLoadSettings; +package utils.val; import java.util.Locale; import java.util.Random; -import couchbase.test.docgen.anySize.Person1; +import utils.docgen.WorkLoadSettings; +import utils.docgen.anySize.Person1; -import couchbase.test.dictionary.Dictionary; public class anySizeValue { public WorkLoadSettings ws; diff --git a/src/main/java/couchbase/test/val/siftBigANN.java b/src/main/java/utils/val/siftBigANN.java similarity index 99% rename from src/main/java/couchbase/test/val/siftBigANN.java rename to src/main/java/utils/val/siftBigANN.java index 8e80798..b096cc6 100644 --- a/src/main/java/couchbase/test/val/siftBigANN.java +++ b/src/main/java/utils/val/siftBigANN.java @@ -1,4 +1,4 @@ -package couchbase.test.val; +package utils.val; import java.io.File; import java.io.FileInputStream; @@ -12,7 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.github.javafaker.Faker; -import couchbase.test.docgen.WorkLoadSettings; +import utils.docgen.WorkLoadSettings; public class siftBigANN {