sachinnn99 commented on code in PR #11207: URL: https://github.com/apache/gravitino/pull/11207#discussion_r3316928266
########## catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/operation/JdbcViewOperations.java: ########## @@ -0,0 +1,236 @@ +/* + * 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.catalog.jdbc.operation; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import javax.sql.DataSource; +import org.apache.gravitino.catalog.jdbc.JdbcColumn; +import org.apache.gravitino.catalog.jdbc.JdbcView; +import org.apache.gravitino.catalog.jdbc.converter.JdbcExceptionConverter; +import org.apache.gravitino.catalog.jdbc.converter.JdbcTypeConverter; +import org.apache.gravitino.exceptions.NoSuchViewException; +import org.apache.gravitino.rel.Column; +import org.apache.gravitino.rel.SQLRepresentation; + +/** Abstract base class for database-specific JDBC view operations. */ +public abstract class JdbcViewOperations { + + protected DataSource dataSource; + protected JdbcExceptionConverter exceptionMapper; + protected JdbcTypeConverter typeConverter; + + /** + * Initializes the view operations with the given data source and converters. + * + * @param dataSource The JDBC data source. + * @param exceptionMapper The exception converter. + * @param typeConverter The type converter. + * @param conf The configuration map. + */ + public void initialize( + DataSource dataSource, + JdbcExceptionConverter exceptionMapper, + JdbcTypeConverter typeConverter, + Map<String, String> conf) { + this.dataSource = dataSource; + this.exceptionMapper = exceptionMapper; + this.typeConverter = typeConverter; + } + + /** + * Lists all view names in the given database/schema. + * + * @param databaseName The database or schema name. + * @return A list of view names. + */ + public List<String> listViews(String databaseName) { + try (Connection connection = getConnection(databaseName)) { + String sql = generateListViewsSql(); + try (PreparedStatement stmt = connection.prepareStatement(sql)) { + bindListViewsParameters(stmt, databaseName); + try (ResultSet rs = stmt.executeQuery()) { + List<String> views = new ArrayList<>(); + while (rs.next()) { + views.add(rs.getString(1)); + } + return views; + } + } + } catch (SQLException e) { + throw exceptionMapper.toGravitinoException(e); + } + } + + /** + * Loads view metadata from the database. + * + * @param databaseName The database or schema name. + * @param viewName The view name. + * @return The loaded view. + * @throws NoSuchViewException If the view does not exist. + */ + public JdbcView load(String databaseName, String viewName) throws NoSuchViewException { + try (Connection connection = getConnection(databaseName)) { + String viewDefinition = loadViewDefinition(connection, databaseName, viewName); + Preconditions.checkNotNull( + viewDefinition, "View definition is null for view %s in %s", viewName, databaseName); + Column[] columns = discoverColumns(connection, viewName); + + SQLRepresentation rep = + SQLRepresentation.builder().withDialect(dialectName()).withSql(viewDefinition).build(); + + return JdbcView.builder() + .withName(viewName) + .withColumns(columns) + .withRepresentations(new SQLRepresentation[] {rep}) + .withProperties(ImmutableMap.of()) Review Comment: Done -- added a `loadComment()` template method to `JdbcViewOperations` (returns `null` by default for MySQL). The `load()` method now calls it and passes the result to `JdbcView.builder().withComment(comment)`. PostgreSQL overrides it to query `obj_description(c.oid, 'pg_class')` from `pg_catalog`. Also added IT assertions: PostgreSQL verifies the comment round-trips, MySQL asserts `null`. ########## catalogs/catalog-jdbc-postgresql/src/main/java/org/apache/gravitino/catalog/postgresql/operation/PostgreSqlViewOperations.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.catalog.postgresql.operation; + +import com.google.common.base.Preconditions; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.Map; +import javax.sql.DataSource; +import org.apache.commons.lang3.StringUtils; +import org.apache.gravitino.catalog.jdbc.config.JdbcConfig; +import org.apache.gravitino.catalog.jdbc.converter.JdbcExceptionConverter; +import org.apache.gravitino.catalog.jdbc.converter.JdbcTypeConverter; +import org.apache.gravitino.catalog.jdbc.operation.JdbcViewOperations; +import org.apache.gravitino.rel.Dialects; + +/** PostgreSQL-specific implementation of JDBC view operations. */ +public class PostgreSqlViewOperations extends JdbcViewOperations { + + private String database; + + @Override + public void initialize( + DataSource dataSource, + JdbcExceptionConverter exceptionMapper, + JdbcTypeConverter typeConverter, + Map<String, String> conf) { + super.initialize(dataSource, exceptionMapper, typeConverter, conf); + this.database = new JdbcConfig(conf).getJdbcDatabase(); + Preconditions.checkArgument( + StringUtils.isNotBlank(database), + "The `jdbc-database` configuration item is mandatory in PostgreSQL."); + } + + @Override + public String dialectName() { + return Dialects.POSTGRESQL; + } + + @Override + protected String quoteIdentifier(String identifier) { + return "\"" + identifier.replace("\"", "\"\"") + "\""; + } + + @Override + protected String generateListViewsSql() { + return "SELECT table_name FROM information_schema.views" + + " WHERE table_schema = ? AND table_catalog = ?"; + } + + @Override + protected void bindListViewsParameters(PreparedStatement stmt, String schemaName) + throws SQLException { + stmt.setString(1, schemaName); + stmt.setString(2, database); + } + + @Override + protected String generateLoadViewSql() { + return "SELECT view_definition FROM information_schema.views" Review Comment: Done -- same as above. `PostgreSqlViewOperations` now overrides `loadComment()` to fetch the view comment from `pg_description` via `obj_description(c.oid, 'pg_class')`. The IT test creates a view with `COMMENT ON VIEW` and verifies the comment is returned on load. -- 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]
