You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by do...@apache.org on 2021/11/05 15:02:17 UTC
[geode-benchmarks] branch develop updated: GEODE-9291: Add
benchmark for Zrem (#160)
This is an automated email from the ASF dual-hosted git repository.
donalevans pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/develop by this push:
new df05773 GEODE-9291: Add benchmark for Zrem (#160)
df05773 is described below
commit df05773d4994bcd95973e88af2b2ea473e88d711
Author: Eric Zoerner <zo...@vmware.com>
AuthorDate: Fri Nov 5 08:02:13 2021 -0700
GEODE-9291: Add benchmark for Zrem (#160)
---
.../benchmark/redis/tasks/JedisClientManager.java | 5 ++
.../redis/tasks/LettuceClientManager.java | 5 ++
.../geode/benchmark/redis/tasks/RedisClient.java | 2 +
.../redis/tasks/ZaddAndZremRedisTask.java | 72 ++++++++++++++++++++++
.../tests/RedisWeightedZaddAndZrangeBenchmark.java | 1 -
...nchmark.java => RedisZaddAndZremBenchmark.java} | 15 ++---
6 files changed, 88 insertions(+), 12 deletions(-)
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/JedisClientManager.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/JedisClientManager.java
index e193dbf..a4d6ef4 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/JedisClientManager.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/JedisClientManager.java
@@ -63,6 +63,11 @@ public final class JedisClientManager implements RedisClientManager {
}
@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);
}
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/LettuceClientManager.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/LettuceClientManager.java
index 93bae98..012220a 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/LettuceClientManager.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/LettuceClientManager.java
@@ -76,6 +76,11 @@ public final class LettuceClientManager implements RedisClientManager {
}
@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));
}
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/RedisClient.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/RedisClient.java
index bbd188f..cf796f3 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/RedisClient.java
+++ b/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);
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/ZaddAndZremRedisTask.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/ZaddAndZremRedisTask.java
new file mode 100644
index 0000000..3cbc20e
--- /dev/null
+++ b/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;
+ }
+
+}
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tests/RedisWeightedZaddAndZrangeBenchmark.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tests/RedisWeightedZaddAndZrangeBenchmark.java
index 3f1da6d..0838ab7 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tests/RedisWeightedZaddAndZrangeBenchmark.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tests/RedisWeightedZaddAndZrangeBenchmark.java
@@ -21,7 +21,6 @@ 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.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;
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tests/RedisWeightedZaddAndZrangeBenchmark.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tests/RedisZaddAndZremBenchmark.java
similarity index 69%
copy from geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tests/RedisWeightedZaddAndZrangeBenchmark.java
copy to geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tests/RedisZaddAndZremBenchmark.java
index 3f1da6d..b347548 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tests/RedisWeightedZaddAndZrangeBenchmark.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tests/RedisZaddAndZremBenchmark.java
@@ -21,26 +21,19 @@ 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.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;
-import org.apache.geode.benchmark.tasks.WeightedTasks;
-import org.apache.geode.benchmark.tasks.WeightedTasks.WeightedTask;
+import org.apache.geode.benchmark.redis.tasks.ZaddAndZremRedisTask;
import org.apache.geode.perftest.TestConfig;
-public class RedisWeightedZaddAndZrangeBenchmark extends RedisBenchmark {
+public class RedisZaddAndZremBenchmark extends RedisBenchmark {
@Override
public TestConfig configure() {
final TestConfig config = super.configure();
before(config, new PrePopulateRedisSortedSet(redisClientManager, keyRange), CLIENT);
-
- workload(config, new WeightedTasks(
- new WeightedTask(20, new ZaddRedisTask(redisClientManager, keyRange)),
- new WeightedTask(80, new ZrangeRedisTask(redisClientManager, keyRange, false))), CLIENT);
-
+ workload(config, new ZaddAndZremRedisTask(redisClientManager, keyRange),
+ CLIENT);
return config;
}
}