-
Notifications
You must be signed in to change notification settings - Fork 2
backup: Redis set encoder (Phase 0a) #758
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.
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
1
commit into
main
Choose a base branch
from
feat/backup-phase0a-redis-set
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+616
−1
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,236 @@ | ||
| package backup | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "encoding/binary" | ||
| "encoding/json" | ||
| "math" | ||
| "path/filepath" | ||
| "sort" | ||
|
|
||
| cockroachdberr "github.com/cockroachdb/errors" | ||
| ) | ||
|
|
||
| // Redis set encoder. Translates raw !st|... snapshot records into the | ||
| // per-set `sets/<key>.json` shape defined by Phase 0 | ||
| // (docs/design/2026_04_29_proposed_snapshot_logical_decoder.md). | ||
| // | ||
| // Wire format mirrors store/set_helpers.go: | ||
| // - !st|meta|<userKeyLen(4)><userKey> → 8-byte BE Len | ||
| // - !st|mem|<userKeyLen(4)><userKey><member> → empty value; the | ||
| // member bytes live in the key (binary-safe, per Redis's SADD | ||
| // contract). | ||
| // - !st|meta|d|<userKeyLen(4)><userKey>... → 8-byte LenDelta; | ||
| // skipped silently. Same policy as hash deltas: !st|mem| keys | ||
| // are the source of truth at backup time, and delta arithmetic | ||
| // does not need to be replayed. | ||
| const ( | ||
| RedisSetMetaPrefix = "!st|meta|" | ||
| RedisSetMemberPrefix = "!st|mem|" | ||
| RedisSetMetaDeltaPrefix = "!st|meta|d|" | ||
| ) | ||
|
|
||
| // ErrRedisInvalidSetMeta is returned when an !st|meta| value is not | ||
| // the expected 8-byte big-endian member count. | ||
| var ErrRedisInvalidSetMeta = cockroachdberr.New("backup: invalid !st|meta| value") | ||
|
|
||
| // ErrRedisInvalidSetKey is returned when an !st| key cannot be parsed | ||
| // for its userKeyLen+userKey (or member) segments. | ||
| var ErrRedisInvalidSetKey = cockroachdberr.New("backup: malformed !st| key") | ||
|
|
||
| // redisSetState buffers one userKey's set during a snapshot scan. | ||
| // Members are stored as a map keyed by their byte string so duplicate | ||
| // HandleSetMember calls collapse idempotently (a snapshot iterator | ||
| // that re-emits a member is harmless — Redis sets are mathematical | ||
| // sets, not multisets). | ||
| type redisSetState struct { | ||
| metaSeen bool | ||
| declaredLen int64 | ||
| members map[string]struct{} | ||
| expireAtMs uint64 | ||
| hasTTL bool | ||
| } | ||
|
|
||
| // HandleSetMeta processes one !st|meta|<len><userKey> record. The | ||
| // value is the 8-byte BE member count. We park the declared length | ||
| // so flushSets can warn on a mismatch with the observed member | ||
| // count and register the user key so a later !redis|ttl|<userKey> | ||
| // record routes back to this set state. | ||
| // | ||
| // !st|meta|d|... delta keys share the !st|meta| string prefix, so a | ||
| // snapshot dispatcher that routes by "starts with RedisSetMetaPrefix" | ||
| // lands delta records here too. The hash encoder solved the analogous | ||
| // problem (Codex P1 round 14 PR #725) by silently skipping the delta | ||
| // family; we mirror that policy because !st|mem| records are the | ||
| // source of truth for the restored set contents. | ||
| func (r *RedisDB) HandleSetMeta(key, value []byte) error { | ||
| if bytes.HasPrefix(key, []byte(RedisSetMetaDeltaPrefix)) { | ||
| return nil | ||
| } | ||
| userKey, ok := parseSetMetaKey(key) | ||
| if !ok { | ||
| return cockroachdberr.Wrapf(ErrRedisInvalidSetKey, "meta key: %q", key) | ||
| } | ||
| if len(value) != redisUint64Bytes { | ||
| return cockroachdberr.Wrapf(ErrRedisInvalidSetMeta, | ||
| "length %d != %d", len(value), redisUint64Bytes) | ||
| } | ||
| // Bounds-check the uint64 declared count before narrowing to | ||
| // int64; without this a corrupted store with the high bit set | ||
| // would wrap to a negative declaredLen and fire spurious | ||
| // redis_set_length_mismatch warnings on every flush. Mirrors | ||
| // the hash + list encoders' symmetric guard. | ||
| rawLen := binary.BigEndian.Uint64(value) | ||
| if rawLen > math.MaxInt64 { | ||
| return cockroachdberr.Wrapf(ErrRedisInvalidSetMeta, | ||
| "declared len %d overflows int64", rawLen) | ||
| } | ||
| st := r.setState(userKey) | ||
| st.declaredLen = int64(rawLen) //nolint:gosec // bounds-checked above | ||
| st.metaSeen = true | ||
| return nil | ||
| } | ||
|
|
||
| // HandleSetMember processes one !st|mem|<len><userKey><member> | ||
| // record. The value is empty by design (Redis sets store the member | ||
| // bytes in the key, not the value), so HandleSetMember discards the | ||
| // value argument; the member bytes are extracted from the key's | ||
| // trailing segment. | ||
| func (r *RedisDB) HandleSetMember(key, _ []byte) error { | ||
| userKey, member, ok := parseSetMemberKey(key) | ||
| if !ok { | ||
| return cockroachdberr.Wrapf(ErrRedisInvalidSetKey, "member key: %q", key) | ||
| } | ||
| st := r.setState(userKey) | ||
| st.members[string(member)] = struct{}{} | ||
| return nil | ||
| } | ||
|
|
||
| // HandleSetMetaDelta accepts and discards one !st|meta|d|... record. | ||
| // See HandleSetMeta's docstring for the rationale; !st|mem| is the | ||
| // source of truth at backup time. | ||
| func (r *RedisDB) HandleSetMetaDelta(_, _ []byte) error { return nil } | ||
|
|
||
| // setState lazily creates per-key state. Mirrors the hash/list | ||
| // kindByKey-registration pattern so HandleSetMeta, HandleSetMember, | ||
| // and the HandleTTL back-edge all agree on the kind. | ||
| func (r *RedisDB) setState(userKey []byte) *redisSetState { | ||
| uk := string(userKey) | ||
| if st, ok := r.sets[uk]; ok { | ||
| return st | ||
| } | ||
| st := &redisSetState{members: make(map[string]struct{})} | ||
| r.sets[uk] = st | ||
| r.kindByKey[uk] = redisKindSet | ||
| return st | ||
| } | ||
|
|
||
| // parseSetMetaKey strips !st|meta| and the 4-byte BE userKeyLen | ||
| // prefix. Returns (userKey, true) on success. Delta keys | ||
| // (!st|meta|d|...) share the meta string prefix and would otherwise | ||
| // be parsed as base-meta with a garbage userKeyLen — refuse them | ||
| // at the boundary so a misrouted delta surfaces a parse error | ||
| // rather than silent state corruption. Mirrors parseHashMetaKey's | ||
| // delta guard. | ||
| func parseSetMetaKey(key []byte) ([]byte, bool) { | ||
| if bytes.HasPrefix(key, []byte(RedisSetMetaDeltaPrefix)) { | ||
| return nil, false | ||
| } | ||
| rest := bytes.TrimPrefix(key, []byte(RedisSetMetaPrefix)) | ||
| if len(rest) == len(key) { | ||
| return nil, false | ||
| } | ||
| return parseUserKeyLenPrefix(rest) | ||
| } | ||
|
|
||
| // parseSetMemberKey strips !st|mem| and the 4-byte BE userKeyLen | ||
| // prefix, then returns (userKey, member, true). The member bytes | ||
| // are everything after the userKey segment — binary-safe per | ||
| // Redis's SADD contract. | ||
| func parseSetMemberKey(key []byte) ([]byte, []byte, bool) { | ||
| rest := bytes.TrimPrefix(key, []byte(RedisSetMemberPrefix)) | ||
| if len(rest) == len(key) { | ||
| return nil, nil, false | ||
| } | ||
| userKey, ok := parseUserKeyLenPrefix(rest) | ||
| if !ok { | ||
| return nil, nil, false | ||
| } | ||
| member := rest[hashUserKeyLenSize+len(userKey):] | ||
| return userKey, member, true | ||
| } | ||
|
|
||
| // flushSets writes one JSON file per accumulated set to | ||
| // sets/<encoded>.json. Empty sets (Len=0, no members) still emit a | ||
| // file when meta was seen, mirroring the hash/list encoders: their | ||
| // existence is observable to clients (TYPE returns "set", SCARD | ||
| // returns 0). Mismatched declared-vs-observed length surfaces an | ||
| // `redis_set_length_mismatch` warning. | ||
| func (r *RedisDB) flushSets() error { | ||
| return flushWideColumnDir(r, r.sets, "sets", func(dir, uk string, st *redisSetState) error { | ||
| if r.warn != nil && st.metaSeen && int64(len(st.members)) != st.declaredLen { | ||
| r.warn("redis_set_length_mismatch", | ||
| "user_key_len", len(uk), | ||
| "declared_len", st.declaredLen, | ||
| "observed_members", len(st.members), | ||
| "hint", "meta record's Len does not match the count of !st|mem| keys for this user key") | ||
| } | ||
| return r.writeSetJSON(dir, []byte(uk), st) | ||
| }) | ||
| } | ||
|
|
||
| func (r *RedisDB) writeSetJSON(dir string, userKey []byte, st *redisSetState) error { | ||
| encoded := EncodeSegment(userKey) | ||
| if err := r.recordIfFallback(encoded, userKey); err != nil { | ||
| return err | ||
| } | ||
| path := filepath.Join(dir, encoded+".json") | ||
| body, err := marshalSetJSON(st) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if err := writeFileAtomic(path, body); err != nil { | ||
| return cockroachdberr.WithStack(err) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // marshalSetJSON renders one set state as the design's | ||
| // `{format_version, members, expire_at_ms}` JSON shape. Members are | ||
| // emitted as an array (not a JSON object) and sorted by raw byte | ||
| // order so identical snapshots produce identical dump output across | ||
| // runs — same rationale as the hash encoder's fields array | ||
| // (binary-safe member names that would collide under JSON object | ||
| // keying when percent-encoded). Each value goes through | ||
| // marshalRedisBinaryValue so non-UTF-8 members round-trip via the | ||
| // `{"base64":"..."}` envelope. | ||
| func marshalSetJSON(st *redisSetState) ([]byte, error) { | ||
| members := make([]string, 0, len(st.members)) | ||
| for m := range st.members { | ||
| members = append(members, m) | ||
| } | ||
| sort.Strings(members) | ||
| out := make([]json.RawMessage, 0, len(members)) | ||
| for _, m := range members { | ||
| v, err := marshalRedisBinaryValue([]byte(m)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| out = append(out, v) | ||
| } | ||
| type record struct { | ||
| FormatVersion uint32 `json:"format_version"` | ||
| Members []json.RawMessage `json:"members"` | ||
| ExpireAtMs *uint64 `json:"expire_at_ms"` | ||
| } | ||
| rec := record{FormatVersion: 1, Members: out} | ||
| if st.hasTTL { | ||
| ms := st.expireAtMs | ||
| rec.ExpireAtMs = &ms | ||
| } | ||
| body, err := json.MarshalIndent(rec, "", " ") | ||
| if err != nil { | ||
| return nil, cockroachdberr.WithStack(err) | ||
| } | ||
| return body, nil | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The constant
hashUserKeyLenSizeappears to be a leftover from the hash encoder implementation. While it likely holds the correct value (4 bytes), using a hash-specific constant in the set encoder is misleading and creates an unnecessary dependency on the hash implementation details. Please define a local constant for the set encoder or use a more generic shared constant if one exists in thebackuppackage.