Merge pull request #22117 from Grivn/fix/legacy-null-tree

data: read empty trees from older repaired snapshots
This commit is contained in:
Michael Eischer authored and GitHub committed 2026-11-15 19:27:39 +01:00
commit 516c8d32e0
3 files changed
+66 -13

No files matched your search

+21 -13
View File
@@ -25,8 +25,9 @@ import (
var ErrTreeNotOrdered = errors.New("nodes are not ordered or duplicate")
type treeIterator struct {
dec json.Decoder
started bool
dec json.Decoder
started bool
nodesNull bool
}
type NodeOrError struct {
@@ -87,10 +88,15 @@ func (t *treeIterator) init() error {
return errors.Errorf("error decoding tree: expected string key, got %v", token)
}
if key == "nodes" {
// Found "nodes", proceed to read the array
if err := t.assertToken(json.Delim('[')); err != nil {
token, err := t.dec.Token()
if err != nil {
return err
}
if token != nil && token != json.Delim('[') {
return errors.Errorf("error decoding tree: expected [, got %v", token)
}
// A null node list encodes an empty tree in older repaired snapshots.
t.nodesNull = token == nil
return nil
}
// Unknown key, decode its value into RawMessage and discard it
@@ -102,17 +108,19 @@ func (t *treeIterator) init() error {
}
func (t *treeIterator) next() (*Node, error) {
if t.dec.More() {
var n Node
err := t.dec.Decode(&n)
if err != nil {
if !t.nodesNull {
if t.dec.More() {
var n Node
err := t.dec.Decode(&n)
if err != nil {
return nil, err
}
return &n, nil
}
if err := t.assertToken(json.Delim(']')); err != nil {
return nil, err
}
return &n, nil
}
if err := t.assertToken(json.Delim(']')); err != nil {
return nil, err
}
// Skip unknown keys after the array until we find the closing brace
for {
+36
View File
@@ -295,6 +295,42 @@ func TestTreeIteratorUnknownKeys(t *testing.T) {
}
}
func TestTreeIteratorNullNodes(t *testing.T) {
for _, tc := range []struct {
name string
input string
wantErr bool
}{
{"null", `{"nodes":null}`, false},
{"unknown key before", `{"extra":{"nested":[1,2]},"nodes":null}`, false},
{"unknown key after", `{"nodes":null,"extra":{"nested":[1,2]}}`, false},
{"unknown keys around", `{"before":true,"nodes":null,"after":[1,2]}`, false},
{"boolean", `{"nodes":false}`, true},
{"number", `{"nodes":0}`, true},
{"string", `{"nodes":""}`, true},
{"object", `{"nodes":{}}`, true},
{"invalid trailing value", `{"nodes":null,"extra":]}`, true},
} {
t.Run(tc.name, func(t *testing.T) {
it, err := data.NewTreeNodeIterator(strings.NewReader(tc.input))
items := 0
if err == nil {
for item := range it {
items++
err = item.Error
rtest.Assert(t, item.Node == nil, "unexpected node: %v", item.Node)
}
}
if tc.wantErr {
rtest.Assert(t, err != nil, "expected invalid tree to fail")
} else {
rtest.OK(t, err)
rtest.Equals(t, 0, items)
}
})
}
}
func BenchmarkLoadTree(t *testing.B) {
repository.BenchmarkAllVersions(t, benchmarkLoadTree)
}