Skip to content
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.

Sign up for GitHub

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

Jump to bottom

The interval tree is not complete implementation based on red-black tree #10877

Closed
xkeyideal opened this issue Jul 8, 2019 · 6 comments · Fixed by #10959
Closed

The interval tree is not complete implementation based on red-black tree #10877

xkeyideal opened this issue Jul 8, 2019 · 6 comments · Fixed by #10959

Comments

@xkeyideal
Copy link

Because of Interval Tree of Etcd use golang nil as red-black tree "NIL", delete someone node The Tree will not according with Property 5.

For example:

image

Delete Node 514, then delete node 11 should be:

image
@xkeyideal
Copy link
Author

Delete Node 11, the interval tree code will not execute deleteFixup function, but this wil cause inconsistency with the nature of red-black tree.

@xiang90
Copy link
Contributor

xiang90 commented Jul 8, 2019

@xkeyideal

Thanks for pointing this out. Can you write a test case and a fix?

@xkeyideal
Copy link
Author

@xiang90 YES，I will make a pull request for the interval tree

@xkeyideal xkeyideal mentioned this issue Jul 9, 2019
Closed
@xkeyideal
Copy link
Author

@xiang90

Please see my pull request code, can not pass the case of TestCtlV3AuthAndWatch

@xkeyideal
Copy link
Author

I find all use interval tree codes, some codes use Union function not use pointer, I change them all, but no use.

@xkeyideal
Copy link
Author

@xiang90

Please take a look the pull request, thx

@gyuho gyuho mentioned this issue Jul 29, 2019
Closed
19 tasks
gyuho added a commit to gyuho/etcd that referenced this issue Jul 30, 2019
@gyuho
pkg/adt: add "IntervalTree.Delete" failure case
d8d4460 
Described in etcd-io#10877.

"black-height" property: Every path from a node to any descendant leaf node must have the same number of black nodes.

Expected

    After deleting 11 (requires rebalancing):
                            [510,511]
                             /      \
                   ----------        --------------------------
                  /                                            \
              [383,384]                                       [830,831]
              /       \                                      /          \
             /         \                                    /            \
      [261,262](red)  [410,411]                     [647,648]           [899,900](red)
          /               \                              \                      /    \
         /                 \                              \                    /      \
      [82,83]           [292,293]                      [815,816](red)   [888,889]    [972,973]
            \                                                           /
             \                                                         /
          [238,239](red)                                       [953,954](red)

Got

    After deleting 11 (requires rebalancing):
                            [510,511]
                             /      \
                   ----------        --------------------------
                  /                                            \
              [82,83]                                       [830,831]
                    \                                      /          \
                     \                                    /            \
                  [383,384]                        [647,648]            [899,900]
                  /       \                              \                   /    \
                 /         \                              \                 /      \
           [261,262]      [410,411]                      [815,816]   [888,889]    [972,973]
             /   \                                                                  /
            /     \                                                                /
     [238,239]   [292,293]                                                  [953,954]

This violates "black-height" property.

Signed-off-by: Gyuho Lee <[email protected]>
@gyuho gyuho mentioned this issue Jul 30, 2019
Merged
gyuho added a commit to gyuho/etcd that referenced this issue Jul 30, 2019
@gyuho
pkg/adt: add "IntervalTree.Delete" failure case
ff8d158 
Described in etcd-io#10877.

"black-height" property: Every path from a node to any descendant leaf node must have the same number of black nodes.

Expected

    After deleting 11 (requires rebalancing):
                            [510,511]
                             /      \
                   ----------        --------------------------
                  /                                            \
              [383,384]                                       [830,831]
              /       \                                      /          \
             /         \                                    /            \
      [261,262](red)  [410,411]                     [647,648]           [899,900](red)
          /               \                              \                      /    \
         /                 \                              \                    /      \
      [82,83]           [292,293]                      [815,816](red)   [888,889]    [972,973]
            \                                                           /
             \                                                         /
          [238,239](red)                                       [953,954](red)

Got

    After deleting 11 (requires rebalancing):
                            [510,511]
                             /      \
                   ----------        --------------------------
                  /                                            \
              [82,83]                                       [830,831]
                    \                                      /          \
                     \                                    /            \
                  [383,384]                        [647,648]            [899,900]
                  /       \                              \                  /    \
                 /         \                              \                /      \
           [261,262]      [410,411]                      [815,816]   [888,889]    [972,973]
             /   \                                                                  /
            /     \                                                                /
     [238,239]   [292,293]                                                  [953,954]

This violates "black-height" property.

