lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

[MINOR] remove unused generics type (#2163)

Browse Source
This commit is contained in:
dugenkui
2020-10-12 09:38:42 +08:00
committed by GitHub
parent 2126f13e13
commit b58daf29ba
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/commit/AbstractMergeHelper.java
View File

@@ -94,7 +94,7 @@ public abstract class AbstractMergeHelper<T extends HoodieRecordPayload, I, K, O
Schema readSchema, boolean externalSchemaTransformation) throws IOException { Schema readSchema, boolean externalSchemaTransformation) throws IOException {
Path externalFilePath = new Path(baseFile.getBootstrapBaseFile().get().getPath()); Path externalFilePath = new Path(baseFile.getBootstrapBaseFile().get().getPath());
Configuration bootstrapFileConfig = new Configuration(table.getHadoopConf()); Configuration bootstrapFileConfig = new Configuration(table.getHadoopConf());
HoodieFileReader<GenericRecord> bootstrapReader = HoodieFileReaderFactory.<T, GenericRecord>getFileReader(bootstrapFileConfig, externalFilePath); HoodieFileReader<GenericRecord> bootstrapReader = HoodieFileReaderFactory.<GenericRecord>getFileReader(bootstrapFileConfig, externalFilePath);
Schema bootstrapReadSchema; Schema bootstrapReadSchema;
if (externalSchemaTransformation) { if (externalSchemaTransformation) {
bootstrapReadSchema = bootstrapReader.getSchema(); bootstrapReadSchema = bootstrapReader.getSchema();

2
hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/commit/SparkMergeHelper.java
View File

@@ -76,7 +76,7 @@ public class SparkMergeHelper<T extends HoodieRecordPayload> extends AbstractMer
} }
BoundedInMemoryExecutor<GenericRecord, GenericRecord, Void> wrapper = null; BoundedInMemoryExecutor<GenericRecord, GenericRecord, Void> wrapper = null;
HoodieFileReader<GenericRecord> reader = HoodieFileReaderFactory.<T, GenericRecord>getFileReader(cfgForHoodieFile, mergeHandle.getOldFilePath()); HoodieFileReader<GenericRecord> reader = HoodieFileReaderFactory.<GenericRecord>getFileReader(cfgForHoodieFile, mergeHandle.getOldFilePath());
try { try {
final Iterator<GenericRecord> readerIterator; final Iterator<GenericRecord> readerIterator;
if (baseFile.getBootstrapBaseFile().isPresent()) { if (baseFile.getBootstrapBaseFile().isPresent()) {

10
hudi-common/src/main/java/org/apache/hudi/io/storage/HoodieFileReaderFactory.java
View File

@@ -19,7 +19,6 @@
package org.apache.hudi.io.storage; package org.apache.hudi.io.storage;
import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.fs.FSUtils;
import org.apache.hudi.common.model.HoodieRecordPayload;
import org.apache.avro.generic.IndexedRecord; import org.apache.avro.generic.IndexedRecord;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
@@ -33,8 +32,7 @@ import static org.apache.hudi.common.model.HoodieFileFormat.HFILE;
public class HoodieFileReaderFactory { public class HoodieFileReaderFactory {
public static <T extends HoodieRecordPayload, R extends IndexedRecord> HoodieFileReader<R> getFileReader( public static <R extends IndexedRecord> HoodieFileReader<R> getFileReader(Configuration conf, Path path) throws IOException {
Configuration conf, Path path) throws IOException {
final String extension = FSUtils.getFileExtension(path.toString()); final String extension = FSUtils.getFileExtension(path.toString());
if (PARQUET.getFileExtension().equals(extension)) { if (PARQUET.getFileExtension().equals(extension)) {
return newParquetFileReader(conf, path); return newParquetFileReader(conf, path);
@@ -46,13 +44,11 @@ public class HoodieFileReaderFactory {
throw new UnsupportedOperationException(extension + " format not supported yet."); throw new UnsupportedOperationException(extension + " format not supported yet.");
} }
private static <T extends HoodieRecordPayload, R extends IndexedRecord> HoodieFileReader<R> newParquetFileReader( private static <R extends IndexedRecord> HoodieFileReader<R> newParquetFileReader(Configuration conf, Path path) {
Configuration conf, Path path) throws IOException {
return new HoodieParquetReader<>(conf, path); return new HoodieParquetReader<>(conf, path);
} }
private static <T extends HoodieRecordPayload, R extends IndexedRecord> HoodieFileReader<R> newHFileFileReader( private static <R extends IndexedRecord> HoodieFileReader<R> newHFileFileReader(Configuration conf, Path path) throws IOException {
Configuration conf, Path path) throws IOException {
CacheConfig cacheConfig = new CacheConfig(conf); CacheConfig cacheConfig = new CacheConfig(conf);
return new HoodieHFileReader<>(conf, path, cacheConfig); return new HoodieHFileReader<>(conf, path, cacheConfig);
} }