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 da...@apache.org on 2024/05/14 11:26:39 UTC
(jackrabbit-oak) branch OAK-10792 created (now e23df052ca)
This is an automated email from the ASF dual-hosted git repository.
daim pushed a change to branch OAK-10792
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at e23df052ca OAK-10792 : rename DetailedGC to FullGC
This branch includes the following new commits:
new e23df052ca 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 da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch OAK-10792
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit e23df052ca65b9b5525eeb4c837fd22eb27eecea
Author: Rishabh Kumar <di...@adobe.com>
AuthorDate: Tue May 14 16:51:58 2024 +0530
OAK-10792 : rename DetailedGC to FullGC
---
.../document/FullRevisionGCStatsCollectorImpl.java | 6 +++---
.../plugins/document/VersionGarbageCollector.java | 22 +++++++++++-----------
.../FullRevisionGCStatsCollectorImplTest.java | 2 +-
.../oak/plugins/document/VersionGCStatsTest.java | 6 +++---
4 files changed, 18 insertions(+), 18 deletions(-)
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 5cc287ec9e..4e4ded0fcb 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
@@ -60,7 +60,7 @@ class FullRevisionGCStatsCollectorImpl implements DetailedRevisionGCStatsCollect
private final MeterStats skippedDoc;
private final TimerStats fullGCActiveTimer;
private final TimerStats fullGCTimer;
- private final TimerStats collectDetailedGarbageTimer;
+ private final TimerStats collectFullGarbageTimer;
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);
- collectDetailedGarbageTimer = timer(provider, COLLECT_DETAILED_GARBAGE_TIMER);
+ collectFullGarbageTimer = timer(provider, COLLECT_DETAILED_GARBAGE_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);
- collectDetailedGarbageTimer.update(stats.collectDetailedGarbageElapsed, MICROSECONDS);
+ collectFullGarbageTimer.update(stats.collectFullGarbageElapsed, 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 65df210736..dd390db9f4 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
@@ -427,21 +427,21 @@ public class VersionGarbageCollector {
final Stopwatch updateResurrectedDocuments = Stopwatch.createUnstarted();
final Stopwatch deleteDeletedDocs = Stopwatch.createUnstarted();
final Stopwatch collectAndDeleteSplitDocs = Stopwatch.createUnstarted();
- final Stopwatch collectDetailedGarbage = Stopwatch.createUnstarted();
+ final Stopwatch collectFullGarbage = 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, collectDetailedGarbageElapsed, collectOrphanNodesElapsed, collectDeletedPropsElapsed,
+ fullGCDocsElapsed, collectFullGarbageElapsed, 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 [timeToDeleteDetailedGarbage=%s and timeToCollectDetailedGarbage=%s, (of which timeToCollectOrphanNodes=%s timeToCollectDeletedProps=%s, timeToCollectOldRevs=%s, timeToCollectUnmergedBranchCommits=%s)]";
+ "timeToRunFullGC=%s, which includes [timeToDeleteFullGarbage=%s and timeToCollectFullGarbage=%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(collectDetailedGarbageElapsed, MICROSECONDS),
+ df.format(collectFullGarbageElapsed, 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(collectDetailedGarbage.elapsed(MICROSECONDS), MICROSECONDS),
+ df.format(collectFullGarbage.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.collectDetailedGarbageElapsed += run.collectDetailedGarbageElapsed;
+ this.collectFullGarbageElapsed += run.collectFullGarbageElapsed;
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.collectDetailedGarbageElapsed += run.collectDetailedGarbage.elapsed(MICROSECONDS);
+ this.collectFullGarbageElapsed += run.collectFullGarbage.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.collectDetailedGarbage);
+ this.watches.put(GCPhase.FULL_GC_COLLECT_GARBAGE, stats.collectFullGarbage);
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);
- collectDetailedGarbage(phases, headRevision, rec);
+ collectFullGarbage(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 collectDetailedGarbage(final GCPhases phases, final RevisionVector headRevision, final VersionGCRecommendations rec) {
+ private void collectFullGarbage(final GCPhases phases, final RevisionVector headRevision, final VersionGCRecommendations rec) {
final long oldestModifiedMs = rec.scopeFullGC.fromMs;
final long toModifiedMs = rec.scopeFullGC.toMs;
@@ -1353,7 +1353,7 @@ public class VersionGarbageCollector {
final int origCount = updateOp.getChanges().size();
updateOp.getChanges().entrySet().removeIf(opEntry -> Objects.equals(prop, opEntry.getKey().getName()));
final int diff = origCount - updateOp.getChanges().size();
- //TODO: beautify once this is in DetailedGC branch
+ //TODO: beautify once this is in FullGC branch
if (diff > 0) {
deletedInternalPropRevsCountMap.merge(doc.getId(), -diff, Integer::sum);
}
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 12b127609f..c72364e850 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
@@ -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.collectDetailedGarbageElapsed = MILLISECONDS.toMicros(5);
+ vgcs.collectFullGarbageElapsed = MILLISECONDS.toMicros(5);
vgcs.collectOrphanNodesElapsed = MILLISECONDS.toMicros(6);
vgcs.collectDeletedPropsElapsed = MILLISECONDS.toMicros(7);
vgcs.collectDeletedOldRevsElapsed = MILLISECONDS.toMicros(11);
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 afd9941665..9b423c1f73 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.collectDetailedGarbage.elapsed(MICROSECONDS), cumulative.collectDetailedGarbageElapsed);
+ assertEquals(stats.collectFullGarbage.elapsed(MICROSECONDS), cumulative.collectFullGarbageElapsed);
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.collectDetailedGarbage.elapsed(MICROSECONDS) * 2, cumulative.collectDetailedGarbageElapsed);
+ assertEquals(stats.collectFullGarbage.elapsed(MICROSECONDS) * 2, cumulative.collectFullGarbageElapsed);
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.collectDetailedGarbage);
+ c.call(stats.collectFullGarbage);
c.call(stats.collectOrphanNodes);
c.call(stats.collectDeletedProps);
c.call(stats.collectDeletedOldRevs);