theoxu31 commented on code in PR #6742:
URL: https://github.com/apache/iceberg/pull/6742#discussion_r1183165921
##########
aws/src/main/java/org/apache/iceberg/aws/glue/GlueCatalog.java:
##########
@@ -437,6 +441,69 @@ public void renameTable(TableIdentifier from,
TableIdentifier to) {
LOG.info("Successfully renamed table from {} to {}", from, to);
}
+ @Override
+ public org.apache.iceberg.Table registerTable(
+ TableIdentifier identifier, String metadataFileLocation) {
+ Preconditions.checkArgument(
+ isValidIdentifier(identifier), "Table identifier to register is
invalid: " + identifier);
+ Preconditions.checkArgument(
+ metadataFileLocation != null && !metadataFileLocation.isEmpty(),
+ "Cannot register an empty metadata file location as a table");
+
+ // keep the original behavior when force-register-table flag is off
+ if (!awsProperties.glueCatalogForceRegisterTable()) {
+ return super.registerTable(identifier, metadataFileLocation);
+ }
+
+ TableOperations ops = newTableOps(identifier);
+ InputFile metadataFile = ops.io().newInputFile(metadataFileLocation);
+ TableMetadata metadata = TableMetadataParser.read(ops.io(), metadataFile);
+
+ Map<String, String> tableParameters =
+ ImmutableMap.of(
+ BaseMetastoreTableOperations.TABLE_TYPE_PROP,
+
BaseMetastoreTableOperations.ICEBERG_TABLE_TYPE_VALUE.toLowerCase(Locale.ENGLISH),
+ BaseMetastoreTableOperations.METADATA_LOCATION_PROP,
+ metadataFileLocation);
+
+ String databaseName =
+ IcebergToGlueConverter.getDatabaseName(
+ identifier, awsProperties.glueCatalogSkipNameValidation());
+ String tableName =
+ IcebergToGlueConverter.getTableName(
+ identifier, awsProperties.glueCatalogSkipNameValidation());
+
+ TableInput tableInput =
+ TableInput.builder()
+ .applyMutation(
+ builder ->
IcebergToGlueConverter.setTableInputInformation(builder, metadata))
+ .name(tableName)
+ .tableType(GlueTableOperations.GLUE_EXTERNAL_TABLE_TYPE)
+ .parameters(tableParameters)
+ .build();
+
+ try {
+ glue.createTable(
+
CreateTableRequest.builder().databaseName(databaseName).tableInput(tableInput).build());
+ } catch (software.amazon.awssdk.services.glue.model.AlreadyExistsException
e) {
+ GetTableResponse response =
+ glue.getTable(
+
GetTableRequest.builder().databaseName(databaseName).name(tableName).build());
+ String versionId = response.table().versionId();
+ glue.updateTable(
+ UpdateTableRequest.builder()
+ .databaseName(databaseName)
+ .tableInput(tableInput)
+ .versionId(versionId)
+ .build());
+ } catch (EntityNotFoundException e) {
+ throw new NoSuchNamespaceException(
+ e, "Namespace %s is not found in Glue", identifier.namespace());
Review Comment:
This exception handling is meant for catching exceptions for
`glue.createTable` calls only, for any exception during the getTable &
updateTable calls we should have it throw exceptions as expected, thoughts?
Also I think the `EntityNotFoundException` won't be thrown for table not
found in the case of Table AlreadyExistsException.
--
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]
