Revert "OAK-11299: Missing Segments With Oak Run Segment Copy (#1892)"

This reverts commit 8785c85.

Author: reschke

oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsSegmentStoreMigrator.java

@@ -32,14 +32,12 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 import org.apache.jackrabbit.oak.commons.Buffer;
 import org.apache.jackrabbit.oak.segment.aws.AwsContext;
 import org.apache.jackrabbit.oak.segment.aws.AwsPersistence;
 import org.apache.jackrabbit.oak.segment.aws.tool.AwsToolUtils.SegmentStoreType;
 import org.apache.jackrabbit.oak.segment.file.tar.TarPersistence;
-import org.apache.jackrabbit.oak.segment.remote.RemoteUtilities;
 import org.apache.jackrabbit.oak.segment.spi.RepositoryNotReachableException;
 import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitorAdapter;
 import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitorAdapter;
@@ -157,12 +155,9 @@ private void migrateArchives() throws IOException, ExecutionException, Interrupt
         List<String> targetArchives = targetManager.listArchives();
 
         if (appendMode && !targetArchives.isEmpty()) {
-            // sort archives by index
-            // last archive could have been updated since last copy and may need to be recopied
-            targetArchives = targetArchives.stream()
-                    .sorted(RemoteUtilities.ARCHIVE_INDEX_COMPARATOR)
-                    .limit(targetArchives.size() - 1)
-                    .collect(Collectors.toList());
+            //last archive can be updated since last copy and needs to be recopied
+            String lastArchive = targetArchives.get(targetArchives.size() - 1);
+            targetArchives.remove(lastArchive);
         }
 
         for (String archiveName : sourceManager.listArchives()) {

oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentCopy.java

@@ -387,7 +387,7 @@ public int run() {
 
             } catch (Exception e) {
                 watch.stop();
-                printMessage(errWriter, "A problem occurred while copying archives from {0} to {1} ", source,
+                printMessage(errWriter, "A problem occured while copying archives from {0} to {1} ", source,
                         destination);
                 e.printStackTrace(errWriter);
                 return 1;

oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentStoreMigrator.java

@@ -25,7 +25,6 @@
 import org.apache.jackrabbit.oak.segment.azure.tool.ToolUtils.SegmentStoreType;
 import org.apache.jackrabbit.oak.segment.azure.util.Retrier;
 import org.apache.jackrabbit.oak.segment.file.tar.TarPersistence;
-import org.apache.jackrabbit.oak.segment.remote.RemoteUtilities;
 import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitorAdapter;
 import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitorAdapter;
 import org.apache.jackrabbit.oak.segment.spi.monitor.RemoteStoreMonitorAdapter;
@@ -54,7 +53,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 public class SegmentStoreMigrator implements Closeable  {
 
@@ -164,12 +162,9 @@ private void migrateArchives() throws IOException, ExecutionException, Interrupt
         List<String> targetArchives = targetManager.listArchives();
 
         if (appendMode && !targetArchives.isEmpty()) {
-            // sort archives by index
-            // last archive could have been updated since last copy and may need to be recopied
-            targetArchives = targetArchives.stream()
-                    .sorted(RemoteUtilities.ARCHIVE_INDEX_COMPARATOR)
-                    .limit(targetArchives.size() - 1)
-                    .collect(Collectors.toList());
+            //last archive can be updated since last copy and needs to be recopied
+            String lastArchive = targetArchives.get(targetArchives.size() - 1);
+            targetArchives.remove(lastArchive);
         }
 
         for (String archiveName : sourceManager.listArchives()) {

oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/RemoteUtilities.java

@@ -20,7 +20,6 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Comparator;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -29,7 +28,6 @@ public final class RemoteUtilities {
     public static final boolean OFF_HEAP = getBoolean("access.off.heap");
     public static final String SEGMENT_FILE_NAME_PATTERN = "^([0-9a-f]{4})\\.([0-9a-f-]+)$";
     public static final int MAX_ENTRY_COUNT = 0x10000;
-    public static final Comparator<String> ARCHIVE_INDEX_COMPARATOR = new ArchiveIndexComparator();
 
     private static final Pattern PATTERN = Pattern.compile(SEGMENT_FILE_NAME_PATTERN);
 
@@ -52,17 +50,4 @@ public static UUID getSegmentUUID(@NotNull String segmentFileName) {
         }
         return UUID.fromString(m.group(2));
     }
-
-    private static class ArchiveIndexComparator implements Comparator<String> {
-        final static Pattern indexPattern = Pattern.compile("[0-9]+");
-
-        @Override
-        public int compare(String archive1, String archive2) {
-            Matcher matcher1 = indexPattern.matcher(archive1);
-            int index1 = matcher1.find() ? Integer.parseInt(matcher1.group()) : 0;
-            Matcher matcher2 = indexPattern.matcher(archive2);
-            int index2 = matcher2.find() ? Integer.parseInt(matcher2.group()) : 0;
-            return index1 - index2;
-        }
-    }
 }

oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/package-info.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 @Internal(since = "1.0.0")
-@Version("1.4.0")
+@Version("1.3.0")
 package org.apache.jackrabbit.oak.segment.remote;
 
 import org.apache.jackrabbit.oak.commons.annotations.Internal;

oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/RemoteUtilitiesTest.java

@@ -18,10 +18,6 @@
 
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import java.util.UUID;
 
 import static org.junit.Assert.assertEquals;
@@ -39,31 +35,14 @@ public void testValidEntryIndex() {
         assertEquals(uuid, RemoteUtilities.getSegmentUUID(name));
     }
 
-    @Test
-    public void testInvalidEntryIndex() {
-        UUID uuid = UUID.randomUUID();
-        String name = RemoteUtilities.getSegmentFileName(
+  @Test
+  public void testInvalidEntryIndex() {
+    UUID uuid = UUID.randomUUID();
+    String name = RemoteUtilities.getSegmentFileName(
             RemoteUtilities.MAX_ENTRY_COUNT,
             uuid.getMostSignificantBits(),
             uuid.getLeastSignificantBits()
-        );
-        assertNotEquals(uuid, RemoteUtilities.getSegmentUUID(name));
-    }
-
-    private void expectArchiveSortOrder(List<String> expectedOrder) {
-        List<String> archives = new ArrayList<>(expectedOrder);
-        Collections.shuffle(archives);
-        archives.sort(RemoteUtilities.ARCHIVE_INDEX_COMPARATOR);
-        assertEquals(expectedOrder, archives);
-    }
-
-    @Test
-    public void testSortArchives() {
-        expectArchiveSortOrder(Arrays.asList("data00001a.tar", "data00002a.tar", "data00003a.tar"));
-    }
-
-    @Test
-    public void testSortArchivesLargeIndices() {
-        expectArchiveSortOrder(Arrays.asList("data00003a.tar", "data20000a.tar", "data100000a.tar"));
-    }
+    );
+    assertNotEquals(uuid, RemoteUtilities.getSegmentUUID(name));
+  }
 }