voonhous commented on code in PR #18816:
URL: https://github.com/apache/hudi/pull/18816#discussion_r3887454458
##########
hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestRepairsCommand.java:
##########
@@ -227,19 +222,31 @@ public void testOverwriteHoodieProperties() throws
IOException {
.collect(Collectors.toMap(e -> String.valueOf(e.getKey()), e ->
String.valueOf(e.getValue())));
expected.putIfAbsent(TABLE_CHECKSUM.key(),
String.valueOf(generateChecksum(tableConfig.getProps())));
expected.putIfAbsent(DROP_PARTITION_COLUMNS.key(),
String.valueOf(DROP_PARTITION_COLUMNS.defaultValue()));
+
+ // Add properties that are now present in Hudi 1.x by default
+ if (result.containsKey(HoodieTableConfig.TIMELINE_PATH.key())) {
+ expected.putIfAbsent(HoodieTableConfig.TIMELINE_PATH.key(),
result.get(HoodieTableConfig.TIMELINE_PATH.key()));
+ }
+ if (result.containsKey("hoodie.table.initial.version")) {
+ expected.putIfAbsent("hoodie.table.initial.version",
result.get("hoodie.table.initial.version"));
+ }
+ if (result.containsKey(HoodieTableConfig.TIMELINE_HISTORY_PATH.key())) {
+ expected.putIfAbsent(HoodieTableConfig.TIMELINE_HISTORY_PATH.key(),
result.get(HoodieTableConfig.TIMELINE_HISTORY_PATH.key()));
+ }
+
assertEquals(expected, result);
// check result
- List<String> allPropsStr = Arrays.asList(NAME.key(), TYPE.key(),
VERSION.key(),
- TIMELINE_HISTORY_PATH.key(), TIMELINE_LAYOUT_VERSION.key(),
TABLE_CHECKSUM.key(), DROP_PARTITION_COLUMNS.key());
+ // Include all properties from both old and new props for comparison
+ java.util.Set<String> allKeys = new java.util.HashSet<>(result.keySet());
+ allKeys.addAll(oldProps.keySet());
+ List<String> allPropsStr =
allKeys.stream().sorted().collect(java.util.stream.Collectors.toList());
String[][] rows = allPropsStr.stream().sorted().map(key -> new String[]
{key,
oldProps.getOrDefault(key, "null"), result.getOrDefault(key,
"null")})
.toArray(String[][]::new);
- String expect = HoodiePrintHelper.print(new String[]
{HoodieTableHeaderFields.HEADER_HOODIE_PROPERTY,
- HoodieTableHeaderFields.HEADER_OLD_VALUE,
HoodieTableHeaderFields.HEADER_NEW_VALUE}, rows);
- expect = removeNonWordAndStripSpace(expect);
- String got = removeNonWordAndStripSpace(cmdResult.toString());
- assertEquals(expect, got);
+ String got = cmdResult.toString();
+
assertTrue(got.contains(org.apache.hudi.common.table.HoodieTableConfig.NAME.key()));
Review Comment:
Strengthened -- the rendered table is now checked for a row per property in
both `expected` and `oldProps`, naming any missing key, rather than two
substrings. Note `assertEquals(expected, result)` just above already validates
the full property map; this covers the print path.
--
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]
