[ISSUES 111]Flow rule cache/check

adapter/micro/server_test.go

@@ -58,7 +58,7 @@ func TestServerLimiter(t *testing.T) {
 	_, err = flow.LoadRules([]*flow.Rule{
 		{
 			Resource:               req.Method(),
-			Threshold:              1,
+			Threshold:              0,
 			TokenCalculateStrategy: flow.Direct,
 			ControlBehavior:        flow.Reject,
 		},

api/api.go

@@ -11,7 +11,7 @@ var entryOptsPool = sync.Pool{
 		return &EntryOptions{
 			resourceType: base.ResTypeCommon,
 			entryType:    base.Outbound,
-			acquireCount: 1,
+			batchCount:   1,
 			flag:         0,
 			slotChain:    nil,
 			args:         nil,
@@ -24,7 +24,7 @@ var entryOptsPool = sync.Pool{
 type EntryOptions struct {
 	resourceType base.ResourceType
 	entryType    base.TrafficType
-	acquireCount uint32
+	batchCount   uint32
 	flag         int32
 	slotChain    *base.SlotChain
 	args         []interface{}
@@ -34,7 +34,7 @@ type EntryOptions struct {
 func (o *EntryOptions) Reset() {
 	o.resourceType = base.ResTypeCommon
 	o.entryType = base.Outbound
-	o.acquireCount = 1
+	o.batchCount = 1
 	o.flag = 0
 	o.slotChain = nil
 	o.args = nil
@@ -57,10 +57,18 @@ func WithTrafficType(entryType base.TrafficType) EntryOption {
 	}
 }
 
+// DEPRECATED: use WithBatchCount instead.
 // WithAcquireCount sets the resource entry with the given batch count (by default 1).
 func WithAcquireCount(acquireCount uint32) EntryOption {
 	return func(opts *EntryOptions) {
-		opts.acquireCount = acquireCount
+		opts.batchCount = acquireCount
+	}
+}
+
+// WithBatchCount sets the resource entry with the given batch count (by default 1).
+func WithBatchCount(batchCount uint32) EntryOption {
+	return func(opts *EntryOptions) {
+		opts.batchCount = batchCount
 	}
 }
 
@@ -129,7 +137,7 @@ func entry(resource string, options *EntryOptions) (*base.SentinelEntry, *base.B
 	// Get context from pool.
 	ctx := sc.GetPooledContext()
 	ctx.Resource = rw
-	ctx.Input.AcquireCount = options.acquireCount
+	ctx.Input.BatchCount = options.batchCount
 	ctx.Input.Flag = options.flag
 	if len(options.args) != 0 {
 		ctx.Input.Args = options.args

api/api_test.go

@@ -72,7 +72,7 @@ func Test_entryWithArgsAndChainPass(t *testing.T) {
 	entry, b := entry("abc", &EntryOptions{
 		resourceType: base.ResTypeCommon,
 		entryType:    base.Inbound,
-		acquireCount: 1,
+		batchCount:   1,
 		flag:         0,
 		slotChain:    sc,
 	})
@@ -112,7 +112,7 @@ func Test_entryWithArgsAndChainBlock(t *testing.T) {
 	entry, b := entry("abc", &EntryOptions{
 		resourceType: base.ResTypeCommon,
 		entryType:    base.Inbound,
-		acquireCount: 1,
+		batchCount:   1,
 		flag:         0,
 		slotChain:    sc,
 	})

core/base/context.go

@@ -67,15 +67,15 @@ func NewEmptyEntryContext() *EntryContext {
 
 // The input data of sentinel
 type SentinelInput struct {
-	AcquireCount uint32
-	Flag         int32
-	Args         []interface{}
+	BatchCount uint32
+	Flag       int32
+	Args       []interface{}
 	// store some values in this context when calling context in slot.
 	Attachments map[interface{}]interface{}
 }
 
 func (i *SentinelInput) reset() {
-	i.AcquireCount = 1
+	i.BatchCount = 1
 	i.Flag = 0
 	if len(i.Args) != 0 {
 		i.Args = make([]interface{}, 0)

core/base/slot_chain.go

@@ -67,10 +67,10 @@ func NewSlotChain() *SlotChain {
 				ctx.RuleCheckResult = NewTokenResultPass()
 				ctx.Data = make(map[interface{}]interface{})
 				ctx.Input = &SentinelInput{
-					AcquireCount: 1,
-					Flag:         0,
-					Args:         make([]interface{}, 0),
-					Attachments:  make(map[interface{}]interface{}),
+					BatchCount:  1,
+					Flag:        0,
+					Args:        make([]interface{}, 0),
+					Attachments: make(map[interface{}]interface{}),
 				}
 				return ctx
 			},

core/base/slot_chain_test.go

@@ -223,10 +223,10 @@ func TestSlotChain_Entry_Pass_And_Exit(t *testing.T) {
 	ctx.SetEntry(NewSentinelEntry(ctx, rw, sc))
 	ctx.StatNode = &StatNodeMock{}
 	ctx.Input = &SentinelInput{
-		AcquireCount: 1,
-		Flag:         0,
-		Args:         nil,
-		Attachments:  nil,
+		BatchCount:  1,
+		Flag:        0,
+		Args:        nil,
+		Attachments: nil,
 	}
 
 	ps1 := &prepareSlotMock{}
@@ -266,10 +266,10 @@ func TestSlotChain_Entry_Block(t *testing.T) {
 	ctx.Resource = rw
 	ctx.StatNode = &StatNodeMock{}
 	ctx.Input = &SentinelInput{
-		AcquireCount: 1,
-		Flag:         0,
-		Args:         nil,
-		Attachments:  nil,
+		BatchCount:  1,
+		Flag:        0,
+		Args:        nil,
+		Attachments: nil,
 	}
 
 	rbs := &prepareSlotMock{}
@@ -324,10 +324,10 @@ func TestSlotChain_Entry_With_Panic(t *testing.T) {
 	statNodeMock.On("AddErrorRequest", mock.Anything).Return()
 	ctx.StatNode = statNodeMock
 	ctx.Input = &SentinelInput{
-		AcquireCount: 1,
-		Flag:         0,
-		Args:         nil,
-		Attachments:  nil,
+		BatchCount:  1,
+		Flag:        0,
+		Args:        nil,
+		Attachments: nil,
 	}
 
 	rbs := &badPrepareSlotMock{}