jun-he commented on a change in pull request #4262: URL: https://github.com/apache/iceberg/pull/4262#discussion_r820944180
########## File path: python/src/iceberg/expression/literals.py ########## @@ -0,0 +1,741 @@ +# Licensed 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. +# +# 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. + +import datetime +import uuid +from decimal import ROUND_HALF_UP, Decimal +from functools import singledispatch + +try: + from functools import singledispatchmethod +except ImportError: + from singledispatch import singledispatchmethod # type: ignore + +import pytz + +from iceberg.types import ( + BinaryType, + BooleanType, + DateType, + DecimalType, + DoubleType, + FixedType, + FloatType, + IntegerType, + LongType, + Singleton, + StringType, + TimestampType, + TimestamptzType, + TimeType, + UUIDType, +) + +JAVA_MAX_INT = 2147483647 +JAVA_MIN_INT = -2147483648 +JAVA_MAX_FLOAT = 3.4028235e38 +JAVA_MIN_FLOAT = -3.4028235e38 +EPOCH = datetime.datetime.utcfromtimestamp(0) +EPOCH_DAY = EPOCH.date() + +""" +Iceberg literal is wrapper class used in expressions, which return unbound predicates +It's being organized as below +Literal +|-- AboveMax +|-- BelowMin +|-- BaseLiteral + |-- StringLiteral + |-- FixedLiteral + |-- BinaryLiteral + |-- ComparableLiteral + |-- BooleanLiteral + |-- IntegerLiteral + |-- LongLiteral + |-- FloatLiteral + |-- DoubleLiteral + |-- DateLiteral + |-- TimeLiteral + |-- TimestampLiteral + |-- DecimalLiteral + |-- UUIDLiteral +""" + + +class Literal: + def to(self, type_var): + raise NotImplementedError() + + def to_byte_buffer(self): + raise NotImplementedError() + + +@singledispatch +def of(value): + """ + A generic Literal factory to construct an iceberg Literal based on python primitive data type + using dynamic overloading + + Args: + value(python primitive type): the value to be associated with literal + + Example: + import iceberg.expressions.literals + >>> iceberg.expressions.literals.of(1) + IntegerLiteral(1) + """ + raise TypeError(f"Unimplemented Type Literal for value: {value}") + + [email protected](bool) +def _of(value): + return BooleanLiteral(value) + + [email protected](int) # type: ignore[no-redef] +def _of(value): + """ + Upgrade to long if python int is outside the JAVA_MIN_INT and JAVA_MAX_INT + """ + if value < JAVA_MIN_INT or value > JAVA_MAX_INT: + return LongLiteral(value) + return IntegerLiteral(value) + + [email protected](float) # type: ignore[no-redef] +def _of(value): + """ + Upgrade to double if python float is outside the JAVA_MIN_FLOAT and JAVA_MAX_FLOAT + """ + if value < JAVA_MIN_FLOAT or value > JAVA_MAX_FLOAT: + return DoubleLiteral(value) + return FloatLiteral(value) + + [email protected](str) # type: ignore[no-redef] +def _of(value): + return StringLiteral(value) + + [email protected](uuid.UUID) # type: ignore[no-redef] +def _of(value): + return UUIDLiteral(value) + + [email protected](bytes) # type: ignore[no-redef] +def _of(value): + return FixedLiteral(value) + + [email protected](bytearray) # type: ignore[no-redef] +def _of(value): + return BinaryLiteral(value) + + [email protected](Decimal) # type: ignore[no-redef] +def _of(value): + return DecimalLiteral(value) + + +class BaseLiteral(Literal): + """Base literal which has a value and can be converted between types""" + + def __init__(self, repr_string: str, value): Review comment: type annotation for `value`? ########## File path: python/tests/expression/conftest.py ########## @@ -0,0 +1,32 @@ +# 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. + +import pytest + +from iceberg.types import DecimalType + + Review comment: is the conftest to set up base config for expression tests? ########## File path: python/.coveragerc ########## @@ -20,5 +20,5 @@ skip_empty = true [run] omit = - # omit this single file - src/iceberg/literals.py + src/iceberg/expression/literals.py Review comment: Given that no other places use literals, I am wondering if we can remove those unfinished code (e.g. todos) from this PR and move them into another PR? So we can still achieve the same level of code coverage for merged code. ########## File path: python/src/iceberg/expression/literals.py ########## @@ -0,0 +1,742 @@ +# Licensed 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. +# +# 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. + +import datetime +import sys +import uuid +from decimal import ROUND_HALF_UP, Decimal +from functools import singledispatch + +if sys.version_info >= (3, 8): + from functools import singledispatchmethod +else: + from singledispatch import singledispatchmethod + +import pytz + +from iceberg.types import ( + BinaryType, + BooleanType, + DateType, + DecimalType, + DoubleType, + FixedType, + FloatType, + IntegerType, + LongType, + Singleton, + StringType, + TimestampType, + TimestamptzType, + TimeType, + UUIDType, +) + +JAVA_MAX_INT = 2147483647 +JAVA_MIN_INT = -2147483648 +JAVA_MAX_FLOAT = 3.4028235e38 +JAVA_MIN_FLOAT = -3.4028235e38 +EPOCH = datetime.datetime.utcfromtimestamp(0) +EPOCH_DAY = EPOCH.date() + +""" +Iceberg literal is wrapper class used in expressions, which return unbound predicates +It's being organized as below +Literal +|-- AboveMax +|-- BelowMin +|-- BaseLiteral + |-- StringLiteral + |-- FixedLiteral + |-- BinaryLiteral + |-- ComparableLiteral + |-- BooleanLiteral + |-- IntegerLiteral + |-- LongLiteral + |-- FloatLiteral + |-- DoubleLiteral + |-- DateLiteral + |-- TimeLiteral + |-- TimestampLiteral + |-- DecimalLiteral + |-- UUIDLiteral +""" + + +class Literal: + def to(self, type_var): + raise NotImplementedError() + + def to_byte_buffer(self): + raise NotImplementedError() + + +@singledispatch +def of(value): + """ + A generic Literal factory to construct an iceberg Literal based on python primitive data type + using dynamic overloading + + Args: + value(python primitive type): the value to be associated with literal + + Example: + import iceberg.expressions.literals + >>> iceberg.expressions.literals.of(1) + IntegerLiteral(1) + """ + raise TypeError(f"Unimplemented Type Literal for value: {value}") + + [email protected](bool) +def _of(value): Review comment: Is it feasible to put type annotation for `value`? ########## File path: python/src/iceberg/expression/literals.py ########## @@ -0,0 +1,741 @@ +# Licensed 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. +# +# 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. + +import datetime +import uuid +from decimal import ROUND_HALF_UP, Decimal +from functools import singledispatch + +try: + from functools import singledispatchmethod +except ImportError: + from singledispatch import singledispatchmethod # type: ignore + +import pytz + +from iceberg.types import ( + BinaryType, + BooleanType, + DateType, + DecimalType, + DoubleType, + FixedType, + FloatType, + IntegerType, + LongType, + Singleton, + StringType, + TimestampType, + TimestamptzType, + TimeType, + UUIDType, +) + +JAVA_MAX_INT = 2147483647 Review comment: Wondering if those limits are defined in iceberg spec? If so, we may rename those constants to `ICEBERG_...` instead of `JAVA_...` to make it clear. ########## File path: python/src/iceberg/expression/literals.py ########## @@ -0,0 +1,742 @@ +# Licensed 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. +# +# 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. + +import datetime +import sys +import uuid +from decimal import ROUND_HALF_UP, Decimal +from functools import singledispatch + +if sys.version_info >= (3, 8): + from functools import singledispatchmethod +else: + from singledispatch import singledispatchmethod + +import pytz + +from iceberg.types import ( + BinaryType, + BooleanType, + DateType, + DecimalType, + DoubleType, + FixedType, + FloatType, + IntegerType, + LongType, + Singleton, + StringType, + TimestampType, + TimestamptzType, + TimeType, + UUIDType, +) + +JAVA_MAX_INT = 2147483647 +JAVA_MIN_INT = -2147483648 +JAVA_MAX_FLOAT = 3.4028235e38 +JAVA_MIN_FLOAT = -3.4028235e38 +EPOCH = datetime.datetime.utcfromtimestamp(0) +EPOCH_DAY = EPOCH.date() + +""" +Iceberg literal is wrapper class used in expressions, which return unbound predicates +It's being organized as below +Literal +|-- AboveMax +|-- BelowMin +|-- BaseLiteral + |-- StringLiteral + |-- FixedLiteral + |-- BinaryLiteral + |-- ComparableLiteral + |-- BooleanLiteral + |-- IntegerLiteral + |-- LongLiteral + |-- FloatLiteral + |-- DoubleLiteral + |-- DateLiteral + |-- TimeLiteral + |-- TimestampLiteral + |-- DecimalLiteral + |-- UUIDLiteral +""" + + +class Literal: + def to(self, type_var): Review comment: Is it feasible to put type annotation for type_var here? -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
