-
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
*: tidy code && prealloc some slice for performance #13468
Merged
Merged
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
60db06e
prealloc
xiekeyi98 3174f9d
staticcheck
xiekeyi98 dfe8980
Merge remote-tracking branch 'upstream/master' into tidyCode
xiekeyi98 e43678f
fix: unit test timeout
xiekeyi98 c6820f3
tidy code
xiekeyi98 7745cf9
Merge branch 'master' into tidyCode
xiekeyi98 0b8f761
Merge remote-tracking branch 'upstream/master' into tidyCode
xiekeyi98 ab0e4ab
address comment
xiekeyi98 bba93aa
Delete db_test_20191228213908.go
xiekeyi98 2c6b21c
Delete db_test_20191228213943.go
xiekeyi98 91554e6
Merge branch 'master' into tidyCode
zz-jason File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,8 +32,8 @@ import ( | |
"go.etcd.io/etcd/integration" | ||
"go.etcd.io/etcd/mvcc/mvccpb" | ||
goctx "golang.org/x/net/context" | ||
"google.golang.org/grpc" | ||
"google.golang.org/grpc/codes" | ||
"google.golang.org/grpc/status" | ||
) | ||
|
||
func TestT(t *testing.T) { | ||
|
@@ -230,7 +230,7 @@ func TestSyncerSimple(t *testing.T) { | |
} | ||
|
||
func isTimeoutError(err error) bool { | ||
if terror.ErrorEqual(err, goctx.DeadlineExceeded) || grpc.Code(errors.Cause(err)) == codes.DeadlineExceeded || | ||
if terror.ErrorEqual(err, goctx.DeadlineExceeded) || status.Code(errors.Cause(err)) == codes.DeadlineExceeded || | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
terror.ErrorEqual(err, etcdserver.ErrTimeout) { | ||
return true | ||
} | ||
|
@@ -250,7 +250,7 @@ func checkRespKV(t *testing.T, kvCount int, key, val string, | |
if string(kv.Key) != key { | ||
t.Fatalf("key resp %s, exported %s", kv.Key, key) | ||
} | ||
if val != val { | ||
if string(kv.Value) != val { | ||
t.Fatalf("val resp %s, exported %s", kv.Value, val) | ||
} | ||
} |
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
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
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
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
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
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.
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.
time.Sleep(50)
is puzzled, we should add the unit.