feat: use Ristretto to manage the topic selector cache

dunglas · Dec 21, 2020 · b5251fd · b5251fd
1 parent 8d97cc6
commit b5251fd
Show file tree

Hide file tree

Showing 13 changed files with 148 additions and 117 deletions.
diff --git a/authorization_test.go b/authorization_test.go
@@ -394,7 +394,7 @@ func TestAuthorizeAllOriginsAllowed(t *testing.T) {
 }
 
 func TestCanReceive(t *testing.T) {
-	s := NewTopicSelectorStore()
+	s, _ := NewTopicSelectorStore()
 	assert.True(t, canReceive(s, []string{"foo", "bar"}, []string{"foo", "bar"}, true))
 	assert.True(t, canReceive(s, []string{"foo", "bar"}, []string{"bar"}, true))
 	assert.True(t, canReceive(s, []string{"foo", "bar"}, []string{"*"}, true))
@@ -404,7 +404,7 @@ func TestCanReceive(t *testing.T) {
 }
 
 func TestCanDispatch(t *testing.T) {
-	s := NewTopicSelectorStore()
+	s, _ := NewTopicSelectorStore()
 	assert.True(t, canDispatch(s, []string{"foo", "bar"}, []string{"foo", "bar"}))
 	assert.True(t, canDispatch(s, []string{"foo", "bar"}, []string{"*"}))
 	assert.False(t, canDispatch(s, []string{"foo", "bar"}, []string{}))

diff --git a/bolt_transport_test.go b/bolt_transport_test.go
@@ -35,7 +35,8 @@ func TestBoltTransportHistory(t *testing.T) {
 		})
 	}
 
-	s := NewSubscriber("8", transport.logger, NewTopicSelectorStore())
+	tss, _ := NewTopicSelectorStore()
+	s := NewSubscriber("8", transport.logger, tss)
 	s.Topics = topics
 	go s.start()
 
@@ -66,7 +67,8 @@ func TestBoltTransportRetrieveAllHistory(t *testing.T) {
 		})
 	}
 
-	s := NewSubscriber(EarliestLastEventID, transport.logger, NewTopicSelectorStore())
+	tss, _ := NewTopicSelectorStore()
+	s := NewSubscriber(EarliestLastEventID, transport.logger, tss)
 	s.Topics = topics
 	go s.start()
 	require.Nil(t, transport.AddSubscriber(s))
@@ -96,7 +98,8 @@ func TestBoltTransportHistoryAndLive(t *testing.T) {
 		})
 	}
 
-	s := NewSubscriber("8", transport.logger, NewTopicSelectorStore())
+	tss, _ := NewTopicSelectorStore()
+	s := NewSubscriber("8", transport.logger, tss)
 	s.Topics = topics
 	go s.start()
 	require.Nil(t, transport.AddSubscriber(s))
@@ -179,7 +182,8 @@ func TestBoltTransportDoNotDispatchedUntilListen(t *testing.T) {
 	defer os.Remove("test.db")
 	assert.Implements(t, (*Transport)(nil), transport)
 
-	s := NewSubscriber("", transport.logger, NewTopicSelectorStore())
+	tss, _ := NewTopicSelectorStore()
+	s := NewSubscriber("", transport.logger, tss)
 	go s.start()
 	require.Nil(t, transport.AddSubscriber(s))
 
@@ -212,7 +216,8 @@ func TestBoltTransportDispatch(t *testing.T) {
 	defer os.Remove("test.db")
 	assert.Implements(t, (*Transport)(nil), transport)
 
-	s := NewSubscriber("", transport.logger, NewTopicSelectorStore())
+	tss, _ := NewTopicSelectorStore()
+	s := NewSubscriber("", transport.logger, tss)
 	s.Topics = []string{"https://example.com/foo"}
 	go s.start()
 
@@ -230,7 +235,8 @@ func TestBoltTransportClosed(t *testing.T) {
 	defer os.Remove("test.db")
 	assert.Implements(t, (*Transport)(nil), transport)
 
-	s := NewSubscriber("", transport.logger, NewTopicSelectorStore())
+	tss, _ := NewTopicSelectorStore()
+	s := NewSubscriber("", transport.logger, tss)
 	s.Topics = []string{"https://example.com/foo"}
 	go s.start()
 	require.Nil(t, transport.AddSubscriber(s))
@@ -250,8 +256,7 @@ func TestBoltCleanDisconnectedSubscribers(t *testing.T) {
 	defer transport.Close()
 	defer os.Remove("test.db")
 
-	tss := NewTopicSelectorStore()
-
+	tss, _ := NewTopicSelectorStore()
 	s1 := NewSubscriber("", transport.logger, tss)
 	go s1.start()
 	require.Nil(t, transport.AddSubscriber(s1))
@@ -281,8 +286,7 @@ func TestBoltGetSubscribers(t *testing.T) {
 	defer transport.Close()
 	defer os.Remove("test.db")
 
-	tss := NewTopicSelectorStore()
-
+	tss, _ := NewTopicSelectorStore()
 	s1 := NewSubscriber("", transport.logger, tss)
 	go s1.start()
 	require.Nil(t, transport.AddSubscriber(s1))

diff --git a/caddy/go.mod b/caddy/go.mod
@@ -14,21 +14,25 @@ require (
 	github.com/dunglas/mercure v0.11.0-beta.1
 	github.com/golang/snappy v0.0.2 // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
+	github.com/klauspost/compress v1.11.4 // indirect
 	github.com/klauspost/cpuid v1.3.1 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.2 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.3 // indirect
 	github.com/manifoldco/promptui v0.8.0 // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/miekg/dns v1.1.35 // indirect
 	github.com/mitchellh/reflectwalk v1.0.1 // indirect
 	github.com/prometheus/client_golang v1.9.0
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sirupsen/logrus v1.7.0 // indirect
-	github.com/smallstep/certificates v0.15.5 // indirect
+	github.com/smallstep/certificates v0.15.6 // indirect
+	github.com/smallstep/cli v0.15.3 // indirect
 	github.com/smallstep/nosql v0.3.2 // indirect
 	github.com/stretchr/testify v1.6.1
 	github.com/urfave/cli v1.22.5 // indirect
-	go.step.sm/crypto v0.7.1 // indirect
+	github.com/yosida95/uritemplate/v3 v3.0.1 // indirect
+	github.com/yuin/goldmark v1.3.0 // indirect
 	go.uber.org/zap v1.16.0
+	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
 	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
 	google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d // indirect
 	google.golang.org/grpc v1.33.2 // indirect