You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by st...@apache.org on 2024/05/16 17:04:11 UTC
(jackrabbit-oak) 01/01: OAK-10739 : revert unrelated or unnecessary changes
This is an automated email from the ASF dual-hosted git repository.
stefanegli pushed a commit to branch OAK-10739-1454-2
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 4cb436ad1cf7461edb4426da5f29aa58c03cb0c7
Author: Stefan Egli <st...@apache.org>
AuthorDate: Thu May 16 18:57:36 2024 +0200
OAK-10739 : revert unrelated or unnecessary changes
---
.../java/org/apache/jackrabbit/oak/run/RevisionsCommand.java | 10 ++++++++--
oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java | 10 +++++++---
oak-segment-azure/src/test/resources/logback-test.xml | 10 +---------
.../apache/jackrabbit/oak/plugins/document/DocumentStore.java | 2 +-
.../oak/plugins/document/util/LoggingDocumentStoreWrapper.java | 1 -
5 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RevisionsCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RevisionsCommand.java
index ba74e49361..8a9688999a 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RevisionsCommand.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RevisionsCommand.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.List;
import java.util.Locale;
import java.util.Optional;
+import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -173,7 +174,7 @@ public class RevisionsCommand implements Command {
String getSubCmd() {
List<String> args = getOtherArgs();
- if (!args.isEmpty()) {
+ if (args.size() > 0) {
return args.get(0);
}
return "info";
@@ -412,7 +413,12 @@ public class RevisionsCommand implements Command {
ExecutorService executor) throws IOException {
long started = System.currentTimeMillis();
System.out.println("starting gc collect");
- Future<VersionGCStats> f = executor.submit(() -> gc.gc(options.getOlderThan(), SECONDS));
+ Future<VersionGCStats> f = executor.submit(new Callable<VersionGCStats>() {
+ @Override
+ public VersionGCStats call() throws Exception {
+ return gc.gc(options.getOlderThan(), SECONDS);
+ }
+ });
if (options.getTimeLimit() >= 0) {
try {
f.get(options.getTimeLimit(), SECONDS);
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
index 3de6751d55..eb99b3a7c6 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
@@ -55,6 +55,7 @@ import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
import org.apache.jackrabbit.oak.plugins.blob.datastore.OakFileDataStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreBuilder;
+import org.apache.jackrabbit.oak.plugins.document.LeaseCheckMode;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
@@ -225,9 +226,11 @@ class Utils {
}
@Nullable
- static DocumentNodeStoreBuilder<?> createDocumentMKBuilder(NodeStoreOptions options, Closer closer) throws IOException {
+ static DocumentNodeStoreBuilder<?> createDocumentMKBuilder(NodeStoreOptions options,
+ Closer closer)
+ throws IOException {
String src = options.getStoreArg();
- if (src == null || src.isEmpty()) {
+ if (src == null || src.length() == 0) {
options.printHelpOn(System.err);
System.exit(1);
}
@@ -245,7 +248,8 @@ class Utils {
} else {
return null;
}
- builder.setLeaseCheckMode(DISABLED).
+ builder.
+ setLeaseCheckMode(LeaseCheckMode.DISABLED).
setClusterId(options.getClusterId());
if (options.disableBranchesSpec()) {
builder.disableBranches();
diff --git a/oak-segment-azure/src/test/resources/logback-test.xml b/oak-segment-azure/src/test/resources/logback-test.xml
index ebe3ff9700..03262a697c 100644
--- a/oak-segment-azure/src/test/resources/logback-test.xml
+++ b/oak-segment-azure/src/test/resources/logback-test.xml
@@ -23,17 +23,9 @@
</appender>
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
- <appender name="file" class="ch.qos.logback.core.FileAppender">
- <file>target/unit-tests.log</file>
- <encoder>
- <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
- </encoder>
- </appender>
-
<!-- Root logger -->
<root level="INFO">
- <!-- <appender-ref ref="CONSOLE"/>-->
- <appender-ref ref="file"/>
+ <appender-ref ref="CONSOLE"/>
</root>
<logger name="org.mockserver" level="WARN"/>
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
index 8b73a57714..28e6b22b1a 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
@@ -546,7 +546,7 @@ public interface DocumentStore {
/**
* Performs a conditional update (e.g. using
* {@link UpdateOp.Condition.Type#EXISTS} and only update the
- * document(s) if the respective condition is <code>true</code>. The returned documents are
+ * document if the condition is <code>true</code>. The returned documents are
* immutable.
* <p>
* In case of a {@code DocumentStoreException} (e.g. when a communication
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java
index 7cde39cffc..099eca91de 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java
@@ -283,7 +283,6 @@ public class LoggingDocumentStoreWrapper implements DocumentStore {
}
@Override
- @NotNull
public <T extends Document> List<T> findAndUpdate(@NotNull Collection<T> collection, @NotNull List<UpdateOp> updateOps) {
try {
logMethod("findAndUpdate", collection, updateOps);