fix:1.重修随机浮点数方法,2.redis锁代码优化

Author: keepchen

utils/number.go

@@ -81,33 +81,11 @@ func RandomFloat64(start, end float64, precision int) float64 {
 	if start == end {
 		return start
 	}
-	var scale = 1
 
-	//对start进行放大
-	for {
-		startScaled := start * float64(scale)
-		if startScaled == float64(int64(startScaled)) {
-			break
-		}
-		scale *= 10
-	}
-
-	//对end进行放大
-	for {
-		endScaled := end * float64(scale)
-		if endScaled == float64(int64(endScaled)) {
-			break
-		}
-		scale *= 10
-	}
-
-	start *= float64(scale)
-	end *= float64(scale)
-
-	randInt64 := RandomInt64(int64(start), int64(end))
+	delta := end - start
+	result := start + rand.Float64()*delta
 
-	return decimal.NewFromInt(randInt64).
-		Div(decimal.NewFromInt(int64(scale))).
+	return decimal.NewFromFloat(result).
 		Truncate(int32(precision)).InexactFloat64()
 }
 

utils/number_test.go

@@ -46,6 +46,7 @@ func TestRandomFloat64(t *testing.T) {
 		{-10.11, 0.11, 4},
 		{-10.101, 100.10111111, 5},
 		{-100.1011, 100.1011111111, 6},
+		{-200, -100, 6},
 	}
 	for _, rn := range ranges {
 		t.Log("range: from", rn.start, "to", rn.end, "precision", rn.precision)

utils/redislock.go

@@ -35,12 +35,7 @@ type CancelFunc func()
 // 该方法会立即返回锁定成功与否的结果
 func RedisTryLock(key string) bool {
 	ctx, cancel := context.WithTimeout(context.Background(), redisExecuteTimeout)
-	go func() {
-		for range time.After(redisExecuteTimeout) {
-			cancel()
-			break
-		}
-	}()
+	defer cancel()
 
 	return RedisTryLockWithContext(ctx, key)
 }
@@ -143,12 +138,7 @@ func RedisUnlockWithContext(ctx context.Context, key string) {
 // using SetNX
 func RedisStandaloneLock(key string) bool {
 	ctx, cancel := context.WithTimeout(context.Background(), redisExecuteTimeout)
-	go func() {
-		for range time.After(redisExecuteTimeout) {
-			cancel()
-			break
-		}
-	}()
+	defer cancel()
 
 	return RedisStandaloneLockWithContext(ctx, key)
 }
@@ -197,12 +187,7 @@ func RedisStandaloneLockWithContext(ctx context.Context, key string) bool {
 // using SetNX
 func RedisStandaloneUnlock(key string) {
 	ctx, cancel := context.WithTimeout(context.Background(), redisExecuteTimeout)
-	go func() {
-		for range time.After(redisExecuteTimeout) {
-			cancel()
-			break
-		}
-	}()
+	defer cancel()
 
 	RedisStandaloneUnlockWithContext(ctx, key)
 }
@@ -232,12 +217,7 @@ func RedisStandaloneUnlockWithContext(ctx context.Context, key string) {
 // using SetNX
 func RedisClusterLock(key string) bool {
 	ctx, cancel := context.WithTimeout(context.Background(), redisExecuteTimeout)
-	go func() {
-		for range time.After(redisExecuteTimeout) {
-			cancel()
-			break
-		}
-	}()
+	defer cancel()
 
 	return RedisClusterLockWithContext(ctx, key)
 }
@@ -286,12 +266,7 @@ func RedisClusterLockWithContext(ctx context.Context, key string) bool {
 // using SetNX
 func RedisClusterUnlock(key string) {
 	ctx, cancel := context.WithTimeout(context.Background(), redisExecuteTimeout)
-	go func() {
-		for range time.After(redisExecuteTimeout) {
-			cancel()
-			break
-		}
-	}()
+	defer cancel()
 
 	RedisClusterUnlockWithContext(ctx, key)
 }