You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by he...@apache.org on 2021/03/18 16:45:09 UTC
[geode] branch support/1.14 updated: GEODE-9032: support SLOWLOG
command (#6131) (#6149)
This is an automated email from the ASF dual-hosted git repository.
heybales pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new 05989e5 GEODE-9032: support SLOWLOG command (#6131) (#6149)
05989e5 is described below
commit 05989e5b5368e5d8230b9b7ca5b600a729d2f73e
Author: Hale Bales <hb...@pivotal.io>
AuthorDate: Thu Mar 18 09:44:18 2021 -0700
GEODE-9032: support SLOWLOG command (#6131) (#6149)
- update documentation to show SLOWLOG as a supported command
- move SLOWLOG to supported commands list in RedisCommandTypes
- update supported commands test
- did not add any new tests because it was already very well tested.
- add footnote to readme
(cherry picked from commit dfc16562a1965d4d0bc32756bdf2a9664b4127c2)
---
.../tools_modules/redis_api_for_geode.html.md.erb | 6 ++--
geode-redis/README.md | 35 +++++++++++-----------
.../geode/redis/internal/RedisCommandType.java | 4 ++-
.../redis/internal/SupportedCommandsJUnitTest.java | 2 +-
4 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/geode-docs/tools_modules/redis_api_for_geode.html.md.erb b/geode-docs/tools_modules/redis_api_for_geode.html.md.erb
index 7c7aa01..a2eadae 100644
--- a/geode-docs/tools_modules/redis_api_for_geode.html.md.erb
+++ b/geode-docs/tools_modules/redis_api_for_geode.html.md.erb
@@ -66,13 +66,14 @@ If the server is functioning properly, you should see a response of `PONG`.
The Redis API for <%=vars.product_name%> currently supports the following commands. See [Redis commands](https://redis.io/commands/) for a complete list of and more information on Redis commands.
**Note**: These commands are supported for Redis 5.
+**Note**: SLOWLOG is implemented as a NoOp for compatibility with DataDog.
- **Connection**: AUTH, PING, QUIT
- **Hashes**: HGETALL, HMGET, HMSET, HSET, HSETNX, HSTRLEN, HLEN, HVALS
- **Keys**: DEL, EXISTS, EXPIRE, EXPIREAT, KEYS, PERSIST, PEXPIRE, PEXPIREAT, PTTL, RENAME, TTL,
TYPE
- **Publish/Subscribe**: PUBLISH, PSUBSCRIBE, PUNSUBSCRIBE, SUBSCRIBE, UNSUBSCRIBE
-- **Server**: INFO
+- **Server**: SLOWLOG, INFO
- **Sets**: SADD, SMEMBERS, SREM
- **Strings**: APPEND, GET, SET
@@ -83,8 +84,7 @@ exactly as expected.
- **Connection**: ECHO, SELECT
- **Hashes**: HDEL, HEXISTS, HGET, HINCRBY, HINCRBYFLOAT, HKEYS, HSCAN
- **Keys**: SCAN, UNLINK
-- **Server**: DBSIZE, FLUSHALL (no async option), FLUSHDB (no async option), SHUTDOWN,
- SLOWLOG, TIME
+- **Server**: DBSIZE, FLUSHALL (no async option), FLUSHDB (no async option), SHUTDOWN, TIME
- **Sets**: SCARD, SDIFF, SDIFFSTORE, SINTER, SINTERSTORE, SISMEMBER, SMOVE, SPOP, SRANDMEMBER,
SSCAN, SUNION, SUNIONSTORE
- **Strings**: BITCOUNT, BITOP, BITPOS, DECR, DECRBY, GETBIT, GETRANGE, GETSET, INCR, INCRBY,
diff --git a/geode-redis/README.md b/geode-redis/README.md
index 4e640c9..d06920c 100644
--- a/geode-redis/README.md
+++ b/geode-redis/README.md
@@ -186,26 +186,26 @@ start server \
| RENAME | SCAN | CLIENT PAUSE |
| SADD | SCARD | CLIENT REPLY |
| SET | SDIFF | CLIENT SETNAME |
-| SMEMBERS | SDIFFSTORE | CLIENT TRACKING |
-| SREM | SELECT | CLIENT UNBLOCK |
-| SUBSCRIBE | SETBIT | CLUSTER ADDSLOTS |
-| TTL | SETEX | CLUSTER BUMPEPOCH |
-| TYPE | SETNX | CLUSTER COUNT-FAILURE-REPORTS |
-| UNSUBSCRIBE | SETRANGE | CLUSTER COUNTKEYSINSLOT |
-| | SHUTDOWN | CLUSTER DELSLOTS |
+| SLOWLOG[2] | SDIFFSTORE | CLIENT TRACKING |
+| SMEMBERS | SELECT | CLIENT UNBLOCK |
+| SREM | SETBIT | CLUSTER ADDSLOTS |
+| SUBSCRIBE | SETEX | CLUSTER BUMPEPOCH |
+| TTL | SETNX | CLUSTER COUNT-FAILURE-REPORTS |
+| TYPE | SETRANGE | CLUSTER COUNTKEYSINSLOT |
+| UNSUBSCRIBE | SHUTDOWN | CLUSTER DELSLOTS |
| | SINTER | CLUSTER FAILOVER |
| | SINTERSTORE | CLUSTER FLUSHSLOTS |
| | SISMEMBER | CLUSTER FORGET |
-| | SLOWLOG | CLUSTER GETKEYSINSLOT |
-| | SMOVE | CLUSTER INFO |
-| | SPOP | CLUSTER KEYSLOT |
-| | SRANDMEMBER | CLUSTER MEET |
-| | SSCAN | CLUSTER MYID |
-| | STRLEN | CLUSTER NODES |
-| | SUNION | CLUSTER REPLICAS |
-| | SUNIONSTORE | CLUSTER REPLICATE |
-| | TIME | CLUSTER RESET |
-| | UNLINK [1] | CLUSTER SAVECONFIG |
+| | SMOVE | CLUSTER GETKEYSINSLOT |
+| | SPOP | CLUSTER INFO |
+| | SRANDMEMBER | CLUSTER KEYSLOT |
+| | SSCAN | CLUSTER MEET |
+| | STRLEN | CLUSTER MYID |
+| | SUNION | CLUSTER NODES |
+| | SUNIONSTORE | CLUSTER REPLICAS |
+| | TIME | CLUSTER REPLICATE |
+| | UNLINK [1] | CLUSTER RESET |
+| | | CLUSTER SAVECONFIG |
| | | CLUSTER SET-CONFIG-EPOCH |
| | | CLUSTER SETSLOT |
| | | CLUSTER SLAVES |
@@ -335,3 +335,4 @@ start server \
**NOTES:**
[1] - UNLINK is implemented as a synonym to DEL and does not unlink asynchronously.
+[2] - SLOWLOG is implemented as a NoOp.
diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java
index 8a11e36..287e53f 100755
--- a/geode-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java
+++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java
@@ -185,6 +185,9 @@ public enum RedisCommandType {
SMEMBERS(new SMembersExecutor(), SUPPORTED, new ExactParameterRequirements(2)),
SREM(new SRemExecutor(), SUPPORTED, new MinimumParameterRequirements(3)),
+ /************* Server *****************/
+ SLOWLOG(new SlowlogExecutor(), SUPPORTED, new SlowlogParameterRequirements()),
+
/********** Publish Subscribe **********/
SUBSCRIBE(new SubscribeExecutor(), SUPPORTED, new MinimumParameterRequirements(2)),
PUBLISH(new PublishExecutor(), SUPPORTED, new ExactParameterRequirements(3)),
@@ -270,7 +273,6 @@ public enum RedisCommandType {
FLUSHALL(new FlushAllExecutor(), UNSUPPORTED, new MaximumParameterRequirements(2, ERROR_SYNTAX)),
FLUSHDB(new FlushAllExecutor(), UNSUPPORTED, new MaximumParameterRequirements(2, ERROR_SYNTAX)),
SHUTDOWN(new ShutDownExecutor(), UNSUPPORTED, new MaximumParameterRequirements(2, ERROR_SYNTAX)),
- SLOWLOG(new SlowlogExecutor(), UNSUPPORTED, new SlowlogParameterRequirements()),
TIME(new TimeExecutor(), UNSUPPORTED, new ExactParameterRequirements(1)),
/////////// UNIMPLEMENTED /////////////////////
diff --git a/geode-redis/src/test/java/org/apache/geode/redis/internal/SupportedCommandsJUnitTest.java b/geode-redis/src/test/java/org/apache/geode/redis/internal/SupportedCommandsJUnitTest.java
index 6fe8cc7..e395455 100644
--- a/geode-redis/src/test/java/org/apache/geode/redis/internal/SupportedCommandsJUnitTest.java
+++ b/geode-redis/src/test/java/org/apache/geode/redis/internal/SupportedCommandsJUnitTest.java
@@ -70,6 +70,7 @@ public class SupportedCommandsJUnitTest {
"RENAME",
"SADD",
"SET",
+ "SLOWLOG",
"SMEMBERS",
"SREM",
"STRLEN",
@@ -108,7 +109,6 @@ public class SupportedCommandsJUnitTest {
"SINTER",
"SINTERSTORE",
"SISMEMBER",
- "SLOWLOG",
"SMOVE",
"SPOP",
"SRANDMEMBER",