3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-03 08:50:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

storage: add filtering to SyncLatest (#3368)

Browse source 
* wip

* storage: add filtering to SyncLatest

* don't increment the record version, so intermediate changes are requested

* fix stream filter
This commit is contained in:
Caleb Doxsey 2022-05-17 22:00:23 +00:00 • committed by GitHub
parent 363dd82802
commit 1669b601ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 88 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkg/storage/inmemory/backend.go
View file

@ -255,12 +255,18 @@ func (backend *Backend) Sync(ctx context.Context, serverVersion, recordVersion u
}
// SyncLatest returns a record stream for all the records.
func (backend *Backend) SyncLatest(ctx context.Context) (serverVersion uint64, stream storage.RecordStream, err error) {
func (backend *Backend) SyncLatest(
ctx context.Context,
recordType string,
expr storage.FilterExpression,
) (serverVersion, recordVersion uint64, stream storage.RecordStream, err error) {
backend.mu.RLock()
currentServerVersion := backend.serverVersion
serverVersion = backend.serverVersion
recordVersion = backend.lastVersion
backend.mu.RUnlock()
return currentServerVersion, newSyncLatestRecordStream(ctx, backend), nil
stream, err = newSyncLatestRecordStream(ctx, backend, recordType, expr)
return serverVersion, recordVersion, stream, err
}
func (backend *Backend) recordChange(record *databroker.Record) {

2
pkg/storage/inmemory/backend_test.go
View file

@ -210,7 +210,7 @@ func TestCapacity(t *testing.T) {
require.NoError(t, err)
}
_, stream, err := backend.SyncLatest(ctx)
_, _, stream, err := backend.SyncLatest(ctx, "EXAMPLE", nil)
require.NoError(t, err)
records, err := storage.RecordStreamToList(stream)

38
pkg/storage/inmemory/stream.go
View file

@ -10,17 +10,35 @@ import (
func newSyncLatestRecordStream(
ctx context.Context,
backend *Backend,
) storage.RecordStream {
recordType string,
expr storage.FilterExpression,
) (storage.RecordStream, error) {
filter, err := storage.RecordStreamFilterFromFilterExpression(expr)
if err != nil {
return nil, err
}
if recordType != "" {
filter = filter.And(func(record *databroker.Record) (keep bool) {
return record.GetType() == recordType
})
}
var ready []*databroker.Record
return storage.NewRecordStream(ctx, backend.closed, []storage.RecordStreamGenerator{
func(ctx context.Context, block bool) (*databroker.Record, error) {
backend.mu.RLock()
for _, co := range backend.lookup {
ready = append(ready, co.List()...)
generator := func(ctx context.Context, block bool) (*databroker.Record, error) {
backend.mu.RLock()
for _, co := range backend.lookup {
for _, record := range co.List() {
if filter(record) {
ready = append(ready, record)
}
}
backend.mu.RUnlock()
return nil, storage.ErrStreamDone
},
}
backend.mu.RUnlock()
return nil, storage.ErrStreamDone
}
return storage.NewRecordStream(ctx, backend.closed, []storage.RecordStreamGenerator{
generator,
func(ctx context.Context, block bool) (*databroker.Record, error) {
if len(ready) == 0 {
return nil, storage.ErrStreamDone
@ -30,7 +48,7 @@ func newSyncLatestRecordStream(
ready = ready[1:]
return dup(record), nil
},
}, nil)
}, nil), nil
}
func newSyncRecordStream(