lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

[HUDI-245]: replaced instances of getInstants() and reverse() with getReverseOrderedInstants() (#1000)

Browse Source
This commit is contained in:
pratyakshsharma
2019-11-07 22:12:48 +05:30
committed by vinoth chandar
parent 20871a17b2
commit 0863b1cfd9
5 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hudi-cli/src/main/java/org/apache/hudi/cli/commands/CleansCommand.java
View File

@@ -20,7 +20,6 @@ package org.apache.hudi.cli.commands;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -69,9 +68,8 @@ public class CleansCommand implements CommandMarker {
HoodieActiveTimeline activeTimeline = HoodieCLI.tableMetadata.getActiveTimeline(); HoodieActiveTimeline activeTimeline = HoodieCLI.tableMetadata.getActiveTimeline();
HoodieTimeline timeline = activeTimeline.getCleanerTimeline().filterCompletedInstants(); HoodieTimeline timeline = activeTimeline.getCleanerTimeline().filterCompletedInstants();
List<HoodieInstant> cleans = timeline.getInstants().collect(Collectors.toList()); List<HoodieInstant> cleans = timeline.getReverseOrderedInstants().collect(Collectors.toList());
List<Comparable[]> rows = new ArrayList<>(); List<Comparable[]> rows = new ArrayList<>();
Collections.reverse(cleans);
for (int i = 0; i < cleans.size(); i++) { for (int i = 0; i < cleans.size(); i++) {
HoodieInstant clean = cleans.get(i); HoodieInstant clean = cleans.get(i);
HoodieCleanMetadata cleanMetadata = HoodieCleanMetadata cleanMetadata =

4
hudi-cli/src/main/java/org/apache/hudi/cli/commands/CommitsCommand.java
View File

@@ -20,7 +20,6 @@ package org.apache.hudi.cli.commands;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -80,9 +79,8 @@ public class CommitsCommand implements CommandMarker {
HoodieActiveTimeline activeTimeline = HoodieCLI.tableMetadata.getActiveTimeline(); HoodieActiveTimeline activeTimeline = HoodieCLI.tableMetadata.getActiveTimeline();
HoodieTimeline timeline = activeTimeline.getCommitsTimeline().filterCompletedInstants(); HoodieTimeline timeline = activeTimeline.getCommitsTimeline().filterCompletedInstants();
List<HoodieInstant> commits = timeline.getInstants().collect(Collectors.toList()); List<HoodieInstant> commits = timeline.getReverseOrderedInstants().collect(Collectors.toList());
List<Comparable[]> rows = new ArrayList<>(); List<Comparable[]> rows = new ArrayList<>();
Collections.reverse(commits);
for (int i = 0; i < commits.size(); i++) { for (int i = 0; i < commits.size(); i++) {
HoodieInstant commit = commits.get(i); HoodieInstant commit = commits.get(i);
HoodieCommitMetadata commitMetadata = HoodieCommitMetadata commitMetadata =

4
hudi-cli/src/main/java/org/apache/hudi/cli/commands/CompactionCommand.java
View File

@@ -21,7 +21,6 @@ package org.apache.hudi.cli.commands;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -89,9 +88,8 @@ public class CompactionCommand implements CommandMarker {
HoodieTimeline commitTimeline = activeTimeline.getCommitTimeline().filterCompletedInstants(); HoodieTimeline commitTimeline = activeTimeline.getCommitTimeline().filterCompletedInstants();
Set<String> committed = commitTimeline.getInstants().map(HoodieInstant::getTimestamp).collect(Collectors.toSet()); Set<String> committed = commitTimeline.getInstants().map(HoodieInstant::getTimestamp).collect(Collectors.toSet());
List<HoodieInstant> instants = timeline.getInstants().collect(Collectors.toList()); List<HoodieInstant> instants = timeline.getReverseOrderedInstants().collect(Collectors.toList());
List<Comparable[]> rows = new ArrayList<>(); List<Comparable[]> rows = new ArrayList<>();
Collections.reverse(instants);
for (int i = 0; i < instants.size(); i++) { for (int i = 0; i < instants.size(); i++) {
HoodieInstant instant = instants.get(i); HoodieInstant instant = instants.get(i);
HoodieCompactionPlan workload = null; HoodieCompactionPlan workload = null;

4
hudi-cli/src/main/java/org/apache/hudi/cli/commands/SavepointsCommand.java
View File

@@ -19,7 +19,6 @@
package org.apache.hudi.cli.commands; package org.apache.hudi.cli.commands;
import java.io.IOException; import java.io.IOException;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.hudi.HoodieWriteClient; import org.apache.hudi.HoodieWriteClient;
@@ -70,9 +69,8 @@ public class SavepointsCommand implements CommandMarker {
public String showSavepoints() throws IOException { public String showSavepoints() throws IOException {
HoodieActiveTimeline activeTimeline = HoodieCLI.tableMetadata.getActiveTimeline(); HoodieActiveTimeline activeTimeline = HoodieCLI.tableMetadata.getActiveTimeline();
HoodieTimeline timeline = activeTimeline.getSavePointTimeline().filterCompletedInstants(); HoodieTimeline timeline = activeTimeline.getSavePointTimeline().filterCompletedInstants();
List<HoodieInstant> commits = timeline.getInstants().collect(Collectors.toList()); List<HoodieInstant> commits = timeline.getReverseOrderedInstants().collect(Collectors.toList());
String[][] rows = new String[commits.size()][]; String[][] rows = new String[commits.size()][];
Collections.reverse(commits);
for (int i = 0; i < commits.size(); i++) { for (int i = 0; i < commits.size(); i++) {
HoodieInstant commit = commits.get(i); HoodieInstant commit = commits.get(i);
rows[i] = new String[] {commit.getTimestamp()}; rows[i] = new String[] {commit.getTimestamp()};

10
hudi-client/src/main/java/org/apache/hudi/HoodieWriteClient.java
View File

@@ -26,7 +26,6 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.text.ParseException; import java.text.ParseException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -746,11 +745,10 @@ public class HoodieWriteClient<T extends HoodieRecordPayload> extends AbstractHo
// Create a Hoodie table which encapsulated the commits and files visible // Create a Hoodie table which encapsulated the commits and files visible
HoodieTable<T> table = HoodieTable.getHoodieTable(createMetaClient(true), config, jsc); HoodieTable<T> table = HoodieTable.getHoodieTable(createMetaClient(true), config, jsc);
// Get all the commits on the timeline after the provided commit time // Get all the commits on the timeline after the provided commit time
List<HoodieInstant> instantsToRollback = table.getActiveTimeline().getCommitsAndCompactionTimeline().getInstants() List<HoodieInstant> instantsToRollback = table.getActiveTimeline().getCommitsAndCompactionTimeline()
.getReverseOrderedInstants()
.filter(instant -> HoodieActiveTimeline.GREATER.test(instant.getTimestamp(), instantTime)) .filter(instant -> HoodieActiveTimeline.GREATER.test(instant.getTimestamp(), instantTime))
.collect(Collectors.toList()); .collect(Collectors.toList());
// reverse the commits to descending order of commit time
Collections.reverse(instantsToRollback);
// Start a rollback instant for all commits to be rolled back // Start a rollback instant for all commits to be rolled back
String startRollbackInstant = startInstant(); String startRollbackInstant = startInstant();
// Start the timer // Start the timer
@@ -1116,8 +1114,8 @@ public class HoodieWriteClient<T extends HoodieRecordPayload> extends AbstractHo
private void rollbackInflightCommits() { private void rollbackInflightCommits() {
HoodieTable<T> table = HoodieTable.getHoodieTable(createMetaClient(true), config, jsc); HoodieTable<T> table = HoodieTable.getHoodieTable(createMetaClient(true), config, jsc);
HoodieTimeline inflightTimeline = table.getMetaClient().getCommitsTimeline().filterInflightsExcludingCompaction(); HoodieTimeline inflightTimeline = table.getMetaClient().getCommitsTimeline().filterInflightsExcludingCompaction();
List<String> commits = inflightTimeline.getInstants().map(HoodieInstant::getTimestamp).collect(Collectors.toList()); List<String> commits = inflightTimeline.getReverseOrderedInstants().map(HoodieInstant::getTimestamp)
Collections.reverse(commits); .collect(Collectors.toList());
for (String commit : commits) { for (String commit : commits) {
rollback(commit); rollback(commit);
} }