Issue Netflix#57 - addressed review comments

pencal · Dec 11, 2017 · 66618ec · 66618ec
1 parent 4e66606
commit 66618ec
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 158 deletions.
diff --git a/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/cass/CassAstyanaxPlugin.java b/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/cass/CassAstyanaxPlugin.java
@@ -190,12 +190,7 @@ public void shutdown() throws Exception {
      * @throws Exception
      */
     public List<String> readBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = readSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**
@@ -204,12 +199,7 @@ public List<String> readBulk(final List<String> keys) throws Exception {
      * @throws Exception
      */
     public List<String> writeBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = writeSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**

diff --git a/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/cass/CassJavaDriverBatch.java b/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/cass/CassJavaDriverBatch.java
@@ -132,12 +132,7 @@ public String writeSingle(String key) throws Exception {
      * @throws Exception
      */
     public List<String> readBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = readSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**
@@ -146,12 +141,7 @@ public List<String> readBulk(final List<String> keys) throws Exception {
      * @throws Exception
      */
     public List<String> writeBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = writeSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     private BoundStatement getBStmtTable1(String key) {

diff --git a/...nch-cass-plugins/src/main/java/com/netflix/ndbench/plugin/cass/CassJavaDriverGeneric.java b/...nch-cass-plugins/src/main/java/com/netflix/ndbench/plugin/cass/CassJavaDriverGeneric.java
@@ -73,12 +73,7 @@ public String writeSingle(String key) throws Exception {
      * @throws Exception
      */
     public List<String> readBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = readSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**
@@ -87,12 +82,7 @@ public List<String> readBulk(final List<String> keys) throws Exception {
      * @throws Exception
      */
     public List<String> writeBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = writeSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     @Override

diff --git a/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/cass/CassJavaDriverPlugin.java b/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/cass/CassJavaDriverPlugin.java
@@ -150,12 +150,7 @@ public String writeSingle(String key) throws Exception {
      * @throws Exception
      */
     public List<String> readBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = readSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**
@@ -164,12 +159,7 @@ public List<String> readBulk(final List<String> keys) throws Exception {
      * @throws Exception
      */
     public List<String> writeBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = writeSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**

diff --git a/...s/src/main/java/com/netflix/ndbench/plugin/elassandra/ElassandraCassJavaDriverPlugin.java b/...s/src/main/java/com/netflix/ndbench/plugin/elassandra/ElassandraCassJavaDriverPlugin.java
@@ -136,12 +136,7 @@ public String writeSingle(String key) throws Exception {
      * @throws Exception
      */
     public List<String> readBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = readSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**
@@ -150,12 +145,7 @@ public List<String> readBulk(final List<String> keys) throws Exception {
      * @throws Exception
      */
     public List<String> writeBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = writeSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**

diff --git a/ndbench-core/src/main/java/com/netflix/ndbench/core/operations/ReadOperation.java b/ndbench-core/src/main/java/com/netflix/ndbench/core/operations/ReadOperation.java
@@ -24,6 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -47,7 +48,14 @@ public boolean process(NdBenchDriver driver,
                            boolean isAutoTuneEnabled) {
         try {
             Long startTime = System.nanoTime();
-            List<String> value = client.readBulk(keys);
+            List<String> value = new ArrayList<>(keys.size());
+            if (keys.size() > 1) {
+                // bulk
+                value.addAll(client.readBulk(keys));
+            } else {
+                // single
+                value.add(client.readSingle(keys.get(0)));
+            }
             monitor.recordReadLatency((System.nanoTime() - startTime)/1000);
             if (value != null) {
                 monitor.incCacheHit();

diff --git a/ndbench-core/src/main/java/com/netflix/ndbench/core/operations/WriteOperation.java b/ndbench-core/src/main/java/com/netflix/ndbench/core/operations/WriteOperation.java
@@ -24,6 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -49,7 +50,15 @@ public boolean process(NdBenchDriver driver,
                            boolean isAutoTuneEnabled) {
         try {
             Long startTime = System.nanoTime();
-            List<W> result = client.writeBulk(keys);
+            List<W> result;
+            if (keys.size() > 1) {
+                // bulk
+                result = client.writeBulk(keys);
+            } else {
+                // single
+                result = new ArrayList<>(1);
+                result.add(client.writeSingle(keys.get(0)));
+            }
             stats.recordWriteLatency((System.nanoTime() - startTime)/1000);
 
             if (isAutoTuneEnabled) {

diff --git a/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedis.java b/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedis.java
@@ -115,12 +115,7 @@ public String writeSingle(String key) throws Exception {
      * @throws Exception
      */
     public List<String> readBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = readSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**
@@ -129,12 +124,7 @@ public List<String> readBulk(final List<String> keys) throws Exception {
      * @throws Exception
      */
     public List<String> writeBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = writeSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**

diff --git a/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisExtFunc.java b/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisExtFunc.java
@@ -131,12 +131,7 @@ public String writeSingle(String key) throws Exception {
      * @throws Exception
      */
     public List<String> readBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = readSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**
@@ -145,12 +140,7 @@ public List<String> readBulk(final List<String> keys) throws Exception {
      * @throws Exception
      */
     public List<String> writeBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = writeSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     @Override

diff --git a/...h-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisGetSetPipeline.java b/...h-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisGetSetPipeline.java
@@ -117,12 +117,7 @@ public String writeSingle(String key) throws Exception {
      * @throws Exception
      */
     public List<String> readBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = readSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**
@@ -131,12 +126,7 @@ public List<String> readBulk(final List<String> keys) throws Exception {
      * @throws Exception
      */
     public List<String> writeBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = writeSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
 }
diff --git a/...nch-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisHashPipeline.java b/...nch-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisHashPipeline.java
@@ -98,12 +98,7 @@ public String writeSingle(String key) throws Exception {
      * @throws Exception
      */
     public List<String> readBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = readSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**
@@ -112,12 +107,7 @@ public List<String> readBulk(final List<String> keys) throws Exception {
      * @throws Exception
      */
     public List<String> writeBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = writeSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     @Override

diff --git a/...c/main/java/com/netflix/ndbench/plugin/local/dynomite/proxy/LocalDynomiteProxyPlugin.java b/...c/main/java/com/netflix/ndbench/plugin/local/dynomite/proxy/LocalDynomiteProxyPlugin.java
@@ -132,12 +132,7 @@ public String writeSingle(String key) throws Exception {
      * @throws Exception
      */
     public List<String> readBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = readSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**
@@ -146,12 +141,7 @@ public List<String> readBulk(final List<String> keys) throws Exception {
      * @throws Exception
      */
     public List<String> writeBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = writeSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**

diff --git a/ndbench-es-plugins/src/main/java/com/netflix/ndbench/plugin/es/EsRestPlugin.java b/ndbench-es-plugins/src/main/java/com/netflix/ndbench/plugin/es/EsRestPlugin.java
@@ -188,12 +188,7 @@ public String readSingle(String key) throws Exception {
      * @throws Exception
      */
     public List<String> readBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = readSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**
@@ -202,12 +197,7 @@ public List<String> readBulk(final List<String> keys) throws Exception {
      * @throws Exception
      */
     public List<WriteResult> writeBulk(final List<String> keys) throws Exception {
-        List<WriteResult> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            WriteResult response = writeSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     @Override

diff --git a/ndbench-geode-plugins/src/main/java/com/netflix/ndbench/geode/plugin/GeodeCloudPlugin.java b/ndbench-geode-plugins/src/main/java/com/netflix/ndbench/geode/plugin/GeodeCloudPlugin.java
@@ -115,12 +115,7 @@ public String writeSingle(final String key) throws Exception {
      * @throws Exception
      */
     public List<String> readBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = readSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
     /**
@@ -129,12 +124,7 @@ public List<String> readBulk(final List<String> keys) throws Exception {
      * @throws Exception
      */
     public List<String> writeBulk(final List<String> keys) throws Exception {
-        List<String> responses = new ArrayList<>(keys.size());
-        for (String key : keys) {
-            String response = writeSingle(key);
-            responses.add(response);
-        }
-        return responses;
+        throw new UnsupportedOperationException("bulk operation is not supported");
     }
 
   public void shutdown() throws Exception {