more tests

Signed-off-by: xbasel <[email protected]>

Author: xbasel

src/unit/test_files.h

@@ -204,6 +204,8 @@ int test_demotion_ht_to_single(int argc, char **argv, int flags);
 int test_update_same_bucket_noop(int argc, char **argv, int flags);
 int test_update_entry_within_same_bucket(int argc, char **argv, int flags);
 int test_update_entry_across_buckets(int argc, char **argv, int flags);
+int test_bucket_order_by_expiry(int argc, char **argv, int flags);
+int test_bucket_lookup_strictly_below(int argc, char **argv, int flags);
 int test_ziplistCreateIntList(int argc, char **argv, int flags);
 int test_ziplistPop(int argc, char **argv, int flags);
 int test_ziplistGetElementAtIndex3(int argc, char **argv, int flags);
@@ -265,6 +267,7 @@ unitTest __test_util_c[] = {{"test_string2ll", test_string2ll}, {"test_string2l"
 unitTest __test_valkey_strtod_c[] = {{"test_valkey_strtod", test_valkey_strtod}, {NULL, NULL}};
 unitTest __test_vector_c[] = {{"test_vector", test_vector}, {NULL, NULL}};
 unitTest __test_volatile_set_c[] = {{"test_basic", test_basic}, {"test_update_entry", test_update_entry}, {"test_hashtable", test_hashtable}, {"test_promotion", test_promotion}, {"test_demotion_ht_to_single", test_demotion_ht_to_single}, {"test_update_same_bucket_noop", test_update_same_bucket_noop}, {"test_update_entry_within_same_bucket", test_update_entry_within_same_bucket}, {"test_update_entry_across_buckets", test_update_entry_across_buckets}, {NULL, NULL}};
+unitTest __test_volatile_set_c[] = {{"test_basic", test_basic}, {"test_update_entry", test_update_entry}, {"test_hashtable", test_hashtable}, {"test_promotion", test_promotion}, {"test_demotion_ht_to_single", test_demotion_ht_to_single}, {"test_update_same_bucket_noop", test_update_same_bucket_noop}, {"test_update_entry_within_same_bucket", test_update_entry_within_same_bucket}, {"test_update_entry_across_buckets", test_update_entry_across_buckets}, {"test_bucket_order_by_expiry", test_bucket_order_by_expiry}, {"test_bucket_lookup_strictly_below", test_bucket_lookup_strictly_below}, {NULL, NULL}};
 unitTest __test_ziplist_c[] = {{"test_ziplistCreateIntList", test_ziplistCreateIntList}, {"test_ziplistPop", test_ziplistPop}, {"test_ziplistGetElementAtIndex3", test_ziplistGetElementAtIndex3}, {"test_ziplistGetElementOutOfRange", test_ziplistGetElementOutOfRange}, {"test_ziplistGetLastElement", test_ziplistGetLastElement}, {"test_ziplistGetFirstElement", test_ziplistGetFirstElement}, {"test_ziplistGetElementOutOfRangeReverse", test_ziplistGetElementOutOfRangeReverse}, {"test_ziplistIterateThroughFullList", test_ziplistIterateThroughFullList}, {"test_ziplistIterateThroughListFrom1ToEnd", test_ziplistIterateThroughListFrom1ToEnd}, {"test_ziplistIterateThroughListFrom2ToEnd", test_ziplistIterateThroughListFrom2ToEnd}, {"test_ziplistIterateThroughStartOutOfRange", test_ziplistIterateThroughStartOutOfRange}, {"test_ziplistIterateBackToFront", test_ziplistIterateBackToFront}, {"test_ziplistIterateBackToFrontDeletingAllItems", test_ziplistIterateBackToFrontDeletingAllItems}, {"test_ziplistDeleteInclusiveRange0To0", test_ziplistDeleteInclusiveRange0To0}, {"test_ziplistDeleteInclusiveRange0To1", test_ziplistDeleteInclusiveRange0To1}, {"test_ziplistDeleteInclusiveRange1To2", test_ziplistDeleteInclusiveRange1To2}, {"test_ziplistDeleteWithStartIndexOutOfRange", test_ziplistDeleteWithStartIndexOutOfRange}, {"test_ziplistDeleteWithNumOverflow", test_ziplistDeleteWithNumOverflow}, {"test_ziplistDeleteFooWhileIterating", test_ziplistDeleteFooWhileIterating}, {"test_ziplistReplaceWithSameSize", test_ziplistReplaceWithSameSize}, {"test_ziplistReplaceWithDifferentSize", test_ziplistReplaceWithDifferentSize}, {"test_ziplistRegressionTestForOver255ByteStrings", test_ziplistRegressionTestForOver255ByteStrings}, {"test_ziplistRegressionTestDeleteNextToLastEntries", test_ziplistRegressionTestDeleteNextToLastEntries}, {"test_ziplistCreateLongListAndCheckIndices", test_ziplistCreateLongListAndCheckIndices}, {"test_ziplistCompareStringWithZiplistEntries", test_ziplistCompareStringWithZiplistEntries}, {"test_ziplistMergeTest", test_ziplistMergeTest}, {"test_ziplistStressWithRandomPayloadsOfDifferentEncoding", test_ziplistStressWithRandomPayloadsOfDifferentEncoding}, {"test_ziplistCascadeUpdateEdgeCases", test_ziplistCascadeUpdateEdgeCases}, {"test_ziplistInsertEdgeCase", test_ziplistInsertEdgeCase}, {"test_ziplistStressWithVariableSize", test_ziplistStressWithVariableSize}, {"test_BenchmarkziplistFind", test_BenchmarkziplistFind}, {"test_BenchmarkziplistIndex", test_BenchmarkziplistIndex}, {"test_BenchmarkziplistValidateIntegrity", test_BenchmarkziplistValidateIntegrity}, {"test_BenchmarkziplistCompareWithString", test_BenchmarkziplistCompareWithString}, {"test_BenchmarkziplistCompareWithNumber", test_BenchmarkziplistCompareWithNumber}, {"test_ziplistStress__ziplistCascadeUpdate", test_ziplistStress__ziplistCascadeUpdate}, {NULL, NULL}};
 unitTest __test_zipmap_c[] = {{"test_zipmapIterateWithLargeKey", test_zipmapIterateWithLargeKey}, {"test_zipmapIterateThroughElements", test_zipmapIterateThroughElements}, {NULL, NULL}};
 unitTest __test_zmalloc_c[] = {{"test_zmallocInitialUsedMemory", test_zmallocInitialUsedMemory}, {"test_zmallocAllocReallocCallocAndFree", test_zmallocAllocReallocCallocAndFree}, {"test_zmallocAllocZeroByteAndFree", test_zmallocAllocZeroByteAndFree}, {NULL, NULL}};

src/unit/test_volatile_set.c

@@ -441,3 +441,78 @@ static void crash_duplicate_in_hashtable(void) {
 //
 //     return 0;
 // }
+
+int test_bucket_order_by_expiry(int argc, char **argv, int flags) {
+    UNUSED(argc); UNUSED(argv); UNUSED(flags);
+
+    volatile_set *vset = createVolatileSet(NULL);
+
+    long long expiries[] = {180000, 60000, 120000}; // intentionally unordered
+    long long expected[] = {60000, 120000, 180000};
+
+    for (int i = 0; i < 3; i++) {
+        char f[16], v[16];
+        snprintf(f, sizeof(f), "f%lld", expiries[i]);
+        snprintf(v, sizeof(v), "v%lld", expiries[i]);
+        entry *e = entryCreate(createSds(f), createSds(v), expiries[i]);
+        TEST_ASSERT(volatileSetAddEntry(vset, e, expiries[i]) == 1);
+    }
+
+    raxIterator ri;
+    raxStart(&ri, vset->expiry_buckets);
+    raxSeek(&ri, ">=", NULL, 0);
+
+    int i = 0;
+    while (raxNext(&ri)) {
+        long long ts;
+        memcpy(&ts, ri.key, sizeof(ts));
+        ts = ntohu64(ts); // convert back from BE
+        TEST_ASSERT(ts == expected[i]);
+        i++;
+    }
+    TEST_ASSERT(i == 3); // Ensure we saw all buckets
+
+    raxStop(&ri);
+    freeVolatileSet(vset);
+    return 0;
+}
+
+int test_bucket_lookup_strictly_below(int argc, char **argv, int flags) {
+    UNUSED(argc); UNUSED(argv); UNUSED(flags);
+
+    volatile_set *vset = createVolatileSet(NULL);
+    long long buckets[] = {60000, 120000, 180000};
+    entry *e[3];
+
+    for (int i = 0; i < 3; i++) {
+        char f[16], v[16];
+        snprintf(f, sizeof(f), "f%lld", buckets[i]);
+        snprintf(v, sizeof(v), "v%lld", buckets[i]);
+        e[i] = entryCreate(createSds(f), createSds(v), buckets[i]);
+        TEST_ASSERT(volatileSetAddEntry(vset, e[i], buckets[i]) == 1);
+    }
+
+    // Try to find the bucket just below or equal to 119000 → should get 60000
+    long long lookup_ts = 119000;
+    unsigned char lookup_key[VSET_BUCKET_KEY_LEN] = {0};
+    encodeExpiryBucketKey(lookup_key, lookup_ts);
+
+    raxIterator ri;
+    raxStart(&ri, vset->expiry_buckets);
+    raxSeek(&ri, ">=", lookup_key, sizeof(long long));
+
+    if (!raxPrev(&ri)) {
+        TEST_ASSERT(!"Expected to find bucket below");
+    } else {
+        long long ts;
+        memcpy(&ts, ri.key, sizeof(ts));
+        ts = ntohu64(ts);
+
+        TEST_ASSERT(ts == 60000);
+        // TEST_ASSERT(ri.data == e[0]); // matches entry at 60000
+    }
+
+    raxStop(&ri);
+    freeVolatileSet(vset);
+    return 0;
+}