You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2019/12/09 10:19:32 UTC
[dubbo-go] branch develop updated: Fix: use 1e6 as ms
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/develop by this push:
new 33b75f1 Fix: use 1e6 as ms
33b75f1 is described below
commit 33b75f139c8897a72de37188f78d92847e43ba0f
Author: AlexStocks <al...@foxmail.com>
AuthorDate: Mon Dec 9 18:19:16 2019 +0800
Fix: use 1e6 as ms
---
common/url.go | 4 +++-
filter/impl/tps/impl/tps_limit_fix_window_strategy.go | 2 +-
filter/impl/tps/impl/tps_limit_fix_window_strategy_test.go | 2 +-
filter/impl/tps/impl/tps_limit_sliding_window_strategy.go | 2 +-
filter/impl/tps/impl/tps_limit_sliding_window_strategy_test.go | 4 ++--
.../tps/impl/tps_limit_thread_safe_fix_window_strategy_test.go | 2 +-
filter/impl/tps/impl/tps_limiter_mock.go | 10 ++++++++--
7 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/common/url.go b/common/url.go
index 6e7a843..6fc7cd8 100644
--- a/common/url.go
+++ b/common/url.go
@@ -156,7 +156,9 @@ func WithToken(token string) option {
if len(token) > 0 {
value := token
if strings.ToLower(token) == "true" || strings.ToLower(token) == "default" {
- value = uuid.NewV4().String()
+ if id, err := uuid.NewV4(); err == nil {
+ value = id.String()
+ }
}
url.SetParam(constant.TOKEN_KEY, value)
}
diff --git a/filter/impl/tps/impl/tps_limit_fix_window_strategy.go b/filter/impl/tps/impl/tps_limit_fix_window_strategy.go
index b4dd815..8805dbd 100644
--- a/filter/impl/tps/impl/tps_limit_fix_window_strategy.go
+++ b/filter/impl/tps/impl/tps_limit_fix_window_strategy.go
@@ -79,7 +79,7 @@ func (impl *FixedWindowTpsLimitStrategyImpl) IsAllowable() bool {
func NewFixedWindowTpsLimitStrategyImpl(rate int, interval int) tps.TpsLimitStrategy {
return &FixedWindowTpsLimitStrategyImpl{
rate: int32(rate),
- interval: int64(interval * 1000), // convert to ns
+ interval: int64(interval) * int64(time.Millisecond), // convert to ns
count: 0,
timestamp: time.Now().UnixNano(),
}
diff --git a/filter/impl/tps/impl/tps_limit_fix_window_strategy_test.go b/filter/impl/tps/impl/tps_limit_fix_window_strategy_test.go
index 55d0b14..4cf52b2 100644
--- a/filter/impl/tps/impl/tps_limit_fix_window_strategy_test.go
+++ b/filter/impl/tps/impl/tps_limit_fix_window_strategy_test.go
@@ -36,7 +36,7 @@ func TestFixedWindowTpsLimitStrategyImpl_IsAllowable(t *testing.T) {
assert.True(t, strategy.IsAllowable())
assert.True(t, strategy.IsAllowable())
assert.False(t, strategy.IsAllowable())
- time.Sleep(time.Duration(2100 * 1000))
+ time.Sleep(2100 * time.Millisecond)
assert.True(t, strategy.IsAllowable())
assert.True(t, strategy.IsAllowable())
assert.False(t, strategy.IsAllowable())
diff --git a/filter/impl/tps/impl/tps_limit_sliding_window_strategy.go b/filter/impl/tps/impl/tps_limit_sliding_window_strategy.go
index de98eb7..c48c818 100644
--- a/filter/impl/tps/impl/tps_limit_sliding_window_strategy.go
+++ b/filter/impl/tps/impl/tps_limit_sliding_window_strategy.go
@@ -83,7 +83,7 @@ func (impl *SlidingWindowTpsLimitStrategyImpl) IsAllowable() bool {
func NewSlidingWindowTpsLimitStrategyImpl(rate int, interval int) tps.TpsLimitStrategy {
return &SlidingWindowTpsLimitStrategyImpl{
rate: rate,
- interval: int64(interval * 1000),
+ interval: int64(interval) * int64(time.Millisecond),
mutex: &sync.Mutex{},
queue: list.New(),
}
diff --git a/filter/impl/tps/impl/tps_limit_sliding_window_strategy_test.go b/filter/impl/tps/impl/tps_limit_sliding_window_strategy_test.go
index 1d0187f..0169404 100644
--- a/filter/impl/tps/impl/tps_limit_sliding_window_strategy_test.go
+++ b/filter/impl/tps/impl/tps_limit_sliding_window_strategy_test.go
@@ -31,14 +31,14 @@ func TestSlidingWindowTpsLimitStrategyImpl_IsAllowable(t *testing.T) {
assert.True(t, strategy.IsAllowable())
assert.True(t, strategy.IsAllowable())
assert.False(t, strategy.IsAllowable())
- time.Sleep(time.Duration(2100 * 1000))
+ time.Sleep(2100 * time.Millisecond)
assert.False(t, strategy.IsAllowable())
strategy = NewSlidingWindowTpsLimitStrategyImpl(2, 2000)
assert.True(t, strategy.IsAllowable())
assert.True(t, strategy.IsAllowable())
assert.False(t, strategy.IsAllowable())
- time.Sleep(time.Duration(2100 * 1000))
+ time.Sleep(2100 * time.Millisecond)
assert.True(t, strategy.IsAllowable())
assert.True(t, strategy.IsAllowable())
assert.False(t, strategy.IsAllowable())
diff --git a/filter/impl/tps/impl/tps_limit_thread_safe_fix_window_strategy_test.go b/filter/impl/tps/impl/tps_limit_thread_safe_fix_window_strategy_test.go
index fea93df..e05ad4f 100644
--- a/filter/impl/tps/impl/tps_limit_thread_safe_fix_window_strategy_test.go
+++ b/filter/impl/tps/impl/tps_limit_thread_safe_fix_window_strategy_test.go
@@ -36,7 +36,7 @@ func TestThreadSafeFixedWindowTpsLimitStrategyImpl_IsAllowable(t *testing.T) {
assert.True(t, strategy.IsAllowable())
assert.True(t, strategy.IsAllowable())
assert.False(t, strategy.IsAllowable())
- time.Sleep(time.Duration(2100 * 1000))
+ time.Sleep(2100 * time.Millisecond)
assert.True(t, strategy.IsAllowable())
assert.True(t, strategy.IsAllowable())
assert.False(t, strategy.IsAllowable())
diff --git a/filter/impl/tps/impl/tps_limiter_mock.go b/filter/impl/tps/impl/tps_limiter_mock.go
index ff2f984..acd3a15 100644
--- a/filter/impl/tps/impl/tps_limiter_mock.go
+++ b/filter/impl/tps/impl/tps_limiter_mock.go
@@ -21,10 +21,16 @@
package impl
import (
+ reflect "reflect"
+)
+
+import (
+ gomock "github.com/golang/mock/gomock"
+)
+
+import (
common "github.com/apache/dubbo-go/common"
protocol "github.com/apache/dubbo-go/protocol"
- gomock "github.com/golang/mock/gomock"
- reflect "reflect"
)
// MockTpsLimiter is a mock of TpsLimiter interface