FANNG1 commented on code in PR #11071: URL: https://github.com/apache/gravitino/pull/11071#discussion_r3281099719
########## flink-connector/v1.19/flink-runtime/build.gradle.kts: ########## @@ -0,0 +1,90 @@ +/* + * 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. + */ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +plugins { + `maven-publish` + id("java") + id("idea") + alias(libs.plugins.shadow) +} + +repositories { + mavenCentral() +} + +val flinkVersion: String = libs.versions.flink119.get() +val flinkMajorVersion: String = flinkVersion.substringBeforeLast(".") +val scalaVersion: String = "2.12" Review Comment: No, not in this PR. Flink 1.18+ is still wired only for Scala 2.12 here. The `119` / `120` aliases are intended to make the Flink minor version explicit (`1.19` / `1.20`) and avoid ambiguity with the Scala suffix used in artifact names. ########## flink-connector/v1.20/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/jdbc/FlinkJdbcMysqlCatalogIT120.java: ########## @@ -0,0 +1,51 @@ +/* + * 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.gravitino.flink.connector.integration.test.jdbc; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class FlinkJdbcMysqlCatalogIT120 extends FlinkJdbcMysqlCatalogIT { + + @Override + @Test + public void testCreateGravitinoJdbcCatalogUsingSQLMissingOptions() { + // Flink 1.20 reports missing required catalog options through IllegalArgumentException + // rather than the ValidationException thrown by older minor versions. + tableEnv.useCatalog(DEFAULT_CATALOG); + String catalogName = "gravitino_mysql_jdbc_catalog_missing_options"; + IllegalArgumentException exception = + Assertions.assertThrows( + IllegalArgumentException.class, + () -> + tableEnv.executeSql( + String.format( + "create catalog %s with (" + + "'type'='gravitino-jdbc-mysql', " + + "'base-url'='%s'," + + "'username'='%s'," + + "'default-database'='%s'" + + ")", + catalogName, mysqlUrl, mysqlUsername, mysqlDefaultDatabase))); + + Assertions.assertTrue(exception.getMessage().contains("jdbc-password")); + Assertions.assertFalse(metalake.catalogExists(catalogName)); Review Comment: Fixed in 94d8486a0. The Flink 1.20 JDBC missing-option assertion now checks for `password`, which covers the Flink SQL option key while still matching the current Gravitino-side error message. ########## flink-connector/v1.19/flink/build.gradle.kts: ########## @@ -0,0 +1,207 @@ +/* + * 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. + */ +import org.gradle.api.tasks.SourceSetContainer + +plugins { + `maven-publish` + id("java") + id("idea") +} + +repositories { + mavenCentral() +} + +val commonProject = project(":flink-connector:flink-common") +val commonSourceSets = commonProject.extensions.getByType<SourceSetContainer>() +val commonTestOutput = commonSourceSets.named("test").get().output +val flinkVersion: String = libs.versions.flink119.get() +val flinkMajorVersion: String = flinkVersion.substringBeforeLast(".") +val icebergVersion: String = libs.versions.iceberg4flink119.get() +val paimonVersion: String = libs.versions.paimon4flink119.get() +val scalaVersion: String = "2.12" +val artifactName = "${rootProject.name}-flink-${flinkMajorVersion}_$scalaVersion" + +dependencies { + implementation(commonProject) + + compileOnly(project(":clients:client-java-runtime", configuration = "shadow")) + compileOnly("org.apache.iceberg:iceberg-flink-runtime-$flinkMajorVersion:$icebergVersion") + compileOnly("org.apache.flink:flink-connector-hive_$scalaVersion:$flinkVersion") + compileOnly("org.apache.flink:flink-table-common:$flinkVersion") + compileOnly("org.apache.flink:flink-table-api-java:$flinkVersion") + compileOnly("org.apache.paimon:paimon-flink-$flinkMajorVersion:$paimonVersion") + compileOnly(libs.flinkjdbc119) + compileOnly(libs.hive2.common) { + exclude("org.eclipse.jetty.aggregate", "jetty-all") + exclude("org.eclipse.jetty.orbit", "javax.servlet") + } + + testImplementation(project(":api")) + testImplementation(project(":catalogs:catalog-jdbc-common")) { + exclude("org.apache.logging.log4j") + } + testImplementation(project(":clients:client-java")) + testImplementation(project(":common")) + testImplementation(project(":core")) + testImplementation(project(":flink-connector:flink-common", "testArtifacts")) + testImplementation(project(":integration-test-common", "testArtifacts")) + testImplementation(project(":server")) + testImplementation(project(":server-common")) + testImplementation(libs.awaitility) + testImplementation(libs.flinkjdbc119) + testImplementation(libs.junit.jupiter.api) + testImplementation(libs.junit.jupiter.params) + testImplementation(libs.metrics.core) + testImplementation(libs.minikdc) + testImplementation(libs.mockito.core) + testImplementation(libs.mysql.driver) + testImplementation(libs.postgresql.driver) + testImplementation(libs.sqlite.jdbc) + testImplementation(libs.testcontainers) + testImplementation(libs.testcontainers.junit.jupiter) + testImplementation(libs.testcontainers.mysql) + + testImplementation("org.apache.iceberg:iceberg-core:$icebergVersion") + testImplementation("org.apache.iceberg:iceberg-hive-metastore:$icebergVersion") + testImplementation("org.apache.iceberg:iceberg-flink-runtime-$flinkMajorVersion:$icebergVersion") + testImplementation("org.apache.flink:flink-connector-hive_$scalaVersion:$flinkVersion") + testImplementation("org.apache.flink:flink-table-common:$flinkVersion") + testImplementation("org.apache.flink:flink-table-api-java:$flinkVersion") + testImplementation("org.apache.flink:flink-sql-gateway:$flinkVersion") + testImplementation("org.apache.paimon:paimon-flink-$flinkMajorVersion:$paimonVersion") + + testImplementation(libs.hive2.exec) { + artifact { + classifier = "core" + } + exclude("com.fasterxml.jackson.core") + exclude("com.google.code.findbugs", "jsr305") + exclude("com.google.protobuf") + exclude("org.apache.avro") + exclude("org.apache.calcite") + exclude("org.apache.calcite.avatica") + exclude("org.apache.curator") + exclude("org.apache.hadoop", "hadoop-yarn-server-resourcemanager") + exclude("org.apache.logging.log4j") + exclude("org.apache.zookeeper") + exclude("org.eclipse.jetty.aggregate", "jetty-all") + exclude("org.eclipse.jetty.orbit", "javax.servlet") + exclude("org.openjdk.jol") + exclude("org.pentaho") + exclude("org.slf4j") + } + + testImplementation(libs.hadoop3.common) { + exclude("*") + } + testImplementation(libs.hadoop3.hdfs) { + exclude("com.sun.jersey") + exclude("commons-cli", "commons-cli") + exclude("commons-io", "commons-io") + exclude("commons-codec", "commons-codec") + exclude("commons-logging", "commons-logging") + exclude("javax.servlet", "servlet-api") + exclude("org.mortbay.jetty") + } + testImplementation(libs.hadoop3.hdfs.client) + testImplementation(libs.hadoop3.mapreduce.client.core) { + exclude("*") + } + // Hadoop 3.x runtime requirements (stripped by exclude("*") above) + testImplementation(libs.hadoop3.shaded.guava) + testImplementation(libs.hadoop3.shaded.protobuf) + testImplementation(libs.commons.configuration2) + testImplementation(libs.re2j) + testImplementation(libs.hive2.common) { + exclude("org.eclipse.jetty.aggregate", "jetty-all") + exclude("org.eclipse.jetty.orbit", "javax.servlet") + } + testImplementation(libs.hive2.metastore) { + exclude("co.cask.tephra") + exclude("com.github.joshelser") + exclude("com.google.code.findbugs", "jsr305") + exclude("com.google.code.findbugs", "sr305") + exclude("com.tdunning", "json") + exclude("com.zaxxer", "HikariCP") + exclude("io.dropwizard.metrics") + exclude("javax.transaction", "transaction-api") + exclude("org.apache.avro") + exclude("org.apache.curator") + exclude("org.apache.hbase") + exclude("org.apache.hadoop", "hadoop-yarn-server-resourcemanager") + exclude("org.apache.logging.log4j") + exclude("org.apache.parquet", "parquet-hadoop-bundle") + exclude("org.apache.zookeeper") + exclude("org.eclipse.jetty.aggregate", "jetty-all") + exclude("org.eclipse.jetty.orbit", "javax.servlet") + exclude("org.slf4j") + } + testImplementation("org.apache.flink:flink-table-api-bridge-base:$flinkVersion") { + exclude("commons-cli", "commons-cli") + exclude("commons-io", "commons-io") + exclude("com.google.code.findbugs", "jsr305") + } + testImplementation("org.apache.flink:flink-table-planner_$scalaVersion:$flinkVersion") + testImplementation("org.apache.flink:flink-test-utils:$flinkVersion") + + testRuntimeOnly(libs.junit.jupiter.engine) +} + +tasks.test { + dependsOn(commonProject.tasks.named("testClasses")) + // A test artifact dependency only adds common test classes to the classpath. Add the common + // test output explicitly so Gradle discovers and executes those shared tests in this variant. + testClassesDirs = files(commonTestOutput.classesDirs, sourceSets["test"].output.classesDirs) + classpath = files(commonTestOutput, sourceSets["test"].runtimeClasspath) + + val skipITs = project.hasProperty("skipITs") + if (skipITs) { + exclude("**/integration/test/**") + } else { + dependsOn(tasks.jar) + dependsOn(":catalogs:catalog-hive:jar") + dependsOn(":catalogs:catalog-hive:runtimeJars") + dependsOn(":catalogs:catalog-lakehouse-iceberg:jar") + dependsOn(":catalogs:catalog-lakehouse-iceberg:runtimeJars") + dependsOn(":iceberg:iceberg-rest-server:jar") Review Comment: This is needed by the Iceberg REST catalog IT path. `FlinkEnvIT` enables the `iceberg-rest` auxiliary service for the lakehouse-iceberg provider, and `MiniGravitino` loads that service from `iceberg/iceberg-rest-server/build/libs`. The explicit `:iceberg:iceberg-rest-server:jar` dependency guarantees that jar exists before the Flink IT starts. This is copied from the Flink 1.18 module wiring. -- 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]
