addressing comments

Signed-off-by: Sarthak Aggarwal <[email protected]>

Author: sarthakaggarwal97

src/hashtable.c

@@ -72,7 +72,6 @@ uint64_t siphash_nocase(const uint8_t *in, const size_t inlen, const uint8_t *k)
 /* --- Global variables --- */
 
 static uint8_t hash_function_seed[16];
-static uint8_t db_hash_function_seed[16];
 static hashtableResizePolicy resize_policy = HASHTABLE_RESIZE_ALLOW;
 
 /* --- Fill factor --- */
@@ -113,14 +112,6 @@ uint64_t hashtableGenCaseHashFunction(const char *buf, size_t len) {
     return siphash_nocase((const uint8_t *)buf, len, hash_function_seed);
 }
 
-void dbHashtableSetHashFunctionSeed(uint8_t *seed) {
-    memcpy(db_hash_function_seed, seed, sizeof(db_hash_function_seed));
-}
-
-uint64_t dbHashtableGenHashFunction(const void *key, size_t len) {
-    return siphash(key, len, db_hash_function_seed);
-}
-
 /* --- Global resize policy API --- */
 
 /* The global resize policy is one of

src/hashtable.h

@@ -110,8 +110,6 @@ void hashtableSetHashFunctionSeed(const uint8_t *seed);
 uint8_t *hashtableGetHashFunctionSeed(void);
 uint64_t hashtableGenHashFunction(const char *buf, size_t len);
 uint64_t hashtableGenCaseHashFunction(const char *buf, size_t len);
-void dbHashtableSetHashFunctionSeed(uint8_t *seed);
-uint64_t dbHashtableGenHashFunction(const void *key, size_t len);
 
 /* Global resize policy */
 void hashtableSetResizePolicy(hashtableResizePolicy policy);

src/server.c

@@ -573,7 +573,7 @@ hashtableType zsetHashtableType = {
 };
 
 uint64_t hashtableSdsHash(const void *key) {
-    return dbHashtableGenHashFunction((const char *)key, sdslen((char *)key));
+    return hashtableGenHashFunction((const char *)key, sdslen((char *)key));
 }
 
 const void *hashtableObjectGetKey(const void *entry) {
@@ -7136,7 +7136,6 @@ __attribute__((weak)) int main(int argc, char **argv) {
     getRandomBytes(hashseed, sizeof(hashseed));
     dictSetHashFunctionSeed(hashseed);
     hashtableSetHashFunctionSeed(hashseed);
-    dbHashtableSetHashFunctionSeed(hashseed);
 
     char *exec_name = strrchr(argv[0], '/');
     if (exec_name == NULL) exec_name = argv[0];
@@ -7295,7 +7294,7 @@ __attribute__((weak)) int main(int argc, char **argv) {
     if (server.db_hash_seed != NULL) {
         memset(hashseed, 0, sizeof(hashseed));
         getHashSeedFromValue(hashseed, sizeof(hashseed), server.db_hash_seed);
-        dbHashtableSetHashFunctionSeed(hashseed);
+        hashtableSetHashFunctionSeed(hashseed);
     }
 
     /* Do system checks */

src/server.h

@@ -2213,7 +2213,7 @@ struct valkeyServer {
                                                             * dropping packets of a specific type */
     unsigned long cluster_blacklist_ttl;                   /* Duration in seconds that a node is denied re-entry into
                                                             * the cluster after it is forgotten with CLUSTER FORGET. */
-    char *db_hash_seed;                                    /* Configurable DB hash seed */
+    sds db_hash_seed;                                      /* Configurable DB hash seed */
     int cluster_slot_stats_enabled;                        /* Cluster slot usage statistics tracking enabled. */
     mstime_t cluster_mf_timeout;                           /* Milliseconds to do a manual failover. */
     unsigned long cluster_slot_migration_log_max_len;      /* Maximum count of migrations to display in the

tests/integration/scan-consistency-on-failover.tcl

@@ -1,21 +1,4 @@
 start_server {tags {"scan-consistency-on-failover external:skip"}} {
-    proc full_scan_keys {c prefix} {
-        set cur 0
-        set out {}
-        while {1} {
-            # count 1 to make the ordering fully observable
-            set res [$c scan $cur count 1]
-            set cur  [lindex $res 0]
-            set keys [lindex $res 1]
-            foreach k $keys {
-                if {[string match "${prefix}*" $k]} {
-                    lappend out $k
-                }
-            }
-            if {$cur eq "0"} break
-        }
-        return $out
-    }
 
     set fixed_seed "00112233445566778899aabbccddeeff"
     set shared_overrides [list appendonly no save "" db-hash-seed $fixed_seed activedefrag no hz 1]
@@ -25,9 +8,6 @@ start_server {tags {"scan-consistency-on-failover external:skip"}} {
         set primary_port [srv 0 port]
 
         start_server [list overrides $shared_overrides] {
-            set replica_host [srv 0 host]
-            set replica_port [srv 0 port]
-
             set primary [srv -1 client]
             set replica [srv 0 client]
 
@@ -46,26 +26,13 @@ start_server {tags {"scan-consistency-on-failover external:skip"}} {
                 fail "replica did not catch up dbsize (primary=[$primary dbsize], replica=[$replica dbsize])"
             }
 
-            wait_for_condition 200 50 {
-                ![string match {Hash table 1 stats*} [$primary debug htstats 9]] &&
-                ![string match {Hash table 1 stats*} [$replica debug htstats 9]] &&
-                [dict get [$primary memory stats] db.dict.rehashing.count] == 0 &&
-                [dict get [$replica memory stats] db.dict.rehashing.count] == 0
-            } else {
-                fail "hash tables still rehashing on primary/replica"
+            set cursor {{0} {}}
+            while {1} {
+                set cursor_next [$primary scan [lindex $cursor 0]]
+                assert_equal $cursor_next [$replica scan [lindex $cursor 0]]
+                if {[lindex $cursor_next 0] eq "0"} break
+                set cursor $cursor_next
             }
-
-            set pseed [$primary config get db-hash-seed]
-            set rseed [$replica config get db-hash-seed]
-            assert_equal $pseed $rseed
-
-            set pkeys [full_scan_keys $primary "k:"]
-            set rkeys [full_scan_keys $replica "k:"]
-
-            assert_equal [$primary dbsize] [llength $pkeys]
-            assert_equal [$replica  dbsize] [llength $rkeys]
-            assert_equal [llength $pkeys] [llength $rkeys]
-            assert_equal $pkeys $rkeys
         }
     }
 }