Amend domain matcher with returning values of all matched subdomains #95
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Vigilans
commented
Aug 13, 2020
Comment on lines
+943
to
+953
| { // Will match server 4,3,1,2 and server 4 returns expected one | ||
| ips, err := client.LookupIP("v2.api.google.com") | ||
| if err != nil { | ||
| t.Fatal("unexpected error: ", err) | ||
| } | ||
|
|
||
| if r := cmp.Diff(ips, []net.IP{{8, 8, 7, 8}}); r != "" { | ||
| t.Fatal(r) | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
现在DNS的测试使用如下四个用例：
- 查询google.com，匹配DNS [1, 2]，DNS 1返回的IP是Expected的，直接返回；
- 查询ipv6.google.com，匹配DNS [1, 2]，DNS 1返回的IP不是Expected的，这时并不直接Fallback到默认轮询，而是继续查询DNS 2，收到Expected IP并返回。
- 查询api.google.com，匹配DNS [3, 1, 2]，这是因为
domain:api.google.com的优先级更高。从DNS 3收到Expected IP并返回。 - 查询v2.api.google.com，匹配DNS [4, 3, 1, 2]，这是因为Full Matcher的优先级最高。从DNS 4收到Expected IP并返回。
Comment on lines
+86
to
+96
| switch len(matches) { | ||
| case 0: | ||
| return nil | ||
| case 1: | ||
| return matches[0] | ||
| default: | ||
| result := []uint32{} | ||
| for idx := range matches { | ||
| // Insert reversely, the subdomain that matches further ranks higher | ||
| result = append(result, matches[len(matches)-1-idx]...) | ||
| } | ||
| return result |
There was a problem hiding this comment.
当没有match时，直接返回nil；当只有一个match时，返回matches里保存的数组引用，从而避免构造一个新数组。
Comment on lines
+36
to
+38
| { // Matches [c.a.b.com, a.b.com] | ||
| Domain: "c.a.b.com", | ||
| Result: []uint32{4}, | ||
| Result: []uint32{5, 4}, |
There was a problem hiding this comment.
这个测试用例似乎说明原作者是特意设计了级数最少的优先匹配这个规则的（c.a.b.com添加时为5，最后匹配到了4）。不知最初的用意为何……
在本机上，原版、Amend PR 1、当前PR的Benchmark
原版实现Amend PR 1 实现Amend PR 2 实现 |
1e743f5
to
1e22242
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #92 (comment)