fluidB
/
fluidb-old
1
0
Fork 0
Code Pull Requests Activity

Fix more uses of random

Browse Source
master
Philip O'Toole 1 year ago
parent d32c4e70d5
commit 208fc20659
9 changed files with 82 additions and 65 deletions
Show Stats Download Patch File Download Diff File

8
cluster/bootstrap.go
Unescape Escape View File

@ -7,7 +7,6 @@ import (
"errors"
"fmt"
"log"
"math/rand"
"net/http"
"os"
"strings"
@ -15,12 +14,9 @@ import (
"time"
rurl "github.com/rqlite/rqlite/http/url"
"github.com/rqlite/rqlite/random"
)
func init() {
rand.Seed(time.Now().UnixNano())
}
var (
// ErrBootTimeout is returned when a boot operation does not
// complete within the timeout.
@ -260,5 +256,5 @@ func NewAddressProviderString(ss []string) AddressProvider {
// useful to prevent nodes across the cluster performing certain operations
// all at the same time.
func jitter(duration time.Duration) time.Duration {
return duration + time.Duration(rand.Float64()*float64(duration))
return duration + time.Duration(random.Float64()*float64(duration))
}

2
db/db.go
Unescape Escape View File

@ -10,7 +10,6 @@ import (
"expvar"
"fmt"
"io"
"math/rand"
"os"
"path/filepath"
"strconv"
@ -53,7 +52,6 @@ var DBVersion string
var stats *expvar.Map
func init() {
rand.Seed(time.Now().UnixNano())
DBVersion, _, _ = sqlite3.Version()
stats = expvar.NewMap("db")
ResetStats()

19
db/db_test.go
Unescape Escape View File

@ -4,8 +4,6 @@ import (
"database/sql"
"fmt"
"io"
"io/ioutil"
"math/rand"
"os"
"path/filepath"
"sync"
@ -25,7 +23,7 @@ func Test_RemoveFiles(t *testing.T) {
t.Fatalf("failed to remove files: %s", err.Error())
}
files, err := ioutil.ReadDir(d)
files, err := os.ReadDir(d)
if err != nil {
t.Fatalf("failed to read directory: %s", err.Error())
}
@ -906,7 +904,7 @@ func asJSON(v interface{}) string {
// mustTempFile returns a path to a temporary file in directory dir. It is up to the
// caller to remove the file once it is no longer needed.
func mustTempFile() string {
tmpfile, err := ioutil.TempFile("", "rqlite-db-test")
tmpfile, err := os.CreateTemp("", "rqlite-db-test")
if err != nil {
panic(err.Error())
}
@ -915,7 +913,7 @@ func mustTempFile() string {
}
func mustTempDir() string {
tmpdir, err := ioutil.TempDir("", "rqlite-db-test")
tmpdir, err := os.MkdirTemp("", "rqlite-db-test")
if err != nil {
panic(err.Error())
}
@ -947,12 +945,6 @@ func mustCopyFile(dst, src string) {
}
}
func mustRenameFile(oldpath, newpath string) {
if err := os.Rename(oldpath, newpath); err != nil {
panic(err)
}
}
func mustCreateClosedFile(path string) {
f, err := os.Create(path)
if err != nil {
@ -975,8 +967,3 @@ func mustFileSize(path string) int64 {
fi := mustStat(path)
return fi.Size()
}
func mustRandomInt(n int) int {
rand.Seed(time.Now().UnixNano())
return rand.Intn(n)
}

9
disco/service.go
Unescape Escape View File

@ -3,15 +3,12 @@ package disco
import (
"fmt"
"log"
"math/rand"
"os"
"sync"
"time"
)
func init() {
rand.Seed(time.Now().UnixNano())
}
"github.com/rqlite/rqlite/random"
)
const (
leaderChanLen = 5 // Support any fast back-to-back leadership changes.
@ -143,5 +140,5 @@ func (s *Service) updateContact(t time.Time) {
}
func jitter(duration time.Duration) time.Duration {
return duration + time.Duration(rand.Float64()*float64(duration))
return duration + time.Duration(random.Float64()*float64(duration))
}

16
store/random/random.go → random/random.go
Unescape Escape View File

@ -15,7 +15,7 @@ func init() {
}
// RandomString returns a random string of 20 characters
func RandomString() string {
func String() string {
mu.Lock()
defer mu.Unlock()
var output strings.Builder
@ -27,3 +27,17 @@ func RandomString() string {
}
return output.String()
}
// Float64 returns a random float64
func Float64() float64 {
mu.Lock()
defer mu.Unlock()
return r.Float64()
}
// Intn returns a random int
func Intn(n int) int {
mu.Lock()
defer mu.Unlock()
return r.Intn(n)
}

51
random/random_test.go
Unescape Escape View File

@ -0,0 +1,51 @@
package random
import (
"testing"
)
func Test_StringLength(t *testing.T) {
str := String()
if len(str) != 20 {
t.Errorf("String() returned a string of length %d; want 20", len(str))
}
}
func Test_StringUniqueness(t *testing.T) {
const numStrings = 10
strs := make(map[string]bool, numStrings)
for i := 0; i < numStrings; i++ {
str := String()
if strs[str] {
t.Errorf("String() returned a non-unique string: %s", str)
}
strs[str] = true
}
}
func Test_Float64Uniqueness(t *testing.T) {
const numFloat64s = 10
floats := make(map[float64]bool, numFloat64s)
for i := 0; i < numFloat64s; i++ {
f := Float64()
if floats[f] {
t.Errorf("Float64() returned a non-unique float64: %f", f)
}
floats[f] = true
}
}
func Test_IntnUniqueness(t *testing.T) {
const numIntns = 10
intns := make(map[int]bool, numIntns)
for i := 0; i < numIntns; i++ {
n := Intn(1000000000)
if intns[n] {
t.Errorf("Intn() returned a non-unique int: %d", n)
}
intns[n] = true
}
}

25
store/random/random_test.go
Unescape Escape View File

@ -1,25 +0,0 @@
package random
import (
"testing"
)
func Test_RandomStringLength(t *testing.T) {
str := RandomString()
if len(str) != 20 {
t.Errorf("RandomString() returned a string of length %d; want 20", len(str))
}
}
func Test_RandomStringUniqueness(t *testing.T) {
const numStrings = 100
strs := make(map[string]bool, numStrings)
for i := 0; i < numStrings; i++ {
str := RandomString()
if strs[str] {
t.Errorf("RandomString() returned a non-unique string: %s", str)
}
strs[str] = true
}
}

8
store/store_test.go
Unescape Escape View File

@ -15,7 +15,7 @@ import (
"github.com/rqlite/rqlite/command"
"github.com/rqlite/rqlite/command/encoding"
"github.com/rqlite/rqlite/db"
"github.com/rqlite/rqlite/store/random"
"github.com/rqlite/rqlite/random"
"github.com/rqlite/rqlite/testdata/chinook"
)
@ -2866,18 +2866,18 @@ func mustNewStoreAtPathsLn(id, dataPath, sqlitePath string, fk bool) (*Store, ne
}
func mustNewStore(t *testing.T) (*Store, net.Listener) {
return mustNewStoreAtPathsLn(random.RandomString(), t.TempDir(), "", false)
return mustNewStoreAtPathsLn(random.String(), t.TempDir(), "", false)
}
func mustNewStoreFK(t *testing.T) (*Store, net.Listener) {
return mustNewStoreAtPathsLn(random.RandomString(), t.TempDir(), "", true)
return mustNewStoreAtPathsLn(random.String(), t.TempDir(), "", true)
}
func mustNewStoreSQLitePath(t *testing.T) (*Store, net.Listener, string) {
dataDir := t.TempDir()
sqliteDir := t.TempDir()
sqlitePath := filepath.Join(sqliteDir, "explicit-path.db")
s, ln := mustNewStoreAtPathsLn(random.RandomString(), dataDir, sqlitePath, true)
s, ln := mustNewStoreAtPathsLn(random.String(), dataDir, sqlitePath, true)
return s, ln, sqlitePath
}

9
tcp/pool/channel_test.go
Unescape Escape View File

@ -2,11 +2,12 @@ package pool
import (
"log"
"math/rand"
"net"
"sync"
"testing"
"time"
"github.com/rqlite/rqlite/random"
)
var (
@ -21,8 +22,6 @@ func init() {
// used for factory function
go simpleTCPServer()
time.Sleep(time.Millisecond * 300) // wait until tcp server has been settled
rand.Seed(time.Now().UTC().UnixNano())
}
func TestNew(t *testing.T) {
@ -229,7 +228,7 @@ func TestPoolConcurrent2(t *testing.T) {
for i := 0; i < 10; i++ {
go func(i int) {
conn, _ := p.Get()
time.Sleep(time.Millisecond * time.Duration(rand.Intn(100)))
time.Sleep(time.Millisecond * time.Duration(random.Intn(100)))
conn.Close()
wg.Done()
}(i)
@ -240,7 +239,7 @@ func TestPoolConcurrent2(t *testing.T) {
wg.Add(1)
go func(i int) {
conn, _ := p.Get()
time.Sleep(time.Millisecond * time.Duration(rand.Intn(100)))
time.Sleep(time.Millisecond * time.Duration(random.Intn(100)))
conn.Close()
wg.Done()
}(i)

Write Preview
Loading…
Cancel
Save