This is an automated email from the ASF dual-hosted git repository. vinoth pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push: new 0cb24e4 [MINOR] Use HoodieActiveTimeline.COMMIT_FORMATTER (#1874) 0cb24e4 is described below commit 0cb24e4a2defd8e639437b6cd145a26f038ef1af Author: Raymond Xu <2701446+xushi...@users.noreply.github.com> AuthorDate: Fri Jul 24 18:48:56 2020 -0700 [MINOR] Use HoodieActiveTimeline.COMMIT_FORMATTER (#1874) --- .../java/org/apache/hudi/common/fs/TestFSUtils.java | 10 +++++----- .../apache/hudi/common/model/TestHoodieWriteStat.java | 4 ++-- .../apache/hudi/common/testutils/HoodieTestUtils.java | 19 +++++++++---------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/hudi-common/src/test/java/org/apache/hudi/common/fs/TestFSUtils.java b/hudi-common/src/test/java/org/apache/hudi/common/fs/TestFSUtils.java index 0e35df5..f1d8078 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/fs/TestFSUtils.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/fs/TestFSUtils.java @@ -37,7 +37,6 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -46,6 +45,7 @@ import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.Stream; +import static org.apache.hudi.common.table.timeline.HoodieActiveTimeline.COMMIT_FORMATTER; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -72,14 +72,14 @@ public class TestFSUtils extends HoodieCommonTestHarness { @Test public void testMakeDataFileName() { - String instantTime = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + String instantTime = COMMIT_FORMATTER.format(new Date()); String fileName = UUID.randomUUID().toString(); assertEquals(FSUtils.makeDataFileName(instantTime, TEST_WRITE_TOKEN, fileName), fileName + "_" + TEST_WRITE_TOKEN + "_" + instantTime + ".parquet"); } @Test public void testMaskFileName() { - String instantTime = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + String instantTime = COMMIT_FORMATTER.format(new Date()); int taskPartitionId = 2; assertEquals(FSUtils.maskWithoutFileId(instantTime, taskPartitionId), "*_" + taskPartitionId + "_" + instantTime + ".parquet"); } @@ -144,7 +144,7 @@ public class TestFSUtils extends HoodieCommonTestHarness { @Test public void testGetCommitTime() { - String instantTime = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + String instantTime = COMMIT_FORMATTER.format(new Date()); String fileName = UUID.randomUUID().toString(); String fullFileName = FSUtils.makeDataFileName(instantTime, TEST_WRITE_TOKEN, fileName); assertEquals(instantTime, FSUtils.getCommitTime(fullFileName)); @@ -152,7 +152,7 @@ public class TestFSUtils extends HoodieCommonTestHarness { @Test public void testGetFileNameWithoutMeta() { - String instantTime = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + String instantTime = COMMIT_FORMATTER.format(new Date()); String fileName = UUID.randomUUID().toString(); String fullFileName = FSUtils.makeDataFileName(instantTime, TEST_WRITE_TOKEN, fileName); assertEquals(fileName, FSUtils.getFileId(fullFileName)); 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 a01effa..7136ce7 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 @@ -23,10 +23,10 @@ import org.apache.hudi.common.fs.FSUtils; import org.apache.hadoop.fs.Path; import org.junit.jupiter.api.Test; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.UUID; +import static org.apache.hudi.common.table.timeline.HoodieActiveTimeline.COMMIT_FORMATTER; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -37,7 +37,7 @@ public class TestHoodieWriteStat { @Test public void testSetPaths() { - String instantTime = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + String instantTime = COMMIT_FORMATTER.format(new Date()); String basePathString = "/data/tables/some-hoodie-table"; String partitionPathString = "2017/12/31"; String fileName = UUID.randomUUID().toString(); diff --git a/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestUtils.java b/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestUtils.java index cbf3af6..9ad904f 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestUtils.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestUtils.java @@ -18,12 +18,6 @@ package org.apache.hudi.common.testutils; -import org.apache.hadoop.fs.FSDataOutputStream; -import org.apache.hadoop.fs.FileStatus; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.LocatedFileStatus; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.fs.RemoteIterator; import org.apache.hudi.avro.HoodieAvroUtils; import org.apache.hudi.avro.model.HoodieActionInstant; import org.apache.hudi.avro.model.HoodieCleanMetadata; @@ -47,7 +41,6 @@ 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.timeline.HoodieActiveTimeline; 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; @@ -66,6 +59,12 @@ import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.apache.avro.generic.IndexedRecord; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FSDataOutputStream; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.LocatedFileStatus; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.RemoteIterator; import org.apache.hadoop.util.StringUtils; import java.io.ByteArrayInputStream; @@ -78,7 +77,6 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.file.Files; import java.nio.file.Paths; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -94,6 +92,7 @@ import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.Stream; +import static org.apache.hudi.common.table.timeline.HoodieActiveTimeline.COMMIT_FORMATTER; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -160,7 +159,7 @@ public class HoodieTestUtils { } public static String makeNewCommitTime() { - return new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + return COMMIT_FORMATTER.format(new Date()); } public static void createCommitFiles(String basePath, String... instantTimes) throws IOException { @@ -488,7 +487,7 @@ public class HoodieTestUtils { cal.add(Calendar.SECOND, startSecsDelta); List<String> commits = new ArrayList<>(); for (int i = 0; i < numTimestamps; i++) { - commits.add(HoodieActiveTimeline.COMMIT_FORMATTER.format(cal.getTime())); + commits.add(COMMIT_FORMATTER.format(cal.getTime())); cal.add(Calendar.SECOND, 1); } return commits;