slipenkomk/valkey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix reply schemas validator build issue due to new regular expression (#13103)

Browse Source 
The new regular expression break the validator:
```
In file included from commands.c:10:
commands_with_reply_schema.def:14528:72: error: stray ‘\’ in program
14528 | struct jsonObjectElement MEMORY_STATS_ReplySchema_patternProperties__db\_\d+__properties_overhead_hashtable_main_elements[] = {
```

The reason is that special characters are not added to to_c_name,
causes special characters to appear in the structure name, causing
c file compilation to fail.

Broken by #12913
This commit is contained in:
Binbin 2024-03-03 03:26:05 +08:00 committed by GitHub
parent a50bbcb656
commit df75153d79
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/generate-command-code.py
View File

@ -242,7 +242,8 @@ class Argument(object):
def to_c_name(str):
return str.replace(":", "").replace(".", "_").replace("$", "_")\
.replace("^", "_").replace("*", "_").replace("-", "_")
.replace("^", "_").replace("*", "_").replace("-", "_") \
.replace("\\", "_").replace("+", "_")
class ReplySchema(object):
@ -285,7 +286,7 @@ class ReplySchema(object):
t = "JSON_TYPE_INTEGER"
vstr = ".value.integer=%d" % v
return "%s,\"%s\",%s" % (t, k, vstr)
return "%s,%s,%s" % (t, json.dumps(k), vstr)
for k, v in self.schema.items():
if isinstance(v, ReplySchema):