[jackrabbit-oak] 23/29: OAK-10199 : added bundled properties while calculating the properties retain set as well

[da...@apache.org]

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 4e422cd572be4cbb42f542123fdf12468d2a3ad3
Author: Rishabh Kumar <di...@adobe.com>
AuthorDate: Wed Aug 2 15:55:20 2023 +0530

    OAK-10199 : added bundled properties while calculating the properties retain set as well
---
 .../jackrabbit/oak/plugins/document/VersionGarbageCollector.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 f2a334b75b..8b84d5c4b1 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
@@ -882,7 +882,8 @@ public class VersionGarbageCollector {
                 // eligible to be garbage collected.
 
                 final Set<String> retainPropSet = ofNullable(doc.getNodeAtRevision(nodeStore, headRevision, null))
-                        .map(DocumentNodeState::getPropertyNames)
+                        .map(DocumentNodeState::getAllBundledProperties)
+                        .map(Map::keySet)
                         .map(p -> p.stream().map(Utils::escapePropertyName).collect(toSet()))
                         .orElse(emptySet());