[jackrabbit-oak] branch OAK-10199 updated: OAK-10199 : renamed method name to avoid confusion with other variable of same name

[daim]

This is an automated email from the ASF dual-hosted git repository.

daim pushed a commit to branch OAK-10199
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/OAK-10199 by this push:
     new d1fa0bb92e OAK-10199 : renamed method name to avoid confusion with 
other variable of same name
d1fa0bb92e is described below

commit d1fa0bb92ec2097fcc467fd10dd3cb23645b014d
Author: Rishabh Kumar <d...@adobe.com>
AuthorDate: Fri Aug 4 14:18:02 2023 +0530

    OAK-10199 : renamed method name to avoid confusion with other variable of 
same name
---
 .../jackrabbit/oak/plugins/document/VersionGarbageCollector.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
 
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
index 8b84d5c4b1..138edef1a9 100644
--- 
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
+++ 
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
@@ -633,8 +633,7 @@ public class VersionGarbageCollector {
          * @param headRevision the current head revision of node store
          * @param rec {@link VersionGCRecommendations} to recommend GC 
operation
          */
-        private void collectDetailedGarbage(final GCPhases phases, final 
RevisionVector headRevision, final VersionGCRecommendations rec)
-                throws IOException {
+        private void collectDetailedGarbage(final GCPhases phases, final 
RevisionVector headRevision, final VersionGCRecommendations rec) {
 
             final long oldestModifiedMs = rec.scopeDetailedGC.fromMs;
             final long toModifiedMs = rec.scopeDetailedGC.toMs;
@@ -666,7 +665,7 @@ public class VersionGarbageCollector {
                                 docsTraversed++;
                                 if (docsTraversed % 100 == 0) {
                                     monitor.info("Iterated through {} 
documents so far. {} had detailed garbage",
-                                            docsTraversed, 
gc.getGarbageDocsCount());
+                                            docsTraversed, 
gc.getGarbageCount());
                                 }
 
                                 lastDoc = doc;
@@ -865,7 +864,7 @@ public class VersionGarbageCollector {
 
         private void collectUnmergedBranchCommitDocument(final NodeDocument 
doc, final GCPhases phases, final UpdateOp updateOp) {
             if (phases.start(GCPhase.DETAILED_GC_COLLECT_UNMERGED_BC)){
-                // TODO add umerged BC collection logic
+                // TODO add unmerged BC collection logic
                 phases.stop(GCPhase.DETAILED_GC_COLLECT_UNMERGED_BC);
             }
 
@@ -912,7 +911,7 @@ public class VersionGarbageCollector {
 
         }
 
-        int getGarbageDocsCount() {
+        int getGarbageCount() {
             return totalGarbageDocsCount;
         }