Merge remote-tracking branch 'upstream/unstable' into dual_channel_replica_memory

Signed-off-by: Binbin <binloveplay1314@qq.com>

Author: enjoy-binbin

.github/workflows/ci.yml

@@ -78,7 +78,7 @@ jobs:
           CFLAGS='-Werror' ./runtest-moduleapi --tags needs:other-server --verbose --dump-logs \
             --other-server-path tests/tmp/valkey-${{ matrix.server.version }}-noble-x86_64/bin/valkey-server
 
-  test-ubuntu-latest-cmake:
+  test-ubuntu-latest-cmake-tls:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -91,14 +91,15 @@ jobs:
           make -j$(nproc)
       - name: test
         run: |
-          sudo apt-get install -y tcl8.6 tclx
+          sudo apt-get install -y tcl8.6 tclx tcl-tls
+          ./utils/gen-test-certs.sh
           ln -sf $(pwd)/build-release/bin/valkey-server $(pwd)/src/valkey-server
           ln -sf $(pwd)/build-release/bin/valkey-cli $(pwd)/src/valkey-cli
           ln -sf $(pwd)/build-release/bin/valkey-benchmark $(pwd)/src/valkey-benchmark
           ln -sf $(pwd)/build-release/bin/valkey-server $(pwd)/src/valkey-check-aof
           ln -sf $(pwd)/build-release/bin/valkey-server $(pwd)/src/valkey-check-rdb
           ln -sf $(pwd)/build-release/bin/valkey-server $(pwd)/src/valkey-sentinel
-          ./runtest --verbose --tags -slow --dump-logs
+          ./runtest --verbose --tags -slow --dump-logs --tls
       - name: unit tests
         run: |
           ./build-release/bin/valkey-unit-tests

README.md

@@ -143,14 +143,18 @@ To compile against jemalloc on Mac OS X systems, use:
 
 ## Monotonic clock
 
-By default, Valkey will build using the POSIX clock_gettime function as the
-monotonic clock source.  On most modern systems, the internal processor clock
-can be used to improve performance.  Cautions can be found here:
+By default, Valkey uses the processor's internal instruction clock (TSC on x86,
+CNTVCT on ARM) for monotonic time tracking, which provides approximately 3x
+faster time access compared to POSIX clock_gettime (~10-30ns vs ~100ns).
+This is enabled by default on supported architectures (x86_64 Linux and aarch64)
+and automatically falls back to POSIX clock_gettime on unsupported systems.
+
+For more information about processor clock usage, see:
     http://oliveryang.net/2015/09/pitfalls-of-TSC-usage/
 
-To build with support for the processor's internal instruction clock, use:
+To disable the processor clock and force POSIX clock_gettime, use:
 
-    % make CFLAGS="-DUSE_PROCESSOR_CLOCK"
+    % make CFLAGS="-DNO_PROCESSOR_CLOCK"
 
 ## Verbose build
 

deps/fpconv/CMakeLists.txt

@@ -2,3 +2,5 @@ project(fpconv)
 
 set(SRCS "${CMAKE_CURRENT_LIST_DIR}/fpconv_dtoa.c" "${CMAKE_CURRENT_LIST_DIR}/fpconv_dtoa.h")
 add_library(fpconv STATIC ${SRCS})
+# Add -fPIC
+set_target_properties(fpconv PROPERTIES POSITION_INDEPENDENT_CODE ON)

src/CMakeLists.txt

@@ -21,9 +21,12 @@ if (BUILD_LUA)
     add_subdirectory(modules/lua)
     add_dependencies(valkey-server valkeylua)
     target_compile_definitions(valkey-server PRIVATE LUA_ENABLED)
