Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
10 changes: 9 additions & 1 deletion api/src/main/java/org/apache/iceberg/expressions/Binder.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,15 @@ public static Set<Integer> boundReferences(StructType struct, List<Expression> e
}
ReferenceVisitor visitor = new ReferenceVisitor();
for (Expression expr : exprs) {
ExpressionVisitors.visit(bind(struct, expr, caseSensitive), visitor);
try {
ExpressionVisitors.visit(bind(struct, expr, caseSensitive), visitor);
} catch (IllegalStateException e) {
if (e.getMessage().contains("Found already bound predicate")) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't rely on exception messages like this.

I think instead we should just add a utility to detect whether an expression is bound. Here's an implementation:

  /**
   * Returns whether an expression is bound.
   * <p>
   * An expression is bound if all of its predicates are bound.
   *
   * @param expr an {@link Expression}
   * @return true if the expression is bound
   * @throws IllegalArgumentException if the expression has both bound and unbound predicates.
   */
  public static boolean isBound(Expression expr) {
    Boolean isBound = ExpressionVisitors.visit(expr, new IsBoundVisitor());
    return isBound != null ? isBound : false; // assume unbound if undetermined
  }

  private static class IsBoundVisitor extends ExpressionVisitors.ExpressionVisitor<Boolean> {
    @Override
    public Boolean not(Boolean result) {
      return result;
    }

    @Override
    public Boolean and(Boolean leftResult, Boolean rightResult) {
      return combineResults(leftResult, rightResult);
    }

    @Override
    public Boolean or(Boolean leftResult, Boolean rightResult) {
      return combineResults(leftResult, rightResult);
    }

    @Override
    public <T> Boolean predicate(BoundPredicate<T> pred) {
      return true;
    }

    @Override
    public <T> Boolean predicate(UnboundPredicate<T> pred) {
      return false;
    }

    private Boolean combineResults(Boolean isLeftBound, Boolean isRightBound) {
      if (isLeftBound != null) {
        Preconditions.checkArgument(isRightBound == null || isLeftBound.equals(isRightBound),
            "Found partially bound expression");
        return isLeftBound;
      } else {
        return isRightBound;
      }
    }
  }

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds great! Thank you very much for the implementation!

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem! Thanks for all your work on this.

ExpressionVisitors.visit(expr, visitor);
} else {
throw e;
}
}
}
return visitor.references;
}
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/iceberg/TableProperties.java
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ private TableProperties() {
"write.delete.parquet.row-group-check-max-record-count";
public static final int PARQUET_ROW_GROUP_CHECK_MAX_RECORD_COUNT_DEFAULT = 10000;

public static final String PARQUET_BLOOM_FILTER_COLUMN_ENABLED_PREFIX = "write.parquet.bloom-filter-enabled.column.";

public static final String AVRO_COMPRESSION = "write.avro.compression-codec";
public static final String DELETE_AVRO_COMPRESSION = "write.delete.avro.compression-codec";
public static final String AVRO_COMPRESSION_DEFAULT = "gzip";
Expand Down
17 changes: 13 additions & 4 deletions parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
import static org.apache.iceberg.TableProperties.DELETE_PARQUET_ROW_GROUP_CHECK_MAX_RECORD_COUNT;
import static org.apache.iceberg.TableProperties.DELETE_PARQUET_ROW_GROUP_CHECK_MIN_RECORD_COUNT;
import static org.apache.iceberg.TableProperties.DELETE_PARQUET_ROW_GROUP_SIZE_BYTES;
import static org.apache.iceberg.TableProperties.PARQUET_BLOOM_FILTER_COLUMN_ENABLED_PREFIX;
import static org.apache.iceberg.TableProperties.PARQUET_COMPRESSION;
import static org.apache.iceberg.TableProperties.PARQUET_COMPRESSION_DEFAULT;
import static org.apache.iceberg.TableProperties.PARQUET_COMPRESSION_LEVEL;
Expand Down Expand Up @@ -281,7 +282,7 @@ public <D> FileAppender<D> build() throws IOException {
conf, file, schema, rowGroupSize, metadata, createWriterFunc, codec,
parquetProperties, metricsConfig, writeMode);
} else {
return new ParquetWriteAdapter<>(new ParquetWriteBuilder<D>(ParquetIO.file(file))
ParquetWriteBuilder<D> parquetWriteBuilder = new ParquetWriteBuilder<D>(ParquetIO.file(file))
.withWriterVersion(writerVersion)
.setType(type)
.setConfig(config)
Expand All @@ -291,9 +292,17 @@ public <D> FileAppender<D> build() throws IOException {
.withWriteMode(writeMode)
.withRowGroupSize(rowGroupSize)
.withPageSize(pageSize)
.withDictionaryPageSize(dictionaryPageSize)
.build(),
metricsConfig);
.withDictionaryPageSize(dictionaryPageSize);
// Todo: The following code needs to be improved in the bloom filter write path PR.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is okay for now to get this in with tests. Thanks, @huaxingao!

for (Map.Entry<String, String> entry : config.entrySet()) {
String key = entry.getKey();
if (key.startsWith(PARQUET_BLOOM_FILTER_COLUMN_ENABLED_PREFIX)) {
String columnPath = key.replaceFirst(PARQUET_BLOOM_FILTER_COLUMN_ENABLED_PREFIX, "");
String value = entry.getValue();
parquetWriteBuilder.withBloomFilterEnabled(columnPath, Boolean.valueOf(value));
}
}
return new ParquetWriteAdapter<>(parquetWriteBuilder.build(), metricsConfig);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,331 @@
/*
* 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.iceberg.parquet;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to include the unit test in this PR? I think all you'd need to do is configure the bloom filter settings using the Parquet settings in a Hadoop Configuration rather than through the Iceberg write settings.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to config using ParquetOutputFormat.BLOOM_FILTER_ENABLED by replacing this line with .set(ParquetOutputFormat.BLOOM_FILTER_ENABLED + "#_id", "true") , but it doesn't work.

Seems Iceberg only honors the Iceberg's properties (which are set by Context at here), but it doesn't really take the properties set by Parquet.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that properties will be passed through to the Hadoop Configuration automatically. Is that no longer true?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rdblue Thanks for your quick reply!

Seems the properties need to be passed to InternalParquetRecordWriter through this encodingProps. We need to call the withXXX method explicitly e.g. withDictionaryPageSize to set the property to encodingPropsBuilder

So it seems to me that we have to call this withBloomFilterEnabled explicitly to set the bloom filter property toencodingPropsBuilder. Otherwise, Parquet's InternalParquetRecordWriter won't be able to take it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I set the Parquet properties to encodingPropsBuilder? If the same properties is also set by iceberg properties, I will reset to overwrite.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Is it possible to get some tests working without the write-side changes? Maybe write a Parquet file directly and use name mapping? If not then let's try to make the minimal write-side changes to get the test in.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some minimal write-side changes to get the test in. Hope this is OK.


import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import org.apache.iceberg.Schema;
import org.apache.iceberg.expressions.Binder;
import org.apache.iceberg.expressions.BoundReference;
import org.apache.iceberg.expressions.Expression;
import org.apache.iceberg.expressions.ExpressionVisitors;
import org.apache.iceberg.expressions.ExpressionVisitors.BoundExpressionVisitor;
import org.apache.iceberg.expressions.Expressions;
import org.apache.iceberg.expressions.Literal;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.relocated.com.google.common.collect.Sets;
import org.apache.iceberg.types.Type;
import org.apache.iceberg.types.TypeUtil;
import org.apache.iceberg.types.Types.StructType;
import org.apache.iceberg.util.DecimalUtil;
import org.apache.iceberg.util.UUIDUtil;
import org.apache.parquet.column.values.bloomfilter.BloomFilter;
import org.apache.parquet.hadoop.BloomFilterReader;
import org.apache.parquet.hadoop.metadata.BlockMetaData;
import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData;
import org.apache.parquet.io.api.Binary;
import org.apache.parquet.schema.DecimalMetadata;
import org.apache.parquet.schema.MessageType;
import org.apache.parquet.schema.PrimitiveType;

public class ParquetBloomRowGroupFilter {
private final Schema schema;
private final Expression expr;
private final boolean caseSensitive;

public ParquetBloomRowGroupFilter(Schema schema, Expression unbound) {
this(schema, unbound, true);
}

public ParquetBloomRowGroupFilter(Schema schema, Expression unbound, boolean caseSensitive) {
this.schema = schema;
StructType struct = schema.asStruct();
this.expr = Binder.bind(struct, Expressions.rewriteNot(unbound), caseSensitive);
this.caseSensitive = caseSensitive;
}

/**
* Tests whether the bloom for a row group may contain records that match the expression.
*
* @param fileSchema schema for the Parquet file
* @param rowGroup metadata for a row group
* @param bloomReader a bloom filter reader
* @return false if the file cannot contain rows that match the expression, true otherwise.
*/
public boolean shouldRead(MessageType fileSchema, BlockMetaData rowGroup, BloomFilterReader bloomReader) {
return new BloomEvalVisitor().eval(fileSchema, rowGroup, bloomReader);
}

private static final boolean ROWS_MIGHT_MATCH = true;
private static final boolean ROWS_CANNOT_MATCH = false;

private class BloomEvalVisitor extends BoundExpressionVisitor<Boolean> {
private BloomFilterReader bloomReader;
private Set<Integer> fieldsWithBloomFilter = null;
private Map<Integer, ColumnChunkMetaData> columnMetaMap = null;
private Map<Integer, BloomFilter> bloomCache = null;
private Map<Integer, PrimitiveType> parquetPrimitiveTypes = null;
private Map<Integer, Type> types = null;

private boolean eval(MessageType fileSchema, BlockMetaData rowGroup, BloomFilterReader bloomFilterReader) {
this.bloomReader = bloomFilterReader;
this.fieldsWithBloomFilter = Sets.newHashSet();
this.columnMetaMap = Maps.newHashMap();
this.bloomCache = Maps.newHashMap();
this.parquetPrimitiveTypes = Maps.newHashMap();
this.types = Maps.newHashMap();

for (ColumnChunkMetaData meta : rowGroup.getColumns()) {
PrimitiveType colType = fileSchema.getType(meta.getPath().toArray()).asPrimitiveType();
if (colType.getId() != null) {
int id = colType.getId().intValue();
Type icebergType = schema.findType(id);
if (!ParquetUtil.hasNoBloomFilterPages(meta)) {
fieldsWithBloomFilter.add(id);
}
columnMetaMap.put(id, meta);
parquetPrimitiveTypes.put(id, colType);
types.put(id, icebergType);
}
}

Set<Integer> filterRefs = Binder.boundReferences(schema.asStruct(), ImmutableList.of(expr), caseSensitive);
// If the filter's column set doesn't overlap with any bloom filter columns, exit early with ROWS_MIGHT_MATCH
if (filterRefs.size() > 0 && Sets.intersection(fieldsWithBloomFilter, filterRefs).isEmpty()) {
return ROWS_MIGHT_MATCH;
}

return ExpressionVisitors.visitEvaluator(expr, this);
}

@Override
public Boolean alwaysTrue() {
return ROWS_MIGHT_MATCH; // all rows match
}

@Override
public Boolean alwaysFalse() {
return ROWS_CANNOT_MATCH; // all rows fail
}

@Override
public Boolean not(Boolean result) {
// not() should be rewritten by RewriteNot
// bloom filter is based on hash and cannot eliminate based on not
throw new UnsupportedOperationException("This path shouldn't be reached.");
}

@Override
public Boolean and(Boolean leftResult, Boolean rightResult) {
return leftResult && rightResult;
}

@Override
public Boolean or(Boolean leftResult, Boolean rightResult) {
return leftResult || rightResult;
}

@Override
public <T> Boolean isNull(BoundReference<T> ref) {
// bloom filter only contain non-nulls and cannot eliminate based on isNull or NotNull
return ROWS_MIGHT_MATCH;
}

@Override
public <T> Boolean notNull(BoundReference<T> ref) {
// bloom filter only contain non-nulls and cannot eliminate based on isNull or NotNull
return ROWS_MIGHT_MATCH;
}

@Override
public <T> Boolean isNaN(BoundReference<T> ref) {
// bloom filter is based on hash and cannot eliminate based on isNaN or notNaN
return ROWS_MIGHT_MATCH;
}

@Override
public <T> Boolean notNaN(BoundReference<T> ref) {
// bloom filter is based on hash and cannot eliminate based on isNaN or notNaN
return ROWS_MIGHT_MATCH;
}

@Override
public <T> Boolean lt(BoundReference<T> ref, Literal<T> lit) {
// bloom filter is based on hash and cannot eliminate based on lt or ltEq or gt or gtEq
return ROWS_MIGHT_MATCH;
}

@Override
public <T> Boolean ltEq(BoundReference<T> ref, Literal<T> lit) {
// bloom filter is based on hash and cannot eliminate based on lt or ltEq or gt or gtEq
return ROWS_MIGHT_MATCH;
}

@Override
public <T> Boolean gt(BoundReference<T> ref, Literal<T> lit) {
// bloom filter is based on hash and cannot eliminate based on lt or ltEq or gt or gtEq
return ROWS_MIGHT_MATCH;
}

@Override
public <T> Boolean gtEq(BoundReference<T> ref, Literal<T> lit) {
// bloom filter is based on hash and cannot eliminate based on lt or ltEq or gt or gtEq
return ROWS_MIGHT_MATCH;
}

@Override
public <T> Boolean eq(BoundReference<T> ref, Literal<T> lit) {
int id = ref.fieldId();
if (!fieldsWithBloomFilter.contains(id)) { // no bloom filter
return ROWS_MIGHT_MATCH;
}

BloomFilter bloom = loadBloomFilter(id);
Type type = types.get(id);
T value = lit.value();
return shouldRead(parquetPrimitiveTypes.get(id), value, bloom, type);
}

@Override
public <T> Boolean notEq(BoundReference<T> ref, Literal<T> lit) {
// bloom filter is based on hash and cannot eliminate based on notEq
return ROWS_MIGHT_MATCH;
}

@Override
public <T> Boolean in(BoundReference<T> ref, Set<T> literalSet) {
int id = ref.fieldId();
if (!fieldsWithBloomFilter.contains(id)) { // no bloom filter
return ROWS_MIGHT_MATCH;
}
BloomFilter bloom = loadBloomFilter(id);
Type type = types.get(id);
for (T e : literalSet) {
if (shouldRead(parquetPrimitiveTypes.get(id), e, bloom, type)) {
return ROWS_MIGHT_MATCH;
}
}
return ROWS_CANNOT_MATCH;
}

@Override
public <T> Boolean notIn(BoundReference<T> ref, Set<T> literalSet) {
// bloom filter is based on hash and cannot eliminate based on notIn
return ROWS_MIGHT_MATCH;
}

@Override
public <T> Boolean startsWith(BoundReference<T> ref, Literal<T> lit) {
// bloom filter is based on hash and cannot eliminate based on startsWith
return ROWS_MIGHT_MATCH;
}

@Override
public <T> Boolean notStartsWith(BoundReference<T> ref, Literal<T> lit) {
// bloom filter is based on hash and cannot eliminate based on startsWith
return ROWS_MIGHT_MATCH;
}

private BloomFilter loadBloomFilter(int id) {
if (bloomCache.containsKey(id)) {
return bloomCache.get(id);
} else {
ColumnChunkMetaData columnChunkMetaData = columnMetaMap.get(id);
BloomFilter bloomFilter = bloomReader.readBloomFilter(columnChunkMetaData);
if (bloomFilter == null) {
throw new IllegalStateException("Failed to read required bloom filter for id: " + id);
} else {
bloomCache.put(id, bloomFilter);
}

return bloomFilter;
}
}

private <T> boolean shouldRead(PrimitiveType primitiveType, T value, BloomFilter bloom, Type type) {
long hashValue = 0;
switch (primitiveType.getPrimitiveTypeName()) {
case INT32:
switch (type.typeId()) {
case DECIMAL:
BigDecimal decimalValue = (BigDecimal) value;
hashValue = bloom.hash(decimalValue.unscaledValue().intValue());
return bloom.findHash(hashValue);
case INTEGER:
case DATE:
hashValue = bloom.hash(((Number) value).intValue());
return bloom.findHash(hashValue);
default:
return ROWS_MIGHT_MATCH;
}
case INT64:
switch (type.typeId()) {
case DECIMAL:
BigDecimal decimalValue = (BigDecimal) value;
hashValue = bloom.hash(decimalValue.unscaledValue().longValue());
return bloom.findHash(hashValue);
case LONG:
case TIME:
case TIMESTAMP:
hashValue = bloom.hash(((Number) value).longValue());
return bloom.findHash(hashValue);
default:
return ROWS_MIGHT_MATCH;
}
case FLOAT:
hashValue = bloom.hash(((Number) value).floatValue());
return bloom.findHash(hashValue);
case DOUBLE:
hashValue = bloom.hash(((Number) value).doubleValue());
return bloom.findHash(hashValue);
case FIXED_LEN_BYTE_ARRAY:
case BINARY:
switch (type.typeId()) {
case STRING:
hashValue = bloom.hash(Binary.fromCharSequence((CharSequence) value));
return bloom.findHash(hashValue);
case BINARY:
case FIXED:
hashValue = bloom.hash(Binary.fromConstantByteBuffer((ByteBuffer) value));
return bloom.findHash(hashValue);
case DECIMAL:
DecimalMetadata metadata = primitiveType.getDecimalMetadata();
int scale = metadata.getScale();
int precision = metadata.getPrecision();
byte[] requiredBytes = new byte[TypeUtil.decimalRequiredBytes(precision)];
byte[] binary = DecimalUtil.toReusedFixLengthBytes(precision, scale, (BigDecimal) value, requiredBytes);
hashValue = bloom.hash(Binary.fromConstantByteArray(binary));
return bloom.findHash(hashValue);
case UUID:
hashValue = bloom.hash(Binary.fromConstantByteArray(UUIDUtil.convert((UUID) value)));
return bloom.findHash(hashValue);
default:
return ROWS_MIGHT_MATCH;
}
default:
return ROWS_MIGHT_MATCH;
}
}
}
}
Loading