Skip to content

Commit

Permalink
[SPARK-31064][SQL] New Parquet Predicate Filter APIs with multi-part …
Browse files Browse the repository at this point in the history
…Identifier Support

### What changes were proposed in this pull request?
Parquet's org.apache.parquet.filter2.predicate.FilterApi uses `dots` as separators to split the column name into multi-parts of nested fields. The drawback is this causes issues when the field name contains `dots`.

The new APIs that will be added will take array of string directly for multi-parts of nested fields, so no confusion as using `dots` as separators.

### Why are the changes needed?
To support nested predicate pushdown and predicate pushdown for columns containing `dots`.

### Does this PR introduce any user-facing change?
No.

### How was this patch tested?
Existing UTs.

Closes apache#27824 from dbtsai/SPARK-31064.

Authored-by: DB Tsai <d_tsai@apple.com>
Signed-off-by: DB Tsai <d_tsai@apple.com>
  • Loading branch information
dbtsai authored and Seongjin Cho committed Apr 14, 2020
1 parent 8905b74 commit 8afcb40
Show file tree
Hide file tree
Showing 2 changed files with 156 additions and 93 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
* 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.parquet.filter2.predicate;

import org.apache.parquet.hadoop.metadata.ColumnPath;
import org.apache.parquet.filter2.predicate.Operators.BinaryColumn;
import org.apache.parquet.filter2.predicate.Operators.BooleanColumn;
import org.apache.parquet.filter2.predicate.Operators.DoubleColumn;
import org.apache.parquet.filter2.predicate.Operators.FloatColumn;
import org.apache.parquet.filter2.predicate.Operators.IntColumn;
import org.apache.parquet.filter2.predicate.Operators.LongColumn;

/**
* TODO (PARQUET-1809): This is a temporary workaround; it is intended to be moved to Parquet.
*/
public final class SparkFilterApi {
public static IntColumn intColumn(String[] path) {
return new IntColumn(ColumnPath.get(path));
}

public static LongColumn longColumn(String[] path) {
return new LongColumn(ColumnPath.get(path));
}

public static FloatColumn floatColumn(String[] path) {
return new FloatColumn(ColumnPath.get(path));
}

public static DoubleColumn doubleColumn(String[] path) {
return new DoubleColumn(ColumnPath.get(path));
}

public static BooleanColumn booleanColumn(String[] path) {
return new BooleanColumn(ColumnPath.get(path));
}

public static BinaryColumn binaryColumn(String[] path) {
return new BinaryColumn(ColumnPath.get(path));
}
}

0 comments on commit 8afcb40

Please sign in to comment.