FANNG1 commented on code in PR #6543: URL: https://github.com/apache/gravitino/pull/6543#discussion_r1980530375
########## flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/GravitinoJdbcCatalogFactory.java: ########## @@ -0,0 +1,69 @@ +/* + * 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.Collections; +import java.util.Set; +import org.apache.flink.configuration.ConfigOption; +import org.apache.flink.table.factories.FactoryUtil; +import org.apache.flink.util.Preconditions; +import org.apache.gravitino.Catalog; +import org.apache.gravitino.flink.connector.DefaultPartitionConverter; +import org.apache.gravitino.flink.connector.PartitionConverter; +import org.apache.gravitino.flink.connector.catalog.BaseCatalogFactory; +import org.apache.gravitino.flink.connector.utils.FactoryUtils; + +/** + * Factory for creating instances of {@link GravitinoJdbcCatalog}. It will be created by SPI + * discovery in Flink. + */ +public abstract class GravitinoJdbcCatalogFactory implements BaseCatalogFactory { + + @Override + public org.apache.flink.table.catalog.Catalog createCatalog(Context context) { + final FactoryUtil.CatalogFactoryHelper helper = + FactoryUtils.createCatalogFactoryHelper(this, context); + String defaultDatabase = + helper.getOptions().get(GravitinoJdbcCatalogFactoryOptions.DEFAULT_DATABASE); + Preconditions.checkNotNull(defaultDatabase, "default-database should not be null."); Review Comment: could you use a constant to represent `default-database`? ########## flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/GravitinoJdbcCatalog.java: ########## @@ -0,0 +1,86 @@ +/* + * 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.Map; +import java.util.Optional; +import org.apache.flink.connector.jdbc.catalog.JdbcCatalog; +import org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactory; +import org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory; +import org.apache.flink.table.catalog.AbstractCatalog; +import org.apache.flink.table.catalog.CatalogBaseTable; +import org.apache.flink.table.catalog.ObjectPath; +import org.apache.flink.table.catalog.exceptions.CatalogException; +import org.apache.flink.table.catalog.exceptions.TableNotExistException; +import org.apache.flink.table.factories.CatalogFactory; +import org.apache.flink.table.factories.Factory; +import org.apache.gravitino.flink.connector.PartitionConverter; +import org.apache.gravitino.flink.connector.PropertiesConverter; +import org.apache.gravitino.flink.connector.catalog.BaseCatalog; + +/** + * The GravitinoJdbcCatalog class is an implementation of the BaseCatalog class that is used to + * proxy the JdbcCatalog class. + */ +public class GravitinoJdbcCatalog extends BaseCatalog { + + private final JdbcCatalog jdbcCatalog; + + private final CatalogFactory.Context context; + + protected GravitinoJdbcCatalog( + CatalogFactory.Context context, + String defaultDatabase, + PropertiesConverter propertiesConverter, + PartitionConverter partitionConverter) { + super(context.getName(), defaultDatabase, propertiesConverter, partitionConverter); + this.context = context; + JdbcCatalogFactory jdbcCatalogFactory = new JdbcCatalogFactory(); + this.jdbcCatalog = (JdbcCatalog) jdbcCatalogFactory.createCatalog(context); + } + + @Override + protected AbstractCatalog realCatalog() { + return jdbcCatalog; + } + + @Override + public Optional<Factory> getFactory() { + return Optional.of(new JdbcDynamicTableFactory()); + } + + @Override + public CatalogBaseTable getTable(ObjectPath tablePath) Review Comment: Could we add the table property transform logic in the JDBCPropertiesConverter to avoid override `getTable`? ########## flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/GravitinoJdbcCatalogFactory.java: ########## @@ -0,0 +1,69 @@ +/* + * 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.Collections; +import java.util.Set; +import org.apache.flink.configuration.ConfigOption; +import org.apache.flink.table.factories.FactoryUtil; +import org.apache.flink.util.Preconditions; +import org.apache.gravitino.Catalog; +import org.apache.gravitino.flink.connector.DefaultPartitionConverter; +import org.apache.gravitino.flink.connector.PartitionConverter; +import org.apache.gravitino.flink.connector.catalog.BaseCatalogFactory; +import org.apache.gravitino.flink.connector.utils.FactoryUtils; + +/** + * Factory for creating instances of {@link GravitinoJdbcCatalog}. It will be created by SPI + * discovery in Flink. + */ +public abstract class GravitinoJdbcCatalogFactory implements BaseCatalogFactory { + + @Override + public org.apache.flink.table.catalog.Catalog createCatalog(Context context) { + final FactoryUtil.CatalogFactoryHelper helper = + FactoryUtils.createCatalogFactoryHelper(this, context); + String defaultDatabase = + helper.getOptions().get(GravitinoJdbcCatalogFactoryOptions.DEFAULT_DATABASE); + Preconditions.checkNotNull(defaultDatabase, "default-database should not be null."); + return new GravitinoJdbcCatalog( + context, defaultDatabase, propertiesConverter(), partitionConverter()); + } + + @Override + public Catalog.Type gravitinoCatalogType() { + return Catalog.Type.RELATIONAL; + } + + @Override + public PartitionConverter partitionConverter() { Review Comment: Does Flink Jdbc connector support partition operations? ########## flink-connector/flink/build.gradle.kts: ########## @@ -97,7 +97,7 @@ dependencies { testImplementation(libs.testcontainers.junit.jupiter) testImplementation(libs.testcontainers.mysql) testImplementation(libs.metrics.core) - + testImplementation(libs.flinkjdbc) Review Comment: seems not fixed? ########## flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/GravitinoJdbcCatalog.java: ########## @@ -0,0 +1,86 @@ +/* + * 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.Map; +import java.util.Optional; +import org.apache.flink.connector.jdbc.catalog.JdbcCatalog; +import org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactory; +import org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory; +import org.apache.flink.table.catalog.AbstractCatalog; +import org.apache.flink.table.catalog.CatalogBaseTable; +import org.apache.flink.table.catalog.ObjectPath; +import org.apache.flink.table.catalog.exceptions.CatalogException; +import org.apache.flink.table.catalog.exceptions.TableNotExistException; +import org.apache.flink.table.factories.CatalogFactory; +import org.apache.flink.table.factories.Factory; +import org.apache.gravitino.flink.connector.PartitionConverter; +import org.apache.gravitino.flink.connector.PropertiesConverter; +import org.apache.gravitino.flink.connector.catalog.BaseCatalog; + +/** + * The GravitinoJdbcCatalog class is an implementation of the BaseCatalog class that is used to + * proxy the JdbcCatalog class. + */ +public class GravitinoJdbcCatalog extends BaseCatalog { Review Comment: shoud Jdbc catalog implement `open` and `close` method? ########## flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/JdbcPropertiesConstants.java: ########## @@ -0,0 +1,54 @@ +/* + * 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; + +public class JdbcPropertiesConstants { + + private JdbcPropertiesConstants() {} + + public static final String GRAVITINO_JDBC_USER = "jdbc-user"; + public static final String GRAVITINO_JDBC_PASSWORD = "jdbc-password"; + public static final String GRAVITINO_JDBC_URL = "jdbc-url"; + public static final String GRAVITINO_JDBC_DRIVER = "jdbc-driver"; Review Comment: seems missing the logic about tranforming from `GRAVITINO_JDBC_DRIVER` to `Flink_JDBC_DRIVER`? -- 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: commits-unsubscr...@gravitino.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
