Skip to content

Fix value filter allSatisfy bug #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JackieTien97 merged 1 commit into from
Feb 29, 2024
Merged

Fix value filter allSatisfy bug #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tsfile/src/main/java/org/apache/tsfile/read/filter/basic/ValueFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ public boolean canSkip(IMetadata metadata) {

@Override
public boolean allSatisfy(IMetadata metadata) {
if (metadata.hasNullValue(measurementIndex)) {
// null not satisfy any filter, except IS NULL
return false;
}
Optional<Statistics<? extends Serializable>> statistics =
metadata.getMeasurementStatistics(measurementIndex);
return statistics.map(this::allSatisfy).orElse(false);
Expand Down
8 changes: 8 additions & 0 deletions tsfile/src/main/java/org/apache/tsfile/read/filter/factory/ValueFilterApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ public static ValueRegexp like(int measurementIndex, String likePattern) {
return regexp(measurementIndex, RegexUtils.parseLikePatternToRegex(likePattern));
}

public static ValueRegexp like(int measurementIndex, Pattern pattern) {
return regexp(measurementIndex, pattern);
}

public static ValueNotRegexp notLike(String likePattern) {
return notRegexp(DEFAULT_MEASUREMENT_INDEX, RegexUtils.parseLikePatternToRegex(likePattern));
}
Expand All @@ -144,6 +148,10 @@ public static ValueNotRegexp notLike(int measurementIndex, String likePattern) {
return notRegexp(measurementIndex, RegexUtils.parseLikePatternToRegex(likePattern));
}

public static ValueNotRegexp notLike(int measurementIndex, Pattern pattern) {
return notRegexp(measurementIndex, pattern);
}

public static ValueRegexp regexp(String regex) {
return new ValueRegexp(DEFAULT_MEASUREMENT_INDEX, RegexUtils.compileRegex(regex));
}
Expand Down