Remove unnecessary filter accumulation logic

Signed-off-by: Calum Murray <[email protected]>
knative · Sep 29, 2023 · 18d0553 · 18d0553
1 parent 6915382
commit 18d0553
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 28 deletions.
diff --git a/pkg/eventfilter/filter.go b/pkg/eventfilter/filter.go
@@ -31,32 +31,6 @@ const (
 // FilterResult has the result of the filtering operation.
 type FilterResult string
 
-func (x FilterResult) And(y FilterResult) FilterResult {
-	if x == NoFilter {
-		return y
-	}
-	if y == NoFilter {
-		return x
-	}
-	if x == PassFilter && y == PassFilter {
-		return PassFilter
-	}
-	return FailFilter
-}
-
-func (x FilterResult) Or(y FilterResult) FilterResult {
-	if x == NoFilter {
-		return y
-	}
-	if y == NoFilter {
-		return x
-	}
-	if x == PassFilter || y == PassFilter {
-		return PassFilter
-	}
-	return FailFilter
-}
-
 // Filter is an interface representing an event filter of the trigger filter
 type Filter interface {
 	// Filter compute the predicate on the provided event and returns the result of the matching

diff --git a/pkg/eventfilter/subscriptionsapi/all_filter.go b/pkg/eventfilter/subscriptionsapi/all_filter.go
@@ -65,7 +65,7 @@ func (filter *allFilter) Filter(ctx context.Context, event cloudevents.Event) ev
 	filter.rwMutex.RLock()
 	defer filter.rwMutex.RUnlock()
 	for i, f := range filter.filters {
-		res = res.And(f.filter.Filter(ctx, event))
+		res = f.filter.Filter(ctx, event)
 		// Short circuit to optimize it
 		if res == eventfilter.FailFilter {
 			select {

diff --git a/pkg/eventfilter/subscriptionsapi/any_filter.go b/pkg/eventfilter/subscriptionsapi/any_filter.go
@@ -59,7 +59,7 @@ func (filter *anyFilter) Filter(ctx context.Context, event cloudevents.Event) ev
 	filter.rwMutex.RLock()
 	defer filter.rwMutex.RUnlock()
 	for i, f := range filter.filters {
-		res = res.Or(f.filter.Filter(ctx, event))
+		res = f.filter.Filter(ctx, event)
 		// Short circuit to optimize it
 		if res == eventfilter.PassFilter {
 			select {