Merge branch 'master' into master

Author: vmihailenco

benchmarks/basic_operations.py

@@ -13,7 +13,7 @@ def parse_args():
  parser.add_argument(
  "-P",
  type=int,
- help=("Pipeline <numreq> requests." " Default 1 (no pipeline)."),
+ help=("Pipeline <numreq> requests. Default 1 (no pipeline)."),
  default=1,
  )
  parser.add_argument(

redis/asyncio/client.py

@@ -1132,7 +1132,7 @@ def multi(self):
  raise RedisError("Cannot issue nested calls to MULTI")
  if self.command_stack:
  raise RedisError(
- "Commands without an initial WATCH have already " "been issued"
+ "Commands without an initial WATCH have already been issued"
  )
  self.explicit_transaction = True
 
@@ -1157,7 +1157,7 @@ async def _disconnect_reset_raise(self, conn, error):
  if self.watching:
  await self.reset()
  raise WatchError(
- "A ConnectionError occurred on while " "watching one or more keys"
+ "A ConnectionError occurred on while watching one or more keys"
  )
  # if retry_on_timeout is not set, or the error is not
  # a TimeoutError, raise it
@@ -1345,7 +1345,7 @@ async def _disconnect_raise_reset(self, conn: Connection, error: Exception):
  # indicates the user should retry this transaction.
  if self.watching:
  raise WatchError(
- "A ConnectionError occurred on while " "watching one or more keys"
+ "A ConnectionError occurred on while watching one or more keys"
  )
  # if retry_on_timeout is not set, or the error is not
  # a TimeoutError, raise it

redis/asyncio/lock.py

@@ -259,7 +259,7 @@ async def do_release(self, expected_token: bytes) -> None:
  keys=[self.name], args=[expected_token], client=self.redis
  )
  ):
- raise LockNotOwnedError("Cannot release a lock" " that's no longer owned")
+ raise LockNotOwnedError("Cannot release a lock that's no longer owned")
 
  def extend(
  self, additional_time: float, replace_ttl: bool = False
@@ -289,7 +289,7 @@ async def do_extend(self, additional_time, replace_ttl) -> bool:
  client=self.redis,
  )
  ):
- raise LockNotOwnedError("Cannot extend a lock that's" " no longer owned")
+ raise LockNotOwnedError("Cannot extend a lock that's no longer owned")
  return True
 
  def reacquire(self) -> Awaitable[bool]:
@@ -309,5 +309,5 @@ async def do_reacquire(self) -> bool:
  keys=[self.name], args=[self.local.token, timeout], client=self.redis
  )
  ):
- raise LockNotOwnedError("Cannot reacquire a lock that's" " no longer owned")
+ raise LockNotOwnedError("Cannot reacquire a lock that's no longer owned")
  return True

redis/client.py

@@ -1881,7 +1881,7 @@ def multi(self):
  raise RedisError("Cannot issue nested calls to MULTI")
  if self.command_stack:
  raise RedisError(
- "Commands without an initial WATCH have already " "been issued"
+ "Commands without an initial WATCH have already been issued"
  )
  self.explicit_transaction = True
 
@@ -1904,7 +1904,7 @@ def _disconnect_reset_raise(self, conn, error):
  if self.watching:
  self.reset()
  raise WatchError(
- "A ConnectionError occurred on while " "watching one or more keys"
+ "A ConnectionError occurred on while watching one or more keys"
  )
  # if retry_on_timeout is not set, or the error is not
  # a TimeoutError, raise it
@@ -1997,7 +1997,7 @@ def _execute_transaction(self, connection, commands, raise_on_error):
  if len(response) != len(commands):
  self.connection.disconnect()
  raise ResponseError(
- "Wrong number of response items from " "pipeline execution"
+ "Wrong number of response items from pipeline execution"
  )
 
  # find any errors in the response and raise if necessary
@@ -2078,7 +2078,7 @@ def _disconnect_raise_reset(self, conn, error):
  # indicates the user should retry this transaction.
  if self.watching:
  raise WatchError(
- "A ConnectionError occurred on while " "watching one or more keys"
+ "A ConnectionError occurred on while watching one or more keys"
  )
  # if retry_on_timeout is not set, or the error is not
  # a TimeoutError, raise it

