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
internal/grpcrand: use Go top-level random functions for go1.21+ #6925
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
//go:build !go1.21 | ||
// +build !go1.21 | ||
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. We don't need both syntaxes for this, since we don't support Go 1.16 or earlier. Just 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. Done |
||
|
||
/* | ||
* | ||
* Copyright 2018 gRPC authors. | ||
|
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 |
---|---|---|
@@ -0,0 +1,74 @@ | ||
//go:build go1.21 | ||
// +build go1.21 | ||
|
||
/* | ||
* | ||
* Copyright 2024 gRPC authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* | ||
*/ | ||
|
||
// Package grpcrand implements math/rand functions in a concurrent-safe way | ||
// with a global random source, independent of math/rand's global source. | ||
package grpcrand | ||
|
||
import "math/rand" | ||
|
||
// This implementation will be used for Go version 1.21 or newer. | ||
// For older versions, the original implementation with mutex will be used. | ||
|
||
// Int implements rand.Int on the grpcrand global source. | ||
func Int() int { | ||
return rand.Int() | ||
} | ||
|
||
// Int63n implements rand.Int63n on the grpcrand global source. | ||
func Int63n(n int64) int64 { | ||
return rand.Int63n(n) | ||
} | ||
|
||
// Intn implements rand.Intn on the grpcrand global source. | ||
func Intn(n int) int { | ||
return rand.Intn(n) | ||
} | ||
|
||
// Int31n implements rand.Int31n on the grpcrand global source. | ||
func Int31n(n int32) int32 { | ||
return rand.Int31n(n) | ||
} | ||
|
||
// Float64 implements rand.Float64 on the grpcrand global source. | ||
func Float64() float64 { | ||
return rand.Float64() | ||
} | ||
|
||
// Uint64 implements rand.Uint64 on the grpcrand global source. | ||
func Uint64() uint64 { | ||
return rand.Uint64() | ||
} | ||
|
||
// Uint32 implements rand.Uint32 on the grpcrand global source. | ||
func Uint32() uint32 { | ||
return rand.Uint32() | ||
} | ||
|
||
// ExpFloat64 implements rand.ExpFloat64 on the grpcrand global source. | ||
func ExpFloat64() float64 { | ||
return rand.ExpFloat64() | ||
} | ||
|
||
// Shuffle implements rand.Shuffle on the grpcrand global source. | ||
var Shuffle = func(n int, f func(int, int)) { | ||
rand.Shuffle(n, f) | ||
} |
Oops, something went wrong.
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.
Would you mind adding a TODO here that says something like:
"TODO: when this file is deleted (after Go 1.20 support is dropped), delete all of grpcrand and call the rand package directly."
?
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.
Done
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.
Sorry for my absence and thank you @arvindbr8
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.
No worries, sorry if you were working on the branch. Since this was a oneliner change, and since you had also allowed edits to your PR by maintainers I went ahead and made the change.