[
https://issues.apache.org/jira/browse/GEODE-8881?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17276652#comment-17276652
]
ASF GitHub Bot commented on GEODE-8881:
---------------------------------------
nonbinaryprogrammer commented on a change in pull request #5972:
URL: https://github.com/apache/geode/pull/5972#discussion_r568139634
##########
File path:
geode-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HKeysDUnitTest.java
##########
@@ -0,0 +1,165 @@
+/*
+ * 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.redis.internal.executor.hash;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import redis.clients.jedis.Jedis;
+
+import org.apache.geode.redis.ConcurrentLoopingThreads;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.dunit.rules.RedisClusterStartupRule;
+
+public class HKeysDUnitTest {
+
+ @ClassRule
+ public static RedisClusterStartupRule clusterStartUp = new
RedisClusterStartupRule(4);
+
+ private static final String LOCAL_HOST = "127.0.0.1";
+ private static final int HASH_SIZE = 10;
+ private static final int NUM_ITERATIONS = 1000;
+ private static final int JEDIS_TIMEOUT =
+ Math.toIntExact(GeodeAwaitility.getTimeout().toMillis());
+ private static Jedis jedis1;
+ private static Jedis jedis2;
+
+ private static Properties locatorProperties;
+
+ private static MemberVM locator;
+ private static MemberVM server1;
+ private static MemberVM server2;
+
+ private static int redisServerPort1;
+ private static int redisServerPort2;
+
+ @BeforeClass
+ public static void classSetup() {
+ locatorProperties = new Properties();
+
+ locator = clusterStartUp.startLocatorVM(0, locatorProperties);
+ server1 = clusterStartUp.startRedisVM(1, locator.getPort());
+ server2 = clusterStartUp.startRedisVM(2, locator.getPort());
+
+ redisServerPort1 = clusterStartUp.getRedisPort(1);
+ redisServerPort2 = clusterStartUp.getRedisPort(2);
+
+ jedis1 = new Jedis(LOCAL_HOST, redisServerPort1, JEDIS_TIMEOUT);
+ jedis2 = new Jedis(LOCAL_HOST, redisServerPort2, JEDIS_TIMEOUT);
+ }
+
+ @Before
+ public void testSetup() {
+ jedis1.flushAll();
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ jedis1.disconnect();
+ jedis2.disconnect();
+
+ server1.stop();
+ server2.stop();
+ locator.stop();
+ }
+
+ @Test
+ public void testConcurrentHKeys_whileAddingValues() {
+ String key = "key";
+
+ Map<String, String> testMap = makeHashMap(HASH_SIZE, "field-", "value-");
+ Set<String> expectedFields = makeSet(HASH_SIZE, "field-");
+ BlockingQueue<String> queue = new LinkedBlockingQueue<>();
+
+ jedis1.hset(key, testMap);
+
+ new ConcurrentLoopingThreads(NUM_ITERATIONS,
+ (i) -> {
+ int newIndex = HASH_SIZE + i + 1;
+ jedis1.hset(key, "field-" + newIndex, "value-" + newIndex);
+ queue.add("field-" + newIndex);
+ },
+ (i) -> {
+ try {
+ expectedFields.add(queue.take());
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ assertThat(jedis2.hkeys(key)).containsAll(expectedFields);
+ }).run();
+
+
assertThat(jedis1.hkeys(key)).containsExactlyInAnyOrderElementsOf(expectedFields);
+ }
+
+ @Test
+ public void testConcurrentHKeys_whileDeletingValues() {
+ String key = "key";
+ Map<String, String> testMap = makeHashMap(NUM_ITERATIONS, "field-",
"value-");
+
+ jedis1.hset(key, testMap);
+
+ new ConcurrentLoopingThreads(NUM_ITERATIONS,
+ (i) -> jedis1.hdel(key, "field-" + i),
+ (i) -> jedis2.hkeys(key)).run();
+
+ assertThat(jedis1.hkeys(key).size()).isEqualTo(0);
+ }
+
+ @Test
+ public void testConcurrentHKeys_whileUpdatingValues() {
+ String key = "key";
+ Map<String, String> testMap = makeHashMap(NUM_ITERATIONS, "field-",
"value-");
+
+ jedis1.hset(key, testMap);
+
+ new ConcurrentLoopingThreads(NUM_ITERATIONS,
+ (i) -> jedis1.hset(key, "field-" + i, "changedValue-" + i),
+ (i) ->
assertThat(jedis2.hkeys(key)).containsExactlyInAnyOrderElementsOf(testMap.keySet()))
+ .run();
+
+
assertThat(jedis1.hkeys(key)).containsExactlyInAnyOrderElementsOf(testMap.keySet());
Review comment:
👍
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Redis: move HKEYS command to supported commands
> -----------------------------------------------
>
> Key: GEODE-8881
> URL: https://issues.apache.org/jira/browse/GEODE-8881
> Project: Geode
> Issue Type: Test
> Components: redis
> Reporter: Hale Bales
> Assignee: Hale Bales
> Priority: Major
> Labels: pull-request-available
>
> Write unit/integration tests that run against both Geode Redis and native
> Redis, and dunit tests which test multiple concurrent clients accessing
> different servers for the following command:
> HKEYS
> A.C.
> Unit/integration tests for both Geode and native Redis passing
> DUNIT tests passing
> README/redis_api_for_geode.html.md.erb updated to make command "supported"
> or
> Stories in the backlog to fix the identified issues (with JIRA tickets)
> and problem tests ignored
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
