Upgrade from math/rand to math/rand/v2#1788
Open
Onyx2406 wants to merge 1 commit intoClickHouse:mainfrom
Open
Conversation
Migrate all usages of the deprecated math/rand package to math/rand/v2 across the codebase. This fixes the Go 1.25 compatibility issue where rand.Seed no longer works (ClickHouse#1652). Key changes: - Replace math/rand imports with math/rand/v2 in all 19 affected files - Use rand.IntN instead of rand.Intn (v2 naming convention) - Replace rand.NewSource with rand.NewPCG for local random generators - Remove all rand.Seed calls (v2 auto-seeds the global source) - Fix ConnOpenRandom strategy: pick random offset once outside the loop instead of on every iteration, ensuring all addresses are tried before failing over - Re-enable TestConnFailoverRandom and TestStdConnFailoverRandom tests that were skipped due to Go 1.25 math/random changes Fixes ClickHouse#1653
|
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
math/randusages tomath/rand/v2across the entire codebase (19 files)ConnOpenRandomstrategy to pick random offset once outside the loopMotivation
Go 1.25 broke
rand.Seedwhich causedConnOpenRandomfailover tests to be skipped (#1652). Themath/randpackage is deprecated in favor ofmath/rand/v2which provides automatic seeding and better APIs.As discussed in #1653, the
ConnOpenRandomstrategy also had a bug whererand.Int()was called on every loop iteration, meaning a connection attempt could pick the same (broken) address multiple times and fail to try all addresses.Changes
Core library (
clickhouse.go,clickhouse_std.go):math/randwithmath/rand/v2ConnOpenRandom: pick random starting offset once viarand.IntN(len(addrs))before the loop, then iterate through all addresses deterministically from that offset. This ensures every address is tried exactly once before failing.Tests (11 files):
rand.NewSource/rand.Newwithrand.NewPCG/rand.Newrand.Intn(n)withrand.IntN(n)(v2 naming)src.Int63()withrng.Int64()in string generatorsrand.Seedcalls (v2 auto-seeds)TestConnFailoverRandomandTestStdConnFailoverRandomExamples (5 files):
rand.Seedcalls from multi-host and test setupResetRandSeed()to no-op (v2 has norand.Seed)time,math/rand)Test Plan
go build ./...passes cleanlymath/randv1 imports (grepconfirms zero matches)TestConnFailoverRandomandTestStdConnFailoverRandomre-enabled (previously skipped)Fixes #1653