diff --git a/LICENSE b/LICENSE index ed8458a0d..dc4edaaf3 100644 --- a/LICENSE +++ b/LICENSE @@ -286,9 +286,9 @@ SOFTWARE. This product includes code from Apache Hadoop -* org.apache.hudi.common.bloom.filter.InternalDynamicBloomFilter.java adapted from org.apache.hadoop.util.bloom.DynamicBloomFilter.java +* org.apache.hudi.common.bloom.InternalDynamicBloomFilter.java adapted from org.apache.hadoop.util.bloom.DynamicBloomFilter.java -* org.apache.hudi.common.bloom.filter.InternalFilter copied from classes in org.apache.hadoop.util.bloom package +* org.apache.hudi.common.bloom.InternalFilter copied from classes in org.apache.hadoop.util.bloom package with the following license diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/HoodieCLI.java b/hudi-cli/src/main/java/org/apache/hudi/cli/HoodieCLI.java index af68035cb..e2d5c1349 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/HoodieCLI.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/HoodieCLI.java @@ -20,10 +20,10 @@ package org.apache.hudi.cli; import org.apache.hudi.cli.utils.SparkTempViewProvider; import org.apache.hudi.cli.utils.TempViewProvider; -import org.apache.hudi.common.model.TimelineLayoutVersion; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.ConsistencyGuardConfig; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.ConsistencyGuardConfig; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hadoop.conf.Configuration; diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/ArchivedCommitsCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/ArchivedCommitsCommand.java index f45550484..2d35ca577 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/ArchivedCommitsCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/ArchivedCommitsCommand.java @@ -24,11 +24,11 @@ import org.apache.hudi.cli.HoodieCLI; import org.apache.hudi.cli.HoodiePrintHelper; import org.apache.hudi.cli.TableHeader; import org.apache.hudi.common.model.HoodieLogFile; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.log.HoodieLogFormat; import org.apache.hudi.common.table.log.HoodieLogFormat.Reader; import org.apache.hudi.common.table.log.block.HoodieAvroDataBlock; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.avro.generic.GenericRecord; import org.apache.avro.generic.IndexedRecord; diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CleansCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CleansCommand.java index facbcede1..154e11a98 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CleansCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CleansCommand.java @@ -26,10 +26,10 @@ import org.apache.hudi.cli.TableHeader; import org.apache.hudi.cli.utils.InputStreamConsumer; import org.apache.hudi.cli.utils.SparkUtil; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.AvroUtils; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; import org.apache.hudi.utilities.UtilHelpers; import org.apache.spark.launcher.SparkLauncher; import org.apache.spark.util.Utils; @@ -68,7 +68,7 @@ public class CleansCommand implements CommandMarker { List rows = new ArrayList<>(); for (HoodieInstant clean : cleans) { HoodieCleanMetadata cleanMetadata = - AvroUtils.deserializeHoodieCleanMetadata(timeline.getInstantDetails(clean).get()); + TimelineMetadataUtils.deserializeHoodieCleanMetadata(timeline.getInstantDetails(clean).get()); rows.add(new Comparable[]{clean.getTimestamp(), cleanMetadata.getEarliestCommitToRetain(), cleanMetadata.getTotalFilesDeleted(), cleanMetadata.getTimeTakenInMillis()}); } @@ -103,7 +103,7 @@ public class CleansCommand implements CommandMarker { } HoodieCleanMetadata cleanMetadata = - AvroUtils.deserializeHoodieCleanMetadata(timeline.getInstantDetails(cleanInstant).get()); + TimelineMetadataUtils.deserializeHoodieCleanMetadata(timeline.getInstantDetails(cleanInstant).get()); List rows = new ArrayList<>(); for (Map.Entry entry : cleanMetadata.getPartitionMetadata().entrySet()) { String path = entry.getKey(); diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CommitsCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CommitsCommand.java index 45c84257c..28e83e5b3 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CommitsCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CommitsCommand.java @@ -27,7 +27,7 @@ import org.apache.hudi.cli.utils.SparkUtil; import org.apache.hudi.common.model.HoodieCommitMetadata; import org.apache.hudi.common.model.HoodieWriteStat; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieArchivedTimeline; import org.apache.hudi.common.table.timeline.HoodieDefaultTimeline; diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CompactionCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CompactionCommand.java index 57ea71ebc..064422f0d 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CompactionCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CompactionCommand.java @@ -31,12 +31,12 @@ import org.apache.hudi.cli.utils.InputStreamConsumer; import org.apache.hudi.cli.utils.SparkUtil; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieArchivedTimeline; import org.apache.hudi.common.table.timeline.HoodieDefaultTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.AvroUtils; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.StringUtils; import org.apache.hudi.common.util.collection.Pair; @@ -119,7 +119,7 @@ public class CompactionCommand implements CommandMarker { throws Exception { HoodieTableMetaClient client = checkAndGetMetaClient(); HoodieActiveTimeline activeTimeline = client.getActiveTimeline(); - HoodieCompactionPlan compactionPlan = AvroUtils.deserializeCompactionPlan( + HoodieCompactionPlan compactionPlan = TimelineMetadataUtils.deserializeCompactionPlan( activeTimeline.readCompactionPlanAsBytes( HoodieTimeline.getCompactionRequestedInstant(compactionInstantTime)).get()); @@ -179,7 +179,7 @@ public class CompactionCommand implements CommandMarker { String endTs = CommitUtil.addHours(compactionInstantTime, 1); try { archivedTimeline.loadInstantDetailsInMemory(startTs, endTs); - HoodieCompactionPlan compactionPlan = AvroUtils.deserializeCompactionPlan( + HoodieCompactionPlan compactionPlan = TimelineMetadataUtils.deserializeCompactionPlan( archivedTimeline.getInstantDetails(instant).get()); return printCompaction(compactionPlan, sortByField, descending, limit, headerOnly); } finally { @@ -330,7 +330,7 @@ public class CompactionCommand implements CommandMarker { return null; } else { try { - return AvroUtils.deserializeCompactionPlan(archivedTimeline.getInstantDetails(instant).get()); + return TimelineMetadataUtils.deserializeCompactionPlan(archivedTimeline.getInstantDetails(instant).get()); } catch (IOException e) { throw new HoodieIOException(e.getMessage(), e); } @@ -346,7 +346,7 @@ public class CompactionCommand implements CommandMarker { if (!HoodieTimeline.COMPACTION_ACTION.equals(instant.getAction())) { try { // This could be a completed compaction. Assume a compaction request file is present but skip if fails - return AvroUtils.deserializeCompactionPlan( + return TimelineMetadataUtils.deserializeCompactionPlan( activeTimeline.readCompactionPlanAsBytes( HoodieTimeline.getCompactionRequestedInstant(instant.getTimestamp())).get()); } catch (HoodieIOException ioe) { @@ -354,7 +354,7 @@ public class CompactionCommand implements CommandMarker { return null; } } else { - return AvroUtils.deserializeCompactionPlan(activeTimeline.readCompactionPlanAsBytes( + return TimelineMetadataUtils.deserializeCompactionPlan(activeTimeline.readCompactionPlanAsBytes( HoodieTimeline.getCompactionRequestedInstant(instant.getTimestamp())).get()); } } catch (IOException e) { diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/FileSystemViewCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/FileSystemViewCommand.java index 93607c37b..456ddf383 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/FileSystemViewCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/FileSystemViewCommand.java @@ -24,7 +24,7 @@ import org.apache.hudi.cli.TableHeader; import org.apache.hudi.common.model.FileSlice; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieDefaultTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.view.HoodieTableFileSystemView; diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieSyncCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieSyncCommand.java index 5346b98d6..72a974af1 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieSyncCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieSyncCommand.java @@ -22,7 +22,7 @@ import org.apache.hudi.cli.HoodieCLI; import org.apache.hudi.cli.utils.CommitUtil; import org.apache.hudi.cli.utils.HiveUtil; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.exception.HoodieException; diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/RepairsCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/RepairsCommand.java index 83af13cd8..cda44323a 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/RepairsCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/RepairsCommand.java @@ -25,7 +25,7 @@ import org.apache.hudi.cli.utils.SparkUtil; import org.apache.hudi.common.model.HoodiePartitionMetadata; import org.apache.hudi.common.table.HoodieTableConfig; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hadoop.fs.Path; import org.apache.spark.launcher.SparkLauncher; diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/RollbacksCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/RollbacksCommand.java index 3993714f1..98bdceb29 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/RollbacksCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/RollbacksCommand.java @@ -23,11 +23,11 @@ import org.apache.hudi.cli.HoodieCLI; import org.apache.hudi.cli.HoodiePrintHelper; import org.apache.hudi.cli.TableHeader; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; -import org.apache.hudi.common.util.AvroUtils; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; import org.apache.hudi.common.util.CollectionUtils; import org.apache.hudi.common.util.collection.Pair; @@ -42,7 +42,7 @@ import java.util.HashMap; import java.util.List; import java.util.stream.Stream; -import static org.apache.hudi.common.table.HoodieTimeline.ROLLBACK_ACTION; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.ROLLBACK_ACTION; /** * CLI command to display rollback options. @@ -64,7 +64,7 @@ public class RollbacksCommand implements CommandMarker { final List rows = new ArrayList<>(); rollback.getInstants().forEach(instant -> { try { - HoodieRollbackMetadata metadata = AvroUtils + HoodieRollbackMetadata metadata = TimelineMetadataUtils .deserializeAvroMetadata(activeTimeline.getInstantDetails(instant).get(), HoodieRollbackMetadata.class); metadata.getCommitsRollback().forEach(c -> { Comparable[] row = new Comparable[5]; @@ -96,7 +96,7 @@ public class RollbacksCommand implements CommandMarker { throws IOException { HoodieActiveTimeline activeTimeline = new RollbackTimeline(HoodieCLI.getTableMetaClient()); final List rows = new ArrayList<>(); - HoodieRollbackMetadata metadata = AvroUtils.deserializeAvroMetadata( + HoodieRollbackMetadata metadata = TimelineMetadataUtils.deserializeAvroMetadata( activeTimeline.getInstantDetails(new HoodieInstant(State.COMPLETED, ROLLBACK_ACTION, rollbackInstant)).get(), HoodieRollbackMetadata.class); metadata.getPartitionMetadata().forEach((key, value) -> Stream diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/SavepointsCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/SavepointsCommand.java index 82c3edf20..fa11f722e 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/SavepointsCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/SavepointsCommand.java @@ -24,7 +24,7 @@ import org.apache.hudi.cli.HoodiePrintHelper; import org.apache.hudi.cli.utils.InputStreamConsumer; import org.apache.hudi.cli.utils.SparkUtil; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.config.HoodieIndexConfig; diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/SparkMain.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/SparkMain.java index b67181e2f..12dbf6140 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/SparkMain.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/SparkMain.java @@ -21,7 +21,7 @@ package org.apache.hudi.cli.commands; import org.apache.hudi.client.HoodieWriteClient; import org.apache.hudi.cli.DedupeSparkJob; import org.apache.hudi.cli.utils.SparkUtil; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.StringUtils; import org.apache.hudi.config.HoodieIndexConfig; import org.apache.hudi.config.HoodieWriteConfig; diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/StatsCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/StatsCommand.java index eba9e9cb6..995890031 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/StatsCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/StatsCommand.java @@ -22,10 +22,10 @@ import org.apache.hudi.cli.HoodieCLI; import org.apache.hudi.cli.HoodiePrintHelper; import org.apache.hudi.cli.TableHeader; import org.apache.hudi.common.model.HoodieCommitMetadata; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.NumericUtils; import com.codahale.metrics.Histogram; diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/TableCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/TableCommand.java index 9dcd5c9eb..14cefbf52 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/TableCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/TableCommand.java @@ -23,7 +23,7 @@ import org.apache.hudi.cli.HoodiePrintHelper; import org.apache.hudi.cli.TableHeader; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.ConsistencyGuardConfig; +import org.apache.hudi.common.fs.ConsistencyGuardConfig; import org.apache.hudi.exception.TableNotFoundException; import org.springframework.shell.core.CommandMarker; diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/utils/CommitUtil.java b/hudi-cli/src/main/java/org/apache/hudi/cli/utils/CommitUtil.java index 60d3e3e73..55933e0b7 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/utils/CommitUtil.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/utils/CommitUtil.java @@ -20,7 +20,7 @@ package org.apache.hudi.cli.utils; import org.apache.hudi.common.model.HoodieCommitMetadata; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/utils/SparkUtil.java b/hudi-cli/src/main/java/org/apache/hudi/cli/utils/SparkUtil.java index 80696d98e..2248d47f6 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/utils/SparkUtil.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/utils/SparkUtil.java @@ -21,7 +21,7 @@ package org.apache.hudi.cli.utils; import org.apache.hudi.client.HoodieWriteClient; import org.apache.hudi.cli.commands.SparkEnvCommand; import org.apache.hudi.cli.commands.SparkMain; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.StringUtils; import org.apache.spark.SparkConf; diff --git a/hudi-cli/src/main/scala/org/apache/hudi/cli/DedupeSparkJob.scala b/hudi-cli/src/main/scala/org/apache/hudi/cli/DedupeSparkJob.scala index 71a7988ff..5f4974c86 100644 --- a/hudi-cli/src/main/scala/org/apache/hudi/cli/DedupeSparkJob.scala +++ b/hudi-cli/src/main/scala/org/apache/hudi/cli/DedupeSparkJob.scala @@ -20,10 +20,10 @@ package org.apache.hudi.cli import java.util.stream.Collectors import org.apache.hadoop.fs.{FileSystem, FileUtil, Path} +import org.apache.hudi.common.fs.FSUtils import org.apache.hudi.common.model.{HoodieBaseFile, HoodieRecord} import org.apache.hudi.common.table.HoodieTableMetaClient import org.apache.hudi.common.table.view.HoodieTableFileSystemView -import org.apache.hudi.common.util.FSUtils import org.apache.hudi.exception.HoodieException import org.apache.log4j.Logger import org.apache.spark.sql.{DataFrame, SQLContext} diff --git a/hudi-cli/src/main/scala/org/apache/hudi/cli/SparkHelpers.scala b/hudi-cli/src/main/scala/org/apache/hudi/cli/SparkHelpers.scala index 6fdac1ce8..a229a15ce 100644 --- a/hudi-cli/src/main/scala/org/apache/hudi/cli/SparkHelpers.scala +++ b/hudi-cli/src/main/scala/org/apache/hudi/cli/SparkHelpers.scala @@ -24,7 +24,7 @@ import org.apache.hadoop.fs.{FileSystem, Path} import org.apache.hudi.avro.HoodieAvroWriteSupport import org.apache.hudi.client.SparkTaskContextSupplier import org.apache.hudi.common.HoodieJsonPayload -import org.apache.hudi.common.bloom.filter.{BloomFilter, BloomFilterFactory} +import org.apache.hudi.common.bloom.{BloomFilter, BloomFilterFactory} import org.apache.hudi.common.model.HoodieRecord import org.apache.hudi.common.util.ParquetUtils import org.apache.hudi.config.{HoodieIndexConfig, HoodieStorageConfig} diff --git a/hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestArchivedCommitsCommand.java b/hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestArchivedCommitsCommand.java index 7ccc3c81a..03e64b8fd 100644 --- a/hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestArchivedCommitsCommand.java +++ b/hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestArchivedCommitsCommand.java @@ -26,7 +26,7 @@ import org.apache.hudi.cli.common.HoodieTestCommitMetadataGenerator; import org.apache.hudi.cli.common.HoodieTestCommitUtilities; import org.apache.hudi.common.model.HoodieCommitMetadata; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieWriteConfig; diff --git a/hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestTableCommand.java b/hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestTableCommand.java index a4f023f1e..a7b9488ee 100644 --- a/hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestTableCommand.java +++ b/hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestTableCommand.java @@ -22,7 +22,7 @@ import org.apache.hudi.cli.AbstractShellIntegrationTest; import org.apache.hudi.cli.HoodieCLI; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.ConsistencyGuardConfig; +import org.apache.hudi.common.fs.ConsistencyGuardConfig; import org.junit.Before; import org.junit.Test; import org.springframework.shell.core.CommandResult; diff --git a/hudi-cli/src/test/java/org/apache/hudi/cli/common/HoodieTestCommitMetadataGenerator.java b/hudi-cli/src/test/java/org/apache/hudi/cli/common/HoodieTestCommitMetadataGenerator.java index 27454effd..385fb510d 100644 --- a/hudi-cli/src/test/java/org/apache/hudi/cli/common/HoodieTestCommitMetadataGenerator.java +++ b/hudi-cli/src/test/java/org/apache/hudi/cli/common/HoodieTestCommitMetadataGenerator.java @@ -27,9 +27,9 @@ import org.apache.hudi.common.model.HoodieCommitMetadata; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.model.HoodieWriteStat; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.util.CollectionUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.exception.HoodieIOException; import java.io.IOException; diff --git a/hudi-client/src/main/java/org/apache/hudi/client/AbstractHoodieClient.java b/hudi-client/src/main/java/org/apache/hudi/client/AbstractHoodieClient.java index 0a47554b9..f186c074c 100644 --- a/hudi-client/src/main/java/org/apache/hudi/client/AbstractHoodieClient.java +++ b/hudi-client/src/main/java/org/apache/hudi/client/AbstractHoodieClient.java @@ -21,7 +21,7 @@ package org.apache.hudi.client; import org.apache.hudi.client.embedded.EmbeddedTimelineService; import org.apache.hudi.client.utils.ClientUtils; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.config.HoodieWriteConfig; diff --git a/hudi-client/src/main/java/org/apache/hudi/client/AbstractHoodieWriteClient.java b/hudi-client/src/main/java/org/apache/hudi/client/AbstractHoodieWriteClient.java index d1319b3ee..b4378ac40 100644 --- a/hudi-client/src/main/java/org/apache/hudi/client/AbstractHoodieWriteClient.java +++ b/hudi-client/src/main/java/org/apache/hudi/client/AbstractHoodieWriteClient.java @@ -31,12 +31,12 @@ import org.apache.hudi.common.model.HoodieRollingStatMetadata; import org.apache.hudi.common.model.HoodieWriteStat; import org.apache.hudi.common.model.WriteOperationType; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; -import org.apache.hudi.common.util.AvroUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.exception.HoodieCommitException; @@ -399,14 +399,14 @@ public abstract class AbstractHoodieWriteClient e durationInMs = Option.of(metrics.getDurationInMs(context.stop())); metrics.updateRollbackMetrics(durationInMs.get(), numFilesDeleted); } - HoodieRollbackMetadata rollbackMetadata = AvroUtils + HoodieRollbackMetadata rollbackMetadata = TimelineMetadataUtils .convertRollbackMetadata(startRollbackTime, durationInMs, commitsToRollback, rollbackStats); //TODO: varadarb - This will be fixed when Rollback transition mimics that of commit table.getActiveTimeline().createNewInstant(new HoodieInstant(State.INFLIGHT, HoodieTimeline.ROLLBACK_ACTION, startRollbackTime)); table.getActiveTimeline().saveAsComplete( new HoodieInstant(true, HoodieTimeline.ROLLBACK_ACTION, startRollbackTime), - AvroUtils.serializeRollbackMetadata(rollbackMetadata)); + TimelineMetadataUtils.serializeRollbackMetadata(rollbackMetadata)); LOG.info("Rollback of Commits " + commitsToRollback + " is complete"); if (!table.getActiveTimeline().getCleanerTimeline().empty()) { diff --git a/hudi-client/src/main/java/org/apache/hudi/client/CompactionAdminClient.java b/hudi-client/src/main/java/org/apache/hudi/client/CompactionAdminClient.java index 7d2d664a7..46abc3c79 100644 --- a/hudi-client/src/main/java/org/apache/hudi/client/CompactionAdminClient.java +++ b/hudi-client/src/main/java/org/apache/hudi/client/CompactionAdminClient.java @@ -27,14 +27,14 @@ import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodieFileGroupId; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.log.HoodieLogFormat; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; import org.apache.hudi.common.table.view.HoodieTableFileSystemView; -import org.apache.hudi.common.util.AvroUtils; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; import org.apache.hudi.common.util.CompactionUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.common.util.collection.Pair; @@ -58,7 +58,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import static org.apache.hudi.common.table.HoodieTimeline.COMPACTION_ACTION; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.COMPACTION_ACTION; /** * Client to perform admin operations related to compaction. @@ -182,7 +182,7 @@ public class CompactionAdminClient extends AbstractHoodieClient { // Overwrite compaction plan with updated info metaClient.getActiveTimeline().saveToCompactionRequested( new HoodieInstant(State.REQUESTED, COMPACTION_ACTION, compactionOperationWithInstant.getLeft()), - AvroUtils.serializeCompactionPlan(newPlan), true); + TimelineMetadataUtils.serializeCompactionPlan(newPlan), true); } return res; } @@ -219,7 +219,7 @@ public class CompactionAdminClient extends AbstractHoodieClient { */ private static HoodieCompactionPlan getCompactionPlan(HoodieTableMetaClient metaClient, String compactionInstant) throws IOException { - return AvroUtils.deserializeCompactionPlan( + return TimelineMetadataUtils.deserializeCompactionPlan( metaClient.getActiveTimeline().readCompactionPlanAsBytes( HoodieTimeline.getCompactionRequestedInstant(compactionInstant)).get()); } diff --git a/hudi-client/src/main/java/org/apache/hudi/client/HoodieCleanClient.java b/hudi-client/src/main/java/org/apache/hudi/client/HoodieCleanClient.java index 15ba2a7db..7ce6b9877 100644 --- a/hudi-client/src/main/java/org/apache/hudi/client/HoodieCleanClient.java +++ b/hudi-client/src/main/java/org/apache/hudi/client/HoodieCleanClient.java @@ -24,11 +24,11 @@ import org.apache.hudi.client.embedded.EmbeddedTimelineService; import org.apache.hudi.common.HoodieCleanStat; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; -import org.apache.hudi.common.util.AvroUtils; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; import org.apache.hudi.common.util.CleanerUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; @@ -119,7 +119,7 @@ public class HoodieCleanClient extends AbstractHo HoodieInstant cleanInstant = new HoodieInstant(State.REQUESTED, HoodieTimeline.CLEAN_ACTION, startCleanTime); // Save to both aux and timeline folder try { - table.getActiveTimeline().saveToCleanRequested(cleanInstant, AvroUtils.serializeCleanerPlan(cleanerPlan)); + table.getActiveTimeline().saveToCleanRequested(cleanInstant, TimelineMetadataUtils.serializeCleanerPlan(cleanerPlan)); LOG.info("Requesting Cleaning with instant time " + cleanInstant); } catch (IOException e) { LOG.error("Got exception when saving cleaner requested file", e); @@ -157,7 +157,7 @@ public class HoodieCleanClient extends AbstractHo if (!cleanInstant.isInflight()) { // Mark as inflight first cleanInstant = table.getActiveTimeline().transitionCleanRequestedToInflight(cleanInstant, - AvroUtils.serializeCleanerPlan(cleanerPlan)); + TimelineMetadataUtils.serializeCleanerPlan(cleanerPlan)); } List cleanStats = table.clean(jsc, cleanInstant, cleanerPlan); @@ -182,7 +182,7 @@ public class HoodieCleanClient extends AbstractHo table.getActiveTimeline().transitionCleanInflightToComplete( new HoodieInstant(true, HoodieTimeline.CLEAN_ACTION, cleanInstant.getTimestamp()), - AvroUtils.serializeCleanMetadata(metadata)); + TimelineMetadataUtils.serializeCleanMetadata(metadata)); LOG.info("Marked clean started on " + cleanInstant.getTimestamp() + " as complete"); return metadata; } catch (IOException e) { diff --git a/hudi-client/src/main/java/org/apache/hudi/client/HoodieWriteClient.java b/hudi-client/src/main/java/org/apache/hudi/client/HoodieWriteClient.java index d654bc8a2..f5d14cdf5 100644 --- a/hudi-client/src/main/java/org/apache/hudi/client/HoodieWriteClient.java +++ b/hudi-client/src/main/java/org/apache/hudi/client/HoodieWriteClient.java @@ -35,14 +35,14 @@ import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.HoodieWriteStat; import org.apache.hudi.common.model.WriteOperationType; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.TableFileSystemView.BaseFileOnlyView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; +import org.apache.hudi.common.table.view.TableFileSystemView.BaseFileOnlyView; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; -import org.apache.hudi.common.util.AvroUtils; import org.apache.hudi.common.util.CompactionUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.config.HoodieCompactionConfig; @@ -581,7 +581,7 @@ public class HoodieWriteClient extends AbstractHo // Check the last commit that was not cleaned and check if savepoint time is > that commit String lastCommitRetained; if (cleanInstant.isPresent()) { - HoodieCleanMetadata cleanMetadata = AvroUtils + HoodieCleanMetadata cleanMetadata = TimelineMetadataUtils .deserializeHoodieCleanMetadata(table.getActiveTimeline().getInstantDetails(cleanInstant.get()).get()); lastCommitRetained = cleanMetadata.getEarliestCommitToRetain(); } else { @@ -605,13 +605,13 @@ public class HoodieWriteClient extends AbstractHo return new Tuple2<>(partitionPath, latestFiles); }).collectAsMap(); - HoodieSavepointMetadata metadata = AvroUtils.convertSavepointMetadata(user, comment, latestFilesMap); + HoodieSavepointMetadata metadata = TimelineMetadataUtils.convertSavepointMetadata(user, comment, latestFilesMap); // Nothing to save in the savepoint table.getActiveTimeline().createNewInstant( new HoodieInstant(true, HoodieTimeline.SAVEPOINT_ACTION, instantTime)); table.getActiveTimeline() .saveAsComplete(new HoodieInstant(true, HoodieTimeline.SAVEPOINT_ACTION, instantTime), - AvroUtils.serializeSavepointMetadata(metadata)); + TimelineMetadataUtils.serializeSavepointMetadata(metadata)); LOG.info("Savepoint " + instantTime + " created"); return true; } catch (IOException e) { @@ -799,9 +799,9 @@ public class HoodieWriteClient extends AbstractHo metrics.updateRollbackMetrics(durationInMs.get(), numFilesDeleted); } HoodieRestoreMetadata restoreMetadata = - AvroUtils.convertRestoreMetadata(startRestoreTime, durationInMs, commitsToRollback, commitToStats); + TimelineMetadataUtils.convertRestoreMetadata(startRestoreTime, durationInMs, commitsToRollback, commitToStats); table.getActiveTimeline().saveAsComplete(new HoodieInstant(true, HoodieTimeline.RESTORE_ACTION, startRestoreTime), - AvroUtils.serializeRestoreMetadata(restoreMetadata)); + TimelineMetadataUtils.serializeRestoreMetadata(restoreMetadata)); LOG.info("Commits " + commitsToRollback + " rollback is complete. Restored table to " + restoreToInstant); if (!table.getActiveTimeline().getCleanerTimeline().empty()) { @@ -930,7 +930,7 @@ public class HoodieWriteClient extends AbstractHo HoodieInstant compactionInstant = new HoodieInstant(State.REQUESTED, HoodieTimeline.COMPACTION_ACTION, instantTime); metaClient.getActiveTimeline().saveToCompactionRequested(compactionInstant, - AvroUtils.serializeCompactionPlan(workload)); + TimelineMetadataUtils.serializeCompactionPlan(workload)); return true; } return false; @@ -958,7 +958,7 @@ public class HoodieWriteClient extends AbstractHo HoodieTableMetaClient metaClient = createMetaClient(true); HoodieTable table = HoodieTable.getHoodieTable(metaClient, config, jsc); HoodieActiveTimeline timeline = metaClient.getActiveTimeline(); - HoodieCompactionPlan compactionPlan = AvroUtils.deserializeCompactionPlan( + HoodieCompactionPlan compactionPlan = TimelineMetadataUtils.deserializeCompactionPlan( timeline.readCompactionPlanAsBytes(HoodieTimeline.getCompactionRequestedInstant(compactionInstantTime)).get()); // Merge extra meta-data passed by user with the one already in inflight compaction Option> mergedMetaData = extraMetadata.map(m -> { diff --git a/hudi-client/src/main/java/org/apache/hudi/client/embedded/EmbeddedTimelineService.java b/hudi-client/src/main/java/org/apache/hudi/client/embedded/EmbeddedTimelineService.java index 5afee3fd4..d8b671b9d 100644 --- a/hudi-client/src/main/java/org/apache/hudi/client/embedded/EmbeddedTimelineService.java +++ b/hudi-client/src/main/java/org/apache/hudi/client/embedded/EmbeddedTimelineService.java @@ -18,7 +18,7 @@ package org.apache.hudi.client.embedded; -import org.apache.hudi.common.SerializableConfiguration; +import org.apache.hudi.common.config.SerializableConfiguration; import org.apache.hudi.common.table.view.FileSystemViewManager; import org.apache.hudi.common.table.view.FileSystemViewStorageConfig; import org.apache.hudi.common.table.view.FileSystemViewStorageType; diff --git a/hudi-client/src/main/java/org/apache/hudi/client/utils/ClientUtils.java b/hudi-client/src/main/java/org/apache/hudi/client/utils/ClientUtils.java index 11790e10a..c8c5c9f1e 100644 --- a/hudi-client/src/main/java/org/apache/hudi/client/utils/ClientUtils.java +++ b/hudi-client/src/main/java/org/apache/hudi/client/utils/ClientUtils.java @@ -18,7 +18,7 @@ package org.apache.hudi.client.utils; -import org.apache.hudi.common.model.TimelineLayoutVersion; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; import org.apache.hudi.common.table.HoodieTableMetaClient; import org.apache.hudi.common.util.Option; import org.apache.hudi.config.HoodieWriteConfig; diff --git a/hudi-client/src/main/java/org/apache/hudi/config/HoodieCompactionConfig.java b/hudi-client/src/main/java/org/apache/hudi/config/HoodieCompactionConfig.java index a7275c8f3..910c04c52 100644 --- a/hudi-client/src/main/java/org/apache/hudi/config/HoodieCompactionConfig.java +++ b/hudi-client/src/main/java/org/apache/hudi/config/HoodieCompactionConfig.java @@ -18,6 +18,7 @@ package org.apache.hudi.config; +import org.apache.hudi.common.config.DefaultHoodieConfig; import org.apache.hudi.common.model.HoodieCleaningPolicy; import org.apache.hudi.common.model.OverwriteWithLatestAvroPayload; import org.apache.hudi.common.util.ValidationUtils; diff --git a/hudi-client/src/main/java/org/apache/hudi/config/HoodieHBaseIndexConfig.java b/hudi-client/src/main/java/org/apache/hudi/config/HoodieHBaseIndexConfig.java index 714aca409..68ada2219 100644 --- a/hudi-client/src/main/java/org/apache/hudi/config/HoodieHBaseIndexConfig.java +++ b/hudi-client/src/main/java/org/apache/hudi/config/HoodieHBaseIndexConfig.java @@ -18,6 +18,7 @@ package org.apache.hudi.config; +import org.apache.hudi.common.config.DefaultHoodieConfig; import org.apache.hudi.index.hbase.DefaultHBaseQPSResourceAllocator; import java.io.File; diff --git a/hudi-client/src/main/java/org/apache/hudi/config/HoodieIndexConfig.java b/hudi-client/src/main/java/org/apache/hudi/config/HoodieIndexConfig.java index 00c7605b1..df2177e36 100644 --- a/hudi-client/src/main/java/org/apache/hudi/config/HoodieIndexConfig.java +++ b/hudi-client/src/main/java/org/apache/hudi/config/HoodieIndexConfig.java @@ -18,7 +18,8 @@ package org.apache.hudi.config; -import org.apache.hudi.common.bloom.filter.BloomFilterTypeCode; +import org.apache.hudi.common.bloom.BloomFilterTypeCode; +import org.apache.hudi.common.config.DefaultHoodieConfig; import org.apache.hudi.index.HoodieIndex; import javax.annotation.concurrent.Immutable; diff --git a/hudi-client/src/main/java/org/apache/hudi/config/HoodieMemoryConfig.java b/hudi-client/src/main/java/org/apache/hudi/config/HoodieMemoryConfig.java index 8f0f5e8e0..3105fcd13 100644 --- a/hudi-client/src/main/java/org/apache/hudi/config/HoodieMemoryConfig.java +++ b/hudi-client/src/main/java/org/apache/hudi/config/HoodieMemoryConfig.java @@ -18,6 +18,8 @@ package org.apache.hudi.config; +import org.apache.hudi.common.config.DefaultHoodieConfig; + import javax.annotation.concurrent.Immutable; import java.io.File; diff --git a/hudi-client/src/main/java/org/apache/hudi/config/HoodieMetricsConfig.java b/hudi-client/src/main/java/org/apache/hudi/config/HoodieMetricsConfig.java index b17e935ee..4792d6f07 100644 --- a/hudi-client/src/main/java/org/apache/hudi/config/HoodieMetricsConfig.java +++ b/hudi-client/src/main/java/org/apache/hudi/config/HoodieMetricsConfig.java @@ -18,6 +18,7 @@ package org.apache.hudi.config; +import org.apache.hudi.common.config.DefaultHoodieConfig; import org.apache.hudi.metrics.MetricsReporterType; import javax.annotation.concurrent.Immutable; diff --git a/hudi-client/src/main/java/org/apache/hudi/config/HoodieStorageConfig.java b/hudi-client/src/main/java/org/apache/hudi/config/HoodieStorageConfig.java index 5ae221a3a..ac8857f3e 100644 --- a/hudi-client/src/main/java/org/apache/hudi/config/HoodieStorageConfig.java +++ b/hudi-client/src/main/java/org/apache/hudi/config/HoodieStorageConfig.java @@ -18,6 +18,8 @@ package org.apache.hudi.config; +import org.apache.hudi.common.config.DefaultHoodieConfig; + import javax.annotation.concurrent.Immutable; import java.io.File; diff --git a/hudi-client/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java b/hudi-client/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java index e63601f84..2494acc52 100644 --- a/hudi-client/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java +++ b/hudi-client/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java @@ -20,10 +20,11 @@ package org.apache.hudi.config; import org.apache.hudi.client.HoodieWriteClient; import org.apache.hudi.client.WriteStatus; +import org.apache.hudi.common.config.DefaultHoodieConfig; import org.apache.hudi.common.model.HoodieCleaningPolicy; -import org.apache.hudi.common.model.TimelineLayoutVersion; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; import org.apache.hudi.common.table.view.FileSystemViewStorageConfig; -import org.apache.hudi.common.util.ConsistencyGuardConfig; +import org.apache.hudi.common.fs.ConsistencyGuardConfig; import org.apache.hudi.common.util.ReflectionUtils; import org.apache.hudi.index.HoodieIndex; import org.apache.hudi.table.compact.strategy.CompactionStrategy; diff --git a/hudi-client/src/main/java/org/apache/hudi/index/bloom/HoodieGlobalBloomIndex.java b/hudi-client/src/main/java/org/apache/hudi/index/bloom/HoodieGlobalBloomIndex.java index 3c6cc7298..d1e5bac81 100644 --- a/hudi-client/src/main/java/org/apache/hudi/index/bloom/HoodieGlobalBloomIndex.java +++ b/hudi-client/src/main/java/org/apache/hudi/index/bloom/HoodieGlobalBloomIndex.java @@ -24,7 +24,7 @@ import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordLocation; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-client/src/main/java/org/apache/hudi/index/hbase/HBaseIndex.java b/hudi-client/src/main/java/org/apache/hudi/index/hbase/HBaseIndex.java index 89ed64d97..e19c6efab 100644 --- a/hudi-client/src/main/java/org/apache/hudi/index/hbase/HBaseIndex.java +++ b/hudi-client/src/main/java/org/apache/hudi/index/hbase/HBaseIndex.java @@ -25,7 +25,7 @@ import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordLocation; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ReflectionUtils; diff --git a/hudi-client/src/main/java/org/apache/hudi/io/HoodieAppendHandle.java b/hudi-client/src/main/java/org/apache/hudi/io/HoodieAppendHandle.java index 0c0873443..bf3925f1f 100644 --- a/hudi-client/src/main/java/org/apache/hudi/io/HoodieAppendHandle.java +++ b/hudi-client/src/main/java/org/apache/hudi/io/HoodieAppendHandle.java @@ -30,15 +30,15 @@ import org.apache.hudi.common.model.HoodieRecordLocation; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.model.HoodieWriteStat; import org.apache.hudi.common.model.HoodieWriteStat.RuntimeStats; -import org.apache.hudi.common.table.TableFileSystemView.SliceView; +import org.apache.hudi.common.table.view.TableFileSystemView.SliceView; import org.apache.hudi.common.table.log.HoodieLogFormat; import org.apache.hudi.common.table.log.HoodieLogFormat.Writer; import org.apache.hudi.common.table.log.block.HoodieAvroDataBlock; import org.apache.hudi.common.table.log.block.HoodieDeleteBlock; import org.apache.hudi.common.table.log.block.HoodieLogBlock; import org.apache.hudi.common.table.log.block.HoodieLogBlock.HeaderMetadataType; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.exception.HoodieAppendException; diff --git a/hudi-client/src/main/java/org/apache/hudi/io/HoodieCreateHandle.java b/hudi-client/src/main/java/org/apache/hudi/io/HoodieCreateHandle.java index dd8bdac24..d667356be 100644 --- a/hudi-client/src/main/java/org/apache/hudi/io/HoodieCreateHandle.java +++ b/hudi-client/src/main/java/org/apache/hudi/io/HoodieCreateHandle.java @@ -26,7 +26,7 @@ import org.apache.hudi.common.model.HoodieRecordLocation; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.model.HoodieWriteStat; import org.apache.hudi.common.model.HoodieWriteStat.RuntimeStats; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.exception.HoodieInsertException; diff --git a/hudi-client/src/main/java/org/apache/hudi/io/HoodieKeyLookupHandle.java b/hudi-client/src/main/java/org/apache/hudi/io/HoodieKeyLookupHandle.java index 69ed578e5..02f351e59 100644 --- a/hudi-client/src/main/java/org/apache/hudi/io/HoodieKeyLookupHandle.java +++ b/hudi-client/src/main/java/org/apache/hudi/io/HoodieKeyLookupHandle.java @@ -18,7 +18,7 @@ package org.apache.hudi.io; -import org.apache.hudi.common.bloom.filter.BloomFilter; +import org.apache.hudi.common.bloom.BloomFilter; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.model.HoodieTableType; diff --git a/hudi-client/src/main/java/org/apache/hudi/io/HoodieMergeHandle.java b/hudi-client/src/main/java/org/apache/hudi/io/HoodieMergeHandle.java index 5b95cd0fa..98dae314d 100644 --- a/hudi-client/src/main/java/org/apache/hudi/io/HoodieMergeHandle.java +++ b/hudi-client/src/main/java/org/apache/hudi/io/HoodieMergeHandle.java @@ -29,8 +29,8 @@ import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.model.HoodieWriteStat; import org.apache.hudi.common.model.HoodieWriteStat.RuntimeStats; import org.apache.hudi.common.util.DefaultSizeEstimator; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.HoodieRecordSizeEstimator; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.ExternalSpillableMap; diff --git a/hudi-client/src/main/java/org/apache/hudi/io/HoodieWriteHandle.java b/hudi-client/src/main/java/org/apache/hudi/io/HoodieWriteHandle.java index dd67a6ac1..f8f6eafd7 100644 --- a/hudi-client/src/main/java/org/apache/hudi/io/HoodieWriteHandle.java +++ b/hudi-client/src/main/java/org/apache/hudi/io/HoodieWriteHandle.java @@ -22,8 +22,8 @@ import org.apache.hudi.client.SparkTaskContextSupplier; import org.apache.hudi.client.WriteStatus; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordPayload; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.HoodieTimer; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ReflectionUtils; diff --git a/hudi-client/src/main/java/org/apache/hudi/io/storage/HoodieParquetWriter.java b/hudi-client/src/main/java/org/apache/hudi/io/storage/HoodieParquetWriter.java index 473a8062f..98f31598d 100644 --- a/hudi-client/src/main/java/org/apache/hudi/io/storage/HoodieParquetWriter.java +++ b/hudi-client/src/main/java/org/apache/hudi/io/storage/HoodieParquetWriter.java @@ -20,11 +20,11 @@ package org.apache.hudi.io.storage; import org.apache.hudi.avro.HoodieAvroWriteSupport; import org.apache.hudi.client.SparkTaskContextSupplier; -import org.apache.hudi.common.io.storage.HoodieWrapperFileSystem; +import org.apache.hudi.common.fs.HoodieWrapperFileSystem; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordPayload; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; diff --git a/hudi-client/src/main/java/org/apache/hudi/io/storage/HoodieStorageWriterFactory.java b/hudi-client/src/main/java/org/apache/hudi/io/storage/HoodieStorageWriterFactory.java index 09f8ba936..a98f1b6ec 100644 --- a/hudi-client/src/main/java/org/apache/hudi/io/storage/HoodieStorageWriterFactory.java +++ b/hudi-client/src/main/java/org/apache/hudi/io/storage/HoodieStorageWriterFactory.java @@ -20,10 +20,10 @@ package org.apache.hudi.io.storage; import org.apache.hudi.avro.HoodieAvroWriteSupport; import org.apache.hudi.client.SparkTaskContextSupplier; -import org.apache.hudi.common.bloom.filter.BloomFilter; -import org.apache.hudi.common.bloom.filter.BloomFilterFactory; +import org.apache.hudi.common.bloom.BloomFilter; +import org.apache.hudi.common.bloom.BloomFilterFactory; import org.apache.hudi.common.model.HoodieRecordPayload; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.table.HoodieTable; diff --git a/hudi-client/src/main/java/org/apache/hudi/metrics/HoodieMetrics.java b/hudi-client/src/main/java/org/apache/hudi/metrics/HoodieMetrics.java index 4b2b48b01..292039b83 100644 --- a/hudi-client/src/main/java/org/apache/hudi/metrics/HoodieMetrics.java +++ b/hudi-client/src/main/java/org/apache/hudi/metrics/HoodieMetrics.java @@ -19,7 +19,7 @@ package org.apache.hudi.metrics; import org.apache.hudi.common.model.HoodieCommitMetadata; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.config.HoodieWriteConfig; import com.codahale.metrics.Timer; diff --git a/hudi-client/src/main/java/org/apache/hudi/table/CleanHelper.java b/hudi-client/src/main/java/org/apache/hudi/table/CleanHelper.java index b9f586d8e..a62a16dec 100644 --- a/hudi-client/src/main/java/org/apache/hudi/table/CleanHelper.java +++ b/hudi-client/src/main/java/org/apache/hudi/table/CleanHelper.java @@ -29,11 +29,11 @@ import org.apache.hudi.common.model.HoodieFileGroupId; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.model.HoodieTableType; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; +import org.apache.hudi.common.table.view.SyncableFileSystemView; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.AvroUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.config.HoodieWriteConfig; @@ -95,7 +95,7 @@ public class CleanHelper> implements Serializab Option lastClean = hoodieTable.getCleanTimeline().filterCompletedInstants().lastInstant(); if (lastClean.isPresent()) { - HoodieCleanMetadata cleanMetadata = AvroUtils + HoodieCleanMetadata cleanMetadata = TimelineMetadataUtils .deserializeHoodieCleanMetadata(hoodieTable.getActiveTimeline().getInstantDetails(lastClean.get()).get()); if ((cleanMetadata.getEarliestCommitToRetain() != null) && (cleanMetadata.getEarliestCommitToRetain().length() > 0)) { diff --git a/hudi-client/src/main/java/org/apache/hudi/table/HoodieCommitArchiveLog.java b/hudi-client/src/main/java/org/apache/hudi/table/HoodieCommitArchiveLog.java index a3a11a9db..8f6f8e946 100644 --- a/hudi-client/src/main/java/org/apache/hudi/table/HoodieCommitArchiveLog.java +++ b/hudi-client/src/main/java/org/apache/hudi/table/HoodieCommitArchiveLog.java @@ -27,7 +27,7 @@ import org.apache.hudi.common.model.HoodieArchivedLogFile; import org.apache.hudi.common.model.HoodieCommitMetadata; import org.apache.hudi.common.model.HoodieRollingStatMetadata; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.log.HoodieLogFormat; import org.apache.hudi.common.table.log.HoodieLogFormat.Writer; import org.apache.hudi.common.table.log.block.HoodieAvroDataBlock; @@ -36,7 +36,7 @@ import org.apache.hudi.common.table.log.block.HoodieLogBlock.HeaderMetadataType; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieArchivedTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.AvroUtils; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; import org.apache.hudi.common.util.CleanerUtils; import org.apache.hudi.common.util.CompactionUtils; import org.apache.hudi.common.util.Option; @@ -300,13 +300,13 @@ public class HoodieCommitArchiveLog { break; } case HoodieTimeline.ROLLBACK_ACTION: { - archivedMetaWrapper.setHoodieRollbackMetadata(AvroUtils.deserializeAvroMetadata( + archivedMetaWrapper.setHoodieRollbackMetadata(TimelineMetadataUtils.deserializeAvroMetadata( commitTimeline.getInstantDetails(hoodieInstant).get(), HoodieRollbackMetadata.class)); archivedMetaWrapper.setActionType(ActionType.rollback.name()); break; } case HoodieTimeline.SAVEPOINT_ACTION: { - archivedMetaWrapper.setHoodieSavePointMetadata(AvroUtils.deserializeAvroMetadata( + archivedMetaWrapper.setHoodieSavePointMetadata(TimelineMetadataUtils.deserializeAvroMetadata( commitTimeline.getInstantDetails(hoodieInstant).get(), HoodieSavepointMetadata.class)); archivedMetaWrapper.setActionType(ActionType.savepoint.name()); break; diff --git a/hudi-client/src/main/java/org/apache/hudi/table/HoodieCopyOnWriteTable.java b/hudi-client/src/main/java/org/apache/hudi/table/HoodieCopyOnWriteTable.java index 250bc51c8..10af05acf 100644 --- a/hudi-client/src/main/java/org/apache/hudi/table/HoodieCopyOnWriteTable.java +++ b/hudi-client/src/main/java/org/apache/hudi/table/HoodieCopyOnWriteTable.java @@ -32,11 +32,11 @@ import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordLocation; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.model.HoodieRollingStatMetadata; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.NumericUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.Pair; diff --git a/hudi-client/src/main/java/org/apache/hudi/table/HoodieMergeOnReadTable.java b/hudi-client/src/main/java/org/apache/hudi/table/HoodieMergeOnReadTable.java index 469038290..9e4198200 100644 --- a/hudi-client/src/main/java/org/apache/hudi/table/HoodieMergeOnReadTable.java +++ b/hudi-client/src/main/java/org/apache/hudi/table/HoodieMergeOnReadTable.java @@ -28,11 +28,11 @@ import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordLocation; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.model.HoodieWriteStat; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.view.SyncableFileSystemView; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.config.HoodieWriteConfig; diff --git a/hudi-client/src/main/java/org/apache/hudi/table/HoodieTable.java b/hudi-client/src/main/java/org/apache/hudi/table/HoodieTable.java index a05e28f2e..f715c65e3 100644 --- a/hudi-client/src/main/java/org/apache/hudi/table/HoodieTable.java +++ b/hudi-client/src/main/java/org/apache/hudi/table/HoodieTable.java @@ -26,25 +26,25 @@ import org.apache.hudi.avro.model.HoodieSavepointMetadata; import org.apache.hudi.client.utils.ClientUtils; import org.apache.hudi.common.HoodieCleanStat; import org.apache.hudi.common.HoodieRollbackStat; -import org.apache.hudi.common.SerializableConfiguration; +import org.apache.hudi.common.config.SerializableConfiguration; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.model.HoodieWriteStat; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; -import org.apache.hudi.common.table.TableFileSystemView; -import org.apache.hudi.common.table.TableFileSystemView.BaseFileOnlyView; -import org.apache.hudi.common.table.TableFileSystemView.SliceView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; +import org.apache.hudi.common.table.view.SyncableFileSystemView; +import org.apache.hudi.common.table.view.TableFileSystemView; +import org.apache.hudi.common.table.view.TableFileSystemView.BaseFileOnlyView; +import org.apache.hudi.common.table.view.TableFileSystemView.SliceView; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.view.FileSystemViewManager; import org.apache.hudi.common.table.view.HoodieTableFileSystemView; -import org.apache.hudi.common.util.AvroUtils; -import org.apache.hudi.common.util.ConsistencyGuard; -import org.apache.hudi.common.util.ConsistencyGuard.FileVisibility; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.FailSafeConsistencyGuard; +import org.apache.hudi.common.fs.ConsistencyGuard; +import org.apache.hudi.common.fs.ConsistencyGuard.FileVisibility; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.fs.FailSafeConsistencyGuard; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.exception.HoodieException; @@ -230,7 +230,7 @@ public abstract class HoodieTable implements Seri HoodieInstant instant = new HoodieInstant(false, HoodieTimeline.SAVEPOINT_ACTION, savepointTime); HoodieSavepointMetadata metadata; try { - metadata = AvroUtils.deserializeHoodieSavepointMetadata(getActiveTimeline().getInstantDetails(instant).get()); + metadata = TimelineMetadataUtils.deserializeHoodieSavepointMetadata(getActiveTimeline().getInstantDetails(instant).get()); } catch (IOException e) { throw new HoodieSavepointException("Could not get savepointed data files for savepoint " + savepointTime, e); } diff --git a/hudi-client/src/main/java/org/apache/hudi/table/compact/HoodieMergeOnReadTableCompactor.java b/hudi-client/src/main/java/org/apache/hudi/table/compact/HoodieMergeOnReadTableCompactor.java index 355f48575..b3a5986ab 100644 --- a/hudi-client/src/main/java/org/apache/hudi/table/compact/HoodieMergeOnReadTableCompactor.java +++ b/hudi-client/src/main/java/org/apache/hudi/table/compact/HoodieMergeOnReadTableCompactor.java @@ -29,13 +29,13 @@ import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.HoodieWriteStat.RuntimeStats; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.TableFileSystemView.SliceView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.view.TableFileSystemView.SliceView; import org.apache.hudi.common.table.log.HoodieMergedLogRecordScanner; import org.apache.hudi.common.util.CollectionUtils; import org.apache.hudi.common.util.CompactionUtils; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.common.util.collection.Pair; diff --git a/hudi-client/src/main/java/org/apache/hudi/table/compact/strategy/CompactionStrategy.java b/hudi-client/src/main/java/org/apache/hudi/table/compact/strategy/CompactionStrategy.java index 4b083f580..cfccba728 100644 --- a/hudi-client/src/main/java/org/apache/hudi/table/compact/strategy/CompactionStrategy.java +++ b/hudi-client/src/main/java/org/apache/hudi/table/compact/strategy/CompactionStrategy.java @@ -23,7 +23,7 @@ import org.apache.hudi.avro.model.HoodieCompactionPlan; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.util.CompactionUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.table.compact.HoodieMergeOnReadTableCompactor; diff --git a/hudi-client/src/main/java/org/apache/hudi/table/rollback/RollbackHelper.java b/hudi-client/src/main/java/org/apache/hudi/table/rollback/RollbackHelper.java index 120c00bf9..33559ce23 100644 --- a/hudi-client/src/main/java/org/apache/hudi/table/rollback/RollbackHelper.java +++ b/hudi-client/src/main/java/org/apache/hudi/table/rollback/RollbackHelper.java @@ -27,7 +27,7 @@ import org.apache.hudi.common.table.log.block.HoodieCommandBlock; import org.apache.hudi.common.table.log.block.HoodieCommandBlock.HoodieCommandBlockTypeEnum; import org.apache.hudi.common.table.log.block.HoodieLogBlock.HeaderMetadataType; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.exception.HoodieRollbackException; diff --git a/hudi-client/src/test/java/HoodieClientExample.java b/hudi-client/src/test/java/HoodieClientExample.java index 47eaab588..0e4191af1 100644 --- a/hudi-client/src/test/java/HoodieClientExample.java +++ b/hudi-client/src/test/java/HoodieClientExample.java @@ -25,7 +25,7 @@ import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieIndexConfig; diff --git a/hudi-client/src/test/java/org/apache/hudi/client/TestClientRollback.java b/hudi-client/src/test/java/org/apache/hudi/client/TestClientRollback.java index 28a47fd82..f226a9fbf 100644 --- a/hudi-client/src/test/java/org/apache/hudi/client/TestClientRollback.java +++ b/hudi-client/src/test/java/org/apache/hudi/client/TestClientRollback.java @@ -24,9 +24,9 @@ import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.TableFileSystemView.BaseFileOnlyView; +import org.apache.hudi.common.table.view.TableFileSystemView.BaseFileOnlyView; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieIndexConfig; import org.apache.hudi.config.HoodieWriteConfig; diff --git a/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieClientBase.java b/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieClientBase.java index b67435386..f93acce3e 100644 --- a/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieClientBase.java +++ b/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieClientBase.java @@ -27,14 +27,14 @@ import org.apache.hudi.common.model.EmptyHoodieRecordPayload; import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodiePartitionMetadata; import org.apache.hudi.common.model.HoodieRecord; -import org.apache.hudi.common.model.TimelineLayoutVersion; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.view.SyncableFileSystemView; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.view.FileSystemViewStorageConfig; import org.apache.hudi.common.table.view.FileSystemViewStorageType; -import org.apache.hudi.common.util.ConsistencyGuardConfig; +import org.apache.hudi.common.fs.ConsistencyGuardConfig; import org.apache.hudi.common.util.Option; import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieIndexConfig; diff --git a/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieClientOnCopyOnWriteStorage.java b/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieClientOnCopyOnWriteStorage.java index e29107737..280dbd1d7 100644 --- a/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieClientOnCopyOnWriteStorage.java +++ b/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieClientOnCopyOnWriteStorage.java @@ -27,14 +27,14 @@ import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRollingStat; import org.apache.hudi.common.model.HoodieRollingStatMetadata; import org.apache.hudi.common.model.HoodieTestUtils; -import org.apache.hudi.common.model.TimelineLayoutVersion; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.TableFileSystemView.BaseFileOnlyView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.view.TableFileSystemView.BaseFileOnlyView; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.ConsistencyGuardConfig; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.ConsistencyGuardConfig; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.FileIOUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ParquetUtils; @@ -70,7 +70,7 @@ import java.util.stream.Collectors; import static org.apache.hudi.common.HoodieTestDataGenerator.NULL_SCHEMA; import static org.apache.hudi.common.HoodieTestDataGenerator.TRIP_EXAMPLE_SCHEMA; -import static org.apache.hudi.common.model.TimelineLayoutVersion.VERSION_0; +import static org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion.VERSION_0; import static org.apache.hudi.common.util.ParquetUtils.readRowKeysFromParquet; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -397,7 +397,7 @@ public class TestHoodieClientOnCopyOnWriteStorage extends TestHoodieClientBase { * Write 1 (inserts and deletes) Write actual 200 insert records and ignore 100 delete records */ String newCommitTime = "001"; - List inserts1 = dataGen.generateInserts(newCommitTime, 10); + List inserts1 = dataGen.generateInserts(newCommitTime, 100); // Write 1 (only inserts) client.startCommitWithTime(newCommitTime); @@ -413,7 +413,7 @@ public class TestHoodieClientOnCopyOnWriteStorage extends TestHoodieClientBase { for (int i = 0; i < fullPartitionPaths.length; i++) { fullPartitionPaths[i] = String.format("%s/%s/*", basePath, dataGen.getPartitionPaths()[i]); } - assertEquals("Must contain " + 10 + " records", 10, + assertEquals("Must contain 100 records", 100, HoodieClientTestUtils.read(jsc, basePath, sqlContext, fs, fullPartitionPaths).count()); /** @@ -436,7 +436,7 @@ public class TestHoodieClientOnCopyOnWriteStorage extends TestHoodieClientBase { for (int i = 0; i < fullPartitionPaths.length; i++) { fullPartitionPaths[i] = String.format("%s/%s/*", basePath, dataGen.getPartitionPaths()[i]); } - assertEquals("Must contain " + 10 + " records", 10, + assertEquals("Must contain 100 records", 100, HoodieClientTestUtils.read(jsc, basePath, sqlContext, fs, fullPartitionPaths).count()); } diff --git a/hudi-client/src/test/java/org/apache/hudi/client/TestMultiFS.java b/hudi-client/src/test/java/org/apache/hudi/client/TestMultiFS.java index 9b70c10ae..9d849bdae 100644 --- a/hudi-client/src/test/java/org/apache/hudi/client/TestMultiFS.java +++ b/hudi-client/src/test/java/org/apache/hudi/client/TestMultiFS.java @@ -26,9 +26,9 @@ import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.config.HoodieIndexConfig; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.index.HoodieIndex; diff --git a/hudi-client/src/test/java/org/apache/hudi/client/TestUpdateSchemaEvolution.java b/hudi-client/src/test/java/org/apache/hudi/client/TestUpdateSchemaEvolution.java index 19919c713..5bc09526b 100644 --- a/hudi-client/src/test/java/org/apache/hudi/client/TestUpdateSchemaEvolution.java +++ b/hudi-client/src/test/java/org/apache/hudi/client/TestUpdateSchemaEvolution.java @@ -24,8 +24,8 @@ import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordLocation; import org.apache.hudi.common.model.HoodieTestUtils; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.FileIOUtils; import org.apache.hudi.common.util.ParquetUtils; import org.apache.hudi.config.HoodieWriteConfig; diff --git a/hudi-client/src/test/java/org/apache/hudi/common/HoodieClientTestHarness.java b/hudi-client/src/test/java/org/apache/hudi/common/HoodieClientTestHarness.java index c5c7d8248..2316a7e03 100644 --- a/hudi-client/src/test/java/org/apache/hudi/common/HoodieClientTestHarness.java +++ b/hudi-client/src/test/java/org/apache/hudi/common/HoodieClientTestHarness.java @@ -22,7 +22,7 @@ import org.apache.hudi.client.TestHoodieClientBase; import org.apache.hudi.common.minicluster.HdfsTestService; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/hudi-client/src/test/java/org/apache/hudi/common/HoodieClientTestUtils.java b/hudi-client/src/test/java/org/apache/hudi/common/HoodieClientTestUtils.java index b4601c299..6be9f51bd 100644 --- a/hudi-client/src/test/java/org/apache/hudi/common/HoodieClientTestUtils.java +++ b/hudi-client/src/test/java/org/apache/hudi/common/HoodieClientTestUtils.java @@ -22,21 +22,21 @@ import org.apache.hudi.client.HoodieReadClient; import org.apache.hudi.client.SparkTaskContextSupplier; import org.apache.hudi.client.WriteStatus; import org.apache.hudi.avro.HoodieAvroWriteSupport; -import org.apache.hudi.common.bloom.filter.BloomFilter; -import org.apache.hudi.common.bloom.filter.BloomFilterFactory; -import org.apache.hudi.common.bloom.filter.BloomFilterTypeCode; +import org.apache.hudi.common.bloom.BloomFilter; +import org.apache.hudi.common.bloom.BloomFilterFactory; +import org.apache.hudi.common.bloom.BloomFilterTypeCode; import org.apache.hudi.common.model.HoodieCommitMetadata; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.TableFileSystemView.BaseFileOnlyView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.view.TableFileSystemView.BaseFileOnlyView; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.view.HoodieTableFileSystemView; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.config.HoodieStorageConfig; import org.apache.hudi.exception.HoodieException; import org.apache.hudi.io.storage.HoodieParquetConfig; diff --git a/hudi-client/src/test/java/org/apache/hudi/common/HoodieMergeOnReadTestUtils.java b/hudi-client/src/test/java/org/apache/hudi/common/HoodieMergeOnReadTestUtils.java index b57a9c348..bdf500f22 100644 --- a/hudi-client/src/test/java/org/apache/hudi/common/HoodieMergeOnReadTestUtils.java +++ b/hudi-client/src/test/java/org/apache/hudi/common/HoodieMergeOnReadTestUtils.java @@ -19,7 +19,7 @@ package org.apache.hudi.common; import org.apache.hudi.common.model.HoodieTestUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.hadoop.realtime.HoodieParquetRealtimeInputFormat; import org.apache.avro.Schema; diff --git a/hudi-client/src/test/java/org/apache/hudi/common/HoodieTestDataGenerator.java b/hudi-client/src/test/java/org/apache/hudi/common/HoodieTestDataGenerator.java index 35a80900c..fcb52c7d8 100644 --- a/hudi-client/src/test/java/org/apache/hudi/common/HoodieTestDataGenerator.java +++ b/hudi-client/src/test/java/org/apache/hudi/common/HoodieTestDataGenerator.java @@ -25,11 +25,11 @@ import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodiePartitionMetadata; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.AvroUtils; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.exception.HoodieIOException; @@ -252,7 +252,7 @@ public class HoodieTestDataGenerator { try (FSDataOutputStream os = fs.create(commitFile, true)) { HoodieCompactionPlan workload = new HoodieCompactionPlan(); // Write empty commit metadata - os.writeBytes(new String(AvroUtils.serializeCompactionPlan(workload).get(), StandardCharsets.UTF_8)); + os.writeBytes(new String(TimelineMetadataUtils.serializeCompactionPlan(workload).get(), StandardCharsets.UTF_8)); } } diff --git a/hudi-client/src/test/java/org/apache/hudi/config/TestHoodieWriteConfig.java b/hudi-client/src/test/java/org/apache/hudi/common/config/TestHoodieWriteConfig.java similarity index 94% rename from hudi-client/src/test/java/org/apache/hudi/config/TestHoodieWriteConfig.java rename to hudi-client/src/test/java/org/apache/hudi/common/config/TestHoodieWriteConfig.java index 0d9c59d0a..3516a6a83 100644 --- a/hudi-client/src/test/java/org/apache/hudi/config/TestHoodieWriteConfig.java +++ b/hudi-client/src/test/java/org/apache/hudi/common/config/TestHoodieWriteConfig.java @@ -16,8 +16,10 @@ * limitations under the License. */ -package org.apache.hudi.config; +package org.apache.hudi.common.config; +import org.apache.hudi.config.HoodieCompactionConfig; +import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.config.HoodieWriteConfig.Builder; import org.junit.Test; diff --git a/hudi-client/src/test/java/org/apache/hudi/index/bloom/TestHoodieBloomIndex.java b/hudi-client/src/test/java/org/apache/hudi/index/bloom/TestHoodieBloomIndex.java index d29cfa47e..3dc63be8e 100644 --- a/hudi-client/src/test/java/org/apache/hudi/index/bloom/TestHoodieBloomIndex.java +++ b/hudi-client/src/test/java/org/apache/hudi/index/bloom/TestHoodieBloomIndex.java @@ -21,15 +21,15 @@ package org.apache.hudi.index.bloom; import org.apache.hudi.common.HoodieClientTestHarness; import org.apache.hudi.common.HoodieClientTestUtils; import org.apache.hudi.common.TestRawTripPayload; -import org.apache.hudi.common.bloom.filter.BloomFilter; -import org.apache.hudi.common.bloom.filter.BloomFilterFactory; -import org.apache.hudi.common.bloom.filter.BloomFilterTypeCode; +import org.apache.hudi.common.bloom.BloomFilter; +import org.apache.hudi.common.bloom.BloomFilterFactory; +import org.apache.hudi.common.bloom.BloomFilterTypeCode; import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.FileIOUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.config.HoodieIndexConfig; diff --git a/hudi-client/src/test/java/org/apache/hudi/index/bloom/TestHoodieGlobalBloomIndex.java b/hudi-client/src/test/java/org/apache/hudi/index/bloom/TestHoodieGlobalBloomIndex.java index 2e2121ec0..1ac2e5840 100644 --- a/hudi-client/src/test/java/org/apache/hudi/index/bloom/TestHoodieGlobalBloomIndex.java +++ b/hudi-client/src/test/java/org/apache/hudi/index/bloom/TestHoodieGlobalBloomIndex.java @@ -26,9 +26,9 @@ import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodiePartitionMetadata; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.FileIOUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.config.HoodieIndexConfig; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.table.HoodieTable; diff --git a/hudi-client/src/test/java/org/apache/hudi/io/TestHoodieCommitArchiveLog.java b/hudi-client/src/test/java/org/apache/hudi/io/TestHoodieCommitArchiveLog.java index 2969effed..360bd4978 100644 --- a/hudi-client/src/test/java/org/apache/hudi/io/TestHoodieCommitArchiveLog.java +++ b/hudi-client/src/test/java/org/apache/hudi/io/TestHoodieCommitArchiveLog.java @@ -24,7 +24,7 @@ import org.apache.hudi.common.model.HoodieCommitMetadata; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.model.WriteOperationType; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieArchivedTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; diff --git a/hudi-client/src/test/java/org/apache/hudi/io/TestHoodieMergeHandle.java b/hudi-client/src/test/java/org/apache/hudi/io/TestHoodieMergeHandle.java index 664f4b51a..f44376732 100644 --- a/hudi-client/src/test/java/org/apache/hudi/io/TestHoodieMergeHandle.java +++ b/hudi-client/src/test/java/org/apache/hudi/io/TestHoodieMergeHandle.java @@ -26,9 +26,9 @@ import org.apache.hudi.common.HoodieTestDataGenerator; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieWriteStat; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieIndexConfig; import org.apache.hudi.config.HoodieStorageConfig; diff --git a/hudi-client/src/test/java/org/apache/hudi/table/TestCleaner.java b/hudi-client/src/test/java/org/apache/hudi/table/TestCleaner.java index 8502872c8..fd361edb4 100644 --- a/hudi-client/src/test/java/org/apache/hudi/table/TestCleaner.java +++ b/hudi-client/src/test/java/org/apache/hudi/table/TestCleaner.java @@ -38,20 +38,20 @@ import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.model.HoodieWriteStat; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.TableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; +import org.apache.hudi.common.table.view.TableFileSystemView; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; -import org.apache.hudi.common.util.AvroUtils; import org.apache.hudi.common.util.CleanerUtils; import org.apache.hudi.common.util.CollectionUtils; import org.apache.hudi.common.util.CompactionUtils; -import org.apache.hudi.common.util.ConsistencyGuardConfig; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.ConsistencyGuardConfig; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.Pair; -import org.apache.hudi.common.versioning.clean.CleanMetadataMigrator; +import org.apache.hudi.common.table.timeline.versioning.clean.CleanMetadataMigrator; import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.index.HoodieIndex; @@ -229,7 +229,7 @@ public class TestCleaner extends TestHoodieClientBase { String compactionTime = instantTimes.get(0); table.getActiveTimeline().saveToCompactionRequested( new HoodieInstant(State.REQUESTED, HoodieTimeline.COMPACTION_ACTION, compactionTime), - AvroUtils.serializeCompactionPlan(compactionPlan)); + TimelineMetadataUtils.serializeCompactionPlan(compactionPlan)); instantTimes = instantTimes.subList(1, instantTimes.size()); // Keep doing some writes and clean inline. Make sure we have expected number of files diff --git a/hudi-client/src/test/java/org/apache/hudi/table/TestConsistencyGuard.java b/hudi-client/src/test/java/org/apache/hudi/table/TestConsistencyGuard.java index cc78a64fb..b32c01a22 100644 --- a/hudi-client/src/test/java/org/apache/hudi/table/TestConsistencyGuard.java +++ b/hudi-client/src/test/java/org/apache/hudi/table/TestConsistencyGuard.java @@ -20,9 +20,9 @@ package org.apache.hudi.table; import org.apache.hudi.common.HoodieClientTestHarness; import org.apache.hudi.common.HoodieClientTestUtils; -import org.apache.hudi.common.util.ConsistencyGuard; -import org.apache.hudi.common.util.ConsistencyGuardConfig; -import org.apache.hudi.common.util.FailSafeConsistencyGuard; +import org.apache.hudi.common.fs.ConsistencyGuard; +import org.apache.hudi.common.fs.ConsistencyGuardConfig; +import org.apache.hudi.common.fs.FailSafeConsistencyGuard; import org.apache.hadoop.fs.Path; import org.junit.After; diff --git a/hudi-client/src/test/java/org/apache/hudi/table/TestCopyOnWriteTable.java b/hudi-client/src/test/java/org/apache/hudi/table/TestCopyOnWriteTable.java index 9ff0f971e..7eb63d3a7 100644 --- a/hudi-client/src/test/java/org/apache/hudi/table/TestCopyOnWriteTable.java +++ b/hudi-client/src/test/java/org/apache/hudi/table/TestCopyOnWriteTable.java @@ -26,14 +26,14 @@ import org.apache.hudi.common.HoodieClientTestUtils; import org.apache.hudi.common.HoodieTestDataGenerator; import org.apache.hudi.common.TestRawTripPayload; import org.apache.hudi.common.TestRawTripPayload.MetadataMergeWriteStatus; -import org.apache.hudi.common.bloom.filter.BloomFilter; +import org.apache.hudi.common.bloom.BloomFilter; import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordLocation; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.FileIOUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ParquetUtils; diff --git a/hudi-client/src/test/java/org/apache/hudi/table/TestHoodieRecordSizing.java b/hudi-client/src/test/java/org/apache/hudi/table/TestHoodieRecordSizing.java index 07a91af73..314d87d43 100644 --- a/hudi-client/src/test/java/org/apache/hudi/table/TestHoodieRecordSizing.java +++ b/hudi-client/src/test/java/org/apache/hudi/table/TestHoodieRecordSizing.java @@ -20,7 +20,7 @@ package org.apache.hudi.table; import org.apache.hudi.common.model.HoodieCommitMetadata; import org.apache.hudi.common.model.HoodieWriteStat; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.util.Option; diff --git a/hudi-client/src/test/java/org/apache/hudi/table/TestMergeOnReadTable.java b/hudi-client/src/test/java/org/apache/hudi/table/TestMergeOnReadTable.java index 6dbb89fc2..b3d9a8a36 100644 --- a/hudi-client/src/test/java/org/apache/hudi/table/TestMergeOnReadTable.java +++ b/hudi-client/src/test/java/org/apache/hudi/table/TestMergeOnReadTable.java @@ -40,10 +40,10 @@ import org.apache.hudi.common.model.HoodieRollingStatMetadata; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; -import org.apache.hudi.common.table.TableFileSystemView.BaseFileOnlyView; -import org.apache.hudi.common.table.TableFileSystemView.SliceView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.view.SyncableFileSystemView; +import org.apache.hudi.common.table.view.TableFileSystemView.BaseFileOnlyView; +import org.apache.hudi.common.table.view.TableFileSystemView.SliceView; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; diff --git a/hudi-client/src/test/java/org/apache/hudi/table/compact/TestAsyncCompaction.java b/hudi-client/src/test/java/org/apache/hudi/table/compact/TestAsyncCompaction.java index 1a366a455..83559237c 100644 --- a/hudi-client/src/test/java/org/apache/hudi/table/compact/TestAsyncCompaction.java +++ b/hudi-client/src/test/java/org/apache/hudi/table/compact/TestAsyncCompaction.java @@ -33,7 +33,7 @@ import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; import org.apache.hudi.common.table.view.FileSystemViewStorageConfig; diff --git a/hudi-client/src/test/java/org/apache/hudi/table/compact/TestHoodieCompactor.java b/hudi-client/src/test/java/org/apache/hudi/table/compact/TestHoodieCompactor.java index 482d72188..009e6e615 100644 --- a/hudi-client/src/test/java/org/apache/hudi/table/compact/TestHoodieCompactor.java +++ b/hudi-client/src/test/java/org/apache/hudi/table/compact/TestHoodieCompactor.java @@ -28,7 +28,7 @@ import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.table.HoodieTableMetaClient; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieIndexConfig; import org.apache.hudi.config.HoodieMemoryConfig; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/HoodieAvroUtils.java b/hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroUtils.java similarity index 99% rename from hudi-common/src/main/java/org/apache/hudi/common/util/HoodieAvroUtils.java rename to hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroUtils.java index 95cb8b9a8..2eec7486f 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/HoodieAvroUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.avro; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroWriteSupport.java b/hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroWriteSupport.java index 8db227f9c..cb96e6f3f 100644 --- a/hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroWriteSupport.java +++ b/hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroWriteSupport.java @@ -18,8 +18,8 @@ package org.apache.hudi.avro; -import org.apache.hudi.common.bloom.filter.BloomFilter; -import org.apache.hudi.common.bloom.filter.HoodieDynamicBoundedBloomFilter; +import org.apache.hudi.common.bloom.BloomFilter; +import org.apache.hudi.common.bloom.HoodieDynamicBoundedBloomFilter; import org.apache.avro.Schema; import org.apache.parquet.avro.AvroWriteSupport; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/BloomFilter.java b/hudi-common/src/main/java/org/apache/hudi/common/bloom/BloomFilter.java similarity index 96% rename from hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/BloomFilter.java rename to hudi-common/src/main/java/org/apache/hudi/common/bloom/BloomFilter.java index 7356a4826..7997da159 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/BloomFilter.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/bloom/BloomFilter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.bloom.filter; +package org.apache.hudi.common.bloom; /** * A Bloom filter interface. diff --git a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/BloomFilterFactory.java b/hudi-common/src/main/java/org/apache/hudi/common/bloom/BloomFilterFactory.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/BloomFilterFactory.java rename to hudi-common/src/main/java/org/apache/hudi/common/bloom/BloomFilterFactory.java index 052a6f6ce..008fef6cb 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/BloomFilterFactory.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/bloom/BloomFilterFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.bloom.filter; +package org.apache.hudi.common.bloom; import org.apache.hadoop.util.hash.Hash; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/BloomFilterTypeCode.java b/hudi-common/src/main/java/org/apache/hudi/common/bloom/BloomFilterTypeCode.java similarity index 95% rename from hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/BloomFilterTypeCode.java rename to hudi-common/src/main/java/org/apache/hudi/common/bloom/BloomFilterTypeCode.java index d90bfd3ce..b54abe3c1 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/BloomFilterTypeCode.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/bloom/BloomFilterTypeCode.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.bloom.filter; +package org.apache.hudi.common.bloom; /** * Bloom filter type codes. diff --git a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/BloomFilterUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/bloom/BloomFilterUtils.java similarity index 97% rename from hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/BloomFilterUtils.java rename to hudi-common/src/main/java/org/apache/hudi/common/bloom/BloomFilterUtils.java index 85d57d4e7..5be9a4ec3 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/BloomFilterUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/bloom/BloomFilterUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.bloom.filter; +package org.apache.hudi.common.bloom; /** * Bloom filter utils. diff --git a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/HoodieDynamicBoundedBloomFilter.java b/hudi-common/src/main/java/org/apache/hudi/common/bloom/HoodieDynamicBoundedBloomFilter.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/HoodieDynamicBoundedBloomFilter.java rename to hudi-common/src/main/java/org/apache/hudi/common/bloom/HoodieDynamicBoundedBloomFilter.java index 4d66718e2..343822b13 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/HoodieDynamicBoundedBloomFilter.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/bloom/HoodieDynamicBoundedBloomFilter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.bloom.filter; +package org.apache.hudi.common.bloom; import org.apache.hudi.common.util.Base64CodecUtil; import org.apache.hudi.exception.HoodieIndexException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/InternalDynamicBloomFilter.java b/hudi-common/src/main/java/org/apache/hudi/common/bloom/InternalDynamicBloomFilter.java similarity index 99% rename from hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/InternalDynamicBloomFilter.java rename to hudi-common/src/main/java/org/apache/hudi/common/bloom/InternalDynamicBloomFilter.java index a98e38e28..ee77f3637 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/InternalDynamicBloomFilter.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/bloom/InternalDynamicBloomFilter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.bloom.filter; +package org.apache.hudi.common.bloom; import org.apache.hadoop.util.bloom.BloomFilter; import org.apache.hadoop.util.bloom.Key; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/InternalFilter.java b/hudi-common/src/main/java/org/apache/hudi/common/bloom/InternalFilter.java similarity index 99% rename from hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/InternalFilter.java rename to hudi-common/src/main/java/org/apache/hudi/common/bloom/InternalFilter.java index c0a5028c9..58d185e3a 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/InternalFilter.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/bloom/InternalFilter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.bloom.filter; +package org.apache.hudi.common.bloom; import org.apache.hadoop.io.Writable; import org.apache.hadoop.util.bloom.HashFunction; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/SimpleBloomFilter.java b/hudi-common/src/main/java/org/apache/hudi/common/bloom/SimpleBloomFilter.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/SimpleBloomFilter.java rename to hudi-common/src/main/java/org/apache/hudi/common/bloom/SimpleBloomFilter.java index cf8b066c7..b0278319f 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/bloom/filter/SimpleBloomFilter.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/bloom/SimpleBloomFilter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.bloom.filter; +package org.apache.hudi.common.bloom; import org.apache.hudi.common.util.Base64CodecUtil; import org.apache.hudi.exception.HoodieIndexException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/DFSPropertiesConfiguration.java b/hudi-common/src/main/java/org/apache/hudi/common/config/DFSPropertiesConfiguration.java similarity index 99% rename from hudi-common/src/main/java/org/apache/hudi/common/util/DFSPropertiesConfiguration.java rename to hudi-common/src/main/java/org/apache/hudi/common/config/DFSPropertiesConfiguration.java index f535cac4b..cd4ade1ef 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/DFSPropertiesConfiguration.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/config/DFSPropertiesConfiguration.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.config; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/hudi-common/src/main/java/org/apache/hudi/config/DefaultHoodieConfig.java b/hudi-common/src/main/java/org/apache/hudi/common/config/DefaultHoodieConfig.java similarity index 97% rename from hudi-common/src/main/java/org/apache/hudi/config/DefaultHoodieConfig.java rename to hudi-common/src/main/java/org/apache/hudi/common/config/DefaultHoodieConfig.java index ad03f3e71..e0766db8c 100644 --- a/hudi-common/src/main/java/org/apache/hudi/config/DefaultHoodieConfig.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/config/DefaultHoodieConfig.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.config; +package org.apache.hudi.common.config; import java.io.Serializable; import java.util.Properties; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/SerializableConfiguration.java b/hudi-common/src/main/java/org/apache/hudi/common/config/SerializableConfiguration.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/SerializableConfiguration.java rename to hudi-common/src/main/java/org/apache/hudi/common/config/SerializableConfiguration.java index 1f4c568e6..8ad82d45e 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/SerializableConfiguration.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/config/SerializableConfiguration.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common; +package org.apache.hudi.common.config; import org.apache.hadoop.conf.Configuration; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/TypedProperties.java b/hudi-common/src/main/java/org/apache/hudi/common/config/TypedProperties.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/util/TypedProperties.java rename to hudi-common/src/main/java/org/apache/hudi/common/config/TypedProperties.java index 784c8b9df..295598ca8 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/TypedProperties.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/config/TypedProperties.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.config; import java.io.Serializable; import java.util.Arrays; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/ConsistencyGuard.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/ConsistencyGuard.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/util/ConsistencyGuard.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/ConsistencyGuard.java index 6d2dc1218..15d83c4bc 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/ConsistencyGuard.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/ConsistencyGuard.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.fs; import org.apache.hadoop.fs.Path; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/ConsistencyGuardConfig.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/ConsistencyGuardConfig.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/util/ConsistencyGuardConfig.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/ConsistencyGuardConfig.java index 8a5017af1..55d80df35 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/ConsistencyGuardConfig.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/ConsistencyGuardConfig.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.fs; -import org.apache.hudi.config.DefaultHoodieConfig; +import org.apache.hudi.common.config.DefaultHoodieConfig; import java.io.File; import java.io.FileReader; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/FSUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/FSUtils.java similarity index 99% rename from hudi-common/src/main/java/org/apache/hudi/common/util/FSUtils.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/FSUtils.java index 7d207e239..8df08d009 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/FSUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/FSUtils.java @@ -16,13 +16,15 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.fs; import org.apache.hudi.common.model.HoodieFileFormat; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.model.HoodiePartitionMetadata; import org.apache.hudi.common.table.HoodieTableMetaClient; import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.exception.HoodieException; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/FailSafeConsistencyGuard.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/FailSafeConsistencyGuard.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/util/FailSafeConsistencyGuard.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/FailSafeConsistencyGuard.java index e7ce62d39..83aeb1a37 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/FailSafeConsistencyGuard.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/FailSafeConsistencyGuard.java @@ -16,11 +16,12 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.fs; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hudi.common.util.ValidationUtils; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/io/storage/HoodieWrapperFileSystem.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/HoodieWrapperFileSystem.java similarity index 99% rename from hudi-common/src/main/java/org/apache/hudi/common/io/storage/HoodieWrapperFileSystem.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/HoodieWrapperFileSystem.java index 63ee7df2b..7f8874f41 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/io/storage/HoodieWrapperFileSystem.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/HoodieWrapperFileSystem.java @@ -16,12 +16,8 @@ * limitations under the License. */ -package org.apache.hudi.common.io.storage; +package org.apache.hudi.common.fs; -import org.apache.hudi.common.storage.StorageSchemes; -import org.apache.hudi.common.util.ConsistencyGuard; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.NoOpConsistencyGuard; import org.apache.hudi.exception.HoodieException; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/NoOpConsistencyGuard.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/NoOpConsistencyGuard.java similarity index 97% rename from hudi-common/src/main/java/org/apache/hudi/common/util/NoOpConsistencyGuard.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/NoOpConsistencyGuard.java index bc3466d29..058b3a104 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/NoOpConsistencyGuard.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/NoOpConsistencyGuard.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.fs; import org.apache.hadoop.fs.Path; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/storage/SizeAwareDataInputStream.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/SizeAwareDataInputStream.java similarity index 97% rename from hudi-common/src/main/java/org/apache/hudi/common/storage/SizeAwareDataInputStream.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/SizeAwareDataInputStream.java index 2dc609de7..63fe79ed2 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/storage/SizeAwareDataInputStream.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/SizeAwareDataInputStream.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.storage; +package org.apache.hudi.common.fs; import java.io.DataInputStream; import java.io.IOException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/collection/io/storage/SizeAwareDataOutputStream.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/SizeAwareDataOutputStream.java similarity index 97% rename from hudi-common/src/main/java/org/apache/hudi/common/util/collection/io/storage/SizeAwareDataOutputStream.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/SizeAwareDataOutputStream.java index ddf67407b..ba4fe66f8 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/collection/io/storage/SizeAwareDataOutputStream.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/SizeAwareDataOutputStream.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.util.collection.io.storage; +package org.apache.hudi.common.fs; import java.io.BufferedOutputStream; import java.io.DataOutputStream; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/io/storage/SizeAwareFSDataOutputStream.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/SizeAwareFSDataOutputStream.java similarity index 96% rename from hudi-common/src/main/java/org/apache/hudi/common/io/storage/SizeAwareFSDataOutputStream.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/SizeAwareFSDataOutputStream.java index 0211fb3cf..0b70bedc0 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/io/storage/SizeAwareFSDataOutputStream.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/SizeAwareFSDataOutputStream.java @@ -16,9 +16,8 @@ * limitations under the License. */ -package org.apache.hudi.common.io.storage; +package org.apache.hudi.common.fs; -import org.apache.hudi.common.util.ConsistencyGuard; import org.apache.hudi.exception.HoodieException; import org.apache.hadoop.fs.FSDataOutputStream; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/storage/StorageSchemes.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/StorageSchemes.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/storage/StorageSchemes.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/StorageSchemes.java index 316ff0d0d..83514a10a 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/storage/StorageSchemes.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/StorageSchemes.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.storage; +package org.apache.hudi.common.fs; import java.util.Arrays; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/inline/fs/InLineFSUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/inline/InLineFSUtils.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/inline/fs/InLineFSUtils.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/inline/InLineFSUtils.java index dbc64dd64..e4570f942 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/inline/fs/InLineFSUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/inline/InLineFSUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.inline.fs; +package org.apache.hudi.common.fs.inline; import org.apache.hadoop.fs.Path; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/inline/fs/InLineFileSystem.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/inline/InLineFileSystem.java similarity index 99% rename from hudi-common/src/main/java/org/apache/hudi/common/inline/fs/InLineFileSystem.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/inline/InLineFileSystem.java index 480a126e6..4c693c5c5 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/inline/fs/InLineFileSystem.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/inline/InLineFileSystem.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.inline.fs; +package org.apache.hudi.common.fs.inline; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/inline/fs/InLineFsDataInputStream.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/inline/InLineFsDataInputStream.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/inline/fs/InLineFsDataInputStream.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/inline/InLineFsDataInputStream.java index cd5ca0993..1d316cd6a 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/inline/fs/InLineFsDataInputStream.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/inline/InLineFsDataInputStream.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.inline.fs; +package org.apache.hudi.common.fs.inline; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.ReadOption; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/inline/fs/InMemoryFileSystem.java b/hudi-common/src/main/java/org/apache/hudi/common/fs/inline/InMemoryFileSystem.java similarity index 99% rename from hudi-common/src/main/java/org/apache/hudi/common/inline/fs/InMemoryFileSystem.java rename to hudi-common/src/main/java/org/apache/hudi/common/fs/inline/InMemoryFileSystem.java index c1f33a7c5..e433340f6 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/inline/fs/InMemoryFileSystem.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/inline/InMemoryFileSystem.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.inline.fs; +package org.apache.hudi.common.fs.inline; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/model/BaseAvroPayload.java b/hudi-common/src/main/java/org/apache/hudi/common/model/BaseAvroPayload.java index 8ed925bd4..24d02b54f 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/model/BaseAvroPayload.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/model/BaseAvroPayload.java @@ -18,7 +18,7 @@ package org.apache.hudi.common.model; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.exception.HoodieException; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/model/CompactionOperation.java b/hudi-common/src/main/java/org/apache/hudi/common/model/CompactionOperation.java index dd4aaf40a..664001fed 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/model/CompactionOperation.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/model/CompactionOperation.java @@ -19,7 +19,7 @@ package org.apache.hudi.common.model; import org.apache.hudi.avro.model.HoodieCompactionOperation; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hadoop.fs.Path; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieAvroPayload.java b/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieAvroPayload.java index 08baeac4c..255c8195c 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieAvroPayload.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieAvroPayload.java @@ -18,7 +18,7 @@ package org.apache.hudi.common.model; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieBaseFile.java b/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieBaseFile.java index 90e429b0d..ee20136f4 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieBaseFile.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieBaseFile.java @@ -18,7 +18,7 @@ package org.apache.hudi.common.model; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.Path; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieCommitMetadata.java b/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieCommitMetadata.java index d40a77014..1d5f238a1 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieCommitMetadata.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieCommitMetadata.java @@ -18,7 +18,7 @@ package org.apache.hudi.common.model; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieFileGroup.java b/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieFileGroup.java index ef33e8abe..847500da2 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieFileGroup.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieFileGroup.java @@ -18,7 +18,7 @@ package org.apache.hudi.common.model; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.util.Option; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieLogFile.java b/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieLogFile.java index 6369b876b..a0a22aa9a 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieLogFile.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/model/HoodieLogFile.java @@ -18,7 +18,7 @@ package org.apache.hudi.common.model; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/model/OverwriteWithLatestAvroPayload.java b/hudi-common/src/main/java/org/apache/hudi/common/model/OverwriteWithLatestAvroPayload.java index 88811f53b..2c98b830f 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/model/OverwriteWithLatestAvroPayload.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/model/OverwriteWithLatestAvroPayload.java @@ -18,7 +18,7 @@ package org.apache.hudi.common.model; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.Option; import org.apache.avro.Schema; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTableConfig.java b/hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTableConfig.java index 0b705952c..2742e69f0 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTableConfig.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTableConfig.java @@ -21,7 +21,7 @@ package org.apache.hudi.common.table; import org.apache.hudi.common.model.HoodieFileFormat; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.OverwriteWithLatestAvroPayload; -import org.apache.hudi.common.model.TimelineLayoutVersion; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; import org.apache.hudi.common.util.Option; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTableMetaClient.java b/hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTableMetaClient.java index 2bff9b74f..a7232af61 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTableMetaClient.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTableMetaClient.java @@ -18,17 +18,19 @@ package org.apache.hudi.common.table; -import org.apache.hudi.common.SerializableConfiguration; -import org.apache.hudi.common.io.storage.HoodieWrapperFileSystem; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.timeline.TimelineLayout; +import org.apache.hudi.common.config.SerializableConfiguration; +import org.apache.hudi.common.fs.HoodieWrapperFileSystem; import org.apache.hudi.common.model.HoodieTableType; -import org.apache.hudi.common.model.TimelineLayoutVersion; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieArchivedTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.ConsistencyGuardConfig; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.FailSafeConsistencyGuard; -import org.apache.hudi.common.util.NoOpConsistencyGuard; +import org.apache.hudi.common.fs.ConsistencyGuardConfig; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.fs.FailSafeConsistencyGuard; +import org.apache.hudi.common.fs.NoOpConsistencyGuard; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.exception.HoodieException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/log/AbstractHoodieLogRecordScanner.java b/hudi-common/src/main/java/org/apache/hudi/common/table/log/AbstractHoodieLogRecordScanner.java index 42f1f9a9d..ed87bf998 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/log/AbstractHoodieLogRecordScanner.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/log/AbstractHoodieLogRecordScanner.java @@ -23,7 +23,7 @@ import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.log.block.HoodieAvroDataBlock; import org.apache.hudi.common.table.log.block.HoodieCommandBlock; import org.apache.hudi.common.table.log.block.HoodieDeleteBlock; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFileReader.java b/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFileReader.java index 784535913..66177d50a 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFileReader.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFileReader.java @@ -26,7 +26,7 @@ import org.apache.hudi.common.table.log.block.HoodieDeleteBlock; import org.apache.hudi.common.table.log.block.HoodieLogBlock; import org.apache.hudi.common.table.log.block.HoodieLogBlock.HeaderMetadataType; import org.apache.hudi.common.table.log.block.HoodieLogBlock.HoodieLogBlockType; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.exception.CorruptedLogFileException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFormat.java b/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFormat.java index d1d35c0dc..f72dbcea1 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFormat.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFormat.java @@ -20,7 +20,7 @@ package org.apache.hudi.common.table.log; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.table.log.block.HoodieLogBlock; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.Pair; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFormatWriter.java b/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFormatWriter.java index 1b2e18884..cb66a30d1 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFormatWriter.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFormatWriter.java @@ -19,11 +19,11 @@ package org.apache.hudi.common.table.log; import org.apache.hudi.common.model.HoodieLogFile; -import org.apache.hudi.common.storage.StorageSchemes; +import org.apache.hudi.common.fs.StorageSchemes; import org.apache.hudi.common.table.log.HoodieLogFormat.Writer; import org.apache.hudi.common.table.log.HoodieLogFormat.WriterBuilder; import org.apache.hudi.common.table.log.block.HoodieLogBlock; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.exception.HoodieException; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/LogReaderUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/table/log/LogReaderUtils.java similarity index 95% rename from hudi-common/src/main/java/org/apache/hudi/common/util/LogReaderUtils.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/log/LogReaderUtils.java index 52b30cbc2..3043f2488 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/LogReaderUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/log/LogReaderUtils.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.table.log; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.log.HoodieLogFormat; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.log.HoodieLogFormat.Reader; import org.apache.hudi.common.table.log.block.HoodieAvroDataBlock; import org.apache.hudi.common.table.log.block.HoodieLogBlock; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/log/block/HoodieAvroDataBlock.java b/hudi-common/src/main/java/org/apache/hudi/common/table/log/block/HoodieAvroDataBlock.java index 8c1fc341d..958b112da 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/log/block/HoodieAvroDataBlock.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/log/block/HoodieAvroDataBlock.java @@ -19,8 +19,8 @@ package org.apache.hudi.common.table.log.block; import org.apache.hudi.common.model.HoodieLogFile; -import org.apache.hudi.common.storage.SizeAwareDataInputStream; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.fs.SizeAwareDataInputStream; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/log/block/HoodieDeleteBlock.java b/hudi-common/src/main/java/org/apache/hudi/common/table/log/block/HoodieDeleteBlock.java index a293dc476..903b895b7 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/log/block/HoodieDeleteBlock.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/log/block/HoodieDeleteBlock.java @@ -20,7 +20,7 @@ package org.apache.hudi.common.table.log.block; import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodieLogFile; -import org.apache.hudi.common.storage.SizeAwareDataInputStream; +import org.apache.hudi.common.fs.SizeAwareDataInputStream; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.SerializationUtils; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/log/block/HoodieLogBlock.java b/hudi-common/src/main/java/org/apache/hudi/common/table/log/block/HoodieLogBlock.java index 18f018665..e0f118438 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/log/block/HoodieLogBlock.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/log/block/HoodieLogBlock.java @@ -20,7 +20,7 @@ package org.apache.hudi.common.table.log.block; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.table.log.HoodieMergedLogRecordScanner; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.exception.HoodieException; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieActiveTimeline.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieActiveTimeline.java index 837c4a15d..49f52085a 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieActiveTimeline.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieActiveTimeline.java @@ -19,7 +19,6 @@ package org.apache.hudi.common.table.timeline; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant.State; import org.apache.hudi.common.util.FileIOUtils; import org.apache.hudi.common.util.Option; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieArchivedTimeline.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieArchivedTimeline.java index 76d7422f6..39838b737 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieArchivedTimeline.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieArchivedTimeline.java @@ -26,7 +26,6 @@ import org.apache.hudi.avro.model.HoodieArchivedMetaEntry; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.model.HoodiePartitionMetadata; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; import org.apache.hudi.common.table.log.HoodieLogFormat; import org.apache.hudi.common.table.log.block.HoodieAvroDataBlock; import org.apache.hudi.common.util.Option; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieDefaultTimeline.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieDefaultTimeline.java index bc21c29c0..3f400be1c 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieDefaultTimeline.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieDefaultTimeline.java @@ -18,7 +18,6 @@ package org.apache.hudi.common.table.timeline; -import org.apache.hudi.common.table.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant.State; import org.apache.hudi.common.util.CollectionUtils; import org.apache.hudi.common.util.Option; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieInstant.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieInstant.java index e98e5bf49..569bc5a9b 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieInstant.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieInstant.java @@ -18,9 +18,8 @@ package org.apache.hudi.common.table.timeline; -import org.apache.hudi.common.table.HoodieTimeline; import org.apache.hudi.common.util.CollectionUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hadoop.fs.FileStatus; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTimeline.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieTimeline.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTimeline.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieTimeline.java index bfc18d2f3..cdd3a852c 100755 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTimeline.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieTimeline.java @@ -16,11 +16,10 @@ * limitations under the License. */ -package org.apache.hudi.common.table; +package org.apache.hudi.common.table.timeline; import org.apache.hudi.common.model.HoodieTableType; -import org.apache.hudi.common.table.timeline.HoodieDefaultTimeline; -import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.HoodieTableMetaClient; import org.apache.hudi.common.table.timeline.HoodieInstant.State; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.StringUtils; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/TimelineDiffHelper.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/TimelineDiffHelper.java similarity index 97% rename from hudi-common/src/main/java/org/apache/hudi/common/util/TimelineDiffHelper.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/TimelineDiffHelper.java index 7625bb572..1ade7be23 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/TimelineDiffHelper.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/TimelineDiffHelper.java @@ -16,11 +16,10 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.table.timeline; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; +import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.Pair; import org.apache.log4j.LogManager; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/TimelineLayout.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/TimelineLayout.java similarity index 94% rename from hudi-common/src/main/java/org/apache/hudi/common/table/TimelineLayout.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/TimelineLayout.java index e3e31dbdd..77d82f913 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/TimelineLayout.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/TimelineLayout.java @@ -16,10 +16,9 @@ * limitations under the License. */ -package org.apache.hudi.common.table; +package org.apache.hudi.common.table.timeline; -import org.apache.hudi.common.model.TimelineLayoutVersion; -import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; import org.apache.hudi.common.util.collection.Pair; import java.io.Serializable; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/AvroUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/TimelineMetadataUtils.java similarity index 97% rename from hudi-common/src/main/java/org/apache/hudi/common/util/AvroUtils.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/TimelineMetadataUtils.java index 3cf6bc8c1..698dd113d 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/AvroUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/TimelineMetadataUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.table.timeline; import org.apache.hudi.avro.model.HoodieCleanMetadata; import org.apache.hudi.avro.model.HoodieCleanerPlan; @@ -37,6 +37,8 @@ import org.apache.avro.io.DatumWriter; import org.apache.avro.specific.SpecificDatumReader; import org.apache.avro.specific.SpecificDatumWriter; import org.apache.avro.specific.SpecificRecordBase; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.common.util.ValidationUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -45,10 +47,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -/** - * A utility class for avro. - */ -public class AvroUtils { +public class TimelineMetadataUtils { private static final Integer DEFAULT_VERSION = 1; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/dto/TimelineDTO.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/dto/TimelineDTO.java index fa6bf3afe..6dac1ccbd 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/dto/TimelineDTO.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/dto/TimelineDTO.java @@ -19,7 +19,7 @@ package org.apache.hudi.common.table.timeline.dto; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieDefaultTimeline; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/versioning/AbstractMigratorBase.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/AbstractMigratorBase.java similarity index 95% rename from hudi-common/src/main/java/org/apache/hudi/common/versioning/AbstractMigratorBase.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/AbstractMigratorBase.java index a3035fb1a..00c2be5e0 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/versioning/AbstractMigratorBase.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/AbstractMigratorBase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.versioning; +package org.apache.hudi.common.table.timeline.versioning; import org.apache.hudi.common.table.HoodieTableMetaClient; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/versioning/MetadataMigrator.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/MetadataMigrator.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/versioning/MetadataMigrator.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/MetadataMigrator.java index f92dcea34..23d2a703d 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/versioning/MetadataMigrator.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/MetadataMigrator.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.versioning; +package org.apache.hudi.common.table.timeline.versioning; import org.apache.hudi.common.table.HoodieTableMetaClient; import org.apache.hudi.common.util.ValidationUtils; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/model/TimelineLayoutVersion.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/TimelineLayoutVersion.java similarity index 97% rename from hudi-common/src/main/java/org/apache/hudi/common/model/TimelineLayoutVersion.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/TimelineLayoutVersion.java index d05d8439d..994c86778 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/model/TimelineLayoutVersion.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/TimelineLayoutVersion.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.model; +package org.apache.hudi.common.table.timeline.versioning; import org.apache.hudi.common.util.ValidationUtils; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/versioning/VersionMigrator.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/VersionMigrator.java similarity index 96% rename from hudi-common/src/main/java/org/apache/hudi/common/versioning/VersionMigrator.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/VersionMigrator.java index 0983a6422..253463776 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/versioning/VersionMigrator.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/VersionMigrator.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.versioning; +package org.apache.hudi.common.table.timeline.versioning; import java.io.Serializable; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanMetadataMigrator.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/clean/CleanMetadataMigrator.java similarity index 90% rename from hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanMetadataMigrator.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/clean/CleanMetadataMigrator.java index 536f148ca..cd30a692f 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanMetadataMigrator.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/clean/CleanMetadataMigrator.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.hudi.common.versioning.clean; +package org.apache.hudi.common.table.timeline.versioning.clean; import org.apache.hudi.avro.model.HoodieCleanMetadata; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.versioning.MetadataMigrator; +import org.apache.hudi.common.table.timeline.versioning.MetadataMigrator; import java.util.Arrays; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV1MigrationHandler.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/clean/CleanV1MigrationHandler.java similarity index 95% rename from hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV1MigrationHandler.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/clean/CleanV1MigrationHandler.java index a7434b5f8..fb23fb88c 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV1MigrationHandler.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/clean/CleanV1MigrationHandler.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.hudi.common.versioning.clean; +package org.apache.hudi.common.table.timeline.versioning.clean; import org.apache.hudi.avro.model.HoodieCleanMetadata; import org.apache.hudi.avro.model.HoodieCleanPartitionMetadata; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.common.util.collection.Pair; -import org.apache.hudi.common.versioning.AbstractMigratorBase; +import org.apache.hudi.common.table.timeline.versioning.AbstractMigratorBase; import org.apache.hadoop.fs.Path; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV2MigrationHandler.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/clean/CleanV2MigrationHandler.java similarity index 96% rename from hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV2MigrationHandler.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/clean/CleanV2MigrationHandler.java index 14b288678..a5fa09bdd 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV2MigrationHandler.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/clean/CleanV2MigrationHandler.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hudi.common.versioning.clean; +package org.apache.hudi.common.table.timeline.versioning.clean; import org.apache.hudi.avro.model.HoodieCleanMetadata; import org.apache.hudi.avro.model.HoodieCleanPartitionMetadata; import org.apache.hudi.common.table.HoodieTableMetaClient; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.common.util.collection.Pair; -import org.apache.hudi.common.versioning.AbstractMigratorBase; +import org.apache.hudi.common.table.timeline.versioning.AbstractMigratorBase; import org.apache.hadoop.fs.Path; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/versioning/compaction/CompactionPlanMigrator.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/compaction/CompactionPlanMigrator.java similarity index 90% rename from hudi-common/src/main/java/org/apache/hudi/common/versioning/compaction/CompactionPlanMigrator.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/compaction/CompactionPlanMigrator.java index 3b4f2e1f6..eb36b453e 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/versioning/compaction/CompactionPlanMigrator.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/compaction/CompactionPlanMigrator.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.hudi.common.versioning.compaction; +package org.apache.hudi.common.table.timeline.versioning.compaction; import org.apache.hudi.avro.model.HoodieCompactionPlan; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.versioning.MetadataMigrator; +import org.apache.hudi.common.table.timeline.versioning.MetadataMigrator; import java.util.Arrays; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/versioning/compaction/CompactionV1MigrationHandler.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/compaction/CompactionV1MigrationHandler.java similarity index 94% rename from hudi-common/src/main/java/org/apache/hudi/common/versioning/compaction/CompactionV1MigrationHandler.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/compaction/CompactionV1MigrationHandler.java index 9d23d6113..cd7c6f4a5 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/versioning/compaction/CompactionV1MigrationHandler.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/compaction/CompactionV1MigrationHandler.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hudi.common.versioning.compaction; +package org.apache.hudi.common.table.timeline.versioning.compaction; import org.apache.hudi.avro.model.HoodieCompactionOperation; import org.apache.hudi.avro.model.HoodieCompactionPlan; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.ValidationUtils; -import org.apache.hudi.common.versioning.AbstractMigratorBase; +import org.apache.hudi.common.table.timeline.versioning.AbstractMigratorBase; import org.apache.hadoop.fs.Path; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/versioning/compaction/CompactionV2MigrationHandler.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/compaction/CompactionV2MigrationHandler.java similarity index 95% rename from hudi-common/src/main/java/org/apache/hudi/common/versioning/compaction/CompactionV2MigrationHandler.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/compaction/CompactionV2MigrationHandler.java index 0c07b7cf5..9ae3d70cf 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/versioning/compaction/CompactionV2MigrationHandler.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/compaction/CompactionV2MigrationHandler.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.hudi.common.versioning.compaction; +package org.apache.hudi.common.table.timeline.versioning.compaction; import org.apache.hudi.avro.model.HoodieCompactionOperation; import org.apache.hudi.avro.model.HoodieCompactionPlan; import org.apache.hudi.common.table.HoodieTableMetaClient; import org.apache.hudi.common.util.ValidationUtils; -import org.apache.hudi.common.versioning.AbstractMigratorBase; +import org.apache.hudi.common.table.timeline.versioning.AbstractMigratorBase; import org.apache.hadoop.fs.Path; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/view/AbstractTableFileSystemView.java b/hudi-common/src/main/java/org/apache/hudi/common/table/view/AbstractTableFileSystemView.java index d8f77e4f3..dc4a1eac6 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/view/AbstractTableFileSystemView.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/view/AbstractTableFileSystemView.java @@ -25,11 +25,10 @@ import org.apache.hudi.common.model.HoodieFileGroup; import org.apache.hudi.common.model.HoodieFileGroupId; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.util.CompactionUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.HoodieTimer; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/view/FileSystemViewManager.java b/hudi-common/src/main/java/org/apache/hudi/common/table/view/FileSystemViewManager.java index 8d50ef598..c5e7764b3 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/view/FileSystemViewManager.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/view/FileSystemViewManager.java @@ -18,10 +18,9 @@ package org.apache.hudi.common.table.view; -import org.apache.hudi.common.SerializableConfiguration; +import org.apache.hudi.common.config.SerializableConfiguration; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.util.Functions.Function2; import org.apache.log4j.LogManager; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/view/FileSystemViewStorageConfig.java b/hudi-common/src/main/java/org/apache/hudi/common/table/view/FileSystemViewStorageConfig.java index 93c55076a..d2d29cc26 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/view/FileSystemViewStorageConfig.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/view/FileSystemViewStorageConfig.java @@ -19,7 +19,7 @@ package org.apache.hudi.common.table.view; import org.apache.hudi.common.util.ValidationUtils; -import org.apache.hudi.config.DefaultHoodieConfig; +import org.apache.hudi.common.config.DefaultHoodieConfig; import java.io.File; import java.io.FileReader; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/view/HoodieTableFileSystemView.java b/hudi-common/src/main/java/org/apache/hudi/common/table/view/HoodieTableFileSystemView.java index 1f7165ba7..4d877fab2 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/view/HoodieTableFileSystemView.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/view/HoodieTableFileSystemView.java @@ -22,8 +22,7 @@ import org.apache.hudi.common.model.CompactionOperation; import org.apache.hudi.common.model.HoodieFileGroup; import org.apache.hudi.common.model.HoodieFileGroupId; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.TableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.common.util.collection.Pair; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/view/IncrementalTimelineSyncFileSystemView.java b/hudi-common/src/main/java/org/apache/hudi/common/table/view/IncrementalTimelineSyncFileSystemView.java index 3ce40bfca..007817471 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/view/IncrementalTimelineSyncFileSystemView.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/view/IncrementalTimelineSyncFileSystemView.java @@ -28,15 +28,15 @@ import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodieCommitMetadata; import org.apache.hudi.common.model.HoodieFileGroup; import org.apache.hudi.common.model.HoodieLogFile; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.AvroUtils; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; import org.apache.hudi.common.util.CleanerUtils; import org.apache.hudi.common.util.CompactionUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TimelineDiffHelper; -import org.apache.hudi.common.util.TimelineDiffHelper.TimelineDiffResult; +import org.apache.hudi.common.table.timeline.TimelineDiffHelper; +import org.apache.hudi.common.table.timeline.TimelineDiffHelper.TimelineDiffResult; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.exception.HoodieException; @@ -220,7 +220,7 @@ public abstract class IncrementalTimelineSyncFileSystemView extends AbstractTabl private void addRestoreInstant(HoodieTimeline timeline, HoodieInstant instant) throws IOException { LOG.info("Syncing restore instant (" + instant + ")"); HoodieRestoreMetadata metadata = - AvroUtils.deserializeAvroMetadata(timeline.getInstantDetails(instant).get(), HoodieRestoreMetadata.class); + TimelineMetadataUtils.deserializeAvroMetadata(timeline.getInstantDetails(instant).get(), HoodieRestoreMetadata.class); Map>> partitionFiles = metadata.getHoodieRestoreMetadata().entrySet().stream().flatMap(entry -> { @@ -244,7 +244,7 @@ public abstract class IncrementalTimelineSyncFileSystemView extends AbstractTabl private void addRollbackInstant(HoodieTimeline timeline, HoodieInstant instant) throws IOException { LOG.info("Syncing rollback instant (" + instant + ")"); HoodieRollbackMetadata metadata = - AvroUtils.deserializeAvroMetadata(timeline.getInstantDetails(instant).get(), HoodieRollbackMetadata.class); + TimelineMetadataUtils.deserializeAvroMetadata(timeline.getInstantDetails(instant).get(), HoodieRollbackMetadata.class); metadata.getPartitionMetadata().entrySet().stream().forEach(e -> { removeFileSlicesForPartition(timeline, instant, e.getKey(), e.getValue().getSuccessDeleteFiles()); diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/view/PriorityBasedFileSystemView.java b/hudi-common/src/main/java/org/apache/hudi/common/table/view/PriorityBasedFileSystemView.java index 5eb1173c0..be9f9cb69 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/view/PriorityBasedFileSystemView.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/view/PriorityBasedFileSystemView.java @@ -22,8 +22,7 @@ import org.apache.hudi.common.model.CompactionOperation; import org.apache.hudi.common.model.FileSlice; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodieFileGroup; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.util.Functions.Function0; import org.apache.hudi.common.util.Functions.Function1; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/view/RemoteHoodieTableFileSystemView.java b/hudi-common/src/main/java/org/apache/hudi/common/table/view/RemoteHoodieTableFileSystemView.java index 256fbd4f7..3ab62fead 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/view/RemoteHoodieTableFileSystemView.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/view/RemoteHoodieTableFileSystemView.java @@ -23,8 +23,7 @@ import org.apache.hudi.common.model.FileSlice; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodieFileGroup; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.dto.BaseFileDTO; import org.apache.hudi.common.table.timeline.dto.CompactionOpDTO; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/view/RocksDbBasedFileSystemView.java b/hudi-common/src/main/java/org/apache/hudi/common/table/view/RocksDbBasedFileSystemView.java index a89ac5803..d944ddf49 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/view/RocksDbBasedFileSystemView.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/view/RocksDbBasedFileSystemView.java @@ -25,9 +25,9 @@ import org.apache.hudi.common.model.HoodieFileGroup; import org.apache.hudi.common.model.HoodieFileGroupId; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.RocksDBDAO; +import org.apache.hudi.common.util.collection.RocksDBDAO; import org.apache.hudi.common.util.RocksDBSchemaHelper; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.common.util.collection.Pair; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/view/SpillableMapBasedFileSystemView.java b/hudi-common/src/main/java/org/apache/hudi/common/table/view/SpillableMapBasedFileSystemView.java index c806523b1..4ae4ee444 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/view/SpillableMapBasedFileSystemView.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/view/SpillableMapBasedFileSystemView.java @@ -22,7 +22,7 @@ import org.apache.hudi.common.model.CompactionOperation; import org.apache.hudi.common.model.HoodieFileGroup; import org.apache.hudi.common.model.HoodieFileGroupId; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.util.DefaultSizeEstimator; import org.apache.hudi.common.util.collection.ExternalSpillableMap; import org.apache.hudi.common.util.collection.Pair; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/SyncableFileSystemView.java b/hudi-common/src/main/java/org/apache/hudi/common/table/view/SyncableFileSystemView.java similarity index 88% rename from hudi-common/src/main/java/org/apache/hudi/common/table/SyncableFileSystemView.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/view/SyncableFileSystemView.java index 7a03f0ff6..18ef931eb 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/SyncableFileSystemView.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/view/SyncableFileSystemView.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.hudi.common.table; +package org.apache.hudi.common.table.view; -import org.apache.hudi.common.table.TableFileSystemView.BaseFileOnlyView; -import org.apache.hudi.common.table.TableFileSystemView.SliceView; +import org.apache.hudi.common.table.view.TableFileSystemView.BaseFileOnlyView; +import org.apache.hudi.common.table.view.TableFileSystemView.SliceView; /** * A consolidated file-system view interface exposing both complete slice and basefile only views along with diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/TableFileSystemView.java b/hudi-common/src/main/java/org/apache/hudi/common/table/view/TableFileSystemView.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/table/TableFileSystemView.java rename to hudi-common/src/main/java/org/apache/hudi/common/table/view/TableFileSystemView.java index 0a5bb3231..414f8e906 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/TableFileSystemView.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/view/TableFileSystemView.java @@ -16,13 +16,14 @@ * limitations under the License. */ -package org.apache.hudi.common.table; +package org.apache.hudi.common.table.view; import org.apache.hudi.common.model.CompactionOperation; import org.apache.hudi.common.model.FileSlice; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodieFileGroup; import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.Pair; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/CleanerUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/util/CleanerUtils.java index 263a34d30..48f6bf7d8 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/CleanerUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/util/CleanerUtils.java @@ -18,15 +18,16 @@ package org.apache.hudi.common.util; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; import org.apache.hudi.avro.model.HoodieCleanMetadata; import org.apache.hudi.avro.model.HoodieCleanPartitionMetadata; import org.apache.hudi.avro.model.HoodieCleanerPlan; import org.apache.hudi.common.HoodieCleanStat; import org.apache.hudi.common.table.HoodieTableMetaClient; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.versioning.clean.CleanMetadataMigrator; -import org.apache.hudi.common.versioning.clean.CleanV1MigrationHandler; -import org.apache.hudi.common.versioning.clean.CleanV2MigrationHandler; +import org.apache.hudi.common.table.timeline.versioning.clean.CleanMetadataMigrator; +import org.apache.hudi.common.table.timeline.versioning.clean.CleanV1MigrationHandler; +import org.apache.hudi.common.table.timeline.versioning.clean.CleanV2MigrationHandler; import java.io.IOException; import java.util.HashMap; @@ -69,7 +70,7 @@ public class CleanerUtils { public static HoodieCleanMetadata getCleanerMetadata(HoodieTableMetaClient metaClient, HoodieInstant cleanInstant) throws IOException { CleanMetadataMigrator metadataMigrator = new CleanMetadataMigrator(metaClient); - HoodieCleanMetadata cleanMetadata = AvroUtils.deserializeHoodieCleanMetadata( + HoodieCleanMetadata cleanMetadata = TimelineMetadataUtils.deserializeHoodieCleanMetadata( metaClient.getActiveTimeline().readCleanerInfoAsBytes(cleanInstant).get()); return metadataMigrator.upgradeToLatest(cleanMetadata, cleanMetadata.getVersion()); } @@ -83,7 +84,7 @@ public class CleanerUtils { */ public static HoodieCleanerPlan getCleanerPlan(HoodieTableMetaClient metaClient, HoodieInstant cleanInstant) throws IOException { - return AvroUtils.deserializeAvroMetadata(metaClient.getActiveTimeline().readCleanerInfoAsBytes(cleanInstant).get(), + return TimelineMetadataUtils.deserializeAvroMetadata(metaClient.getActiveTimeline().readCleanerInfoAsBytes(cleanInstant).get(), HoodieCleanerPlan.class); } } diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/CompactionUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/util/CompactionUtils.java index c5ce52673..39bc45f73 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/CompactionUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/util/CompactionUtils.java @@ -18,18 +18,19 @@ package org.apache.hudi.common.util; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; import org.apache.hudi.avro.model.HoodieCompactionOperation; import org.apache.hudi.avro.model.HoodieCompactionPlan; import org.apache.hudi.common.model.CompactionOperation; import org.apache.hudi.common.model.FileSlice; import org.apache.hudi.common.model.HoodieFileGroupId; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.util.collection.Pair; -import org.apache.hudi.common.versioning.compaction.CompactionPlanMigrator; -import org.apache.hudi.common.versioning.compaction.CompactionV1MigrationHandler; -import org.apache.hudi.common.versioning.compaction.CompactionV2MigrationHandler; +import org.apache.hudi.common.table.timeline.versioning.compaction.CompactionPlanMigrator; +import org.apache.hudi.common.table.timeline.versioning.compaction.CompactionV1MigrationHandler; +import org.apache.hudi.common.table.timeline.versioning.compaction.CompactionV2MigrationHandler; import org.apache.hudi.exception.HoodieException; import org.apache.log4j.LogManager; @@ -139,7 +140,7 @@ public class CompactionUtils { public static HoodieCompactionPlan getCompactionPlan(HoodieTableMetaClient metaClient, String compactionInstant) throws IOException { CompactionPlanMigrator migrator = new CompactionPlanMigrator(metaClient); - HoodieCompactionPlan compactionPlan = AvroUtils.deserializeCompactionPlan( + HoodieCompactionPlan compactionPlan = TimelineMetadataUtils.deserializeCompactionPlan( metaClient.getActiveTimeline().readCompactionPlanAsBytes( HoodieTimeline.getCompactionRequestedInstant(compactionInstant)).get()); return migrator.upgradeToLatest(compactionPlan, compactionPlan.getVersion()); diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/ParquetUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/util/ParquetUtils.java index dd53e22c4..923b174fd 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/ParquetUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/util/ParquetUtils.java @@ -18,10 +18,12 @@ package org.apache.hudi.common.util; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.avro.HoodieAvroWriteSupport; -import org.apache.hudi.common.bloom.filter.BloomFilter; -import org.apache.hudi.common.bloom.filter.BloomFilterFactory; -import org.apache.hudi.common.bloom.filter.BloomFilterTypeCode; +import org.apache.hudi.common.bloom.BloomFilter; +import org.apache.hudi.common.bloom.BloomFilterFactory; +import org.apache.hudi.common.bloom.BloomFilterTypeCode; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.exception.HoodieException; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/SpillableMapUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/util/SpillableMapUtils.java index 06e84a9ec..64c391c4e 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/SpillableMapUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/util/SpillableMapUtils.java @@ -22,7 +22,7 @@ import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.util.collection.DiskBasedMap.FileEntry; -import org.apache.hudi.common.util.collection.io.storage.SizeAwareDataOutputStream; +import org.apache.hudi.common.fs.SizeAwareDataOutputStream; import org.apache.hudi.exception.HoodieCorruptedDataException; import org.apache.avro.generic.GenericRecord; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/collection/DiskBasedMap.java b/hudi-common/src/main/java/org/apache/hudi/common/util/collection/DiskBasedMap.java index 07ad5f27a..51309749e 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/collection/DiskBasedMap.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/util/collection/DiskBasedMap.java @@ -21,7 +21,7 @@ package org.apache.hudi.common.util.collection; import org.apache.hudi.common.util.BufferedRandomAccessFile; import org.apache.hudi.common.util.SerializationUtils; import org.apache.hudi.common.util.SpillableMapUtils; -import org.apache.hudi.common.util.collection.io.storage.SizeAwareDataOutputStream; +import org.apache.hudi.common.fs.SizeAwareDataOutputStream; import org.apache.hudi.exception.HoodieException; import org.apache.hudi.exception.HoodieIOException; import org.apache.hudi.exception.HoodieNotSupportedException; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/collection/RocksDBBasedMap.java b/hudi-common/src/main/java/org/apache/hudi/common/util/collection/RocksDBBasedMap.java index 38dcaaaf3..c4fbd3a8c 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/collection/RocksDBBasedMap.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/util/collection/RocksDBBasedMap.java @@ -18,7 +18,6 @@ package org.apache.hudi.common.util.collection; -import org.apache.hudi.common.util.RocksDBDAO; import org.apache.hudi.exception.HoodieNotSupportedException; import java.io.Serializable; diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/RocksDBDAO.java b/hudi-common/src/main/java/org/apache/hudi/common/util/collection/RocksDBDAO.java similarity index 98% rename from hudi-common/src/main/java/org/apache/hudi/common/util/RocksDBDAO.java rename to hudi-common/src/main/java/org/apache/hudi/common/util/collection/RocksDBDAO.java index 9296fa75b..84b4953ab 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/RocksDBDAO.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/util/collection/RocksDBDAO.java @@ -16,9 +16,12 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.util.collection; -import org.apache.hudi.common.util.collection.Pair; +import org.apache.hudi.common.util.FileIOUtils; +import org.apache.hudi.common.util.HoodieTimer; +import org.apache.hudi.common.util.SerializationUtils; +import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.exception.HoodieException; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/util/TestHoodieAvroUtils.java b/hudi-common/src/test/java/org/apache/hudi/avro/TestHoodieAvroUtils.java similarity index 98% rename from hudi-common/src/test/java/org/apache/hudi/common/util/TestHoodieAvroUtils.java rename to hudi-common/src/test/java/org/apache/hudi/avro/TestHoodieAvroUtils.java index 2f925b8cc..c0be005ad 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/util/TestHoodieAvroUtils.java +++ b/hudi-common/src/test/java/org/apache/hudi/avro/TestHoodieAvroUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.avro; import org.apache.avro.Schema; import org.codehaus.jackson.JsonNode; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/HoodieCommonTestHarness.java b/hudi-common/src/test/java/org/apache/hudi/common/HoodieCommonTestHarness.java index a3bf255e6..1150ecee4 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/HoodieCommonTestHarness.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/HoodieCommonTestHarness.java @@ -21,8 +21,8 @@ package org.apache.hudi.common; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.view.SyncableFileSystemView; import org.apache.hudi.common.table.view.HoodieTableFileSystemView; import org.junit.Rule; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/bloom/filter/TestBloomFilter.java b/hudi-common/src/test/java/org/apache/hudi/common/bloom/TestBloomFilter.java similarity index 98% rename from hudi-common/src/test/java/org/apache/hudi/common/bloom/filter/TestBloomFilter.java rename to hudi-common/src/test/java/org/apache/hudi/common/bloom/TestBloomFilter.java index 9d999b9cc..1e0514cdd 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/bloom/filter/TestBloomFilter.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/bloom/TestBloomFilter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.bloom.filter; +package org.apache.hudi.common.bloom; import org.junit.Assert; import org.junit.Test; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/bloom/filter/TestInternalDynamicBloomFilter.java b/hudi-common/src/test/java/org/apache/hudi/common/bloom/TestInternalDynamicBloomFilter.java similarity index 97% rename from hudi-common/src/test/java/org/apache/hudi/common/bloom/filter/TestInternalDynamicBloomFilter.java rename to hudi-common/src/test/java/org/apache/hudi/common/bloom/TestInternalDynamicBloomFilter.java index f93355963..58400215e 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/bloom/filter/TestInternalDynamicBloomFilter.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/bloom/TestInternalDynamicBloomFilter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.bloom.filter; +package org.apache.hudi.common.bloom; import org.apache.hadoop.util.hash.Hash; import org.junit.Assert; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/util/TestFSUtils.java b/hudi-common/src/test/java/org/apache/hudi/common/fs/TestFSUtils.java similarity index 99% rename from hudi-common/src/test/java/org/apache/hudi/common/util/TestFSUtils.java rename to hudi-common/src/test/java/org/apache/hudi/common/fs/TestFSUtils.java index 9f9562bba..7bc88e4a1 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/util/TestFSUtils.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/fs/TestFSUtils.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.fs; import org.apache.hudi.common.HoodieCommonTestHarness; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.exception.HoodieException; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/inline/fs/FileSystemTestUtils.java b/hudi-common/src/test/java/org/apache/hudi/common/fs/inline/FileSystemTestUtils.java similarity index 98% rename from hudi-common/src/test/java/org/apache/hudi/common/inline/fs/FileSystemTestUtils.java rename to hudi-common/src/test/java/org/apache/hudi/common/fs/inline/FileSystemTestUtils.java index 5d0b6a4a7..c64b04a45 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/inline/fs/FileSystemTestUtils.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/fs/inline/FileSystemTestUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.inline.fs; +package org.apache.hudi.common.fs.inline; import org.apache.hadoop.fs.Path; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/inline/fs/TestHFileInLining.java b/hudi-common/src/test/java/org/apache/hudi/common/fs/inline/TestHFileInLining.java similarity index 96% rename from hudi-common/src/test/java/org/apache/hudi/common/inline/fs/TestHFileInLining.java rename to hudi-common/src/test/java/org/apache/hudi/common/fs/inline/TestHFileInLining.java index 391a2390a..ddf262d37 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/inline/fs/TestHFileInLining.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/fs/inline/TestHFileInLining.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.inline.fs; +package org.apache.hudi.common.fs.inline; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; @@ -42,10 +42,10 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; -import static org.apache.hudi.common.inline.fs.FileSystemTestUtils.FILE_SCHEME; -import static org.apache.hudi.common.inline.fs.FileSystemTestUtils.RANDOM; -import static org.apache.hudi.common.inline.fs.FileSystemTestUtils.getPhantomFile; -import static org.apache.hudi.common.inline.fs.FileSystemTestUtils.getRandomOuterInMemPath; +import static org.apache.hudi.common.fs.inline.FileSystemTestUtils.FILE_SCHEME; +import static org.apache.hudi.common.fs.inline.FileSystemTestUtils.RANDOM; +import static org.apache.hudi.common.fs.inline.FileSystemTestUtils.getPhantomFile; +import static org.apache.hudi.common.fs.inline.FileSystemTestUtils.getRandomOuterInMemPath; /** * Tests {@link InLineFileSystem} to inline HFile. diff --git a/hudi-common/src/test/java/org/apache/hudi/common/inline/fs/TestInLineFileSystem.java b/hudi-common/src/test/java/org/apache/hudi/common/fs/inline/TestInLineFileSystem.java similarity index 98% rename from hudi-common/src/test/java/org/apache/hudi/common/inline/fs/TestInLineFileSystem.java rename to hudi-common/src/test/java/org/apache/hudi/common/fs/inline/TestInLineFileSystem.java index 2c6d15dba..3e10c4b14 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/inline/fs/TestInLineFileSystem.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/fs/inline/TestInLineFileSystem.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.inline.fs; +package org.apache.hudi.common.fs.inline; import org.apache.hudi.common.util.collection.Pair; @@ -38,8 +38,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.apache.hudi.common.inline.fs.FileSystemTestUtils.RANDOM; -import static org.apache.hudi.common.inline.fs.FileSystemTestUtils.getRandomOuterFSPath; +import static org.apache.hudi.common.fs.inline.FileSystemTestUtils.RANDOM; +import static org.apache.hudi.common.fs.inline.FileSystemTestUtils.getRandomOuterFSPath; /** * Tests {@link InLineFileSystem}. diff --git a/hudi-common/src/test/java/org/apache/hudi/common/inline/fs/TestInMemoryFileSystem.java b/hudi-common/src/test/java/org/apache/hudi/common/fs/inline/TestInMemoryFileSystem.java similarity index 96% rename from hudi-common/src/test/java/org/apache/hudi/common/inline/fs/TestInMemoryFileSystem.java rename to hudi-common/src/test/java/org/apache/hudi/common/fs/inline/TestInMemoryFileSystem.java index 9d739148f..4e3e8892c 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/inline/fs/TestInMemoryFileSystem.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/fs/inline/TestInMemoryFileSystem.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.inline.fs; +package org.apache.hudi.common.fs.inline; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; @@ -27,8 +27,8 @@ import org.junit.Test; import java.io.IOException; import java.net.URI; -import static org.apache.hudi.common.inline.fs.FileSystemTestUtils.RANDOM; -import static org.apache.hudi.common.inline.fs.FileSystemTestUtils.getRandomOuterInMemPath; +import static org.apache.hudi.common.fs.inline.FileSystemTestUtils.RANDOM; +import static org.apache.hudi.common.fs.inline.FileSystemTestUtils.getRandomOuterInMemPath; /** * Unit tests {@link InMemoryFileSystem}. diff --git a/hudi-common/src/test/java/org/apache/hudi/common/minicluster/HdfsTestService.java b/hudi-common/src/test/java/org/apache/hudi/common/minicluster/HdfsTestService.java index 38e62188b..d331a17aa 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/minicluster/HdfsTestService.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/minicluster/HdfsTestService.java @@ -54,7 +54,7 @@ public class HdfsTestService { private MiniDFSCluster miniDfsCluster; public HdfsTestService() throws IOException { - workDir = Files.createTempDirectory("temp").getName(0).toString(); + workDir = Files.createTempDirectory("temp").toFile().getAbsolutePath(); } public Configuration getHadoopConf() { diff --git a/hudi-common/src/test/java/org/apache/hudi/common/model/AvroBinaryTestPayload.java b/hudi-common/src/test/java/org/apache/hudi/common/model/AvroBinaryTestPayload.java index 739f68272..440d92bd5 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/model/AvroBinaryTestPayload.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/model/AvroBinaryTestPayload.java @@ -18,7 +18,7 @@ package org.apache.hudi.common.model; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/model/HoodieTestUtils.java b/hudi-common/src/test/java/org/apache/hudi/common/model/HoodieTestUtils.java index c5fa5b302..700e0070c 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/model/HoodieTestUtils.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/model/HoodieTestUtils.java @@ -26,7 +26,7 @@ import org.apache.hudi.common.HoodieCleanStat; import org.apache.hudi.common.model.HoodieWriteStat.RuntimeStats; import org.apache.hudi.common.table.HoodieTableConfig; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.log.HoodieLogFormat; import org.apache.hudi.common.table.log.HoodieLogFormat.Writer; import org.apache.hudi.common.table.log.block.HoodieAvroDataBlock; @@ -34,11 +34,11 @@ import org.apache.hudi.common.table.log.block.HoodieLogBlock; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; -import org.apache.hudi.common.util.AvroUtils; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; import org.apache.hudi.common.util.CleanerUtils; import org.apache.hudi.common.util.CompactionUtils; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.exception.HoodieIOException; @@ -162,7 +162,7 @@ public class HoodieTestUtils { metaClient.getBasePath() + "/" + HoodieTableMetaClient.METAFOLDER_NAME + "/" + f); os = metaClient.getFs().create(commitFile, true); // Write empty clean metadata - os.write(AvroUtils.serializeCleanerPlan( + os.write(TimelineMetadataUtils.serializeCleanerPlan( new HoodieCleanerPlan(new HoodieActionInstant("", "", ""), "", new HashMap<>(), 1)).get()); } catch (IOException ioe) { throw new HoodieIOException(ioe.getMessage(), ioe); @@ -241,7 +241,7 @@ public class HoodieTestUtils { HoodieCompactionPlan plan = CompactionUtils.buildFromFileSlices(fileSliceList, Option.empty(), Option.empty()); HoodieInstant compactionInstant = new HoodieInstant(State.REQUESTED, HoodieTimeline.COMPACTION_ACTION, instant); metaClient.getActiveTimeline().saveToCompactionRequested(compactionInstant, - AvroUtils.serializeCompactionPlan(plan)); + TimelineMetadataUtils.serializeCompactionPlan(plan)); } public static String getDataFilePath(String basePath, String partitionPath, String instantTime, String fileID) { @@ -306,7 +306,7 @@ public class HoodieTestUtils { HoodieCleanMetadata cleanMetadata = CleanerUtils.convertCleanMetadata(metaClient, instantTime, Option.of(0L), Collections.singletonList(cleanStats)); // Write empty clean metadata - os.write(AvroUtils.serializeCleanMetadata(cleanMetadata).get()); + os.write(TimelineMetadataUtils.serializeCleanMetadata(cleanMetadata).get()); } } diff --git a/hudi-common/src/test/java/org/apache/hudi/common/model/TestHoodieWriteStat.java b/hudi-common/src/test/java/org/apache/hudi/common/model/TestHoodieWriteStat.java index f163e21b6..2f5daa690 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/model/TestHoodieWriteStat.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/model/TestHoodieWriteStat.java @@ -18,7 +18,7 @@ package org.apache.hudi.common.model; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hadoop.fs.Path; import org.junit.Test; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/storage/TestStorageSchemes.java b/hudi-common/src/test/java/org/apache/hudi/common/storage/TestStorageSchemes.java index ebd3d7879..c76a46aa7 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/storage/TestStorageSchemes.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/storage/TestStorageSchemes.java @@ -18,6 +18,7 @@ package org.apache.hudi.common.storage; +import org.apache.hudi.common.fs.StorageSchemes; import org.junit.Test; import static org.junit.Assert.assertFalse; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/table/TestHoodieTableMetaClient.java b/hudi-common/src/test/java/org/apache/hudi/common/table/TestHoodieTableMetaClient.java index 8b9f64391..ae376b4fd 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/table/TestHoodieTableMetaClient.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/table/TestHoodieTableMetaClient.java @@ -22,6 +22,7 @@ import org.apache.hudi.common.HoodieCommonTestHarness; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.util.Option; import org.junit.Before; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/table/TestTimelineLayout.java b/hudi-common/src/test/java/org/apache/hudi/common/table/TestTimelineLayout.java index 386b974a9..9b610a58e 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/table/TestTimelineLayout.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/table/TestTimelineLayout.java @@ -18,10 +18,12 @@ package org.apache.hudi.common.table; -import org.apache.hudi.common.model.TimelineLayoutVersion; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.timeline.TimelineLayout; import org.junit.Assert; import org.junit.Test; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/table/log/TestHoodieLogFormat.java b/hudi-common/src/test/java/org/apache/hudi/common/table/log/TestHoodieLogFormat.java index a19001233..8c3ccd0c9 100755 --- a/hudi-common/src/test/java/org/apache/hudi/common/table/log/TestHoodieLogFormat.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/table/log/TestHoodieLogFormat.java @@ -34,8 +34,8 @@ import org.apache.hudi.common.table.log.block.HoodieDeleteBlock; import org.apache.hudi.common.table.log.block.HoodieLogBlock; import org.apache.hudi.common.table.log.block.HoodieLogBlock.HeaderMetadataType; import org.apache.hudi.common.table.log.block.HoodieLogBlock.HoodieLogBlockType; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.SchemaTestUtil; import org.apache.hudi.exception.CorruptedLogFileException; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/table/string/MockHoodieTimeline.java b/hudi-common/src/test/java/org/apache/hudi/common/table/timeline/MockHoodieTimeline.java similarity index 86% rename from hudi-common/src/test/java/org/apache/hudi/common/table/string/MockHoodieTimeline.java rename to hudi-common/src/test/java/org/apache/hudi/common/table/timeline/MockHoodieTimeline.java index 3726d3db8..8e812830a 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/table/string/MockHoodieTimeline.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/table/timeline/MockHoodieTimeline.java @@ -16,11 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.common.table.string; - -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; -import org.apache.hudi.common.table.timeline.HoodieInstant; +package org.apache.hudi.common.table.timeline; import java.util.Comparator; import java.util.stream.Collectors; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/table/string/TestHoodieActiveTimeline.java b/hudi-common/src/test/java/org/apache/hudi/common/table/timeline/TestHoodieActiveTimeline.java similarity index 98% rename from hudi-common/src/test/java/org/apache/hudi/common/table/string/TestHoodieActiveTimeline.java rename to hudi-common/src/test/java/org/apache/hudi/common/table/timeline/TestHoodieActiveTimeline.java index 7a9dc74b5..31777989c 100755 --- a/hudi-common/src/test/java/org/apache/hudi/common/table/string/TestHoodieActiveTimeline.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/table/timeline/TestHoodieActiveTimeline.java @@ -16,15 +16,12 @@ * limitations under the License. */ -package org.apache.hudi.common.table.string; +package org.apache.hudi.common.table.timeline; import org.apache.hudi.common.HoodieCommonTestHarness; import org.apache.hudi.common.model.HoodieTestUtils; -import org.apache.hudi.common.model.TimelineLayoutVersion; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; -import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; import org.apache.hudi.common.util.CollectionUtils; import org.apache.hudi.common.util.Option; @@ -47,7 +44,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.apache.hudi.common.model.TimelineLayoutVersion.VERSION_0; +import static org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion.VERSION_0; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestHoodieTableFileSystemView.java b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestHoodieTableFileSystemView.java index fde7126c9..c2b2bc55c 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestHoodieTableFileSystemView.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestHoodieTableFileSystemView.java @@ -27,16 +27,15 @@ import org.apache.hudi.common.model.HoodieFileGroup; import org.apache.hudi.common.model.HoodieFileGroupId; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.model.HoodieTableType; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; -import org.apache.hudi.common.table.TableFileSystemView.BaseFileOnlyView; -import org.apache.hudi.common.table.TableFileSystemView.SliceView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; +import org.apache.hudi.common.table.view.TableFileSystemView.BaseFileOnlyView; +import org.apache.hudi.common.table.view.TableFileSystemView.SliceView; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; -import org.apache.hudi.common.util.AvroUtils; import org.apache.hudi.common.util.CompactionUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.Pair; @@ -279,11 +278,11 @@ public class TestHoodieTableFileSystemView extends HoodieCommonTestHarness { new File(basePath + "/" + partitionPath + "/" + compactDataFileName).createNewFile(); compactionInstant = new HoodieInstant(State.INFLIGHT, HoodieTimeline.COMPACTION_ACTION, compactionRequestedTime); HoodieInstant requested = HoodieTimeline.getCompactionRequestedInstant(compactionInstant.getTimestamp()); - commitTimeline.saveToCompactionRequested(requested, AvroUtils.serializeCompactionPlan(compactionPlan)); + commitTimeline.saveToCompactionRequested(requested, TimelineMetadataUtils.serializeCompactionPlan(compactionPlan)); commitTimeline.transitionCompactionRequestedToInflight(requested); } else { compactionInstant = new HoodieInstant(State.REQUESTED, HoodieTimeline.COMPACTION_ACTION, compactionRequestedTime); - commitTimeline.saveToCompactionRequested(compactionInstant, AvroUtils.serializeCompactionPlan(compactionPlan)); + commitTimeline.saveToCompactionRequested(compactionInstant, TimelineMetadataUtils.serializeCompactionPlan(compactionPlan)); } // View immediately after scheduling compaction @@ -1067,7 +1066,7 @@ public class TestHoodieTableFileSystemView extends HoodieCommonTestHarness { new HoodieInstant(State.INFLIGHT, HoodieTimeline.COMPACTION_ACTION, compactionRequestedTime); HoodieInstant requested = HoodieTimeline.getCompactionRequestedInstant(compactionInstant.getTimestamp()); metaClient.getActiveTimeline().saveToCompactionRequested(requested, - AvroUtils.serializeCompactionPlan(compactionPlan)); + TimelineMetadataUtils.serializeCompactionPlan(compactionPlan)); metaClient.getActiveTimeline().transitionCompactionRequestedToInflight(requested); // Fake delta-ingestion after compaction-requested diff --git a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestIncrementalFSViewSync.java b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestIncrementalFSViewSync.java index 08f31746e..9051cc18b 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestIncrementalFSViewSync.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestIncrementalFSViewSync.java @@ -35,15 +35,14 @@ import org.apache.hudi.common.model.HoodieFileGroupId; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.HoodieWriteStat; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; -import org.apache.hudi.common.util.AvroUtils; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; import org.apache.hudi.common.util.CleanerUtils; import org.apache.hudi.common.util.CollectionUtils; import org.apache.hudi.common.util.CompactionUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.common.util.collection.Pair; @@ -70,7 +69,7 @@ import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.apache.hudi.common.table.HoodieTimeline.COMPACTION_ACTION; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.COMPACTION_ACTION; /** * Tests incremental file system view sync. @@ -418,7 +417,7 @@ public class TestIncrementalFSViewSync extends HoodieCommonTestHarness { HoodieCleanMetadata cleanMetadata = CleanerUtils .convertCleanMetadata(metaClient, cleanInstant, Option.empty(), cleanStats); metaClient.getActiveTimeline().saveAsComplete(cleanInflightInstant, - AvroUtils.serializeCleanMetadata(cleanMetadata)); + TimelineMetadataUtils.serializeCleanMetadata(cleanMetadata)); } /** @@ -439,7 +438,7 @@ public class TestIncrementalFSViewSync extends HoodieCommonTestHarness { rollbacks.add(instant); HoodieRollbackMetadata rollbackMetadata = - AvroUtils.convertRollbackMetadata(rollbackInstant, Option.empty(), rollbacks, rollbackStats); + TimelineMetadataUtils.convertRollbackMetadata(rollbackInstant, Option.empty(), rollbacks, rollbackStats); if (isRestore) { HoodieRestoreMetadata metadata = new HoodieRestoreMetadata(); @@ -453,13 +452,13 @@ public class TestIncrementalFSViewSync extends HoodieCommonTestHarness { HoodieInstant restoreInstant = new HoodieInstant(true, HoodieTimeline.RESTORE_ACTION, rollbackInstant); metaClient.getActiveTimeline().createNewInstant(restoreInstant); - metaClient.getActiveTimeline().saveAsComplete(restoreInstant, AvroUtils.serializeRestoreMetadata(metadata)); + metaClient.getActiveTimeline().saveAsComplete(restoreInstant, TimelineMetadataUtils.serializeRestoreMetadata(metadata)); } else { metaClient.getActiveTimeline().createNewInstant( new HoodieInstant(true, HoodieTimeline.ROLLBACK_ACTION, rollbackInstant)); metaClient.getActiveTimeline().saveAsComplete( new HoodieInstant(true, HoodieTimeline.ROLLBACK_ACTION, rollbackInstant), - AvroUtils.serializeRollbackMetadata(rollbackMetadata)); + TimelineMetadataUtils.serializeRollbackMetadata(rollbackMetadata)); } } @@ -501,7 +500,7 @@ public class TestIncrementalFSViewSync extends HoodieCommonTestHarness { HoodieCompactionPlan plan = CompactionUtils.buildFromFileSlices(slices, Option.empty(), Option.empty()); HoodieInstant compactionInstant = new HoodieInstant(State.REQUESTED, HoodieTimeline.COMPACTION_ACTION, instantTime); metaClient.getActiveTimeline().saveToCompactionRequested(compactionInstant, - AvroUtils.serializeCompactionPlan(plan)); + TimelineMetadataUtils.serializeCompactionPlan(plan)); view.sync(); partitions.forEach(p -> { diff --git a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestPriorityBasedFileSystemView.java b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestPriorityBasedFileSystemView.java index d94177ea0..e8c16b43e 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestPriorityBasedFileSystemView.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestPriorityBasedFileSystemView.java @@ -22,9 +22,8 @@ import org.apache.hudi.common.model.CompactionOperation; import org.apache.hudi.common.model.FileSlice; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodieFileGroup; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; -import org.apache.hudi.common.table.string.MockHoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.timeline.MockHoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.ImmutablePair; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestRocksDBBasedIncrementalFSViewSync.java b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestRocksDBBasedIncrementalFSViewSync.java index 1769980c8..355224279 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestRocksDBBasedIncrementalFSViewSync.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestRocksDBBasedIncrementalFSViewSync.java @@ -19,8 +19,7 @@ package org.apache.hudi.common.table.view; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import java.io.IOException; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestRocksDbBasedFileSystemView.java b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestRocksDbBasedFileSystemView.java index 8acf05706..c23944bed 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestRocksDbBasedFileSystemView.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestRocksDbBasedFileSystemView.java @@ -18,8 +18,7 @@ package org.apache.hudi.common.table.view; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import java.io.IOException; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestSpillableMapBasedFileSystemView.java b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestSpillableMapBasedFileSystemView.java index 84cc7d953..35324e7c8 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestSpillableMapBasedFileSystemView.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestSpillableMapBasedFileSystemView.java @@ -18,8 +18,7 @@ package org.apache.hudi.common.table.view; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; /** * Tests spillable map based file system view {@link SyncableFileSystemView}. diff --git a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestSpillableMapBasedIncrementalFSViewSync.java b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestSpillableMapBasedIncrementalFSViewSync.java index 00791aafd..8384d42fe 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestSpillableMapBasedIncrementalFSViewSync.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestSpillableMapBasedIncrementalFSViewSync.java @@ -19,8 +19,7 @@ package org.apache.hudi.common.table.view; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; /** * Tests spillable map based incremental fs view sync. diff --git a/hudi-common/src/test/java/org/apache/hudi/common/util/CompactionTestUtils.java b/hudi-common/src/test/java/org/apache/hudi/common/util/CompactionTestUtils.java index 228e21dee..f5fb24867 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/util/CompactionTestUtils.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/util/CompactionTestUtils.java @@ -18,8 +18,10 @@ package org.apache.hudi.common.util; +import org.apache.hudi.common.table.timeline.TimelineMetadataUtils; import org.apache.hudi.avro.model.HoodieCompactionOperation; import org.apache.hudi.avro.model.HoodieCompactionPlan; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.model.FileSlice; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodieFileGroupId; @@ -45,8 +47,8 @@ import java.util.stream.IntStream; import java.util.stream.Stream; import static org.apache.hudi.common.model.HoodieTestUtils.DEFAULT_PARTITION_PATHS; -import static org.apache.hudi.common.table.HoodieTimeline.COMPACTION_ACTION; -import static org.apache.hudi.common.table.HoodieTimeline.DELTA_COMMIT_ACTION; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.COMPACTION_ACTION; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.DELTA_COMMIT_ACTION; /** * The utility class to support testing compaction. @@ -128,7 +130,7 @@ public class CompactionTestUtils { HoodieCompactionPlan compactionPlan) throws IOException { metaClient.getActiveTimeline().saveToCompactionRequested( new HoodieInstant(State.REQUESTED, COMPACTION_ACTION, instantTime), - AvroUtils.serializeCompactionPlan(compactionPlan)); + TimelineMetadataUtils.serializeCompactionPlan(compactionPlan)); } public static void createDeltaCommit(HoodieTableMetaClient metaClient, String instantTime) { diff --git a/hudi-common/src/test/java/org/apache/hudi/common/util/SchemaTestUtil.java b/hudi-common/src/test/java/org/apache/hudi/common/util/SchemaTestUtil.java index 28a65b929..04546f368 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/util/SchemaTestUtil.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/util/SchemaTestUtil.java @@ -18,6 +18,7 @@ package org.apache.hudi.common.util; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.avro.MercifulJsonConverter; import org.apache.hudi.common.model.HoodieAvroPayload; import org.apache.hudi.common.model.HoodieKey; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/util/TestCompactionUtils.java b/hudi-common/src/test/java/org/apache/hudi/common/util/TestCompactionUtils.java index eb6b73c6d..e2f3e2174 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/util/TestCompactionUtils.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/util/TestCompactionUtils.java @@ -21,6 +21,7 @@ package org.apache.hudi.common.util; import org.apache.hudi.avro.model.HoodieCompactionOperation; import org.apache.hudi.avro.model.HoodieCompactionPlan; import org.apache.hudi.common.HoodieCommonTestHarness; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.model.FileSlice; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodieFileGroupId; @@ -29,7 +30,7 @@ import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.table.HoodieTableMetaClient; import org.apache.hudi.common.util.CompactionTestUtils.TestHoodieBaseFile; import org.apache.hudi.common.util.collection.Pair; -import org.apache.hudi.common.versioning.compaction.CompactionPlanMigrator; +import org.apache.hudi.common.table.timeline.versioning.compaction.CompactionPlanMigrator; import org.apache.hadoop.fs.Path; import org.junit.Assert; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/util/TestDFSPropertiesConfiguration.java b/hudi-common/src/test/java/org/apache/hudi/common/util/TestDFSPropertiesConfiguration.java index 794a7e2ad..4a95fb7a7 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/util/TestDFSPropertiesConfiguration.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/util/TestDFSPropertiesConfiguration.java @@ -23,6 +23,8 @@ import org.apache.hudi.common.minicluster.HdfsTestService; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.DistributedFileSystem; import org.apache.hadoop.hdfs.MiniDFSCluster; +import org.apache.hudi.common.config.DFSPropertiesConfiguration; +import org.apache.hudi.common.config.TypedProperties; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/util/TestParquetUtils.java b/hudi-common/src/test/java/org/apache/hudi/common/util/TestParquetUtils.java index 9f473dee1..ad9a7f163 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/util/TestParquetUtils.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/util/TestParquetUtils.java @@ -18,11 +18,12 @@ package org.apache.hudi.common.util; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.avro.HoodieAvroWriteSupport; import org.apache.hudi.common.HoodieCommonTestHarness; -import org.apache.hudi.common.bloom.filter.BloomFilter; -import org.apache.hudi.common.bloom.filter.BloomFilterFactory; -import org.apache.hudi.common.bloom.filter.BloomFilterTypeCode; +import org.apache.hudi.common.bloom.BloomFilter; +import org.apache.hudi.common.bloom.BloomFilterFactory; +import org.apache.hudi.common.bloom.BloomFilterTypeCode; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieTestUtils; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestDiskBasedMap.java b/hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestDiskBasedMap.java index 3fcfab5d7..3289d62da 100755 --- a/hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestDiskBasedMap.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestDiskBasedMap.java @@ -25,7 +25,7 @@ import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.HoodieRecordSizeEstimator; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.SchemaTestUtil; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestExternalSpillableMap.java b/hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestExternalSpillableMap.java index c4b0d5c5f..013fc2fff 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestExternalSpillableMap.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestExternalSpillableMap.java @@ -25,7 +25,7 @@ import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.util.DefaultSizeEstimator; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.HoodieRecordSizeEstimator; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.SchemaTestUtil; diff --git a/hudi-common/src/test/java/org/apache/hudi/common/util/TestRocksDBManager.java b/hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestRocksDBManager.java similarity index 98% rename from hudi-common/src/test/java/org/apache/hudi/common/util/TestRocksDBManager.java rename to hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestRocksDBManager.java index b03b7cf26..f024a0b00 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/util/TestRocksDBManager.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestRocksDBManager.java @@ -16,10 +16,9 @@ * limitations under the License. */ -package org.apache.hudi.common.util; +package org.apache.hudi.common.util.collection; import org.apache.hudi.common.table.view.FileSystemViewStorageConfig; -import org.apache.hudi.common.util.collection.Pair; import org.junit.AfterClass; import org.junit.Assert; diff --git a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieParquetInputFormat.java b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieParquetInputFormat.java index eaf28fc0f..40ef4713b 100644 --- a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieParquetInputFormat.java +++ b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieParquetInputFormat.java @@ -45,8 +45,8 @@ import org.apache.hudi.common.model.HoodieCommitMetadata; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodiePartitionMetadata; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.TableFileSystemView.BaseFileOnlyView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.view.TableFileSystemView.BaseFileOnlyView; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.view.HoodieTableFileSystemView; import org.apache.hudi.common.util.StringUtils; diff --git a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieROTablePathFilter.java b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieROTablePathFilter.java index eb02a577c..d9e7c7bba 100644 --- a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieROTablePathFilter.java +++ b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieROTablePathFilter.java @@ -18,7 +18,7 @@ package org.apache.hudi.hadoop; -import org.apache.hudi.common.SerializableConfiguration; +import org.apache.hudi.common.config.SerializableConfiguration; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodiePartitionMetadata; import org.apache.hudi.common.table.HoodieTableMetaClient; diff --git a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/AbstractRealtimeRecordReader.java b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/AbstractRealtimeRecordReader.java index df635d618..fddd321ce 100644 --- a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/AbstractRealtimeRecordReader.java +++ b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/AbstractRealtimeRecordReader.java @@ -20,8 +20,8 @@ package org.apache.hudi.hadoop.realtime; import org.apache.hudi.common.model.HoodieAvroPayload; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.HoodieAvroUtils; -import org.apache.hudi.common.util.LogReaderUtils; +import org.apache.hudi.avro.HoodieAvroUtils; +import org.apache.hudi.common.table.log.LogReaderUtils; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.exception.HoodieException; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/HoodieParquetRealtimeInputFormat.java b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/HoodieParquetRealtimeInputFormat.java index 265bc5cf6..eb322e23e 100644 --- a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/HoodieParquetRealtimeInputFormat.java +++ b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/HoodieParquetRealtimeInputFormat.java @@ -22,11 +22,11 @@ import org.apache.hudi.common.model.FileSlice; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.view.HoodieTableFileSystemView; import org.apache.hudi.common.util.CollectionUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.exception.HoodieException; diff --git a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/RealtimeCompactedRecordReader.java b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/RealtimeCompactedRecordReader.java index 46bc1b366..c4cdca233 100644 --- a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/RealtimeCompactedRecordReader.java +++ b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/RealtimeCompactedRecordReader.java @@ -21,8 +21,8 @@ package org.apache.hudi.hadoop.realtime; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.table.log.HoodieMergedLogRecordScanner; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.Option; import org.apache.avro.generic.GenericRecord; diff --git a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/RealtimeUnmergedRecordReader.java b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/RealtimeUnmergedRecordReader.java index 7ec8534ac..d49702bef 100644 --- a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/RealtimeUnmergedRecordReader.java +++ b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/realtime/RealtimeUnmergedRecordReader.java @@ -20,7 +20,7 @@ package org.apache.hudi.hadoop.realtime; import org.apache.hudi.common.table.log.HoodieUnMergedLogRecordScanner; import org.apache.hudi.common.util.DefaultSizeEstimator; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.queue.BoundedInMemoryExecutor; import org.apache.hudi.common.util.queue.BoundedInMemoryQueueProducer; diff --git a/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/InputFormatTestUtil.java b/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/InputFormatTestUtil.java index 426629983..a76e6a17b 100644 --- a/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/InputFormatTestUtil.java +++ b/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/InputFormatTestUtil.java @@ -20,8 +20,8 @@ package org.apache.hudi.hadoop; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieTestUtils; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.SchemaTestUtil; import org.apache.avro.Schema; diff --git a/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/TestHoodieParquetInputFormat.java b/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/TestHoodieParquetInputFormat.java index 0f15f4568..1bd56bdaf 100644 --- a/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/TestHoodieParquetInputFormat.java +++ b/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/TestHoodieParquetInputFormat.java @@ -38,7 +38,7 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hudi.common.model.HoodieCommitMetadata; import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.model.HoodieWriteStat; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/realtime/TestHoodieRealtimeRecordReader.java b/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/realtime/TestHoodieRealtimeRecordReader.java index a206f3615..c570031c3 100644 --- a/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/realtime/TestHoodieRealtimeRecordReader.java +++ b/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/realtime/TestHoodieRealtimeRecordReader.java @@ -22,7 +22,7 @@ import org.apache.hudi.common.model.FileSlice; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.HoodieTestUtils; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.log.HoodieLogFormat; import org.apache.hudi.common.table.log.HoodieLogFormat.Writer; import org.apache.hudi.common.table.log.block.HoodieAvroDataBlock; @@ -30,8 +30,8 @@ import org.apache.hudi.common.table.log.block.HoodieCommandBlock; import org.apache.hudi.common.table.log.block.HoodieCommandBlock.HoodieCommandBlockTypeEnum; import org.apache.hudi.common.table.log.block.HoodieLogBlock; import org.apache.hudi.common.table.log.block.HoodieLogBlock.HeaderMetadataType; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.SchemaTestUtil; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.exception.HoodieException; diff --git a/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncTool.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncTool.java index a651da706..e6572c93a 100644 --- a/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncTool.java +++ b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncTool.java @@ -18,7 +18,7 @@ package org.apache.hudi.hive; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.exception.InvalidTableException; import org.apache.hudi.hadoop.HoodieParquetInputFormat; diff --git a/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java index acbff7f75..6bd3c0508 100644 --- a/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java +++ b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java @@ -22,11 +22,11 @@ import org.apache.hudi.common.model.HoodieCommitMetadata; import org.apache.hudi.common.model.HoodieFileFormat; import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.model.HoodieTableType; -import org.apache.hudi.common.storage.StorageSchemes; +import org.apache.hudi.common.fs.StorageSchemes; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.common.util.collection.Pair; diff --git a/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestUtil.java b/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestUtil.java index c02743ba1..930794ce0 100644 --- a/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestUtil.java +++ b/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestUtil.java @@ -19,9 +19,9 @@ package org.apache.hudi.hive; import org.apache.hudi.avro.HoodieAvroWriteSupport; -import org.apache.hudi.common.bloom.filter.BloomFilter; -import org.apache.hudi.common.bloom.filter.BloomFilterFactory; -import org.apache.hudi.common.bloom.filter.BloomFilterTypeCode; +import org.apache.hudi.common.bloom.BloomFilter; +import org.apache.hudi.common.bloom.BloomFilterFactory; +import org.apache.hudi.common.bloom.BloomFilterTypeCode; import org.apache.hudi.common.minicluster.HdfsTestService; import org.apache.hudi.common.minicluster.ZookeeperTestService; import org.apache.hudi.common.model.HoodieAvroPayload; @@ -32,13 +32,13 @@ import org.apache.hudi.common.model.HoodieLogFile; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.HoodieWriteStat; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.log.HoodieLogFormat; import org.apache.hudi.common.table.log.HoodieLogFormat.Writer; import org.apache.hudi.common.table.log.block.HoodieAvroDataBlock; import org.apache.hudi.common.table.log.block.HoodieLogBlock; import org.apache.hudi.common.table.log.block.HoodieLogBlock.HeaderMetadataType; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.FileIOUtils; import org.apache.hudi.common.util.SchemaTestUtil; import org.apache.hudi.hive.util.HiveTestService; diff --git a/hudi-spark/src/main/java/org/apache/hudi/DataSourceUtils.java b/hudi-spark/src/main/java/org/apache/hudi/DataSourceUtils.java index b47041629..60e586bac 100644 --- a/hudi-spark/src/main/java/org/apache/hudi/DataSourceUtils.java +++ b/hudi-spark/src/main/java/org/apache/hudi/DataSourceUtils.java @@ -27,7 +27,7 @@ import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.util.ReflectionUtils; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieIndexConfig; import org.apache.hudi.config.HoodieWriteConfig; diff --git a/hudi-spark/src/main/java/org/apache/hudi/HoodieDataSourceHelpers.java b/hudi-spark/src/main/java/org/apache/hudi/HoodieDataSourceHelpers.java index ef9825ba2..89faa56eb 100644 --- a/hudi-spark/src/main/java/org/apache/hudi/HoodieDataSourceHelpers.java +++ b/hudi-spark/src/main/java/org/apache/hudi/HoodieDataSourceHelpers.java @@ -20,7 +20,7 @@ package org.apache.hudi; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.util.CollectionUtils; diff --git a/hudi-spark/src/main/java/org/apache/hudi/QuickstartUtils.java b/hudi-spark/src/main/java/org/apache/hudi/QuickstartUtils.java index bc35aad7e..0dd2bf61d 100644 --- a/hudi-spark/src/main/java/org/apache/hudi/QuickstartUtils.java +++ b/hudi-spark/src/main/java/org/apache/hudi/QuickstartUtils.java @@ -21,7 +21,7 @@ package org.apache.hudi; import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.OverwriteWithLatestAvroPayload; -import org.apache.hudi.common.util.HoodieAvroUtils; +import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-spark/src/main/java/org/apache/hudi/keygen/ComplexKeyGenerator.java b/hudi-spark/src/main/java/org/apache/hudi/keygen/ComplexKeyGenerator.java index 80d5488d0..b3308e36a 100644 --- a/hudi-spark/src/main/java/org/apache/hudi/keygen/ComplexKeyGenerator.java +++ b/hudi-spark/src/main/java/org/apache/hudi/keygen/ComplexKeyGenerator.java @@ -21,7 +21,7 @@ package org.apache.hudi.keygen; import org.apache.hudi.DataSourceUtils; import org.apache.hudi.DataSourceWriteOptions; import org.apache.hudi.common.model.HoodieKey; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieKeyException; import org.apache.avro.generic.GenericRecord; diff --git a/hudi-spark/src/main/java/org/apache/hudi/keygen/GlobalDeleteKeyGenerator.java b/hudi-spark/src/main/java/org/apache/hudi/keygen/GlobalDeleteKeyGenerator.java index ebbdb1d3b..bb60e7523 100644 --- a/hudi-spark/src/main/java/org/apache/hudi/keygen/GlobalDeleteKeyGenerator.java +++ b/hudi-spark/src/main/java/org/apache/hudi/keygen/GlobalDeleteKeyGenerator.java @@ -24,7 +24,7 @@ import org.apache.avro.generic.GenericRecord; import org.apache.hudi.DataSourceUtils; import org.apache.hudi.DataSourceWriteOptions; import org.apache.hudi.common.model.HoodieKey; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieKeyException; /** diff --git a/hudi-spark/src/main/java/org/apache/hudi/keygen/KeyGenerator.java b/hudi-spark/src/main/java/org/apache/hudi/keygen/KeyGenerator.java index 56fbcba7e..fcad2e714 100644 --- a/hudi-spark/src/main/java/org/apache/hudi/keygen/KeyGenerator.java +++ b/hudi-spark/src/main/java/org/apache/hudi/keygen/KeyGenerator.java @@ -19,7 +19,7 @@ package org.apache.hudi.keygen; import org.apache.hudi.common.model.HoodieKey; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.avro.generic.GenericRecord; diff --git a/hudi-spark/src/main/java/org/apache/hudi/keygen/NonpartitionedKeyGenerator.java b/hudi-spark/src/main/java/org/apache/hudi/keygen/NonpartitionedKeyGenerator.java index d22997aef..d3b464e51 100644 --- a/hudi-spark/src/main/java/org/apache/hudi/keygen/NonpartitionedKeyGenerator.java +++ b/hudi-spark/src/main/java/org/apache/hudi/keygen/NonpartitionedKeyGenerator.java @@ -20,7 +20,7 @@ package org.apache.hudi.keygen; import org.apache.hudi.DataSourceUtils; import org.apache.hudi.common.model.HoodieKey; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieKeyException; import org.apache.avro.generic.GenericRecord; diff --git a/hudi-spark/src/main/java/org/apache/hudi/keygen/SimpleKeyGenerator.java b/hudi-spark/src/main/java/org/apache/hudi/keygen/SimpleKeyGenerator.java index 67a794220..24430e7df 100644 --- a/hudi-spark/src/main/java/org/apache/hudi/keygen/SimpleKeyGenerator.java +++ b/hudi-spark/src/main/java/org/apache/hudi/keygen/SimpleKeyGenerator.java @@ -21,7 +21,7 @@ package org.apache.hudi.keygen; import org.apache.hudi.DataSourceUtils; import org.apache.hudi.DataSourceWriteOptions; import org.apache.hudi.common.model.HoodieKey; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieKeyException; import org.apache.avro.generic.GenericRecord; diff --git a/hudi-spark/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala b/hudi-spark/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala index b3cf74272..66b614536 100644 --- a/hudi-spark/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala +++ b/hudi-spark/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala @@ -25,10 +25,11 @@ import org.apache.hadoop.fs.{FileSystem, Path} import org.apache.hadoop.hive.conf.HiveConf import org.apache.hudi.DataSourceWriteOptions._ import org.apache.hudi.client.{HoodieWriteClient, WriteStatus} +import org.apache.hudi.common.fs.FSUtils import org.apache.hudi.common.model.HoodieRecordPayload import org.apache.hudi.common.table.HoodieTableMetaClient import org.apache.hudi.common.table.timeline.HoodieActiveTimeline -import org.apache.hudi.common.util.{FSUtils, TypedProperties} +import org.apache.hudi.common.config.TypedProperties import org.apache.hudi.config.HoodieWriteConfig import org.apache.hudi.exception.HoodieException import org.apache.hudi.hive.{HiveSyncConfig, HiveSyncTool} diff --git a/hudi-spark/src/test/scala/TestDataSource.scala b/hudi-spark/src/test/scala/TestDataSource.scala index 6bd32b475..fd0677d8c 100644 --- a/hudi-spark/src/test/scala/TestDataSource.scala +++ b/hudi-spark/src/test/scala/TestDataSource.scala @@ -17,7 +17,7 @@ import org.apache.hadoop.fs.{FileSystem, Path} import org.apache.hudi.common.HoodieTestDataGenerator -import org.apache.hudi.common.util.FSUtils +import org.apache.hudi.common.fs.FSUtils import org.apache.hudi.config.HoodieWriteConfig import org.apache.hudi.{DataSourceReadOptions, DataSourceWriteOptions, HoodieDataSourceHelpers} import org.apache.spark.sql._ diff --git a/hudi-spark/src/test/scala/TestDataSourceDefaults.scala b/hudi-spark/src/test/scala/TestDataSourceDefaults.scala index 5a307d3ba..7a8008f4c 100644 --- a/hudi-spark/src/test/scala/TestDataSourceDefaults.scala +++ b/hudi-spark/src/test/scala/TestDataSourceDefaults.scala @@ -17,10 +17,11 @@ import org.apache.avro.generic.GenericRecord import org.apache.hudi.common.model.{EmptyHoodieRecordPayload, OverwriteWithLatestAvroPayload} -import org.apache.hudi.common.util.{Option, SchemaTestUtil, TypedProperties} +import org.apache.hudi.common.util.{Option, SchemaTestUtil} import org.apache.hudi.exception.{HoodieException, HoodieKeyException} import org.apache.hudi.keygen.{ComplexKeyGenerator, GlobalDeleteKeyGenerator, SimpleKeyGenerator} import org.apache.hudi.DataSourceWriteOptions +import org.apache.hudi.common.config.TypedProperties import org.junit.Assert._ import org.junit.{Before, Test} import org.scalatest.junit.AssertionsForJUnit diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java index 8c49394ac..cde4a921c 100644 --- a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java +++ b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java @@ -18,8 +18,8 @@ package org.apache.hudi.timeline.service; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.view.SyncableFileSystemView; import org.apache.hudi.common.table.timeline.dto.CompactionOpDTO; import org.apache.hudi.common.table.timeline.dto.BaseFileDTO; import org.apache.hudi.common.table.timeline.dto.FileGroupDTO; diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java index bf8b91662..fb7c416b4 100644 --- a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java +++ b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java @@ -18,11 +18,11 @@ package org.apache.hudi.timeline.service; -import org.apache.hudi.common.SerializableConfiguration; +import org.apache.hudi.common.config.SerializableConfiguration; import org.apache.hudi.common.table.view.FileSystemViewManager; import org.apache.hudi.common.table.view.FileSystemViewStorageConfig; import org.apache.hudi.common.table.view.FileSystemViewStorageType; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; diff --git a/hudi-timeline-service/src/test/java/org/apache/hudi/timeline/table/view/TestRemoteHoodieTableFileSystemView.java b/hudi-timeline-service/src/test/java/org/apache/hudi/timeline/table/view/TestRemoteHoodieTableFileSystemView.java index e01988ae4..76ab9c519 100644 --- a/hudi-timeline-service/src/test/java/org/apache/hudi/timeline/table/view/TestRemoteHoodieTableFileSystemView.java +++ b/hudi-timeline-service/src/test/java/org/apache/hudi/timeline/table/view/TestRemoteHoodieTableFileSystemView.java @@ -18,9 +18,9 @@ package org.apache.hudi.timeline.table.view; -import org.apache.hudi.common.SerializableConfiguration; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.config.SerializableConfiguration; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.view.SyncableFileSystemView; import org.apache.hudi.common.table.view.FileSystemViewManager; import org.apache.hudi.common.table.view.FileSystemViewStorageConfig; import org.apache.hudi.common.table.view.FileSystemViewStorageType; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HDFSParquetImporter.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HDFSParquetImporter.java index e566a3e71..f06531f61 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HDFSParquetImporter.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HDFSParquetImporter.java @@ -26,9 +26,9 @@ import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.table.HoodieTableConfig; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieIOException; import com.beust.jcommander.IValueValidator; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCleaner.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCleaner.java index 6780a85e0..b6d7f2a2c 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCleaner.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCleaner.java @@ -19,8 +19,8 @@ package org.apache.hudi.utilities; import org.apache.hudi.client.HoodieWriteClient; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.config.HoodieWriteConfig; import com.beust.jcommander.JCommander; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCompactionAdminTool.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCompactionAdminTool.java index 6c3928d17..6798761c7 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCompactionAdminTool.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCompactionAdminTool.java @@ -23,7 +23,7 @@ import org.apache.hudi.client.CompactionAdminClient.RenameOpResult; import org.apache.hudi.client.CompactionAdminClient.ValidationOpResult; import org.apache.hudi.common.model.HoodieFileGroupId; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCompactor.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCompactor.java index 8dc0e0077..553750d15 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCompactor.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCompactor.java @@ -20,9 +20,9 @@ package org.apache.hudi.utilities; import org.apache.hudi.client.HoodieWriteClient; import org.apache.hudi.client.WriteStatus; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotCopier.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotCopier.java index 8c81ddf35..9d6690279 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotCopier.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotCopier.java @@ -18,16 +18,16 @@ package org.apache.hudi.utilities; -import org.apache.hudi.common.SerializableConfiguration; +import org.apache.hudi.common.config.SerializableConfiguration; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodiePartitionMetadata; import org.apache.hudi.common.table.HoodieTableConfig; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.TableFileSystemView.BaseFileOnlyView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.view.TableFileSystemView.BaseFileOnlyView; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.view.HoodieTableFileSystemView; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import com.beust.jcommander.JCommander; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotExporter.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotExporter.java index 7d48d5554..fb4a5db56 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotExporter.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotExporter.java @@ -18,18 +18,18 @@ package org.apache.hudi.utilities; -import org.apache.hudi.common.SerializableConfiguration; +import org.apache.hudi.common.config.SerializableConfiguration; import org.apache.hudi.common.model.HoodieBaseFile; import org.apache.hudi.common.model.HoodiePartitionMetadata; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.table.HoodieTableConfig; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; -import org.apache.hudi.common.table.TableFileSystemView.BaseFileOnlyView; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.view.TableFileSystemView.BaseFileOnlyView; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.view.HoodieTableFileSystemView; import org.apache.hudi.common.util.CollectionUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ReflectionUtils; import org.apache.hudi.common.util.StringUtils; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/UtilHelpers.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/UtilHelpers.java index 50254ddaf..78a72ff9a 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/UtilHelpers.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/UtilHelpers.java @@ -22,10 +22,10 @@ import org.apache.avro.Schema; import org.apache.hudi.AvroConversionUtils; import org.apache.hudi.client.HoodieWriteClient; import org.apache.hudi.client.WriteStatus; -import org.apache.hudi.common.util.DFSPropertiesConfiguration; +import org.apache.hudi.common.config.DFSPropertiesConfiguration; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ReflectionUtils; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieIndexConfig; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/adhoc/UpgradePayloadFromUberToApache.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/adhoc/UpgradePayloadFromUberToApache.java index 06a83e30a..8c702253b 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/adhoc/UpgradePayloadFromUberToApache.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/adhoc/UpgradePayloadFromUberToApache.java @@ -21,7 +21,7 @@ package org.apache.hudi.utilities.adhoc; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.table.HoodieTableConfig; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.config.HoodieCompactionConfig; import com.beust.jcommander.JCommander; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/DeltaSync.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/DeltaSync.java index 31eef7ed8..798eb2042 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/DeltaSync.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/DeltaSync.java @@ -29,10 +29,10 @@ import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.model.HoodieRecordPayload; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieIndexConfig; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/HoodieDeltaStreamer.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/HoodieDeltaStreamer.java index 5bf81c234..a27e63526 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/HoodieDeltaStreamer.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/HoodieDeltaStreamer.java @@ -22,13 +22,13 @@ import org.apache.hudi.client.HoodieWriteClient; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.OverwriteWithLatestAvroPayload; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieInstant.State; import org.apache.hudi.common.util.CompactionUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.exception.HoodieException; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/keygen/TimestampBasedKeyGenerator.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/keygen/TimestampBasedKeyGenerator.java index b8019b476..660fcdd67 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/keygen/TimestampBasedKeyGenerator.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/keygen/TimestampBasedKeyGenerator.java @@ -21,7 +21,7 @@ package org.apache.hudi.utilities.keygen; import org.apache.hudi.DataSourceUtils; import org.apache.hudi.keygen.SimpleKeyGenerator; import org.apache.hudi.common.model.HoodieKey; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieKeyException; import org.apache.hudi.exception.HoodieNotSupportedException; import org.apache.hudi.utilities.exception.HoodieDeltaStreamerException; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/perf/TimelineServerPerf.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/perf/TimelineServerPerf.java index e9a5f8008..c6e00074d 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/perf/TimelineServerPerf.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/perf/TimelineServerPerf.java @@ -20,11 +20,11 @@ package org.apache.hudi.utilities.perf; import org.apache.hudi.common.model.FileSlice; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.SyncableFileSystemView; +import org.apache.hudi.common.table.view.SyncableFileSystemView; import org.apache.hudi.common.table.view.FileSystemViewStorageConfig; import org.apache.hudi.common.table.view.FileSystemViewStorageType; import org.apache.hudi.common.table.view.RemoteHoodieTableFileSystemView; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.timeline.service.TimelineService; import org.apache.hudi.utilities.UtilHelpers; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/FilebasedSchemaProvider.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/FilebasedSchemaProvider.java index 0ce8f0b11..70a693da4 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/FilebasedSchemaProvider.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/FilebasedSchemaProvider.java @@ -19,8 +19,8 @@ package org.apache.hudi.utilities.schema; import org.apache.hudi.DataSourceUtils; -import org.apache.hudi.common.util.FSUtils; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieIOException; import org.apache.avro.Schema; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/JdbcbasedSchemaProvider.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/JdbcbasedSchemaProvider.java index b5622fdb4..2e9b41333 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/JdbcbasedSchemaProvider.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/JdbcbasedSchemaProvider.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.schema; import org.apache.avro.Schema; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieException; import org.apache.hudi.utilities.UtilHelpers; import org.apache.spark.api.java.JavaSparkContext; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/NullTargetSchemaRegistryProvider.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/NullTargetSchemaRegistryProvider.java index 2fde2b8b6..5983238e8 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/NullTargetSchemaRegistryProvider.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/NullTargetSchemaRegistryProvider.java @@ -18,7 +18,7 @@ package org.apache.hudi.utilities.schema; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.avro.Schema; import org.apache.spark.api.java.JavaSparkContext; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/RowBasedSchemaProvider.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/RowBasedSchemaProvider.java index 6c8a3d0d2..8fe8e6c33 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/RowBasedSchemaProvider.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/RowBasedSchemaProvider.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.schema; import org.apache.hudi.AvroConversionUtils; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.avro.Schema; import org.apache.spark.api.java.JavaSparkContext; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/SchemaProvider.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/SchemaProvider.java index 53d015ccc..b90f07d92 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/SchemaProvider.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/SchemaProvider.java @@ -18,7 +18,7 @@ package org.apache.hudi.utilities.schema; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.avro.Schema; import org.apache.spark.api.java.JavaSparkContext; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/SchemaRegistryProvider.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/SchemaRegistryProvider.java index 263ddce1d..636668a5c 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/SchemaRegistryProvider.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/SchemaRegistryProvider.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.schema; import org.apache.hudi.DataSourceUtils; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieIOException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroDFSSource.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroDFSSource.java index e79197090..feedbffce 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroDFSSource.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroDFSSource.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.utilities.schema.SchemaProvider; import org.apache.hudi.utilities.sources.helpers.DFSPathSelector; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroKafkaSource.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroKafkaSource.java index b2139882c..c5f485706 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroKafkaSource.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroKafkaSource.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.utilities.schema.SchemaProvider; import org.apache.hudi.utilities.sources.helpers.KafkaOffsetGen; import org.apache.hudi.utilities.sources.helpers.KafkaOffsetGen.CheckpointUtils; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroSource.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroSource.java index 24d787883..e8ea266ca 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroSource.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroSource.java @@ -18,7 +18,7 @@ package org.apache.hudi.utilities.sources; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.utilities.schema.SchemaProvider; import org.apache.avro.generic.GenericRecord; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/CsvDFSSource.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/CsvDFSSource.java index b8ccd6e90..d6cb87a54 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/CsvDFSSource.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/CsvDFSSource.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.utilities.schema.SchemaProvider; import org.apache.hudi.utilities.sources.helpers.DFSPathSelector; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/HiveIncrPullSource.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/HiveIncrPullSource.java index a440eb06f..bd498b18d 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/HiveIncrPullSource.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/HiveIncrPullSource.java @@ -19,9 +19,9 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.DataSourceUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieIOException; import org.apache.hudi.utilities.HiveIncrementalPuller; import org.apache.hudi.utilities.schema.SchemaProvider; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/HoodieIncrSource.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/HoodieIncrSource.java index 0b03507b7..ad1113ac0 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/HoodieIncrSource.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/HoodieIncrSource.java @@ -22,7 +22,7 @@ import org.apache.hudi.DataSourceReadOptions; import org.apache.hudi.DataSourceUtils; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.hive.SlashEncodedDayPartitionValueExtractor; import org.apache.hudi.utilities.schema.SchemaProvider; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/JsonDFSSource.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/JsonDFSSource.java index 37f67e47b..7414b6bf8 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/JsonDFSSource.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/JsonDFSSource.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.utilities.schema.SchemaProvider; import org.apache.hudi.utilities.sources.helpers.DFSPathSelector; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/JsonKafkaSource.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/JsonKafkaSource.java index 51a1ae1de..8d6c9ca09 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/JsonKafkaSource.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/JsonKafkaSource.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.utilities.schema.SchemaProvider; import org.apache.hudi.utilities.sources.helpers.KafkaOffsetGen; import org.apache.hudi.utilities.sources.helpers.KafkaOffsetGen.CheckpointUtils; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/JsonSource.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/JsonSource.java index fb569e904..301430044 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/JsonSource.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/JsonSource.java @@ -18,7 +18,7 @@ package org.apache.hudi.utilities.sources; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.utilities.schema.SchemaProvider; import org.apache.spark.api.java.JavaRDD; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/ParquetDFSSource.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/ParquetDFSSource.java index 3a8f722c8..c527dd397 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/ParquetDFSSource.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/ParquetDFSSource.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.utilities.schema.SchemaProvider; import org.apache.hudi.utilities.sources.helpers.DFSPathSelector; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/RowSource.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/RowSource.java index 9e289f102..fdd1ed86e 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/RowSource.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/RowSource.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.utilities.schema.RowBasedSchemaProvider; import org.apache.hudi.utilities.schema.SchemaProvider; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/Source.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/Source.java index 500691612..a36767702 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/Source.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/Source.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.utilities.schema.SchemaProvider; import org.apache.spark.api.java.JavaSparkContext; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/DFSPathSelector.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/DFSPathSelector.java index ba4a40542..49d3374ae 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/DFSPathSelector.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/DFSPathSelector.java @@ -19,9 +19,9 @@ package org.apache.hudi.utilities.sources.helpers; import org.apache.hudi.DataSourceUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.common.util.collection.ImmutablePair; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.exception.HoodieIOException; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/IncrSourceHelper.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/IncrSourceHelper.java index 44fd50dd9..4d349496c 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/IncrSourceHelper.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/IncrSourceHelper.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources.helpers; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.ValidationUtils; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/KafkaOffsetGen.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/KafkaOffsetGen.java index 2989f2003..197130ab8 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/KafkaOffsetGen.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/KafkaOffsetGen.java @@ -20,7 +20,7 @@ package org.apache.hudi.utilities.sources.helpers; import org.apache.hudi.DataSourceUtils; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieNotSupportedException; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -50,7 +50,7 @@ public class KafkaOffsetGen { public static class CheckpointUtils { /** - * Reconstruct checkpoint from string. + * Reconstruct checkpoint from timeline. */ public static HashMap strToOffsets(String checkpointStr) { HashMap offsetMap = new HashMap<>(); diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/AWSDmsTransformer.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/AWSDmsTransformer.java index bffa6e407..71fb56472 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/AWSDmsTransformer.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/AWSDmsTransformer.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.transform; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.payload.AWSDmsAvroPayload; import org.apache.spark.api.java.JavaSparkContext; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/FlatteningTransformer.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/FlatteningTransformer.java index aabcb73ae..a85fb1a5f 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/FlatteningTransformer.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/FlatteningTransformer.java @@ -18,7 +18,7 @@ package org.apache.hudi.utilities.transform; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/SqlQueryBasedTransformer.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/SqlQueryBasedTransformer.java index 8210fb14b..9429c89d0 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/SqlQueryBasedTransformer.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/SqlQueryBasedTransformer.java @@ -18,7 +18,7 @@ package org.apache.hudi.utilities.transform; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/Transformer.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/Transformer.java index 46857e61d..60278d758 100644 --- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/Transformer.java +++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/Transformer.java @@ -18,7 +18,7 @@ package org.apache.hudi.utilities.transform; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.sql.Dataset; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHDFSParquetImporter.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHDFSParquetImporter.java index e4aac06c3..e97c9dbf1 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHDFSParquetImporter.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHDFSParquetImporter.java @@ -23,7 +23,7 @@ import org.apache.hudi.client.HoodieWriteClient; import org.apache.hudi.common.HoodieTestDataGenerator; import org.apache.hudi.common.minicluster.HdfsTestService; import org.apache.hudi.common.model.HoodieTestUtils; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; import org.apache.avro.generic.GenericRecord; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHoodieDeltaStreamer.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHoodieDeltaStreamer.java index 92daf3a56..b1f9ea10c 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHoodieDeltaStreamer.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHoodieDeltaStreamer.java @@ -26,12 +26,12 @@ import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.model.OverwriteWithLatestAvroPayload; import org.apache.hudi.common.table.HoodieTableConfig; import org.apache.hudi.common.table.HoodieTableMetaClient; -import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.HoodieInstant; -import org.apache.hudi.common.util.DFSPropertiesConfiguration; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.config.DFSPropertiesConfiguration; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.exception.TableNotFoundException; import org.apache.hudi.exception.HoodieException; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHoodieSnapshotCopier.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHoodieSnapshotCopier.java index 349b5aab6..a94e28f28 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHoodieSnapshotCopier.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHoodieSnapshotCopier.java @@ -21,7 +21,7 @@ package org.apache.hudi.utilities; import org.apache.hudi.common.HoodieCommonTestHarness; import org.apache.hudi.common.HoodieTestDataGenerator; import org.apache.hudi.common.model.HoodieTestUtils; -import org.apache.hudi.common.util.FSUtils; +import org.apache.hudi.common.fs.FSUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestJdbcbasedSchemaProvider.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestJdbcbasedSchemaProvider.java index 8a2fe78e0..6b9c94054 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestJdbcbasedSchemaProvider.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestJdbcbasedSchemaProvider.java @@ -18,7 +18,7 @@ package org.apache.hudi.utilities; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieException; import org.apache.hudi.utilities.schema.JdbcbasedSchemaProvider; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestTimestampBasedKeyGenerator.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestTimestampBasedKeyGenerator.java index b358bd6f5..377e93336 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestTimestampBasedKeyGenerator.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestTimestampBasedKeyGenerator.java @@ -23,7 +23,7 @@ import org.apache.avro.generic.GenericRecord; import org.apache.hudi.DataSourceWriteOptions; import org.apache.hudi.common.model.HoodieKey; import org.apache.hudi.common.util.SchemaTestUtil; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.utilities.keygen.TimestampBasedKeyGenerator; import org.junit.Before; import org.junit.Test; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/UtilitiesTestBase.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/UtilitiesTestBase.java index ffb8e47bd..0dde23b28 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/UtilitiesTestBase.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/UtilitiesTestBase.java @@ -27,7 +27,7 @@ import org.apache.hudi.common.model.HoodieTestUtils; import org.apache.hudi.common.table.HoodieTableMetaClient; import org.apache.hudi.common.util.CollectionUtils; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.exception.HoodieIOException; import org.apache.hudi.hive.HiveSyncConfig; import org.apache.hudi.hive.HoodieHiveClient; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/inline/fs/TestParquetInLining.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/inline/fs/TestParquetInLining.java index 9479e284b..e8a4f30b5 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/inline/fs/TestParquetInLining.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/inline/fs/TestParquetInLining.java @@ -19,9 +19,9 @@ package org.apache.hudi.utilities.inline.fs; import org.apache.hudi.common.HoodieTestDataGenerator; -import org.apache.hudi.common.inline.fs.FileSystemTestUtils; -import org.apache.hudi.common.inline.fs.InLineFileSystem; -import org.apache.hudi.common.inline.fs.InMemoryFileSystem; +import org.apache.hudi.common.fs.inline.FileSystemTestUtils; +import org.apache.hudi.common.fs.inline.InLineFileSystem; +import org.apache.hudi.common.fs.inline.InMemoryFileSystem; import org.apache.hudi.common.model.HoodieRecord; import org.apache.avro.generic.GenericRecord; @@ -43,9 +43,9 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import static org.apache.hudi.common.inline.fs.FileSystemTestUtils.FILE_SCHEME; -import static org.apache.hudi.common.inline.fs.FileSystemTestUtils.getPhantomFile; -import static org.apache.hudi.common.inline.fs.FileSystemTestUtils.getRandomOuterInMemPath; +import static org.apache.hudi.common.fs.inline.FileSystemTestUtils.FILE_SCHEME; +import static org.apache.hudi.common.fs.inline.FileSystemTestUtils.getPhantomFile; +import static org.apache.hudi.common.fs.inline.FileSystemTestUtils.getRandomOuterInMemPath; /** * Tests {@link InLineFileSystem} with Parquet writer and reader. hudi-common can't access HoodieTestDataGenerator. diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/AbstractBaseTestSource.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/AbstractBaseTestSource.java index 86ac361af..bec86aec7 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/AbstractBaseTestSource.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/AbstractBaseTestSource.java @@ -21,7 +21,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.HoodieTestDataGenerator; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.common.util.collection.RocksDBBasedMap; import org.apache.hudi.exception.HoodieIOException; import org.apache.hudi.utilities.schema.SchemaProvider; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/DistributedTestDataSource.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/DistributedTestDataSource.java index 4aaa1d611..6a5b356bf 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/DistributedTestDataSource.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/DistributedTestDataSource.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.utilities.schema.SchemaProvider; import org.apache.hudi.utilities.sources.config.TestSourceConfig; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestCsvDFSSource.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestCsvDFSSource.java index fbb6d8f54..35cf5e90a 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestCsvDFSSource.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestCsvDFSSource.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.model.HoodieRecord; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.utilities.UtilitiesTestBase; import org.apache.hudi.utilities.schema.FilebasedSchemaProvider; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestDataSource.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestDataSource.java index 2667cc735..9a5fdaa5f 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestDataSource.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestDataSource.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.utilities.schema.SchemaProvider; import org.apache.avro.generic.GenericRecord; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestJsonDFSSource.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestJsonDFSSource.java index 3cdae7aa7..58596cdcd 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestJsonDFSSource.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestJsonDFSSource.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.model.HoodieRecord; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.utilities.UtilitiesTestBase; import org.apache.hadoop.fs.Path; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestKafkaSource.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestKafkaSource.java index b58247f14..0706b9e6e 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestKafkaSource.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestKafkaSource.java @@ -21,7 +21,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.AvroConversionUtils; import org.apache.hudi.common.HoodieTestDataGenerator; import org.apache.hudi.common.util.Option; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.utilities.UtilitiesTestBase; import org.apache.hudi.utilities.deltastreamer.SourceFormatAdapter; import org.apache.hudi.utilities.schema.FilebasedSchemaProvider; diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestParquetDFSSource.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestParquetDFSSource.java index 6d8d7001a..19fd3f140 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestParquetDFSSource.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestParquetDFSSource.java @@ -19,7 +19,7 @@ package org.apache.hudi.utilities.sources; import org.apache.hudi.common.model.HoodieRecord; -import org.apache.hudi.common.util.TypedProperties; +import org.apache.hudi.common.config.TypedProperties; import org.apache.hadoop.fs.Path; import org.junit.Before;