FANNG1 commented on code in PR #6543:
URL: https://github.com/apache/gravitino/pull/6543#discussion_r2000319977
##########
flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/iceberg/GravitinoIcebergCatalog.java:
##########
@@ -39,7 +39,7 @@ protected GravitinoIcebergCatalog(
PropertiesConverter propertiesConverter,
PartitionConverter partitionConverter,
Map<String, String> properties) {
Review Comment:
rename properties to `FlinkCatalogProperties`?
##########
flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/FlinkCommonIT.java:
##########
@@ -646,8 +664,8 @@ public void testAlterTableDropColumn() {
}
@Test
- @EnabledIf("supportColumnOperation")
- public void testAlterColumnTypeAndChangeOrder() {
+ @EnabledIf("supportModifyColumnsMultipleByOneSql")
+ public void testAlterColumnTypeAndChangeOrderInOneSql() {
Review Comment:
what's the difference between `testAlterColumnTypeAndChangeOrderInOneSql `
and `testAlterColumnTypeAndChangeOrder `? seems we could only keep one test
##########
flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/hive/HivePropertiesConverter.java:
##########
@@ -47,7 +48,10 @@ public String transformPropertyToFlinkCatalog(String
configKey) {
}
@Override
- public Map<String, String> toFlinkTableProperties(Map<String, String>
gravitinoProperties) {
+ public Map<String, String> toFlinkTableProperties(
+ Map<String, String> flinkCatalogProperties,
+ Map<String, String> gravitinoProperties,
Review Comment:
How about using `gravitinoTableProperties` to make it more clear?
##########
flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/JdbcPropertiesConverter.java:
##########
@@ -0,0 +1,96 @@
+/*
+ * 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.jdbc;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.table.catalog.ObjectPath;
+import org.apache.gravitino.flink.connector.PropertiesConverter;
+
+public abstract class JdbcPropertiesConverter implements PropertiesConverter {
+
+ private static final Pattern jdbcUrlPattern =
Pattern.compile("(jdbc:\\w+://[^:/]+(?::\\d+)?)");
+
+ @Override
+ public Map<String, String> toGravitinoCatalogProperties(Configuration
flinkConf) {
+ Map<String, String> gravitinoCatalogProperties =
+ PropertiesConverter.super.toGravitinoCatalogProperties(flinkConf);
+ if
(!gravitinoCatalogProperties.containsKey(JdbcPropertiesConstants.GRAVITINO_JDBC_DRIVER))
{
+ gravitinoCatalogProperties.put(
+ JdbcPropertiesConstants.GRAVITINO_JDBC_DRIVER, defaultDriverName());
+ }
+ return gravitinoCatalogProperties;
+ }
+
+ @Override
+ public Map<String, String> toFlinkCatalogProperties(Map<String, String>
gravitinoProperties) {
+ Map<String, String> flinkCatalogProperties =
+
PropertiesConverter.super.toFlinkCatalogProperties(gravitinoProperties);
+ String gravitinoJdbcUrl =
gravitinoProperties.get(JdbcPropertiesConstants.GRAVITINO_JDBC_URL);
+ // The URL in FlinkJdbcCatalog does not support database and other
parameters.
+ flinkCatalogProperties.put(
+ JdbcPropertiesConstants.FLINK_JDBC_URL,
getBaseUrlFromJdbcUrl(gravitinoJdbcUrl));
+ return flinkCatalogProperties;
+ }
+
+ @Override
+ public String transformPropertyToGravitinoCatalog(String configKey) {
+ return JdbcPropertiesConstants.flinkToGravitinoMap.get(configKey);
+ }
+
+ @Override
+ public String transformPropertyToFlinkCatalog(String configKey) {
+ return JdbcPropertiesConstants.gravitinoToFlinkMap.get(configKey);
+ }
+
+ @Override
+ public Map<String, String> toFlinkTableProperties(
+ Map<String, String> flinkCatalogProperties,
+ Map<String, String> gravitinoProperties,
+ ObjectPath tablePath) {
+ Map<String, String> tableOptions = new HashMap<>();
Review Comment:
Could you check the exists of `JdbcPropertiesConstants.FLINK_JDBC_USER`
`JdbcPropertiesConstants.FLINK_JDBC_URL`
`JdbcPropertiesConstants.FLINK_JDBC_PASSWORD` first?
--
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]
