This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch DetailedGC/OAK-10199 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 9abd3b3e3c7434053d0a8148746cc2d84587b92c Author: Rishabh Kumar <d...@adobe.com> AuthorDate: Mon Aug 7 18:16:00 2023 +0530 OAK-10199 : incorporated review comments to remove <p/> XHTML tags --- .../jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java | 2 +- .../java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java | 4 ++-- .../jackrabbit/oak/plugins/document/VersionGCRecommendations.java | 4 ++-- .../org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java | 2 +- .../jackrabbit/oak/plugins/document/VersionGarbageCollector.java | 4 ++-- .../apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java | 2 +- .../jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java index 3b39d4c3a1..f77aa2c676 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java @@ -72,7 +72,7 @@ public class DocumentNodeStoreHelper { } public static VersionGarbageCollector createVersionGC( - DocumentNodeStore nodeStore, VersionGCSupport gcSupport, final boolean detailedGCEnabled) { + DocumentNodeStore nodeStore, VersionGCSupport gcSupport, boolean detailedGCEnabled) { return new VersionGarbageCollector(nodeStore, gcSupport, detailedGCEnabled); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java index 38673aa7e7..ce1fe241c7 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java @@ -1673,8 +1673,8 @@ public final class NodeDocument extends Document { /** * Returns name of all the properties on this document * <p> - * Note: property names returned are escaped - * <p/> + * Note: property names returned are escaped + * * @return Set of all property names (escaped) * @see Utils#unescapePropertyName(String) * @see Utils#escapePropertyName(String) diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCRecommendations.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCRecommendations.java index 05ebaa44a9..6e2b9eaf1d 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCRecommendations.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCRecommendations.java @@ -92,7 +92,7 @@ public class VersionGCRecommendations { * @param detailedGCEnabled whether detailedGC is enabled or not */ public VersionGCRecommendations(long maxRevisionAgeMs, Checkpoints checkpoints, Clock clock, VersionGCSupport vgc, - VersionGCOptions options, GCMonitor gcMonitor, final boolean detailedGCEnabled) { + VersionGCOptions options, GCMonitor gcMonitor, boolean detailedGCEnabled) { boolean ignoreDueToCheckPoint = false; boolean ignoreDetailedGCDueToCheckPoint = false; long deletedOnceCount = 0; @@ -306,7 +306,7 @@ public class VersionGCRecommendations { ignoreGC = true; } else { gcScope = gcScope.notLaterThan(checkpoint.getTimestamp() - 1); - log.info("checkpoint at [{}] found, detailedGCScope now {}", timestampToString(checkpoint.getTimestamp()), gcScope); + log.debug("checkpoint at [{}] found, detailedGCScope now {}", timestampToString(checkpoint.getTimestamp()), gcScope); } } return new GCResult(ignoreGC, gcScope); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java index ab7789f920..df505adf8a 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java @@ -83,7 +83,7 @@ public class VersionGCSupport { * since the epoch and the implementation will convert them to seconds at * the granularity of the {@link NodeDocument#MODIFIED_IN_SECS} field and * then perform the comparison. - * <p/> + * * * @param fromModified the lower bound modified timestamp (inclusive) * @param toModified the upper bound modified timestamp (exclusive) 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 c65ea1dc01..8f2c977274 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 @@ -619,9 +619,9 @@ public class VersionGarbageCollector { * et al: essentially garbage that in earlier versions of Oak were ignored. This * includes: deleted properties, revision information within documents, branch * commit related garbage. - * <p/> + * <p> * TODO: limit this to run only on a singleton instance, eg the cluster leader - * <p/> + * <p> * The "detailed garbage" collector can be instructed to do a full repository scan * - or incrementally based on where it last left off. When doing a full * repository scan (but not limited to that), it executes in (small) batches diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java index 3a9ef2d95d..25a3aca5e7 100755 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java @@ -1854,7 +1854,7 @@ public class RDBDocumentStore implements DocumentStore { } if (sortBy != null && !sortBy.isEmpty()) { - for (String key: sortBy) { + for (String key : sortBy) { if (!allowedProps.contains(key)) { final String message = "indexed property " + key + " not supported. supported properties are " + allowedProps; LOG.error(message); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java index 5082422109..27c582311b 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java @@ -114,7 +114,7 @@ public class RDBVersionGCSupport extends VersionGCSupport { * since the epoch and the implementation will convert them to seconds at * the granularity of the {@link NodeDocument#MODIFIED_IN_SECS} field and * then perform the comparison. - * <p/> + * * * @param fromModified the lower bound modified timestamp (inclusive) * @param toModified the upper bound modified timestamp (exclusive)