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.

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

pkg/adt: merge etcd master & fix interval tree #10977

Closed
wants to merge 10 commits into from
Closed

pkg/adt: merge etcd master & fix interval tree #10977

wants to merge 10 commits into from

Conversation

xkeyideal
Copy link

@gyuho
Copy link
Contributor

gyuho commented Aug 5, 2019

@xkeyideal Could you rebase your branch from current master, and cherry-pick your patch? It makes code review much easier. Thanks!

@gyuho
Copy link
Contributor

gyuho commented Aug 5, 2019

Also please squash all your commits into one, without merge commit.

@codecov-io
Copy link

Codecov Report

Merging #10977 into master will decrease coverage by 0.43%.
The diff coverage is 87.2%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #10977      +/-   ##
==========================================
- Coverage   64.22%   63.78%   -0.44%     
==========================================
  Files         401      401              
  Lines       37540    37541       +1     
==========================================
- Hits        24110    23946     -164     
- Misses      11808    11986     +178     
+ Partials     1622     1609      -13
Impacted Files Coverage Δ
pkg/adt/interval_tree.go 86.59% <87.2%> (+1.84%) ⬆️
client/keys.go 68.34% <0%> (-23.12%) ⬇️
auth/store.go 45.08% <0%> (-21.08%) ⬇️
clientv3/naming/grpc.go 59.64% <0%> (-15.79%) ⬇️
pkg/netutil/netutil.go 63.11% <0%> (-5.74%) ⬇️
etcdserver/api/v3election/election.go 61.11% <0%> (-2.78%) ⬇️
etcdserver/api/v3rpc/watch.go 78.43% <0%> (-1.64%) ⬇️
pkg/schedule/schedule.go 81.69% <0%> (-1.41%) ⬇️
etcdserver/api/v2http/client.go 84.3% <0%> (-1.21%) ⬇️
... and 20 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9a2af73...0928cd2. Read the comment docs.

@gyuho
Copy link
Contributor

gyuho commented Aug 5, 2019

Also change this line to Fatalf to validate the fix.

if !reflect.DeepEqual(expectedAfterDelete11, visitsAfterDelete11) {
// "black-height" property is violated here
//
// TODO: fix this
// [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]
//
t.Logf("level order after deleting '11' expected %v, got %v", expectedAfterDelete11, visitsAfterDelete11)

@xkeyideal
Copy link
Author

@xkeyideal #10978

@xkeyideal xkeyideal closed this Aug 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants