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/06/24 12:49:33 UTC
(jackrabbit-oak) branch trunk updated (9d4d35cf14 -> 922d17ea5d)
This is an automated email from the ASF dual-hosted git repository.
daim pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from 9d4d35cf14 Merge pull request #1553 from apache/OAK-10914-1
add 6a6864d29a OAK-10912 : make fullGc include/exclude configurable via OSGI config
add 772c8559d4 OAK-10912 : removed the inValid paths
add 167b46c5ea OAK-10912 : unit cases for invalid paths
add 55f310e2d6 OAK-10912 : changed config names and updated documentation
new 922d17ea5d Merge pull request #1551 from apache/OAK-10912
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.
Summary of changes:
.../oak/plugins/document/Configuration.java | 18 +++++++++
.../oak/plugins/document/DocumentNodeStore.java | 1 +
.../plugins/document/DocumentNodeStoreBuilder.java | 27 +++++++++++++
.../plugins/document/DocumentNodeStoreService.java | 2 +
.../document/mongo/MongoVersionGCSupport.java | 10 ++---
.../document/rdb/RDBDocumentNodeStoreBuilder.java | 26 ++++++++++++
.../DocumentNodeStoreServiceConfigurationTest.java | 47 +++++++++++++++++++++-
.../document/VersionGarbageCollectorIT.java | 4 +-
.../mongo/MongoDocumentNodeStoreBuilderTest.java | 34 ++++++++++++++++
.../rdb/RDBDocumentNodeStoreBuilderTest.java | 15 +++++++
10 files changed, 176 insertions(+), 8 deletions(-)
(jackrabbit-oak) 01/01: Merge pull request #1551 from apache/OAK-10912
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 922d17ea5d15911837a58da877bb2de5b30b7eb5
Merge: 9d4d35cf14 55f310e2d6
Author: Rishabh Kumar <ri...@gmail.com>
AuthorDate: Mon Jun 24 18:19:29 2024 +0530
Merge pull request #1551 from apache/OAK-10912
OAK-10912 : make fullGc include/exclude paths configurable via OSGI config
.../oak/plugins/document/Configuration.java | 18 +++++++++
.../oak/plugins/document/DocumentNodeStore.java | 1 +
.../plugins/document/DocumentNodeStoreBuilder.java | 27 +++++++++++++
.../plugins/document/DocumentNodeStoreService.java | 2 +
.../document/mongo/MongoVersionGCSupport.java | 10 ++---
.../document/rdb/RDBDocumentNodeStoreBuilder.java | 26 ++++++++++++
.../DocumentNodeStoreServiceConfigurationTest.java | 47 +++++++++++++++++++++-
.../document/VersionGarbageCollectorIT.java | 4 +-
.../mongo/MongoDocumentNodeStoreBuilderTest.java | 34 ++++++++++++++++
.../rdb/RDBDocumentNodeStoreBuilderTest.java | 15 +++++++
10 files changed, 176 insertions(+), 8 deletions(-)
diff --cc oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
index a7e835953c,7f4ba804a8..5ef8bf24af
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
@@@ -201,13 -201,13 +201,13 @@@ public class MongoVersionGCSupport exte
*/
@Override
public Iterable<NodeDocument> getModifiedDocs(final long fromModified, final long toModified, final int limit,
- @NotNull final String fromId,
- Set<String> includedPathPrefixes, Set<String> excludedPathPrefixes) {
+ @NotNull final String fromId, @NotNull Set<String> includedPathPrefixes,
+ @NotNull Set<String> excludedPathPrefixes) {
// (_modified = fromModified && _id > fromId || _modified > fromModified && _modified < toModified)
final Bson query = or(
- withIncludeExcludes(includedPathPrefixes, excludedPathPrefixes,
+ withIncludeExcludes(includedPathPrefixes, Set.of()/*OAK-10914 : temporarily disabling excludedPathPrefixes*/,
and(eq(MODIFIED_IN_SECS, getModifiedInSecs(fromModified)), gt(ID, fromId))),
- withIncludeExcludes(includedPathPrefixes, excludedPathPrefixes,
+ withIncludeExcludes(includedPathPrefixes, Set.of()/*OAK-10914 : temporarily disabling excludedPathPrefixes*/,
and(gt(MODIFIED_IN_SECS, getModifiedInSecs(fromModified)), lt(MODIFIED_IN_SECS, getModifiedInSecs(toModified)))));
// first sort by _modified and then by _id