rdblue commented on a change in pull request #2062: URL: https://github.com/apache/iceberg/pull/2062#discussion_r567175957
########## File path: api/src/test/java/org/apache/iceberg/transforms/TestNotStartsWith.java ########## @@ -0,0 +1,191 @@ +/* + * 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.transforms; + +import org.apache.iceberg.DataFile; +import org.apache.iceberg.PartitionSpec; +import org.apache.iceberg.Schema; +import org.apache.iceberg.TestHelpers; +import org.apache.iceberg.TestHelpers.Row; +import org.apache.iceberg.TestHelpers.TestDataFile; +import org.apache.iceberg.expressions.Binder; +import org.apache.iceberg.expressions.BoundPredicate; +import org.apache.iceberg.expressions.Evaluator; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.False; +import org.apache.iceberg.expressions.InclusiveMetricsEvaluator; +import org.apache.iceberg.expressions.Literal; +import org.apache.iceberg.expressions.Projections; +import org.apache.iceberg.expressions.StrictMetricsEvaluator; +import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.types.Types; +import org.apache.iceberg.types.Types.NestedField; +import org.apache.iceberg.types.Types.StringType; +import org.junit.Assert; +import org.junit.Test; + +import static org.apache.iceberg.TestHelpers.assertAndUnwrapUnbound; +import static org.apache.iceberg.expressions.Expressions.notStartsWith; +import static org.apache.iceberg.types.Conversions.toByteBuffer; +import static org.apache.iceberg.types.Types.NestedField.optional; + +public class TestNotStartsWith { + + private static final String COLUMN = "someStringCol"; + private static final NestedField FIELD = optional(1, COLUMN, Types.StringType.get()); + private static final Schema SCHEMA = new Schema(FIELD); + + // All 50 rows have someStringCol = 'bbb', none are null (despite being optional). + private static final DataFile FILE_1 = new TestDataFile("file_1.avro", Row.of(), 50, + // any value counts, including nulls + ImmutableMap.of(1, 50L), + // null value counts + ImmutableMap.of(1, 0L), + // nan value counts + null, + // lower bounds + ImmutableMap.of(1, toByteBuffer(StringType.get(), "bbb")), + // upper bounds + ImmutableMap.of(1, toByteBuffer(StringType.get(), "bbb"))); + + @Test + public void testTruncateProjections() { + PartitionSpec spec = PartitionSpec.builderFor(SCHEMA).truncate(COLUMN, 4).build(); + + assertProjectionInclusive(spec, notStartsWith(COLUMN, "ab"), "ab", Expression.Operation.NOT_STARTS_WITH); + assertProjectionInclusive(spec, notStartsWith(COLUMN, "abab"), "abab", Expression.Operation.NOT_STARTS_WITH); + assertProjectionInclusive(spec, notStartsWith(COLUMN, "ababab"), "abab", Expression.Operation.NOT_STARTS_WITH); + + assertProjectionStrict(spec, notStartsWith(COLUMN, "ab"), "ab", Expression.Operation.NOT_STARTS_WITH); + assertProjectionStrict(spec, notStartsWith(COLUMN, "abab"), "abab", Expression.Operation.NOT_EQ); + + Expression projection = Projections.strict(spec).project(notStartsWith(COLUMN, "abcde")); + Assert.assertTrue(projection instanceof False); + } + + @Test + public void testTruncateStringWhenProjectedPredicateTermIsLongerThanWidth() { + Truncate<String> trunc = Truncate.get(Types.StringType.get(), 2); + Expression expr = notStartsWith(COLUMN, "abcde"); + BoundPredicate<String> boundExpr = (BoundPredicate<String>) Binder.bind(SCHEMA.asStruct(), expr, false); + + UnboundPredicate<String> projected = trunc.project(COLUMN, boundExpr); + Evaluator evaluator = new Evaluator(SCHEMA.asStruct(), projected); + + Assert.assertFalse("notStartsWith(abcde, truncate(abcde,2)) => false", + evaluator.eval(TestHelpers.Row.of("abcde"))); + + Assert.assertFalse("notStartsWith(abcde, truncate(ab, 2)) => false", + evaluator.eval(TestHelpers.Row.of("ab"))); + + Assert.assertFalse("notStartsWith(abcde, truncate(abcdz, 2)) => false", + evaluator.eval(TestHelpers.Row.of("abcdz"))); + + Assert.assertTrue("notStartsWith(abcde, truncate(a, 2)) => true", + evaluator.eval(TestHelpers.Row.of("a"))); + + Assert.assertTrue("notStartsWith(abcde, truncate(abzcde, 2)) => true", + evaluator.eval(TestHelpers.Row.of("azcde"))); + } + + @Test + public void testTruncateStringWhenProjectedPredicateTermIsShorterThanWidth() { + Truncate<String> trunc = Truncate.get(Types.StringType.get(), 16); + Expression expr = notStartsWith(COLUMN, "ab"); + BoundPredicate<String> boundExpr = (BoundPredicate<String>) Binder.bind(SCHEMA.asStruct(), expr, false); + UnboundPredicate<String> projected = trunc.project(COLUMN, boundExpr); + Evaluator evaluator = new Evaluator(SCHEMA.asStruct(), projected); + + Assert.assertFalse("notStartsWith(ab, truncate(abcde, 16)) => false", + evaluator.eval(TestHelpers.Row.of("abcde"))); + + Assert.assertFalse("notStartsWith(ab, truncate(ab, 16)) => false", + evaluator.eval(TestHelpers.Row.of("ab"))); + + Assert.assertTrue("notStartsWith(ab, truncate(a, 16)) => true", + evaluator.eval(TestHelpers.Row.of("a"))); + } + + @Test + public void testTruncateStringWhenProjectedPredicateTermIsEqualToWidth() { + Truncate<String> trunc = Truncate.get(Types.StringType.get(), 7); + Expression expr = notStartsWith(COLUMN, "abcdefg"); + BoundPredicate<String> boundExpr = (BoundPredicate<String>) Binder.bind(SCHEMA.asStruct(), expr, false); + UnboundPredicate<String> projected = trunc.project(COLUMN, boundExpr); + Evaluator evaluator = new Evaluator(SCHEMA.asStruct(), projected); + + Assert.assertFalse("notStartsWith(abcdefg, truncate(abcdefg, 7)) => false", + evaluator.eval(TestHelpers.Row.of("abcdefg"))); + + Assert.assertTrue("notStartsWith(abcdefg, truncate(ab, 2)) => true", + evaluator.eval(TestHelpers.Row.of("ab"))); + + Assert.assertTrue("notStartsWith(abcdefg, truncate(a, 16)) => true", + evaluator.eval(TestHelpers.Row.of("a"))); + } + + @Test + public void testStrictMetricsEvaluatorForNotStartsWith() { + boolean shouldRead = new StrictMetricsEvaluator(SCHEMA, notStartsWith(COLUMN, "bbb")).eval(FILE_1); + Assert.assertFalse("Should not match: strict metrics eval is always false for notStartsWith", shouldRead); + } + + @Test + public void testInclusiveMetricsEvaluatorForNotStartsWith() { Review comment: Looks good. ########## File path: api/src/test/java/org/apache/iceberg/transforms/TestNotStartsWith.java ########## @@ -0,0 +1,191 @@ +/* + * 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.transforms; + +import org.apache.iceberg.DataFile; +import org.apache.iceberg.PartitionSpec; +import org.apache.iceberg.Schema; +import org.apache.iceberg.TestHelpers; +import org.apache.iceberg.TestHelpers.Row; +import org.apache.iceberg.TestHelpers.TestDataFile; +import org.apache.iceberg.expressions.Binder; +import org.apache.iceberg.expressions.BoundPredicate; +import org.apache.iceberg.expressions.Evaluator; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.False; +import org.apache.iceberg.expressions.InclusiveMetricsEvaluator; +import org.apache.iceberg.expressions.Literal; +import org.apache.iceberg.expressions.Projections; +import org.apache.iceberg.expressions.StrictMetricsEvaluator; +import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.types.Types; +import org.apache.iceberg.types.Types.NestedField; +import org.apache.iceberg.types.Types.StringType; +import org.junit.Assert; +import org.junit.Test; + +import static org.apache.iceberg.TestHelpers.assertAndUnwrapUnbound; +import static org.apache.iceberg.expressions.Expressions.notStartsWith; +import static org.apache.iceberg.types.Conversions.toByteBuffer; +import static org.apache.iceberg.types.Types.NestedField.optional; + +public class TestNotStartsWith { + + private static final String COLUMN = "someStringCol"; + private static final NestedField FIELD = optional(1, COLUMN, Types.StringType.get()); + private static final Schema SCHEMA = new Schema(FIELD); + + // All 50 rows have someStringCol = 'bbb', none are null (despite being optional). + private static final DataFile FILE_1 = new TestDataFile("file_1.avro", Row.of(), 50, + // any value counts, including nulls + ImmutableMap.of(1, 50L), + // null value counts + ImmutableMap.of(1, 0L), + // nan value counts + null, + // lower bounds + ImmutableMap.of(1, toByteBuffer(StringType.get(), "bbb")), + // upper bounds + ImmutableMap.of(1, toByteBuffer(StringType.get(), "bbb"))); + + @Test + public void testTruncateProjections() { + PartitionSpec spec = PartitionSpec.builderFor(SCHEMA).truncate(COLUMN, 4).build(); + + assertProjectionInclusive(spec, notStartsWith(COLUMN, "ab"), "ab", Expression.Operation.NOT_STARTS_WITH); + assertProjectionInclusive(spec, notStartsWith(COLUMN, "abab"), "abab", Expression.Operation.NOT_STARTS_WITH); + assertProjectionInclusive(spec, notStartsWith(COLUMN, "ababab"), "abab", Expression.Operation.NOT_STARTS_WITH); + + assertProjectionStrict(spec, notStartsWith(COLUMN, "ab"), "ab", Expression.Operation.NOT_STARTS_WITH); + assertProjectionStrict(spec, notStartsWith(COLUMN, "abab"), "abab", Expression.Operation.NOT_EQ); + + Expression projection = Projections.strict(spec).project(notStartsWith(COLUMN, "abcde")); + Assert.assertTrue(projection instanceof False); + } + + @Test + public void testTruncateStringWhenProjectedPredicateTermIsLongerThanWidth() { + Truncate<String> trunc = Truncate.get(Types.StringType.get(), 2); + Expression expr = notStartsWith(COLUMN, "abcde"); + BoundPredicate<String> boundExpr = (BoundPredicate<String>) Binder.bind(SCHEMA.asStruct(), expr, false); + + UnboundPredicate<String> projected = trunc.project(COLUMN, boundExpr); + Evaluator evaluator = new Evaluator(SCHEMA.asStruct(), projected); + + Assert.assertFalse("notStartsWith(abcde, truncate(abcde,2)) => false", + evaluator.eval(TestHelpers.Row.of("abcde"))); + + Assert.assertFalse("notStartsWith(abcde, truncate(ab, 2)) => false", + evaluator.eval(TestHelpers.Row.of("ab"))); + + Assert.assertFalse("notStartsWith(abcde, truncate(abcdz, 2)) => false", + evaluator.eval(TestHelpers.Row.of("abcdz"))); + + Assert.assertTrue("notStartsWith(abcde, truncate(a, 2)) => true", + evaluator.eval(TestHelpers.Row.of("a"))); + + Assert.assertTrue("notStartsWith(abcde, truncate(abzcde, 2)) => true", + evaluator.eval(TestHelpers.Row.of("azcde"))); + } + + @Test + public void testTruncateStringWhenProjectedPredicateTermIsShorterThanWidth() { + Truncate<String> trunc = Truncate.get(Types.StringType.get(), 16); + Expression expr = notStartsWith(COLUMN, "ab"); + BoundPredicate<String> boundExpr = (BoundPredicate<String>) Binder.bind(SCHEMA.asStruct(), expr, false); + UnboundPredicate<String> projected = trunc.project(COLUMN, boundExpr); + Evaluator evaluator = new Evaluator(SCHEMA.asStruct(), projected); + + Assert.assertFalse("notStartsWith(ab, truncate(abcde, 16)) => false", + evaluator.eval(TestHelpers.Row.of("abcde"))); + + Assert.assertFalse("notStartsWith(ab, truncate(ab, 16)) => false", + evaluator.eval(TestHelpers.Row.of("ab"))); + + Assert.assertTrue("notStartsWith(ab, truncate(a, 16)) => true", + evaluator.eval(TestHelpers.Row.of("a"))); + } + + @Test + public void testTruncateStringWhenProjectedPredicateTermIsEqualToWidth() { + Truncate<String> trunc = Truncate.get(Types.StringType.get(), 7); + Expression expr = notStartsWith(COLUMN, "abcdefg"); + BoundPredicate<String> boundExpr = (BoundPredicate<String>) Binder.bind(SCHEMA.asStruct(), expr, false); + UnboundPredicate<String> projected = trunc.project(COLUMN, boundExpr); + Evaluator evaluator = new Evaluator(SCHEMA.asStruct(), projected); + + Assert.assertFalse("notStartsWith(abcdefg, truncate(abcdefg, 7)) => false", + evaluator.eval(TestHelpers.Row.of("abcdefg"))); + + Assert.assertTrue("notStartsWith(abcdefg, truncate(ab, 2)) => true", + evaluator.eval(TestHelpers.Row.of("ab"))); + + Assert.assertTrue("notStartsWith(abcdefg, truncate(a, 16)) => true", + evaluator.eval(TestHelpers.Row.of("a"))); + } + + @Test + public void testStrictMetricsEvaluatorForNotStartsWith() { Review comment: Looks good. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