redis/cluster.py

@@ -265,6 +265,9 @@ class AbstractRedisCluster:
  "READWRITE",
  "TIME",
  "GRAPH.CONFIG",
+ "LATENCY HISTORY",
+ "LATENCY LATEST",
+ "LATENCY RESET",
  ],
  DEFAULT_NODE,
  ),
@@ -1645,7 +1648,7 @@ def set_pubsub_node(self, cluster, node=None, host=None, port=None):
  pubsub_node = node
  elif any([host, port]) is True:
  # only 'host' or 'port' passed
- raise DataError("Passing a host requires passing a port, " "and vice versa")
+ raise DataError("Passing a host requires passing a port, and vice versa")
  else:
  # nothing passed by the user. set node to None
  pubsub_node = None
@@ -2123,7 +2126,7 @@ def delete(self, *names):
  """
  if len(names) != 1:
  raise RedisClusterException(
- "deleting multiple keys is not " "implemented in pipeline command"
+ "deleting multiple keys is not implemented in pipeline command"
  )
 
  return self.execute_command("DEL", names[0])

redis/commands/core.py

@@ -101,7 +101,7 @@ def acl_genpass(self, bits: Union[int, None] = None, **kwargs) -> ResponseT:
  raise ValueError
  except ValueError:
  raise DataError(
- "genpass optionally accepts a bits argument, " "between 0 and 4096."
+ "genpass optionally accepts a bits argument, between 0 and 4096."
  )
  return self.execute_command("ACL GENPASS", *pieces, **kwargs)
 
@@ -142,7 +142,7 @@ def acl_log(self, count: Union[int, None] = None, **kwargs) -> ResponseT:
  args = []
  if count is not None:
  if not isinstance(count, int):
- raise DataError("ACL LOG count must be an " "integer")
+ raise DataError("ACL LOG count must be an integer")
  args.append(count)
 
  return self.execute_command("ACL LOG", *args, **kwargs)
@@ -276,7 +276,7 @@ def acl_setuser(
 
  if (passwords or hashed_passwords) and nopass:
  raise DataError(
- "Cannot set 'nopass' and supply " "'passwords' or 'hashed_passwords'"
+ "Cannot set 'nopass' and supply 'passwords' or 'hashed_passwords'"
  )
 
  if passwords:
@@ -980,6 +980,34 @@ def lastsave(self, **kwargs) -> ResponseT:
  """
  return self.execute_command("LASTSAVE", **kwargs)
 
+ def latency_doctor(self):
+ """Raise a NotImplementedError, as the client will not support LATENCY DOCTOR.
+ This funcion is best used within the redis-cli.
+
+ For more information see https://redis.io/commands/latency-doctor
+ """
+ raise NotImplementedError(
+ """
+ LATENCY DOCTOR is intentionally not implemented in the client.
+
+ For more information see https://redis.io/commands/latency-doctor
+ """
+ )
+
+ def latency_graph(self):
+ """Raise a NotImplementedError, as the client will not support LATENCY GRAPH.
+ This funcion is best used within the redis-cli.
+
+ For more information see https://redis.io/commands/latency-graph.
+ """
+ raise NotImplementedError(
+ """
+ LATENCY GRAPH is intentionally not implemented in the client.
+
+ For more information see https://redis.io/commands/latency-graph
+ """
+ )
+
  def lolwut(self, *version_numbers: Union[str, float], **kwargs) -> ResponseT:
  """
  Get the Redis version and a piece of generative computer art
@@ -1123,6 +1151,30 @@ def latency_histogram(self, *args):
  "LATENCY HISTOGRAM is intentionally not implemented in the client."
  )
 
+ def latency_history(self, event: str) -> ResponseT:
+ """
+ Returns the raw data of the ``event``'s latency spikes time series.
+
+ For more information see https://redis.io/commands/latency-history
+ """
+ return self.execute_command("LATENCY HISTORY", event)
+
+ def latency_latest(self) -> ResponseT:
+ """
+ Reports the latest latency events logged.
+
+ For more information see https://redis.io/commands/latency-latest
+ """
+ return self.execute_command("LATENCY LATEST")
+
+ def latency_reset(self, *events: str) -> ResponseT:
+ """
+ Resets the latency spikes time series of all, or only some, events.
+
+ For more information see https://redis.io/commands/latency-reset
+ """
+ return self.execute_command("LATENCY RESET", *events)
+
  def ping(self, **kwargs) -> ResponseT:
  """
  Ping the Redis server
