scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 12:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor clearnup in etcd3 code

Browse Source
This commit is contained in:
Wojciech Tyczynski
2016-10-06 15:38:34 +02:00
parent 4dc418c5ee
commit d70a9615ec
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/storage/etcd3/store.go
View File

@@ -314,21 +314,21 @@ func (s *store) List(ctx context.Context, key, resourceVersion string, pred stor
// Watch implements storage.Interface.Watch. // Watch implements storage.Interface.Watch.
func (s *store) Watch(ctx context.Context, key string, resourceVersion string, pred storage.SelectionPredicate) (watch.Interface, error) { func (s *store) Watch(ctx context.Context, key string, resourceVersion string, pred storage.SelectionPredicate) (watch.Interface, error) {
return s.watch(ctx, key, resourceVersion, storage.SimpleFilter(pred), false) return s.watch(ctx, key, resourceVersion, pred, false)
} }
// WatchList implements storage.Interface.WatchList. // WatchList implements storage.Interface.WatchList.
func (s *store) WatchList(ctx context.Context, key string, resourceVersion string, pred storage.SelectionPredicate) (watch.Interface, error) { func (s *store) WatchList(ctx context.Context, key string, resourceVersion string, pred storage.SelectionPredicate) (watch.Interface, error) {
return s.watch(ctx, key, resourceVersion, storage.SimpleFilter(pred), true) return s.watch(ctx, key, resourceVersion, pred, true)
} }
func (s *store) watch(ctx context.Context, key string, rv string, filter storage.FilterFunc, recursive bool) (watch.Interface, error) { func (s *store) watch(ctx context.Context, key string, rv string, pred storage.SelectionPredicate, recursive bool) (watch.Interface, error) {
rev, err := storage.ParseWatchResourceVersion(rv) rev, err := storage.ParseWatchResourceVersion(rv)
if err != nil { if err != nil {
return nil, err return nil, err
} }
key = keyWithPrefix(s.pathPrefix, key) key = keyWithPrefix(s.pathPrefix, key)
return s.watcher.Watch(ctx, key, int64(rev), recursive, filter) return s.watcher.Watch(ctx, key, int64(rev), recursive, storage.SimpleFilter(pred))
} }
func (s *store) getState(getResp *clientv3.GetResponse, key string, v reflect.Value, ignoreNotFound bool) (*objState, error) { func (s *store) getState(getResp *clientv3.GetResponse, key string, v reflect.Value, ignoreNotFound bool) (*objState, error) {

2
pkg/storage/etcd3/watcher_test.go
View File

@@ -92,7 +92,7 @@ func testWatch(t *testing.T, recursive bool) {
}, },
}} }}
for i, tt := range tests { for i, tt := range tests {
w, err := store.watch(ctx, tt.key, "0", storage.SimpleFilter(tt.pred), recursive) w, err := store.watch(ctx, tt.key, "0", tt.pred, recursive)
if err != nil { if err != nil {
t.Fatalf("Watch failed: %v", err) t.Fatalf("Watch failed: %v", err)
} }