From e21ec3510d8797650400e6680a0b37a8eb6210c5 Mon Sep 17 00:00:00 2001 From: fanng Date: Thu, 6 Mar 2025 19:57:38 +0800 Subject: [PATCH 1/3] fix comment --- .../connector/iceberg/GravitinoIcebergCatalog.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/GravitinoIcebergCatalog.java b/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/GravitinoIcebergCatalog.java index ccadc69e49a..dfdc221f715 100644 --- a/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/GravitinoIcebergCatalog.java +++ b/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/GravitinoIcebergCatalog.java @@ -22,6 +22,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Map; +import org.apache.commons.lang3.StringUtils; +import org.apache.gravitino.catalog.lakehouse.iceberg.IcebergConstants; import org.apache.gravitino.catalog.lakehouse.iceberg.IcebergPropertiesUtils; import org.apache.gravitino.rel.Table; import org.apache.gravitino.spark.connector.PropertiesConverter; @@ -58,6 +60,16 @@ public class GravitinoIcebergCatalog extends BaseCatalog @Override protected TableCatalog createAndInitSparkCatalog( String name, CaseInsensitiveStringMap options, Map properties) { + String jdbcDriver = properties.get(IcebergConstants.GRAVITINO_JDBC_DRIVER); + if (StringUtils.isNotBlank(jdbcDriver)) { + // If `spark.sql.hive.metastore.jars` is set to path, Spark will use IsolatedClientLoader to + // JDBC drivers, which makes Iceberg could not find corresponding JDBC driver. + try { + Class.forName(jdbcDriver); + } catch (Exception e) { + throw new RuntimeException(e); + } + } String catalogBackendName = IcebergPropertiesUtils.getCatalogBackendName(properties); Map all = getPropertiesConverter().toSparkCatalogProperties(options, properties); From b9b21f3b49b5b77a55e2fdfe12d52ab5482e1c2c Mon Sep 17 00:00:00 2001 From: fanng Date: Thu, 6 Mar 2025 20:21:14 +0800 Subject: [PATCH 2/3] fix comment --- .../spark/connector/iceberg/GravitinoIcebergCatalog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/GravitinoIcebergCatalog.java b/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/GravitinoIcebergCatalog.java index dfdc221f715..5ec75a507ea 100644 --- a/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/GravitinoIcebergCatalog.java +++ b/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/GravitinoIcebergCatalog.java @@ -63,7 +63,7 @@ protected TableCatalog createAndInitSparkCatalog( String jdbcDriver = properties.get(IcebergConstants.GRAVITINO_JDBC_DRIVER); if (StringUtils.isNotBlank(jdbcDriver)) { // If `spark.sql.hive.metastore.jars` is set to path, Spark will use IsolatedClientLoader to - // JDBC drivers, which makes Iceberg could not find corresponding JDBC driver. + // load JDBC drivers, which makes Iceberg could not find corresponding JDBC driver. try { Class.forName(jdbcDriver); } catch (Exception e) { From 4f1e1487efb705e3b066902b12c67c037b8e5a0a Mon Sep 17 00:00:00 2001 From: fanng Date: Sat, 8 Mar 2025 20:59:49 +0800 Subject: [PATCH 3/3] fix comment --- .../spark/connector/iceberg/GravitinoIcebergCatalog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/GravitinoIcebergCatalog.java b/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/GravitinoIcebergCatalog.java index 5ec75a507ea..e6d59c853b3 100644 --- a/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/GravitinoIcebergCatalog.java +++ b/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/GravitinoIcebergCatalog.java @@ -62,8 +62,8 @@ protected TableCatalog createAndInitSparkCatalog( String name, CaseInsensitiveStringMap options, Map properties) { String jdbcDriver = properties.get(IcebergConstants.GRAVITINO_JDBC_DRIVER); if (StringUtils.isNotBlank(jdbcDriver)) { - // If `spark.sql.hive.metastore.jars` is set to path, Spark will use IsolatedClientLoader to - // load JDBC drivers, which makes Iceberg could not find corresponding JDBC driver. + // If `spark.sql.hive.metastore.jars` is set, Spark will use an isolated client class loader + // to load JDBC drivers, which makes Iceberg could not find corresponding JDBC driver. try { Class.forName(jdbcDriver); } catch (Exception e) {