You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2020/07/23 18:21:59 UTC

[couchdb] 02/06: mutate node id of non-leaf, non-root nodes on delete

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch prototype/fdb-layer-ebtree-immutable
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 8190602097de859ce364503c831f2777c45b17f9
Author: Robert Newson <rn...@apache.org>
AuthorDate: Thu Jul 23 19:01:02 2020 +0100

    mutate node id of non-leaf, non-root nodes on delete
---
 src/ebtree/src/ebtree.erl | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/ebtree/src/ebtree.erl b/src/ebtree/src/ebtree.erl
index 418bd5e..cf8ac91 100644
--- a/src/ebtree/src/ebtree.erl
+++ b/src/ebtree/src/ebtree.erl
@@ -643,20 +643,38 @@ delete(Tx, #tree{} = Tree, #node{} = Parent0, Key) ->
             end, Members2, NewNodes),
 
             Parent1 = Parent0#node{
-                %% TODO change id
                 members = Members3
             },
+            Parent2 = if
+                Parent1#node.id == ?NODE_ROOT_ID ->
+                    Parent1;
+                Parent0#node.members == Parent1#node.members ->
+                    Parent1;
+                true ->
+                    clear_node(Tx, Tree, Parent1),
+                    Parent1#node{id = new_node_id(Tx, Tree)}
+            end,
 
             clear_nodes(Tx, Tree, [Child0, Sibling]),
             set_nodes(Tx, Tree, NewNodes),
-            Parent1;
+            Parent2;
         false ->
             set_node(Tx, Tree, Child1),
             {_OldFirstKey, _OldLastKey, ChildId0, _OldReduction} = lists:keyfind(ChildId0, 3, Parent0#node.members),
-            Parent0#node{
+            Parent1 = Parent0#node{
                 members = lists:keyreplace(ChildId0, 3, Parent0#node.members,
                     {first_key(Child1), last_key(Child1), Child1#node.id, reduce_node(Tree, Child1)})
-            }
+            },
+            Parent2 = if
+                Parent1#node.id == ?NODE_ROOT_ID ->
+                    Parent1;
+                Parent0#node.members == Parent1#node.members ->
+                    Parent1;
+                true ->
+                    clear_node(Tx, Tree, Parent1),
+                    Parent1#node{id = new_node_id(Tx, Tree)}
+            end,
+            Parent2
     end.