Skip to content

Commit

Permalink
PARQUET-2390: Replace anonymouse functions with lambdas (#1213)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fokko
Fokko authored Dec 4, 2023
1 parent 1c484e6 commit a308f21
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 100 deletions.
112 changes: 21 additions & 91 deletions parquet-column/src/main/java/org/apache/parquet/filter/ColumnPredicates.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,162 +29,92 @@
*/
public class ColumnPredicates {

public static interface Predicate {
public interface Predicate {
boolean apply(ColumnReader input);
}

public static interface PredicateFunction<T> {
public interface PredicateFunction<T> {
boolean functionToApply(T input);
}

/* provide the following to avoid boxing primitives */

public static interface IntegerPredicateFunction {
public interface IntegerPredicateFunction {
boolean functionToApply(int input);
}

public static interface LongPredicateFunction {
public interface LongPredicateFunction {
boolean functionToApply(long input);
}

public static interface FloatPredicateFunction {
public interface FloatPredicateFunction {
boolean functionToApply(float input);
}

public static interface DoublePredicateFunction {
public interface DoublePredicateFunction {
boolean functionToApply(double input);
}

public static interface BooleanPredicateFunction {
public interface BooleanPredicateFunction {
boolean functionToApply(boolean input);
}

public static Predicate equalTo(final String target) {
Objects.requireNonNull(target, "target cannot be null");
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return target.equals(input.getBinary().toStringUsingUTF8());
}
};
return input -> target.equals(input.getBinary().toStringUsingUTF8());
}

public static Predicate applyFunctionToString(final PredicateFunction<String> fn) {
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return fn.functionToApply(input.getBinary().toStringUsingUTF8());
}
};
return input -> fn.functionToApply(input.getBinary().toStringUsingUTF8());
}

public static Predicate equalTo(final int target) {
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return input.getInteger() == target;
}
};
return input -> input.getInteger() == target;
}

public static Predicate applyFunctionToInteger(final IntegerPredicateFunction fn) {
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return fn.functionToApply(input.getInteger());
}
};
return input -> fn.functionToApply(input.getInteger());
}

public static Predicate equalTo(final long target) {
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return input.getLong() == target;
}
};
return input -> input.getLong() == target;
}

public static Predicate applyFunctionToLong(final LongPredicateFunction fn) {
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return fn.functionToApply(input.getLong());
}
};
return input -> fn.functionToApply(input.getLong());
}

public static Predicate equalTo(final float target) {
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return input.getFloat() == target;
}
};
return input -> input.getFloat() == target;
}

public static Predicate applyFunctionToFloat(final FloatPredicateFunction fn) {
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return fn.functionToApply(input.getFloat());
}
};
return input -> fn.functionToApply(input.getFloat());
}

public static Predicate equalTo(final double target) {
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return input.getDouble() == target;
}
};
return input -> input.getDouble() == target;
}

public static Predicate applyFunctionToDouble(final DoublePredicateFunction fn) {
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return fn.functionToApply(input.getDouble());
}
};
return input -> fn.functionToApply(input.getDouble());
}

public static Predicate equalTo(final boolean target) {
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return input.getBoolean() == target;
}
};
return input -> input.getBoolean() == target;
}

public static Predicate applyFunctionToBoolean(final BooleanPredicateFunction fn) {
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return fn.functionToApply(input.getBoolean());
}
};
return input -> fn.functionToApply(input.getBoolean());
}

public static <E extends Enum> Predicate equalTo(final E target) {
Objects.requireNonNull(target, "target cannot be null");
final String targetAsString = target.name();
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return targetAsString.equals(input.getBinary().toStringUsingUTF8());
}
};
return input -> targetAsString.equals(input.getBinary().toStringUsingUTF8());
}

public static Predicate applyFunctionToBinary(final PredicateFunction<Binary> fn) {
return new Predicate() {
@Override
public boolean apply(ColumnReader input) {
return fn.functionToApply(input.getBinary());
}
};
return input -> fn.functionToApply(input.getBinary());
}
}
11 changes: 2 additions & 9 deletions parquet-column/src/main/java/org/apache/parquet/filter/PagedRecordFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
*/
package org.apache.parquet.filter;

import org.apache.parquet.column.ColumnReader;

/**
* Filter which will only materialize a page worth of results.
*/
Expand All @@ -36,13 +34,8 @@ public final class PagedRecordFilter implements RecordFilter {
* @param pageSize The size of the page.
* @return a paged record filter
*/
public static final UnboundRecordFilter page(final long startPos, final long pageSize) {
return new UnboundRecordFilter() {
@Override
public RecordFilter bind(Iterable<ColumnReader> readers) {
return new PagedRecordFilter(startPos, pageSize);
}
};
public static UnboundRecordFilter page(final long startPos, final long pageSize) {
return readers -> new PagedRecordFilter(startPos, pageSize);
}

/**
Expand Down

0 comments on commit a308f21

Please sign in to comment.