stefan-egli commented on code in PR #1315:
URL: https://github.com/apache/jackrabbit-oak/pull/1315#discussion_r1504229448
##########
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java:
##########
@@ -1255,28 +1305,40 @@ public void removeGarbage(final VersionGCStats stats) {
}
if (!isDetailedGCDryRun) {
// only delete these in case it is not a dryRun
- List<NodeDocument> oldDocs = ds.findAndUpdate(NODES,
updateOpList);
- int deletedProps =
oldDocs.stream().filter(Objects::nonNull).mapToInt(d ->
deletedPropsCountMap.getOrDefault(d.getId(), 0)).sum();
- int updatedDocs = (int)
oldDocs.stream().filter(Objects::nonNull).count();
- stats.updatedDetailedGCDocsCount += updatedDocs;
- stats.deletedPropsCount += deletedProps;
- stats.deletedUnmergedBCCount +=
deletedUnmergedBCSet.size();
-
- if (log.isDebugEnabled()) {
- log.debug("Updated [{}] documents, deleted [{}]
properties, deleted [{}] unmergedBranchCommits",
- updatedDocs, deletedProps,
deletedUnmergedBCSet.size());
+
+ if (!orphanOrDeletedRemovalList.isEmpty()) {
+ ds.remove(NODES, orphanOrDeletedRemovalList);
+ final int removedSize =
orphanOrDeletedRemovalList.size();
Review Comment:
addressed in
https://github.com/apache/jackrabbit-oak/pull/1315/commits/74ef58d446f770bdfc2723b0039409ca963c3c4d
##########
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java:
##########
@@ -1255,28 +1305,40 @@ public void removeGarbage(final VersionGCStats stats) {
}
if (!isDetailedGCDryRun) {
// only delete these in case it is not a dryRun
- List<NodeDocument> oldDocs = ds.findAndUpdate(NODES,
updateOpList);
- int deletedProps =
oldDocs.stream().filter(Objects::nonNull).mapToInt(d ->
deletedPropsCountMap.getOrDefault(d.getId(), 0)).sum();
- int updatedDocs = (int)
oldDocs.stream().filter(Objects::nonNull).count();
- stats.updatedDetailedGCDocsCount += updatedDocs;
- stats.deletedPropsCount += deletedProps;
- stats.deletedUnmergedBCCount +=
deletedUnmergedBCSet.size();
-
- if (log.isDebugEnabled()) {
- log.debug("Updated [{}] documents, deleted [{}]
properties, deleted [{}] unmergedBranchCommits",
- updatedDocs, deletedProps,
deletedUnmergedBCSet.size());
+
+ if (!orphanOrDeletedRemovalList.isEmpty()) {
+ ds.remove(NODES, orphanOrDeletedRemovalList);
+ final int removedSize =
orphanOrDeletedRemovalList.size();
+ stats.updatedDetailedGCDocsCount += removedSize;
+ stats.deletedDocGCCount += removedSize;
Review Comment:
done in
https://github.com/apache/jackrabbit-oak/pull/1315/commits/74ef58d446f770bdfc2723b0039409ca963c3c4d
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@jackrabbit.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
