Fokko commented on code in PR #5360:
URL: https://github.com/apache/iceberg/pull/5360#discussion_r930362357
##########
python/tests/catalog/test_catalog.py:
##########
@@ -20,43 +20,43 @@
List,
Optional,
Set,
+ Tuple,
Union,
)
import pytest
-from pyiceberg.catalog import Identifier, Properties
-from pyiceberg.catalog.base import Catalog
+from pyiceberg.catalog import Catalog
from pyiceberg.exceptions import (
AlreadyExistsError,
NamespaceNotEmptyError,
NoSuchNamespaceError,
NoSuchTableError,
)
from pyiceberg.schema import Schema
-from pyiceberg.table.base import Table
+from pyiceberg.table import Table
from pyiceberg.table.metadata import INITIAL_SPEC_ID
from pyiceberg.table.partitioning import PartitionSpec
class InMemoryCatalog(Catalog):
"""An in-memory catalog implementation for testing purposes."""
- __tables: Dict[Identifier, Table]
- __namespaces: Dict[Identifier, Properties]
+ __tables: Dict[Tuple[str, ...], Table]
Review Comment:
Was this change intentional?
##########
python/pyiceberg/catalog/__init__.py:
##########
@@ -1,20 +1,246 @@
-# 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
+# Licensed to the Apache Software Foundation (ASF) under one
Review Comment:
Some unwanted indentation here.
##########
python/pyiceberg/expression/__init__.py:
##########
@@ -0,0 +1,83 @@
+# 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.
+from pyiceberg.expression.expressions import (
+ And,
+ Equal,
+ GreaterThan,
+ GreaterThanEqual,
+ In,
+ IsNaN,
+ IsNull,
+ LessThan,
+ LessThanEqual,
+ Not,
+ NotEqual,
+ NotIn,
+ NotNaN,
+ NotNull,
+ Or,
+)
+from pyiceberg.expression.literals import (
+ AboveMax,
+ BelowMin,
+ BinaryLiteral,
+ BooleanLiteral,
+ DateLiteral,
+ DecimalLiteral,
+ DoubleLiteral,
+ FixedLiteral,
+ FloatLiteral,
+ LongLiteral,
+ StringLiteral,
+ TimeLiteral,
+ TimestampLiteral,
+ UUIDLiteral,
+ literal,
+)
+
+__all__ = [
Review Comment:
I'm not a big fan of this mostly because it is a one-off and it is
additional bookkeeping. Why not get rid of the whole module, and move all the
expressions to `pyiceberg/expressions.py` and the literals to
`pyiceberg/literals.py`.
--
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]
