yihua commented on code in PR #12826:
URL: https://github.com/apache/hudi/pull/12826#discussion_r1974239573
##########
hudi-client/hudi-client-common/src/test/java/org/apache/hudi/utils/TestMetadataConversionUtils.java:
##########
@@ -194,8 +197,8 @@ public void testArchivedClean() throws Exception {
HoodieLSMTimelineInstant archived =
MetadataConversionUtils.createLSMTimelineInstant(getActiveInstant(newCommitTime),
metaClient);
assertEquals(newCommitTime, archived.getInstantTime());
assertEquals(HoodieTimeline.CLEAN_ACTION, archived.getAction());
- assertDoesNotThrow(() -> CleanerUtils.getCleanerMetadata(metaClient,
archived.getMetadata().array()));
- assertDoesNotThrow(() ->
TimelineMetadataUtils.deserializeCleanerPlan(archived.getPlan().array()));
+ assertDoesNotThrow(() -> CleanerUtils.getCleanerMetadata(metaClient, new
ByteArrayInputStream(archived.getMetadata().array())));
+ assertDoesNotThrow(() -> deserializeAvroMetadata(new
ByteArrayInputStream(archived.getPlan().array()), HoodieCleanerPlan.class));
Review Comment:
Revisit this to see if we can rewrite this.
##########
hudi-client/hudi-client-common/src/test/java/org/apache/hudi/utils/HoodieWriterClientTestHarness.java:
##########
@@ -933,9 +926,8 @@ protected void testMetadataStatsOnCommit(boolean
populateMetaFields, Function tr
metaClient = createMetaClient();
instant = INSTANT_GENERATOR.createNewInstant(COMPLETED, COMMIT_ACTION,
instantTime1);
// Read from commit file
- metadata = metaClient.getCommitMetadataSerDe().deserialize(instant,
- metaClient.reloadActiveTimeline().getInstantDetails(instant).get(),
- HoodieCommitMetadata.class);
+ HoodieActiveTimeline activeTimeline1 = metaClient.reloadActiveTimeline();
+ metadata = activeTimeline1.loadInstantContent(instant,
HoodieCommitMetadata.class);
Review Comment:
similar here
##########
hudi-client/hudi-client-common/src/test/java/org/apache/hudi/utils/HoodieWriterClientTestHarness.java:
##########
@@ -912,9 +906,8 @@ protected void testMetadataStatsOnCommit(boolean
populateMetaFields, Function tr
// Read from commit file
HoodieInstant instant = INSTANT_GENERATOR.createNewInstant(COMPLETED,
COMMIT_ACTION, instantTime0);
- HoodieCommitMetadata metadata =
metaClient.getCommitMetadataSerDe().deserialize(instant,
-
createMetaClient().reloadActiveTimeline().getInstantDetails(instant).get(),
- HoodieCommitMetadata.class);
+ HoodieActiveTimeline activeTimeline =
createMetaClient().reloadActiveTimeline();
+ HoodieCommitMetadata metadata = activeTimeline.loadInstantContent(instant,
HoodieCommitMetadata.class);
Review Comment:
nit: could be merged into one line
##########
hudi-client/hudi-client-common/src/test/java/org/apache/hudi/utils/TestMetadataConversionUtils.java:
##########
@@ -244,17 +244,15 @@ public void testArchivedInsertOverwriteWithClustering()
throws Exception {
HoodieLSMTimelineInstant archived =
MetadataConversionUtils.createLSMTimelineInstant(getActiveInstant(newCommitTime),
metaClient);
assertEquals(newCommitTime, archived.getInstantTime());
assertEquals(HoodieTimeline.REPLACE_COMMIT_ACTION, archived.getAction());
- assertDoesNotThrow(() ->
HoodieReplaceCommitMetadata.fromBytes(archived.getMetadata().array(),
HoodieReplaceCommitMetadata.class));
- assertDoesNotThrow(() ->
TimelineMetadataUtils.deserializeRequestedReplaceMetadata(archived.getPlan().array()));
+ assertDoesNotThrow(() -> deserializeAvroMetadata(new
ByteArrayInputStream(archived.getPlan().array()),
HoodieRequestedReplaceMetadata.class));
Review Comment:
Should this be `HoodieReplaceCommitMetadata`?
##########
hudi-client/hudi-client-common/src/test/java/org/apache/hudi/utils/TestMetadataConversionUtils.java:
##########
@@ -206,8 +209,7 @@ public void testArchivedReplace() throws Exception {
HoodieLSMTimelineInstant archived =
MetadataConversionUtils.createLSMTimelineInstant(getActiveInstant(newCommitTime),
metaClient);
assertEquals(newCommitTime, archived.getInstantTime());
assertEquals(HoodieTimeline.REPLACE_COMMIT_ACTION, archived.getAction());
- assertDoesNotThrow(() ->
HoodieReplaceCommitMetadata.fromBytes(archived.getMetadata().array(),
HoodieReplaceCommitMetadata.class));
- assertDoesNotThrow(() ->
TimelineMetadataUtils.deserializeRequestedReplaceMetadata(archived.getPlan().array()));
+ assertDoesNotThrow(() -> deserializeAvroMetadata(new
ByteArrayInputStream(archived.getPlan().array()),
HoodieRequestedReplaceMetadata.class));
Review Comment:
Check this again.
##########
hudi-client/hudi-client-common/src/test/java/org/apache/hudi/utils/TestMetadataConversionUtils.java:
##########
@@ -206,8 +209,7 @@ public void testArchivedReplace() throws Exception {
HoodieLSMTimelineInstant archived =
MetadataConversionUtils.createLSMTimelineInstant(getActiveInstant(newCommitTime),
metaClient);
assertEquals(newCommitTime, archived.getInstantTime());
assertEquals(HoodieTimeline.REPLACE_COMMIT_ACTION, archived.getAction());
- assertDoesNotThrow(() ->
HoodieReplaceCommitMetadata.fromBytes(archived.getMetadata().array(),
HoodieReplaceCommitMetadata.class));
- assertDoesNotThrow(() ->
TimelineMetadataUtils.deserializeRequestedReplaceMetadata(archived.getPlan().array()));
+ assertDoesNotThrow(() -> deserializeAvroMetadata(new
ByteArrayInputStream(archived.getPlan().array()),
HoodieRequestedReplaceMetadata.class));
Review Comment:
Should this be `HoodieReplaceCommitMetadata`?
##########
hudi-client/hudi-client-common/src/test/java/org/apache/hudi/utils/TestMetadataConversionUtils.java:
##########
@@ -244,17 +244,15 @@ public void testArchivedInsertOverwriteWithClustering()
throws Exception {
HoodieLSMTimelineInstant archived =
MetadataConversionUtils.createLSMTimelineInstant(getActiveInstant(newCommitTime),
metaClient);
assertEquals(newCommitTime, archived.getInstantTime());
assertEquals(HoodieTimeline.REPLACE_COMMIT_ACTION, archived.getAction());
- assertDoesNotThrow(() ->
HoodieReplaceCommitMetadata.fromBytes(archived.getMetadata().array(),
HoodieReplaceCommitMetadata.class));
- assertDoesNotThrow(() ->
TimelineMetadataUtils.deserializeRequestedReplaceMetadata(archived.getPlan().array()));
+ assertDoesNotThrow(() -> deserializeAvroMetadata(new
ByteArrayInputStream(archived.getPlan().array()),
HoodieRequestedReplaceMetadata.class));
String newCommitTime2 = HoodieTestTable.makeNewCommitTime();
createReplace(newCommitTime2, WriteOperationType.INSERT_OVERWRITE_TABLE,
true);
// test conversion to archived instant
HoodieLSMTimelineInstant archived2 =
MetadataConversionUtils.createLSMTimelineInstant(getActiveInstant(newCommitTime2),
metaClient);
assertEquals(newCommitTime2, archived2.getInstantTime());
assertEquals(HoodieTimeline.REPLACE_COMMIT_ACTION, archived2.getAction());
- assertDoesNotThrow(() ->
HoodieReplaceCommitMetadata.fromBytes(archived2.getMetadata().array(),
HoodieReplaceCommitMetadata.class));
- assertDoesNotThrow(() ->
TimelineMetadataUtils.deserializeRequestedReplaceMetadata(archived2.getPlan().array()));
+ assertDoesNotThrow(() -> deserializeAvroMetadata(new
ByteArrayInputStream(archived2.getPlan().array()),
HoodieRequestedReplaceMetadata.class));
Review Comment:
Should this be `HoodieReplaceCommitMetadata`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
