Merge pull request #27 from couchbaselabs/feature/refactoring

Refactoring the code for better maintainability.

src/main/java/couchbase/test/sdk/Loader.java → 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);

src/main/java/mongo/loader/MongoLoader.java → 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();
         }

src/main/java/couchbase/test/sdk/SIFTLoader.java → 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);

src/main/java/couchbase/test/loadgen/TransactionWorkLoadGenerate.java → 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;

src/main/java/couchbase/test/loadgen/WorkLoadGenerate.java → 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;

src/main/java/couchbase/test/rest/RestClient.java → 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;

src/main/java/couchbase/test/sdk/DocOps.java → 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 {
 

src/main/java/couchbase/test/sdk/Result.java → src/main/java/couchbase/sdk/Result.java

@@ -1,4 +1,4 @@
-package couchbase.test.sdk;
+package couchbase.sdk;
 
 import reactor.util.annotation.Nullable;
 

src/main/java/couchbase/test/sdk/SDKClient.java → 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;

src/main/java/couchbase/test/sdk/SDKClientPool.java → 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;

src/main/java/couchbase/test/sdk/Server.java → src/main/java/couchbase/sdk/Server.java

@@ -1,4 +1,4 @@
-package couchbase.test.sdk;
+package couchbase.sdk;
 
 public class Server {
     public String ip;

src/main/java/couchbase/test/transactions/SimpleTransaction.java → 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;

src/main/java/couchbase/test/transactions/Transaction.java → 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;

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;
 	}
 }

src/main/java/mongo/loader/WorkLoadGenerate.java → 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;

src/main/java/mongo/loader/MongoSDKClient.java → 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 {
 

src/main/java/couchbase/test/docgen/DRConstants.java → 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";

src/main/java/couchbase/test/docgen/DocRange.java → 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;

src/main/java/couchbase/test/docgen/DocType.java → src/main/java/utils/docgen/DocType.java

@@ -1,4 +1,4 @@
-package couchbase.test.docgen;
+package utils.docgen;
 
 import java.util.List;
 

src/main/java/couchbase/test/docgen/DocumentGenerator.java → src/main/java/utils/docgen/DocumentGenerator.java

@@ -1,28 +1,29 @@
-package couchbase.test.docgen;
+package utils.docgen;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 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;

src/main/java/couchbase/test/docgen/WorkLoadBase.java → 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;

src/main/java/couchbase/test/docgen/WorkLoadSettings.java → 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;