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
The following commit(s) were added to refs/heads/OAK-11618 by this push:
new 014718beb7 OAK-11618: Remove usage of Guava Stopwatch - work in
progress
014718beb7 is described below
commit 014718beb7ba497cb93a57ed585cbeec6332522f
Author: Julian Reschke <[email protected]>
AuthorDate: Fri Apr 4 18:34:21 2025 +0100
OAK-11618: Remove usage of Guava Stopwatch - work in progress
---
.../java/org/apache/jackrabbit/oak/stats/Stopwatch.java | 4 ++--
.../plugins/index/lucene/hybrid/DocumentQueueTest.java | 1 +
oak-run-elastic/pom.xml | 6 ++++++
.../apache/jackrabbit/oak/index/ElasticIndexCommand.java | 1 +
.../org/apache/jackrabbit/oak/index/IndexCommand.java | 1 +
.../jackrabbit/oak/plugins/document/check/Summary.java | 1 +
.../oak/plugins/index/search/BadIndexTracker.java | 16 +++-------------
7 files changed, 15 insertions(+), 15 deletions(-)
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
index 16b65dff1e..13aefa7255 100644
--- 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
@@ -35,7 +35,7 @@ public class Stopwatch {
private boolean running;
private final java.time.Clock clock;
- private Stopwatch(Clock clock, boolean running) {
+ private Stopwatch(java.time.Clock clock, boolean running) {
this.clock = clock;
this.accumulated = 0L;
this.starttime = this.clock.millis();
@@ -52,7 +52,7 @@ public class Stopwatch {
/**
* @return a running stop watch, using the supplied clock.
*/
- public static Stopwatch createStarted(Clock clock) {
+ public static Stopwatch createStarted(java.time.Clock clock) {
return new Stopwatch(clock, true);
}
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 02878d5e59..512ac76fad 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
@@ -48,6 +48,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.apache.jackrabbit.oak.stats.Stopwatch;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
diff --git a/oak-run-elastic/pom.xml b/oak-run-elastic/pom.xml
index 8fd518ae96..0813c60c76 100644
--- a/oak-run-elastic/pom.xml
+++ b/oak-run-elastic/pom.xml
@@ -262,6 +262,12 @@
<artifactId>mockito-core</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>
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 ce40fcffdb..3d82a8fc26 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
@@ -45,6 +45,7 @@ import
org.apache.jackrabbit.oak.spi.commit.SimpleCommitContext;
import org.apache.jackrabbit.oak.spi.commit.ResetCommitAttributeHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
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-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 0a39191954..0f9ce2e519 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
@@ -37,6 +37,7 @@ import org.apache.jackrabbit.oak.run.cli.Options;
import org.apache.jackrabbit.oak.run.commons.Command;
import org.apache.jackrabbit.oak.run.commons.LoggingInitializer;
import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
+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-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 c7bbe285b9..70312e1c1f 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
@@ -20,6 +20,7 @@ import java.util.concurrent.BlockingQueue;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
+import org.apache.jackrabbit.oak.stats.Stopwatch;
import org.jetbrains.annotations.NotNull;
/**
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 d7f1bf0ba3..9c0d484525 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
@@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.guava.common.base.Throwables;
-import org.apache.jackrabbit.guava.common.base.Ticker;
+import org.apache.jackrabbit.oak.stats.Stopwatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -155,18 +155,8 @@ public class BadIndexTracker {
final int lastIndexerCycleCount = indexerCycleCount;
private final long createdTime = clock.millis();
private final boolean persistedIndex;
- private final Stopwatch created = Stopwatch.createStarted(new Ticker()
{
- @Override
- public long read() {
- return TimeUnit.MILLISECONDS.toNanos(clock.millis());
- }
- });
- private final Stopwatch watch = Stopwatch.createStarted(new Ticker() {
- @Override
- public long read() {
- return TimeUnit.MILLISECONDS.toNanos(clock.millis());
- }
- });
+ private final Stopwatch created = Stopwatch.createStarted(clock);
+ private final Stopwatch watch = Stopwatch.createStarted(clock);
private String exception;
private int accessCount;
private int failedAccessCount;
