This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11484 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 19088c5ffbb4004b8c72152bd0db758bdce09fea Author: Julian Reschke <[email protected]> AuthorDate: Thu Feb 13 21:36:34 2025 +0100 OAK-11484: Remove usage of Guava io.CountingInputStream --- .../jackrabbit/oak/spi/blob/stats/StatsCollectingStreams.java | 5 ++--- .../plugins/index/lucene/directory/IndexConsistencyChecker.java | 9 ++++----- .../oak/plugins/index/lucene/LucenePropertyIndexTest.java | 4 ++-- .../org/apache/jackrabbit/oak/plugins/tika/TextExtractor.java | 4 ++-- .../index/search/spi/binary/FulltextBinaryTextExtractor.java | 4 ++-- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/stats/StatsCollectingStreams.java b/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/stats/StatsCollectingStreams.java index 7b3dcf0a9e..766c8f0918 100644 --- a/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/stats/StatsCollectingStreams.java +++ b/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/stats/StatsCollectingStreams.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.spi.blob.stats; import java.io.FilterInputStream; @@ -24,7 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.io.CountingInputStream; +import org.apache.commons.io.input.CountingInputStream; import org.jetbrains.annotations.NotNull; @@ -48,7 +47,7 @@ public final class StatsCollectingStreams { //be processing also as it moved further in stream. So that //overhead would add to the download time - collector.downloaded(blobId, System.nanoTime() - startTime, TimeUnit.NANOSECONDS, cin.getCount()); + collector.downloaded(blobId, System.nanoTime() - startTime, TimeUnit.NANOSECONDS, cin.getByteCount()); collector.downloadCompleted(blobId); } }; diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyChecker.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyChecker.java index 7af6711f90..7437342b31 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyChecker.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyChecker.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.plugins.index.lucene.directory; import java.io.File; @@ -32,9 +31,9 @@ import java.util.List; import javax.jcr.PropertyType; +import org.apache.commons.io.input.CountingInputStream; import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.io.Closer; -import org.apache.jackrabbit.guava.common.io.CountingInputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.oak.api.Blob; @@ -394,13 +393,13 @@ public class IndexConsistencyChecker { if (cis.getCount() != blob.length()){ String msg = String.format("Invalid blob %s. Length mismatch - expected ${%d} -> found ${%d}", - blobPath, blob.length(), cis.getCount()); - result.invalidBlobIds.add(new FileSizeStatus(blobPath, cis.getCount(), blob.length())); + blobPath, blob.length(), cis.getByteCount()); + result.invalidBlobIds.add(new FileSizeStatus(blobPath, cis.getByteCount(), blob.length())); log.warn("[{}] {}", indexPath, msg); result.clean = false; result.blobSizeMismatch = true; } - result.binaryPropSize += cis.getCount(); + result.binaryPropSize += cis.getByteCount(); } catch (Exception e) { log.warn("[{}] Error occurred reading blob at {}", indexPath, blobPath, e); result.missingBlobIds.add(id); diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java index e5292a302c..32499790d3 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java @@ -44,9 +44,9 @@ import java.util.concurrent.Executors; import javax.jcr.PropertyType; import org.apache.commons.collections4.IterableUtils; +import org.apache.commons.io.input.CountingInputStream; import org.apache.jackrabbit.guava.common.collect.ComparisonChain; import org.apache.jackrabbit.guava.common.collect.Iterables; -import org.apache.jackrabbit.guava.common.io.CountingInputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.JcrConstants; @@ -3320,7 +3320,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest { if (stream == null){ return 0; } - return stream.getCount(); + return stream.getByteCount(); } @Override diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractor.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractor.java index 5bb34371f8..5e054990bf 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractor.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractor.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.plugins.tika; -import org.apache.jackrabbit.guava.common.io.CountingInputStream; +import org.apache.commons.io.input.CountingInputStream; import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.commons.io.LazyInputStream; import org.apache.jackrabbit.oak.plugins.blob.datastore.TextWriter; @@ -261,7 +261,7 @@ class TextExtractor implements Closeable { try { tika.getParser().parse(stream, handler, metadata, new ParseContext()); } finally { - size = stream.getCount(); + size = stream.getByteCount(); stream.close(); } } catch (LinkageError e) { diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/binary/FulltextBinaryTextExtractor.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/binary/FulltextBinaryTextExtractor.java index 8b80aac54d..5db229908c 100644 --- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/binary/FulltextBinaryTextExtractor.java +++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/binary/FulltextBinaryTextExtractor.java @@ -18,8 +18,8 @@ */ package org.apache.jackrabbit.oak.plugins.index.search.spi.binary; -import org.apache.jackrabbit.guava.common.io.CountingInputStream; import org.apache.commons.io.IOUtils; +import org.apache.commons.io.input.CountingInputStream; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; @@ -172,7 +172,7 @@ public class FulltextBinaryTextExtractor { getParser().parse(stream, handler, metadata, new ParseContext()); } } finally { - bytesRead = stream.getCount(); + bytesRead = stream.getByteCount(); stream.close(); } } catch (LinkageError e) {
