diff --git a/ndbench-api/src/main/java/com/netflix/ndbench/api/plugin/NdBenchAbstractClient.java b/ndbench-api/src/main/java/com/netflix/ndbench/api/plugin/NdBenchAbstractClient.java index 2060cf54..acf87a3f 100644 --- a/ndbench-api/src/main/java/com/netflix/ndbench/api/plugin/NdBenchAbstractClient.java +++ b/ndbench-api/src/main/java/com/netflix/ndbench/api/plugin/NdBenchAbstractClient.java @@ -32,7 +32,7 @@ * * @author vchella, pencal */ -public interface NdBenchAbstractClient { +public interface NdBenchAbstractClient { /** * Initialize the client @@ -47,7 +47,7 @@ public interface NdBenchAbstractClient { * @return * @throws Exception */ - String readSingle(final String key) throws Exception; + String readSingle(final K key) throws Exception; /** * Perform a bulk read operation given the list of keys @@ -55,7 +55,7 @@ public interface NdBenchAbstractClient { * @return * @throws Exception */ - List readBulk(final List keys) throws Exception; + List readBulk(final List keys) throws Exception; /** * Perform a single write operation @@ -63,7 +63,7 @@ public interface NdBenchAbstractClient { * @return * @throws Exception */ - W writeSingle(final String key) throws Exception; + W writeSingle(final K key) throws Exception; /** * Perform bulk write operation given the list of keys @@ -71,7 +71,7 @@ public interface NdBenchAbstractClient { * @param keys * @return */ - List writeBulk(final List keys) throws Exception; + List writeBulk(final List keys) throws Exception; /** * shutdown the client diff --git a/ndbench-api/src/main/java/com/netflix/ndbench/api/plugin/NdBenchBaseClient.java b/ndbench-api/src/main/java/com/netflix/ndbench/api/plugin/NdBenchBaseClient.java index 7bc4ce6b..28f85a26 100644 --- a/ndbench-api/src/main/java/com/netflix/ndbench/api/plugin/NdBenchBaseClient.java +++ b/ndbench-api/src/main/java/com/netflix/ndbench/api/plugin/NdBenchBaseClient.java @@ -23,26 +23,26 @@ /** * @author vchella, pencal */ -public abstract class NdBenchBaseClient implements NdBenchClient { +public abstract class NdBenchBaseClient implements NdBenchClient { @Override - public String readSingle(final String key) throws Exception { + public String readSingle(final K key) throws Exception { return null; } @Override - public String writeSingle(final String key) throws Exception { + public W writeSingle(final K key) throws Exception { return null; } @Override - public List readBulk(final List keys) throws Exception { + public List readBulk(final List keys) throws Exception { return null; } @Override - public List writeBulk(final List keys) throws Exception { + public List writeBulk(final List keys) throws Exception { return null; } diff --git a/ndbench-api/src/main/java/com/netflix/ndbench/api/plugin/NdBenchClient.java b/ndbench-api/src/main/java/com/netflix/ndbench/api/plugin/NdBenchClient.java index 55056c47..6a39d239 100644 --- a/ndbench-api/src/main/java/com/netflix/ndbench/api/plugin/NdBenchClient.java +++ b/ndbench-api/src/main/java/com/netflix/ndbench/api/plugin/NdBenchClient.java @@ -22,7 +22,7 @@ /** * @author vchella, pencal */ - public interface NdBenchClient extends NdBenchAbstractClient { + public interface NdBenchClient extends NdBenchAbstractClient { /** * Initialize the client @@ -35,21 +35,21 @@ public interface NdBenchClient extends NdBenchAbstractClient { * @return * @throws Exception */ - String readSingle(final String key) throws Exception; + String readSingle(final K key) throws Exception; /** * Perform a single write operation * @return * @throws Exception */ - String writeSingle(final String key) throws Exception; + W writeSingle(final K key) throws Exception; /** * Perform a bulk read operation * @return * @throws Exception */ - default List readBulk(final List keys) throws Exception { + default List readBulk(final List keys) throws Exception { throw new UnsupportedOperationException("bulk operation is not supported"); } @@ -58,7 +58,7 @@ default List readBulk(final List keys) throws Exception { * @return * @throws Exception */ - default List writeBulk(final List keys) throws Exception { + default List writeBulk(final List keys) throws Exception { throw new UnsupportedOperationException("bulk operation is not supported"); } diff --git a/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/cass/CJavaDriverBasePlugin.java b/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/cass/CJavaDriverBasePlugin.java index 44670e8f..0076b6bb 100644 --- a/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/cass/CJavaDriverBasePlugin.java +++ b/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/cass/CJavaDriverBasePlugin.java @@ -29,7 +29,7 @@ * @author vchella * @author Alexander Patrikalakis */ -public abstract class CJavaDriverBasePlugin implements NdBenchClient { +public abstract class CJavaDriverBasePlugin implements NdBenchClient { private static final Logger logger = LoggerFactory.getLogger(CJavaDriverBasePlugin.class); protected static final String ResultOK = "Ok"; 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 index 40c0856b..58a02902 100644 --- 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 @@ -44,7 +44,7 @@ */ @Singleton @NdBenchClientPlugin("CassAstyanaxPlugin") -public class CassAstyanaxPlugin implements NdBenchClient { +public class CassAstyanaxPlugin implements NdBenchClient { private static final Logger logger = LoggerFactory.getLogger(CassAstyanaxPlugin.class); private static final String ResultOK = "Ok"; private static final String CacheMiss = null; diff --git a/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/elassandra/ElassandraCassJavaDriverPlugin.java b/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/elassandra/ElassandraCassJavaDriverPlugin.java index 2cc76f23..fa8d0bed 100644 --- a/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/elassandra/ElassandraCassJavaDriverPlugin.java +++ b/ndbench-cass-plugins/src/main/java/com/netflix/ndbench/plugin/elassandra/ElassandraCassJavaDriverPlugin.java @@ -40,7 +40,7 @@ */ @Singleton @NdBenchClientPlugin("ElassandraCassJavaDriverPlugin") -public class ElassandraCassJavaDriverPlugin implements NdBenchClient{ +public class ElassandraCassJavaDriverPlugin implements NdBenchClient{ private static final Logger logger = LoggerFactory.getLogger(ElassandraCassJavaDriverPlugin.class); private static final String ResultOK = "Ok"; private static final String CacheMiss = null; diff --git a/ndbench-core/src/main/java/com/netflix/ndbench/core/DataBackfill.java b/ndbench-core/src/main/java/com/netflix/ndbench/core/DataBackfill.java index 5075b365..a5c07bc7 100644 --- a/ndbench-core/src/main/java/com/netflix/ndbench/core/DataBackfill.java +++ b/ndbench-core/src/main/java/com/netflix/ndbench/core/DataBackfill.java @@ -60,19 +60,19 @@ public DataBackfill(IConfiguration config) { this.config = config; } - public void backfill(final NdBenchAbstractClient client) throws Exception { + public void backfill(final NdBenchAbstractClientclient) throws Exception { backfill(client, new NormalBackfill()); } - public void conditionalBackfill(final NdBenchAbstractClient client) throws Exception { + public void conditionalBackfill(final NdBenchAbstractClientclient) throws Exception { backfill(client, new ConditionalBackfill()); } - public void verifyBackfill(final NdBenchAbstractClient client) throws Exception { + public void verifyBackfill(final NdBenchAbstractClientclient) throws Exception { backfill(client, new VerifyBackfill()); } - private void backfill(final NdBenchAbstractClient client, final BackfillOperation backfillOperation) throws Exception { + private void backfill(final NdBenchAbstractClientclient, final BackfillOperation backfillOperation) throws Exception { long start = System.currentTimeMillis(); @@ -83,11 +83,11 @@ private void backfill(final NdBenchAbstractClient client, final BackfillOpera logger.info("Backfiller latch done! in " + (System.currentTimeMillis() - start) + " ms"); } - public void backfillAsync(final NdBenchAbstractClient client) { + public void backfillAsync(final NdBenchAbstractClientclient) { backfillAsync(client, new NormalBackfill()); } - private void backfillAsync(final NdBenchAbstractClient client, final BackfillOperation backfillOperation) { + private void backfillAsync(final NdBenchAbstractClientclient, final BackfillOperation backfillOperation) { stop.set(false); //Default #Cores*4 so that we can keep the CPUs busy even while waiting on I/O @@ -166,23 +166,23 @@ public boolean getIsBackfillRunning() { return false; //Never started } - private interface BackfillOperation { - String process(final NdBenchAbstractClient client, final String key) throws Exception; + private interface BackfillOperation { + String process(final NdBenchAbstractClient client, final K key) throws Exception; } - private class NormalBackfill implements BackfillOperation { + private class NormalBackfill implements BackfillOperation { @Override - public String process(NdBenchAbstractClient client, String key) throws Exception { + public String process(NdBenchAbstractClient client, K key) throws Exception { Object result = client.writeSingle(key); return result == null ? "" : result.toString(); } } - private class ConditionalBackfill implements BackfillOperation { + private class ConditionalBackfill implements BackfillOperation { @Override - public String process(NdBenchAbstractClient client, String key) throws Exception { + public String process(NdBenchAbstractClient client, K key) throws Exception { String result = client.readSingle(key); if (result == null) { missCount.incrementAndGet(); @@ -193,10 +193,10 @@ public String process(NdBenchAbstractClient client, String key) throws Except } } - private class VerifyBackfill implements BackfillOperation { + private class VerifyBackfill implements BackfillOperation { @Override - public String process(NdBenchAbstractClient client, String key) throws Exception { + public String process(NdBenchAbstractClient client, K key) throws Exception { Object result = client.writeSingle(key); String value = client.readSingle(key); if (value == null) { diff --git a/ndbench-core/src/main/java/com/netflix/ndbench/core/NdBenchClientFactory.java b/ndbench-core/src/main/java/com/netflix/ndbench/core/NdBenchClientFactory.java index 83c71128..6ef0979d 100644 --- a/ndbench-core/src/main/java/com/netflix/ndbench/core/NdBenchClientFactory.java +++ b/ndbench-core/src/main/java/com/netflix/ndbench/core/NdBenchClientFactory.java @@ -29,15 +29,15 @@ @Singleton public class NdBenchClientFactory { - private Map> clientMap; + private Map> clientMap; @Inject - public NdBenchClientFactory(Map> driverMap) { + public NdBenchClientFactory(Map> driverMap) { this.clientMap = driverMap; } - public NdBenchAbstractClient getClient(String clientName) { - NdBenchAbstractClient client = clientMap.get(clientName); + public NdBenchAbstractClient getClient(String clientName) { + NdBenchAbstractClient client = clientMap.get(clientName); if (client == null) { throw new RuntimeException("Client not found: " + clientName); } diff --git a/ndbench-core/src/main/java/com/netflix/ndbench/core/NdBenchDriver.java b/ndbench-core/src/main/java/com/netflix/ndbench/core/NdBenchDriver.java index 11767e88..eb370544 100644 --- a/ndbench-core/src/main/java/com/netflix/ndbench/core/NdBenchDriver.java +++ b/ndbench-core/src/main/java/com/netflix/ndbench/core/NdBenchDriver.java @@ -75,8 +75,8 @@ public class NdBenchDriver { private final AtomicReference timerRef = new AtomicReference(null); private final RPSCount rpsCount; - private final AtomicReference> clientRef = - new AtomicReference>(null); + private final AtomicReference> clientRef = + new AtomicReference>(null); private final AtomicReference keyGeneratorWriteRef = new AtomicReference<>(null); private final AtomicReference keyGeneratorReadRef = new AtomicReference<>(null); @@ -334,19 +334,7 @@ public void stopOperation(AtomicReference tpRef) { logger.info("Threadpool has terminated!"); } - public interface NdBenchOperation { - boolean process(NdBenchDriver driver, - NdBenchMonitor monitor, - List keys, - AtomicReference rateLimiter, - boolean isAutoTuneEnabled); - - boolean isReadType(); - - boolean isWriteType(); - } - - public void init(NdBenchAbstractClient client) throws Exception { + public void init(NdBenchAbstractClient client) throws Exception { if (!clientInited.get()) { try { if (clientInited.compareAndSet(false, true)) { @@ -434,22 +422,22 @@ public void shutdownClient() throws Exception { } } - public String readSingle(String key) throws Exception { - try { - return clientRef.get().readSingle(key); - } catch (Exception e) { - logger.error("FAILED readSingle ", e); - throw e; - } - } - - - public String writeSingle(String key) throws Exception { - Object result = clientRef.get().writeSingle(key); - return result == null ? "" : result.toString(); - } - - public NdBenchAbstractClient getClient() { +// public String readSingle(String key) throws Exception { +// try { +// return clientRef.get().readSingle(key); +// } catch (Exception e) { +// logger.error("FAILED readSingle ", e); +// throw e; +// } +// } +// +// +// public String writeSingle(String key) throws Exception { +// Object result = clientRef.get().writeSingle(key); +// return result == null ? "" : result.toString(); +// } + + public NdBenchAbstractClient getClient() { return clientRef.get(); } diff --git a/ndbench-core/src/main/java/com/netflix/ndbench/core/NdBenchOperation.java b/ndbench-core/src/main/java/com/netflix/ndbench/core/NdBenchOperation.java new file mode 100644 index 00000000..74a24338 --- /dev/null +++ b/ndbench-core/src/main/java/com/netflix/ndbench/core/NdBenchOperation.java @@ -0,0 +1,20 @@ +package com.netflix.ndbench.core; + +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; + +import com.google.common.util.concurrent.RateLimiter; + +import com.netflix.ndbench.api.plugin.NdBenchMonitor; + +public interface NdBenchOperation { + boolean process(NdBenchDriver driver, + NdBenchMonitor monitor, + List keys, + AtomicReference rateLimiter, + boolean isAutoTuneEnabled); + + boolean isReadType(); + + boolean isWriteType(); + } \ No newline at end of file diff --git a/ndbench-core/src/main/java/com/netflix/ndbench/core/defaultimpl/NdBenchClientModule.java b/ndbench-core/src/main/java/com/netflix/ndbench/core/defaultimpl/NdBenchClientModule.java index bb880616..e153be33 100644 --- a/ndbench-core/src/main/java/com/netflix/ndbench/core/defaultimpl/NdBenchClientModule.java +++ b/ndbench-core/src/main/java/com/netflix/ndbench/core/defaultimpl/NdBenchClientModule.java @@ -43,7 +43,7 @@ public class NdBenchClientModule extends AbstractModule { private static final Logger logger = LoggerFactory.getLogger(NdBenchClientModule.class); - private MapBinder> maps; + private MapBinder> maps; private String getAnnotationValue(Class ndBenchClientImpl) { String name = ndBenchClientImpl.getName(); @@ -61,7 +61,7 @@ private void installNdBenchClientPlugin(Class ndBenchClientImpl) { if (maps == null) { TypeLiteral stringTypeLiteral = new TypeLiteral() { }; - TypeLiteral> ndbClientTypeLiteral = (new TypeLiteral>() { + TypeLiteral> ndbClientTypeLiteral = (new TypeLiteral>() { }); maps = MapBinder.newMapBinder(binder(), stringTypeLiteral, ndbClientTypeLiteral); } @@ -69,7 +69,7 @@ private void installNdBenchClientPlugin(Class ndBenchClientImpl) { String name = getAnnotationValue(ndBenchClientImpl); - maps.addBinding(name).to((Class>) ndBenchClientImpl); + maps.addBinding(name).to((Class>) ndBenchClientImpl); } @Override 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 index c05a8409..11846cb7 100644 --- 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 @@ -21,6 +21,8 @@ import com.netflix.ndbench.api.plugin.NdBenchAbstractClient; import com.netflix.ndbench.api.plugin.NdBenchMonitor; import com.netflix.ndbench.core.NdBenchDriver; +import com.netflix.ndbench.core.NdBenchOperation; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,19 +33,20 @@ /** * @author vchella */ -public class ReadOperation implements NdBenchDriver.NdBenchOperation { +public class ReadOperation implements NdBenchOperation +{ private static final Logger logger = LoggerFactory.getLogger(ReadOperation.class); - private final NdBenchAbstractClient client; + private final NdBenchAbstractClient client; - public ReadOperation(NdBenchAbstractClient pClient) { + public ReadOperation(NdBenchAbstractClient pClient) { client = pClient; } @Override public boolean process(NdBenchDriver driver, NdBenchMonitor monitor, - List keys, + List keys, AtomicReference ignoredForNow, boolean isAutoTuneEnabled) { try { 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 index 5b267184..ea5308ef 100644 --- 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 @@ -21,6 +21,8 @@ import com.netflix.ndbench.api.plugin.NdBenchAbstractClient; import com.netflix.ndbench.api.plugin.NdBenchMonitor; import com.netflix.ndbench.core.NdBenchDriver; +import com.netflix.ndbench.core.NdBenchOperation; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,19 +35,20 @@ * * @author vchella, pencal */ -public class WriteOperation implements NdBenchDriver.NdBenchOperation { +public class WriteOperation implements NdBenchOperation +{ private static final Logger logger = LoggerFactory.getLogger(WriteOperation.class); - private final NdBenchAbstractClient client; + private final NdBenchAbstractClient client; - public WriteOperation(NdBenchAbstractClient pClient) { + public WriteOperation(NdBenchAbstractClient pClient) { this.client = pClient; } @Override public boolean process(NdBenchDriver driver, NdBenchMonitor stats, - List keys, + List keys, AtomicReference rateLimiter, boolean isAutoTuneEnabled) { try { diff --git a/ndbench-core/src/main/java/com/netflix/ndbench/core/resources/NdBenchResource.java b/ndbench-core/src/main/java/com/netflix/ndbench/core/resources/NdBenchResource.java index c068fb0b..98a810bd 100644 --- a/ndbench-core/src/main/java/com/netflix/ndbench/core/resources/NdBenchResource.java +++ b/ndbench-core/src/main/java/com/netflix/ndbench/core/resources/NdBenchResource.java @@ -100,7 +100,7 @@ public Response startDataFill() throws Exception { logger.info("Starting NdBench data fill"); try { - NdBenchAbstractClient client = ndBenchDriver.getClient(); + NdBenchAbstractClient client = ndBenchDriver.getClient(); dataBackfill.backfill(client); return sendSuccessResponse("data fill done!"); } catch (Exception e) { @@ -117,7 +117,7 @@ public Response startDataFillAsync() throws Exception { logger.info("Starting NdBench data fill - Async"); try { - NdBenchAbstractClient client = ndBenchDriver.getClient(); + NdBenchAbstractClient client = ndBenchDriver.getClient(); dataBackfill.backfillAsync(client); return sendSuccessResponse( "Async data fill started !"); } catch (Exception e) { @@ -134,7 +134,7 @@ public Response conditionalBackfill() throws Exception { logger.info("Starting NdBench data fill"); try { - NdBenchAbstractClient client = ndBenchDriver.getClient(); + NdBenchAbstractClient client = ndBenchDriver.getClient(); dataBackfill.conditionalBackfill(client); return sendSuccessResponse("data fill done!"); } catch (Exception e) { @@ -151,7 +151,7 @@ public Response verifyBackfill() throws Exception { logger.info("Starting NdBench data fill"); try { - NdBenchAbstractClient client = ndBenchDriver.getClient(); + NdBenchAbstractClient client = ndBenchDriver.getClient(); dataBackfill.verifyBackfill(client); return sendSuccessResponse("data fill done!"); } catch (Exception e) { @@ -200,7 +200,7 @@ public Response shutdownDataFill() throws Exception { @Produces(MediaType.APPLICATION_JSON) public Response init(@PathParam("client") String clientName) throws Exception { try { - NdBenchAbstractClient client = clientFactory.getClient(clientName); + NdBenchAbstractClient client = clientFactory.getClient(clientName); ndBenchDriver.init(client); return sendSuccessResponse("NdBench client initiated!"); @@ -340,7 +340,7 @@ public Response stop() throws Exception { public Response readSingle(@PathParam("key") String key) throws Exception { try { - String value = ndBenchDriver.readSingle(key); + String value = "";//ndBenchDriver.readSingle(key); return sendSuccessResponse(value); } catch (Exception e) { @@ -355,7 +355,7 @@ public Response readSingle(@PathParam("key") String key) throws Exception { public Response writeSingle(@PathParam("key") String key) throws Exception { try { - String result = ndBenchDriver.writeSingle(key); + String result = "";//ndBenchDriver.writeSingle(key); return sendSuccessResponse(result); } catch (Exception e) { @@ -453,7 +453,7 @@ public Response getServerStatus() throws Exception { serverStatusJson.put("LoadPatterns", Arrays.asList(LoadPattern.values())); String currentRunningDriver="NA",connectionInfo="NA", currentWriteLoadPattern="NA", currentReadLoadPattern="NA"; - NdBenchAbstractClient NdBenchClient= ndBenchDriver.getClient(); + NdBenchAbstractClient NdBenchClient= ndBenchDriver.getClient(); if(NdBenchClient!=null) { @@ -507,7 +507,7 @@ public Response getServerStatus() throws Exception { public Response runWorkflow() throws Exception { try { - NdBenchAbstractClient client = ndBenchDriver.getClient(); + NdBenchAbstractClient client = ndBenchDriver.getClient(); return sendSuccessResponse(client.runWorkFlow()); } catch (Exception e) { logger.error("Error in running workflow", e); diff --git a/ndbench-dax-plugins/src/main/java/com/netflix/ndbench/plugin/dax/DaxKeyValue.java b/ndbench-dax-plugins/src/main/java/com/netflix/ndbench/plugin/dax/DaxKeyValue.java index 49b0b602..5e4673d9 100644 --- a/ndbench-dax-plugins/src/main/java/com/netflix/ndbench/plugin/dax/DaxKeyValue.java +++ b/ndbench-dax-plugins/src/main/java/com/netflix/ndbench/plugin/dax/DaxKeyValue.java @@ -37,7 +37,7 @@ @Singleton @NdBenchClientPlugin("DaxKeyValue") -public class DaxKeyValue extends DynamoDBKeyValueBase implements NdBenchClient { +public class DaxKeyValue extends DynamoDBKeyValueBase implements NdBenchClient { private static final Logger logger = LoggerFactory.getLogger(DaxKeyValue.class); /** diff --git a/ndbench-dynamodb-plugins/src/main/java/com/netflix/ndbench/plugin/dynamodb/DynamoDBKeyValue.java b/ndbench-dynamodb-plugins/src/main/java/com/netflix/ndbench/plugin/dynamodb/DynamoDBKeyValue.java index ff5cd224..18ce9251 100644 --- a/ndbench-dynamodb-plugins/src/main/java/com/netflix/ndbench/plugin/dynamodb/DynamoDBKeyValue.java +++ b/ndbench-dynamodb-plugins/src/main/java/com/netflix/ndbench/plugin/dynamodb/DynamoDBKeyValue.java @@ -54,7 +54,7 @@ */ @Singleton @NdBenchClientPlugin("DynamoDBKeyValue") -public class DynamoDBKeyValue extends DynamoDBKeyValueBase implements NdBenchClient { +public class DynamoDBKeyValue extends DynamoDBKeyValueBase implements NdBenchClient { private static final Logger logger = LoggerFactory.getLogger(DynamoDBKeyValue.class); /** diff --git a/ndbench-dynamodb-plugins/src/main/java/com/netflix/ndbench/plugin/dynamodb/DynamoDBKeyValueBase.java b/ndbench-dynamodb-plugins/src/main/java/com/netflix/ndbench/plugin/dynamodb/DynamoDBKeyValueBase.java index 75af9525..901d8fef 100644 --- a/ndbench-dynamodb-plugins/src/main/java/com/netflix/ndbench/plugin/dynamodb/DynamoDBKeyValueBase.java +++ b/ndbench-dynamodb-plugins/src/main/java/com/netflix/ndbench/plugin/dynamodb/DynamoDBKeyValueBase.java @@ -44,7 +44,7 @@ /** * Base class with shared fields among the various implementations of NdBenchClient. */ -public abstract class DynamoDBKeyValueBase implements NdBenchClient { +public abstract class DynamoDBKeyValueBase implements NdBenchClient { private static final Logger logger = LoggerFactory.getLogger(DynamoDBKeyValueBase.class); private static final boolean DO_HONOR_MAX_ERROR_RETRY_IN_CLIENT_CONFIG = true; diff --git a/ndbench-dynamodb-plugins/src/main/java/com/netflix/ndbench/plugin/dynamodb/DynamoDBProgrammaticKeyValue.java b/ndbench-dynamodb-plugins/src/main/java/com/netflix/ndbench/plugin/dynamodb/DynamoDBProgrammaticKeyValue.java index 98ca489b..9f8bcfe7 100644 --- a/ndbench-dynamodb-plugins/src/main/java/com/netflix/ndbench/plugin/dynamodb/DynamoDBProgrammaticKeyValue.java +++ b/ndbench-dynamodb-plugins/src/main/java/com/netflix/ndbench/plugin/dynamodb/DynamoDBProgrammaticKeyValue.java @@ -67,7 +67,7 @@ */ @Singleton @NdBenchClientPlugin("DynamoDBProgrammaticKeyValue") -public class DynamoDBProgrammaticKeyValue extends DynamoDBKeyValueBase implements NdBenchClient { +public class DynamoDBProgrammaticKeyValue extends DynamoDBKeyValueBase implements NdBenchClient { private static final Logger logger = LoggerFactory.getLogger(DynamoDBProgrammaticKeyValue.class); private static final String ND_BENCH_DYNAMO_DB_CONSUMED_RCU = "ConsumedRcuHighRes"; private static final String ND_BENCH_DYNAMO_DB_CONSUMED_WCU = "ConsumedWcuHighRes"; 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 index b7940525..b7396ad8 100644 --- 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 @@ -35,7 +35,7 @@ */ @Singleton @NdBenchClientPlugin("DynoJedis") -public class DynoJedis implements NdBenchClient { +public class DynoJedis implements NdBenchClient { private static final Logger logger = LoggerFactory.getLogger(DynoJedis.class); private static final String ResultOK = "Ok"; 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 index 0f37c2b4..d1967cdb 100644 --- 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 @@ -44,7 +44,7 @@ @Singleton @NdBenchClientPlugin("DynoExtFunc") -public class DynoJedisExtFunc extends NdBenchBaseClient { +public class DynoJedisExtFunc extends NdBenchBaseClient { private final Logger logger = LoggerFactory.getLogger(DynoJedisExtFunc.class); private static final int MIN_PIPE_KEYS = 3; diff --git a/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisGetSetPipeline.java b/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisGetSetPipeline.java index f8c890bc..7395a3ba 100644 --- a/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisGetSetPipeline.java +++ b/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisGetSetPipeline.java @@ -38,7 +38,7 @@ */ @Singleton @NdBenchClientPlugin("DynoGetSetPipeline") -public class DynoJedisGetSetPipeline implements NdBenchClient { +public class DynoJedisGetSetPipeline implements NdBenchClient { private static final Logger logger = LoggerFactory.getLogger(DynoJedisGetSetPipeline.class); private static final int MIN_PIPE_KEYS = 3; diff --git a/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisHashPipeline.java b/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisHashPipeline.java index 1da0cb3c..6a757324 100644 --- a/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisHashPipeline.java +++ b/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/dyno/DynoJedisHashPipeline.java @@ -38,7 +38,7 @@ */ @Singleton @NdBenchClientPlugin("DynoHashPipeline") -public class DynoJedisHashPipeline implements NdBenchClient { +public class DynoJedisHashPipeline implements NdBenchClient { private static final Logger logger = LoggerFactory.getLogger(DynoJedisHashPipeline.class); diff --git a/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/local/dynomite/proxy/LocalDynomiteProxyPlugin.java b/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/local/dynomite/proxy/LocalDynomiteProxyPlugin.java index 8861ac6b..35610eec 100644 --- a/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/local/dynomite/proxy/LocalDynomiteProxyPlugin.java +++ b/ndbench-dyno-plugins/src/main/java/com/netflix/ndbench/plugin/local/dynomite/proxy/LocalDynomiteProxyPlugin.java @@ -38,7 +38,7 @@ */ @Singleton @NdBenchClientPlugin("LocalDynomiteProxyPlugin") -public class LocalDynomiteProxyPlugin implements NdBenchClient{ +public class LocalDynomiteProxyPlugin implements NdBenchClient{ private static final Logger logger = LoggerFactory.getLogger(DynoJedis.class); private static final String ResultOK = "Ok"; 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 index 3cd15e46..68f70c66 100644 --- 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 @@ -39,7 +39,7 @@ @Singleton @NdBenchClientPlugin("ES_REST") -public class EsRestPlugin implements NdBenchAbstractClient { +public class EsRestPlugin implements NdBenchAbstractClient { static final String RESULT_OK = "Ok"; public static final int MAX_INDEX_ROLLS_PER_HOUR = 60; diff --git a/ndbench-geode-plugins/src/main/java/com/netflix/ndbench/plugin/geode/GeodeCloudPlugin.java b/ndbench-geode-plugins/src/main/java/com/netflix/ndbench/plugin/geode/GeodeCloudPlugin.java index 958bea1d..97384696 100644 --- a/ndbench-geode-plugins/src/main/java/com/netflix/ndbench/plugin/geode/GeodeCloudPlugin.java +++ b/ndbench-geode-plugins/src/main/java/com/netflix/ndbench/plugin/geode/GeodeCloudPlugin.java @@ -39,7 +39,7 @@ @Singleton @NdBenchClientPlugin("GeodeCloudPlugin") -public class GeodeCloudPlugin implements NdBenchClient{ +public class GeodeCloudPlugin implements NdBenchClient{ private static final Logger logger = LoggerFactory.getLogger(GeodeCloudPlugin.class); private final PropertyFactory propertyFactory; diff --git a/ndbench-janusgraph-plugins/src/main/java/com/netflix/ndbench/plugin/janusgraph/JanusGraphPluginCQL.java b/ndbench-janusgraph-plugins/src/main/java/com/netflix/ndbench/plugin/janusgraph/JanusGraphPluginCQL.java index 8682ddfc..74c6588b 100644 --- a/ndbench-janusgraph-plugins/src/main/java/com/netflix/ndbench/plugin/janusgraph/JanusGraphPluginCQL.java +++ b/ndbench-janusgraph-plugins/src/main/java/com/netflix/ndbench/plugin/janusgraph/JanusGraphPluginCQL.java @@ -47,7 +47,7 @@ */ @Singleton @NdBenchClientPlugin("janusgraph-cql") -public class JanusGraphPluginCQL extends JanusGraphBasePlugin implements NdBenchClient { +public class JanusGraphPluginCQL extends JanusGraphBasePlugin implements NdBenchClient { private static final Logger logger = LoggerFactory.getLogger(JanusGraphPluginCQL.class); private static String BACKEND = "cql"; diff --git a/ndbench-sample-plugins/src/main/java/com/netflix/ndbench/plugin/sample/InMemoryTestPlugin.java b/ndbench-sample-plugins/src/main/java/com/netflix/ndbench/plugin/sample/InMemoryTestPlugin.java index e2b2391e..608bf78c 100644 --- a/ndbench-sample-plugins/src/main/java/com/netflix/ndbench/plugin/sample/InMemoryTestPlugin.java +++ b/ndbench-sample-plugins/src/main/java/com/netflix/ndbench/plugin/sample/InMemoryTestPlugin.java @@ -33,10 +33,10 @@ */ @Singleton @NdBenchClientPlugin("InMemoryTest") -public class InMemoryTestPlugin implements NdBenchClient{ +public class InMemoryTestPlugin implements NdBenchClient{ private static final Logger logger = LoggerFactory.getLogger(InMemoryTestPlugin.class); - private final Map data = Maps.newConcurrentMap(); + private final Map data = Maps.newConcurrentMap(); private DataGenerator dataGenerator; private static final String ResultOK = "Ok"; @@ -63,7 +63,7 @@ public void init(DataGenerator dataGenerator) throws Exception { * @throws Exception */ @Override - public String readSingle(String key) throws Exception { + public String readSingle(K key) throws Exception { String res = data.get(key); if(res!=null) { @@ -76,7 +76,6 @@ public String readSingle(String key) throws Exception { { return CacheMiss; } - return ResultOK; } @@ -88,9 +87,9 @@ public String readSingle(String key) throws Exception { * @throws Exception */ @Override - public String writeSingle(String key) throws Exception { + public W writeSingle(K key) throws Exception { data.put(key, this.dataGenerator.getRandomValue()); - return ResultOK; + return (W)ResultOK; } /** @@ -98,7 +97,7 @@ public String writeSingle(String key) throws Exception { * @return a list of response codes * @throws Exception */ - public List readBulk(final List keys) throws Exception { + public List readBulk(final List keys) throws Exception { throw new UnsupportedOperationException("bulk operation is not supported"); } @@ -107,7 +106,7 @@ public List readBulk(final List keys) throws Exception { * @return a list of response codes * @throws Exception */ - public List writeBulk(final List keys) throws Exception { + public List writeBulk(final List keys) throws Exception { throw new UnsupportedOperationException("bulk operation is not supported"); }