-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added support for includes/excludes source (#1023)
* Added support for includes/excluses source * Fixed comment grammar * PR fixes * Fixed tests
- Loading branch information
1 parent
0cf0a22
commit f381f04
Showing
27 changed files
with
957 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
astra/src/main/java/com/slack/astra/logstore/search/SourceFieldFilter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| package com.slack.astra.logstore.search; | ||
|
|
||
| import com.slack.astra.proto.service.AstraSearch; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
|
|
||
| public class SourceFieldFilter { | ||
| private final Optional<Boolean> includeAll; | ||
| private final Optional<Boolean> excludeAll; | ||
| private final Map<String, Boolean> includeFields; | ||
| private final Map<String, Boolean> excludeFields; | ||
| private final List<String> includeWildcards; | ||
| private final List<String> excludeWildcards; | ||
| private final FilterType filterType; | ||
|
|
||
| public enum FilterType { | ||
| INCLUDE, | ||
| EXCLUDE | ||
| } | ||
|
|
||
| public SourceFieldFilter( | ||
| Optional<Boolean> includeAll, | ||
| Optional<Boolean> excludeAll, | ||
| Map<String, Boolean> includeFields, | ||
| Map<String, Boolean> excludeFields, | ||
| List<String> includeWildcards, | ||
| List<String> excludeWildcards) { | ||
| this.includeAll = includeAll; | ||
| this.excludeAll = excludeAll; | ||
| this.includeFields = includeFields; | ||
| this.excludeFields = excludeFields; | ||
| this.includeWildcards = includeWildcards; | ||
| this.excludeWildcards = excludeWildcards; | ||
|
|
||
| if (includeAll.isPresent() || !includeFields.isEmpty() || !includeWildcards.isEmpty()) { | ||
| this.filterType = FilterType.INCLUDE; | ||
| } else { | ||
| this.filterType = FilterType.EXCLUDE; | ||
| } | ||
| } | ||
|
|
||
| public static SourceFieldFilter fromProto( | ||
| AstraSearch.SearchRequest.SourceFieldFilter sourceFieldFilterProto) { | ||
| Optional<Boolean> includeAll = Optional.empty(); | ||
| Optional<Boolean> excludeAll = Optional.empty(); | ||
| if (sourceFieldFilterProto.hasIncludeAll()) { | ||
| includeAll = Optional.of(sourceFieldFilterProto.getIncludeAll()); | ||
| } | ||
| if (sourceFieldFilterProto.hasExcludeAll()) { | ||
| excludeAll = Optional.of(sourceFieldFilterProto.getExcludeAll()); | ||
| } | ||
|
|
||
| return new SourceFieldFilter( | ||
| includeAll, | ||
| excludeAll, | ||
| sourceFieldFilterProto.getIncludeFieldsMap(), | ||
| sourceFieldFilterProto.getExcludeFieldsMap(), | ||
| sourceFieldFilterProto.getIncludeWildcardsList(), | ||
| sourceFieldFilterProto.getExcludeWildcardsList()); | ||
| } | ||
|
|
||
| public boolean appliesToField(String fieldname) { | ||
| Optional<Boolean> all = | ||
| this.filterType == FilterType.INCLUDE ? this.includeAll : this.excludeAll; | ||
| Map<String, Boolean> fields = | ||
| this.filterType == FilterType.INCLUDE ? this.includeFields : this.excludeFields; | ||
| List<String> wildcards = | ||
| this.filterType == FilterType.INCLUDE ? this.includeWildcards : this.excludeWildcards; | ||
|
|
||
| if (all.isPresent()) { | ||
| return all.get(); | ||
| } | ||
|
|
||
| if (fields.containsKey(fieldname)) { | ||
| return fields.get(fieldname); | ||
| } | ||
|
|
||
| for (String wildcard : wildcards) { | ||
| if (fieldname.matches(wildcard)) { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| public List<String> getExcludeWildcards() { | ||
| return excludeWildcards; | ||
| } | ||
|
|
||
| public List<String> getIncludeWildcards() { | ||
| return includeWildcards; | ||
| } | ||
|
|
||
| public Map<String, Boolean> getExcludeFields() { | ||
| return excludeFields; | ||
| } | ||
|
|
||
| public Map<String, Boolean> getIncludeFields() { | ||
| return includeFields; | ||
| } | ||
|
|
||
| public Optional<Boolean> getExcludeAll() { | ||
| return excludeAll; | ||
| } | ||
|
|
||
| public Optional<Boolean> getIncludeAll() { | ||
| return includeAll; | ||
| } | ||
|
|
||
| public FilterType getFilterType() { | ||
| return filterType; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.