@@ -1561,7 +1613,7 @@ def bitpos(
  if start is not None and end is not None:
  params.append(end)
  elif start is None and end is not None:
- raise DataError("start argument is not set, " "when end is specified")
+ raise DataError("start argument is not set, when end is specified")
 
  if mode is not None:
  params.append(mode)
@@ -3405,9 +3457,7 @@ def xadd(
  """
  pieces: list[EncodableT] = []
  if maxlen is not None and minid is not None:
- raise DataError(
- "Only one of ```maxlen``` or ```minid``` " "may be specified"
- )
+ raise DataError("Only one of ```maxlen``` or ```minid``` may be specified")
 
  if maxlen is not None:
  if not isinstance(maxlen, int) or maxlen < 1:
@@ -3463,7 +3513,7 @@ def xautoclaim(
  try:
  if int(min_idle_time) < 0:
  raise DataError(
- "XAUTOCLAIM min_idle_time must be a non" "negative integer"
+ "XAUTOCLAIM min_idle_time must be a nonnegative integer"
  )
  except TypeError:
  pass
@@ -3521,7 +3571,7 @@ def xclaim(
  For more information see https://redis.io/commands/xclaim
  """
  if not isinstance(min_idle_time, int) or min_idle_time < 0:
- raise DataError("XCLAIM min_idle_time must be a non negative " "integer")
+ raise DataError("XCLAIM min_idle_time must be a non negative integer")
  if not isinstance(message_ids, (list, tuple)) or not message_ids:
  raise DataError(
  "XCLAIM message_ids must be a non empty list or "
@@ -3854,7 +3904,7 @@ def xreadgroup(
  pieces.append(str(count))
  if block is not None:
  if not isinstance(block, int) or block < 0:
- raise DataError("XREADGROUP block must be a non-negative " "integer")
+ raise DataError("XREADGROUP block must be a non-negative integer")
  pieces.append(b"BLOCK")
  pieces.append(str(block))
  if noack:
@@ -3916,7 +3966,7 @@ def xtrim(
  """
  pieces: list[EncodableT] = []
  if maxlen is not None and minid is not None:
- raise DataError("Only one of ``maxlen`` or ``minid`` " "may be specified")
+ raise DataError("Only one of ``maxlen`` or ``minid`` may be specified")
 
  if maxlen is None and minid is None:
  raise DataError("One of ``maxlen`` or ``minid`` must be specified")
@@ -4290,14 +4340,12 @@ def _zrange(
  num: Union[int, None] = None,
  ) -> ResponseT:
  if byscore and bylex:
- raise DataError(
- "``byscore`` and ``bylex`` can not be " "specified together."
- )
+ raise DataError("``byscore`` and ``bylex`` can not be specified together.")
  if (offset is not None and num is None) or (num is not None and offset is None):
  raise DataError("``offset`` and ``num`` must both be specified.")
  if bylex and withscores:
  raise DataError(
- "``withscores`` not supported in combination " "with ``bylex``."
+ "``withscores`` not supported in combination with ``bylex``."
  )
  pieces = [command]
  if dest:
@@ -5249,7 +5297,7 @@ def geoadd(
  if nx and xx:
  raise DataError("GEOADD allows either 'nx' or 'xx', not both")
  if len(values) % 3 != 0:
- raise DataError("GEOADD requires places with lon, lat and name" " values")
+ raise DataError("GEOADD requires places with lon, lat and name values")
  pieces = [name]
  if nx:
  pieces.append("NX")
@@ -5435,7 +5483,7 @@ def _georadiusgeneric(
  raise DataError("GEORADIUS invalid sort")
 
  if kwargs["store"] and kwargs["store_dist"]:
- raise DataError("GEORADIUS store and store_dist cant be set" " together")
+ raise DataError("GEORADIUS store and store_dist cant be set together")
 
  if kwargs["store"]:
  pieces.extend([b"STORE", kwargs["store"]])
@@ -5572,13 +5620,11 @@ def _geosearchgeneric(
  # FROMMEMBER or FROMLONLAT
  if kwargs["member"] is None:
  if kwargs["longitude"] is None or kwargs["latitude"] is None:
- raise DataError(
- "GEOSEARCH must have member or" " longitude and latitude"
- )
+ raise DataError("GEOSEARCH must have member or longitude and latitude")
  if kwargs["member"]:
  if kwargs["longitude"] or kwargs["latitude"]:
  raise DataError(
- "GEOSEARCH member and longitude or latitude" " cant be set together"
+ "GEOSEARCH member and longitude or latitude cant be set together"
  )
  pieces.extend([b"FROMMEMBER", kwargs["member"]])
  if kwargs["longitude"] is not None and kwargs["latitude"] is not None:
@@ -5587,15 +5633,15 @@ def _geosearchgeneric(
  # BYRADIUS or BYBOX
  if kwargs["radius"] is None:
  if kwargs["width"] is None or kwargs["height"] is None:
- raise DataError("GEOSEARCH must have radius or" " width and height")
+ raise DataError("GEOSEARCH must have radius or width and height")
  if kwargs["unit"] is None:
  raise DataError("GEOSEARCH must have unit")
  if kwargs["unit"].lower() not in ("m", "km", "mi", "ft"):
  raise DataError("GEOSEARCH invalid unit")
  if kwargs["radius"]:
  if kwargs["width"] or kwargs["height"]:
  raise DataError(
- "GEOSEARCH radius and width or height" " cant be set together"
+ "GEOSEARCH radius and width or height cant be set together"
  )
  pieces.extend([b"BYRADIUS", kwargs["radius"], kwargs["unit"]])
  if kwargs["width"] and kwargs["height"]:
@@ -5616,7 +5662,7 @@ def _geosearchgeneric(
  if kwargs["any"]:
  pieces.append(b"ANY")
  elif kwargs["any"]:
- raise DataError("GEOSEARCH ``any`` can't be provided " "without count")
+ raise DataError("GEOSEARCH ``any`` can't be provided without count")
 
  # other properties
  for arg_name, byte_repr in (

redis/commands/graph/node.py

@@ -32,7 +32,7 @@ def __init__(self, node_id=None, alias=None, label=None, properties=None):
  self.labels = label
  else:
  raise AssertionError(
- "label should be either None, " "string or a list of strings"
+ "label should be either None, string or a list of strings"
  )
 
  self.properties = properties or {}

redis/commands/search/commands.py

@@ -527,7 +527,7 @@ def profile(
  cmd += query.get_args()
  cmd += self.get_params_args(query_params)
  else:
- raise ValueError("Must provide AggregateRequest object or " "Query object.")
+ raise ValueError("Must provide AggregateRequest object or Query object.")
 
  res = self.execute_command(*cmd)
 

redis/connection.py

@@ -62,9 +62,9 @@
 SERVER_CLOSED_CONNECTION_ERROR = "Connection closed by server."
 
 SENTINEL = object()
-MODULE_LOAD_ERROR = "Error loading the extension. " "Please check the server logs."
+MODULE_LOAD_ERROR = "Error loading the extension. Please check the server logs."
 NO_SUCH_MODULE_ERROR = "Error unloading module: no such module with that name"
-MODULE_UNLOAD_NOT_POSSIBLE_ERROR = "Error unloading module: operation not " "possible."
+MODULE_UNLOAD_NOT_POSSIBLE_ERROR = "Error unloading module: operation not possible."
 MODULE_EXPORTS_DATA_TYPES_ERROR = (
  "Error unloading module: the module "
  "exports one or more module-side data "

redis/lock.py

@@ -256,7 +256,7 @@ def do_release(self, expected_token: str) -> None:
  if not bool(
  self.lua_release(keys=[self.name], args=[expected_token], client=self.redis)
  ):
- raise LockNotOwnedError("Cannot release a lock" " that's no longer owned")
+ raise LockNotOwnedError("Cannot release a lock that's no longer owned")
 
  def extend(self, additional_time: int, replace_ttl: bool = False) -> bool:
  """