This is an automated email from the ASF dual-hosted git repository. pinal pushed a commit to branch ATLAS-5021 in repository https://gitbox.apache.org/repos/asf/atlas.git
commit b0346ede6674b9ac3c6f3744061c2e6ccc899c73 Author: Pinal Shah <[email protected]> AuthorDate: Thu Jul 31 10:58:19 2025 +0530 minor change --- .../apache/atlas/trino/cli/ExtractorService.java | 3 -- .../atlas/trino/client/AtlasClientHelper.java | 5 +-- .../atlas/trino/connector/ConnectorFactory.java | 4 +- .../atlas/trino/connector/HiveEntityConnector.java | 1 - .../trino/connector/IcebergEntityConnector.java | 43 +++++++++++----------- .../trino/connector/RdbmsEntityConnector.java | 43 ---------------------- 6 files changed, 25 insertions(+), 74 deletions(-) diff --git a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/cli/ExtractorService.java b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/cli/ExtractorService.java index e6f4d6ca8..e4f0797cf 100644 --- a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/cli/ExtractorService.java +++ b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/cli/ExtractorService.java @@ -18,7 +18,6 @@ package org.apache.atlas.trino.cli; import org.apache.atlas.AtlasServiceException; -import org.apache.atlas.exception.AtlasBaseException; import org.apache.atlas.model.instance.AtlasEntity; import org.apache.atlas.model.instance.AtlasEntityHeader; import org.apache.atlas.trino.client.AtlasClientHelper; @@ -56,7 +55,6 @@ public class ExtractorService { private static final String TRINO_CATALOG_HOOK_ENABLED_SUFFIX = ".namespace"; private static Configuration atlasProperties; private static TrinoClientHelper trinoClientHelper; - private static AtlasClientHelper atlasClientHelper; private static String trinoNamespace; private ExtractorContext context; @@ -64,7 +62,6 @@ public class ExtractorService { this.context = context; atlasProperties = context.getAtlasConf(); trinoClientHelper = context.getTrinoConnector(); - atlasClientHelper = context.getAtlasConnector(); trinoNamespace = context.getNamespace(); Map<String, String> catalogs = trinoClientHelper.getAllTrinoCatalogs(); diff --git a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/client/AtlasClientHelper.java b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/client/AtlasClientHelper.java index 1b597fd0f..26bb95322 100644 --- a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/client/AtlasClientHelper.java +++ b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/client/AtlasClientHelper.java @@ -329,10 +329,8 @@ public class AtlasClientHelper { } public static AtlasEntity.AtlasEntityWithExtInfo findEntity(final String typeName, final String qualifiedName, boolean minExtInfo, boolean ignoreRelationship) throws AtlasServiceException { - AtlasEntity.AtlasEntityWithExtInfo ret = null; - try { - ret = atlasClientV2.getEntityByAttribute(typeName, Collections.singletonMap(ATTRIBUTE_QUALIFIED_NAME, qualifiedName), minExtInfo, ignoreRelationship); + return atlasClientV2.getEntityByAttribute(typeName, Collections.singletonMap(ATTRIBUTE_QUALIFIED_NAME, qualifiedName), minExtInfo, ignoreRelationship); } catch (AtlasServiceException e) { if (e.getStatus() == ClientResponse.Status.NOT_FOUND) { return null; @@ -340,7 +338,6 @@ public class AtlasClientHelper { throw e; } - return ret; } public static AtlasEntity.AtlasEntityWithExtInfo createEntity(AtlasEntity.AtlasEntityWithExtInfo entity) throws AtlasServiceException { diff --git a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/ConnectorFactory.java b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/ConnectorFactory.java index 4fa4d2b90..e7a690e66 100644 --- a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/ConnectorFactory.java +++ b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/ConnectorFactory.java @@ -25,8 +25,8 @@ public class ConnectorFactory { public static AtlasEntityConnector getConnector(String connectorType) { switch (connectorType.toLowerCase()) { - case "mysql": - return new RdbmsEntityConnector(); + case "iceberg": + return new IcebergEntityConnector(); case "hive": return new HiveEntityConnector(); default: diff --git a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/HiveEntityConnector.java b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/HiveEntityConnector.java index 3a272435d..8e1036718 100644 --- a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/HiveEntityConnector.java +++ b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/HiveEntityConnector.java @@ -29,7 +29,6 @@ import java.util.List; public class HiveEntityConnector extends AtlasEntityConnector { private static final Logger LOG = LoggerFactory.getLogger(HiveEntityConnector.class); - public static final String HIVE_INSTANCE = "hms_instance"; public static final String HIVE_DB = "hive_db"; public static final String HIVE_TABLE = "hive_table"; public static final String HIVE_COLUMN = "hive_column"; diff --git a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/IcebergEntityConnector.java b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/IcebergEntityConnector.java index bba2052b8..a48aa7ffd 100644 --- a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/IcebergEntityConnector.java +++ b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/IcebergEntityConnector.java @@ -29,16 +29,16 @@ import java.util.List; public class IcebergEntityConnector extends AtlasEntityConnector { private static final Logger LOG = LoggerFactory.getLogger(IcebergEntityConnector.class); - public static final String HIVE_INSTANCE = "hms_instance"; - public static final String HIVE_DB = "hive_db"; - public static final String HIVE_TABLE = "hive_table"; - public static final String HIVE_COLUMN = "hive_column"; - public static final String TRINO_SCHEMA_HIVE_DB_RELATIONSHIP = "trino_schema_hive_db"; - public static final String TRINO_TABLE_HIVE_TABLE_RELATIONSHIP = "trino_table_hive_table"; - public static final String TRINO_COLUMN_HIVE_COLUMN_RELATIONSHIP = "trino_column_hive_column"; - public static final String TRINO_SCHEMA_HIVE_DB_ATTRIBUTE = "hive_db"; - public static final String TRINO_TABLE_HIVE_TABLE_ATTRIBUTE = "hive_table"; - public static final String TRINO_COLUMN_HIVE_COLUMN_ATTRIBUTE = "hive_column"; + public static final String HIVE_DB = "hive_db"; + public static final String ICEBERG_TABLE = "iceberg_table"; + public static final String ICEBERG_COLUMN = "iceberg_column"; + public static final String TRINO_SCHEMA_HIVE_DB_RELATIONSHIP = "trino_schema_hive_db"; + public static final String TRINO_TABLE_ICEBERG_TABLE_RELATIONSHIP = "trino_table_iceberg_table"; + public static final String TRINO_COLUMN_ICEBERG_COLUMN_RELATIONSHIP = "trino_column_iceberg_column"; + public static final String TRINO_SCHEMA_HIVE_DB_ATTRIBUTE = "hive_db"; + public static final String TRINO_TABLE_ICEBERG_TABLE_ATTRIBUTE = "iceberg_table"; + public static final String TRINO_COLUMN_ICEBERG_COLUMN_ATTRIBUTE = "iceberg_column"; + @Override public void connectTrinoCatalog(String instanceName, String catalogName, AtlasEntity entity, AtlasEntity.AtlasEntityWithExtInfo entityWithExtInfo) { @@ -70,12 +70,12 @@ public class IcebergEntityConnector extends AtlasEntityConnector { return; } - AtlasEntity hiveTable; + AtlasEntity icebergTable; try { - hiveTable = toTableEntity(instanceName, schemaName, tableName); + icebergTable = toTableEntity(instanceName, schemaName, tableName); - if (hiveTable != null) { - trinoTable.setRelationshipAttribute(TRINO_TABLE_HIVE_TABLE_ATTRIBUTE, AtlasTypeUtil.getAtlasRelatedObjectId(hiveTable, TRINO_TABLE_HIVE_TABLE_RELATIONSHIP)); + if (icebergTable != null) { + trinoTable.setRelationshipAttribute(TRINO_TABLE_ICEBERG_TABLE_ATTRIBUTE, AtlasTypeUtil.getAtlasRelatedObjectId(icebergTable, TRINO_TABLE_ICEBERG_TABLE_RELATIONSHIP)); for (AtlasEntity columnEntity : columnEntities) { connectTrinoColumn(instanceName, schemaName, tableName, columnEntity); @@ -91,13 +91,14 @@ public class IcebergEntityConnector extends AtlasEntityConnector { return; } - AtlasEntity hiveColumn; + AtlasEntity icebergColumn; try { - hiveColumn = toColumnEntity(instanceName, schemaName, tableName, trinoColumn.getAttribute("name").toString()); - } catch (AtlasServiceException e) { throw new AtlasServiceException(e); + icebergColumn = toColumnEntity(instanceName, schemaName, tableName, trinoColumn.getAttribute("name").toString()); + } catch (AtlasServiceException e) { + throw new AtlasServiceException(e); } - if (hiveColumn != null) { - trinoColumn.setRelationshipAttribute(TRINO_COLUMN_HIVE_COLUMN_ATTRIBUTE, AtlasTypeUtil.getAtlasRelatedObjectId(hiveColumn, TRINO_COLUMN_HIVE_COLUMN_RELATIONSHIP)); + if (icebergColumn != null) { + trinoColumn.setRelationshipAttribute(TRINO_COLUMN_ICEBERG_COLUMN_ATTRIBUTE, AtlasTypeUtil.getAtlasRelatedObjectId(icebergColumn, TRINO_COLUMN_ICEBERG_COLUMN_RELATIONSHIP)); } } @@ -110,14 +111,14 @@ public class IcebergEntityConnector extends AtlasEntityConnector { private AtlasEntity toTableEntity(String instanceName, String schemaName, String tableName) throws AtlasServiceException { String tableQualifiedName = schemaName + "." + tableName + "@" + instanceName; - AtlasEntity.AtlasEntityWithExtInfo ret = AtlasClientHelper.findEntity(HIVE_TABLE, tableQualifiedName, true, true); + AtlasEntity.AtlasEntityWithExtInfo ret = AtlasClientHelper.findEntity(ICEBERG_TABLE, tableQualifiedName, true, true); return ret != null ? ret.getEntity() : null; } private AtlasEntity toColumnEntity(String instanceName, String schemaName, String tableName, String columnName) throws AtlasServiceException { String columnQualifiedName = schemaName + "." + tableName + "." + columnName + "@" + instanceName; - AtlasEntity.AtlasEntityWithExtInfo ret = AtlasClientHelper.findEntity(HIVE_COLUMN, columnQualifiedName, true, true); + AtlasEntity.AtlasEntityWithExtInfo ret = AtlasClientHelper.findEntity(ICEBERG_COLUMN, columnQualifiedName, true, true); return ret != null ? ret.getEntity() : null; } diff --git a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/RdbmsEntityConnector.java b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/RdbmsEntityConnector.java deleted file mode 100644 index 1f1bb4d77..000000000 --- a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/connector/RdbmsEntityConnector.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * 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. - */ -package org.apache.atlas.trino.connector; - -import org.apache.atlas.model.instance.AtlasEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; - -public class RdbmsEntityConnector extends AtlasEntityConnector { - private static final Logger LOG = LoggerFactory.getLogger(RdbmsEntityConnector.class); - - @Override - public void connectTrinoCatalog(String instanceName, String catalogName, AtlasEntity entity, AtlasEntity.AtlasEntityWithExtInfo entityWithExtInfo) { - - } - - @Override - public void connectTrinoSchema(String instanceName, String catalogName, String schemaName, AtlasEntity entity, AtlasEntity.AtlasEntityWithExtInfo entityWithExtInfo) { - - } - - @Override - public void connectTrinoTable(String instanceName, String catalogName, String schemaName, String tableName, AtlasEntity entity, List<AtlasEntity> columnEntities, AtlasEntity.AtlasEntityWithExtInfo entityWithExtInfo) { - - } -}
