apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-16 02:42:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merging children of DirListEntries now unifies the entries rather than just copying has_know_prefix

Browse Source
This commit is contained in:
A.J. Beamon 2018-05-18 09:41:54 -07:00
parent 9e9a81c96d
commit ce3623978e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bindings/bindingtester/tests/directory_util.py
View File

@ -94,13 +94,19 @@ class DirListEntry:
return subdir._add_child_impl(subpath[1:], child) return subdir._add_child_impl(subpath[1:], child)
def _merge_children(self, other): def _merge_children(self, other):
for c in other.children: if self == other:
return
other_children = other.children.copy()
for c in other_children:
if c not in self.children: if c not in self.children:
self.children[c] = other.children[c] self.children[c] = other_children[c]
else: else:
self.children[c].has_known_prefix = self.children[c].has_known_prefix and other.children[c].has_known_prefix # print('%d, %d. Merging child %r and %r' % (self.dir_id, other.dir_id, self.children[c].path, other_children[c].path))
self.children[c]._merge_children(other.children[c]) other_children[c].has_known_prefix = other_children[c].has_known_prefix and self.children[c].has_known_prefix
old_child = self.children[c]
self.children[c] = other_children[c]
old_child._merge_children(other_children[c])
def setup_directories(instructions, default_path, random): def setup_directories(instructions, default_path, random):
dir_list = [DirListEntry(True, False, True)] dir_list = [DirListEntry(True, False, True)]