(jackrabbit-oak) branch trunk updated: OAK-11668 : removed usage of Iterators.mergedSorted with oak-commons util (#2239)

[daim]

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


The following commit(s) were added to refs/heads/trunk by this push:
     new 9cb2172bc9 OAK-11668 : removed usage of Iterators.mergedSorted with 
oak-commons util (#2239)
9cb2172bc9 is described below

commit 9cb2172bc9460b883e5999207d201624445cf334
Author: Rishabh Kumar <rishabhdaim1...@gmail.com>
AuthorDate: Tue Apr 22 13:39:06 2025 +0530

    OAK-11668 : removed usage of Iterators.mergedSorted with oak-commons util 
(#2239)
    
    Co-authored-by: Rishabh Kumar <d...@adobe.com>
---
 .../src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java  | 3 ++-
 .../oak/spi/security/principal/CompositePrincipalProvider.java         | 3 ++-
 .../main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java
index cc18e911e5..2ae273356f 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.oak.api.Result.SizePrecision;
 import org.apache.jackrabbit.oak.api.ResultRow;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
 import org.apache.jackrabbit.oak.plugins.memory.PropertyValues;
 import org.apache.jackrabbit.oak.query.QueryImpl.MeasuringIterator;
 import org.apache.jackrabbit.oak.query.ast.ColumnImpl;
@@ -328,7 +329,7 @@ public class UnionQueryImpl implements Query {
         } else {
             // This would suggest either the sub queries are sorted by index 
or explicitly by QueryImpl (in case of traversing index)
             // So use mergeSorted here.
-            it = Iterators.mergeSorted(List.of(leftIter, rightIter), orderBy);
+            it = IteratorUtils.mergeSorted(List.of(leftIter, rightIter), 
orderBy);
         }
 
         it = FilterIterators.newCombinedFilter(it, distinct, 
limit.orElse(Long.MAX_VALUE), offset.orElse(0L), null, settings);
diff --git 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
index d5098af6b1..11c50a562c 100644
--- 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
+++ 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
@@ -32,6 +32,7 @@ import org.apache.jackrabbit.guava.common.collect.Iterators;
 import static java.util.Objects.requireNonNull;
 
 import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -134,7 +135,7 @@ public class CompositePrincipalProvider implements 
PrincipalProvider {
 
         List<Iterator<? extends Principal>> all = providers.stream()
                 .map((p) -> p.findPrincipals(nameHint, fullText, searchType, 
0, limit + offset)).collect(Collectors.toList());
-        Iterator<? extends Principal> principals = Iterators.mergeSorted(all, 
Comparator.comparing(Principal::getName));
+        Iterator<? extends Principal> principals = 
IteratorUtils.mergeSorted(all, Comparator.comparing(Principal::getName));
 
         Spliterator<? extends Principal> spliterator = 
Spliterators.spliteratorUnknownSize(principals, 0);
         Stream<? extends Principal> stream = StreamSupport.stream(spliterator, 
false);
diff --git 
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java
 
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java
index e27826f468..c979182b22 100644
--- 
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java
+++ 
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java
@@ -29,6 +29,7 @@ import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
 import org.apache.jackrabbit.oak.plugins.document.util.MergeSortedIterators;
 import org.jetbrains.annotations.NotNull;
 
@@ -67,7 +68,7 @@ class ValueMap {
                             new ArrayList<Iterator<NodeDocument>>(2);
                     iterators.add(Iterators.singletonIterator(doc));
                     iterators.add(doc.getPreviousDocs(property, 
null).iterator());
-                    docs = Iterators.mergeSorted(iterators, new 
Comparator<NodeDocument>() {
+                    docs = IteratorUtils.mergeSorted(iterators, new 
Comparator<NodeDocument>() {
                                 @Override
                                 public int compare(NodeDocument o1,
                                                    NodeDocument o2) {