Change return type of CLIENT INFO and CLIENT LIST #813
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
drmarjanovic
force-pushed
the
improve-client-info-client-list
branch
from
1a48bad to
728938e
Compare
mijicd
reviewed
Apr 10, 2023
Comment on lines
86
to
107
| def getFlags(flags: String): Set[ClientFlag] = { | ||
| def clientFlag(cf: Char): Option[ClientFlag] = cf match { | ||
| case 'A' => Some(ClientFlag.ToBeClosedAsap) | ||
| case 'b' => Some(ClientFlag.Blocked) | ||
| case 'B' => Some(ClientFlag.BroadcastTrackingMode) | ||
| case 'c' => Some(ClientFlag.ToBeClosedAfterReply) | ||
| case 'd' => Some(ClientFlag.WatchedKeysModified) | ||
| case 'M' => Some(ClientFlag.IsMaster) | ||
| case 'O' => Some(ClientFlag.MonitorMode) | ||
| case 'P' => Some(ClientFlag.PubSub) | ||
| case 'r' => Some(ClientFlag.ReadOnlyMode) | ||
| case 'R' => Some(ClientFlag.TrackingTargetClientInvalid) | ||
| case 'S' => Some(ClientFlag.Replica) | ||
| case 't' => Some(ClientFlag.KeysTrackingEnabled) | ||
| case 'u' => Some(ClientFlag.Unblocked) | ||
| case 'U' => Some(ClientFlag.UnixDomainSocket) | ||
| case 'x' => Some(ClientFlag.MultiExecContext) | ||
| case _ => None | ||
| } | ||
|
|
||
| flags.foldLeft(Set.empty[ClientFlag])((fs, f) => fs ++ clientFlag(f)) | ||
| } |
There was a problem hiding this comment.
Move these two functions to companion object.
| lines.map(from).toList | ||
| } | ||
|
|
||
| type ClientsInfo = List[ClientInfo] |
Comment on lines
110
to
134
| val events = data("events") | ||
| new ClientInfo( | ||
| id = data("id").toLong, | ||
| name = data.get("name"), | ||
| address = data.get("addr").flatMap(Address.fromString), | ||
| localAddress = data.get("laddr").flatMap(Address.fromString), | ||
| fileDescriptor = data.get("fd").map(_.toLong), | ||
| age = data.get("age").map(s => Duration.fromSeconds(s.toLong)), | ||
| idle = data.get("idle").map(s => Duration.fromSeconds(s.toLong)), | ||
| flags = data.get("flags").fold(Set.empty[ClientFlag])(getFlags), | ||
| databaseId = data.get("id").map(_.toLong), | ||
| subscriptions = data("sub").toInt, | ||
| patternSubscriptions = data("psub").toInt, | ||
| multiCommands = data("multi").toInt, | ||
| queryBufferLength = data.get("qbuf").map(_.toInt), | ||
| queryBufferFree = data.get("qbuf-free").map(_.toInt), | ||
| outputListLength = data.get("oll").map(_.toInt), | ||
| outputBufferMem = data.get("omem").map(_.toLong), | ||
| events = ClientEvents(readable = events.contains("r"), writable = events.contains("w")), | ||
| lastCommand = data.get("cmd"), | ||
| argvMemory = data.get("argv-mem").map(_.toLong), | ||
| totalMemory = data.get("total-mem").map(_.toLong), | ||
| redirectionClientId = data.get("redir").map(_.toLong), | ||
| user = data.get("user") | ||
| ) |
Comment on lines
738
to
744
| case object ClientsInfoOutput extends Output[ClientsInfo] { | ||
| protected def tryDecode(respValue: RespValue): ClientsInfo = | ||
| respValue match { | ||
| case RespValue.BulkString(s) => ClientInfo.from(s.asString.split("\r\n").filter(_.nonEmpty)) | ||
| case other => throw ProtocolError(s"$other isn't a bulk string") | ||
| } | ||
| } |
There was a problem hiding this comment.
Let's rename this to ClientListOutput. Also prefer Chunk to List, e.g.:
case object ClientListOutput extends Output[Chunk[ClientInfo]] { ... }You might be able to reuse ClientInfoOutput in its implementation, though it's not necessary.
mijicd
reviewed
Apr 10, 2023
| object Address { | ||
| private[redis] final def fromString(addr: String): Option[Address] = | ||
| addr.split(":").toList match { | ||
| case ip :: port :: Nil => Some(new Address(InetAddress.getByName(ip), port.toInt)) |
Comment on lines
58
to
75
| flag match { | ||
| case 'A' => Some(ClientFlag.ToBeClosedAsap) | ||
| case 'b' => Some(ClientFlag.Blocked) | ||
| case 'B' => Some(ClientFlag.BroadcastTrackingMode) | ||
| case 'c' => Some(ClientFlag.ToBeClosedAfterReply) | ||
| case 'd' => Some(ClientFlag.WatchedKeysModified) | ||
| case 'M' => Some(ClientFlag.IsMaster) | ||
| case 'O' => Some(ClientFlag.MonitorMode) | ||
| case 'P' => Some(ClientFlag.PubSub) | ||
| case 'r' => Some(ClientFlag.ReadOnlyMode) | ||
| case 'R' => Some(ClientFlag.TrackingTargetClientInvalid) | ||
| case 'S' => Some(ClientFlag.Replica) | ||
| case 't' => Some(ClientFlag.KeysTrackingEnabled) | ||
| case 'u' => Some(ClientFlag.Unblocked) | ||
| case 'U' => Some(ClientFlag.UnixDomainSocket) | ||
| case 'x' => Some(ClientFlag.MultiExecContext) | ||
| case _ => None | ||
| } |
There was a problem hiding this comment.
You can simplify via Map. It can be private and lazy.
mijicd
previously approved these changes
Apr 10, 2023
mijicd
approved these changes
Apr 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
ClientInfoandClientsInfooutput types forCLIENT INFOandCLIENT LISTcommands instead of plain string.