Skip to content
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

Jump to bottom

Cloudflare: perf improvement #43

Merged
merged 4 commits into from
Jan 23, 2024
Merged

Cloudflare: perf improvement #43

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
8e86867
Benchmarks: give more runs, for better comparisons
yosiat Jan 23, 2024
035c56a
Limiter benchmarks: run against real redis server in order to reduce …
yosiat Jan 23, 2024
4e88a4d
Cloudflare: reduce allocs
yosiat Jan 23, 2024
5057eb8
Cloudflare: another small allocation reduction
yosiat Jan 23, 2024
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
bench:
go test -benchmem -run=NONE -bench .
go test -count 5 -benchmem -run=NONE -bench .

test: lint tools
@echo "==> Running tests..."
Expand All @@ -11,4 +11,4 @@ lint: tools
.PHONY: tools
tools:
@echo "==> Installing tools from tools.go..."
@awk -F'"' '/_/ {print $$2}' tools.go | xargs -I % go install %
@awk -F'"' '/_/ {print $$2}' tools.go | xargs -I % go install %
12 changes: 5 additions & 7 deletions algorithm/cloudflare/redis_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package cloudflare

import (
"context"
"fmt"
"time"

"github.com/go-redis/redis/v8"
Expand All @@ -19,12 +18,11 @@ func (s *RedisDataStore) Inc(key string, window time.Time) error {
ctx := context.Background()
key = mapKey(key, window)

if _, err := s.RDB.TxPipelined(ctx, func(pipe redis.Pipeliner) error {
pipe.Incr(ctx, key)
pipe.Expire(ctx, key, s.ExpirationTime)
pipe := s.RDB.TxPipeline()
pipe.Incr(ctx, key)
pipe.Expire(ctx, key, s.ExpirationTime)

return nil
}); err != nil {
if _, err := pipe.Exec(ctx); err != nil {
return err
}

Expand All @@ -49,5 +47,5 @@ func (s *RedisDataStore) Get(key string, previousWindow, currentWindow time.Time
}

func mapKey(key string, window time.Time) string {
return fmt.Sprintf("%s_%s", key, window.Format(time.RFC3339))
return key + "_" + window.Format(time.RFC3339)
}
27 changes: 17 additions & 10 deletions limiter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,9 @@ import (
"github.com/bringg/go_redis_ratelimit/algorithm/sliding_window"
)

var limiter = rateLimiter()

func rateLimiter() *Limiter {
mr, err := miniredis.Run()
if err != nil {
panic(err)
}

func rateLimiter(addr string) *Limiter {
client := redis.NewClient(&redis.Options{
Addr: mr.Addr(),
Addr: addr,
})

if err := client.FlushDB(context.Background()).Err(); err != nil {
Expand All @@ -40,7 +33,12 @@ func rateLimiter() *Limiter {
}

func TestLimiter_Allow(t *testing.T) {
l := rateLimiter()
mr, err := miniredis.Run()
require.NoError(t, err)

defer mr.Close()

l := rateLimiter(mr.Addr())

limit := &Limit{
Algorithm: sliding_window.AlgorithmName,
Expand Down Expand Up @@ -84,7 +82,12 @@ func TestLimiter_Allow(t *testing.T) {
})
}

// In benchmarks we will use real redis-server, since mini-redis impacts the benchmarks.
const redisAddress = "localhost:6379"

func Benchmark_CloudflareAlgorithm(b *testing.B) {
limiter := rateLimiter(redisAddress)

for i := 0; i < b.N; i++ {
if _, err := limiter.Allow("cloudflare", &Limit{
Algorithm: cloudflare.AlgorithmName,
Expand All @@ -97,6 +100,8 @@ func Benchmark_CloudflareAlgorithm(b *testing.B) {
}

func Benchmark_GcraAlgorithm(b *testing.B) {
limiter := rateLimiter(redisAddress)

for i := 0; i < b.N; i++ {
if _, err := limiter.Allow("gcra", &Limit{
Algorithm: gcra.AlgorithmName,
Expand All @@ -110,6 +115,8 @@ func Benchmark_GcraAlgorithm(b *testing.B) {
}

func Benchmark_SlidingWindowAlgorithm(b *testing.B) {
limiter := rateLimiter(redisAddress)

for i := 0; i < b.N; i++ {
if _, err := limiter.Allow("sliding_window", &Limit{
Algorithm: sliding_window.AlgorithmName,
Expand Down