You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by st...@apache.org on 2024/05/14 14:47:43 UTC
(jackrabbit-oak) branch OAK-10792-3 created (now 52b23e3413)
This is an automated email from the ASF dual-hosted git repository.
stefanegli pushed a change to branch OAK-10792-3
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 52b23e3413 OAK-10792 : rename DetailedGC to FullGC
This branch includes the following new commits:
new 52b23e3413 OAK-10792 : rename DetailedGC to FullGC
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-oak) 01/01: OAK-10792 : rename DetailedGC to FullGC
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stefanegli pushed a commit to branch OAK-10792-3
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 52b23e34138246abb619d0b0042ec735373fd441
Author: Stefan Egli <st...@apache.org>
AuthorDate: Tue May 14 16:46:50 2024 +0200
OAK-10792 : rename DetailedGC to FullGC
---
...ctor.java => FullRevisionGCStatsCollector.java} | 4 ++--
.../document/FullRevisionGCStatsCollectorImpl.java | 10 ++++-----
.../plugins/document/VersionGarbageCollector.java | 26 +++++++++++-----------
.../FullRevisionGCStatsCollectorImplTest.java | 6 ++---
.../oak/plugins/document/VersionGCStatsTest.java | 6 ++---
5 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DetailedRevisionGCStatsCollector.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/FullRevisionGCStatsCollector.java
similarity index 94%
rename from oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DetailedRevisionGCStatsCollector.java
rename to oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/FullRevisionGCStatsCollector.java
index 5aec497a25..5bcd77209c 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DetailedRevisionGCStatsCollector.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/FullRevisionGCStatsCollector.java
@@ -21,10 +21,10 @@ package org.apache.jackrabbit.oak.plugins.document;
import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats;
/**
- * Collector interface for {@link DocumentNodeStore} Detailed revision garbage collection
+ * Collector interface for {@link DocumentNodeStore} full revision garbage collection
* statistics.
*/
-public interface DetailedRevisionGCStatsCollector {
+public interface FullRevisionGCStatsCollector {
/**
* Total No. of documents read during FullGC phase
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/FullRevisionGCStatsCollectorImpl.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/FullRevisionGCStatsCollectorImpl.java
index 4e4ded0fcb..c0795ffee5 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/FullRevisionGCStatsCollectorImpl.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/FullRevisionGCStatsCollectorImpl.java
@@ -31,7 +31,7 @@ import static org.apache.jackrabbit.oak.stats.StatsOptions.METRICS_ONLY;
/**
* {@link DocumentNodeStore} Detailed revision garbage collection statistics.
*/
-class FullRevisionGCStatsCollectorImpl implements DetailedRevisionGCStatsCollector {
+class FullRevisionGCStatsCollectorImpl implements FullRevisionGCStatsCollector {
static final String FULL_GC = "FullGC";
static final String READ_DOC = "READ_DOC";
@@ -42,7 +42,7 @@ class FullRevisionGCStatsCollectorImpl implements DetailedRevisionGCStatsCollect
static final String SKIPPED_DOC = "SKIPPED_DOC";
static final String FULL_GC_ACTIVE_TIMER = "FULL_GC_ACTIVE_TIMER";
static final String FULL_GC_TIMER = "FULL_GC_TIMER";
- static final String COLLECT_DETAILED_GARBAGE_TIMER = "COLLECT_DETAILED_GARBAGE_TIMER";
+ static final String COLLECT_FULL_GC_TIMER = "COLLECT_FULL_GC_TIMER";
static final String COLLECT_ORPHAN_NODES_TIMER = "COLLECT_ORPHAN_NODES_TIMER";
static final String COLLECT_DELETED_PROPS_TIMER = "COLLECT_DELETED_PROPS_TIMER";
static final String COLLECT_DELETED_OLD_REVS_TIMER = "COLLECT_DELETED_OLD_REVS_TIMER";
@@ -60,7 +60,7 @@ class FullRevisionGCStatsCollectorImpl implements DetailedRevisionGCStatsCollect
private final MeterStats skippedDoc;
private final TimerStats fullGCActiveTimer;
private final TimerStats fullGCTimer;
- private final TimerStats collectFullGarbageTimer;
+ private final TimerStats collectFullGCTimer;
private final TimerStats collectOrphanNodesTimer;
private final TimerStats collectDeletedPropsTimer;
private final TimerStats collectDeletedOldRevsTimer;
@@ -81,7 +81,7 @@ class FullRevisionGCStatsCollectorImpl implements DetailedRevisionGCStatsCollect
fullGCActiveTimer = timer(provider, FULL_GC_ACTIVE_TIMER);
fullGCTimer = timer(provider, FULL_GC_TIMER);
- collectFullGarbageTimer = timer(provider, COLLECT_DETAILED_GARBAGE_TIMER);
+ collectFullGCTimer = timer(provider, COLLECT_FULL_GC_TIMER);
collectOrphanNodesTimer = timer(provider, COLLECT_ORPHAN_NODES_TIMER);
collectDeletedPropsTimer = timer(provider, COLLECT_DELETED_PROPS_TIMER);
collectDeletedOldRevsTimer = timer(provider, COLLECT_DELETED_OLD_REVS_TIMER);
@@ -133,7 +133,7 @@ class FullRevisionGCStatsCollectorImpl implements DetailedRevisionGCStatsCollect
public void finished(VersionGCStats stats) {
fullGCActiveTimer.update(stats.fullGCActiveElapsed, MICROSECONDS);
fullGCTimer.update(stats.fullGCDocsElapsed, MICROSECONDS);
- collectFullGarbageTimer.update(stats.collectFullGarbageElapsed, MICROSECONDS);
+ collectFullGCTimer.update(stats.collectFullGCElapsed, MICROSECONDS);
collectOrphanNodesTimer.update(stats.collectOrphanNodesElapsed, MICROSECONDS);
collectDeletedPropsTimer.update(stats.collectDeletedPropsElapsed, MICROSECONDS);
collectDeletedOldRevsTimer.update(stats.collectDeletedOldRevsElapsed, MICROSECONDS);
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 dd390db9f4..e83e1c9e0c 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
@@ -221,7 +221,7 @@ public class VersionGarbageCollector {
private VersionGCOptions options;
private GCMonitor gcMonitor = GCMonitor.EMPTY;
private RevisionGCStats gcStats = new RevisionGCStats(NOOP);
- private DetailedRevisionGCStatsCollector fullGCStats = new FullRevisionGCStatsCollectorImpl(NOOP);
+ private FullRevisionGCStatsCollector fullGCStats = new FullRevisionGCStatsCollectorImpl(NOOP);
VersionGarbageCollector(DocumentNodeStore nodeStore,
VersionGCSupport gcSupport,
@@ -427,21 +427,21 @@ public class VersionGarbageCollector {
final Stopwatch updateResurrectedDocuments = Stopwatch.createUnstarted();
final Stopwatch deleteDeletedDocs = Stopwatch.createUnstarted();
final Stopwatch collectAndDeleteSplitDocs = Stopwatch.createUnstarted();
- final Stopwatch collectFullGarbage = Stopwatch.createUnstarted();
+ final Stopwatch collectFullGC = Stopwatch.createUnstarted();
final Stopwatch collectOrphanNodes = Stopwatch.createUnstarted();
final Stopwatch collectDeletedProps = Stopwatch.createUnstarted();
final Stopwatch collectDeletedOldRevs = Stopwatch.createUnstarted();
final Stopwatch collectUnmergedBC = Stopwatch.createUnstarted();
long activeElapsed, fullGCActiveElapsed, collectDeletedDocsElapsed, checkDeletedDocsElapsed, deleteDeletedDocsElapsed,
collectAndDeleteSplitDocsElapsed, deleteSplitDocsElapsed, sortDocIdsElapsed, updateResurrectedDocumentsElapsed,
- fullGCDocsElapsed, collectFullGarbageElapsed, collectOrphanNodesElapsed, collectDeletedPropsElapsed,
+ fullGCDocsElapsed, collectFullGCElapsed, collectOrphanNodesElapsed, collectDeletedPropsElapsed,
deleteFullGCDocsElapsed, collectDeletedOldRevsElapsed, collectUnmergedBCElapsed;
@Override
public String toString() {
String timings;
String fmt = "timeToCollectDeletedDocs=%s, timeToCheckDeletedDocs=%s, timeToSortDocIds=%s, timeTakenToUpdateResurrectedDocs=%s, timeTakenToDeleteDeletedDocs=%s, timeTakenToCollectAndDeleteSplitDocs=%s%s, " +
- "timeToRunFullGC=%s, which includes [timeToDeleteFullGarbage=%s and timeToCollectFullGarbage=%s, (of which timeToCollectOrphanNodes=%s timeToCollectDeletedProps=%s, timeToCollectOldRevs=%s, timeToCollectUnmergedBranchCommits=%s)]";
+ "timeToRunFullGC=%s, which includes [timeToDeleteFullGC=%s and timeToCollectFullGC=%s, (of which timeToCollectOrphanNodes=%s timeToCollectDeletedProps=%s, timeToCollectOldRevs=%s, timeToCollectUnmergedBranchCommits=%s)]";
// aggregated timings?
if (iterationCount > 0) {
@@ -458,7 +458,7 @@ public class VersionGarbageCollector {
timeDeletingSplitDocs,
df.format(fullGCDocsElapsed, MICROSECONDS),
df.format(deleteFullGCDocsElapsed, MICROSECONDS),
- df.format(collectFullGarbageElapsed, MICROSECONDS),
+ df.format(collectFullGCElapsed, MICROSECONDS),
df.format(collectOrphanNodesElapsed, MICROSECONDS),
df.format(collectDeletedPropsElapsed, MICROSECONDS),
df.format(collectDeletedOldRevsElapsed, MICROSECONDS),
@@ -478,7 +478,7 @@ public class VersionGarbageCollector {
timeDeletingSplitDocs,
df.format(fullGCDocs.elapsed(MICROSECONDS), MICROSECONDS),
df.format(deleteFullGCDocs.elapsed(MICROSECONDS), MICROSECONDS),
- df.format(collectFullGarbage.elapsed(MICROSECONDS), MICROSECONDS),
+ df.format(collectFullGC.elapsed(MICROSECONDS), MICROSECONDS),
df.format(collectOrphanNodes.elapsed(MICROSECONDS), MICROSECONDS),
df.format(collectDeletedProps.elapsed(MICROSECONDS), MICROSECONDS),
df.format(collectDeletedOldRevs.elapsed(MICROSECONDS), MICROSECONDS),
@@ -547,7 +547,7 @@ public class VersionGarbageCollector {
this.updateResurrectedDocumentsElapsed += run.updateResurrectedDocumentsElapsed;
this.fullGCDocsElapsed += run.fullGCDocsElapsed;
this.deleteFullGCDocsElapsed += run.deleteFullGCDocsElapsed;
- this.collectFullGarbageElapsed += run.collectFullGarbageElapsed;
+ this.collectFullGCElapsed += run.collectFullGCElapsed;
this.collectOrphanNodesElapsed += run.collectOrphanNodesElapsed;
this.collectDeletedPropsElapsed += run.collectDeletedPropsElapsed;
this.collectDeletedOldRevsElapsed += run.collectDeletedOldRevsElapsed;
@@ -565,7 +565,7 @@ public class VersionGarbageCollector {
this.updateResurrectedDocumentsElapsed += run.updateResurrectedDocuments.elapsed(MICROSECONDS);
this.fullGCDocsElapsed += run.fullGCDocs.elapsed(MICROSECONDS);
this.deleteFullGCDocsElapsed += run.deleteFullGCDocs.elapsed(MICROSECONDS);
- this.collectFullGarbageElapsed += run.collectFullGarbage.elapsed(MICROSECONDS);
+ this.collectFullGCElapsed += run.collectFullGC.elapsed(MICROSECONDS);
this.collectOrphanNodesElapsed += run.collectOrphanNodes.elapsed(MICROSECONDS);
this.collectDeletedPropsElapsed += run.collectDeletedProps.elapsed(MICROSECONDS);
this.collectDeletedOldRevsElapsed += run.collectDeletedOldRevs.elapsed(MICROSECONDS);
@@ -617,7 +617,7 @@ public class VersionGarbageCollector {
this.watches.put(GCPhase.SPLITS_CLEANUP, stats.collectAndDeleteSplitDocs);
this.watches.put(GCPhase.UPDATING, stats.updateResurrectedDocuments);
this.watches.put(GCPhase.FULL_GC, stats.fullGCDocs);
- this.watches.put(GCPhase.FULL_GC_COLLECT_GARBAGE, stats.collectFullGarbage);
+ this.watches.put(GCPhase.FULL_GC_COLLECT_GARBAGE, stats.collectFullGC);
this.watches.put(GCPhase.FULL_GC_COLLECT_ORPHAN_NODES, stats.collectOrphanNodes);
this.watches.put(GCPhase.FULL_GC_COLLECT_PROPS, stats.collectDeletedProps);
this.watches.put(GCPhase.FULL_GC_COLLECT_OLD_REVS, stats.collectDeletedOldRevs);
@@ -760,7 +760,7 @@ public class VersionGarbageCollector {
} else {
final RevisionVector headRevision = nodeStore.getHeadRevision();
monitor.info("Looking at revisions in {} for full GC", rec.scopeFullGC);
- collectFullGarbage(phases, headRevision, rec);
+ collectFullGC(phases, headRevision, rec);
}
}
@@ -805,7 +805,7 @@ public class VersionGarbageCollector {
* @param headRevision the current head revision of node store
* @param rec {@link VersionGCRecommendations} to recommend GC operation
*/
- private void collectFullGarbage(final GCPhases phases, final RevisionVector headRevision, final VersionGCRecommendations rec) {
+ private void collectFullGC(final GCPhases phases, final RevisionVector headRevision, final VersionGCRecommendations rec) {
final long oldestModifiedMs = rec.scopeFullGC.fromMs;
final long toModifiedMs = rec.scopeFullGC.toMs;
@@ -857,9 +857,9 @@ public class VersionGarbageCollector {
final Long modified = lastDoc.getModified();
if (modified == null) {
- monitor.warn("collectFullGarbage : document has no _modified property : {}", doc.getId());
+ monitor.warn("collectFullGC : document has no _modified property : {}", doc.getId());
} else if (SECONDS.toMillis(modified) < fromModifiedMs) {
- monitor.warn("collectFullGarbage : document has older _modified than query boundary : {} (from: {}, to: {})",
+ monitor.warn("collectFullGC : document has older _modified than query boundary : {} (from: {}, to: {})",
modified, timestampToString(fromModifiedMs), timestampToString(toModifiedMs));
}
}
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/FullRevisionGCStatsCollectorImplTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/FullRevisionGCStatsCollectorImplTest.java
index c72364e850..08e1d5db89 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/FullRevisionGCStatsCollectorImplTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/FullRevisionGCStatsCollectorImplTest.java
@@ -36,7 +36,7 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
import static org.apache.commons.lang3.reflect.FieldUtils.readField;
import static org.apache.jackrabbit.oak.plugins.document.FullRevisionGCStatsCollectorImpl.COLLECT_DELETED_OLD_REVS_TIMER;
import static org.apache.jackrabbit.oak.plugins.document.FullRevisionGCStatsCollectorImpl.COLLECT_DELETED_PROPS_TIMER;
-import static org.apache.jackrabbit.oak.plugins.document.FullRevisionGCStatsCollectorImpl.COLLECT_DETAILED_GARBAGE_TIMER;
+import static org.apache.jackrabbit.oak.plugins.document.FullRevisionGCStatsCollectorImpl.COLLECT_FULL_GC_TIMER;
import static org.apache.jackrabbit.oak.plugins.document.FullRevisionGCStatsCollectorImpl.COLLECT_ORPHAN_NODES_TIMER;
import static org.apache.jackrabbit.oak.plugins.document.FullRevisionGCStatsCollectorImpl.COLLECT_UNMERGED_BC_TIMER;
import static org.apache.jackrabbit.oak.plugins.document.FullRevisionGCStatsCollectorImpl.COUNTER;
@@ -127,7 +127,7 @@ public class FullRevisionGCStatsCollectorImplTest {
final VersionGarbageCollector.VersionGCStats vgcs = new VersionGarbageCollector.VersionGCStats();
vgcs.fullGCActiveElapsed = MILLISECONDS.toMicros(2);
vgcs.fullGCDocsElapsed = MILLISECONDS.toMicros(3);
- vgcs.collectFullGarbageElapsed = MILLISECONDS.toMicros(5);
+ vgcs.collectFullGCElapsed = MILLISECONDS.toMicros(5);
vgcs.collectOrphanNodesElapsed = MILLISECONDS.toMicros(6);
vgcs.collectDeletedPropsElapsed = MILLISECONDS.toMicros(7);
vgcs.collectDeletedOldRevsElapsed = MILLISECONDS.toMicros(11);
@@ -138,7 +138,7 @@ public class FullRevisionGCStatsCollectorImplTest {
stats.finished(vgcs);
assertTimer(2, FULL_GC_ACTIVE_TIMER);
assertTimer(3, FULL_GC_TIMER);
- assertTimer(5, COLLECT_DETAILED_GARBAGE_TIMER);
+ assertTimer(5, COLLECT_FULL_GC_TIMER);
assertTimer(6, COLLECT_ORPHAN_NODES_TIMER);
assertTimer(7, COLLECT_DELETED_PROPS_TIMER);
assertTimer(11, COLLECT_DELETED_OLD_REVS_TIMER);
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java
index 9b423c1f73..04793a0992 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java
@@ -60,7 +60,7 @@ public class VersionGCStatsTest {
assertEquals(stats.updateResurrectedDocuments.elapsed(MICROSECONDS), cumulative.updateResurrectedDocumentsElapsed);
assertEquals(stats.fullGCDocs.elapsed(MICROSECONDS), cumulative.fullGCDocsElapsed);
assertEquals(stats.deleteFullGCDocs.elapsed(MICROSECONDS), cumulative.deleteFullGCDocsElapsed);
- assertEquals(stats.collectFullGarbage.elapsed(MICROSECONDS), cumulative.collectFullGarbageElapsed);
+ assertEquals(stats.collectFullGC.elapsed(MICROSECONDS), cumulative.collectFullGCElapsed);
assertEquals(stats.collectOrphanNodes.elapsed(MICROSECONDS), cumulative.collectOrphanNodesElapsed);
assertEquals(stats.collectDeletedProps.elapsed(MICROSECONDS), cumulative.collectDeletedPropsElapsed);
assertEquals(stats.collectDeletedOldRevs.elapsed(MICROSECONDS), cumulative.collectDeletedOldRevsElapsed);
@@ -84,7 +84,7 @@ public class VersionGCStatsTest {
assertEquals(stats.updateResurrectedDocuments.elapsed(MICROSECONDS) * 2, cumulative.updateResurrectedDocumentsElapsed);
assertEquals(stats.fullGCDocs.elapsed(MICROSECONDS) * 2, cumulative.fullGCDocsElapsed);
assertEquals(stats.deleteFullGCDocs.elapsed(MICROSECONDS) * 2, cumulative.deleteFullGCDocsElapsed);
- assertEquals(stats.collectFullGarbage.elapsed(MICROSECONDS) * 2, cumulative.collectFullGarbageElapsed);
+ assertEquals(stats.collectFullGC.elapsed(MICROSECONDS) * 2, cumulative.collectFullGCElapsed);
assertEquals(stats.collectOrphanNodes.elapsed(MICROSECONDS) * 2, cumulative.collectOrphanNodesElapsed);
assertEquals(stats.collectDeletedProps.elapsed(MICROSECONDS) * 2, cumulative.collectDeletedPropsElapsed);
assertEquals(stats.collectDeletedOldRevs.elapsed(MICROSECONDS) * 2, cumulative.collectDeletedOldRevsElapsed);
@@ -102,7 +102,7 @@ public class VersionGCStatsTest {
c.call(stats.updateResurrectedDocuments);
c.call(stats.fullGCDocs);
c.call(stats.deleteFullGCDocs);
- c.call(stats.collectFullGarbage);
+ c.call(stats.collectFullGC);
c.call(stats.collectOrphanNodes);
c.call(stats.collectDeletedProps);
c.call(stats.collectDeletedOldRevs);