jbonofre commented on code in PR #9765:
URL: https://github.com/apache/iceberg/pull/9765#discussion_r1497115893
##########
core/src/main/java/org/apache/iceberg/jdbc/JdbcCatalog.java:
##########
@@ -199,21 +212,31 @@ private void initializeCatalogTables() throws
InterruptedException, SQLException
});
}
- private void updateCatalogTables(Connection connection) throws SQLException {
- DatabaseMetaData dbMeta = connection.getMetaData();
- ResultSet typeColumn =
- dbMeta.getColumns(null, null, JdbcUtil.CATALOG_TABLE_VIEW_NAME,
JdbcUtil.RECORD_TYPE);
- if (typeColumn.next()) {
- LOG.debug("{} already supports views", JdbcUtil.CATALOG_TABLE_VIEW_NAME);
- } else {
- if (PropertyUtil.propertyAsBoolean(
- catalogProperties, JdbcUtil.ADD_VIEW_SUPPORT_PROPERTY, false)) {
- connection.prepareStatement(JdbcUtil.UPDATE_CATALOG_SQL).execute();
- } else {
- LOG.warn(VIEW_WARNING_LOG_MESSAGE);
- schemaVersion = JdbcUtil.SchemaVersion.V0;
- }
- }
+ private void updateSchemaIfRequired() throws SQLException,
InterruptedException {
+ connections.run(
+ conn -> {
+ DatabaseMetaData dbMeta = conn.getMetaData();
+ ResultSet typeColumn =
+ dbMeta.getColumns(null, null, JdbcUtil.CATALOG_TABLE_VIEW_NAME,
JdbcUtil.RECORD_TYPE);
+ if (typeColumn.next()) {
+ LOG.debug("{} already supports views",
JdbcUtil.CATALOG_TABLE_VIEW_NAME);
+ schemaVersion = JdbcUtil.SchemaVersion.V1;
+ return true;
+ } else {
+ if (PropertyUtil.propertyAsString(
+ catalogProperties,
+ JdbcUtil.SCHEMA_VERSION_PROPERTY,
+ JdbcUtil.SchemaVersion.V0.name())
+ .equals(JdbcUtil.SchemaVersion.V1.name())) {
+ LOG.debug("{} is updating to support views",
JdbcUtil.CATALOG_TABLE_VIEW_NAME);
Review Comment:
I used `updating` because the actual update is performed after the log
message (I would have used `updated` if the log message is after the update
statement).
--
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: issues-unsubscr...@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For additional commands, e-mail: issues-h...@iceberg.apache.org
