mchades commented on code in PR #3961: URL: https://github.com/apache/gravitino/pull/3961#discussion_r1686184372
########## catalogs/catalog-jdbc-doris/src/main/java/org/apache/gravitino/catalog/doris/operation/DorisTablePartitionOperations.java: ########## @@ -0,0 +1,334 @@ +/* + * 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.doris.operation; + +import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.DATA_SIZE; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.ID; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.IS_IN_MEMORY; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.KEY; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.NAME; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.STATE; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.VALUES_RANGE; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.VISIBLE_VERSION; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.VISIBLE_VERSION_TIME; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import javax.sql.DataSource; +import org.apache.gravitino.catalog.jdbc.JdbcTable; +import org.apache.gravitino.catalog.jdbc.converter.JdbcExceptionConverter; +import org.apache.gravitino.catalog.jdbc.converter.JdbcTypeConverter; +import org.apache.gravitino.catalog.jdbc.operation.JdbcTablePartitionOperations; +import org.apache.gravitino.exceptions.GravitinoRuntimeException; +import org.apache.gravitino.exceptions.NoSuchPartitionException; +import org.apache.gravitino.exceptions.PartitionAlreadyExistsException; +import org.apache.gravitino.rel.expressions.literals.Literal; +import org.apache.gravitino.rel.expressions.literals.Literals; +import org.apache.gravitino.rel.expressions.transforms.Transform; +import org.apache.gravitino.rel.expressions.transforms.Transforms; +import org.apache.gravitino.rel.partitions.ListPartition; +import org.apache.gravitino.rel.partitions.Partition; +import org.apache.gravitino.rel.partitions.Partitions; +import org.apache.gravitino.rel.partitions.RangePartition; +import org.apache.gravitino.rel.types.Type; + +public final class DorisTablePartitionOperations extends JdbcTablePartitionOperations { + private static final String PARTITION_TYPE_VALUE_PATTERN_STRING = + "types: \\[([^\\]]+)\\]; keys: \\[([^\\]]+)\\];"; + private static final Pattern PARTITION_TYPE_VALUE_PATTERN = + Pattern.compile(PARTITION_TYPE_VALUE_PATTERN_STRING); + + private final JdbcExceptionConverter exceptionConverter; + private final JdbcTypeConverter typeConverter; + + public DorisTablePartitionOperations( + DataSource dataSource, + JdbcTable loadedTable, + JdbcExceptionConverter exceptionConverter, + JdbcTypeConverter typeConverter) { + super(dataSource, loadedTable); + checkArgument(exceptionConverter != null, "exceptionConverter is null"); + checkArgument(typeConverter != null, "typeConverter is null"); + this.exceptionConverter = exceptionConverter; + this.typeConverter = typeConverter; + } + + @Override + public String[] listPartitionNames() { + try (Connection connection = getConnection(loadedTable.databaseName())) { + String showPartitionsSql = String.format("SHOW PARTITIONS FROM `%s`", loadedTable.name()); + try (Statement statement = connection.createStatement(); + ResultSet result = statement.executeQuery(showPartitionsSql)) { + ImmutableList.Builder<String> partitionNames = ImmutableList.builder(); + while (result.next()) { + partitionNames.add(result.getString("PartitionName")); + } + return partitionNames.build().stream().toArray(String[]::new); Review Comment: Can be simplified to `partitionNames.build().toArray(new String[0]);` Many places use this writing style, and it can be simplified. ########## catalogs/catalog-jdbc-doris/src/main/java/org/apache/gravitino/catalog/doris/operation/DorisTablePartitionOperations.java: ########## @@ -0,0 +1,334 @@ +/* + * 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.doris.operation; + +import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.DATA_SIZE; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.ID; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.IS_IN_MEMORY; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.KEY; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.NAME; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.STATE; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.VALUES_RANGE; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.VISIBLE_VERSION; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.VISIBLE_VERSION_TIME; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import javax.sql.DataSource; +import org.apache.gravitino.catalog.jdbc.JdbcTable; +import org.apache.gravitino.catalog.jdbc.converter.JdbcExceptionConverter; +import org.apache.gravitino.catalog.jdbc.converter.JdbcTypeConverter; +import org.apache.gravitino.catalog.jdbc.operation.JdbcTablePartitionOperations; +import org.apache.gravitino.exceptions.GravitinoRuntimeException; +import org.apache.gravitino.exceptions.NoSuchPartitionException; +import org.apache.gravitino.exceptions.PartitionAlreadyExistsException; +import org.apache.gravitino.rel.expressions.literals.Literal; +import org.apache.gravitino.rel.expressions.literals.Literals; +import org.apache.gravitino.rel.expressions.transforms.Transform; +import org.apache.gravitino.rel.expressions.transforms.Transforms; +import org.apache.gravitino.rel.partitions.ListPartition; +import org.apache.gravitino.rel.partitions.Partition; +import org.apache.gravitino.rel.partitions.Partitions; +import org.apache.gravitino.rel.partitions.RangePartition; +import org.apache.gravitino.rel.types.Type; + +public final class DorisTablePartitionOperations extends JdbcTablePartitionOperations { + private static final String PARTITION_TYPE_VALUE_PATTERN_STRING = + "types: \\[([^\\]]+)\\]; keys: \\[([^\\]]+)\\];"; + private static final Pattern PARTITION_TYPE_VALUE_PATTERN = + Pattern.compile(PARTITION_TYPE_VALUE_PATTERN_STRING); + + private final JdbcExceptionConverter exceptionConverter; + private final JdbcTypeConverter typeConverter; + + public DorisTablePartitionOperations( + DataSource dataSource, + JdbcTable loadedTable, + JdbcExceptionConverter exceptionConverter, + JdbcTypeConverter typeConverter) { + super(dataSource, loadedTable); + checkArgument(exceptionConverter != null, "exceptionConverter is null"); + checkArgument(typeConverter != null, "typeConverter is null"); + this.exceptionConverter = exceptionConverter; + this.typeConverter = typeConverter; + } + + @Override + public String[] listPartitionNames() { + try (Connection connection = getConnection(loadedTable.databaseName())) { + String showPartitionsSql = String.format("SHOW PARTITIONS FROM `%s`", loadedTable.name()); + try (Statement statement = connection.createStatement(); + ResultSet result = statement.executeQuery(showPartitionsSql)) { + ImmutableList.Builder<String> partitionNames = ImmutableList.builder(); + while (result.next()) { + partitionNames.add(result.getString("PartitionName")); + } + return partitionNames.build().stream().toArray(String[]::new); + } + } catch (SQLException e) { + throw exceptionConverter.toGravitinoException(e); + } + } + + @Override + public Partition[] listPartitions() { + try (Connection connection = getConnection(loadedTable.databaseName())) { + Transform partitionInfo = loadedTable.partitioning()[0]; + Map<String, Type> columnTypes = getColumnType(connection); + String showPartitionsSql = String.format("SHOW PARTITIONS FROM `%s`", loadedTable.name()); + try (Statement statement = connection.createStatement(); + ResultSet result = statement.executeQuery(showPartitionsSql)) { + ImmutableList.Builder<Partition> partitions = ImmutableList.builder(); + while (result.next()) { + partitions.add(fromDorisPartition(result, partitionInfo, columnTypes)); + } + return partitions.build().stream().toArray(Partition[]::new); + } + } catch (SQLException e) { + throw exceptionConverter.toGravitinoException(e); + } + } + + @Override + public Partition getPartition(String partitionName) throws NoSuchPartitionException { + try (Connection connection = getConnection(loadedTable.databaseName())) { + Transform partitionInfo = loadedTable.partitioning()[0]; + Map<String, Type> columnTypes = getColumnType(connection); + String showPartitionsSql = + String.format( + "SHOW PARTITIONS FROM `%s` WHERE PartitionName = \"%s\"", + loadedTable.name(), partitionName); + try (Statement statement = connection.createStatement(); + ResultSet result = statement.executeQuery(showPartitionsSql)) { + while (result.next()) { + return fromDorisPartition(result, partitionInfo, columnTypes); Review Comment: should use `if` ? ########## catalogs/catalog-jdbc-doris/src/main/java/org/apache/gravitino/catalog/doris/operation/DorisTablePartitionOperations.java: ########## @@ -0,0 +1,334 @@ +/* + * 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.doris.operation; + +import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.DATA_SIZE; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.ID; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.IS_IN_MEMORY; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.KEY; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.NAME; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.STATE; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.VALUES_RANGE; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.VISIBLE_VERSION; +import static org.apache.gravitino.catalog.doris.DorisTablePartitionPropertiesMetadata.VISIBLE_VERSION_TIME; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import javax.sql.DataSource; +import org.apache.gravitino.catalog.jdbc.JdbcTable; +import org.apache.gravitino.catalog.jdbc.converter.JdbcExceptionConverter; +import org.apache.gravitino.catalog.jdbc.converter.JdbcTypeConverter; +import org.apache.gravitino.catalog.jdbc.operation.JdbcTablePartitionOperations; +import org.apache.gravitino.exceptions.GravitinoRuntimeException; +import org.apache.gravitino.exceptions.NoSuchPartitionException; +import org.apache.gravitino.exceptions.PartitionAlreadyExistsException; +import org.apache.gravitino.rel.expressions.literals.Literal; +import org.apache.gravitino.rel.expressions.literals.Literals; +import org.apache.gravitino.rel.expressions.transforms.Transform; +import org.apache.gravitino.rel.expressions.transforms.Transforms; +import org.apache.gravitino.rel.partitions.ListPartition; +import org.apache.gravitino.rel.partitions.Partition; +import org.apache.gravitino.rel.partitions.Partitions; +import org.apache.gravitino.rel.partitions.RangePartition; +import org.apache.gravitino.rel.types.Type; + +public final class DorisTablePartitionOperations extends JdbcTablePartitionOperations { + private static final String PARTITION_TYPE_VALUE_PATTERN_STRING = + "types: \\[([^\\]]+)\\]; keys: \\[([^\\]]+)\\];"; + private static final Pattern PARTITION_TYPE_VALUE_PATTERN = + Pattern.compile(PARTITION_TYPE_VALUE_PATTERN_STRING); + + private final JdbcExceptionConverter exceptionConverter; + private final JdbcTypeConverter typeConverter; + + public DorisTablePartitionOperations( + DataSource dataSource, + JdbcTable loadedTable, + JdbcExceptionConverter exceptionConverter, + JdbcTypeConverter typeConverter) { + super(dataSource, loadedTable); + checkArgument(exceptionConverter != null, "exceptionConverter is null"); + checkArgument(typeConverter != null, "typeConverter is null"); + this.exceptionConverter = exceptionConverter; + this.typeConverter = typeConverter; + } + + @Override + public String[] listPartitionNames() { + try (Connection connection = getConnection(loadedTable.databaseName())) { + String showPartitionsSql = String.format("SHOW PARTITIONS FROM `%s`", loadedTable.name()); + try (Statement statement = connection.createStatement(); + ResultSet result = statement.executeQuery(showPartitionsSql)) { + ImmutableList.Builder<String> partitionNames = ImmutableList.builder(); + while (result.next()) { + partitionNames.add(result.getString("PartitionName")); + } + return partitionNames.build().stream().toArray(String[]::new); + } + } catch (SQLException e) { + throw exceptionConverter.toGravitinoException(e); + } + } + + @Override + public Partition[] listPartitions() { + try (Connection connection = getConnection(loadedTable.databaseName())) { + Transform partitionInfo = loadedTable.partitioning()[0]; + Map<String, Type> columnTypes = getColumnType(connection); + String showPartitionsSql = String.format("SHOW PARTITIONS FROM `%s`", loadedTable.name()); + try (Statement statement = connection.createStatement(); + ResultSet result = statement.executeQuery(showPartitionsSql)) { + ImmutableList.Builder<Partition> partitions = ImmutableList.builder(); + while (result.next()) { + partitions.add(fromDorisPartition(result, partitionInfo, columnTypes)); + } + return partitions.build().stream().toArray(Partition[]::new); + } + } catch (SQLException e) { + throw exceptionConverter.toGravitinoException(e); + } + } + + @Override + public Partition getPartition(String partitionName) throws NoSuchPartitionException { + try (Connection connection = getConnection(loadedTable.databaseName())) { + Transform partitionInfo = loadedTable.partitioning()[0]; + Map<String, Type> columnTypes = getColumnType(connection); + String showPartitionsSql = + String.format( + "SHOW PARTITIONS FROM `%s` WHERE PartitionName = \"%s\"", + loadedTable.name(), partitionName); + try (Statement statement = connection.createStatement(); + ResultSet result = statement.executeQuery(showPartitionsSql)) { + while (result.next()) { + return fromDorisPartition(result, partitionInfo, columnTypes); + } + } + } catch (SQLException e) { + throw exceptionConverter.toGravitinoException(e); + } + throw new NoSuchPartitionException("Partition %s does not exist", partitionName); + } + + @Override + public Partition addPartition(Partition partition) throws PartitionAlreadyExistsException { + try (Connection connection = getConnection(loadedTable.databaseName())) { + Transform partitionInfo = loadedTable.partitioning()[0]; + + String addPartitionSqlFormat = "ALTER TABLE `%s` ADD PARTITION `%s` VALUES %s"; + String partitionValues; + Partition added; + + if (partition instanceof RangePartition) { + Preconditions.checkArgument( + partitionInfo instanceof Transforms.RangeTransform, + "Table %s is partitioned by list, but trying to add a range partition", Review Comment: This error message doesn't seem very accurate. How do we know that this table is partitioned by list? It can be changed to: `Table %s is a non-range-partitioned table, but trying to add a range partition` -- 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
