diff options
| author | Oran Agra <oran@redislabs.com> | 2022-08-15 21:41:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-15 21:41:44 +0300 |
| commit | ac1cc5a6e15bd73bbb7ee9eff950850fdc69a31a (patch) | |
| tree | ab9b4dd6eb8727ed9e081f3bea9fad02ad2797a9 /src/redis-check-rdb.c | |
| parent | 1189680edd99742e3938be71a6ef3965a468b353 (diff) | |
| download | redis-ac1cc5a6e15bd73bbb7ee9eff950850fdc69a31a.tar.gz | |
Trim rdb loading code for pre-release formats (#11058)
The initial module format introduced in 4.0 RC1 and was changed in RC2
The initial function format introduced in 7.0 RC1 and changed in RC3
Diffstat (limited to 'src/redis-check-rdb.c')
| -rw-r--r-- | src/redis-check-rdb.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/redis-check-rdb.c b/src/redis-check-rdb.c index 959768991..cedfd84cb 100644 --- a/src/redis-check-rdb.c +++ b/src/redis-check-rdb.c @@ -85,8 +85,9 @@ char *rdb_type_string[] = { "zset-v1", "hash-hashtable", "zset-v2", + "module-pre-release", "module-value", - "","", + "", "hash-zipmap", "list-ziplist", "set-intset", @@ -312,10 +313,13 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) { robj *o = rdbLoadCheckModuleValue(&rdb,name); decrRefCount(o); continue; /* Read type again. */ - } else if (type == RDB_OPCODE_FUNCTION || type == RDB_OPCODE_FUNCTION2) { + } else if (type == RDB_OPCODE_FUNCTION_PRE_GA) { + rdbCheckError("Pre-release function format not supported %d",rdbver); + goto err; + } else if (type == RDB_OPCODE_FUNCTION2) { sds err = NULL; rdbstate.doing = RDB_CHECK_DOING_READ_FUNCTIONS; - if (rdbFunctionLoad(&rdb, rdbver, NULL, type, 0, &err) != C_OK) { + if (rdbFunctionLoad(&rdb, rdbver, NULL, 0, &err) != C_OK) { rdbCheckError("Failed loading library, %s", err); sdsfree(err); goto err; |