This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11618 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 489d6c16104476425b54134f3c6f98a9289da336 Author: Julian Reschke <[email protected]> AuthorDate: Fri Apr 4 17:29:23 2025 +0100 OAK-11618: Remove usage of Guava Stopwatch - work in progress --- .../external/impl/ExternalLoginModule.java | 2 +- .../suites/ScalabilityBlobSearchSuite.java | 3 +- .../scalability/suites/ScalabilityNodeSuite.java | 3 +- .../oak/benchmark/ContinuousRevisionGCTest.java | 3 +- .../oak/benchmark/OrderedIndexBaseTest.java | 1 - .../jackrabbit/oak/benchmark/RevisionGCTest.java | 3 +- .../standby/StandbyBulkTransferBenchmark.java | 3 +- .../suites/ScalabilityAbstractSuite.java | 2 +- .../blob/AbstractSharedCachingDataStore.java | 2 +- .../jackrabbit/oak/plugins/blob/FileCache.java | 2 +- .../plugins/blob/MarkSweepGarbageCollector.java | 2 +- .../oak/plugins/blob/datastore/BlobIdTracker.java | 2 +- .../org/apache/jackrabbit/oak/stats/Stopwatch.java | 133 +++++++++++++++++++++ .../oak/plugins/index/AsyncIndexUpdate.java | 2 +- .../oak/plugins/index/FormattingUtils.java | 2 +- .../oak/plugins/index/MetricsFormatter.java | 2 +- .../plugins/index/TrackingCorruptIndexHandler.java | 9 +- .../oak/plugins/index/importer/IndexImporter.java | 3 +- .../index/progress/IndexingProgressReporter.java | 3 +- .../index/progress/SimpleRateEstimator.java | 5 +- .../plugins/index/property/RecursiveDelete.java | 3 +- .../oak/security/user/AuthorizableImpl.java | 2 +- .../jackrabbit/oak/security/user/GroupImpl.java | 2 +- .../jackrabbit/oak/security/user/UserImporter.java | 2 +- .../oak/plugins/index/FormattingUtilsTest.java | 11 +- .../filter/ChangeSetFilterImplTest.java | 2 +- oak-lucene/pom.xml | 6 + .../plugins/index/lucene/LuceneIndexMBeanImpl.java | 2 +- .../lucene/directory/IndexConsistencyChecker.java | 2 +- .../lucene/property/PropertyIndexCleaner.java | 4 +- .../StatisticalSortedSetDocValuesFacetCounts.java | 2 +- .../index/lucene/hybrid/DocumentQueueTest.java | 1 - oak-run-commons/pom.xml | 6 + .../jackrabbit/oak/index/OutOfBandIndexerBase.java | 2 +- .../indexer/document/DocumentStoreIndexerBase.java | 2 +- .../document/flatfile/NodeStateEntrySorter.java | 3 +- .../document/flatfile/StoreAndSortStrategy.java | 2 +- .../flatfile/TraverseWithSortStrategy.java | 2 +- .../flatfile/pipelined/PipelinedMergeSortTask.java | 2 +- .../pipelined/PipelinedMongoDownloadTask.java | 2 +- .../flatfile/pipelined/PipelinedSortBatchTask.java | 2 +- .../flatfile/pipelined/PipelinedStrategy.java | 2 +- .../flatfile/pipelined/PipelinedTransformTask.java | 2 +- .../pipelined/PipelinedTreeStoreStrategy.java | 2 +- .../flatfile/pipelined/PipelinedTreeStoreTask.java | 2 +- .../document/flatfile/pipelined/ThreadMonitor.java | 2 +- .../plugins/document/DocumentNodeStoreHelper.java | 2 +- .../PipelinedMongoConnectionFailureIT.java | 2 +- .../jackrabbit/oak/index/ElasticIndexCommand.java | 2 - oak-run/pom.xml | 6 + .../oak/exporter/NodeStateExportCommand.java | 3 +- .../apache/jackrabbit/oak/index/IndexCommand.java | 1 - .../oak/index/IndexConsistencyCheckPrinter.java | 3 +- .../jackrabbit/oak/plugins/document/check/ETA.java | 3 +- .../oak/plugins/document/check/Summary.java | 2 - .../jackrabbit/oak/plugins/tika/TextPopulator.java | 3 +- .../jackrabbit/oak/run/DataStoreCheckCommand.java | 2 +- .../jackrabbit/oak/run/DataStoreCommand.java | 5 +- oak-search/pom.xml | 6 + .../oak/plugins/index/search/BadIndexTracker.java | 1 - oak-segment-aws/pom.xml | 6 + .../oak/segment/aws/AwsSegmentArchiveWriter.java | 3 +- .../oak/segment/aws/tool/AwsCompact.java | 3 +- .../oak/segment/aws/tool/AwsSegmentCopy.java | 3 +- .../oak/segment/aws/tool/AwsToolUtils.java | 3 +- oak-segment-azure/pom.xml | 6 + .../azure/AzureHttpRequestLoggingPolicy.java | 3 +- .../segment/azure/AzureSegmentArchiveWriter.java | 2 +- .../oak/segment/azure/tool/AzureCompact.java | 2 +- .../oak/segment/azure/tool/SegmentCopy.java | 3 +- .../oak/segment/azure/tool/ToolUtils.java | 3 +- .../azure/v8/AzureSegmentArchiveWriterV8.java | 2 +- .../AzureHttpRequestLoggingTestingPolicy.java | 3 +- oak-segment-remote/pom.xml | 8 +- .../remote/AbstractRemoteSegmentArchiveReader.java | 3 +- .../persistentcache/PersistentDiskCache.java | 2 +- .../persistentcache/PersistentRedisCache.java | 2 +- oak-segment-tar/pom.xml | 6 + .../oak/backup/impl/FileStoreBackupImpl.java | 3 +- .../oak/backup/impl/FileStoreRestoreImpl.java | 3 +- .../oak/segment/file/PrintableStopwatch.java | 6 +- .../oak/segment/file/tar/SegmentTarReader.java | 3 +- .../oak/segment/file/tar/SegmentTarWriter.java | 3 +- .../persistentcache/AbstractPersistentCache.java | 3 +- .../standby/client/StandbyClientSyncExecution.java | 3 +- .../jackrabbit/oak/segment/tool/Compact.java | 3 +- .../apache/jackrabbit/oak/segment/RecordTest.java | 2 +- .../oak/segment/SegmentDataStoreBlobGCIT.java | 2 +- oak-store-document/pom.xml | 6 + .../oak/plugins/document/ClusterNodeInfo.java | 3 +- .../oak/plugins/document/DocumentNodeStore.java | 2 +- .../oak/plugins/document/JournalDiffLoader.java | 3 +- .../plugins/document/JournalGarbageCollector.java | 3 +- .../oak/plugins/document/UnsavedModifications.java | 3 +- .../plugins/document/VersionGarbageCollector.java | 2 +- .../plugins/document/mongo/MongoDocumentStore.java | 2 +- .../oak/plugins/document/rdb/RDBDocumentStore.java | 2 +- .../document/secondary/SecondaryStoreObserver.java | 3 +- .../plugins/document/DocumentMKCommitAddTest.java | 3 +- .../oak/plugins/document/MongoBlobGCTest.java | 2 +- .../oak/plugins/document/VersionGCStatsTest.java | 7 +- .../document/mongo/ReplicaSetResilienceIT.java | 2 +- .../document/prefetch/CacheWarmingTest.java | 2 +- oak-upgrade/pom.xml | 6 + .../jackrabbit/oak/upgrade/RepositoryUpgrade.java | 2 +- 105 files changed, 291 insertions(+), 156 deletions(-) diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java index f79b9439e3..fba2dd8e60 100644 --- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java +++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.oak.api.AuthInfo; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -46,6 +45,7 @@ import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncedIden import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.monitor.ExternalIdentityMonitor; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java index 24e386040a..2d456ed55a 100644 --- a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java +++ b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java @@ -37,8 +37,6 @@ import javax.jcr.nodetype.NodeType; import javax.jcr.version.VersionException; import org.apache.commons.lang3.StringUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.commons.io.output.NullOutputStream; import org.apache.commons.math3.stat.descriptive.SynchronizedDescriptiveStatistics; import org.apache.jackrabbit.commons.JcrUtils; @@ -48,6 +46,7 @@ import org.apache.jackrabbit.oak.benchmark.util.MimeType; import org.apache.jackrabbit.oak.benchmark.util.OakIndexUtils; import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.scalability.util.NodeTypeUtils; +import org.apache.jackrabbit.oak.stats.Stopwatch; /** * The suite test will incrementally increase the load and execute searches. diff --git a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java index dadcbf91d6..17e9aa5976 100644 --- a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java +++ b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java @@ -36,8 +36,6 @@ import javax.jcr.Session; import org.apache.commons.lang3.StringUtils; import org.apache.jackrabbit.guava.common.base.Splitter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.commons.math3.stat.descriptive.SynchronizedDescriptiveStatistics; import org.apache.jackrabbit.commons.JcrUtils; import org.apache.jackrabbit.oak.Oak; @@ -62,6 +60,7 @@ import org.apache.jackrabbit.oak.spi.commit.Observer; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.apache.jackrabbit.util.ISO8601; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java index e1d2af7366..24b1380bd5 100644 --- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java +++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java @@ -23,9 +23,8 @@ import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.Session; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.apache.jackrabbit.oak.stats.Stopwatch; /** * Similar to {@link RevisionGCTest} but runs continuously and performs diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/OrderedIndexBaseTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/OrderedIndexBaseTest.java index 8301495f2b..53a374dbf9 100644 --- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/OrderedIndexBaseTest.java +++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/OrderedIndexBaseTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.jackrabbit.oak.benchmark; import java.util.UUID; diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java index ec14dc9940..688cdb7f18 100644 --- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java +++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java @@ -34,8 +34,7 @@ import org.apache.jackrabbit.oak.fixture.RepositoryFixture; import org.apache.jackrabbit.oak.jcr.Jcr; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; - -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.stats.Stopwatch; /** * A benchmark to run RevisionGC. diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java index ff3ea233b8..3501c8e849 100644 --- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java +++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java @@ -16,14 +16,12 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.scalability.benchmarks.segment.standby; import java.lang.management.ManagementFactory; import java.util.Map; import java.util.Set; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import javax.jcr.Credentials; import javax.jcr.Repository; import javax.management.MBeanServer; @@ -35,6 +33,7 @@ import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.segment.standby.client.StandbyClientSync; import org.apache.jackrabbit.oak.segment.standby.jmx.StandbyStatusMBean; import org.apache.jackrabbit.oak.segment.standby.server.StandbyServerSync; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java index cb714edff9..aa160b1ed3 100644 --- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java +++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java @@ -37,7 +37,6 @@ import javax.jcr.Session; import javax.jcr.SimpleCredentials; import org.apache.jackrabbit.guava.common.base.Splitter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.apache.commons.math3.stat.descriptive.SynchronizedDescriptiveStatistics; @@ -47,6 +46,7 @@ import org.apache.jackrabbit.oak.commons.conditions.Validate; import org.apache.jackrabbit.oak.fixture.RepositoryFixture; import org.apache.jackrabbit.oak.scalability.ScalabilitySuite; import org.apache.jackrabbit.oak.scalability.benchmarks.ScalabilityBenchmark; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java index d70f847b43..dc8aac6ba0 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java @@ -50,13 +50,13 @@ import org.apache.jackrabbit.oak.spi.blob.AbstractDataRecord; import org.apache.jackrabbit.oak.spi.blob.AbstractSharedBackend; import org.apache.jackrabbit.oak.spi.blob.BlobOptions; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.apache.jackrabbit.util.LazyFileInputStream; import org.apache.jackrabbit.util.TransientFileFactory; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.guava.common.util.concurrent.ListeningExecutorService; diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java index 847d41d0f1..80fcac2ca8 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java @@ -43,11 +43,11 @@ import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; import org.apache.jackrabbit.oak.commons.io.FileTreeTraverser; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.cache.AbstractCache; /** diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java index 716d86f607..7741ae2773 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java @@ -57,7 +57,6 @@ import java.util.stream.Collectors; import org.apache.commons.collections4.ListValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; import org.apache.commons.io.IOUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.guava.common.util.concurrent.ListenableFutureTask; import org.apache.commons.io.FileUtils; @@ -79,6 +78,7 @@ import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.stats.CounterStats; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.apache.jackrabbit.oak.stats.StatsOptions; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.apache.jackrabbit.oak.stats.TimerStats; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java index 2f406d0dae..2772218593 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java @@ -36,7 +36,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Predicate; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.core.data.DataRecord; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; @@ -46,6 +45,7 @@ import org.apache.jackrabbit.oak.commons.io.FileLineDifferenceIterator; import org.apache.jackrabbit.oak.commons.io.FileTreeTraverser; import org.apache.jackrabbit.oak.plugins.blob.SharedDataStore; import org.apache.jackrabbit.oak.stats.Clock; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/stats/Stopwatch.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/stats/Stopwatch.java new file mode 100644 index 0000000000..16b65dff1e --- /dev/null +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/stats/Stopwatch.java @@ -0,0 +1,133 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.jackrabbit.oak.stats; + +import org.apache.jackrabbit.oak.commons.conditions.Validate; + +import java.time.Duration; +import java.util.concurrent.TimeUnit; + +/** + * A stop watch based on {@link java.time.Clock}, measuring time in milliseconds. + * <p> + * (inspired by Guava's) + */ +public class Stopwatch { + + private long starttime; + private long accumulated; + private boolean running; + private final java.time.Clock clock; + + private Stopwatch(Clock clock, boolean running) { + this.clock = clock; + this.accumulated = 0L; + this.starttime = this.clock.millis(); + this.running = running; + } + + /** + * @return a running stop watch, using {@link Clock#SIMPLE}. + */ + public static Stopwatch createStarted() { + return new Stopwatch(Clock.SIMPLE, true); + } + + /** + * @return a running stop watch, using the supplied clock. + */ + public static Stopwatch createStarted(Clock clock) { + return new Stopwatch(clock, true); + } + + /** + * @return a non-running stop watch, using {@link Clock#SIMPLE}. + */ + public static Stopwatch createUnstarted() { + return new Stopwatch(Clock.SIMPLE, false); + } + + /** + * Starts the stop watch, will fail when running. + * @return the stop watch + */ + public Stopwatch start() { + Validate.checkState(!this.running, "Stopwatch already started."); + this.starttime = clock.millis(); + this.running = true; + return this; + } + + /** + * Stops the stop watch, will fail when stopped. + * @return the stop watch + */ + public Stopwatch stop() { + Validate.checkState(this.running, "Stopwatch not running."); + this.accumulated += this.clock.millis() - this.starttime; + this.starttime = 0L; + this.running = false; + return this; + } + + /** + * Resets the stop watch, and puts it into stopped state. + * @return the stop watch + */ + public Stopwatch reset() { + this.accumulated = 0L; + this.starttime = 0; + this.running = false; + return this; + } + + /** + * @return whether the stop watch is running + */ + public boolean isRunning() { + return this.running; + } + + /** + * Gets elapsed time using the supplied {@link TimeUnit}. + * @param timeunit time unit + * @return elapsed time in the specified unit + */ + public long elapsed(TimeUnit timeunit) { + return timeunit.convert(elapsedMillis(), TimeUnit.MILLISECONDS); + } + + /** + * Gets elapsed time as {@link Duration}. + * @return elapsed time + */ + public Duration elapsed() { + return Duration.ofMillis(elapsedMillis()); + } + + @Override + public String toString() { + return java.time.Duration.ofMillis(elapsedMillis()).toString(); + } + + private long elapsedMillis() { + long delta = this.running ? this.clock.millis() - this.starttime : 0; + return this.accumulated + delta; + } +} diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java index c57297bda8..4e6eea4322 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java @@ -90,6 +90,7 @@ import org.apache.jackrabbit.oak.stats.HistogramStats; import org.apache.jackrabbit.oak.stats.MeterStats; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.apache.jackrabbit.oak.stats.StatsOptions; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.apache.jackrabbit.oak.stats.TimerStats; import org.apache.jackrabbit.stats.TimeSeriesStatsUtil; import org.apache.jackrabbit.util.ISO8601; @@ -99,7 +100,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.jackrabbit.guava.common.base.Splitter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; public class AsyncIndexUpdate implements Runnable, Closeable { /** diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtils.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtils.java index 34d391a0f6..e35a7fa423 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtils.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtils.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.index; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.stats.Stopwatch; import java.util.concurrent.TimeUnit; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsFormatter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsFormatter.java index 867e748dc5..7f66c68638 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsFormatter.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsFormatter.java @@ -16,9 +16,9 @@ */ package org.apache.jackrabbit.oak.plugins.index; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.conditions.Validate; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; +import org.apache.jackrabbit.oak.stats.Stopwatch; import java.util.concurrent.TimeUnit; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java index c82fa461f3..448a36213e 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java @@ -35,11 +35,11 @@ import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.base.Throwables; import org.apache.jackrabbit.guava.common.base.Ticker; import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.stats.MeterStats; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -168,12 +168,7 @@ public class TrackingCorruptIndexHandler implements CorruptIndexHandler { private final String asyncName; private final String path; private final long lastIndexerCycleCount = indexerCycleCount; - private final Stopwatch watch = Stopwatch.createStarted(new Ticker() { - @Override - public long read() { - return TimeUnit.MILLISECONDS.toNanos(clock.millis()); - } - }); + private final Stopwatch watch = Stopwatch.createStarted(clock); private String exception = ""; private int failureCount; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java index a3dda4e6df..feeb568e21 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.plugins.index.importer; import org.apache.commons.collections4.ListValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; @@ -44,6 +42,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java index 527578556c..42aab15b5a 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java @@ -35,11 +35,10 @@ import org.apache.jackrabbit.oak.plugins.index.IndexUpdate; import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback; import org.apache.jackrabbit.oak.plugins.index.NodeTraversalCallback; import org.apache.jackrabbit.oak.spi.commit.Editor; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - public class IndexingProgressReporter implements NodeTraversalCallback { private static final String REINDEX_MSG = "Reindexing"; private static final String INDEX_MSG = "Incremental indexing"; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/SimpleRateEstimator.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/SimpleRateEstimator.java index 0abebb37d0..0a1a868602 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/SimpleRateEstimator.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/SimpleRateEstimator.java @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.plugins.index.progress; -import java.util.concurrent.TimeUnit; +import org.apache.jackrabbit.oak.stats.Stopwatch; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import java.util.concurrent.TimeUnit; public class SimpleRateEstimator implements TraversalRateEstimator { private final Stopwatch w = Stopwatch.createStarted(); diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java index 5b52849129..4839680546 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.plugins.index.property; import java.util.function.Supplier; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; @@ -32,6 +30,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java index 2695a32340..a3e0ea2295 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.security.user; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.api.security.user.Group; import org.apache.jackrabbit.api.security.user.User; @@ -28,6 +27,7 @@ import org.apache.jackrabbit.oak.security.user.monitor.UserMonitor; import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; import org.apache.jackrabbit.oak.spi.security.user.DynamicMembershipProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java index 2175e960b1..a9df374faf 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java @@ -17,7 +17,6 @@ package org.apache.jackrabbit.oak.security.user; import org.apache.commons.lang3.StringUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.api.security.user.Group; import org.apache.jackrabbit.api.security.user.UserManager; @@ -29,6 +28,7 @@ import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; import org.apache.jackrabbit.oak.spi.security.user.DynamicMembershipProvider; import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil; import org.apache.jackrabbit.oak.spi.xml.ImportBehavior; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java index 19f6b85061..7f36e3f965 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.security.user; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.api.JackrabbitSession; import org.apache.jackrabbit.api.security.principal.PrincipalIterator; import org.apache.jackrabbit.api.security.principal.PrincipalManager; @@ -57,6 +56,7 @@ import org.apache.jackrabbit.oak.spi.xml.ProtectedNodeImporter; import org.apache.jackrabbit.oak.spi.xml.ProtectedPropertyImporter; import org.apache.jackrabbit.oak.spi.xml.ReferenceChangeTracker; import org.apache.jackrabbit.oak.spi.xml.TextValue; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtilsTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtilsTest.java index 2bc0637928..a4b84f6b81 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtilsTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtilsTest.java @@ -16,9 +16,8 @@ */ package org.apache.jackrabbit.oak.plugins.index; -import org.apache.jackrabbit.guava.common.base.Stopwatch; -import org.apache.jackrabbit.guava.common.base.Ticker; import org.apache.jackrabbit.oak.stats.NonTickingTestClock; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.junit.Test; import java.util.concurrent.TimeUnit; @@ -28,13 +27,7 @@ import static org.junit.Assert.assertEquals; public class FormattingUtilsTest { private final NonTickingTestClock clock = new NonTickingTestClock(); - - private final Stopwatch sw = Stopwatch.createStarted(new Ticker() { - @Override - public long read() { - return TimeUnit.MILLISECONDS.toNanos(clock.millis()); - } - }); + private final Stopwatch sw = Stopwatch.createStarted(clock); @Test public void formatToSeconds() { diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImplTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImplTest.java index 641adb7901..8510f89aed 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImplTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImplTest.java @@ -25,10 +25,10 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.observation.ChangeSet; import org.apache.jackrabbit.oak.spi.observation.ChangeSetBuilder; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-lucene/pom.xml b/oak-lucene/pom.xml index 2510f6443e..381d421316 100644 --- a/oak-lucene/pom.xml +++ b/oak-lucene/pom.xml @@ -468,5 +468,11 @@ <version>1.19.0</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>1.79-SNAPSHOT</version> + <scope>compile</scope> + </dependency> </dependencies> </project> diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java index 71ab225d41..ac6db67733 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java @@ -70,6 +70,7 @@ import org.apache.jackrabbit.oak.plugins.index.search.util.NodeStateCloner; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.Fields; import org.apache.lucene.index.IndexReader; @@ -94,7 +95,6 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.collect.TreeTraverser; public class LuceneIndexMBeanImpl extends AnnotatedStandardMBean implements LuceneIndexMBean { 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 3f38f68b8a..effd1cde90 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 @@ -32,7 +32,6 @@ 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.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.oak.api.Blob; @@ -49,6 +48,7 @@ import org.apache.jackrabbit.oak.plugins.tree.factories.RootFactory; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.spi.state.ReadOnlyBuilder; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.apache.lucene.index.CheckIndex; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.store.Directory; diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java index 4dea930ba7..d1a9d69e5b 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java @@ -60,13 +60,11 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.MeterStats; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.apache.jackrabbit.oak.stats.StatsOptions; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.apache.jackrabbit.oak.stats.TimerStats; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - - public class PropertyIndexCleaner implements Runnable{ private final Logger log = LoggerFactory.getLogger(getClass()); private final NodeStore nodeStore; diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/StatisticalSortedSetDocValuesFacetCounts.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/StatisticalSortedSetDocValuesFacetCounts.java index 0676166466..62e06c59ec 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/StatisticalSortedSetDocValuesFacetCounts.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/StatisticalSortedSetDocValuesFacetCounts.java @@ -18,11 +18,11 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene.util; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.collect.AbstractIterator; import org.apache.jackrabbit.oak.plugins.index.search.FieldNames; import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition.SecureFacetConfiguration; import org.apache.jackrabbit.oak.spi.query.Filter; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.apache.lucene.document.Document; import org.apache.lucene.facet.FacetResult; import org.apache.lucene.facet.FacetsCollector; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java index 807838c612..02878d5e59 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java @@ -29,7 +29,6 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.collections4.ListValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider; diff --git a/oak-run-commons/pom.xml b/oak-run-commons/pom.xml index 2e15c2a6b1..185944cf4d 100644 --- a/oak-run-commons/pom.xml +++ b/oak-run-commons/pom.xml @@ -228,5 +228,11 @@ <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>1.79-SNAPSHOT</version> + <scope>compile</scope> + </dependency> </dependencies> </project> diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexerBase.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexerBase.java index 1991b60a94..b0b019e9bc 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexerBase.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexerBase.java @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.index; import com.codahale.metrics.MetricRegistry; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.index.*; @@ -36,6 +35,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import java.io.Closeable; import java.io.File; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java index 72fb3607fe..2b5fd568e0 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java @@ -20,7 +20,6 @@ package org.apache.jackrabbit.oak.index.indexer.document; import com.codahale.metrics.MetricRegistry; import com.mongodb.MongoClientURI; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.PathUtils; @@ -59,6 +58,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java index 3211149925..6f5b6d0451 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.index.indexer.document.flatfile; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.commons.sort.ExternalSort; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java index 2e3575ed5d..79e4f80f8e 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.index.indexer.document.LastModifiedRange; import org.apache.jackrabbit.oak.index.indexer.document.NodeStateEntry; @@ -30,6 +29,7 @@ import org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStoreSor import org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStoreUtils; import org.apache.jackrabbit.oak.plugins.document.mongo.TraversingRange; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/TraverseWithSortStrategy.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/TraverseWithSortStrategy.java index 47ff8d149b..a5430c1d15 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/TraverseWithSortStrategy.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/TraverseWithSortStrategy.java @@ -20,7 +20,6 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.commons.sort.ExternalSort; import org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.PipelinedStrategy; @@ -32,6 +31,7 @@ import org.apache.jackrabbit.oak.index.indexer.document.NodeStateEntryTraverserF import org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStoreUtils; import org.apache.jackrabbit.oak.plugins.document.mongo.TraversingRange; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTask.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTask.java index 111b282d55..e0c2853d1e 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTask.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTask.java @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.commons.conditions.Validate; @@ -31,6 +30,7 @@ import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; import org.apache.jackrabbit.oak.plugins.index.IndexingReporter; import org.apache.jackrabbit.oak.plugins.index.MetricsUtils; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java index 67a77ebdff..6dd77b9af7 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java @@ -33,7 +33,6 @@ import com.mongodb.client.MongoCursor; import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Sorts; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; @@ -49,6 +48,7 @@ import org.apache.jackrabbit.oak.plugins.index.IndexingReporter; import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; import org.apache.jackrabbit.oak.spi.filter.PathFilter; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.bson.BsonBinaryReader; import org.bson.BsonDocument; import org.bson.BsonType; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedSortBatchTask.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedSortBatchTask.java index a375337ca3..b26853f22f 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedSortBatchTask.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedSortBatchTask.java @@ -19,13 +19,13 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStoreUtils; import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; import org.apache.jackrabbit.oak.plugins.index.IndexingReporter; import org.apache.jackrabbit.oak.plugins.index.MetricsUtils; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java index 5adbfed287..242d72e473 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java @@ -21,7 +21,6 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; import com.mongodb.MongoClientSettings; import com.mongodb.MongoClientURI; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.util.concurrent.ThreadFactoryBuilder; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.commons.IOUtils; @@ -40,6 +39,7 @@ import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.filter.PathFilter; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.bson.RawBsonDocument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTransformTask.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTransformTask.java index 9a17f11388..5e4c667bd8 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTransformTask.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTransformTask.java @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.index.indexer.document.flatfile.NodeStateEntryWriter; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeState; @@ -34,6 +33,7 @@ import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStoreHelper import org.apache.jackrabbit.oak.plugins.index.FormattingUtils; import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.bson.BsonBinaryReader; import org.bson.ByteBuf; import org.bson.RawBsonDocument; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreStrategy.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreStrategy.java index 7d066a39fb..f9bcba55d6 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreStrategy.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreStrategy.java @@ -21,7 +21,6 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; import com.mongodb.MongoClientSettings; import com.mongodb.MongoClientURI; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.util.concurrent.ThreadFactoryBuilder; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.commons.IOUtils; @@ -41,6 +40,7 @@ import org.apache.jackrabbit.oak.plugins.index.IndexingReporter; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.filter.PathFilter; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.bson.RawBsonDocument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreTask.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreTask.java index dbf548128e..903989dcd4 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreTask.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreTask.java @@ -33,7 +33,6 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.commons.json.JsopReader; import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; @@ -46,6 +45,7 @@ import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; import org.apache.jackrabbit.oak.plugins.index.MetricsUtils; import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/ThreadMonitor.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/ThreadMonitor.java index 53200f60ba..559b7ab866 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/ThreadMonitor.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/ThreadMonitor.java @@ -18,8 +18,8 @@ */ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.plugins.index.FormattingUtils; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java index 4cb99399e4..dd854bc50b 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java @@ -36,9 +36,9 @@ import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStoreHelper; import org.apache.jackrabbit.oak.plugins.document.util.Utils; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.bson.conversions.Bson; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import com.mongodb.BasicDBObject; import com.mongodb.client.FindIterable; import com.mongodb.client.MongoCollection; diff --git a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java index 4816477f0e..786678b54e 100644 --- a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java +++ b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java @@ -22,7 +22,6 @@ import eu.rekawek.toxiproxy.Proxy; import eu.rekawek.toxiproxy.ToxiproxyClient; import eu.rekawek.toxiproxy.model.ToxicDirection; import eu.rekawek.toxiproxy.model.toxic.LimitData; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; @@ -34,6 +33,7 @@ import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.Clock; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.junit.Assert; import org.junit.Assume; diff --git a/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexCommand.java b/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexCommand.java index 603dddc510..ce40fcffdb 100644 --- a/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexCommand.java +++ b/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexCommand.java @@ -18,8 +18,6 @@ */ package org.apache.jackrabbit.oak.index; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import joptsimple.OptionParser; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.api.CommitFailedException; diff --git a/oak-run/pom.xml b/oak-run/pom.xml index 8b2288ec5a..d75df0747e 100644 --- a/oak-run/pom.xml +++ b/oak-run/pom.xml @@ -507,6 +507,12 @@ <version>1.19.0</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>1.79-SNAPSHOT</version> + <scope>compile</scope> + </dependency> </dependencies> <profiles> diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java index 586a5772bb..f61be184b7 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.exporter; import java.io.File; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import joptsimple.OptionParser; +import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.run.cli.CommonOptions; import org.apache.jackrabbit.oak.run.cli.NodeStoreFixture; import org.apache.jackrabbit.oak.run.cli.NodeStoreFixtureProvider; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java index 0d77b88229..0a39191954 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.index; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import joptsimple.OptionParser; import org.apache.commons.io.FileUtils; import org.apache.felix.inventory.Format; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexConsistencyCheckPrinter.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexConsistencyCheckPrinter.java index 433d53ae33..09b4e3a3cc 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexConsistencyCheckPrinter.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexConsistencyCheckPrinter.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.index; import java.io.PrintStream; @@ -25,7 +24,6 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.commons.io.output.WriterOutputStream; import org.apache.felix.inventory.Format; import org.apache.felix.inventory.InventoryPrinter; @@ -33,6 +31,7 @@ import org.apache.jackrabbit.oak.plugins.index.lucene.directory.IndexConsistency import org.apache.jackrabbit.oak.plugins.index.lucene.directory.IndexConsistencyChecker.Level; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.apache.jackrabbit.oak.stats.Stopwatch; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME; import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/ETA.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/ETA.java index e74a47c7c2..3002f4c2ad 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/ETA.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/ETA.java @@ -18,8 +18,7 @@ package org.apache.jackrabbit.oak.plugins.document.check; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.apache.jackrabbit.util.ISO8601; /** diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/Summary.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/Summary.java index 624e4a72f8..c7bbe285b9 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/Summary.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/Summary.java @@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.plugins.document.check; import java.util.concurrent.BlockingQueue; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; import org.jetbrains.annotations.NotNull; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java index 8d2df2e16d..7d70b6c2cf 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.plugins.tika; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.apache.jackrabbit.oak.plugins.blob.datastore.TextWriter; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.Term; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java index 5eb8b15fb2..65acf7f509 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java @@ -45,7 +45,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.jackrabbit.guava.common.base.Splitter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import com.mongodb.MongoClient; import com.mongodb.MongoClientURI; import com.mongodb.MongoURI; @@ -58,6 +57,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.LineIterator; import org.apache.commons.io.filefilter.FileFilterUtils; +import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java index 8bf3d3a9d5..83cf843337 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java @@ -40,7 +40,6 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; import org.apache.jackrabbit.guava.common.base.Splitter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import joptsimple.OptionParser; import org.apache.commons.io.FileUtils; import org.apache.commons.io.LineIterator; @@ -79,6 +78,7 @@ import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -87,7 +87,6 @@ import org.slf4j.LoggerFactory; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.jackrabbit.guava.common.base.Stopwatch.createStarted; import static org.apache.jackrabbit.oak.commons.FileIOUtils.sort; import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeAsLine; import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeStrings; @@ -386,7 +385,7 @@ public class DataStoreCommand implements Command { private static void retrieveBlobIds(GarbageCollectableBlobStore blobStore, File blob) throws Exception { System.out.println("Starting dump of blob ids"); - Stopwatch watch = createStarted(); + Stopwatch watch = Stopwatch.createStarted(); Iterator<String> blobIter = blobStore.getAllChunkIds(0); int count = writeStrings(blobIter, blob, false); diff --git a/oak-search/pom.xml b/oak-search/pom.xml index a0e561e7b4..ca7845af71 100644 --- a/oak-search/pom.xml +++ b/oak-search/pom.xml @@ -174,6 +174,12 @@ <artifactId>logback-classic</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>1.79-SNAPSHOT</version> + <scope>compile</scope> + </dependency> </dependencies> </project> diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java index 1512cfa7d9..d7f1bf0ba3 100644 --- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java +++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java @@ -24,7 +24,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.base.Throwables; import org.apache.jackrabbit.guava.common.base.Ticker; import org.slf4j.Logger; diff --git a/oak-segment-aws/pom.xml b/oak-segment-aws/pom.xml index bc15870a62..988eb41f51 100644 --- a/oak-segment-aws/pom.xml +++ b/oak-segment-aws/pom.xml @@ -310,6 +310,12 @@ <type>so</type> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>1.79-SNAPSHOT</version> + <scope>compile</scope> + </dependency> </dependencies> <repositories> diff --git a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/AwsSegmentArchiveWriter.java b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/AwsSegmentArchiveWriter.java index ccf83cd934..5bc1a72bf5 100644 --- a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/AwsSegmentArchiveWriter.java +++ b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/AwsSegmentArchiveWriter.java @@ -23,13 +23,12 @@ import java.io.File; import java.io.IOException; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.remote.AbstractRemoteSegmentArchiveWriter; import org.apache.jackrabbit.oak.segment.remote.RemoteSegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; +import org.apache.jackrabbit.oak.stats.Stopwatch; public class AwsSegmentArchiveWriter extends AbstractRemoteSegmentArchiveWriter { diff --git a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsCompact.java b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsCompact.java index c452eb9e63..992adc0ecc 100644 --- a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsCompact.java +++ b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsCompact.java @@ -29,8 +29,6 @@ import java.nio.file.Files; import java.util.Collections; import java.util.List; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.segment.SegmentCache; import org.apache.jackrabbit.oak.segment.aws.tool.AwsToolUtils.SegmentStoreType; import org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions.GCType; @@ -45,6 +43,7 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFileWriter; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; import org.apache.jackrabbit.oak.segment.tool.Compact; +import org.apache.jackrabbit.oak.stats.Stopwatch; /** * Perform an offline compaction of an existing AWS Segment Store. diff --git a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsSegmentCopy.java b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsSegmentCopy.java index 7c7696f7d6..2dcf2fb700 100644 --- a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsSegmentCopy.java +++ b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsSegmentCopy.java @@ -27,11 +27,10 @@ import static org.apache.jackrabbit.oak.segment.aws.tool.AwsToolUtils.storeTypeF import java.io.PrintWriter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.segment.aws.tool.AwsToolUtils.SegmentStoreType; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; import org.apache.jackrabbit.oak.segment.tool.Check; +import org.apache.jackrabbit.oak.stats.Stopwatch; /** * Perform a full-copy of repository data at segment level. diff --git a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsToolUtils.java b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsToolUtils.java index e76d18bf86..e771be4488 100644 --- a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsToolUtils.java +++ b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsToolUtils.java @@ -28,8 +28,6 @@ import java.net.URISyntaxException; import java.text.MessageFormat; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.aws.AwsContext; import org.apache.jackrabbit.oak.segment.aws.AwsPersistence; @@ -40,6 +38,7 @@ import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder; import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException; import org.apache.jackrabbit.oak.segment.file.tar.TarPersistence; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; +import org.apache.jackrabbit.oak.stats.Stopwatch; /** * Utility class for common stuff pertaining to tooling. diff --git a/oak-segment-azure/pom.xml b/oak-segment-azure/pom.xml index 24390d5dd7..0ef5b44534 100644 --- a/oak-segment-azure/pom.xml +++ b/oak-segment-azure/pom.xml @@ -467,6 +467,12 @@ <artifactId>system-rules</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>1.79-SNAPSHOT</version> + <scope>compile</scope> + </dependency> </dependencies> </project> diff --git a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingPolicy.java b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingPolicy.java index 0c59c5d343..5045d29dae 100644 --- a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingPolicy.java +++ b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingPolicy.java @@ -22,8 +22,9 @@ import com.azure.core.http.HttpPipelineCallContext; import com.azure.core.http.HttpPipelineNextPolicy; import com.azure.core.http.HttpResponse; import com.azure.core.http.policy.HttpPipelinePolicy; -import org.apache.jackrabbit.guava.common.base.Stopwatch; + import org.apache.jackrabbit.oak.segment.spi.monitor.RemoteStoreMonitor; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java index e9b9f5d8a7..05dfe9fcf2 100644 --- a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java +++ b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java @@ -20,7 +20,6 @@ import com.azure.core.util.BinaryData; import com.azure.storage.blob.BlobContainerClient; import com.azure.storage.blob.models.BlobStorageException; import com.azure.storage.blob.specialized.BlockBlobClient; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.azure.util.Retrier; import org.apache.jackrabbit.oak.segment.remote.AbstractRemoteSegmentArchiveWriter; @@ -28,6 +27,7 @@ import org.apache.jackrabbit.oak.segment.remote.RemoteSegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.remote.WriteAccessController; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; +import org.apache.jackrabbit.oak.stats.Stopwatch; import java.io.File; import java.io.IOException; diff --git a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/AzureCompact.java b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/AzureCompact.java index 1a61d9fcb6..0e43f2659e 100644 --- a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/AzureCompact.java +++ b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/AzureCompact.java @@ -28,7 +28,6 @@ import com.azure.storage.blob.BlobContainerClient; import com.azure.storage.blob.models.BlobItem; import com.azure.storage.blob.models.BlobListDetails; import com.azure.storage.blob.models.ListBlobsOptions; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.segment.SegmentCache; import org.apache.jackrabbit.oak.segment.azure.AzurePersistence; @@ -42,6 +41,7 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; import org.apache.jackrabbit.oak.segment.spi.persistence.split.SplitPersistence; import org.apache.jackrabbit.oak.segment.tool.Compact; +import org.apache.jackrabbit.oak.stats.Stopwatch; import java.io.IOException; import java.io.PrintStream; diff --git a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentCopy.java b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentCopy.java index cfed41d3cf..656b79e5d4 100644 --- a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentCopy.java +++ b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentCopy.java @@ -54,8 +54,7 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; import org.apache.jackrabbit.oak.segment.tool.Check; - -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.stats.Stopwatch; /** * Perform a full-copy of repository data at segment level. diff --git a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java index e41e6f5350..dcfdd0cc0a 100644 --- a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java +++ b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java @@ -54,11 +54,10 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersist import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.CachingPersistence; import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.PersistentCache; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; - import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/v8/AzureSegmentArchiveWriterV8.java b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/v8/AzureSegmentArchiveWriterV8.java index 21ecfe8d76..740af88cf0 100644 --- a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/v8/AzureSegmentArchiveWriterV8.java +++ b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/v8/AzureSegmentArchiveWriterV8.java @@ -26,7 +26,6 @@ import java.net.URISyntaxException; import java.util.concurrent.TimeUnit; import com.microsoft.azure.storage.blob.BlobRequestOptions; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import com.microsoft.azure.storage.StorageException; import com.microsoft.azure.storage.blob.CloudBlobDirectory; import com.microsoft.azure.storage.blob.CloudBlockBlob; @@ -40,6 +39,7 @@ import org.apache.jackrabbit.oak.segment.remote.AbstractRemoteSegmentArchiveWrit import org.apache.jackrabbit.oak.segment.remote.RemoteSegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; +import org.apache.jackrabbit.oak.stats.Stopwatch; public class AzureSegmentArchiveWriterV8 extends AbstractRemoteSegmentArchiveWriter { diff --git a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingTestingPolicy.java b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingTestingPolicy.java index d76554e3ca..8d5caec2f4 100644 --- a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingTestingPolicy.java +++ b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingTestingPolicy.java @@ -22,7 +22,8 @@ import com.azure.core.http.HttpPipelineCallContext; import com.azure.core.http.HttpPipelineNextPolicy; import com.azure.core.http.HttpResponse; import com.azure.core.http.policy.HttpPipelinePolicy; -import org.apache.jackrabbit.guava.common.base.Stopwatch; + +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/oak-segment-remote/pom.xml b/oak-segment-remote/pom.xml index 82dbc60b03..7441d4aae7 100644 --- a/oak-segment-remote/pom.xml +++ b/oak-segment-remote/pom.xml @@ -161,5 +161,11 @@ <artifactId>logback-classic</artifactId> <scope>test</scope> </dependency> - </dependencies> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>1.79-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + </dependencies> </project> diff --git a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/AbstractRemoteSegmentArchiveReader.java b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/AbstractRemoteSegmentArchiveReader.java index d65490eaf0..0b85d44ba8 100644 --- a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/AbstractRemoteSegmentArchiveReader.java +++ b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/AbstractRemoteSegmentArchiveReader.java @@ -19,12 +19,11 @@ package org.apache.jackrabbit.oak.segment.remote; import static org.apache.jackrabbit.oak.segment.remote.RemoteUtilities.getSegmentFileName; import static org.apache.jackrabbit.oak.segment.remote.RemoteUtilities.OFF_HEAP; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; +import org.apache.jackrabbit.oak.stats.Stopwatch; import java.io.File; import java.io.IOException; diff --git a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java index 1a1713f87e..fb47053537 100644 --- a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java +++ b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java @@ -17,7 +17,6 @@ */ package org.apache.jackrabbit.oak.segment.remote.persistentcache; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import java.io.UncheckedIOException; import java.nio.file.NoSuchFileException; import org.apache.commons.io.FileUtils; @@ -25,6 +24,7 @@ import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.AbstractPersistentCache; import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.SegmentCacheStats; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCache.java b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCache.java index 52df79cdfb..51499ce8f6 100644 --- a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCache.java +++ b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCache.java @@ -17,11 +17,11 @@ */ package org.apache.jackrabbit.oak.segment.remote.persistentcache; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.AbstractPersistentCache; import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.SegmentCacheStats; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-segment-tar/pom.xml b/oak-segment-tar/pom.xml index 6361823553..609f6b26a0 100644 --- a/oak-segment-tar/pom.xml +++ b/oak-segment-tar/pom.xml @@ -438,5 +438,11 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>1.79-SNAPSHOT</version> + <scope>compile</scope> + </dependency> </dependencies> </project> diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java index 14c3d62067..3b81395ba3 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.backup.impl; import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder; @@ -24,7 +23,6 @@ import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreB import java.io.File; import java.io.IOException; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.backup.FileStoreBackup; import org.apache.jackrabbit.oak.segment.ClassicCompactor; import org.apache.jackrabbit.oak.segment.DefaultSegmentWriter; @@ -43,6 +41,7 @@ import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException; import org.apache.jackrabbit.oak.segment.file.cancel.Canceller; import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration; import org.apache.jackrabbit.oak.segment.file.tooling.BasicReadOnlyBlobStore; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java index 3f2c3ffa8f..02f4bbb23d 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.backup.impl; import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder; @@ -24,7 +23,6 @@ import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreB import java.io.File; import java.io.IOException; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.backup.FileStoreRestore; import org.apache.jackrabbit.oak.segment.DefaultSegmentWriter; import org.apache.jackrabbit.oak.segment.ClassicCompactor; @@ -39,6 +37,7 @@ import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException; import org.apache.jackrabbit.oak.segment.file.ReadOnlyFileStore; import org.apache.jackrabbit.oak.segment.file.cancel.Canceller; import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PrintableStopwatch.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PrintableStopwatch.java index 5b665413a8..960d39ec0e 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PrintableStopwatch.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PrintableStopwatch.java @@ -15,12 +15,11 @@ * limitations under the License. * */ - package org.apache.jackrabbit.oak.segment.file; -import java.util.concurrent.TimeUnit; +import org.apache.jackrabbit.oak.stats.Stopwatch; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import java.util.concurrent.TimeUnit; /** * A stopwatch that is also pretty-printable for usage in log messages. @@ -46,6 +45,5 @@ class PrintableStopwatch { public String toString() { return String.format("%s (%d ms)", stopwatch, stopwatch.elapsed(TimeUnit.MILLISECONDS)); } - } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarReader.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarReader.java index 29ed0c4551..313910526a 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarReader.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarReader.java @@ -29,8 +29,6 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.file.tar.binaries.BinaryReferencesIndexLoader; import org.apache.jackrabbit.oak.segment.file.tar.binaries.InvalidBinaryReferencesIndexException; @@ -42,6 +40,7 @@ import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; import org.apache.jackrabbit.oak.segment.util.ReaderAtEnd; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java index 1068cbbb1e..cbc853152c 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java @@ -33,8 +33,6 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.zip.CRC32; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.commons.conditions.Validate; import org.apache.jackrabbit.oak.segment.file.tar.index.IndexEntry; @@ -43,6 +41,7 @@ import org.apache.jackrabbit.oak.segment.file.tar.index.SimpleIndexEntry; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java index e57689691d..c55373abc4 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java @@ -20,11 +20,10 @@ package org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache; import static java.lang.Thread.currentThread; import static java.util.concurrent.TimeUnit.SECONDS; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.spi.RepositoryNotReachableException; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java index 6d05a6f8e0..980cd5d498 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java @@ -23,8 +23,6 @@ import java.util.Set; import java.util.UUID; import java.util.function.Supplier; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.segment.RecordId; import org.apache.jackrabbit.oak.segment.SegmentId; import org.apache.jackrabbit.oak.segment.SegmentIdProvider; @@ -32,6 +30,7 @@ import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder; import org.apache.jackrabbit.oak.segment.SegmentNodeState; import org.apache.jackrabbit.oak.segment.SegmentNotFoundException; import org.apache.jackrabbit.oak.segment.file.FileStore; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java index c49115f943..798fce55a1 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.jackrabbit.oak.segment.tool; import static org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument; @@ -34,7 +33,6 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.collections.SetUtils; import org.apache.jackrabbit.oak.segment.SegmentCache; import org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions.GCType; @@ -46,6 +44,7 @@ import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder; import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException; import org.apache.jackrabbit.oak.segment.file.JournalReader; import org.apache.jackrabbit.oak.segment.file.tar.LocalJournalFile; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.Nullable; /** diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java index 2c0e8a47d1..b47bbbcbea 100644 --- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java +++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java @@ -38,7 +38,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; @@ -48,6 +47,7 @@ import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java index 609c21f034..9414633d04 100644 --- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java +++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java @@ -42,7 +42,6 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import ch.qos.logback.classic.Level; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.FileFilterUtils; import org.apache.jackrabbit.oak.api.Blob; @@ -68,6 +67,7 @@ import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Rule; diff --git a/oak-store-document/pom.xml b/oak-store-document/pom.xml index dc0d2aec23..123da0bd79 100644 --- a/oak-store-document/pom.xml +++ b/oak-store-document/pom.xml @@ -355,5 +355,11 @@ <version>${jackson.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>1.79-SNAPSHOT</version> + <scope>compile</scope> + </dependency> </dependencies> </project> diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java index c3762c0f29..5d51351faa 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java @@ -39,13 +39,12 @@ import java.util.TreeSet; import java.util.UUID; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.UUIDUtils; import org.apache.jackrabbit.oak.commons.properties.SystemPropertySupplier; import org.apache.jackrabbit.oak.plugins.document.spi.lease.LeaseFailureHandler; import org.apache.jackrabbit.oak.stats.Clock; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java index 1acad841bd..5257821476 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java @@ -129,12 +129,12 @@ import org.apache.jackrabbit.oak.spi.toggle.Feature; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.base.Suppliers; /** diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java index 1550620902..9556cf73e3 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java @@ -20,12 +20,11 @@ import java.io.IOException; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.sort.StringSort; import org.apache.jackrabbit.oak.plugins.document.util.StringValue; import org.apache.jackrabbit.oak.plugins.document.util.Utils; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java index bae0cd9db8..376e31780a 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java @@ -23,11 +23,10 @@ import java.util.List; import java.util.concurrent.TimeUnit; import org.apache.jackrabbit.oak.plugins.document.util.Utils; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.jackrabbit.oak.plugins.document.Collection.SETTINGS; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java index cc79ba2efb..15e11c61e6 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java @@ -31,13 +31,12 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.plugins.document.util.MapFactory; import org.apache.jackrabbit.oak.plugins.document.util.Utils; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import static java.util.Objects.requireNonNull; import static org.apache.jackrabbit.oak.plugins.document.Collection.CLUSTER_NODES; import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES; 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 271604d61f..8be7e93a19 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 @@ -42,7 +42,6 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.StreamSupport; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.sort.StringSort; @@ -59,6 +58,7 @@ import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.commons.TimeDurationFormatter; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java index 060a90d2a6..b9cc9fa428 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java @@ -43,7 +43,6 @@ import java.util.stream.StreamSupport; import org.apache.commons.io.IOUtils; import com.mongodb.client.model.IndexOptions; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.guava.common.util.concurrent.AtomicDouble; import com.mongodb.Block; @@ -90,6 +89,7 @@ import org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.commons.PerfLogger; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.bson.BSONException; import org.bson.BsonMaximumSizeExceededException; import org.bson.conversions.Bson; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java index 3827972c76..91a841b133 100755 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java @@ -85,12 +85,12 @@ import org.apache.jackrabbit.oak.plugins.document.locks.NodeDocumentLocks; import org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore; import org.apache.jackrabbit.oak.plugins.document.util.CloseableIterator; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; /** diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java index 2ec1d9a5b5..ec1be11f08 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java @@ -16,13 +16,11 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.plugins.document.secondary; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.plugins.document.AbstractDocumentNodeState; import org.apache.jackrabbit.oak.plugins.document.NodeStateDiffer; @@ -36,6 +34,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.apache.jackrabbit.oak.stats.StatsOptions; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.apache.jackrabbit.oak.stats.TimerStats; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java index 898b17144b..3ccccb52a4 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java @@ -22,12 +22,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.json.simple.JSONObject; import org.junit.Ignore; import org.junit.Test; - /** * Tests for add node and property operations. */ diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java index aa4a58ff6f..632af80d6b 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java @@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit; import ch.qos.logback.classic.Level; import org.apache.commons.lang3.StringUtils; import org.apache.jackrabbit.guava.common.base.Splitter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import com.mongodb.BasicDBObject; import com.mongodb.ReadPreference; import com.mongodb.client.MongoCollection; @@ -61,6 +60,7 @@ import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.stats.Clock; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.Nullable; import org.junit.Rule; import org.junit.Test; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java index 04793a0992..e5f75ae487 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java @@ -20,9 +20,8 @@ package org.apache.jackrabbit.oak.plugins.document; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.junit.Before; import org.junit.Test; @@ -36,7 +35,7 @@ public class VersionGCStatsTest { private static final Callable STOP = Stopwatch::stop; private final VersionGCStats stats = new VersionGCStats(); - + @Before public void before() throws Exception { forEachStopwatch(stats, START); @@ -45,7 +44,7 @@ public class VersionGCStatsTest { } forEachStopwatch(stats, STOP); } - + @Test public void addRun() { VersionGCStats cumulative = new VersionGCStats(); diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetResilienceIT.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetResilienceIT.java index 77d949da48..3a90715351 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetResilienceIT.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetResilienceIT.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import com.mongodb.MongoClient; import com.mongodb.MongoClientOptions; import com.mongodb.ServerAddress; @@ -43,6 +42,7 @@ import org.apache.jackrabbit.oak.plugins.document.MongoUtils; import org.apache.jackrabbit.oak.plugins.document.TestUtils; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/prefetch/CacheWarmingTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/prefetch/CacheWarmingTest.java index dc50d25f3e..dd407ea0bc 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/prefetch/CacheWarmingTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/prefetch/CacheWarmingTest.java @@ -52,6 +52,7 @@ import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.stats.Clock; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.Nullable; import org.junit.AfterClass; import org.junit.Before; @@ -59,7 +60,6 @@ import org.junit.Rule; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; public class CacheWarmingTest { diff --git a/oak-upgrade/pom.xml b/oak-upgrade/pom.xml index 0e96bb58a7..afc4716a99 100644 --- a/oak-upgrade/pom.xml +++ b/oak-upgrade/pom.xml @@ -268,5 +268,11 @@ <version>1.1.1</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>1.79-SNAPSHOT</version> + <scope>compile</scope> + </dependency> </dependencies> </project> diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java index 827bc7eabc..5ff9b1a00a 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java @@ -56,7 +56,6 @@ import javax.jcr.nodetype.NodeTypeTemplate; import javax.jcr.nodetype.PropertyDefinitionTemplate; import javax.jcr.security.Privilege; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.collect.ImmutableList; import org.apache.jackrabbit.guava.common.collect.Lists; import org.apache.commons.collections4.bidimap.DualHashBidiMap; @@ -88,6 +87,7 @@ import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback; import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.reference.ReferenceEditorProvider; import org.apache.jackrabbit.oak.plugins.migration.FilteringNodeState; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.apache.jackrabbit.oak.upgrade.nodestate.NameFilteringNodeState; import org.apache.jackrabbit.oak.plugins.migration.NodeStateCopier; import org.apache.jackrabbit.oak.plugins.migration.report.LoggingReporter;
