This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-11667 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 613c8e1d8107dcc136649a06ab130e0f4566e876 Author: Rishabh Kumar <[email protected]> AuthorDate: Tue May 27 14:29:24 2025 +0530 OAK-11667 : removed usage of Guava's PeekingIterator --- .../jackrabbit/oak/commons/io/FileLineDifferenceIterator.java | 4 ++-- .../java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java | 6 +++--- .../index/indexer/document/flatfile/ChildNodeStateProvider.java | 4 ++-- .../apache/jackrabbit/oak/plugins/document/PropertyHistory.java | 4 ++-- .../apache/jackrabbit/oak/plugins/document/RevisionVector.java | 9 ++++----- .../oak/plugins/document/util/MergeSortedIterators.java | 4 ++-- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileLineDifferenceIterator.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileLineDifferenceIterator.java index 633653aab8..6827e451da 100644 --- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileLineDifferenceIterator.java +++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileLineDifferenceIterator.java @@ -27,6 +27,7 @@ import java.io.IOException; import java.util.Iterator; import java.util.function.Function; +import org.apache.commons.collections4.iterators.PeekingIterator; import org.apache.commons.io.FileUtils; import org.apache.commons.io.LineIterator; import org.apache.jackrabbit.oak.commons.FileIOUtils; @@ -34,7 +35,6 @@ import org.jetbrains.annotations.Nullable; import org.apache.jackrabbit.guava.common.collect.AbstractIterator; import org.apache.jackrabbit.guava.common.collect.Iterators; -import org.apache.jackrabbit.guava.common.collect.PeekingIterator; /** * FileLineDifferenceIterator class which iterates over the difference of 2 files line by line. @@ -93,7 +93,7 @@ public class FileLineDifferenceIterator implements Closeable, Iterator<String> { public Impl(LineIterator marked, LineIterator available, @Nullable Function<String, String> transformer) throws IOException { this.marked = marked; - this.peekMarked = Iterators.peekingIterator(marked); + this.peekMarked = PeekingIterator.peekingIterator(marked); this.all = available; if (transformer != null) { this.transformer = transformer; 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 4647cbdd5a..68fd2c097f 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 @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import org.apache.commons.collections4.iterators.PeekingIterator; import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.api.Result; import org.apache.jackrabbit.oak.api.Result.SizePrecision; @@ -42,7 +43,6 @@ import org.slf4j.LoggerFactory; import org.apache.jackrabbit.guava.common.collect.AbstractIterator; import org.apache.jackrabbit.guava.common.collect.Iterators; -import org.apache.jackrabbit.guava.common.collect.PeekingIterator; /** * Represents a union query. @@ -454,8 +454,8 @@ public class UnionQueryImpl implements Query { return; } - PeekingIterator<ResultRowImpl> lPeekIter = Iterators.peekingIterator(lIter); - PeekingIterator<ResultRowImpl> rPeekIter = Iterators.peekingIterator(rIter); + PeekingIterator<ResultRowImpl> lPeekIter = PeekingIterator.peekingIterator(lIter); + PeekingIterator<ResultRowImpl> rPeekIter = PeekingIterator.peekingIterator(rIter); ResultRow lRow = lPeekIter.peek(); ResultRow rRow = rPeekIter.peek(); diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/ChildNodeStateProvider.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/ChildNodeStateProvider.java index 55561a69a5..f8a370692c 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/ChildNodeStateProvider.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/ChildNodeStateProvider.java @@ -23,9 +23,9 @@ import java.util.Optional; import java.util.Set; import java.util.stream.StreamSupport; +import org.apache.commons.collections4.iterators.PeekingIterator; import org.apache.jackrabbit.guava.common.collect.AbstractIterator; import org.apache.jackrabbit.guava.common.collect.Iterators; -import org.apache.jackrabbit.guava.common.collect.PeekingIterator; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.conditions.Validate; @@ -85,7 +85,7 @@ class ChildNodeStateProvider { } Iterator<NodeStateEntry> children(boolean preferred) { - PeekingIterator<NodeStateEntry> pitr = Iterators.peekingIterator(entries.iterator()); + PeekingIterator<NodeStateEntry> pitr = PeekingIterator.peekingIterator(entries.iterator()); if (!pitr.hasNext()) { return emptyIterator(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java index 3fff05637c..ace5cd3069 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java @@ -23,9 +23,9 @@ import java.util.Iterator; import java.util.Map; import java.util.TreeMap; +import org.apache.commons.collections4.iterators.PeekingIterator; import org.apache.jackrabbit.guava.common.collect.AbstractIterator; import org.apache.jackrabbit.guava.common.collect.Iterators; -import org.apache.jackrabbit.guava.common.collect.PeekingIterator; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.jetbrains.annotations.NotNull; @@ -77,7 +77,7 @@ class PropertyHistory implements Iterable<NodeDocument> { private Iterator<NodeDocument> ensureOrder(final Iterable<Map.Entry<Revision, NodeDocument>> docs) { return new AbstractIterator<NodeDocument>() { PeekingIterator<Map.Entry<Revision, NodeDocument>> input - = Iterators.peekingIterator(docs.iterator()); + = PeekingIterator.peekingIterator(docs.iterator()); TreeMap<Revision, NodeDocument> queue = new TreeMap<Revision, NodeDocument>(StableRevisionComparator.INSTANCE); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java index 70e2c29161..c88490c152 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java @@ -23,9 +23,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.apache.commons.collections4.iterators.PeekingIterator; import org.apache.jackrabbit.guava.common.collect.AbstractIterator; import org.apache.jackrabbit.guava.common.collect.Iterators; -import org.apache.jackrabbit.guava.common.collect.PeekingIterator; import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.SetUtils; @@ -36,7 +36,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static java.util.Objects.requireNonNull; -import static org.apache.jackrabbit.guava.common.collect.Iterators.peekingIterator; import static java.util.Arrays.sort; /** @@ -175,7 +174,7 @@ public final class RevisionVector implements Iterable<Revision>, Comparable<Revi } int capacity = Math.min(revisions.length, vector.revisions.length); List<Revision> pmin = new ArrayList<>(capacity); - PeekingIterator<Revision> it = peekingIterator(vector.iterator()); + PeekingIterator<Revision> it = PeekingIterator.peekingIterator(vector.iterator()); for (Revision r : revisions) { Revision other = peekRevision(it, r.getClusterId()); if (other != null) { @@ -206,7 +205,7 @@ public final class RevisionVector implements Iterable<Revision>, Comparable<Revi } int capacity = Math.max(revisions.length, vector.revisions.length); List<Revision> pmax = new ArrayList<>(capacity); - PeekingIterator<Revision> it = peekingIterator(vector.iterator()); + PeekingIterator<Revision> it = PeekingIterator.peekingIterator(vector.iterator()); for (Revision r : revisions) { while (it.hasNext() && it.peek().getClusterId() < r.getClusterId()) { pmax.add(it.next()); @@ -235,7 +234,7 @@ public final class RevisionVector implements Iterable<Revision>, Comparable<Revi */ public RevisionVector difference(RevisionVector vector) { List<Revision> diff = new ArrayList<>(revisions.length); - PeekingIterator<Revision> it = peekingIterator(vector.iterator()); + PeekingIterator<Revision> it = PeekingIterator.peekingIterator(vector.iterator()); for (Revision r : revisions) { Revision other = peekRevision(it, r.getClusterId()); if (!r.equals(other)) { diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MergeSortedIterators.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MergeSortedIterators.java index a588ea468c..e0bb3140c6 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MergeSortedIterators.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MergeSortedIterators.java @@ -23,8 +23,8 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; +import org.apache.commons.collections4.iterators.PeekingIterator; import org.apache.jackrabbit.guava.common.collect.Iterators; -import org.apache.jackrabbit.guava.common.collect.PeekingIterator; /** * <code>MergeSortedIterators</code> is a specialized implementation of a @@ -97,7 +97,7 @@ public abstract class MergeSortedIterators<T> implements Iterator<T> { private void fetchNextIterator() { Iterator<T> it = nextIterator(); if (it != null && it.hasNext()) { - PeekingIterator<T> pIt = Iterators.peekingIterator(it); + PeekingIterator<T> pIt = PeekingIterator.peekingIterator(it); if (!iterators.isEmpty() && comparator.compare(pIt.peek(), lastPeek) < 0) { throw new IllegalStateException(description() +
