GEODE-9291: Add benchmark for Zrem (#160)

geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/JedisClientManager.java

@@ -62,6 +62,11 @@ public long zadd(String key, double score, String value) {
       return jedisCluster.zadd(key, score, value);
     }
 
+    @Override
+    public long zrem(String key, String value) {
+      return jedisCluster.zrem(key, value);
+    }
+
     @Override
     public Set<String> zrange(String key, long start, long stop) {
       return jedisCluster.zrange(key, start, stop);

geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/LettuceClientManager.java

@@ -75,6 +75,11 @@ public long zadd(String key, double score, String value) {
       return redisAdvancedClusterCommands.get().zadd(key, score, value);
     }
 
+    @Override
+    public long zrem(String key, String value) {
+      return redisAdvancedClusterCommands.get().zrem(key, value);
+    }
+
     @Override
     public Set<String> zrange(String key, long start, long stop) {
       return new HashSet<>(redisAdvancedClusterCommands.get().zrange(key, start, stop));

geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/RedisClient.java

@@ -30,6 +30,8 @@ public interface RedisClient {
 
   long zadd(String key, double score, String value);
 
+  long zrem(String key, String value);
+
   Set<String> zrange(String key, long start, long stop);
 
   Set<String> zrangeByScore(String key, long start, long stop);

geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/ZaddAndZremRedisTask.java

@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geode.benchmark.redis.tasks;
+
+
+import static org.apache.geode.benchmark.redis.tasks.RedisSplitKey.toKey;
+import static org.apache.geode.benchmark.redis.tasks.RedisSplitKey.toPart;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.yardstickframework.BenchmarkConfiguration;
+import org.yardstickframework.BenchmarkDriverAdapter;
+
+import org.apache.geode.benchmark.LongRange;
+
+public class ZaddAndZremRedisTask extends BenchmarkDriverAdapter implements Serializable {
+  private static final Logger logger = LoggerFactory.getLogger(ZaddAndZremRedisTask.class);
+
+  private final RedisClientManager redisClientManager;
+  private final LongRange keyRange;
+
+  private transient LongStringCache keyCache;
+  private transient RedisClient redisClient;
+
+  public ZaddAndZremRedisTask(final RedisClientManager redisClientManager,
+      final LongRange keyRange) {
+    logger.info("Initialized: keyRange={}", keyRange);
+    this.redisClientManager = redisClientManager;
+    this.keyRange = keyRange;
+  }
+
+  @Override
+  public void setUp(final BenchmarkConfiguration cfg) throws Exception {
+    super.setUp(cfg);
+
+    keyCache = new LongStringCache(keyRange);
+    redisClient = redisClientManager.get();
+  }
+
+  private static String NEXT_KEY = "N";
+
+  @Override
+  public boolean test(final Map<Object, Object> ctx) throws Exception {
+    final long k = keyRange.random();
+
+    final String key = keyCache.valueOf(toKey(k));
+    final long score = toPart(k);
+    final String value = keyCache.valueOf(score);
+    redisClient.zadd(key, score, value);
+    redisClient.zrem(key, value);
+    return true;
+  }
+
+}

geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tests/RedisWeightedZaddAndZrangeBenchmark.java

@@ -21,7 +21,6 @@
 import static org.apache.geode.benchmark.Config.workload;
 import static org.apache.geode.benchmark.topology.Roles.CLIENT;
 
-import org.apache.geode.benchmark.redis.tasks.PrePopulateRedisHash;
 import org.apache.geode.benchmark.redis.tasks.PrePopulateRedisSortedSet;
 import org.apache.geode.benchmark.redis.tasks.ZaddRedisTask;
 import org.apache.geode.benchmark.redis.tasks.ZrangeRedisTask;

geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tests/RedisZaddAndZremBenchmark.java

@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geode.benchmark.redis.tests;
+
+import static org.apache.geode.benchmark.Config.before;
+import static org.apache.geode.benchmark.Config.workload;
+import static org.apache.geode.benchmark.topology.Roles.CLIENT;
+
+import org.apache.geode.benchmark.redis.tasks.PrePopulateRedisSortedSet;
+import org.apache.geode.benchmark.redis.tasks.ZaddAndZremRedisTask;
+import org.apache.geode.perftest.TestConfig;
+
+public class RedisZaddAndZremBenchmark extends RedisBenchmark {
+
+  @Override
+  public TestConfig configure() {
+    final TestConfig config = super.configure();
+
+    before(config, new PrePopulateRedisSortedSet(redisClientManager, keyRange), CLIENT);
+    workload(config, new ZaddAndZremRedisTask(redisClientManager, keyRange),
+        CLIENT);
+    return config;
+  }
+}