abhishekrb19 commented on code in PR #15782: URL: https://github.com/apache/druid/pull/15782#discussion_r1470356984
########## extensions-contrib/druid-iceberg-extensions/src/main/java/org/apache/druid/iceberg/filter/IcebergRangeFilter.java: ########## @@ -0,0 +1,93 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.iceberg.filter; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.base.Preconditions; +import org.apache.iceberg.TableScan; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +public class IcebergRangeFilter implements IcebergFilter +{ + @JsonProperty + private final String filterColumn; + @JsonProperty + private final Boolean lowerOpen; + @JsonProperty + private final Boolean upperOpen; + @JsonProperty + private final Object lower; + @JsonProperty + private final Object upper; + + @JsonCreator + public IcebergRangeFilter( + @JsonProperty("filterColumn") String filterColumn, + @JsonProperty("lower") @Nullable Object lower, + @JsonProperty("upper") @Nullable Object upper, + @JsonProperty("lowerOpen") @Nullable Boolean lowerOpen, + @JsonProperty("upperOpen") @Nullable Boolean upperOpen + ) + { + Preconditions.checkNotNull(filterColumn, "You must specify a filter column on the range filter"); Review Comment: Consider using `DruidException` for these validation checks: ```suggestion if (filterColumn == null) { throw InvalidInput.exception("filterColumn cannot be null."); } ``` ########## docs/ingestion/input-sources.md: ########## @@ -1114,7 +1114,16 @@ This input source provides the following filters: `and`, `equals`, `interval`, a |type|Set this value to `not`.|yes| |filter|The iceberg filter on which logical NOT is applied|yes| +`range` Filter: +|Property|Description|Required| + |--------|-----------|---------| +|type|Set this value to `range`.|yes| +|filterColumn|The column name from the iceberg table schema based on which range filtering needs to happen.|yes| +|lower|Lower bound value to match.|no. At least one of `lower` or `upper` must not be null.| +|upper|Upper bound value to match. |no. At least one of `lower` or `upper` must not be null.| +|lowerOpen|Boolean indicating if lower bound is open in the interval of values defined by the range (">" instead of ">="). |no| Review Comment: Would also be good to specify the defaults explicitly via a separate column or next to the "no" in the required column ########## docs/ingestion/input-sources.md: ########## @@ -1114,7 +1114,16 @@ This input source provides the following filters: `and`, `equals`, `interval`, a |type|Set this value to `not`.|yes| |filter|The iceberg filter on which logical NOT is applied|yes| +`range` Filter: +|Property|Description|Required| + |--------|-----------|---------| Review Comment: ```suggestion |--------|-----------|---------| ``` ########## extensions-contrib/druid-iceberg-extensions/src/main/java/org/apache/druid/iceberg/filter/IcebergRangeFilter.java: ########## @@ -0,0 +1,93 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.iceberg.filter; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.base.Preconditions; +import org.apache.iceberg.TableScan; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +public class IcebergRangeFilter implements IcebergFilter +{ + @JsonProperty + private final String filterColumn; + @JsonProperty + private final Boolean lowerOpen; + @JsonProperty + private final Boolean upperOpen; + @JsonProperty + private final Object lower; + @JsonProperty + private final Object upper; + + @JsonCreator + public IcebergRangeFilter( + @JsonProperty("filterColumn") String filterColumn, + @JsonProperty("lower") @Nullable Object lower, + @JsonProperty("upper") @Nullable Object upper, + @JsonProperty("lowerOpen") @Nullable Boolean lowerOpen, + @JsonProperty("upperOpen") @Nullable Boolean upperOpen + ) + { + Preconditions.checkNotNull(filterColumn, "You must specify a filter column on the range filter"); + Preconditions.checkArgument(lower != null || upper != null, "Both lower and upper bounds cannot be empty"); + this.filterColumn = filterColumn; + this.lowerOpen = lowerOpen != null ? lowerOpen : false; + this.upperOpen = upperOpen != null ? upperOpen : false; + this.lower = lower; + this.upper = upper; + } + + + @Override + public TableScan filter(TableScan tableScan) + { + return tableScan.filter(getFilterExpression()); + } + + @Override + public Expression getFilterExpression() + { + List<Expression> expressions = new ArrayList<>(2); Review Comment: nit: since one of `lower` and `upper` can be null ```suggestion List<Expression> expressions = new ArrayList<>(); ``` ########## extensions-contrib/druid-iceberg-extensions/src/main/java/org/apache/druid/iceberg/filter/IcebergRangeFilter.java: ########## @@ -0,0 +1,93 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.iceberg.filter; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.base.Preconditions; +import org.apache.iceberg.TableScan; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +public class IcebergRangeFilter implements IcebergFilter +{ + @JsonProperty + private final String filterColumn; + @JsonProperty + private final Boolean lowerOpen; + @JsonProperty + private final Boolean upperOpen; + @JsonProperty + private final Object lower; + @JsonProperty + private final Object upper; + + @JsonCreator + public IcebergRangeFilter( + @JsonProperty("filterColumn") String filterColumn, + @JsonProperty("lower") @Nullable Object lower, + @JsonProperty("upper") @Nullable Object upper, + @JsonProperty("lowerOpen") @Nullable Boolean lowerOpen, + @JsonProperty("upperOpen") @Nullable Boolean upperOpen + ) + { + Preconditions.checkNotNull(filterColumn, "You must specify a filter column on the range filter"); + Preconditions.checkArgument(lower != null || upper != null, "Both lower and upper bounds cannot be empty"); + this.filterColumn = filterColumn; + this.lowerOpen = lowerOpen != null ? lowerOpen : false; Review Comment: nit: should we also add checks to validate if `lowerOpen` is specified if `lower` is null as it doesn't make sense? Ditto for `upperOpen` ########## extensions-contrib/druid-iceberg-extensions/src/main/java/org/apache/druid/iceberg/filter/IcebergRangeFilter.java: ########## @@ -0,0 +1,93 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.iceberg.filter; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.base.Preconditions; +import org.apache.iceberg.TableScan; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +public class IcebergRangeFilter implements IcebergFilter +{ + @JsonProperty + private final String filterColumn; + @JsonProperty + private final Boolean lowerOpen; + @JsonProperty + private final Boolean upperOpen; + @JsonProperty + private final Object lower; + @JsonProperty + private final Object upper; + + @JsonCreator + public IcebergRangeFilter( + @JsonProperty("filterColumn") String filterColumn, + @JsonProperty("lower") @Nullable Object lower, + @JsonProperty("upper") @Nullable Object upper, + @JsonProperty("lowerOpen") @Nullable Boolean lowerOpen, + @JsonProperty("upperOpen") @Nullable Boolean upperOpen + ) + { + Preconditions.checkNotNull(filterColumn, "You must specify a filter column on the range filter"); + Preconditions.checkArgument(lower != null || upper != null, "Both lower and upper bounds cannot be empty"); Review Comment: ```suggestion if (lower == null && upper == null) { throw InvalidInput.exception("Both lower and upper bounds cannot be null."); } ``` ########## extensions-contrib/druid-iceberg-extensions/src/main/java/org/apache/druid/iceberg/filter/IcebergFilter.java: ########## @@ -33,7 +33,9 @@ @JsonSubTypes.Type(name = "equals", value = IcebergEqualsFilter.class), @JsonSubTypes.Type(name = "and", value = IcebergAndFilter.class), @JsonSubTypes.Type(name = "not", value = IcebergNotFilter.class), - @JsonSubTypes.Type(name = "or", value = IcebergOrFilter.class) + @JsonSubTypes.Type(name = "or", value = IcebergOrFilter.class), + @JsonSubTypes.Type(name = "range", value = IcebergRangeFilter.class) + Review Comment: ```suggestion ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