-    target_compile_definitions(valkey-server PRIVATE LUA_LIB=libvalkeylua.so)
-    target_link_options(valkey-server PRIVATE -Wl,--disable-new-dtags)
-
+    if (UNIX AND NOT APPLE)
+        target_compile_definitions(valkey-server PRIVATE LUA_LIB=libvalkeylua.so)
+        target_link_options(valkey-server PRIVATE -Wl,--disable-new-dtags)
+    else ()
+        target_compile_definitions(valkey-server PRIVATE LUA_LIB=libvalkeylua.dylib)
+    endif ()
     set(VALKEY_INSTALL_RPATH "")
     set_target_properties(valkey-server PROPERTIES
         INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"

src/Makefile

@@ -442,13 +442,173 @@ endif
 ENGINE_NAME=valkey
 SERVER_NAME=$(ENGINE_NAME)-server$(PROG_SUFFIX)
 ENGINE_SENTINEL_NAME=$(ENGINE_NAME)-sentinel$(PROG_SUFFIX)
-ENGINE_TRACE_OBJ=trace/trace.o trace/trace_commands.o trace/trace_db.o trace/trace_cluster.o trace/trace_server.o trace/trace_rdb.o trace/trace_aof.o
-ENGINE_SERVER_OBJ=threads_mngr.o adlist.o vector.o quicklist.o ae.o anet.o dict.o hashtable.o kvstore.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o memory_prefetch.o io_threads.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o cluster_legacy.o cluster_slot_stats.o crc16.o cluster_migrateslots.o endianconv.o commandlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crccombine.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o valkey-check-rdb.o valkey-check-aof.o geo.o lazyfree.o module.o lrulfu.o evict.o expire.o geohash.o geohash_helper.o childinfo.o allocator_defrag.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o lolwut9.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script.o functions.o commands.o strl.o connection.o unix.o logreqres.o rdma.o scripting_engine.o entry.o vset.o fifo.o mutexqueue.o
+ENGINE_TRACE_OBJ = \
+    trace/trace.o \
+    trace/trace_aof.o \
+    trace/trace_cluster.o \
+    trace/trace_commands.o \
+    trace/trace_db.o \
+    trace/trace_rdb.o \
+    trace/trace_server.o
+ENGINE_SERVER_OBJ = \
+    acl.o \
+    adlist.o \
+    ae.o \
+    allocator_defrag.o \
+    anet.o \
+    aof.o \
+    bio.o \
+    bitops.o \
+    blocked.o \
+    call_reply.o \
+    childinfo.o \
+    cluster.o \
+    cluster_legacy.o \
+    cluster_migrateslots.o \
+    cluster_slot_stats.o \
+    commandlog.o \
+    commands.o \
+    config.o \
+    connection.o \
+    crc16.o \
+    crc64.o \
+    crccombine.o \
+    crcspeed.o \
+    db.o \
+    debug.o \
+    defrag.o \
+    dict.o \
+    endianconv.o \
+    entry.o \
+    eval.o \
+    evict.o \
+    expire.o \
+    fifo.o \
+    functions.o \
+    geo.o \
+    geohash.o \
+    geohash_helper.o \
+    hashtable.o \
+    hyperloglog.o \
+    intset.o \
+    io_threads.o \
+    kvstore.o \
+    latency.o \
+    lazyfree.o \
+    listpack.o \
+    localtime.o \
+    logreqres.o \
+    lolwut.o \
+    lolwut5.o \
+    lolwut6.o \
+    lolwut9.o \
+    lrulfu.o \
+    lzf_c.o \
+    lzf_d.o \
+    memory_prefetch.o \
+    memtest.o \
+    module.o \
+    monotonic.o \
+    mt19937-64.o \
+    multi.o \
+    mutexqueue.o \
+    networking.o \
+    notify.o \
+    object.o \
+    pqsort.o \
+    pubsub.o \
+    quicklist.o \
+    rand.o \
+    rax.o \
+    rdb.o \
+    rdma.o \
+    release.o \
+    replication.o \
+    resp_parser.o \
+    rio.o \
+    script.o \
+    scripting_engine.o \
+    sds.o \
+    sentinel.o \
+    server.o \
+    setcpuaffinity.o \
+    setproctitle.o \
+    sha1.o \
+    sha256.o \
+    siphash.o \
+    socket.o \
+    sort.o \
+    sparkline.o \
+    strl.o \
+    syncio.o \
+    syscheck.o \
+    t_hash.o \
+    t_list.o \
+    t_set.o \
+    t_stream.o \
+    t_string.o \
+    t_zset.o \
+    threads_mngr.o \
+    timeout.o \
+    tls.o \
+    tracking.o \
+    unix.o \
+    util.o \
+    valkey-check-aof.o \
+    valkey-check-rdb.o \
+    vector.o \
+    vset.o \
+    ziplist.o \
+    zipmap.o \
+    zmalloc.o
 ENGINE_SERVER_OBJ+=$(ENGINE_TRACE_OBJ)
 ENGINE_CLI_NAME=$(ENGINE_NAME)-cli$(PROG_SUFFIX)
-ENGINE_CLI_OBJ=anet.o adlist.o dict.o valkey-cli.o zmalloc.o release.o ae.o serverassert.o crcspeed.o crccombine.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o cli_commands.o sds.o util.o sha256.o
+ENGINE_CLI_OBJ = \
+    adlist.o \
+    ae.o \
+    anet.o \
+    cli_commands.o \
+    cli_common.o \
+    crc16.o \
+    crc64.o \
+    crccombine.o \
+    crcspeed.o \
+    dict.o \
+    monotonic.o \
+    mt19937-64.o \
+    release.o \
+    sds.o \
+    serverassert.o \
+    sha256.o \
+    siphash.o \
+    strl.o \
+    util.o \
+    valkey-cli.o \
+    zmalloc.o
 ENGINE_BENCHMARK_NAME=$(ENGINE_NAME)-benchmark$(PROG_SUFFIX)
-ENGINE_BENCHMARK_OBJ=ae.o anet.o valkey-benchmark.o adlist.o dict.o zmalloc.o serverassert.o release.o crcspeed.o crccombine.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o sds.o util.o sha256.o fuzzer_client.o fuzzer_command_generator.o
+ENGINE_BENCHMARK_OBJ = \
+    adlist.o \
+    ae.o \
+    anet.o \
+    cli_common.o \
+    crc16.o \
+    crc64.o \
+    crccombine.o \
+    crcspeed.o \
+    dict.o \
+    fuzzer_client.o \
+    fuzzer_command_generator.o \
+    monotonic.o \
+    mt19937-64.o \
+    release.o \
+    sds.o \
+    serverassert.o \
+    sha256.o \
+    siphash.o \
+    strl.o \
+    util.o \
+    valkey-benchmark.o \
+    zmalloc.o
 ENGINE_CHECK_RDB_NAME=$(ENGINE_NAME)-check-rdb$(PROG_SUFFIX)
 ENGINE_CHECK_AOF_NAME=$(ENGINE_NAME)-check-aof$(PROG_SUFFIX)
 ENGINE_LIB_NAME=lib$(ENGINE_NAME).a

src/config.c

@@ -37,6 +37,7 @@
 #include "module.h"
 #include "cluster_migrateslots.h"
 #include "eval.h"
+#include "lrulfu.h"
 
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -3330,8 +3331,8 @@ standardConfig static_configs[] = {
     createIntConfig("active-defrag-threshold-lower", NULL, MODIFIABLE_CONFIG, 0, 1000, server.active_defrag_threshold_lower, 10, INTEGER_CONFIG, NULL, NULL),                       /* Default: don't defrag when fragmentation is below 10% */
     createIntConfig("active-defrag-threshold-upper", NULL, MODIFIABLE_CONFIG, 0, 1000, server.active_defrag_threshold_upper, 100, INTEGER_CONFIG, NULL, updateDefragConfiguration), /* Default: maximum defrag force at 100% fragmentation */
     createIntConfig("active-defrag-cycle-us", NULL, MODIFIABLE_CONFIG, 0, 100000, server.active_defrag_cycle_us, 500, INTEGER_CONFIG, NULL, updateDefragConfiguration),
-    createIntConfig("lfu-log-factor", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.lfu_log_factor, 10, INTEGER_CONFIG, NULL, NULL),
-    createIntConfig("lfu-decay-time", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.lfu_decay_time, 1, INTEGER_CONFIG, NULL, NULL),
+    createIntConfig("lfu-log-factor", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, lfu_config_log_factor, 10, INTEGER_CONFIG, NULL, NULL),
+    createIntConfig("lfu-decay-time", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, lfu_config_decay_time, 1, INTEGER_CONFIG, NULL, NULL),
     createIntConfig("replica-priority", "slave-priority", MODIFIABLE_CONFIG, 0, INT_MAX, server.replica_priority, 100, INTEGER_CONFIG, NULL, NULL),
     createIntConfig("repl-diskless-sync-delay", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.repl_diskless_sync_delay, 5, INTEGER_CONFIG, NULL, NULL),
     createIntConfig("maxmemory-samples", NULL, MODIFIABLE_CONFIG, 1, 64, server.maxmemory_samples, 5, INTEGER_CONFIG, NULL, NULL),

src/db.c

@@ -1986,12 +1986,15 @@ void propagateDeletion(serverDb *db, robj *key, int lazy, int slot) {
  *
  * This function builds and propagates a single HDEL command with multiple fields
  * for the given hash object `o`. It temporarily enables replication (if needed),
- * constructs the command using the field names, and sends it via alsoPropagate(). */
-static void propagateFieldsDeletion(serverDb *db, robj *o, size_t n_fields, robj *fields[], int didx) {
+ * constructs the command using the field names, and sends it via alsoPropagate().
+ * Returns how many fields where propagated */
+int propagateFieldsDeletion(serverDb *db, robj *o, size_t n_fields, robj *fields[], int didx) {
     int prev_replication_allowed = server.replication_allowed;
     server.replication_allowed = 1;
 
     robj *argv[EXPIRE_BULK_LIMIT + 2]; /* HDEL + key + fields */
+    if (n_fields > EXPIRE_BULK_LIMIT) n_fields = EXPIRE_BULK_LIMIT;
+
     int argc = 0;
     robj *keyobj = createStringObjectFromSds(objectGetKey(o));
     argv[argc++] = shared.hdel; // HDEL command
@@ -2006,6 +2009,7 @@ static void propagateFieldsDeletion(serverDb *db, robj *o, size_t n_fields, robj
     for (int i = 0; i < argc; i++) {
         decrRefCount(argv[i]);
     }
+    return n_fields;
 }
 
 /* Process expired fields for a hash delete them and propagate changes to replicas and AOF.

src/defrag.c

@@ -239,16 +239,16 @@ robj *activeDefragStringOb(robj *ob) {
 /* Internal function used by zslDefrag */
 static void zslUpdateNode(zskiplist *zsl, zskiplistNode *oldnode, zskiplistNode *newnode, zskiplistNode **update) {
     int i;
-    for (i = 0; i < zsl->level; i++) {
+    for (i = 0; i < zslGetHeight(zsl); i++) {
         if (update[i]->level[i].forward == oldnode) update[i]->level[i].forward = newnode;
     }
-    serverAssert(zsl->header != oldnode);
+    serverAssert(zslGetHeader(zsl) != oldnode);
     if (newnode->level[0].forward) {
         serverAssert(newnode->level[0].forward->backward == oldnode);
         newnode->level[0].forward->backward = newnode;
     } else {
-        serverAssert(zsl->tail == oldnode);
-        zsl->tail = newnode;
+        serverAssert(zslGetTail(zsl) == oldnode);
+        zslSetTail(zsl, newnode);
     }
 }
 
@@ -269,8 +269,8 @@ static void activeDefragZsetNode(void *privdata, void *entry_ref) {
     /* find skiplist pointers that need to be updated if we end up moving the
      * skiplist node. */
     zskiplistNode *update[ZSKIPLIST_MAXLEVEL];
-    zskiplistNode *x = zsl->header;
-    for (int i = zsl->level - 1; i >= 0; i--) {
+    zskiplistNode *x = zslGetHeader(zsl);
+    for (int i = zslGetHeight(zsl) - 1; i >= 0; i--) {
         /* stop when we've reached the end of this level or the next node comes
          * after our target in sorted order */
         zskiplistNode *next = x->level[i].forward;
@@ -453,13 +453,11 @@ static void defragZsetSkiplist(robj *ob) {
 
     zset *newzs;
     zskiplist *newzsl;
-    struct zskiplistNode *newheader;
     if ((newzs = activeDefragAlloc(zs))) {
         objectSetVal(ob, newzs);
         zs = newzs;
     }
     if ((newzsl = activeDefragAlloc(zs->zsl))) zs->zsl = newzsl;
-    if ((newheader = activeDefragAlloc(zs->zsl->header))) zs->zsl->header = newheader;
 
     hashtable *newtable;
     if ((newtable = hashtableDefragTables(zs->ht, activeDefragAlloc))) zs->ht = newtable;