Skip to content

Fix sparse Lua list pop fallback #1094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bootjp wants to merge 9 commits into
base: design/hotspot-split-m2-store-export
Choose a base branch
from
Open

Fix sparse Lua list pop fallback #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fefd809
Fix sparse Lua list pop fallback
bootjp Jul 16, 2026
e1b32b5
Align ElasticKV proxy socket timeouts
bootjp Jul 16, 2026
cf47858
Replay blocking zset pops deterministically
bootjp Jul 16, 2026
f697640
Cap ElasticKV secondary script concurrency
bootjp Jul 16, 2026
7e40979
Refresh ElasticKV leader after not-leader replies
bootjp Jul 16, 2026
3df9239
Avoid full stream rewrites for Lua XADD
bootjp Jul 16, 2026
d19b2a4
Handle Redis proxy replay edge cases
bootjp Jul 16, 2026
b8bb6ad
Honor Lua XADD cached state
bootjp Jul 16, 2026
adf5cdb
Cover Lua XADD maxlen zero append
bootjp Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
191 changes: 191 additions & 0 deletions adapter/redis_lua_compat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package adapter

import (
"context"
"strconv"
"strings"
"testing"
"time"

Expand Down Expand Up @@ -97,6 +99,195 @@ return {eventId, redis.call("HGET", KEYS[1], "name"), cjson.encode(event), redis
require.Equal(t, map[string]any{"event": "waiting", "jobId": "job-1"}, events[0].Values)
}

func TestRedis_LuaXAddMaxLenExistingStream(t *testing.T) {
nodes, _, _ := createNode(t, 3)
defer shutdown(nodes)

ctx := context.Background()
rdb := redis.NewClient(&redis.Options{Addr: nodes[0].redisAddress})
defer func() { _ = rdb.Close() }()

const stream = "bull:test:events-existing"
for i := range 128 {
_, err := rdb.XAdd(ctx, &redis.XAddArgs{
Stream: stream,
ID: "*",
Values: []string{"i", strconv.Itoa(i)},
}).Result()
require.NoError(t, err)
}

id, err := rdb.Eval(ctx, `
return redis.call("XADD", KEYS[1], "MAXLEN", "~", 10, "*", "event", "waiting", "jobId", "job-1")
`, []string{stream}).Text()
require.NoError(t, err)
require.NotEmpty(t, id)

xlen, err := rdb.XLen(ctx, stream).Result()
require.NoError(t, err)
require.Equal(t, int64(10), xlen)

events, err := rdb.XRange(ctx, stream, "-", "+").Result()
require.NoError(t, err)
require.Len(t, events, 10)
require.Equal(t, id, events[len(events)-1].ID)
require.Equal(t, map[string]any{"event": "waiting", "jobId": "job-1"}, events[len(events)-1].Values)
}

func TestRedis_LuaXAddMaxLenZero(t *testing.T) {
nodes, _, _ := createNode(t, 3)
defer shutdown(nodes)

ctx := context.Background()
rdb := redis.NewClient(&redis.Options{Addr: nodes[0].redisAddress})
defer func() { _ = rdb.Close() }()

const stream = "bull:test:events-maxlen0"
for i := range 3 {
_, err := rdb.XAdd(ctx, &redis.XAddArgs{
Stream: stream,
ID: "*",
Values: []string{"i", strconv.Itoa(i)},
}).Result()
require.NoError(t, err)
}

id, err := rdb.Eval(ctx, `
return redis.call("XADD", KEYS[1], "MAXLEN", "0", "*", "event", "trimmed")
`, []string{stream}).Text()
require.NoError(t, err)
require.NotEmpty(t, id)

xlen, err := rdb.XLen(ctx, stream).Result()
require.NoError(t, err)
require.Equal(t, int64(0), xlen)

events, err := rdb.XRange(ctx, stream, "-", "+").Result()
require.NoError(t, err)
require.Empty(t, events)
}

func TestRedis_LuaXAddMaxLenZeroThenAppendInScript(t *testing.T) {
nodes, _, _ := createNode(t, 3)
defer shutdown(nodes)

ctx := context.Background()
rdb := redis.NewClient(&redis.Options{Addr: nodes[0].redisAddress})
defer func() { _ = rdb.Close() }()

const stream = "bull:test:events-maxlen0-then-append"
result, err := rdb.Eval(ctx, `
local trimmed = redis.call("XADD", KEYS[1], "MAXLEN", "0", "*", "event", "trimmed")
local kept = redis.call("XADD", KEYS[1], "MAXLEN", "1", "*", "event", "kept")
return {trimmed, kept}
`, []string{stream}).Result()
require.NoError(t, err)
ids, ok := result.([]any)
require.True(t, ok)
require.Len(t, ids, 2)

xlen, err := rdb.XLen(ctx, stream).Result()
require.NoError(t, err)
require.Equal(t, int64(1), xlen)

events, err := rdb.XRange(ctx, stream, "-", "+").Result()
require.NoError(t, err)
require.Len(t, events, 1)
require.Equal(t, ids[1], events[0].ID)
require.Equal(t, map[string]any{"event": "kept"}, events[0].Values)
}

func TestRedis_LuaXAddMultipleMaxLenTrimsInScript(t *testing.T) {
nodes, _, _ := createNode(t, 3)
defer shutdown(nodes)

ctx := context.Background()
rdb := redis.NewClient(&redis.Options{Addr: nodes[0].redisAddress})
defer func() { _ = rdb.Close() }()

const stream = "bull:test:events-multi-xadd"
result, err := rdb.Eval(ctx, `
local first = redis.call("XADD", KEYS[1], "MAXLEN", "1", "*", "event", "first")
local second = redis.call("XADD", KEYS[1], "MAXLEN", "1", "*", "event", "second")
return {first, second}
`, []string{stream}).Result()
require.NoError(t, err)
ids, ok := result.([]any)
require.True(t, ok)
require.Len(t, ids, 2)

xlen, err := rdb.XLen(ctx, stream).Result()
require.NoError(t, err)
require.Equal(t, int64(1), xlen)

events, err := rdb.XRange(ctx, stream, "-", "+").Result()
require.NoError(t, err)
require.Len(t, events, 1)
require.Equal(t, ids[1], events[0].ID)
require.Equal(t, map[string]any{"event": "second"}, events[0].Values)
}

func TestRedis_LuaXAddRecreatesTTLExpiredStream(t *testing.T) {
nodes, _, _ := createNode(t, 3)
defer shutdown(nodes)

ctx := context.Background()
rdb := redis.NewClient(&redis.Options{Addr: nodes[0].redisAddress})
defer func() { _ = rdb.Close() }()

const (
stream = "bull:test:events-expired"
ttl = 80 * time.Millisecond
)
_, err := rdb.XAdd(ctx, &redis.XAddArgs{
Stream: stream,
ID: "*",
Values: []string{"event", "old"},
}).Result()
require.NoError(t, err)
require.NoError(t, rdb.PExpire(ctx, stream, ttl).Err())
eventuallyExpired(t, ttl, func() bool {
xlen, err := rdb.XLen(ctx, stream).Result()
return err == nil && xlen == 0
}, "stream must be logically expired before Lua XADD recreates it")

id, err := rdb.Eval(ctx, `
return redis.call("XADD", KEYS[1], "MAXLEN", "~", 10, "*", "event", "new")
`, []string{stream}).Text()
require.NoError(t, err)
require.NotEmpty(t, id)

xlen, err := rdb.XLen(ctx, stream).Result()
require.NoError(t, err)
require.Equal(t, int64(1), xlen)
ttlAfter, err := rdb.TTL(ctx, stream).Result()
require.NoError(t, err)
require.Equal(t, time.Duration(-1), ttlAfter)

events, err := rdb.XRange(ctx, stream, "-", "+").Result()
require.NoError(t, err)
require.Len(t, events, 1)
require.Equal(t, id, events[0].ID)
require.Equal(t, map[string]any{"event": "new"}, events[0].Values)
}

func TestRedis_LuaXAddHonorsScriptLocalStringType(t *testing.T) {
nodes, _, _ := createNode(t, 3)
defer shutdown(nodes)

ctx := context.Background()
rdb := redis.NewClient(&redis.Options{Addr: nodes[0].redisAddress})
defer func() { _ = rdb.Close() }()

const key = "bull:test:events-local-string"
_, err := rdb.Eval(ctx, `
redis.call("SET", KEYS[1], "string-value")
return redis.call("XADD", KEYS[1], "*", "event", "bad")
`, []string{key}).Result()
require.Error(t, err)
require.Contains(t, strings.ToUpper(err.Error()), "WRONGTYPE")
}

func TestRedis_LuaReplyHelpers(t *testing.T) {
nodes, _, _ := createNode(t, 3)
defer shutdown(nodes)
Expand Down
Loading
Loading