Skip to content

enable allowN and allowAtMost to peek at contents #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 14, 2021
Merged

enable allowN and allowAtMost to peek at contents #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
391d189
add failing test for allowN increment of zero
danehammer Jan 13, 2021
bbc2f1a
fix lua script to allow increment by zero (effectively peek)
danehammer Jan 13, 2021
c48b3c9
same test and fix for allowAtMost increment by zero
danehammer Jan 13, 2021
2af6864
add test for peeking after a write
danehammer Jan 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lua.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ if remaining < 0 then
end

local reset_after = new_tat - now
redis.call("SET", rate_limit_key, new_tat, "EX", math.ceil(reset_after))
if reset_after > 0 then
redis.call("SET", rate_limit_key, new_tat, "EX", math.ceil(reset_after))
end
local retry_after = -1
return {cost, remaining, tostring(retry_after), tostring(reset_after)}
`)
Expand Down Expand Up @@ -121,7 +123,9 @@ local increment = emission_interval * cost
local new_tat = tat + increment

local reset_after = new_tat - now
redis.call("SET", rate_limit_key, new_tat, "EX", math.ceil(reset_after))
if reset_after > 0 then
redis.call("SET", rate_limit_key, new_tat, "EX", math.ceil(reset_after))
end

return {
cost,
Expand Down
60 changes: 60 additions & 0 deletions rate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,36 @@ func TestAllow(t *testing.T) {
require.InDelta(t, res.ResetAfter, 999*time.Millisecond, float64(10*time.Millisecond))
}

func TestAllowN_IncrementZero(t *testing.T) {
ctx := context.Background()
l := rateLimiter()
limit := redis_rate.PerSecond(10)

// Check for a row that's not there
res, err := l.AllowN(ctx, "test_id", limit, 0)
require.Nil(t, err)
require.Equal(t, res.Allowed, 0)
require.Equal(t, res.Remaining, 10)
require.Equal(t, res.RetryAfter, time.Duration(-1))
require.Equal(t, res.ResetAfter, time.Duration(0))

// Now increment it
res, err = l.Allow(ctx, "test_id", limit)
require.Nil(t, err)
require.Equal(t, res.Allowed, 1)
require.Equal(t, res.Remaining, 9)
require.Equal(t, res.RetryAfter, time.Duration(-1))
require.InDelta(t, res.ResetAfter, 100*time.Millisecond, float64(10*time.Millisecond))

// Peek again
res, err = l.AllowN(ctx, "test_id", limit, 0)
require.Nil(t, err)
require.Equal(t, res.Allowed, 0)
require.Equal(t, res.Remaining, 9)
require.Equal(t, res.RetryAfter, time.Duration(-1))
require.InDelta(t, res.ResetAfter, 100*time.Millisecond, float64(10*time.Millisecond))
}

func TestRetryAfter(t *testing.T) {
limit := redis_rate.Limit{
Rate: 1,
Expand Down Expand Up @@ -146,6 +176,36 @@ func TestAllowAtMost(t *testing.T) {
require.InDelta(t, res.ResetAfter, 999*time.Millisecond, float64(10*time.Millisecond))
}

func TestAllowAtMost_IncrementZero(t *testing.T) {
ctx := context.Background()
l := rateLimiter()
limit := redis_rate.PerSecond(10)

// Check for a row that isn't there
res, err := l.AllowAtMost(ctx, "test_id", limit, 0)
require.Nil(t, err)
require.Equal(t, res.Allowed, 0)
require.Equal(t, res.Remaining, 10)
require.Equal(t, res.RetryAfter, time.Duration(-1))
require.Equal(t, res.ResetAfter, time.Duration(0))

// Now increment it
res, err = l.Allow(ctx, "test_id", limit)
require.Nil(t, err)
require.Equal(t, res.Allowed, 1)
require.Equal(t, res.Remaining, 9)
require.Equal(t, res.RetryAfter, time.Duration(-1))
require.InDelta(t, res.ResetAfter, 100*time.Millisecond, float64(10*time.Millisecond))

// Peek again
res, err = l.AllowAtMost(ctx, "test_id", limit, 0)
require.Nil(t, err)
require.Equal(t, res.Allowed, 0)
require.Equal(t, res.Remaining, 9)
require.Equal(t, res.RetryAfter, time.Duration(-1))
require.InDelta(t, res.ResetAfter, 100*time.Millisecond, float64(10*time.Millisecond))
}

func BenchmarkAllow(b *testing.B) {
ctx := context.Background()
l := rateLimiter()
Expand Down