Murtadha Hubail has submitted this change and it was merged. Change subject: [NO ISSUE][REPL] Use String.compareTo To Sort Replicated Files ......................................................................
[NO ISSUE][REPL] Use String.compareTo To Sort Replicated Files - user model changes: no - storage format changes: no - interface changes: no - Use String.compareTo to sort replicated files instead of custom comparator. Change-Id: I45c106d5cff6e07d16a9a7ce286a2ac563a80338 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2547 Reviewed-by: Michael Blow <[email protected]> Sonar-Qube: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Contrib: Jenkins <[email protected]> --- M asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/sync/ReplicaFilesSynchronizer.java 1 file changed, 2 insertions(+), 12 deletions(-) Approvals: Anon. E. Moose #1000171: Jenkins: Verified; No violations found; ; Verified Michael Blow: Looks good to me, approved diff --git a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/sync/ReplicaFilesSynchronizer.java b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/sync/ReplicaFilesSynchronizer.java index 0d97a7a..583f33d 100644 --- a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/sync/ReplicaFilesSynchronizer.java +++ b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/sync/ReplicaFilesSynchronizer.java @@ -18,12 +18,9 @@ */ package org.apache.asterix.replication.sync; -import static org.apache.asterix.common.utils.StorageConstants.METADATA_FILE_NAME; - import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.SocketChannel; -import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -42,13 +39,6 @@ * Ensures that the files between master and a replica are synchronized */ public class ReplicaFilesSynchronizer { - - private static final Comparator<String> REPLICATED_FILES_COMPARATOR = (file, anotherFile) -> { - if (file.endsWith(METADATA_FILE_NAME) && !anotherFile.endsWith(METADATA_FILE_NAME)) { - return -1; - } - return file.compareTo(anotherFile); - }; private final PartitionReplica replica; private final INcApplicationContext appCtx; @@ -89,8 +79,8 @@ private void replicateMissingFiles(List<String> files) { final FileSynchronizer sync = new FileSynchronizer(appCtx, replica); - // sort files to ensure index metadata files are replicated first - files.sort(REPLICATED_FILES_COMPARATOR); + // sort files to ensure index metadata files starting with "." are replicated first + files.sort(String::compareTo); files.forEach(sync::replicate); } -- To view, visit https://asterix-gerrit.ics.uci.edu/2547 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45c106d5cff6e07d16a9a7ce286a2ac563a80338 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: release-0.9.4-pre-rc Gerrit-Owner: Murtadha Hubail <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]> Gerrit-Reviewer: abdullah alamoudi <[email protected]>
