Skip to content

Implement extract time filters #539

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 2 commits into from
Jul 16, 2025
Merged

Implement extract time filters #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f52a8c
implement
Wei-hao-Li Jul 9, 2025
ea9ae28
fix according review
Wei-hao-Li Jul 16, 2025
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
13 changes: 13 additions & 0 deletions java/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/Filter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.tsfile.read.filter.factory.TimeFilterApi;
import org.apache.tsfile.read.filter.factory.ValueFilterApi;
import org.apache.tsfile.read.filter.operator.And;
import org.apache.tsfile.read.filter.operator.ExtractTimeFilterOperators;
import org.apache.tsfile.read.filter.operator.GroupByFilter;
import org.apache.tsfile.read.filter.operator.GroupByMonthFilter;
import org.apache.tsfile.read.filter.operator.Not;
Expand Down Expand Up @@ -245,6 +246,18 @@ public static Filter deserialize(ByteBuffer buffer) {
return new Or(buffer);
case NOT:
return new Not(buffer);
case EXTRACT_TIME_EQ:
return new ExtractTimeFilterOperators.ExtractTimeEq(buffer);
case EXTRACT_TIME_NEQ:
return new ExtractTimeFilterOperators.ExtractTimeNotEq(buffer);
case EXTRACT_TIME_GT:
return new ExtractTimeFilterOperators.ExtractTimeGt(buffer);
case EXTRACT_TIME_GTEQ:
return new ExtractTimeFilterOperators.ExtractTimeGtEq(buffer);
case EXTRACT_TIME_LT:
return new ExtractTimeFilterOperators.ExtractTimeLt(buffer);
case EXTRACT_TIME_LTEQ:
return new ExtractTimeFilterOperators.ExtractTimeLtEq(buffer);
default:
throw new UnsupportedOperationException("Unsupported operator type:" + type);
}
Expand Down
10 changes: 9 additions & 1 deletion java/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/OperatorType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,15 @@ public enum OperatorType {

// is null
VALUE_IS_NULL("IS NULL"),
VALUE_IS_NOT_NULL("IS NOT NULL");
VALUE_IS_NOT_NULL("IS NOT NULL"),

// extract comparison
EXTRACT_TIME_EQ("="),
EXTRACT_TIME_NEQ("!="),
EXTRACT_TIME_GT(">"),
EXTRACT_TIME_GTEQ(">="),
EXTRACT_TIME_LT("<"),
EXTRACT_TIME_LTEQ("<=");

private final String symbol;

Expand Down
38 changes: 38 additions & 0 deletions java/tsfile/src/main/java/org/apache/tsfile/read/filter/factory/TimeFilterApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@

package org.apache.tsfile.read.filter.factory;

import org.apache.tsfile.read.filter.operator.ExtractTimeFilterOperators.ExtractTimeEq;
import org.apache.tsfile.read.filter.operator.ExtractTimeFilterOperators.ExtractTimeGt;
import org.apache.tsfile.read.filter.operator.ExtractTimeFilterOperators.ExtractTimeGtEq;
import org.apache.tsfile.read.filter.operator.ExtractTimeFilterOperators.ExtractTimeLt;
import org.apache.tsfile.read.filter.operator.ExtractTimeFilterOperators.ExtractTimeLtEq;
import org.apache.tsfile.read.filter.operator.ExtractTimeFilterOperators.ExtractTimeNotEq;
import org.apache.tsfile.read.filter.operator.ExtractTimeFilterOperators.Field;
import org.apache.tsfile.read.filter.operator.GroupByFilter;
import org.apache.tsfile.read.filter.operator.GroupByMonthFilter;
import org.apache.tsfile.read.filter.operator.TimeFilterOperators.TimeBetweenAnd;
Expand All @@ -33,6 +40,7 @@
import org.apache.tsfile.read.filter.operator.TimeFilterOperators.TimeNotIn;
import org.apache.tsfile.utils.TimeDuration;

import java.time.ZoneId;
import java.util.Set;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -98,4 +106,34 @@ public static GroupByMonthFilter groupByMonth(
return new GroupByMonthFilter(
startTime, endTime, interval, slidingStep, timeZone, currPrecision);
}

public static ExtractTimeGt extractTimeGt(
long value, Field field, ZoneId zoneId, TimeUnit currPrecision) {
return new ExtractTimeGt(value, field, zoneId, currPrecision);
}

public static ExtractTimeGtEq extractTimeGtEq(
long value, Field field, ZoneId zoneId, TimeUnit currPrecision) {
return new ExtractTimeGtEq(value, field, zoneId, currPrecision);
}

public static ExtractTimeLt extractTimeLt(
long value, Field field, ZoneId zoneId, TimeUnit currPrecision) {
return new ExtractTimeLt(value, field, zoneId, currPrecision);
}

public static ExtractTimeLtEq extractTimeLtEq(
long value, Field field, ZoneId zoneId, TimeUnit currPrecision) {
return new ExtractTimeLtEq(value, field, zoneId, currPrecision);
}

public static ExtractTimeEq extractTimeEq(
long value, Field field, ZoneId zoneId, TimeUnit currPrecision) {
return new ExtractTimeEq(value, field, zoneId, currPrecision);
}

public static ExtractTimeNotEq extractTimeNotEq(
long value, Field field, ZoneId zoneId, TimeUnit currPrecision) {
return new ExtractTimeNotEq(value, field, zoneId, currPrecision);
}
}
Loading
Loading