Skip to content

Commit 9dc7bbf

Browse files
filter notmatch (#75) (#78)
* filter not match * filter operator all * all use any * add all * delete all operator Co-authored-by: panjiayao <[email protected]>
1 parent fa4e727 commit 9dc7bbf

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

analyzer-runtime/src/main/java/cloud/erda/analyzer/runtime/expression/filters/FilterOperatorDefine.java

+2
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,7 @@ public class FilterOperatorDefine {
4242

4343
public static final String NotMatch = "notMatch";
4444

45+
public static final String All = "all";
46+
4547
public static final String Default = False;
4648
}

analyzer-runtime/src/main/java/cloud/erda/analyzer/runtime/expression/filters/FilterOperatorFactory.java

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public static FilterOperator create(ExpressionFilter filter, ExpressionMetadata
3333
return LikeFilterOperator.instance;
3434
case FilterOperatorDefine.Any:
3535
return AnyFilterOperator.instance;
36+
case FilterOperatorDefine.All:
37+
return AnyFilterOperator.instance;
3638
case FilterOperatorDefine.Null:
3739
return NullFilterOperator.instance;
3840
case FilterOperatorDefine.In:

analyzer-runtime/src/main/java/cloud/erda/analyzer/runtime/expression/filters/NotMatchFilterOperator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public boolean invoke(ExpressionFilter filter, Object value) {
3232
return false;
3333
}
3434
String regex = String.valueOf(filter.getValue()).replace("*", ".*").replace("?", ".?");
35-
return String.valueOf(value).matches(regex);
35+
return !String.valueOf(value).matches(regex);
3636
}
3737

3838
public static final FilterOperator INSTANCE = new MatchFilterOperator();

0 commit comments

Comments
 (0)