You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Merge branch 'main' into backup/redis-stream-encoder
Resolve conflicts after PR #790 (zset encoder) merged to main:
- redis_string.go: take main's pendingTTL infrastructure (which
includes PR #790's r14 Finalize warn predicate plus all prior
fixes); add stream-specific bits — redisKindStream constant,
streams map field, NewRedisDB init, HandleTTL redisKindStream
branch, Finalize flushStreams call. Extracted
inlineWideColumnTTL helper so HandleTTL stays under cyclop=10
with the 5th wide-column branch.
- redis_string_test.go: take main's version (already has the
warnFieldsContain helper and FinalizeWarnsOnOverflowOnly test
landed via PR #790 r14 mirror).
- redis_stream_test.go: remove TestRedisDB_SetTTLArrivesBeforeRows
duplicate (now in main via PR #790).
- redis_set.go: take main's PR #790 attribution.
No semantic change beyond what was already in PR #790. Stream
encoder bits remain unchanged from this PR's pre-merge state.
0 commit comments