SourabhBadhya commented on code in PR #5076: URL: https://github.com/apache/hive/pull/5076#discussion_r1505587606
########## iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/IcebergStorageHandlerMergeProperties.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.iceberg.mr.hive; + +import java.util.Properties; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat; +import org.apache.hadoop.hive.ql.io.avro.AvroContainerOutputFormat; +import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat; +import org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat; +import org.apache.hadoop.hive.ql.io.orc.OrcSerde; +import org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat; +import org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat; +import org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe; +import org.apache.hadoop.hive.ql.plan.StorageHandlerMergeProperties; +import org.apache.hadoop.hive.serde2.avro.AvroSerDe; +import org.apache.iceberg.FileFormat; +import org.apache.iceberg.TableProperties; +import org.apache.iceberg.mr.Catalogs; + +public class IcebergStorageHandlerMergeProperties implements StorageHandlerMergeProperties { + + private final Properties properties; + + IcebergStorageHandlerMergeProperties(Properties properties) { + this.properties = properties; + } + + public Path getTmpLocation() { + String location = properties.getProperty(Catalogs.LOCATION); + return new Path(location + "/data/"); + } + + public String getInputFileFormatClassName() { + FileFormat fileFormat = FileFormat.fromString(properties.getProperty(TableProperties.DEFAULT_FILE_FORMAT)); + if (fileFormat == FileFormat.ORC) { + return OrcInputFormat.class.getName(); + } else if (fileFormat == FileFormat.PARQUET) { + return MapredParquetInputFormat.class.getName(); + } else if (fileFormat == FileFormat.AVRO) { + return AvroContainerInputFormat.class.getName(); + } + return null; + } + + public String getOutputFileFormatClassName() { + FileFormat fileFormat = FileFormat.fromString(properties.getProperty(TableProperties.DEFAULT_FILE_FORMAT)); + if (fileFormat == FileFormat.ORC) { + return OrcOutputFormat.class.getName(); + } else if (fileFormat == FileFormat.PARQUET) { + return MapredParquetOutputFormat.class.getName(); + } else if (fileFormat == FileFormat.AVRO) { + return AvroContainerOutputFormat.class.getName(); + } + return null; + } + + public String getFileSerdeClassName() { + FileFormat fileFormat = FileFormat.fromString(properties.getProperty(TableProperties.DEFAULT_FILE_FORMAT)); + if (fileFormat == FileFormat.ORC) { + return OrcSerde.class.getName(); + } else if (fileFormat == FileFormat.PARQUET) { + return ParquetHiveSerDe.class.getName(); + } else if (fileFormat == FileFormat.AVRO) { + return AvroSerDe.class.getName(); + } + return null; + } Review Comment: Replaced with existing StorageFormatDescriptor. Done. ########## ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverMergeFiles.java: ########## @@ -527,4 +593,20 @@ private Map<FileStatus, List<FileStatus>> getManifestDirs(FileSystem inpFs, List } return manifestDirsToPaths; } + + private void setMergePropertiesToPartDesc(PartitionDesc partitionDesc, + StorageHandlerMergeProperties mergeProperties) throws ClassNotFoundException{ + String inputFileFormatClassName = mergeProperties.getInputFileFormatClassName(); + String outputFileFormatClassName = mergeProperties.getOutputFileFormatClassName(); + String serdeClassName = mergeProperties.getFileSerdeClassName(); Review Comment: Added a null check. -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
