From 6dd82ff5282e4e74c0ca37b9f706bd0e437b322a Mon Sep 17 00:00:00 2001
From: Ming Deng <mindeng@ebay.com>
Date: Thu, 17 Oct 2019 23:21:00 +0800
Subject: [PATCH] Fix review
---
.DS_Store | Bin 0 -> 6148 bytes
common/extension/tps_limit.go | 20 +++++++++---------
.../rejected_execution_handler_mock.go | 2 +-
.../rejected_execution_handler_only_log.go | 6 +++---
...ejected_execution_handler_only_log_test.go | 2 +-
.../tps_limit_fix_window_strategy.go | 6 +++---
.../tps_limit_fix_window_strategy_test.go | 2 +-
.../tps_limit_sliding_window_strategy.go | 6 +++---
.../tps_limit_sliding_window_strategy_test.go | 2 +-
.../tps/{ => impl}/tps_limit_strategy_mock.go | 2 +-
...s_limit_thread_safe_fix_window_strategy.go | 6 +++---
...it_thread_safe_fix_window_strategy_test.go | 2 +-
.../{ => impl}/tps_limiter_method_service.go | 10 ++++-----
.../tps_limiter_method_service_test.go | 10 ++++-----
.../impl/tps/{ => impl}/tps_limiter_mock.go | 2 +-
.../{intf => }/rejected_execution_handler.go | 2 +-
.../impl/tps/{intf => }/tps_limit_strategy.go | 2 +-
filter/impl/tps/{intf => }/tps_limiter.go | 2 +-
filter/impl/tps_limit_filter.go | 2 +-
filter/impl/tps_limit_filter_test.go | 14 ++++++------
20 files changed, 50 insertions(+), 50 deletions(-)
create mode 100644 .DS_Store
rename filter/impl/tps/{ => impl}/rejected_execution_handler_mock.go (99%)
rename filter/impl/tps/{ => impl}/rejected_execution_handler_only_log.go (94%)
rename filter/impl/tps/{ => impl}/rejected_execution_handler_only_log_test.go (98%)
rename filter/impl/tps/{ => impl}/tps_limit_fix_window_strategy.go (96%)
rename filter/impl/tps/{ => impl}/tps_limit_fix_window_strategy_test.go (99%)
rename filter/impl/tps/{ => impl}/tps_limit_sliding_window_strategy.go (96%)
rename filter/impl/tps/{ => impl}/tps_limit_sliding_window_strategy_test.go (99%)
rename filter/impl/tps/{ => impl}/tps_limit_strategy_mock.go (99%)
rename filter/impl/tps/{ => impl}/tps_limit_thread_safe_fix_window_strategy.go (95%)
rename filter/impl/tps/{ => impl}/tps_limit_thread_safe_fix_window_strategy_test.go (99%)
rename filter/impl/tps/{ => impl}/tps_limiter_method_service.go (96%)
rename filter/impl/tps/{ => impl}/tps_limiter_method_service_test.go (96%)
rename filter/impl/tps/{ => impl}/tps_limiter_mock.go (99%)
rename filter/impl/tps/{intf => }/rejected_execution_handler.go (99%)
rename filter/impl/tps/{intf => }/tps_limit_strategy.go (99%)
rename filter/impl/tps/{intf => }/tps_limiter.go (98%)
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d5ca99c072f19da18d683d2bab5ca96b42c1d7b8
GIT binary patch
literal 6148
zcmeHKI|@QE5ZqM}!N$@uSMUZw^aNhO!ViKdh+4nOb9pppKaD=^w2@iZOtRTY$P{ni
ziil1xtBJ@+L<Vp}x!KS*+c$4nCnE}k<BYYOu8Y%Qe>`kk+3y3!?aM}XvX}D<-}Y!!
zfC^9nDnJFOz;_kM`Z^eX_gJ1r1*pIuC}7`*0ynIQO`v}|Fn9|9>>=!ix%U#lVgX=H
zYyuI1X;6Vd)od{|=!lohtBFlu&_%QP(7ai*Ls7pS=NC^Gt$`e=02O#vpc~7P)&DvC
zL;wFw;))7Tfxl8fd$YxCiYH}lZ9UFvZGkW0mUD-jVeS+RUXFoYj<K+EJoco>D>lb|
WO>6?4j=0l-{24G^XjI_W3OoQ4N)@C4
literal 0
HcmV?d00001
diff --git a/common/extension/tps_limit.go b/common/extension/tps_limit.go
index e789d5b10..7d5cb8e9f 100644
--- a/common/extension/tps_limit.go
+++ b/common/extension/tps_limit.go
@@ -18,20 +18,20 @@
package extension
import (
- "github.com/apache/dubbo-go/filter/impl/tps/intf"
+ "github.com/apache/dubbo-go/filter/impl/tps"
)
var (
- tpsLimitStrategy = make(map[string]func(rate int, interval int) intf.TpsLimitStrategy)
- tpsLimiter = make(map[string]func() intf.TpsLimiter)
- tpsRejectedExecutionHandler = make(map[string]func() intf.RejectedExecutionHandler)
+ tpsLimitStrategy = make(map[string]func(rate int, interval int) tps.TpsLimitStrategy)
+ tpsLimiter = make(map[string]func() tps.TpsLimiter)
+ tpsRejectedExecutionHandler = make(map[string]func() tps.RejectedExecutionHandler)
)
-func SetTpsLimiter(name string, creator func() intf.TpsLimiter) {
+func SetTpsLimiter(name string, creator func() tps.TpsLimiter) {
tpsLimiter[name] = creator
}
-func GetTpsLimiter(name string) intf.TpsLimiter {
+func GetTpsLimiter(name string) tps.TpsLimiter {
creator, ok := tpsLimiter[name]
if !ok {
panic("TpsLimiter for " + name + " is not existing, make sure you have import the package " +
@@ -40,11 +40,11 @@ func GetTpsLimiter(name string) intf.TpsLimiter {
return creator()
}
-func SetTpsLimitStrategy(name string, creator func(rate int, interval int) intf.TpsLimitStrategy) {
+func SetTpsLimitStrategy(name string, creator func(rate int, interval int) tps.TpsLimitStrategy) {
tpsLimitStrategy[name] = creator
}
-func GetTpsLimitStrategyCreator(name string) func(rate int, interval int) intf.TpsLimitStrategy {
+func GetTpsLimitStrategyCreator(name string) func(rate int, interval int) tps.TpsLimitStrategy {
creator, ok := tpsLimitStrategy[name]
if !ok {
panic("TpsLimitStrategy for " + name + " is not existing, make sure you have import the package " +
@@ -53,11 +53,11 @@ func GetTpsLimitStrategyCreator(name string) func(rate int, interval int) intf.T
return creator
}
-func SetTpsRejectedExecutionHandler(name string, creator func() intf.RejectedExecutionHandler) {
+func SetTpsRejectedExecutionHandler(name string, creator func() tps.RejectedExecutionHandler) {
tpsRejectedExecutionHandler[name] = creator
}
-func GetTpsRejectedExecutionHandler(name string) intf.RejectedExecutionHandler {
+func GetTpsRejectedExecutionHandler(name string) tps.RejectedExecutionHandler {
creator, ok := tpsRejectedExecutionHandler[name]
if !ok {
panic("TpsRejectedExecutionHandler for " + name + " is not existing, make sure you have import the package " +
diff --git a/filter/impl/tps/rejected_execution_handler_mock.go b/filter/impl/tps/impl/rejected_execution_handler_mock.go
similarity index 99%
rename from filter/impl/tps/rejected_execution_handler_mock.go
rename to filter/impl/tps/impl/rejected_execution_handler_mock.go
index 55b01f022..2f7869d61 100644
--- a/filter/impl/tps/rejected_execution_handler_mock.go
+++ b/filter/impl/tps/impl/rejected_execution_handler_mock.go
@@ -18,7 +18,7 @@
// Source: rejected_execution_handler.go
// Package filter is a generated GoMock package.
-package tps
+package impl
import (
common "github.com/apache/dubbo-go/common"
diff --git a/filter/impl/tps/rejected_execution_handler_only_log.go b/filter/impl/tps/impl/rejected_execution_handler_only_log.go
similarity index 94%
rename from filter/impl/tps/rejected_execution_handler_only_log.go
rename to filter/impl/tps/impl/rejected_execution_handler_only_log.go
index 596160f07..62d2fc81c 100644
--- a/filter/impl/tps/rejected_execution_handler_only_log.go
+++ b/filter/impl/tps/impl/rejected_execution_handler_only_log.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tps
+package impl
import (
"sync"
@@ -26,7 +26,7 @@ import (
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/extension"
"github.com/apache/dubbo-go/common/logger"
- "github.com/apache/dubbo-go/filter/impl/tps/intf"
+ "github.com/apache/dubbo-go/filter/impl/tps"
"github.com/apache/dubbo-go/protocol"
)
@@ -61,7 +61,7 @@ func (handler *OnlyLogRejectedExecutionHandler) RejectedExecution(url common.URL
return &protocol.RPCResult{}
}
-func GetOnlyLogRejectedExecutionHandler() intf.RejectedExecutionHandler {
+func GetOnlyLogRejectedExecutionHandler() tps.RejectedExecutionHandler {
onlyLogHandlerOnce.Do(func() {
onlyLogHandlerInstance = &OnlyLogRejectedExecutionHandler{}
})
diff --git a/filter/impl/tps/rejected_execution_handler_only_log_test.go b/filter/impl/tps/impl/rejected_execution_handler_only_log_test.go
similarity index 98%
rename from filter/impl/tps/rejected_execution_handler_only_log_test.go
rename to filter/impl/tps/impl/rejected_execution_handler_only_log_test.go
index beff7e3f2..da54d8a10 100644
--- a/filter/impl/tps/rejected_execution_handler_only_log_test.go
+++ b/filter/impl/tps/impl/rejected_execution_handler_only_log_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tps
+package impl
import (
"net/url"
diff --git a/filter/impl/tps/tps_limit_fix_window_strategy.go b/filter/impl/tps/impl/tps_limit_fix_window_strategy.go
similarity index 96%
rename from filter/impl/tps/tps_limit_fix_window_strategy.go
rename to filter/impl/tps/impl/tps_limit_fix_window_strategy.go
index 7e4032c68..7290619d5 100644
--- a/filter/impl/tps/tps_limit_fix_window_strategy.go
+++ b/filter/impl/tps/impl/tps_limit_fix_window_strategy.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tps
+package impl
import (
"sync/atomic"
@@ -24,7 +24,7 @@ import (
import (
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/extension"
- "github.com/apache/dubbo-go/filter/impl/tps/intf"
+ "github.com/apache/dubbo-go/filter/impl/tps"
)
const (
@@ -75,7 +75,7 @@ func (impl *FixedWindowTpsLimitStrategyImpl) IsAllowable() bool {
return atomic.AddInt32(&impl.count, 1) <= impl.rate
}
-func NewFixedWindowTpsLimitStrategyImpl(rate int, interval int) intf.TpsLimitStrategy {
+func NewFixedWindowTpsLimitStrategyImpl(rate int, interval int) tps.TpsLimitStrategy {
return &FixedWindowTpsLimitStrategyImpl{
rate: int32(rate),
interval: int64(interval * 1000), // convert to ns
diff --git a/filter/impl/tps/tps_limit_fix_window_strategy_test.go b/filter/impl/tps/impl/tps_limit_fix_window_strategy_test.go
similarity index 99%
rename from filter/impl/tps/tps_limit_fix_window_strategy_test.go
rename to filter/impl/tps/impl/tps_limit_fix_window_strategy_test.go
index 8848a05dd..55d0b14b7 100644
--- a/filter/impl/tps/tps_limit_fix_window_strategy_test.go
+++ b/filter/impl/tps/impl/tps_limit_fix_window_strategy_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tps
+package impl
import (
"testing"
diff --git a/filter/impl/tps/tps_limit_sliding_window_strategy.go b/filter/impl/tps/impl/tps_limit_sliding_window_strategy.go
similarity index 96%
rename from filter/impl/tps/tps_limit_sliding_window_strategy.go
rename to filter/impl/tps/impl/tps_limit_sliding_window_strategy.go
index 3a8db5ab3..de98eb752 100644
--- a/filter/impl/tps/tps_limit_sliding_window_strategy.go
+++ b/filter/impl/tps/impl/tps_limit_sliding_window_strategy.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tps
+package impl
import (
"container/list"
@@ -25,7 +25,7 @@ import (
import (
"github.com/apache/dubbo-go/common/extension"
- "github.com/apache/dubbo-go/filter/impl/tps/intf"
+ "github.com/apache/dubbo-go/filter/impl/tps"
)
func init() {
@@ -80,7 +80,7 @@ func (impl *SlidingWindowTpsLimitStrategyImpl) IsAllowable() bool {
return false
}
-func NewSlidingWindowTpsLimitStrategyImpl(rate int, interval int) intf.TpsLimitStrategy {
+func NewSlidingWindowTpsLimitStrategyImpl(rate int, interval int) tps.TpsLimitStrategy {
return &SlidingWindowTpsLimitStrategyImpl{
rate: rate,
interval: int64(interval * 1000),
diff --git a/filter/impl/tps/tps_limit_sliding_window_strategy_test.go b/filter/impl/tps/impl/tps_limit_sliding_window_strategy_test.go
similarity index 99%
rename from filter/impl/tps/tps_limit_sliding_window_strategy_test.go
rename to filter/impl/tps/impl/tps_limit_sliding_window_strategy_test.go
index 1bca13d40..1d0187fa2 100644
--- a/filter/impl/tps/tps_limit_sliding_window_strategy_test.go
+++ b/filter/impl/tps/impl/tps_limit_sliding_window_strategy_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tps
+package impl
import (
"testing"
diff --git a/filter/impl/tps/tps_limit_strategy_mock.go b/filter/impl/tps/impl/tps_limit_strategy_mock.go
similarity index 99%
rename from filter/impl/tps/tps_limit_strategy_mock.go
rename to filter/impl/tps/impl/tps_limit_strategy_mock.go
index 72c658fb9..a653fb287 100644
--- a/filter/impl/tps/tps_limit_strategy_mock.go
+++ b/filter/impl/tps/impl/tps_limit_strategy_mock.go
@@ -18,7 +18,7 @@
// Source: tps_limit_strategy.go
// Package filter is a generated GoMock package.
-package tps
+package impl
import (
gomock "github.com/golang/mock/gomock"
diff --git a/filter/impl/tps/tps_limit_thread_safe_fix_window_strategy.go b/filter/impl/tps/impl/tps_limit_thread_safe_fix_window_strategy.go
similarity index 95%
rename from filter/impl/tps/tps_limit_thread_safe_fix_window_strategy.go
rename to filter/impl/tps/impl/tps_limit_thread_safe_fix_window_strategy.go
index 3541252db..5f43e8c3b 100644
--- a/filter/impl/tps/tps_limit_thread_safe_fix_window_strategy.go
+++ b/filter/impl/tps/impl/tps_limit_thread_safe_fix_window_strategy.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tps
+package impl
import (
"sync"
@@ -23,7 +23,7 @@ import (
import (
"github.com/apache/dubbo-go/common/extension"
- "github.com/apache/dubbo-go/filter/impl/tps/intf"
+ "github.com/apache/dubbo-go/filter/impl/tps"
)
func init() {
@@ -56,7 +56,7 @@ func (impl *ThreadSafeFixedWindowTpsLimitStrategyImpl) IsAllowable() bool {
return impl.fixedWindow.IsAllowable()
}
-func NewThreadSafeFixedWindowTpsLimitStrategyImpl(rate int, interval int) intf.TpsLimitStrategy {
+func NewThreadSafeFixedWindowTpsLimitStrategyImpl(rate int, interval int) tps.TpsLimitStrategy {
fixedWindowStrategy := NewFixedWindowTpsLimitStrategyImpl(rate, interval).(*FixedWindowTpsLimitStrategyImpl)
return &ThreadSafeFixedWindowTpsLimitStrategyImpl{
fixedWindow: fixedWindowStrategy,
diff --git a/filter/impl/tps/tps_limit_thread_safe_fix_window_strategy_test.go b/filter/impl/tps/impl/tps_limit_thread_safe_fix_window_strategy_test.go
similarity index 99%
rename from filter/impl/tps/tps_limit_thread_safe_fix_window_strategy_test.go
rename to filter/impl/tps/impl/tps_limit_thread_safe_fix_window_strategy_test.go
index 72cd4800d..fea93dfa3 100644
--- a/filter/impl/tps/tps_limit_thread_safe_fix_window_strategy_test.go
+++ b/filter/impl/tps/impl/tps_limit_thread_safe_fix_window_strategy_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tps
+package impl
import (
"testing"
diff --git a/filter/impl/tps/tps_limiter_method_service.go b/filter/impl/tps/impl/tps_limiter_method_service.go
similarity index 96%
rename from filter/impl/tps/tps_limiter_method_service.go
rename to filter/impl/tps/impl/tps_limiter_method_service.go
index 01d9f6564..3faf0d6e6 100644
--- a/filter/impl/tps/tps_limiter_method_service.go
+++ b/filter/impl/tps/impl/tps_limiter_method_service.go
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package tps
+package impl
import (
"fmt"
@@ -30,7 +30,7 @@ import (
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/extension"
- "github.com/apache/dubbo-go/filter/impl/tps/intf"
+ "github.com/apache/dubbo-go/filter/impl/tps"
"github.com/apache/dubbo-go/protocol"
)
@@ -127,7 +127,7 @@ func (limiter MethodServiceTpsLimiterImpl) IsAllowable(url common.URL, invocatio
limitState, found := limiter.tpsState.Load(limitTarget)
if found {
- return limitState.(intf.TpsLimitStrategy).IsAllowable()
+ return limitState.(tps.TpsLimitStrategy).IsAllowable()
}
limitRate := getLimitConfig(methodLimitRateConfig, url, invocation,
@@ -149,7 +149,7 @@ func (limiter MethodServiceTpsLimiterImpl) IsAllowable(url common.URL, invocatio
url.GetParam(constant.TPS_LIMIT_STRATEGY_KEY, constant.DEFAULT_KEY))
limitStateCreator := extension.GetTpsLimitStrategyCreator(limitStrategyConfig)
limitState, _ = limiter.tpsState.LoadOrStore(limitTarget, limitStateCreator(int(limitRate), int(limitInterval)))
- return limitState.(intf.TpsLimitStrategy).IsAllowable()
+ return limitState.(tps.TpsLimitStrategy).IsAllowable()
}
func getLimitConfig(methodLevelConfig string,
@@ -178,7 +178,7 @@ func getLimitConfig(methodLevelConfig string,
var methodServiceTpsLimiterInstance *MethodServiceTpsLimiterImpl
var methodServiceTpsLimiterOnce sync.Once
-func GetMethodServiceTpsLimiter() intf.TpsLimiter {
+func GetMethodServiceTpsLimiter() tps.TpsLimiter {
methodServiceTpsLimiterOnce.Do(func() {
methodServiceTpsLimiterInstance = &MethodServiceTpsLimiterImpl{
tpsState: concurrent.NewMap(),
diff --git a/filter/impl/tps/tps_limiter_method_service_test.go b/filter/impl/tps/impl/tps_limiter_method_service_test.go
similarity index 96%
rename from filter/impl/tps/tps_limiter_method_service_test.go
rename to filter/impl/tps/impl/tps_limiter_method_service_test.go
index 8a6fa8398..006e94638 100644
--- a/filter/impl/tps/tps_limiter_method_service_test.go
+++ b/filter/impl/tps/impl/tps_limiter_method_service_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tps
+package impl
import (
"net/url"
@@ -30,7 +30,7 @@ import (
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/extension"
- "github.com/apache/dubbo-go/filter/impl/tps/intf"
+ "github.com/apache/dubbo-go/filter/impl/tps"
"github.com/apache/dubbo-go/protocol/invocation"
)
@@ -48,7 +48,7 @@ func TestMethodServiceTpsLimiterImpl_IsAllowable_Only_Service_Level(t *testing.T
mockStrategyImpl := NewMockTpsLimitStrategy(ctrl)
mockStrategyImpl.EXPECT().IsAllowable().Return(true).Times(1)
- extension.SetTpsLimitStrategy(constant.DEFAULT_KEY, func(rate int, interval int) intf.TpsLimitStrategy {
+ extension.SetTpsLimitStrategy(constant.DEFAULT_KEY, func(rate int, interval int) tps.TpsLimitStrategy {
assert.Equal(t, 20, rate)
assert.Equal(t, 60000, interval)
return mockStrategyImpl
@@ -95,7 +95,7 @@ func TestMethodServiceTpsLimiterImpl_IsAllowable_Method_Level_Override(t *testin
mockStrategyImpl := NewMockTpsLimitStrategy(ctrl)
mockStrategyImpl.EXPECT().IsAllowable().Return(true).Times(1)
- extension.SetTpsLimitStrategy(constant.DEFAULT_KEY, func(rate int, interval int) intf.TpsLimitStrategy {
+ extension.SetTpsLimitStrategy(constant.DEFAULT_KEY, func(rate int, interval int) tps.TpsLimitStrategy {
assert.Equal(t, 40, rate)
assert.Equal(t, 7000, interval)
return mockStrategyImpl
@@ -123,7 +123,7 @@ func TestMethodServiceTpsLimiterImpl_IsAllowable_Both_Method_And_Service(t *test
mockStrategyImpl := NewMockTpsLimitStrategy(ctrl)
mockStrategyImpl.EXPECT().IsAllowable().Return(true).Times(1)
- extension.SetTpsLimitStrategy(constant.DEFAULT_KEY, func(rate int, interval int) intf.TpsLimitStrategy {
+ extension.SetTpsLimitStrategy(constant.DEFAULT_KEY, func(rate int, interval int) tps.TpsLimitStrategy {
assert.Equal(t, 40, rate)
assert.Equal(t, 3000, interval)
return mockStrategyImpl
diff --git a/filter/impl/tps/tps_limiter_mock.go b/filter/impl/tps/impl/tps_limiter_mock.go
similarity index 99%
rename from filter/impl/tps/tps_limiter_mock.go
rename to filter/impl/tps/impl/tps_limiter_mock.go
index a247bf14d..ff2f984e1 100644
--- a/filter/impl/tps/tps_limiter_mock.go
+++ b/filter/impl/tps/impl/tps_limiter_mock.go
@@ -18,7 +18,7 @@
// Source: tps_limiter.go
// Package filter is a generated GoMock package.
-package tps
+package impl
import (
common "github.com/apache/dubbo-go/common"
diff --git a/filter/impl/tps/intf/rejected_execution_handler.go b/filter/impl/tps/rejected_execution_handler.go
similarity index 99%
rename from filter/impl/tps/intf/rejected_execution_handler.go
rename to filter/impl/tps/rejected_execution_handler.go
index 1e0c0938f..827908974 100644
--- a/filter/impl/tps/intf/rejected_execution_handler.go
+++ b/filter/impl/tps/rejected_execution_handler.go
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package intf
+package tps
import (
"github.com/apache/dubbo-go/common"
diff --git a/filter/impl/tps/intf/tps_limit_strategy.go b/filter/impl/tps/tps_limit_strategy.go
similarity index 99%
rename from filter/impl/tps/intf/tps_limit_strategy.go
rename to filter/impl/tps/tps_limit_strategy.go
index ed52daebf..d1af85b46 100644
--- a/filter/impl/tps/intf/tps_limit_strategy.go
+++ b/filter/impl/tps/tps_limit_strategy.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package intf
+package tps
/*
* please register your implementation by invoking SetTpsLimitStrategy
diff --git a/filter/impl/tps/intf/tps_limiter.go b/filter/impl/tps/tps_limiter.go
similarity index 98%
rename from filter/impl/tps/intf/tps_limiter.go
rename to filter/impl/tps/tps_limiter.go
index d3935c11d..0622a957a 100644
--- a/filter/impl/tps/intf/tps_limiter.go
+++ b/filter/impl/tps/tps_limiter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package intf
+package tps
import (
"github.com/apache/dubbo-go/common"
diff --git a/filter/impl/tps_limit_filter.go b/filter/impl/tps_limit_filter.go
index 11f969e86..1e3222c0e 100644
--- a/filter/impl/tps_limit_filter.go
+++ b/filter/impl/tps_limit_filter.go
@@ -21,7 +21,7 @@ import (
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/extension"
"github.com/apache/dubbo-go/filter"
- _ "github.com/apache/dubbo-go/filter/impl/tps"
+ _ "github.com/apache/dubbo-go/filter/impl/tps/impl"
"github.com/apache/dubbo-go/protocol"
)
diff --git a/filter/impl/tps_limit_filter_test.go b/filter/impl/tps_limit_filter_test.go
index 18a72ba9e..5f5557b07 100644
--- a/filter/impl/tps_limit_filter_test.go
+++ b/filter/impl/tps_limit_filter_test.go
@@ -32,7 +32,7 @@ import (
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/extension"
"github.com/apache/dubbo-go/filter/impl/tps"
- "github.com/apache/dubbo-go/filter/impl/tps/intf"
+ "github.com/apache/dubbo-go/filter/impl/tps/impl"
"github.com/apache/dubbo-go/protocol"
"github.com/apache/dubbo-go/protocol/invocation"
)
@@ -54,9 +54,9 @@ func TestTpsLimitFilter_Invoke_With_No_TpsLimiter(t *testing.T) {
func TestGenericFilter_Invoke_With_Default_TpsLimiter(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
- mockLimiter := tps.NewMockTpsLimiter(ctrl)
+ mockLimiter := impl.NewMockTpsLimiter(ctrl)
mockLimiter.EXPECT().IsAllowable(gomock.Any(), gomock.Any()).Return(true).Times(1)
- extension.SetTpsLimiter(constant.DEFAULT_KEY, func() intf.TpsLimiter {
+ extension.SetTpsLimiter(constant.DEFAULT_KEY, func() tps.TpsLimiter {
return mockLimiter
})
@@ -75,17 +75,17 @@ func TestGenericFilter_Invoke_With_Default_TpsLimiter(t *testing.T) {
func TestGenericFilter_Invoke_With_Default_TpsLimiter_Not_Allow(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
- mockLimiter := tps.NewMockTpsLimiter(ctrl)
+ mockLimiter := impl.NewMockTpsLimiter(ctrl)
mockLimiter.EXPECT().IsAllowable(gomock.Any(), gomock.Any()).Return(false).Times(1)
- extension.SetTpsLimiter(constant.DEFAULT_KEY, func() intf.TpsLimiter {
+ extension.SetTpsLimiter(constant.DEFAULT_KEY, func() tps.TpsLimiter {
return mockLimiter
})
mockResult := &protocol.RPCResult{}
- mockRejectedHandler := tps.NewMockRejectedExecutionHandler(ctrl)
+ mockRejectedHandler := impl.NewMockRejectedExecutionHandler(ctrl)
mockRejectedHandler.EXPECT().RejectedExecution(gomock.Any(), gomock.Any()).Return(mockResult).Times(1)
- extension.SetTpsRejectedExecutionHandler(constant.DEFAULT_KEY, func() intf.RejectedExecutionHandler {
+ extension.SetTpsRejectedExecutionHandler(constant.DEFAULT_KEY, func() tps.RejectedExecutionHandler {
return mockRejectedHandler
})
--
GitLab