From 36757d5962efe2d97e3d66b9e519bfbf0cf64241 Mon Sep 17 00:00:00 2001 From: guyulong Date: Tue, 29 Oct 2024 16:08:27 +0800 Subject: [PATCH 1/2] [#5306][Improvement] Some JDBC catalog properties should be defined as required --- .../jdbc/JdbcCatalogPropertiesMetadata.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogPropertiesMetadata.java b/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogPropertiesMetadata.java index f8b6d5e7a1e..095b89ccf1e 100644 --- a/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogPropertiesMetadata.java +++ b/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogPropertiesMetadata.java @@ -61,24 +61,30 @@ public class JdbcCatalogPropertiesMetadata extends BaseCatalogPropertiesMetadata false /* immutable */, null /* defaultValue */, false /* hidden */), - stringOptionalPropertyEntry( + stringPropertyEntry( JdbcConfig.JDBC_DRIVER.getKey(), JdbcConfig.JDBC_DRIVER.getDoc(), + true /* required */, false /* immutable */, null /* defaultValue */, - false /* hidden */), - stringOptionalPropertyEntry( + false /* hidden */, + false /* reserved */), + stringPropertyEntry( JdbcConfig.USERNAME.getKey(), JdbcConfig.USERNAME.getDoc(), + true /* required */, false /* immutable */, null /* defaultValue */, - false /* hidden */), - stringOptionalPropertyEntry( + false /* hidden */, + false /* reserved */), + stringPropertyEntry( JdbcConfig.PASSWORD.getKey(), JdbcConfig.PASSWORD.getDoc(), + true /* required */, false /* immutable */, null /* defaultValue */, - false /* hidden */), + false /* hidden */, + false /* reserved */), integerPropertyEntry( JdbcConfig.POOL_MIN_SIZE.getKey(), JdbcConfig.POOL_MIN_SIZE.getDoc(), From 8d2d15eb77b8c6577598dcb914b4e1e86f77ef90 Mon Sep 17 00:00:00 2001 From: guyulong Date: Wed, 30 Oct 2024 13:42:56 +0800 Subject: [PATCH 2/2] [#5306][Improvement] Some JDBC catalog properties should be defined as required --- .../catalog/jdbc/JdbcCatalogPropertiesMetadata.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogPropertiesMetadata.java b/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogPropertiesMetadata.java index 095b89ccf1e..d65bdfd7c1d 100644 --- a/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogPropertiesMetadata.java +++ b/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogPropertiesMetadata.java @@ -61,7 +61,7 @@ public class JdbcCatalogPropertiesMetadata extends BaseCatalogPropertiesMetadata false /* immutable */, null /* defaultValue */, false /* hidden */), - stringPropertyEntry( + stringPropertyEntry( JdbcConfig.JDBC_DRIVER.getKey(), JdbcConfig.JDBC_DRIVER.getDoc(), true /* required */, @@ -69,7 +69,7 @@ public class JdbcCatalogPropertiesMetadata extends BaseCatalogPropertiesMetadata null /* defaultValue */, false /* hidden */, false /* reserved */), - stringPropertyEntry( + stringPropertyEntry( JdbcConfig.USERNAME.getKey(), JdbcConfig.USERNAME.getDoc(), true /* required */, @@ -77,7 +77,7 @@ public class JdbcCatalogPropertiesMetadata extends BaseCatalogPropertiesMetadata null /* defaultValue */, false /* hidden */, false /* reserved */), - stringPropertyEntry( + stringPropertyEntry( JdbcConfig.PASSWORD.getKey(), JdbcConfig.PASSWORD.getDoc(), true /* required */,