jackye1995 commented on code in PR #5870: URL: https://github.com/apache/iceberg/pull/5870#discussion_r983136549
########## python/tests/catalog/test_glue.py: ########## @@ -0,0 +1,58 @@ +# 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 unittest.mock import patch, MagicMock + +import botocore.exceptions + +from pyiceberg.catalog import PropertiesUpdateSummary +from pyiceberg.catalog.glue import GlueCatalog +from pyiceberg.schema import Schema + +import random +import string + + +def get_randam_table_name(): Review Comment: for testing I think we need to use some mocks so it's not contacting actual AWS service and can be run as unit test ########## python/pyiceberg/catalog/glue.py: ########## @@ -0,0 +1,200 @@ +# 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 getpass +import uuid + +import boto3 +from datetime import datetime +from typing import Union, Optional, List, Set, Dict + +from pyiceberg.catalog.hive import OWNER + +from pyiceberg.exceptions import ( + NamespaceAlreadyExistsError, + NamespaceNotEmptyError, + NoSuchNamespaceError, + NoSuchTableError, + TableAlreadyExistsError, +) + +from pyiceberg.catalog import ( + Catalog, + Identifier, + Properties, + PropertiesUpdateSummary, +) +from pyiceberg.io import FileIO, load_file_io +from pyiceberg.schema import Schema +from pyiceberg.serializers import FromInputFile, ToOutputFile +from pyiceberg.table import Table +from pyiceberg.table.metadata import TableMetadata, new_table_metadata +from pyiceberg.table.partitioning import PartitionSpec, UNPARTITIONED_PARTITION_SPEC +from pyiceberg.table.sorting import SortOrder, UNSORTED_SORT_ORDER, SortDirection +from pyiceberg.typedef import EMPTY_DICT + +from pyiceberg.types import NestedField + +METADATA_LOCATION = "metadata_location" +ICEBERG = "iceberg" + + +class GlueCatalog(Catalog): + + def __init__(self, name: str, **properties: Properties): + super().__init__(name, **properties) + self.client = boto3.client("glue") + self.sts_client = boto3.client("sts") + + + def _check_response(self, response: Dict[str, Dict[str, str]]): + if response['ResponseMetadata']['HTTPStatusCode'] != 200: + raise ValueError(f"Got unexpected status code {response['HttpStatusCode']}") + + def _glue_to_iceberg(self, glue_table, io: FileIO) -> Table: + properties: Dict[str, str] = glue_table["Parameters"] + + if "table_type" not in properties: + raise NoSuchTableError( + f"Property table_type missing, could not determine type: {glue_table['DatabaseName']}.{glue_table['Name']}") + glue_table_type = properties.get("table_type") + if glue_table_type.lower() != ICEBERG: + raise NoSuchTableError( + f"Property table_type is {glue_table_type}, expected {ICEBERG}: {glue_table['DatabaseName']}.{glue_table['Name']}") + if prop_meta_location := properties.get(METADATA_LOCATION): + metadata_location = prop_meta_location + else: + raise NoSuchTableError(f"Table property {METADATA_LOCATION} is missing") + + file = io.new_input(metadata_location) + metadata = FromInputFile.table_metadata(file) + return Table( + identifier=(glue_table['DatabaseName'], glue_table['Name']), + metadata=metadata, + metadata_location=metadata_location + ) + + def _iceberg_to_glue(self, iceberg_table): + # TODO + pass + + def _construct_parameters(self, metadata_location: str) -> Dict[str, str]: + properties = {"table_type": "ICEBERG", "metadata_location": metadata_location} + return properties + + def _default_warehouse_location(self, database_name: str, table_name: str): + try: + response = self.client.get_database(Name=database_name) + # TODO: handle response and errors + except: + raise NoSuchNamespaceError("Database not found") + + if "LocationUri" in response["Database"]: + return f"{response['Database']['LocationUri']}/table_name" + + # TODO: should extract warehouse path from the properties and handle potential errors + return f"{self.properties['warehouse_path']}/{database_name}.db/{table_name}" + + def _resolve_table_location(self, location: Optional[str], database_name: str, table_name: str): + if not location: + return self._default_warehouse_location(database_name, table_name) + return location + + def _write_metadata(self, metadata: TableMetadata, io: FileIO, metadate_path: str): + ToOutputFile.table_metadata(metadata, io.new_output(metadate_path)) + + # tested on pre-existing database + def create_table( + self, + identifier: Union[str, Identifier], + schema: Schema, + location: Optional[str] = None, + partition_spec: PartitionSpec = UNPARTITIONED_PARTITION_SPEC, + sort_order: SortOrder = UNSORTED_SORT_ORDER, + properties: Properties = EMPTY_DICT, + ) -> Table: + database_name, table_name = self.identifier_to_tuple(identifier) + + location = self._resolve_table_location(location, database_name, table_name) + # TODO: give it correct path based on java version of glueCatalog + metadata_location = f"{location}/metadata/{uuid.uuid4()}.metadata.json" + metadata = new_table_metadata( + location=location, schema=schema, partition_spec=partition_spec, sort_order=sort_order, + properties=properties + ) + io = load_file_io({**self.properties, **properties}, location=location) + self._write_metadata(metadata, io, metadata_location) + try: + create_table_response = self.client.create_table( + DatabaseName=database_name, + TableInput={ + 'Name': table_name, + 'Description': '', # To be fixed + 'TableType': 'EXTERNAL_TABLE', + 'Parameters': self._construct_parameters(metadata_location), + } + ) + # TODO: check response + load_table_response = self.client.get_table(DatabaseName=database_name, Name=table_name) Review Comment: I think it's beneficial to fetch the created result, some information are filled during the creation process -- 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]
