-
Notifications
You must be signed in to change notification settings - Fork 5.9k
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
Update vendor to the latest and add implementation test for GetPrevRegion #7429
Conversation
Hi contributor, thanks for your PR. This patch needs to be approved by someone of admins. They should reply with "/ok-to-test" to accept this PR for running test automatically. |
Gopkg.lock
Outdated
|
||
[[projects]] | ||
branch = "master" | ||
name = "github.com/pingcap/tidb" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
very strange that tidb contains tidb repo....
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed in 080cf406
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is incorrect to remove it in lock
file manually.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
BTW. I did the same... :(
Maybe auto merge
got things wrong
I will clean the work space and do it again
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@liukun4515 are you sure do things above will not add tidb
into vendor ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If updating vendor is a troublesome thing for you, we can give a pr to update vendor, and you can implement getPrevregion base on the latest master.
By the way, if TiDB wants to use the getPrevReigon
feature, we should add this feature to region_cache.go.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe it's not the time for me to do contribute.XD
Could you pls put up another PR only update things you mentioned?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ahaa, I get it. I did dep ensure in my local repo without run checkout-pr-branch.sh
so dep add the github.vendor for me.
I will redo again...
After updating the vendor, you should run the script |
Thx for your reply.
I’m just run ‘dep ensure -update github.com/ping cap/pd’ and dep added this dependency automatically.
Best regards
✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️
Arthur lee
Sent from my iPhone
… On Aug 20, 2018, at 10:05 AM, siddontang ***@***.***> wrote:
@siddontang commented on this pull request.
In Gopkg.lock:
>
[[projects]]
branch = "master"
name = "github.com/pingcap/pd"
packages = ["pd-client"]
- revision = "ea6597638eb7f3d7d50248b90e60888352ac8e85"
+ revision = "ba75bdda52f50df752c42c3f1434d9471e98f75e"
+
+[[projects]]
+ branch = "master"
+ name = "github.com/pingcap/tidb"
@arthurkiller
The tidb should not be in lock file too.
Maybe you can use dep ensure to remove this?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.
|
Maybe remove it manually is a possible solution?
Best regards
✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️
Arthur lee
Sent from my iPhone
… On Aug 20, 2018, at 10:05 AM, siddontang ***@***.***> wrote:
@siddontang commented on this pull request.
In Gopkg.lock:
>
[[projects]]
branch = "master"
name = "github.com/pingcap/pd"
packages = ["pd-client"]
- revision = "ea6597638eb7f3d7d50248b90e60888352ac8e85"
+ revision = "ba75bdda52f50df752c42c3f1434d9471e98f75e"
+
+[[projects]]
+ branch = "master"
+ name = "github.com/pingcap/tidb"
@arthurkiller
The tidb should not be in lock file too.
Maybe you can use dep ensure to remove this?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.
|
Ok, I will checkout the |
Done, this time things going well |
Gopkg.lock
Outdated
revision = "51ce9a71510a58bad5ae66ddd278ef28762a1550" | ||
|
||
[[projects]] | ||
name = "github.com/go-sql-driver/mysql" | ||
packages = ["."] | ||
revision = "3955978caca48c1658a4bb7a9c6a0f084e326af3" | ||
|
||
[[projects]] | ||
name = "github.com/gogo/protobuf" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we not use gogo now? @tiancaiamao
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think update pd and kvproto should not affect those packages.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't know what's wrong but each time I run
dep ensure -update github.com/pingcap/pd
the gogo package will be replaced with google/protobuffer
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@liukun4515 FYI
Gopkg.lock
Outdated
@@ -172,15 +162,6 @@ | |||
packages = ["."] | |||
revision = "7a24ed77b2efb460c1468b7dc917821c66e80e55" | |||
|
|||
[[projects]] | |||
name = "github.com/opentracing/basictracer-go" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same here @tiancaiamao
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's still in use.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@liukun4515 FYI
CI failed @arthurkiller |
Hi contributor, thanks for your PR. This patch needs to be approved by someone of admins. They should reply with "/ok-to-test" to accept this PR for running test automatically. |
Warning: the following project(s) have [[constraint]] stanzas in Gopkg.toml:
✗ github.com/opentracing/basictracer-go
However, these projects are not direct dependencies of the current project:
they are not imported in any .go files, nor are they in the 'required' list in
Gopkg.toml. Dep only applies [[constraint]] rules to direct dependencies, so
these rules will have no effect. ridiculous |
@tiancaiamao @liukun4515 I think the best way is run the dep update by you guys. I did not know why I just failed. :( |
PTAL @liukun4515 |
Do I need to continue this job by updating the vendor? @arthurkiller @siddontang |
@liukun4515 Thats's very nice of you |
@siddontang @tiancaiamao Hey dude. @liukun4515 has do update on his own but unfortunately we get the same results. R U SURE these dependency is still in use? |
You can file another PR |
The version of |
closed via #10152 |
What problem does this PR solve?
Update pd and kv proto to the latest according to tikv/pd#1175, which supply the GetPrevRegion function that is really helpful.
What is changed and how it works?
Run
dep ensure
to update vendorCheck List
Tests
I have build this fella locally
Code changes
Side effects
Related changes