rdblue commented on code in PR #6139:
URL: https://github.com/apache/iceberg/pull/6139#discussion_r1022082391
##########
python/tests/expressions/test_visitors.py:
##########
@@ -1103,363 +1091,296 @@ def test_or(schema: Schema, manifest: ManifestFile):
assert not _ManifestEvalVisitor(
schema,
Or(
- LessThan(Reference[int]("id"), LongLiteral(INT_MIN_VALUE - 25)),
- GreaterThanOrEqual(Reference[int]("id"), LongLiteral(INT_MAX_VALUE
+ 1)),
+ LessThan(Reference("id"), literal(INT_MIN_VALUE - 25)),
+ GreaterThanOrEqual(Reference("id"), literal(INT_MAX_VALUE + 1)),
),
).eval(manifest), "Should skip: or(false, false)"
assert _ManifestEvalVisitor(
schema,
Or(
- LessThan(Reference[int]("id"), LongLiteral(INT_MIN_VALUE - 25)),
- GreaterThanOrEqual(Reference[int]("id"), LongLiteral(INT_MAX_VALUE
- 19)),
+ LessThan(Reference("id"), literal(INT_MIN_VALUE - 25)),
+ GreaterThanOrEqual(Reference("id"), literal(INT_MAX_VALUE - 19)),
),
).eval(manifest), "Should read: or(false, true)"
def test_integer_lt(schema: Schema, manifest: ManifestFile):
- assert not _ManifestEvalVisitor(schema, LessThan(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE - 25))).eval(
+ assert not _ManifestEvalVisitor(schema, LessThan(Reference("id"),
literal(INT_MIN_VALUE - 25))).eval(
manifest
), "Should not read: id range below lower bound (5 < 30)"
- assert not _ManifestEvalVisitor(schema, LessThan(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE))).eval(
+ assert not _ManifestEvalVisitor(schema, LessThan(Reference("id"),
literal(INT_MIN_VALUE))).eval(
manifest
), "Should not read: id range below lower bound (30 is not < 30)"
- assert _ManifestEvalVisitor(schema, LessThan(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE + 1))).eval(
+ assert _ManifestEvalVisitor(schema, LessThan(Reference("id"),
literal(INT_MIN_VALUE + 1))).eval(
manifest
), "Should read: one possible id"
- assert _ManifestEvalVisitor(schema, LessThan(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE))).eval(
+ assert _ManifestEvalVisitor(schema, LessThan(Reference("id"),
literal(INT_MAX_VALUE))).eval(
manifest
), "Should read: may possible ids"
def test_integer_lt_eq(schema: Schema, manifest: ManifestFile):
- assert not _ManifestEvalVisitor(schema,
LessThanOrEqual(Reference[int]("id"), LongLiteral(INT_MIN_VALUE - 25))).eval(
+ assert not _ManifestEvalVisitor(schema, LessThanOrEqual(Reference("id"),
literal(INT_MIN_VALUE - 25))).eval(
manifest
), "Should not read: id range below lower bound (5 < 30)"
- assert not _ManifestEvalVisitor(schema,
LessThanOrEqual(Reference[int]("id"), LongLiteral(INT_MIN_VALUE - 1))).eval(
+ assert not _ManifestEvalVisitor(schema, LessThanOrEqual(Reference("id"),
literal(INT_MIN_VALUE - 1))).eval(
manifest
), "Should not read: id range below lower bound (29 < 30)"
- assert _ManifestEvalVisitor(schema, LessThanOrEqual(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE))).eval(
+ assert _ManifestEvalVisitor(schema, LessThanOrEqual(Reference("id"),
literal(INT_MIN_VALUE))).eval(
manifest
), "Should read: one possible id"
- assert _ManifestEvalVisitor(schema, LessThanOrEqual(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE))).eval(
+ assert _ManifestEvalVisitor(schema, LessThanOrEqual(Reference("id"),
literal(INT_MAX_VALUE))).eval(
manifest
), "Should read: many possible ids"
def test_integer_gt(schema: Schema, manifest: ManifestFile):
- assert not _ManifestEvalVisitor(schema, GreaterThan(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE + 6))).eval(
+ assert not _ManifestEvalVisitor(schema, GreaterThan(Reference("id"),
literal(INT_MAX_VALUE + 6))).eval(
manifest
), "Should not read: id range above upper bound (85 < 79)"
- assert not _ManifestEvalVisitor(schema, GreaterThan(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE))).eval(
+ assert not _ManifestEvalVisitor(schema, GreaterThan(Reference("id"),
literal(INT_MAX_VALUE))).eval(
manifest
), "Should not read: id range above upper bound (79 is not > 79)"
- assert _ManifestEvalVisitor(schema, GreaterThan(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE - 1))).eval(
+ assert _ManifestEvalVisitor(schema, GreaterThan(Reference("id"),
literal(INT_MAX_VALUE - 1))).eval(
manifest
), "Should read: one possible id"
- assert _ManifestEvalVisitor(schema, GreaterThan(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE - 4))).eval(
+ assert _ManifestEvalVisitor(schema, GreaterThan(Reference("id"),
literal(INT_MAX_VALUE - 4))).eval(
manifest
), "Should read: may possible ids"
def test_integer_gt_eq(schema: Schema, manifest: ManifestFile):
- assert not _ManifestEvalVisitor(schema,
GreaterThanOrEqual(Reference[int]("id"), LongLiteral(INT_MAX_VALUE + 6))).eval(
+ assert not _ManifestEvalVisitor(schema,
GreaterThanOrEqual(Reference("id"), literal(INT_MAX_VALUE + 6))).eval(
manifest
), "Should not read: id range above upper bound (85 < 79)"
- assert not _ManifestEvalVisitor(schema,
GreaterThanOrEqual(Reference[int]("id"), LongLiteral(INT_MAX_VALUE + 1))).eval(
+ assert not _ManifestEvalVisitor(schema,
GreaterThanOrEqual(Reference("id"), literal(INT_MAX_VALUE + 1))).eval(
manifest
), "Should not read: id range above upper bound (80 > 79)"
- assert _ManifestEvalVisitor(schema,
GreaterThanOrEqual(Reference[int]("id"), LongLiteral(INT_MAX_VALUE))).eval(
+ assert _ManifestEvalVisitor(schema, GreaterThanOrEqual(Reference("id"),
literal(INT_MAX_VALUE))).eval(
manifest
), "Should read: one possible id"
- assert _ManifestEvalVisitor(schema,
GreaterThanOrEqual(Reference[int]("id"), LongLiteral(INT_MAX_VALUE))).eval(
+ assert _ManifestEvalVisitor(schema, GreaterThanOrEqual(Reference("id"),
literal(INT_MAX_VALUE))).eval(
manifest
), "Should read: may possible ids"
def test_integer_eq(schema: Schema, manifest: ManifestFile):
- assert not _ManifestEvalVisitor(schema, EqualTo(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE - 25))).eval(
+ assert not _ManifestEvalVisitor(schema, EqualTo(Reference("id"),
literal(INT_MIN_VALUE - 25))).eval(
manifest
), "Should not read: id below lower bound"
- assert not _ManifestEvalVisitor(schema, EqualTo(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE - 1))).eval(
+ assert not _ManifestEvalVisitor(schema, EqualTo(Reference("id"),
literal(INT_MIN_VALUE - 1))).eval(
manifest
), "Should not read: id below lower bound"
- assert _ManifestEvalVisitor(schema, EqualTo(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE))).eval(
+ assert _ManifestEvalVisitor(schema, EqualTo(Reference("id"),
literal(INT_MIN_VALUE))).eval(
manifest
), "Should read: id equal to lower bound"
- assert _ManifestEvalVisitor(schema, EqualTo(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE - 4))).eval(
+ assert _ManifestEvalVisitor(schema, EqualTo(Reference("id"),
literal(INT_MAX_VALUE - 4))).eval(
manifest
), "Should read: id between lower and upper bounds"
- assert _ManifestEvalVisitor(schema, EqualTo(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE))).eval(
+ assert _ManifestEvalVisitor(schema, EqualTo(Reference("id"),
literal(INT_MAX_VALUE))).eval(
manifest
), "Should read: id equal to upper bound"
- assert not _ManifestEvalVisitor(schema, EqualTo(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE + 1))).eval(
+ assert not _ManifestEvalVisitor(schema, EqualTo(Reference("id"),
literal(INT_MAX_VALUE + 1))).eval(
manifest
), "Should not read: id above upper bound"
- assert not _ManifestEvalVisitor(schema, EqualTo(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE + 6))).eval(
+ assert not _ManifestEvalVisitor(schema, EqualTo(Reference("id"),
literal(INT_MAX_VALUE + 6))).eval(
manifest
), "Should not read: id above upper bound"
def test_integer_not_eq(schema: Schema, manifest: ManifestFile):
- assert _ManifestEvalVisitor(schema, NotEqualTo(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE - 25))).eval(
+ assert _ManifestEvalVisitor(schema, NotEqualTo(Reference("id"),
literal(INT_MIN_VALUE - 25))).eval(
manifest
), "Should read: id below lower bound"
- assert _ManifestEvalVisitor(schema, NotEqualTo(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE - 1))).eval(
+ assert _ManifestEvalVisitor(schema, NotEqualTo(Reference("id"),
literal(INT_MIN_VALUE - 1))).eval(
manifest
), "Should read: id below lower bound"
- assert _ManifestEvalVisitor(schema, NotEqualTo(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE))).eval(
+ assert _ManifestEvalVisitor(schema, NotEqualTo(Reference("id"),
literal(INT_MIN_VALUE))).eval(
manifest
), "Should read: id equal to lower bound"
- assert _ManifestEvalVisitor(schema, NotEqualTo(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE - 4))).eval(
+ assert _ManifestEvalVisitor(schema, NotEqualTo(Reference("id"),
literal(INT_MAX_VALUE - 4))).eval(
manifest
), "Should read: id between lower and upper bounds"
- assert _ManifestEvalVisitor(schema, NotEqualTo(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE))).eval(
+ assert _ManifestEvalVisitor(schema, NotEqualTo(Reference("id"),
literal(INT_MAX_VALUE))).eval(
manifest
), "Should read: id equal to upper bound"
- assert _ManifestEvalVisitor(schema, NotEqualTo(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE + 1))).eval(
+ assert _ManifestEvalVisitor(schema, NotEqualTo(Reference("id"),
literal(INT_MAX_VALUE + 1))).eval(
manifest
), "Should read: id above upper bound"
- assert _ManifestEvalVisitor(schema, NotEqualTo(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE + 6))).eval(
+ assert _ManifestEvalVisitor(schema, NotEqualTo(Reference("id"),
literal(INT_MAX_VALUE + 6))).eval(
manifest
), "Should read: id above upper bound"
def test_integer_not_eq_rewritten(schema: Schema, manifest: ManifestFile):
- assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE - 25)))).eval(
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("id"),
literal(INT_MIN_VALUE - 25)))).eval(
manifest
), "Should read: id below lower bound"
- assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE - 1)))).eval(
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("id"),
literal(INT_MIN_VALUE - 1)))).eval(
manifest
), "Should read: id below lower bound"
- assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference[int]("id"),
LongLiteral(INT_MIN_VALUE)))).eval(
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("id"),
literal(INT_MIN_VALUE)))).eval(
manifest
), "Should read: id equal to lower bound"
- assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE - 4)))).eval(
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("id"),
literal(INT_MAX_VALUE - 4)))).eval(
manifest
), "Should read: id between lower and upper bounds"
- assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE)))).eval(
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("id"),
literal(INT_MAX_VALUE)))).eval(
manifest
), "Should read: id equal to upper bound"
- assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE + 1)))).eval(
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("id"),
literal(INT_MAX_VALUE + 1)))).eval(
manifest
), "Should read: id above upper bound"
- assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference[int]("id"),
LongLiteral(INT_MAX_VALUE + 6)))).eval(
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("id"),
literal(INT_MAX_VALUE + 6)))).eval(
manifest
), "Should read: id above upper bound"
def test_integer_not_eq_rewritten_case_insensitive(schema: Schema, manifest:
ManifestFile):
- assert _ManifestEvalVisitor(
- schema, Not(EqualTo(Reference[int]("ID"), LongLiteral(INT_MIN_VALUE -
25))), case_sensitive=False
- ).eval(manifest), "Should read: id below lower bound"
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("ID"),
literal(INT_MIN_VALUE - 25))), case_sensitive=False).eval(
+ manifest
+ ), "Should read: id below lower bound"
- assert _ManifestEvalVisitor(
- schema, Not(EqualTo(Reference[int]("ID"), LongLiteral(INT_MIN_VALUE -
1))), case_sensitive=False
- ).eval(manifest), "Should read: id below lower bound"
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("ID"),
literal(INT_MIN_VALUE - 1))), case_sensitive=False).eval(
+ manifest
+ ), "Should read: id below lower bound"
- assert _ManifestEvalVisitor(
- schema, Not(EqualTo(Reference[int]("ID"),
LongLiteral(INT_MIN_VALUE))), case_sensitive=False
- ).eval(manifest), "Should read: id equal to lower bound"
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("ID"),
literal(INT_MIN_VALUE))), case_sensitive=False).eval(
+ manifest
+ ), "Should read: id equal to lower bound"
- assert _ManifestEvalVisitor(
- schema, Not(EqualTo(Reference[int]("ID"), LongLiteral(INT_MAX_VALUE -
4))), case_sensitive=False
- ).eval(manifest), "Should read: id between lower and upper bounds"
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("ID"),
literal(INT_MAX_VALUE - 4))), case_sensitive=False).eval(
+ manifest
+ ), "Should read: id between lower and upper bounds"
- assert _ManifestEvalVisitor(
- schema, Not(EqualTo(Reference[int]("ID"),
LongLiteral(INT_MAX_VALUE))), case_sensitive=False
- ).eval(manifest), "Should read: id equal to upper bound"
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("ID"),
literal(INT_MAX_VALUE))), case_sensitive=False).eval(
+ manifest
+ ), "Should read: id equal to upper bound"
- assert _ManifestEvalVisitor(
- schema, Not(EqualTo(Reference[int]("ID"), LongLiteral(INT_MAX_VALUE +
1))), case_sensitive=False
- ).eval(manifest), "Should read: id above upper bound"
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("ID"),
literal(INT_MAX_VALUE + 1))), case_sensitive=False).eval(
+ manifest
+ ), "Should read: id above upper bound"
- assert _ManifestEvalVisitor(
- schema, Not(EqualTo(Reference[int]("ID"), LongLiteral(INT_MAX_VALUE +
6))), case_sensitive=False
- ).eval(manifest), "Should read: id above upper bound"
+ assert _ManifestEvalVisitor(schema, Not(EqualTo(Reference("ID"),
literal(INT_MAX_VALUE + 6))), case_sensitive=False).eval(
+ manifest
+ ), "Should read: id above upper bound"
def test_integer_in(schema: Schema, manifest: ManifestFile):
- assert not _ManifestEvalVisitor(
- schema, In(Reference[int]("id"), (LongLiteral(INT_MIN_VALUE - 25),
LongLiteral(INT_MIN_VALUE - 24)))
- ).eval(manifest), "Should not read: id below lower bound (5 < 30, 6 < 30)"
+ assert not _ManifestEvalVisitor(schema, In(Reference("id"),
(literal(INT_MIN_VALUE - 25), literal(INT_MIN_VALUE - 24)))).eval(
+ manifest
+ ), "Should not read: id below lower bound (5 < 30, 6 < 30)"
- assert not _ManifestEvalVisitor(
- schema, In(Reference[int]("id"), (LongLiteral(INT_MIN_VALUE - 2),
LongLiteral(INT_MIN_VALUE - 1)))
- ).eval(manifest), "Should not read: id below lower bound (28 < 30, 29 <
30)"
+ assert not _ManifestEvalVisitor(schema, In(Reference("id"),
(literal(INT_MIN_VALUE - 2), literal(INT_MIN_VALUE - 1)))).eval(
+ manifest
+ ), "Should not read: id below lower bound (28 < 30, 29 < 30)"
- assert _ManifestEvalVisitor(
- schema, In(Reference[int]("id"), (LongLiteral(INT_MIN_VALUE - 1),
LongLiteral(INT_MIN_VALUE)))
- ).eval(manifest), "Should read: id equal to lower bound (30 == 30)"
+ assert _ManifestEvalVisitor(schema, In(Reference("id"),
(literal(INT_MIN_VALUE - 1), literal(INT_MIN_VALUE)))).eval(
+ manifest
+ ), "Should read: id equal to lower bound (30 == 30)"
- assert _ManifestEvalVisitor(
- schema, In(Reference[int]("id"), (LongLiteral(INT_MAX_VALUE - 4),
LongLiteral(INT_MAX_VALUE - 3)))
- ).eval(manifest), "Should read: id between lower and upper bounds (30 < 75
< 79, 30 < 76 < 79)"
+ assert _ManifestEvalVisitor(schema, In(Reference("id"),
(literal(INT_MAX_VALUE - 4), literal(INT_MAX_VALUE - 3)))).eval(
+ manifest
+ ), "Should read: id between lower and upper bounds (30 < 75 < 79, 30 < 76
< 79)"
- assert _ManifestEvalVisitor(
- schema, In(Reference[int]("id"), (LongLiteral(INT_MAX_VALUE),
LongLiteral(INT_MAX_VALUE + 1)))
- ).eval(manifest), "Should read: id equal to upper bound (79 == 79)"
+ assert _ManifestEvalVisitor(schema, In(Reference("id"),
(literal(INT_MAX_VALUE), literal(INT_MAX_VALUE + 1)))).eval(
+ manifest
+ ), "Should read: id equal to upper bound (79 == 79)"
- assert not _ManifestEvalVisitor(
- schema, In(Reference[int]("id"), (LongLiteral(INT_MAX_VALUE + 1),
LongLiteral(INT_MAX_VALUE + 2)))
- ).eval(manifest), "Should not read: id above upper bound (80 > 79, 81 >
79)"
+ assert not _ManifestEvalVisitor(schema, In(Reference("id"),
(literal(INT_MAX_VALUE + 1), literal(INT_MAX_VALUE + 2)))).eval(
+ manifest
+ ), "Should not read: id above upper bound (80 > 79, 81 > 79)"
- assert not _ManifestEvalVisitor(
- schema, In(Reference[int]("id"), (LongLiteral(INT_MAX_VALUE + 6),
LongLiteral(INT_MAX_VALUE + 7)))
- ).eval(manifest), "Should not read: id above upper bound (85 > 79, 86 >
79)"
+ assert not _ManifestEvalVisitor(schema, In(Reference("id"),
(literal(INT_MAX_VALUE + 6), literal(INT_MAX_VALUE + 7)))).eval(
+ manifest
+ ), "Should not read: id above upper bound (85 > 79, 86 > 79)"
- assert not _ManifestEvalVisitor(
- schema, In(Reference[str]("all_nulls_missing_nan"),
(StringLiteral("abc"), StringLiteral("def")))
- ).eval(manifest), "Should skip: in on all nulls column"
+ assert not _ManifestEvalVisitor(schema,
In(Reference("all_nulls_missing_nan"), (literal("abc"), literal("def")))).eval(
+ manifest
+ ), "Should skip: in on all nulls column"
- assert _ManifestEvalVisitor(schema, In(Reference[str]("some_nulls"),
(StringLiteral("abc"), StringLiteral("def")))).eval(
+ assert _ManifestEvalVisitor(schema, In(Reference("some_nulls"),
(literal("abc"), literal("def")))).eval(
manifest
), "Should read: in on some nulls column"
- assert _ManifestEvalVisitor(schema, In(Reference[str]("no_nulls"),
(StringLiteral("abc"), StringLiteral("def")))).eval(
+ assert _ManifestEvalVisitor(schema, In(Reference("no_nulls"),
(literal("abc"), literal("def")))).eval(
manifest
), "Should read: in on no nulls column"
def test_integer_not_in(schema: Schema, manifest: ManifestFile):
- assert _ManifestEvalVisitor(
- schema, NotIn(Reference[int]("id"), (LongLiteral(INT_MIN_VALUE - 25),
LongLiteral(INT_MIN_VALUE - 24)))
- ).eval(manifest), "Should read: id below lower bound (5 < 30, 6 < 30)"
+ assert _ManifestEvalVisitor(schema, NotIn(Reference("id"),
(literal(INT_MIN_VALUE - 25), literal(INT_MIN_VALUE - 24)))).eval(
+ manifest
+ ), "Should read: id below lower bound (5 < 30, 6 < 30)"
- assert _ManifestEvalVisitor(
- schema, NotIn(Reference[int]("id"), (LongLiteral(INT_MIN_VALUE - 2),
LongLiteral(INT_MIN_VALUE - 1)))
- ).eval(manifest), "Should read: id below lower bound (28 < 30, 29 < 30)"
+ assert _ManifestEvalVisitor(schema, NotIn(Reference("id"),
(literal(INT_MIN_VALUE - 2), literal(INT_MIN_VALUE - 1)))).eval(
+ manifest
+ ), "Should read: id below lower bound (28 < 30, 29 < 30)"
- assert _ManifestEvalVisitor(
- schema, NotIn(Reference[int]("id"), (LongLiteral(INT_MIN_VALUE - 1),
LongLiteral(INT_MIN_VALUE)))
- ).eval(manifest), "Should read: id equal to lower bound (30 == 30)"
+ assert _ManifestEvalVisitor(schema, NotIn(Reference("id"),
(literal(INT_MIN_VALUE - 1), literal(INT_MIN_VALUE)))).eval(
+ manifest
+ ), "Should read: id equal to lower bound (30 == 30)"
- assert _ManifestEvalVisitor(
- schema, NotIn(Reference[int]("id"), (LongLiteral(INT_MAX_VALUE - 4),
LongLiteral(INT_MAX_VALUE - 3)))
- ).eval(manifest), "Should read: id between lower and upper bounds (30 < 75
< 79, 30 < 76 < 79)"
+ assert _ManifestEvalVisitor(schema, NotIn(Reference("id"),
(literal(INT_MAX_VALUE - 4), literal(INT_MAX_VALUE - 3)))).eval(
+ manifest
+ ), "Should read: id between lower and upper bounds (30 < 75 < 79, 30 < 76
< 79)"
- assert _ManifestEvalVisitor(
- schema, NotIn(Reference[int]("id"), (LongLiteral(INT_MAX_VALUE),
LongLiteral(INT_MAX_VALUE + 1)))
- ).eval(manifest), "Should read: id equal to upper bound (79 == 79)"
+ assert _ManifestEvalVisitor(schema, NotIn(Reference("id"),
(literal(INT_MAX_VALUE), literal(INT_MAX_VALUE + 1)))).eval(
+ manifest
+ ), "Should read: id equal to upper bound (79 == 79)"
- assert _ManifestEvalVisitor(
- schema, NotIn(Reference[int]("id"), (LongLiteral(INT_MAX_VALUE + 1),
LongLiteral(INT_MAX_VALUE + 2)))
- ).eval(manifest), "Should read: id above upper bound (80 > 79, 81 > 79)"
+ assert _ManifestEvalVisitor(schema, NotIn(Reference("id"),
(literal(INT_MAX_VALUE + 1), literal(INT_MAX_VALUE + 2)))).eval(
+ manifest
+ ), "Should read: id above upper bound (80 > 79, 81 > 79)"
- assert _ManifestEvalVisitor(
- schema, NotIn(Reference[int]("id"), (LongLiteral(INT_MAX_VALUE + 6),
LongLiteral(INT_MAX_VALUE + 7)))
- ).eval(manifest), "Should read: id above upper bound (85 > 79, 86 > 79)"
+ assert _ManifestEvalVisitor(schema, NotIn(Reference("id"),
(literal(INT_MAX_VALUE + 6), literal(INT_MAX_VALUE + 7)))).eval(
+ manifest
+ ), "Should read: id above upper bound (85 > 79, 86 > 79)"
- assert _ManifestEvalVisitor(
- schema, NotIn(Reference[str]("all_nulls_missing_nan"),
(StringLiteral("abc"), StringLiteral("def")))
- ).eval(manifest), "Should read: notIn on no nulls column"
+ assert _ManifestEvalVisitor(schema,
NotIn(Reference("all_nulls_missing_nan"), (literal("abc"),
literal("def")))).eval(
+ manifest
+ ), "Should read: notIn on no nulls column"
- assert _ManifestEvalVisitor(schema, NotIn(Reference[str]("some_nulls"),
(StringLiteral("abc"), StringLiteral("def")))).eval(
+ assert _ManifestEvalVisitor(schema, NotIn(Reference("some_nulls"),
(literal("abc"), literal("def")))).eval(
manifest
), "Should read: in on some nulls column"
- assert _ManifestEvalVisitor(schema, NotIn(Reference[str]("no_nulls"),
(StringLiteral("abc"), StringLiteral("def")))).eval(
+ assert _ManifestEvalVisitor(schema, NotIn(Reference("no_nulls"),
(literal("abc"), literal("def")))).eval(
Review Comment:
As long as we're modifying these lines, why not remove `literal` and let the
constructor handle it? (Not a blocker, just curious)
--
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.
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
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
