diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-04 07:59:01 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-04 07:59:09 +0000 |
commit | 51cc817f8e2bab01ee028fbc1a0029a3f314d576 (patch) | |
tree | 8a78c6318a6d1b513e41deb0e3b020e59dd55d6c /iredis | |
parent | Releasing debian version 1.11.1-2. (diff) | |
download | iredis-51cc817f8e2bab01ee028fbc1a0029a3f314d576.tar.xz iredis-51cc817f8e2bab01ee028fbc1a0029a3f314d576.zip |
Merging upstream version 1.12.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'iredis')
-rw-r--r-- | iredis/__init__.py | 2 | ||||
-rw-r--r-- | iredis/client.py | 4 | ||||
-rw-r--r-- | iredis/completers.py | 39 | ||||
-rw-r--r-- | iredis/data/command_syntax.csv | 29 | ||||
-rw-r--r-- | iredis/redis_grammar.py | 107 | ||||
-rw-r--r-- | iredis/utils.py | 6 |
6 files changed, 139 insertions, 48 deletions
diff --git a/iredis/__init__.py b/iredis/__init__.py index c3fa782..b518f6e 100644 --- a/iredis/__init__.py +++ b/iredis/__init__.py @@ -1 +1 @@ -__version__ = "1.11.1" +__version__ = "1.12.0" diff --git a/iredis/client.py b/iredis/client.py index 29045da..1b1bf38 100644 --- a/iredis/client.py +++ b/iredis/client.py @@ -186,9 +186,7 @@ class Client: def get_server_info(self): # safe to decode Redis's INFO response info_resp = nativestr(self.execute("INFO")) - version = re.findall(r"^redis_version:([\d\.]+)\r\n", info_resp, re.MULTILINE)[ - 0 - ] + version = re.findall(r"redis_version:(.+)\r\n", info_resp)[0] logger.debug(f"[Redis Version] {version}") config.version = version diff --git a/iredis/completers.py b/iredis/completers.py index f5d922e..e3ebb5a 100644 --- a/iredis/completers.py +++ b/iredis/completers.py @@ -79,6 +79,15 @@ class TimestampCompleter(Completer): The timezone is read from system. """ + def __init__(self, is_milliseconds, future_time, *args, **kwargs): + if is_milliseconds: + self.factor = 1000 + else: + self.factor = 1 + + self.future_time = future_time + super().__init__(*args, **kwargs) + when_lower_than = { "year": 20, "month": 12, @@ -96,10 +105,17 @@ class TimestampCompleter(Completer): now = pendulum.now() for unit, minimum in self.when_lower_than.items(): if current <= minimum: - dt = now.subtract(**{f"{unit}s": current}) - meta = f"{text} {unit}{'s' if current > 1 else ''} ago ({dt.format('YYYY-MM-DD HH:mm:ss')})" + + if self.future_time: + dt = now.add(**{f"{unit}s": current}) + offset_text = "later" + else: + dt = now.subtract(**{f"{unit}s": current}) + offset_text = "ago" + + meta = f"{text} {unit}{'s' if current > 1 else ''} {offset_text} ({dt.format('YYYY-MM-DD HH:mm:ss')})" yield Completion( - str(dt.int_timestamp * 1000), + str(dt.int_timestamp * self.factor), start_position=-len(document.text_before_cursor), display_meta=meta, ) @@ -111,7 +127,7 @@ class TimestampCompleter(Completer): except Exception: return yield Completion( - str(dt.int_timestamp * 1000), + str(dt.int_timestamp * self.factor), start_position=-len(document.text_before_cursor), display_meta=str(dt), ) @@ -296,7 +312,16 @@ class IRedisCompleter(Completer): config.completer_max, [] ) categoryname_completer = MostRecentlyUsedFirstWordCompleter(100, []) - timestamp_completer = TimestampCompleter() + + timestamp_ms_ago_completer = TimestampCompleter( + is_milliseconds=True, future_time=False + ) + timestamp_ms_after_completer = TimestampCompleter( + is_milliseconds=True, future_time=True + ) + timestamp_after_completer = TimestampCompleter( + is_milliseconds=False, future_time=True + ) integer_type_completer = IntegerTypeCompleter() completer_mapping.update( @@ -317,7 +342,9 @@ class IRedisCompleter(Completer): # stream groups "group": group_completer, # stream id - "stream_id": timestamp_completer, + "stream_id": timestamp_ms_ago_completer, + "timestampms": timestamp_ms_after_completer, + "timestamp": timestamp_after_completer, "inttype": integer_type_completer, "categoryname": categoryname_completer, "username": username_completer, diff --git a/iredis/data/command_syntax.csv b/iredis/data/command_syntax.csv index 4036ff0..477c15c 100644 --- a/iredis/data/command_syntax.csv +++ b/iredis/data/command_syntax.csv @@ -32,19 +32,24 @@ connection,SELECT,command_index,render_simple_string connection,CLIENT CACHING,command_yes,render_simple_string connection,CLIENT GETREDIR,command,render_int connection,CLIENT TRACKING,command_client_tracking,render_simple_string -connection,CLIENT LIST,command_type_conntype_x,render_bulk_string_decode +connection,CLIENT TRACKINGINFO,command,render_list +connection,CLIENT LIST,command_client_list,render_bulk_string_decode connection,CLIENT GETNAME,command,render_bulk_string connection,CLIENT ID,command,render_int +connection,CLIENT INFO,command,render_bulk_string_decode connection,CLIENT KILL,command_clientkill,render_string_or_int -connection,CLIENT PAUSE,command_timeout,render_simple_string +connection,CLIENT PAUSE,command_pause,render_simple_string +connection,CLIENT UNPAUSE,command,render_simple_string connection,CLIENT REPLY,command_switch,render_simple_string connection,CLIENT SETNAME,command_value,render_simple_string connection,CLIENT UNBLOCK,command_clientid_errorx,render_int +generic,COPY,command_copy,render_int generic,DEL,command_keys,render_int generic,DUMP,command_key,render_bulk_string generic,EXISTS,command_keys,render_int generic,EXPIRE,command_key_second,render_int generic,EXPIREAT,command_key_timestamp,render_int +generic,EXPIRETIME,command_key,render_int generic,KEYS,command_pattern,command_keys generic,MIGRATE,command_migrate,render_simple_string generic,MOVE,command_key_index,render_int @@ -68,8 +73,10 @@ geo,GEOADD,command_key_longitude_latitude_members,render_int geo,GEODIST,command_geodist,render_bulk_string geo,GEOHASH,command_key_members,render_list geo,GEOPOS,command_key_members,render_list -geo,GEORADIUS,command_radius,render_list_or_string -geo,GEORADIUSBYMEMBER,command_georadiusbymember,render_list_or_string +geo,GEORADIUS,command_any,render_list_or_string +geo,GEORADIUSBYMEMBER,command_any,render_list_or_string +geo,GEOSEARCH,command_key_any,render_list +geo,GEOSEARCHSTORE,command_key_key_any,render_list hash,HDEL,command_key_fields,render_int hash,HEXISTS,command_key_field,render_int hash,HGET,command_key_field,render_bulk_string @@ -88,6 +95,7 @@ hash,HVALS,command_key,render_list hyperloglog,PFADD,command_key_values,render_int hyperloglog,PFCOUNT,command_keys,render_int hyperloglog,PFMERGE,command_newkey_keys,render_simple_string +list,BLMOVE,command_key_key_lr_lr_timeout, render_bulk_string list,BLPOP,command_keys_timeout,render_list_or_string list,BRPOP,command_keys_timeout,render_list_or_string list,BRPOPLPUSH,command_key_newkey_timeout,render_bulk_string @@ -113,7 +121,9 @@ pubsub,PUNSUBSCRIBE,command_channels,render_subscribe pubsub,SUBSCRIBE,command_channels,render_subscribe pubsub,UNSUBSCRIBE,command_channels,render_subscribe scripting,EVAL,command_lua_any,render_list_or_string +scripting,EVAL_RO,command_lua_any,render_list_or_string scripting,EVALSHA,command_any,render_list_or_string +scripting,EVALSHA_RO,command_any,render_list_or_string scripting,SCRIPT DEBUG,command_scriptdebug,render_simple_string scripting,SCRIPT EXISTS,command_any,render_list scripting,SCRIPT FLUSH,command,render_simple_string @@ -145,6 +155,7 @@ server,CONFIG SET,command_parameter_value,render_simple_string server,DBSIZE,command,render_int server,DEBUG OBJECT,command_key,render_simple_string server,DEBUG SEGFAULT,command,render_simple_string +server,FAILOVER,command_failover,render_simple_string server,FLUSHALL,command_asyncx,render_simple_string server,FLUSHDB,command_asyncx,render_simple_string server,INFO,command_sectionx,render_bulk_string_decode @@ -229,14 +240,16 @@ stream,XREADGROUP,command_xreadgroup,render_list stream,XREVRANGE,command_key_start_end_countx,render_list stream,XTRIM,command_key_maxlen,render_int string,APPEND,command_key_value,render_int -string,BITCOUNT,command_key_start_end_x,render_int -string,BITFIELD,command_bitfield,render_list -string,BITOP,command_operation_key_keys,render_int -string,BITPOS,command_key_bit_start_end,render_int +bitmap,BITCOUNT,command_key_start_end_x,render_int +bitmap,BITFIELD,command_bitfield,render_list +bitmap,BITOP,command_operation_key_keys,render_int +bitmap,BITPOS,command_key_bit_start_end,render_int string,DECR,command_key,render_int string,DECRBY,command_key_delta,render_int string,GET,command_key,render_bulk_string +string,GETEX,command_key_expire,render_bulk_string string,GETBIT,command_key_offset,render_int +string,GETDEL,command_key,render_bulk_string string,GETRANGE,command_key_start_end,render_bulk_string string,GETSET,command_key_value,render_bulk_string string,INCR,command_key,render_int diff --git a/iredis/redis_grammar.py b/iredis/redis_grammar.py index 666c0da..4e38540 100644 --- a/iredis/redis_grammar.py +++ b/iredis/redis_grammar.py @@ -18,6 +18,8 @@ CONST = { "withscores": "WITHSCORES", "limit": "LIMIT", "expiration": "EX PX", + "exat_const": "EXAT", + "pxat_const": "PXAT", "condition": "NX XX", "keepttl": "KEEPTTL", "operation": "AND OR XOR NOT", @@ -32,7 +34,7 @@ CONST = { "type": "string list set zset hash stream", "position_choice": "BEFORE AFTER", "error": "TIMEOUT ERROR", - "async": "ASYNC", + "async": "ASYNC SYNC", "conntype": "NORMAL MASTER REPLICA PUBSUB", "samples": "SAMPLES", "slotsubcmd": "IMPORTING MIGRATING NODE STABLE", @@ -45,6 +47,7 @@ CONST = { "on_off": "ON OFF", "const_id": "ID", "addr": "ADDR", + "laddr": "LADDR", "skipme": "SKIPME", "yes": "YES NO", "migratechoice": "COPY REPLACE", @@ -130,6 +133,13 @@ CONST = { "withmatchlen_const": "WITHMATCHLEN", "strings_const": "STRINGS", "rank_const": "RANK", + "lr_const": "LEFT RIGHT", + "pause_type": "WRITE ALL", + "db_const": "DB", + "replace_const": "REPLACE", + "to_const": "TO", + "timeout_const": "TIMEOUT", + "abort_const": "ABORT", } @@ -151,14 +161,16 @@ VALID_NODE = r"\w+" NUM = r"\d+" NNUM = r"-?\+?\(?\[?(\d+|inf)" # number cloud be negative _FLOAT = r"-?(\d|\.|e)+" +DOUBLE = r"\d*(\.\d+)?" LEXNUM = r"(\[\w+)|(\(\w+)|(\+)|(-)" SLOT = rf"(?P<slot>{VALID_SLOT})" SLOTS = rf"(?P<slots>{VALID_SLOT}(\s+{VALID_SLOT})*)" NODE = rf"(?P<node>{VALID_NODE})" KEY = rf"(?P<key>{VALID_TOKEN})" -PREFIX = rf"(?P<prefix>{VALID_TOKEN})" KEYS = rf"(?P<keys>{VALID_TOKEN}(\s+{VALID_TOKEN})*)" +PREFIX = rf"(?P<prefix>{VALID_TOKEN})" +PREFIXES = rf"(?P<prefixes>{VALID_TOKEN}(\s+{VALID_TOKEN})*?)" DESTINATION = rf"(?P<destination>{VALID_TOKEN})" NEWKEY = rf"(?P<newkey>{VALID_TOKEN})" VALUE = rf"(?P<value>{VALID_TOKEN})" @@ -205,13 +217,15 @@ PASSWORD = rf"(?P<password>{VALID_TOKEN})" REPLICATIONID = rf"(?P<replicationid>{VALID_TOKEN})" INDEX = r"(?P<index>(1[0-5]|\d))" CLIENTID = rf"(?P<clientid>{NUM})" +CLIENTIDS = rf"(?P<clientids>{NUM}(\s+{NUM})*)" + SECOND = rf"(?P<second>{NUM})" -TIMESTAMP = rf"(?P<timestamp>{NUM})" +TIMESTAMP = r"(?P<timestamp>[T\d:>+*\-\$]+)" # TODO test lexer & completer for multi spaces in command # For now, redis command can have one space at most -COMMAND = "(\s* (?P<command>[\w -]+))" +COMMAND = r"(\s* (?P<command>[\w -]+))" MILLISECOND = rf"(?P<millisecond>{NUM})" -TIMESTAMPMS = rf"(?P<timestampms>{NUM})" +TIMESTAMPMS = r"(?P<timestampms>[T\d:>+*\-\$]+)" ANY = r"(?P<any>.*)" # TODO deleted START = rf"(?P<start>{NNUM})" END = rf"(?P<end>{NNUM})" @@ -221,15 +235,24 @@ END = rf"(?P<end>{NNUM})" # https://redis.io/topics/streams-intro#special-ids-in-the-streams-api # stream id, DO NOT use r"" here, or the \+ will be two string # NOTE: if miss the outer (), multi IDS won't work. -STREAM_ID = "(?P<stream_id>[T\d:>+*\-\$]+)" +STREAM_ID = r"(?P<stream_id>[T\d:>+*\-\$]+)" DELTA = rf"(?P<delta>{NNUM})" OFFSET = rf"(?P<offset>{NUM})" # string offset, can't be negative -SHARP_OFFSET = f"(?P<offset>\#?{NUM})" # for bitfield command +SHARP_OFFSET = rf"(?P<offset>\#?{NUM})" # for bitfield command +MIN = rf"(?P<min>{NNUM})" +MAX = rf"(?P<max>{NNUM})" +POSITION = rf"(?P<position>{NNUM})" +SCORE = rf"(?P<score>{_FLOAT})" +LEXMIN = rf"(?P<lexmin>{LEXNUM})" +LEXMAX = rf"(?P<lexmax>{LEXNUM})" +WEIGHTS = rf"(?P<weights>{_FLOAT}(\s+{_FLOAT})*)" +IP_PORT = rf"(?P<ip_port>{IP}:{PORT})" +HOST = rf"(?P<host>{VALID_TOKEN})" MIN = rf"(?P<min>{NNUM})" MAX = rf"(?P<max>{NNUM})" POSITION = rf"(?P<position>{NNUM})" -TIMEOUT = rf"(?P<timeout>{NUM})" +TIMEOUT = rf"(?P<timeout>{DOUBLE})" SCORE = rf"(?P<score>{_FLOAT})" LEXMIN = rf"(?P<lexmin>{LEXNUM})" LEXMAX = rf"(?P<lexmax>{LEXNUM})" @@ -267,6 +290,7 @@ ON_OFF = rf"(?P<on_off>{c('on_off')})" CONST_ID = rf"(?P<const_id>{c('const_id')})" CONST_USER = rf"(?P<const_user>{c('const_user')})" ADDR = rf"(?P<addr>{c('addr')})" +LADDR = rf"(?P<laddr>{c('laddr')})" SKIPME = rf"(?P<skipme>{c('skipme')})" YES = rf"(?P<yes>{c('yes')})" MIGRATECHOICE = rf"(?P<migratechoice>{c('migratechoice')})" @@ -329,6 +353,16 @@ WITHMATCHLEN_CONST = rf"(?P<withmatchlen_const>{c('withmatchlen_const')})" STRINGS_CONST = rf"(?P<strings_const>{c('strings_const')})" RANK_CONST = rf"(?P<rank_const>{c('rank_const')})" +LR_CONST = rf"(?P<lr_const>{c('lr_const')})" +PAUSE_TYPE = rf"(?P<pause_type>{c('pause_type')})" +DB_CONST = rf"(?P<db_const>{c('db_const')})" +REPLACE_CONST = rf"(?P<replace_const>{c('replace_const')})" +TO_CONST = rf"(?P<to_const>{c('to_const')})" +TIMEOUT_CONST = rf"(?P<timeout_const>{c('timeout_const')})" +ABORT_CONST = rf"(?P<abort_const>{c('abort_const')})" +PXAT_CONST = rf"(?P<pxat_const>{c('pxat_const')})" +EXAT_CONST = rf"(?P<exat_const>{c('exat_const')})" + command_grammar = compile(COMMAND) # Here are the core grammars, those are tokens after ``command``. @@ -339,14 +373,6 @@ command_grammar = compile(COMMAND) GRAMMAR = { "command_key": rf"\s+ {KEY} \s*", "command_pattern": rf"\s+ {PATTERN} \s*", - "command_georadiusbymember": rf""" - \s+ {KEY} \s+ {MEMBER} - \s+ {FLOAT} \s+ {DISTUNIT} - (\s+ {GEOCHOICE})* - (\s+ {COUNT_CONST} \s+ {COUNT})? - (\s+ {ORDER})? - (\s+ {CONST_STORE} \s+ {KEY})? - (\s+ {CONST_STOREDIST} \s+ {KEY})? \s*""", "command_command": rf"\s+ {COMMAND} \s*", "command_slots": rf"\s+ {SLOTS} \s*", "command_node": rf"\s+ {NODE} \s*", @@ -370,8 +396,12 @@ GRAMMAR = { "command_messagex": rf"(\s+{MESSAGE})? \s*", "command_index": rf"\s+ {INDEX} \s*", "command_index_index": rf"\s+ {INDEX} \s+ {INDEX} \s*", - "command_type_conntype_x": rf""" - (\s+ {TYPE_CONST} \s+ {CONNTYPE})? \s*""", + "command_client_list": rf""" + ( + (\s+ {TYPE_CONST} \s+ {CONNTYPE})| + (\s+ {CONST_ID} \s+ {CLIENTIDS}) + )* + \s*""", "command_clientid_errorx": rf"\s+ {CLIENTID} (\s+ {ERROR})? \s*", "command_keys": rf"\s+ {KEYS} \s*", "command_key_value": rf"\s+ {KEY} \s+ {VALUE} \s*", @@ -388,7 +418,7 @@ GRAMMAR = { "command_key_newkey_timeout": rf"\s+ {KEY} \s+ {NEWKEY} \s+ {TIMEOUT} \s*", "command_keys_timeout": rf"\s+ {KEYS} \s+ {TIMEOUT} \s*", "command_count_timeout": rf"\s+ {COUNT} \s+ {TIMEOUT} \s*", - "command_timeout": rf"\s+ {TIMEOUT} \s*", + "command_pause": rf"\s+ {TIMEOUT} (\s+ {PAUSE_TYPE})? \s*", "command_key_positionchoice_pivot_value": rf""" \s+ {KEY} \s+ {POSITION_CHOICE} \s+ {VALUE} \s+ {VALUE} \s*""", "command_pass": rf"\s+ {ANY} \s*", @@ -420,10 +450,16 @@ GRAMMAR = { "command_key_members": rf"\s+ {KEY} \s+ {MEMBERS} \s*", "command_geodist": rf"\s+ {KEY} \s+ {MEMBER} \s+ {MEMBER} (\s+ {DISTUNIT})? \s*", "command_key_longitude_latitude_members": rf""" - \s+ {KEY} (\s+ {LONGITUDE} \s+ {LATITUDE} \s {MEMBER})+ \s*""", + \s+ {KEY} + (\s+ {CONDITION})? + (\s+ {CHANGED})? + (\s+ {LONGITUDE} \s+ {LATITUDE} \s {MEMBER})+ + \s*""", "command_destination_keys": rf"\s+ {DESTINATION} \s+ {KEYS} \s*", "command_object_key": rf"\s+ {OBJECT} \s+ {KEY} \s*", "command_key_member": rf"\s+ {KEY} \s+ {MEMBER} \s*", + "command_key_any": rf"\s+ {KEY} \s+ {ANY} \s*", + "command_key_key_any": rf"\s+ {KEY} \s+ {KEY} \s+ {ANY} \s*", "command_key_newkey_member": rf"\s+ {KEY} \s+ {NEWKEY} \s+ {MEMBER} \s*", "command_key_count_x": rf"\s+ {KEY} (\s+ {COUNT})? \s*", "command_key_min_max": rf"\s+ {KEY} \s+ {MIN} \s+ {MAX} \s*", @@ -459,6 +495,7 @@ GRAMMAR = { ( (\s+ {IP_PORT})| (\s+ {ADDR} \s+ {IP_PORT})| + (\s+ {LADDR} \s+ {IP_PORT})| (\s+ {CONST_ID} \s+ {CLIENTID})| (\s+ {TYPE_CONST} \s+ {CONNTYPE})| (\s+ {CONST_USER} \s+ {USERNAME})| @@ -474,12 +511,6 @@ GRAMMAR = { )? (\s+ {CONST_KEYS} \s+ {KEYS})? \s*""", - "command_radius": rf"""\s+ {KEY} - \s+ {LONGITUDE} \s+ {LATITUDE} \s+ {FLOAT} \s+ {DISTUNIT} - (\s+ {GEOCHOICE})* (\s+ {COUNT_CONST} \s+ {COUNT})? - (\s+ {ORDER})? - (\s+ {CONST_STORE} \s+ {KEY})? - (\s+ {CONST_STOREDIST} \s+ {KEY})? \s*""", "command_restore": rf"""\s+ {KEY} \s+ {TIMEOUT} \s+ {VALUE} (\s+ {SUBRESTORE} \s+ {SECOND})? \s*""", "command_pubsubcmd_channels": rf"\s+ {PUBSUBCMD} (\s+ {CHANNEL})+ \s*", @@ -573,7 +604,7 @@ GRAMMAR = { \s+ {ON_OFF} ( (\s+ {REDIRECT_CONST} \s+ {CLIENTID})| - (\s+ {PREFIX_CONST} \s+ {PREFIX})| + (\s+ {PREFIX_CONST} \s+ {PREFIXES})| (\s+ {BCAST_CONST})| (\s+ {OPTIN_CONST})| (\s+ {OPTOUT_CONST})| @@ -607,6 +638,28 @@ GRAMMAR = { (\s+ {MAXLEN} \s+ {LEN}) )* \s*""", + "command_key_key_lr_lr_timeout": rf""" + \s+ {KEY} \s+ {KEY} + \s+ {LR_CONST} \s+ {LR_CONST} + \s+ {TIMEOUT} \s*""", + "command_copy": rf""" + \s+ {KEY} \s+ {KEY} + (\s+ {DB_CONST} \s+ {INDEX})? + (\s+ {REPLACE_CONST})? + \s*""", + "command_failover": rf""" + (\s+ {TO_CONST} \s+ {HOST} \s+ {PORT} (\s+ {FORCE})? )? + (\s+ {ABORT_CONST})? + (\s+ {TIMEOUT_CONST} \s+ {MILLISECOND})? + \s*""", + "command_key_expire": rf""" + \s+ {KEY} + ( + (\s+ {EXPIRATION} \s+ {MILLISECOND})| + (\s+ {PXAT_CONST} \s+ {TIMESTAMPMS})| + (\s+ {EXAT_CONST} \s+ {TIMESTAMP}) + )? + \s*""", } pipeline = r"(?P<shellcommand>\|.*)?" diff --git a/iredis/utils.py b/iredis/utils.py index 7cfae5a..593241b 100644 --- a/iredis/utils.py +++ b/iredis/utils.py @@ -14,7 +14,7 @@ logger = logging.getLogger(__name__) _last_timer = time.time() _timer_counter = 0 -sperator = re.compile(r"\s") +separator = re.compile(r"\s") logger.debug(f"[timer] start on {_last_timer}") @@ -73,8 +73,8 @@ def strip_quote_args(s): word.append(char) # not in quote else: - # sperator - if sperator.match(char): + # separator + if separator.match(char): if word: yield "".join(word) word = [] |