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 mr...@apache.org on 2015/10/05 11:10:20 UTC
svn commit: r1706771 - in /jackrabbit/oak/trunk:
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/
oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo...
Author: mreutegg
Date: Mon Oct 5 09:10:20 2015
New Revision: 1706771
URL: http://svn.apache.org/viewvc?rev=1706771&view=rev
Log:
OAK-3455: Improve conflict exception message
Revert previous commit with accidentally added changes
Removed:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreHelper.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1706771&r1=1706770&r2=1706771&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Mon Oct 5 09:10:20 2015
@@ -1613,8 +1613,7 @@ public class DocumentNodeStoreTest {
merge(ns2, b2);
fail("Must throw CommitFailedException");
} catch (CommitFailedException e) {
- assertNotNull(e.getCause());
- assertTrue(e.getCause().getMessage().contains("not yet visible"));
+ assertTrue(e.getMessage().contains("not yet visible"));
}
}
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreHelper.java?rev=1706771&r1=1706770&r2=1706771&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreHelper.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreHelper.java Mon Oct 5 09:10:20 2015
@@ -27,7 +27,6 @@ import com.mongodb.DBObject;
import com.mongodb.QueryBuilder;
import com.mongodb.WriteResult;
-import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.Revision;
@@ -93,14 +92,4 @@ public class MongoDocumentStoreHelper {
}
- public static <T extends Document> DBCollection getDBCollection(
- MongoDocumentStore store, Collection<T> c) {
- return store.getDBCollection(c);
- }
-
- public static <T extends Document> T convertFromDBObject(
- MongoDocumentStore store, Collection<T> col, DBObject obj) {
- return store.convertFromDBObject(col, obj);
- }
-
}
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1706771&r1=1706770&r2=1706771&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Mon Oct 5 09:10:20 2015
@@ -81,7 +81,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.backup.FileStoreRestore;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
-import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreHelper;
import org.apache.jackrabbit.oak.plugins.document.LastRevRecoveryAgent;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
@@ -195,9 +194,6 @@ public final class Main {
case TIKA:
TextExtractorMain.main(args);
break;
- case GARBAGE:
- garbage(args);
- break;
case HELP:
default:
System.err.print("Available run modes: ");
@@ -426,7 +422,6 @@ public final class Main {
closer.register(asCloseable(mongo));
DocumentNodeStore store = new DocumentMK.Builder()
.setMongoDB(mongo.getDB())
- .setLeaseCheck(false)
.setClusterId(clusterId.value(options)).getNodeStore();
closer.register(asCloseable(store));
return store;
@@ -703,25 +698,6 @@ public final class Main {
}
}
- private static void garbage(String[] args) throws IOException {
- Closer closer = Closer.create();
- String h = "garbage mongodb://host:port/database";
- try {
- NodeStore store = bootstrapNodeStore(args, closer, h);
- if (!(store instanceof DocumentNodeStore)) {
- System.err.println("Garbage mode only available for DocumentNodeStore");
- System.exit(1);
- }
- DocumentNodeStore dns = (DocumentNodeStore) store;
-
- DocumentNodeStoreHelper.garbageReport(dns);
- } catch (Throwable e) {
- throw closer.rethrow(e);
- } finally {
- closer.close();
- }
- }
-
private static void debug(String[] args) throws IOException {
if (args.length == 0) {
System.err.println("usage: debug <path> [id...]");
@@ -1174,8 +1150,7 @@ public final class Main {
CHECKPOINTS("checkpoints"),
RECOVERY("recovery"),
REPAIR("repair"),
- TIKA("tika"),
- GARBAGE("garbage");
+ TIKA("tika");
private final String name;