Backtestshugorun-20261002-200313#15207
panic: slice bounds out of range in contentNodeShifter.Delete when removing draft pages from a multilingual taxonomy
Our patch was judged better than the merged fix.
In this judgment, Patch B = our agent, Patch A = the merged fix.
The two production fixes are essentially identical. Both change the `Delete` and `DeleteFunc` shifter contracts to return an updated node. Both stop mutating the `contentNodes` slice in place while ranging over it, which is the root cause: `append(v[:i], v[i+1:]...)` inside a range shifts elements under the iterator. This corrupts the shared backing array, leaves a stale duplicated tail in the stored value, and later causes the slice-bounds panic. Both then re-insert the updated value into the tree when something was deleted but the node isn't empty. They also handle `DeleteFuncRaw` the same way. Minor code differences are negligible: - B preallocates `kept` with `make` and adds a comment explaining why the slice is never modified in place. - A uses nil-initialised `remaining` and a separate `vv` variable in the default case. The difference is in the tests. **Patch A** tests only the shifter in isolation with a hand-rolled fake node type. It checks the returned counts and `updated` values. It never exercises the tree path that actually panicked: repeated `NodeShiftTree.delete` calls on the same key, with the updated value stored back. **Patch B** tests through the real `NodeShiftTree` with real `resourceSource` nodes: - It deletes languages sequentially in a non-trivial order, which is the multi-delete scenario that left a stale tail and panicked. - After each step it verifies the stored raw value's length and identity. - It checks that repeated deletes are no-ops and that the original slice isn't mutated. - It covers nested `contentNodesMap` inside `contentNodes`. - It covers `DeleteFuncRaw` with adjacent and trailing deletions, which is exactly the skip-element bug the old in-place loop had. These tests reproduce the reported failure mode end-to-end and would fail against the old logic. B's tests are therefore materially stronger and more faithful to the issue, so B wins.
The judge saw only the two patches, labelled A and B in random order, with issue links and version numbers removed. The reasoning above is shown verbatim.
Solve
1h 10m
Wall-clock time in the container
Full test suite
No new failures
3,699 passed · 99 skipped · 3,807 total
Contamination audit
Clean
No sign the agent saw the real fix
Patch size
223vs 161 merged
Changed lines, ours vs merged
The issue
View on GitHubWhat version of Hugo are you using?
Reproduced on both:
hugo v0.159.1-86c7d3afacab79dc53325602d77ef884b7570268+extended darwin/arm64
hugo v0.164.0+extended+withdeploy darwin/arm64
Does this issue reproduce with the latest release?
Yes (0.164.0).
What did you expect to see?
A production build (no -D) of a multilingual site containing draft pages completes.
What did you see instead?
panic: runtime error: slice bounds out of range [5:4]
goroutine 37 [running]:
github.com/gohugoio/hugo/hugolib.(*contentNodeShifter).Delete(0x..., {0x..., 0x...}, {0x2, 0x0, 0x0})
github.com/gohugoio/hugo/hugolib/content_map_page_contentnodeshifter.go:48 +0x5f4
github.com/gohugoio/hugo/hugolib/doctree.(*NodeShiftTree[...]).delete(0x..., {0x..., 0x35})
github.com/gohugoio/hugo/hugolib/doctree/nodeshifttree.go:165 +0x84
github.com/gohugoio/hugo/hugolib/doctree.(*NodeShiftTree[...]).Delete(...)
github.com/gohugoio/hugo/hugolib/doctree/nodeshifttree.go:107
github.com/gohugoio/hugo/hugolib.(*allPagesAssembler).createAllPages.func1-range1(...)
github.com/gohugoio/hugo/hugolib/content_map_page_assembler.go:106 +0xa4
github.com/gohugoio/hugo/hugolib.(*allPagesAssembler).createAllPages(...)
github.com/gohugoio/hugo/hugolib/content_map_page_assembler.go:138 +0x168
github.com/gohugoio/hugo/hugolib.(*HugoSites).assemble(...)
github.com/gohugoio/hugo/hugolib/hugo_sites_build.go:345 +0x41c
The 0x35 in delete(..., {…, 0x35}) is 53, exactly the byte length of the key being removed (/blog/ plus a 47-character slug).
Only on the page-removal path
hugo -D (drafts included) builds fine. The panic appears only when a page is removed from the tree, which makes it invisible in local preview and fatal only in production.
A future publishDate panics identically. Setting [_build] render = "never" / list = "never" on the same pages avoids it entirely — consistent with those pages never being added to the tree, so nothing is deleted.
What I ruled out
Site: 8 languages, ~1,490 pages per language, ~11,455 content files, categories taxonomy.
- Not a regression. 0.159.1 and 0.164.0 behave identically.
- Not the number of drafts. 96 draft pages build fine; 16 panic.
- Not slug length. The panicking key was 47 chars, but renaming an unrelated post to exactly 47 chars builds fine.
- Not the slug. Renaming the offending page does not help.
- Not byte layout. Deleting a front-matter line, or adding a blank one, still panics.
Swapping page content at a fixed path isolates it to front matter. Changing categories = ["Airport Operations"] on the offending page to any other value clears the panic — and so does moving a different page out of that same category while leaving the offending one alone. So the trigger is combinatorial: some particular set of pages being deleted from one taxonomy term corrupts the shifter, rather than any single page being malformed.
Reproducer
I have not managed to minimise it, and I want to be upfront about that. Synthetic multilingual sites (8 languages, 12 blog + 200 glossary pages sharing one taxonomy term, varying draft counts) do not reproduce, so something else in the real tree is required. The affected repository is private.
I am happy to run patches or instrumented builds against the real site and report back, which may be faster than guessing at a minimal case.
The two patches
hugolib/content_map_page_contentnodeshifter.goindex 04f632f75..43c6318be 100644@@ -25,7 +25,7 @@ type contentNodeShifter struct { conf config.AllProvider // Used for logging/debugging. } -func (s *contentNodeShifter) Delete(n contentNode, vec sitesmatrix.Vector) (contentNode, bool, bool) {+func (s *contentNodeShifter) Delete(n contentNode, vec sitesmatrix.Vector) (contentNode, contentNode, bool, bool) { switch v := n.(type) { case contentNodesMap: deleted, wasDeleted := v[vec]@@ -33,49 +33,61 @@ func (s *contentNodeShifter) Delete(n contentNode, vec sitesmatrix.Vector) (cont delete(v, vec) resource.MarkStale(deleted) }- return deleted, wasDeleted, len(v) == 0+ return v, deleted, wasDeleted, len(v) == 0 case contentNodeForSite: if v.siteVector() != vec {- return nil, false, false+ return v, nil, false, false } resource.MarkStale(v)- return v, true, true+ return nil, v, true, true case contentNodes:- var deleted contentNodes- for i, nn := range v {- if vv, ok, _ := s.Delete(nn, vec); ok {+ // Note that we build a new slice here and never modify v in place,+ // as v may be shared and we're iterating over it.+ var (+ deleted contentNodes+ kept = make(contentNodes, 0, len(v))+ )+ for _, nn := range v {+ updated, vv, ok, isEmpty := s.Delete(nn, vec)+ if ok { deleted = append(deleted, vv)- v = append(v[:i], v[i+1:]...)+ }+ if !isEmpty {+ kept = append(kept, updated) } } if len(deleted) == 0 {- return nil, false, false+ return v, nil, false, false }- return deleted, true, len(v) == 0+ return kept, deleted, true, len(kept) == 0 default: v = v.(contentNodeSingle) // Ensure single node. resource.MarkStale(v)- return v, true, true+ return nil, v, true, true } } -func (s *contentNodeShifter) DeleteFunc(v contentNode, f func(n contentNode) bool) bool {+func (s *contentNodeShifter) DeleteFunc(v contentNode, f func(n contentNode) bool) (contentNode, bool) { switch ss := v.(type) { case contentNodeSingle: if f(ss) { resource.MarkStale(ss)- return true+ return nil, true }- return false+ return ss, false case contentNodes:- for i, n := range ss {+ // Note that we build a new slice here and never modify ss in place,+ // as ss may be shared and we're iterating over it.+ kept := make(contentNodes, 0, len(ss))+ for _, n := range ss { if f(n) { resource.MarkStale(n)- ss = append(ss[:i], ss[i+1:]...)+ } else {+ kept = append(kept, n) } }- return len(ss) == 0+ return kept, len(kept) == 0 case contentNodesMap: for k, n := range ss { if f(n) {@@ -83,7 +95,7 @@ func (s *contentNodeShifter) DeleteFunc(v contentNode, f func(n contentNode) boo delete(ss, k) } }- return len(ss) == 0+ return ss, len(ss) == 0 default: panic(fmt.Sprintf("DeleteFunc: unknown type %T", v)) }hugolib/content_map_page_contentnodeshifter_test.gonew file mode 100644index 000000000..4842e7d98@@ -0,0 +1,141 @@+// Copyright 2025 The Hugo Authors. All rights reserved.+//+// Licensed under the Apache License, Version 2.0 (the "License");+// you may not use this file except in compliance with the License.+// You may obtain a copy of the License at+// http://www.apache.org/licenses/LICENSE-2.0+//+// Unless required by applicable law or agreed to in writing, software+// distributed under the License is distributed on an "AS IS" BASIS,+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+// See the License for the specific language governing permissions and+// limitations under the License.++package hugolib++import (+ "testing"++ qt "github.com/frankban/quicktest"+ "github.com/gohugoio/hugo/hugolib/doctree"+ "github.com/gohugoio/hugo/hugolib/sitesmatrix"+)++func newTestContentNodeShiftTree() *doctree.NodeShiftTree[contentNode] {+ return doctree.New(+ doctree.Config[contentNode]{+ Shifter: &contentNodeShifter{},+ TransformerRaw: &contentNodeTransformerRaw{},+ },+ )+}++func newTestResourceSource(lang int) *resourceSource {+ return (&resourceSource{}).assignSiteVector(sitesmatrix.Vector{lang, 0, 0})+}++func newTestResourceSourcesForLanguages(n int) contentNodes {+ var nodes contentNodes+ for i := range n {+ nodes = append(nodes, newTestResourceSource(i))+ }+ return nodes+}++// assertSameContentNodes asserts that got holds exactly the nodes in want, by identity.+func assertSameContentNodes(c *qt.C, got contentNode, want ...contentNode) {+ c.Helper()+ gotNodes, ok := got.(contentNodes)+ c.Assert(ok, qt.IsTrue, qt.Commentf("got %T", got))+ c.Assert(gotNodes, qt.HasLen, len(want))+ for i := range want {+ c.Assert(gotNodes[i], qt.Equals, want[i], qt.Commentf("index %d", i))+ }+}++func TestContentNodeShifterDeleteFromContentNodes(t *testing.T) {+ c := qt.New(t)++ const key = "/blog/mypost"++ tree := newTestContentNodeShiftTree()+ nodes := newTestResourceSourcesForLanguages(6)+ tree.InsertRaw(key, nodes)++ // Delete languages in an order that used to leave a stale, duplicated+ // tail in the stored slice, which panicked with a "slice bounds out of range".+ for i, lang := range []int{0, 5, 2, 3, 1} {+ deleted, ok := tree.Shape(sitesmatrix.Vector{lang, 0, 0}).Delete(key)+ c.Assert(ok, qt.IsTrue, qt.Commentf("lang %d", lang))+ assertSameContentNodes(c, deleted, nodes[lang])++ v, found := tree.GetRaw(key)+ c.Assert(found, qt.IsTrue)+ c.Assert(v.(contentNodes), qt.HasLen, 6-(i+1))+ // Deleting the same language again is a no-op.+ _, ok = tree.Shape(sitesmatrix.Vector{lang, 0, 0}).Delete(key)+ c.Assert(ok, qt.IsFalse)+ }++ v, _ := tree.GetRaw(key)+ assertSameContentNodes(c, v, nodes[4])++ // The original slice must not have been modified in place.+ for i, n := range nodes {+ c.Assert(n.(*resourceSource).sv, qt.Equals, sitesmatrix.Vector{i, 0, 0})+ }++ _, ok := tree.Shape(sitesmatrix.Vector{4, 0, 0}).Delete(key)+ c.Assert(ok, qt.IsTrue)+ _, found := tree.GetRaw(key)+ c.Assert(found, qt.IsFalse)+}++func TestContentNodeShifterDeleteFromContentNodesWithMap(t *testing.T) {+ c := qt.New(t)++ const key = "/blog/mypost"++ tree := newTestContentNodeShiftTree()+ m := contentNodesMap{+ {1, 0, 0}: newTestResourceSource(1),+ {2, 0, 0}: newTestResourceSource(2),+ }+ other := newTestResourceSource(3)+ tree.InsertRaw(key, contentNodes{m, other})++ // Deleting one language from the nested map must keep the other language.+ _, ok := tree.Shape(sitesmatrix.Vector{1, 0, 0}).Delete(key)+ c.Assert(ok, qt.IsTrue)+ v, _ := tree.GetRaw(key)+ c.Assert(v.(contentNodes), qt.HasLen, 2)+ c.Assert(tree.Shape(sitesmatrix.Vector{1, 0, 0}).Get(key), qt.IsNil)+ c.Assert(tree.Shape(sitesmatrix.Vector{2, 0, 0}).Get(key), qt.Equals, m[sitesmatrix.Vector{2, 0, 0}])+ c.Assert(tree.Shape(sitesmatrix.Vector{3, 0, 0}).Get(key), qt.Equals, contentNode(other))+}++func TestContentNodeShifterDeleteFuncRawFromContentNodes(t *testing.T) {+ c := qt.New(t)++ const key = "/blog/mypost"++ tree := newTestContentNodeShiftTree()+ nodes := newTestResourceSourcesForLanguages(6)+ tree.InsertRaw(key, nodes)++ // Delete two adjacent and one trailing node in one pass.+ toDelete := map[contentNode]bool{nodes[1]: true, nodes[2]: true, nodes[5]: true}+ _, count := tree.DeleteFuncRaw(key, func(n contentNode) bool {+ return toDelete[n]+ })+ c.Assert(count, qt.Equals, 3)++ v, found := tree.GetRaw(key)+ c.Assert(found, qt.IsTrue)+ assertSameContentNodes(c, v, nodes[0], nodes[3], nodes[4])++ _, count = tree.DeleteFuncRaw(key, func(n contentNode) bool { return true })+ c.Assert(count, qt.Equals, 3)+ _, found = tree.GetRaw(key)+ c.Assert(found, qt.IsFalse)+}hugolib/doctree/nodeshiftree_test.goindex 1d17a4129..a969b43fc 100644@@ -258,12 +258,15 @@ func (s *testShifter) Insert(old, new *testValue) (*testValue, *testValue, bool) return new, old, true } -func (s *testShifter) Delete(n *testValue, dimension sitesmatrix.Vector) (*testValue, bool, bool) {- return nil, true, true+func (s *testShifter) Delete(n *testValue, dimension sitesmatrix.Vector) (*testValue, *testValue, bool, bool) {+ return nil, n, true, true } -func (s *testShifter) DeleteFunc(v *testValue, f func(*testValue) bool) bool {- return f(v)+func (s *testShifter) DeleteFunc(v *testValue, f func(*testValue) bool) (*testValue, bool) {+ if f(v) {+ return nil, true+ }+ return v, false } func (s *testShifter) Shift(n *testValue, dimension sitesmatrix.Vector, fallback bool) (v *testValue, ok bool) {hugolib/doctree/nodeshifttree.goindex 0ccf3eba3..92a0fb336 100644@@ -49,12 +49,14 @@ type ( // and a bool indicating if an existing record is updated. Insert(old, new T) (T, T, bool) - // Delete deletes T from the given dimension and returns the deleted T and whether the dimension was deleted and if it's empty after the delete.- Delete(v T, dimension sitesmatrix.Vector) (T, bool, bool)+ // Delete deletes T from the given dimension.+ // It returns the updated T (to be stored back in the tree), the deleted T,+ // whether the dimension was deleted and if it's empty after the delete.+ Delete(v T, dimension sitesmatrix.Vector) (T, T, bool, bool) // DeleteFunc deletes nodes in v from the tree where the given function returns true.- // It returns true if it's empty after the delete.- DeleteFunc(v T, f func(n T) bool) bool+ // It returns the updated T (to be stored back in the tree) and true if it's empty after the delete.+ DeleteFunc(v T, f func(n T) bool) (T, bool) // Shift shifts v into the given dimension, // if fallback is true, it will fall back a fallback match if found.@@ -118,7 +120,7 @@ func (r *NodeShiftTree[T]) DeleteFuncRaw(key string, f func(T) bool) (T, int) { return lastDeleted, count } - isEmpty := r.shifter.DeleteFunc(v, func(n T) bool {+ updated, isEmpty := r.shifter.DeleteFunc(v, func(n T) bool { if f(n) { count++ lastDeleted = n@@ -129,6 +131,8 @@ func (r *NodeShiftTree[T]) DeleteFuncRaw(key string, f func(T) bool) (T, int) { if isEmpty { r.tree.Delete(key)+ } else if count > 0 {+ r.tree.Insert(key, updated) } return lastDeleted, count@@ -161,10 +165,15 @@ func (r *NodeShiftTree[T]) delete(key string) (T, bool) { var wasDeleted bool var deleted T if v, ok := r.tree.Get(key); ok {- var isEmpty bool- deleted, wasDeleted, isEmpty = r.shifter.Delete(v, r.siteVector)+ var (+ updated T+ isEmpty bool+ )+ updated, deleted, wasDeleted, isEmpty = r.shifter.Delete(v, r.siteVector) if isEmpty { r.tree.Delete(key)+ } else if wasDeleted {+ r.tree.Insert(key, updated) } } return deleted, wasDeleted
hugolib/content_map_page_contentnodeshifter.goindex 04f632f75..2d8bfa105 100644@@ -25,7 +25,7 @@ type contentNodeShifter struct { conf config.AllProvider // Used for logging/debugging. } -func (s *contentNodeShifter) Delete(n contentNode, vec sitesmatrix.Vector) (contentNode, bool, bool) {+func (s *contentNodeShifter) Delete(n contentNode, vec sitesmatrix.Vector) (contentNode, contentNode, bool, bool) { switch v := n.(type) { case contentNodesMap: deleted, wasDeleted := v[vec]@@ -33,49 +33,53 @@ func (s *contentNodeShifter) Delete(n contentNode, vec sitesmatrix.Vector) (cont delete(v, vec) resource.MarkStale(deleted) }- return deleted, wasDeleted, len(v) == 0+ return v, deleted, wasDeleted, len(v) == 0 case contentNodeForSite: if v.siteVector() != vec {- return nil, false, false+ return v, nil, false, false } resource.MarkStale(v)- return v, true, true+ return nil, v, true, true case contentNodes:- var deleted contentNodes- for i, nn := range v {- if vv, ok, _ := s.Delete(nn, vec); ok {+ var deleted, remaining contentNodes+ for _, nn := range v {+ updated, vv, ok, isEmpty := s.Delete(nn, vec)+ if ok { deleted = append(deleted, vv)- v = append(v[:i], v[i+1:]...)+ }+ if !isEmpty {+ remaining = append(remaining, updated) } } if len(deleted) == 0 {- return nil, false, false+ return v, nil, false, false }- return deleted, true, len(v) == 0+ return remaining, deleted, true, len(remaining) == 0 default:- v = v.(contentNodeSingle) // Ensure single node.- resource.MarkStale(v)- return v, true, true-+ vv := v.(contentNodeSingle) // Ensure single node.+ resource.MarkStale(vv)+ return nil, vv, true, true } } -func (s *contentNodeShifter) DeleteFunc(v contentNode, f func(n contentNode) bool) bool {+func (s *contentNodeShifter) DeleteFunc(v contentNode, f func(n contentNode) bool) (contentNode, bool) { switch ss := v.(type) { case contentNodeSingle: if f(ss) { resource.MarkStale(ss)- return true+ return nil, true }- return false+ return ss, false case contentNodes:- for i, n := range ss {+ var remaining contentNodes+ for _, n := range ss { if f(n) { resource.MarkStale(n)- ss = append(ss[:i], ss[i+1:]...)+ } else {+ remaining = append(remaining, n) } }- return len(ss) == 0+ return remaining, len(remaining) == 0 case contentNodesMap: for k, n := range ss { if f(n) {@@ -83,7 +87,7 @@ func (s *contentNodeShifter) DeleteFunc(v contentNode, f func(n contentNode) boo delete(ss, k) } }- return len(ss) == 0+ return ss, len(ss) == 0 default: panic(fmt.Sprintf("DeleteFunc: unknown type %T", v)) }hugolib/content_map_page_contentnodeshifter_test.gonew file mode 100644index 000000000..f8d2c07bc@@ -0,0 +1,79 @@+// Copyright 2025 The Hugo Authors. All rights reserved.+//+// Licensed under the Apache License, Version 2.0 (the "License");+// you may not use this file except in compliance with the License.+// You may obtain a copy of the License at+// http://www.apache.org/licenses/LICENSE-2.0+//+// Unless required by applicable law or agreed to in writing, software+// distributed under the License is distributed on an "AS IS" BASIS,+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+// See the License for the specific language governing permissions and+// limitations under the License.++package hugolib++import (+ "testing"++ qt "github.com/frankban/quicktest"+ "github.com/gohugoio/hugo/hugolib/sitesmatrix"+)++type testContentNodeForSite struct {+ vec sitesmatrix.Vector+}++func (n *testContentNodeForSite) Path() string { return "/test" }+func (n *testContentNodeForSite) nodeCategorySingle() {}+func (n *testContentNodeForSite) siteVector() sitesmatrix.Vector { return n.vec }+func (n *testContentNodeForSite) forEeachContentNode(f func(sitesmatrix.Vector, contentNode) bool) bool {+ return f(n.vec, n)+}++// See issue 15207.+func TestContentNodeShifterDeleteMultipleFromNodes(t *testing.T) {+ c := qt.New(t)++ s := &contentNodeShifter{}+ vec := sitesmatrix.Vector{2, 0, 0}+ other := sitesmatrix.Vector{1, 0, 0}++ newNodes := func() contentNodes {+ return contentNodes{+ &testContentNodeForSite{vec: other},+ &testContentNodeForSite{vec: vec},+ &testContentNodeForSite{vec: other},+ &testContentNodeForSite{vec: other},+ &testContentNodeForSite{vec: vec},+ }+ }++ updated, deleted, wasDeleted, isEmpty := s.Delete(newNodes(), vec)+ c.Assert(wasDeleted, qt.IsTrue)+ c.Assert(isEmpty, qt.IsFalse)+ c.Assert(deleted.(contentNodes), qt.HasLen, 2)+ remaining := updated.(contentNodes)+ c.Assert(remaining, qt.HasLen, 3)+ for _, n := range remaining {+ c.Assert(n.(contentNodeForSite).siteVector(), qt.Equals, other)+ }++ // Delete all.+ updated, deleted, wasDeleted, isEmpty = s.Delete(contentNodes{+ &testContentNodeForSite{vec: vec},+ &testContentNodeForSite{vec: vec},+ }, vec)+ c.Assert(wasDeleted, qt.IsTrue)+ c.Assert(isEmpty, qt.IsTrue)+ c.Assert(deleted.(contentNodes), qt.HasLen, 2)+ c.Assert(updated, qt.IsNil)++ // Delete none.+ nodes := contentNodes{&testContentNodeForSite{vec: other}}+ updated, deleted, wasDeleted, isEmpty = s.Delete(nodes, vec)+ c.Assert(wasDeleted, qt.IsFalse)+ c.Assert(isEmpty, qt.IsFalse)+ c.Assert(deleted, qt.IsNil)+ c.Assert(updated.(contentNodes), qt.HasLen, 1)+}hugolib/doctree/nodeshiftree_test.goindex 1d17a4129..a969b43fc 100644@@ -258,12 +258,15 @@ func (s *testShifter) Insert(old, new *testValue) (*testValue, *testValue, bool) return new, old, true } -func (s *testShifter) Delete(n *testValue, dimension sitesmatrix.Vector) (*testValue, bool, bool) {- return nil, true, true+func (s *testShifter) Delete(n *testValue, dimension sitesmatrix.Vector) (*testValue, *testValue, bool, bool) {+ return nil, n, true, true } -func (s *testShifter) DeleteFunc(v *testValue, f func(*testValue) bool) bool {- return f(v)+func (s *testShifter) DeleteFunc(v *testValue, f func(*testValue) bool) (*testValue, bool) {+ if f(v) {+ return nil, true+ }+ return v, false } func (s *testShifter) Shift(n *testValue, dimension sitesmatrix.Vector, fallback bool) (v *testValue, ok bool) {hugolib/doctree/nodeshifttree.goindex 0ccf3eba3..f2cec9f26 100644@@ -49,12 +49,14 @@ type ( // and a bool indicating if an existing record is updated. Insert(old, new T) (T, T, bool) - // Delete deletes T from the given dimension and returns the deleted T and whether the dimension was deleted and if it's empty after the delete.- Delete(v T, dimension sitesmatrix.Vector) (T, bool, bool)+ // Delete deletes T from the given dimension.+ // It returns the updated T, the deleted T, whether anything was deleted+ // and whether T is empty after the delete.+ Delete(v T, dimension sitesmatrix.Vector) (T, T, bool, bool) - // DeleteFunc deletes nodes in v from the tree where the given function returns true.- // It returns true if it's empty after the delete.- DeleteFunc(v T, f func(n T) bool) bool+ // DeleteFunc deletes nodes in v where the given function returns true.+ // It returns the updated T and whether it's empty after the delete.+ DeleteFunc(v T, f func(n T) bool) (T, bool) // Shift shifts v into the given dimension, // if fallback is true, it will fall back a fallback match if found.@@ -118,7 +120,7 @@ func (r *NodeShiftTree[T]) DeleteFuncRaw(key string, f func(T) bool) (T, int) { return lastDeleted, count } - isEmpty := r.shifter.DeleteFunc(v, func(n T) bool {+ updated, isEmpty := r.shifter.DeleteFunc(v, func(n T) bool { if f(n) { count++ lastDeleted = n@@ -129,6 +131,8 @@ func (r *NodeShiftTree[T]) DeleteFuncRaw(key string, f func(T) bool) (T, int) { if isEmpty { r.tree.Delete(key)+ } else if count > 0 {+ r.tree.Insert(key, updated) } return lastDeleted, count@@ -161,10 +165,15 @@ func (r *NodeShiftTree[T]) delete(key string) (T, bool) { var wasDeleted bool var deleted T if v, ok := r.tree.Get(key); ok {- var isEmpty bool- deleted, wasDeleted, isEmpty = r.shifter.Delete(v, r.siteVector)+ var (+ updated T+ isEmpty bool+ )+ updated, deleted, wasDeleted, isEmpty = r.shifter.Delete(v, r.siteVector) if isEmpty { r.tree.Delete(key)+ } else if wasDeleted {+ r.tree.Insert(key, updated) } } return deleted, wasDeleted