Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor Hudi code cleanup #17991

Merged
merged 5 commits into from
Jun 21, 2023
Merged

Minor Hudi code cleanup #17991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81a6bce
Remove unused HudiMetadata.log field
findepi Jun 19, 2023
395eb83
Remove unused TestingTable.tableType from Hudi tests
findepi Jun 21, 2023
b0f6be6
Mark constant fields as such in HudiTableMetaClient
findepi Jun 19, 2023
7c77959
Remove dead code in HudiTableMetaClient
findepi Jun 19, 2023
efbd47f
Remove redundant suppression
findepi Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/HiveUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ public static Optional<CompressionCodec> getCompressionCodec(TextInputFormat inp
}
}

@SuppressWarnings({"unchecked", "RedundantCast"})
@SuppressWarnings("unchecked")
private static Class<? extends InputFormat<?, ?>> getInputFormatClass(JobConf conf, String inputFormatName)
throws ClassNotFoundException
{
Expand Down
4 changes: 3 additions & 1 deletion plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ public enum HudiErrorCode
HUDI_CURSOR_ERROR(6, EXTERNAL),
HUDI_FILESYSTEM_ERROR(7, EXTERNAL),
HUDI_PARTITION_NOT_FOUND(8, EXTERNAL),
HUDI_UNSUPPORTED_TABLE_TYPE(9, EXTERNAL);
// HUDI_UNSUPPORTED_TABLE_TYPE(9, EXTERNAL), // Unused. Could be mistaken with HUDI_UNKNOWN_TABLE_TYPE.

/**/;

private final ErrorCode errorCode;

Expand Down
3 changes: 0 additions & 3 deletions plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import io.airlift.log.Logger;
import io.trino.filesystem.Location;
import io.trino.filesystem.TrinoFileSystemFactory;
import io.trino.plugin.base.classloader.ClassLoaderSafeSystemTable;
Expand Down Expand Up @@ -72,8 +71,6 @@
public class HudiMetadata
implements ConnectorMetadata
{
public static final Logger log = Logger.get(HudiMetadata.class);

private final HiveMetastore metastore;
private final TrinoFileSystemFactory fileSystemFactory;
private final TypeManager typeManager;
Expand Down
13 changes: 5 additions & 8 deletions plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/table/HudiTableMetaClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import io.trino.plugin.hudi.timeline.HudiTimeline;
import io.trino.plugin.hudi.timeline.TimelineLayout;
import io.trino.plugin.hudi.timeline.TimelineLayoutVersion;
import io.trino.spi.TrinoException;

import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -36,9 +35,7 @@
import java.util.stream.Stream;

import static com.google.common.base.Preconditions.checkArgument;
import static io.trino.plugin.hudi.HudiErrorCode.HUDI_UNSUPPORTED_TABLE_TYPE;
import static io.trino.plugin.hudi.HudiUtil.isHudiTable;
import static java.lang.String.format;
import static java.util.Objects.requireNonNull;

public class HudiTableMetaClient
Expand All @@ -50,11 +47,12 @@ public class HudiTableMetaClient

private final Location metaPath;
private final Location basePath;
private HudiTableType tableType;
private TimelineLayoutVersion timelineLayoutVersion;
private HudiTableConfig tableConfig;
private final HudiTableType tableType;
private final TimelineLayoutVersion timelineLayoutVersion;
private final HudiTableConfig tableConfig;
private final TrinoFileSystem fileSystem;

private HudiActiveTimeline activeTimeline;
private TrinoFileSystem fileSystem;

protected HudiTableMetaClient(
TrinoFileSystem fileSystem,
Expand Down Expand Up @@ -99,7 +97,6 @@ public HudiTimeline getCommitsTimeline()
// Include commit action to be able to start doing a MOR over a COW table - no
// migration required
getActiveTimeline().getCommitsTimeline();
default -> throw new TrinoException(HUDI_UNSUPPORTED_TABLE_TYPE, format("Unsupported table type : %s", this.getTableType()));
};
}

Expand Down
23 changes: 6 additions & 17 deletions .../trino-hudi/src/test/java/io/trino/plugin/hudi/testing/ResourceHudiTablesInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import io.trino.plugin.hive.metastore.Table;
import io.trino.testing.QueryRunner;
import org.apache.hadoop.hive.metastore.TableType;
import org.apache.hudi.common.model.HoodieTableType;

import java.io.File;
import java.io.IOException;
Expand All @@ -51,8 +50,6 @@
import static io.trino.plugin.hive.HiveType.HIVE_INT;
import static io.trino.plugin.hive.HiveType.HIVE_LONG;
import static io.trino.plugin.hive.HiveType.HIVE_STRING;
import static org.apache.hudi.common.model.HoodieTableType.COPY_ON_WRITE;
import static org.apache.hudi.common.model.HoodieTableType.MERGE_ON_READ;

public class ResourceHudiTablesInitializer
implements HudiTablesInitializer
Expand Down Expand Up @@ -152,10 +149,10 @@ private static void copyDir(Path srcDir, Path dstDir)

public enum TestingTable
{
HUDI_NON_PART_COW(COPY_ON_WRITE, nonPartitionRegularColumns()),
HUDI_COW_PT_TBL(COPY_ON_WRITE, multiPartitionRegularColumns(), multiPartitionColumns(), multiPartitions()),
STOCK_TICKS_COW(COPY_ON_WRITE, stockTicksRegularColumns(), stockTicksPartitionColumns(), stockTicksPartitions()),
STOCK_TICKS_MOR(MERGE_ON_READ, stockTicksRegularColumns(), stockTicksPartitionColumns(), stockTicksPartitions()),
HUDI_NON_PART_COW(nonPartitionRegularColumns()),
HUDI_COW_PT_TBL(multiPartitionRegularColumns(), multiPartitionColumns(), multiPartitions()),
STOCK_TICKS_COW(stockTicksRegularColumns(), stockTicksPartitionColumns(), stockTicksPartitions()),
STOCK_TICKS_MOR(stockTicksRegularColumns(), stockTicksPartitionColumns(), stockTicksPartitions()),
/**/;

private static final List<Column> HUDI_META_COLUMNS = ImmutableList.of(
Expand All @@ -165,38 +162,30 @@ public enum TestingTable
new Column("_hoodie_partition_path", HIVE_STRING, Optional.empty()),
new Column("_hoodie_file_name", HIVE_STRING, Optional.empty()));

private final HoodieTableType tableType;
private final List<Column> regularColumns;
private final List<Column> partitionColumns;
private final Map<String, String> partitions;

TestingTable(
HoodieTableType tableType,
List<Column> regularColumns,
List<Column> partitionColumns,
Map<String, String> partitions)
{
this.tableType = tableType;
this.regularColumns = regularColumns;
this.partitionColumns = partitionColumns;
this.partitions = partitions;
}

TestingTable(HoodieTableType tableType, List<Column> regularColumns)
TestingTable(List<Column> regularColumns)
{
this(tableType, regularColumns, ImmutableList.of(), ImmutableMap.of());
this(regularColumns, ImmutableList.of(), ImmutableMap.of());
}

public String getTableName()
{
return name().toLowerCase(Locale.ROOT);
}

public HoodieTableType getTableType()
{
return tableType;
}

public List<Column> getDataColumns()
{
return Stream.of(HUDI_META_COLUMNS, regularColumns)
Expand Down