remove some unrelated changes

apache · Dec 2, 2024 · 7602888 · 7602888
1 parent 296161b
commit 7602888
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/...egment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/AzureCompact.java b/...egment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/AzureCompact.java
@@ -383,7 +383,7 @@ public int run() throws IOException, StorageException, URISyntaxException {
                     return 0;
                 }
             }
-            System.out.print("    -> compacting\n");
+            System.out.printf("    -> compacting\n");
 
             boolean success = false;
             switch (gcType) {
@@ -400,7 +400,7 @@ public int run() throws IOException, StorageException, URISyntaxException {
                 return 1;
             }
 
-            System.out.print("    -> [skipping] cleaning up\n");
+            System.out.printf("    -> [skipping] cleaning up\n");
             gcGeneration = store.getHead().getGcGeneration();
             root = store.getHead().getRecordId();
         } catch (Exception e) {
@@ -411,7 +411,7 @@ public int run() throws IOException, StorageException, URISyntaxException {
         }
 
         watch.stop();
-        System.out.print("    after\n");
+        System.out.printf("    after\n");
         List<String> afterArchives = Collections.emptyList();
         try {
             afterArchives = rwArchiveManager.listArchives();

diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java
@@ -46,6 +46,8 @@ public final class RecordId implements Comparable<RecordId> {
 
     static final int SERIALIZED_RECORD_ID_BYTES = 20;
 
+    public static RecordId[] EMPTY_ARRAY = new RecordId[0];
+
     public static RecordId fromString(SegmentIdProvider idProvider, String id) {
         Matcher matcher = PATTERN.matcher(id);
         if (matcher.matches()) {

diff --git a/...rc/main/java/org/apache/jackrabbit/oak/segment/file/DefaultGarbageCollectionStrategy.java b/...rc/main/java/org/apache/jackrabbit/oak/segment/file/DefaultGarbageCollectionStrategy.java
@@ -105,7 +105,11 @@ public List<String> cleanup(Context context) throws IOException {
         ));
     }
 
-    void run(Context context, EstimationStrategy estimationStrategy, CompactionStrategy compactionStrategy) throws IOException {
+    public List<String> cleanup(Context context, CompactionResult compactionResult) throws IOException {
+        return getCleanupStrategy().cleanup(newCleanupStrategyContext(context, compactionResult));
+    }
+
+    private void run(Context context, EstimationStrategy estimationStrategy, CompactionStrategy compactionStrategy) throws IOException {
         try {
             context.getGCListener().info("started");
 
@@ -159,10 +163,6 @@ void run(Context context, EstimationStrategy estimationStrategy, CompactionStrat
         }
     }
 
-    public List<String> cleanup(Context context, CompactionResult compactionResult) throws IOException {
-        return getCleanupStrategy().cleanup(newCleanupStrategyContext(context, compactionResult));
-    }
-
     private EstimationStrategy.Context newEstimationStrategyContext(Context context) {
         return new EstimationStrategy.Context() {