Signed-off-by: Gyuho Lee <[email protected]>
gyuho added a commit to gyuho/etcd that referenced this issue Jul 31, 2019
@gyuho
pkg/adt: add "IntervalTree.Delete" failure case
46f04b3 
Described in etcd-io#10877.

"black-height" property: Every path from a node to any descendant leaf node must have the same number of black nodes.

Expected

    After deleting 11 (requires rebalancing):
                            [510,511]
                             /      \
                   ----------        --------------------------
                  /                                            \
              [383,384]                                       [830,831]
              /       \                                      /          \
             /         \                                    /            \
      [261,262](red)  [410,411]                     [647,648]           [899,900](red)
          /               \                              \                      /    \
         /                 \                              \                    /      \
      [82,83]           [292,293]                      [815,816](red)   [888,889]    [972,973]
            \                                                           /
             \                                                         /
          [238,239](red)                                       [953,954](red)

Got

    After deleting 11 (requires rebalancing):
                            [510,511]
                             /      \
                   ----------        --------------------------
                  /                                            \
              [82,83]                                       [830,831]
                    \                                      /          \
                     \                                    /            \
                  [383,384]                        [647,648]            [899,900]
                  /       \                              \                  /    \
                 /         \                              \                /      \
           [261,262]      [410,411]                      [815,816]   [888,889]    [972,973]
             /   \                                                                  /
            /     \                                                                /
     [238,239]   [292,293]                                                  [953,954]

This violates "black-height" property.

Signed-off-by: Gyuho Lee <[email protected]>
@gyuho gyuho mentioned this issue Aug 1, 2019
Closed
@gyuho gyuho reopened this Aug 1, 2019
@gyuho gyuho closed this as completed Aug 1, 2019
gyuho added a commit that referenced this issue Aug 9, 2019
@gyuho
pkg/adt: add "IntervalTree.Delete" failure case
f4341fd 
Described in #10877.

"black-height" property: Every path from a node to any descendant leaf node must have the same number of black nodes.

Expected

    After deleting 11 (requires rebalancing):
                            [510,511]
                             /      \
                   ----------        --------------------------
                  /                                            \
              [383,384]                                       [830,831]
              /       \                                      /          \
             /         \                                    /            \
      [261,262](red)  [410,411]                     [647,648]           [899,900](red)
          /               \                              \                      /    \
         /                 \                              \                    /      \
      [82,83]           [292,293]                      [815,816](red)   [888,889]    [972,973]
            \                                                           /
             \                                                         /
          [238,239](red)                                       [953,954](red)

Got

    After deleting 11 (requires rebalancing):
                            [510,511]
                             /      \
                   ----------        --------------------------
                  /                                            \
              [82,83]                                       [830,831]
                    \                                      /          \
                     \                                    /            \
                  [383,384]                        [647,648]            [899,900]
                  /       \                              \                  /    \
                 /         \                              \                /      \
           [261,262]      [410,411]                      [815,816]   [888,889]    [972,973]
             /   \                                                                  /
            /     \                                                                /
     [238,239]   [292,293]                                                  [953,954]

This violates "black-height" property.

Signed-off-by: Gyuho Lee <[email protected]>
hexfusion pushed a commit to openshift/etcd that referenced this issue Sep 26, 2019
@gyuho @hexfusion
pkg/adt: add "IntervalTree.Delete" failure case
342d3bf 
Described in etcd-io#10877.

"black-height" property: Every path from a node to any descendant leaf node must have the same number of black nodes.

Expected

    After deleting 11 (requires rebalancing):
                            [510,511]
                             /      \
                   ----------        --------------------------
                  /                                            \
              [383,384]                                       [830,831]
              /       \                                      /          \
             /         \                                    /            \
      [261,262](red)  [410,411]                     [647,648]           [899,900](red)
          /               \                              \                      /    \
         /                 \                              \                    /      \
      [82,83]           [292,293]                      [815,816](red)   [888,889]    [972,973]
            \                                                           /
             \                                                         /
          [238,239](red)                                       [953,954](red)

Got

    After deleting 11 (requires rebalancing):
                            [510,511]
                             /      \
                   ----------        --------------------------
                  /                                            \
              [82,83]                                       [830,831]
                    \                                      /          \
                     \                                    /            \
                  [383,384]                        [647,648]            [899,900]
                  /       \                              \                  /    \
                 /         \                              \                /      \
           [261,262]      [410,411]                      [815,816]   [888,889]    [972,973]
             /   \                                                                  /
            /     \                                                                /
     [238,239]   [292,293]                                                  [953,954]

This violates "black-height" property.

Signed-off-by: Gyuho Lee <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

pkg/adt: refactor + add more test cases gyuho/etcd
3 participants
@xiang90 @xkeyideal @gyuho