From 4f59da58ffeaa649d05ca550d593716ca9c49846 Mon Sep 17 00:00:00 2001 From: yuqi Date: Fri, 22 Mar 2024 17:54:44 +0800 Subject: [PATCH 1/2] Fix bugs in `gradle publish` --- catalogs/catalog-hadoop/build.gradle.kts | 4 ++++ catalogs/catalog-hive/build.gradle.kts | 4 ++++ catalogs/catalog-jdbc-doris/build.gradle.kts | 4 ++++ catalogs/catalog-jdbc-mysql/build.gradle.kts | 4 ++++ catalogs/catalog-jdbc-postgresql/build.gradle.kts | 4 ++++ catalogs/catalog-lakehouse-iceberg/build.gradle.kts | 4 ++++ .../catalog/lakehouse/iceberg/IcebergCatalogOperations.java | 1 - .../lakehouse/iceberg/converter/FromIcebergPartitionSpec.java | 4 ++-- .../lakehouse/iceberg/converter/FromIcebergSortOrder.java | 2 +- .../catalog/lakehouse/iceberg/ops/IcebergTableOpsHelper.java | 4 ++-- catalogs/catalog-messaging-kafka/build.gradle.kts | 4 ++++ 11 files changed, 33 insertions(+), 6 deletions(-) diff --git a/catalogs/catalog-hadoop/build.gradle.kts b/catalogs/catalog-hadoop/build.gradle.kts index dbaf8210173..0478ce030a4 100644 --- a/catalogs/catalog-hadoop/build.gradle.kts +++ b/catalogs/catalog-hadoop/build.gradle.kts @@ -103,3 +103,7 @@ tasks.test { init(this) } } + +tasks.getByName("generateMetadataFileForMavenJavaPublication") { + dependsOn("runtimeJars") +} diff --git a/catalogs/catalog-hive/build.gradle.kts b/catalogs/catalog-hive/build.gradle.kts index ef761ece212..ac5d3330e7a 100644 --- a/catalogs/catalog-hive/build.gradle.kts +++ b/catalogs/catalog-hive/build.gradle.kts @@ -169,3 +169,7 @@ tasks.test { init(this) } } + +tasks.getByName("generateMetadataFileForMavenJavaPublication") { + dependsOn("runtimeJars") +} \ No newline at end of file diff --git a/catalogs/catalog-jdbc-doris/build.gradle.kts b/catalogs/catalog-jdbc-doris/build.gradle.kts index 77040ed44a9..8fbcdf40039 100644 --- a/catalogs/catalog-jdbc-doris/build.gradle.kts +++ b/catalogs/catalog-jdbc-doris/build.gradle.kts @@ -69,3 +69,7 @@ tasks.test { init(this) } } + +tasks.getByName("generateMetadataFileForMavenJavaPublication") { + dependsOn("runtimeJars") +} diff --git a/catalogs/catalog-jdbc-mysql/build.gradle.kts b/catalogs/catalog-jdbc-mysql/build.gradle.kts index c62745c7135..536f02996b2 100644 --- a/catalogs/catalog-jdbc-mysql/build.gradle.kts +++ b/catalogs/catalog-jdbc-mysql/build.gradle.kts @@ -86,3 +86,7 @@ tasks.test { init(this) } } + +tasks.getByName("generateMetadataFileForMavenJavaPublication") { + dependsOn("runtimeJars") +} \ No newline at end of file diff --git a/catalogs/catalog-jdbc-postgresql/build.gradle.kts b/catalogs/catalog-jdbc-postgresql/build.gradle.kts index e2bc976e9d0..2b545549dfb 100644 --- a/catalogs/catalog-jdbc-postgresql/build.gradle.kts +++ b/catalogs/catalog-jdbc-postgresql/build.gradle.kts @@ -92,3 +92,7 @@ tasks.test { init(this) } } + +tasks.getByName("generateMetadataFileForMavenJavaPublication") { + dependsOn("runtimeJars") +} diff --git a/catalogs/catalog-lakehouse-iceberg/build.gradle.kts b/catalogs/catalog-lakehouse-iceberg/build.gradle.kts index f42b7c24941..e28f883d0f7 100644 --- a/catalogs/catalog-lakehouse-iceberg/build.gradle.kts +++ b/catalogs/catalog-lakehouse-iceberg/build.gradle.kts @@ -172,3 +172,7 @@ tasks.test { tasks.clean { delete("spark-warehouse") } + +tasks.getByName("generateMetadataFileForMavenJavaPublication") { + dependsOn("runtimeJars") +} diff --git a/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/IcebergCatalogOperations.java b/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/IcebergCatalogOperations.java index 8473ede2422..0d81823b00a 100644 --- a/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/IcebergCatalogOperations.java +++ b/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/IcebergCatalogOperations.java @@ -80,7 +80,6 @@ public class IcebergCatalogOperations implements CatalogOperations, SupportsSche * Initializes the Iceberg catalog operations with the provided configuration. * * @param conf The configuration map for the Iceberg catalog operations. - * @param entity The catalog entity associated with this operations instance. * @throws RuntimeException if initialization fails. */ @Override diff --git a/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/converter/FromIcebergPartitionSpec.java b/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/converter/FromIcebergPartitionSpec.java index 7ef053120a2..d1346599215 100644 --- a/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/converter/FromIcebergPartitionSpec.java +++ b/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/converter/FromIcebergPartitionSpec.java @@ -77,8 +77,8 @@ public Transform unknown(int fieldId, String sourceName, int sourceId, String tr /** * Transform assembled into gravitino. * - * @param partitionSpec - * @param schema + * @param partitionSpec Iceberg partition spec. + * @param schema Iceberg schema. * @return array of transforms for partition fields. */ public static Transform[] fromPartitionSpec(PartitionSpec partitionSpec, Schema schema) { diff --git a/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/converter/FromIcebergSortOrder.java b/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/converter/FromIcebergSortOrder.java index b7f0dcdf45d..56e6dcc0c44 100644 --- a/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/converter/FromIcebergSortOrder.java +++ b/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/converter/FromIcebergSortOrder.java @@ -94,7 +94,7 @@ private NullOrdering toGravitino(NullOrder nullOrder) { /** * Convert Iceberg order to Gravitino. * - * @param sortOrder + * @param sortOrder Iceberg sort order * @return Gravitino sort order */ public static SortOrder[] fromSortOrder(org.apache.iceberg.SortOrder sortOrder) { diff --git a/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/ops/IcebergTableOpsHelper.java b/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/ops/IcebergTableOpsHelper.java index 985a1a25abf..dc6d9bd30ae 100644 --- a/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/ops/IcebergTableOpsHelper.java +++ b/catalogs/catalog-lakehouse-iceberg/src/main/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/ops/IcebergTableOpsHelper.java @@ -332,8 +332,8 @@ public static Namespace getIcebergNamespace(String... level) { * Gravitino only supports tables managed with a single level hierarchy, such as * `{namespace}.{table}`, so we need to perform truncation here. * - * @param namespace - * @param name + * @param namespace The Gravitino name space + * @param name The table name * @return Iceberg TableIdentifier */ public static TableIdentifier buildIcebergTableIdentifier( diff --git a/catalogs/catalog-messaging-kafka/build.gradle.kts b/catalogs/catalog-messaging-kafka/build.gradle.kts index a992063ee09..493c6683961 100644 --- a/catalogs/catalog-messaging-kafka/build.gradle.kts +++ b/catalogs/catalog-messaging-kafka/build.gradle.kts @@ -60,4 +60,8 @@ tasks { } } +tasks.getByName("generateMetadataFileForMavenJavaPublication") { + dependsOn("runtimeJars") +} + // TODO. add test task later on. From 1f6ad750e33074a5957d21c6ce9ce93c857e60e8 Mon Sep 17 00:00:00 2001 From: yuqi Date: Fri, 22 Mar 2024 18:03:54 +0800 Subject: [PATCH 2/2] Fix format error. --- catalogs/catalog-hive/build.gradle.kts | 2 +- catalogs/catalog-jdbc-mysql/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catalogs/catalog-hive/build.gradle.kts b/catalogs/catalog-hive/build.gradle.kts index ac5d3330e7a..8316e7a7db7 100644 --- a/catalogs/catalog-hive/build.gradle.kts +++ b/catalogs/catalog-hive/build.gradle.kts @@ -172,4 +172,4 @@ tasks.test { tasks.getByName("generateMetadataFileForMavenJavaPublication") { dependsOn("runtimeJars") -} \ No newline at end of file +} diff --git a/catalogs/catalog-jdbc-mysql/build.gradle.kts b/catalogs/catalog-jdbc-mysql/build.gradle.kts index 536f02996b2..06f061ced86 100644 --- a/catalogs/catalog-jdbc-mysql/build.gradle.kts +++ b/catalogs/catalog-jdbc-mysql/build.gradle.kts @@ -89,4 +89,4 @@ tasks.test { tasks.getByName("generateMetadataFileForMavenJavaPublication") { dependsOn("runtimeJars") -} \ No newline at end of file +}