From bb90dedfc84dc3a1aa7c3eb2e64320346f5e192c Mon Sep 17 00:00:00 2001 From: lamber-ken Date: Fri, 27 Dec 2019 01:13:47 +0800 Subject: [PATCH 1/4] [MINOR] Fix out of limits for results --- .../apache/hudi/cli/commands/HoodieLogFileCommand.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java index 77b93133f..b8ca6c0c8 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java @@ -215,9 +215,11 @@ public class HoodieLogFileCommand implements CommandMarker { if (n instanceof HoodieAvroDataBlock) { HoodieAvroDataBlock blk = (HoodieAvroDataBlock) n; List records = blk.getRecords(); - allRecords.addAll(records); - if (allRecords.size() >= limit) { - break; + for(IndexedRecord record : records) { + if (allRecords.size() >= limit) { + break; + } + allRecords.add(record); } } } From 36c0e6bae142d18dd0c4ede9c04dc20005380562 Mon Sep 17 00:00:00 2001 From: lamber-ken Date: Fri, 27 Dec 2019 01:16:24 +0800 Subject: [PATCH 2/4] [MINOR] Fix out of limits for results --- .../java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java index b8ca6c0c8..dc0f43e69 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java @@ -215,7 +215,7 @@ public class HoodieLogFileCommand implements CommandMarker { if (n instanceof HoodieAvroDataBlock) { HoodieAvroDataBlock blk = (HoodieAvroDataBlock) n; List records = blk.getRecords(); - for(IndexedRecord record : records) { + for (IndexedRecord record : records) { if (allRecords.size() >= limit) { break; } From 74b00d1f954b5146611f26e55c567861898b084f Mon Sep 17 00:00:00 2001 From: lamber-ken Date: Fri, 27 Dec 2019 02:06:26 +0800 Subject: [PATCH 3/4] trigger rebuild From 619f5010549220c98cb6849ebcfb3592a811c679 Mon Sep 17 00:00:00 2001 From: lamber-ken Date: Tue, 31 Dec 2019 13:59:26 +0800 Subject: [PATCH 4/4] Clean up code --- .../apache/hudi/cli/commands/HoodieLogFileCommand.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java index dc0f43e69..f9bea4785 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/HoodieLogFileCommand.java @@ -198,10 +198,9 @@ public class HoodieLogFileCommand implements CommandMarker { HoodieMemoryConfig.DEFAULT_SPILLABLE_MAP_BASE_PATH); for (HoodieRecord hoodieRecord : scanner) { Option record = hoodieRecord.getData().getInsertValue(readerSchema); - if (allRecords.size() >= limit) { - break; + if (allRecords.size() < limit) { + allRecords.add(record.get()); } - allRecords.add(record.get()); } } else { for (String logFile : logFilePaths) { @@ -216,10 +215,9 @@ public class HoodieLogFileCommand implements CommandMarker { HoodieAvroDataBlock blk = (HoodieAvroDataBlock) n; List records = blk.getRecords(); for (IndexedRecord record : records) { - if (allRecords.size() >= limit) { - break; + if (allRecords.size() < limit) { + allRecords.add(record); } - allRecords.add(record); } } }