Skip to content

[SPARK] Add in NOT_STARTS_WITH support to Spark 3.0 #3781

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
rdblue merged 1 commit into from
Dec 21, 2021
Merged

[SPARK] Add in NOT_STARTS_WITH support to Spark 3.0 #3781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions spark/v3.0/spark/src/main/java/org/apache/iceberg/spark/Spark3Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,8 @@ public <T> String predicate(UnboundPredicate<T> pred) {
return pred.ref().name() + " != " + sqlString(pred.literal());
case STARTS_WITH:
return pred.ref().name() + " LIKE '" + pred.literal() + "%'";
case NOT_STARTS_WITH:
return pred.ref().name() + " NOT LIKE '" + pred.literal() + "%'";
case IN:
return pred.ref().name() + " IN (" + sqlString(pred.literals()) + ")";
case NOT_IN:
Expand Down
53 changes: 53 additions & 0 deletions spark/v3.0/spark/src/test/java/org/apache/iceberg/spark/source/TestFilteredScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.List;
import java.util.Locale;
import java.util.UUID;
import java.util.stream.Collectors;
import org.apache.hadoop.conf.Configuration;
import org.apache.iceberg.DataFile;
import org.apache.iceberg.DataFiles;
Expand All @@ -40,6 +41,7 @@
import org.apache.iceberg.io.FileAppender;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.relocated.com.google.common.collect.Sets;
import org.apache.iceberg.spark.SparkReadOptions;
import org.apache.iceberg.spark.data.GenericsHelpers;
import org.apache.iceberg.transforms.Transform;
Expand All @@ -60,6 +62,7 @@
import org.apache.spark.sql.sources.Filter;
import org.apache.spark.sql.sources.GreaterThan;
import org.apache.spark.sql.sources.LessThan;
import org.apache.spark.sql.sources.Not;
import org.apache.spark.sql.sources.StringStartsWith;
import org.apache.spark.sql.types.IntegerType$;
import org.apache.spark.sql.types.LongType$;
Expand Down Expand Up @@ -421,6 +424,19 @@ public void testPartitionedByDataStartsWithFilter() {
Assert.assertEquals(1, scan.planInputPartitions().length);
}

@Test
public void testPartitionedByDataNotStartsWithFilter() {
Table table = buildPartitionedTable("partitioned_by_data", PARTITION_BY_DATA, "data_ident", "data");
CaseInsensitiveStringMap options = new CaseInsensitiveStringMap(ImmutableMap.of("path", table.location()));

SparkScanBuilder builder = new SparkScanBuilder(spark, TABLES.load(options.get("path")), options);

pushFilters(builder, new Not(new StringStartsWith("data", "junc")));
Batch scan = builder.build().toBatch();

Assert.assertEquals(9, scan.planInputPartitions().length);
}

@Test
public void testPartitionedByIdStartsWith() {
Table table = buildPartitionedTable("partitioned_by_id", PARTITION_BY_ID, "id_ident", "id");
Expand All @@ -437,6 +453,22 @@ public void testPartitionedByIdStartsWith() {
Assert.assertEquals(1, scan.planInputPartitions().length);
}

@Test
public void testPartitionedByIdNotStartsWith() {
Table table = buildPartitionedTable("partitioned_by_id", PARTITION_BY_ID, "id_ident", "id");

CaseInsensitiveStringMap options = new CaseInsensitiveStringMap(ImmutableMap.of(
"path", table.location())
);

SparkScanBuilder builder = new SparkScanBuilder(spark, TABLES.load(options.get("path")), options);

pushFilters(builder, new Not(new StringStartsWith("data", "junc")));
Batch scan = builder.build().toBatch();

Assert.assertEquals(9, scan.planInputPartitions().length);
}

@Test
public void testUnpartitionedStartsWith() {
Dataset<Row> df = spark.read()
Expand All @@ -453,6 +485,27 @@ public void testUnpartitionedStartsWith() {
Assert.assertEquals("junction", matchedData.get(0));
}

@Test
public void testUnpartitionedNotStartsWith() {
Dataset<Row> df = spark.read()
.format("iceberg")
.option(SparkReadOptions.VECTORIZATION_ENABLED, String.valueOf(vectorized))
.load(unpartitioned.toString());

List<String> matchedData = df.select("data")
.where("data NOT LIKE 'jun%'")
.as(Encoders.STRING())
.collectAsList();

List<String> expected = testRecords(SCHEMA).stream()
.map(r -> r.getField("data").toString())
.filter(d -> !d.startsWith("jun"))
.collect(Collectors.toList());

Assert.assertEquals(9, matchedData.size());
Assert.assertEquals(Sets.newHashSet(expected), Sets.newHashSet(matchedData));
}

private static Record projectFlat(Schema projection, Record record) {
Record result = GenericRecord.create(projection);
List<Types.NestedField> fields = projection.asStruct().fields();
Expand Down