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 th...@apache.org on 2022/06/16 13:34:10 UTC
[jackrabbit-oak] 14/32: OAK-9757: increased node name limit for mongo 4.2 version
This is an automated email from the ASF dual-hosted git repository.
thomasm pushed a commit to branch OAK-9780
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit a05a39f779830b8600cee212595dac1b5c5eb1a3
Author: Marcel Reutegger <ma...@gmail.com>
AuthorDate: Mon May 23 15:16:43 2022 +0200
OAK-9757: increased node name limit for mongo 4.2 version
Use MongoStatus.isVersion() to decide on node name limit
---
.../plugins/document/mongo/MongoDocumentStore.java | 2 +-
.../oak/plugins/document/mongo/MongoUtils.java | 15 ++++++-------
.../oak/plugins/document/mongo/MongoUtilsTest.java | 25 +++++++++++++++++-----
3 files changed, 27 insertions(+), 15 deletions(-)
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 e365b5116c..bfe99b829b 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
@@ -273,7 +273,7 @@ public class MongoDocumentStore implements DocumentStore {
.put("version", status.getVersion())
.build();
- this.nodeNameLimit = MongoUtils.getNodeNameLimit(status.getVersion());
+ this.nodeNameLimit = MongoUtils.getNodeNameLimit(status);
this.connection = new MongoDBConnection(connection, db, status, builder.getMongoClock());
this.clusterNodesConnection = getOrCreateClusterNodesConnection(builder);
stats = builder.getDocumentStoreStatsCollector();
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoUtils.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoUtils.java
index 2dad49fda8..3aa64ad6b5 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoUtils.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoUtils.java
@@ -16,9 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document.mongo;
-import java.util.Arrays;
import java.util.Set;
-import java.util.stream.Collectors;
import com.google.common.collect.Sets;
import com.mongodb.BasicDBObject;
@@ -33,7 +31,6 @@ import com.mongodb.client.ClientSession;
import com.mongodb.client.FindIterable;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.model.IndexOptions;
-import com.mongodb.connection.ServerVersion;
import com.mongodb.internal.connection.MongoWriteConcernWithResponseException;
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException.Type;
@@ -196,13 +193,13 @@ class MongoUtils {
}
/**
- * Util method to get node size limit for current mongo version
+ * Util method to get node size limit for MongoDB server version from the
+ * MongoDB status.
*
- * @param version version of current mongo db
- * @return size limit based on mongo db version
+ * @param status the MongoDB status
+ * @return size limit based on MongoDB version.
*/
- static int getNodeNameLimit(final String version) {
- final ServerVersion sv = new ServerVersion(Arrays.stream(version.split("\\.")).map(Integer::new).collect(Collectors.toList()));
- return sv.compareTo(new ServerVersion(4,2)) >= 0 ? Integer.MAX_VALUE : Utils.NODE_NAME_LIMIT;
+ static int getNodeNameLimit(final @NotNull MongoStatus status) {
+ return status.isVersion(4, 2) ? Integer.MAX_VALUE : Utils.NODE_NAME_LIMIT;
}
}
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoUtilsTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoUtilsTest.java
index b1d6f6e9e0..5d24e77d3d 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoUtilsTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoUtilsTest.java
@@ -22,6 +22,7 @@ import java.util.List;
import com.mongodb.BasicDBObject;
import com.mongodb.DuplicateKeyException;
+import com.mongodb.MongoClient;
import com.mongodb.MongoCommandException;
import com.mongodb.MongoException;
import com.mongodb.MongoSocketException;
@@ -50,6 +51,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
+import static org.mockito.Mockito.mock;
public class MongoUtilsTest {
@@ -202,31 +204,37 @@ public class MongoUtilsTest {
@Test
public void getSizeLimitForMongo4() {
- int sizeLimit = MongoUtils.getNodeNameLimit("4.0.0");
+ int sizeLimit = MongoUtils.getNodeNameLimit(serverVersion("4.0.0"));
assertEquals(150, sizeLimit);
}
@Test
public void getSizeLimitForMongo4_1_27() {
- int sizeLimit = MongoUtils.getNodeNameLimit("4.1.27");
+ int sizeLimit = MongoUtils.getNodeNameLimit(serverVersion("4.1.27"));
assertEquals(150, sizeLimit);
}
@Test
public void getSizeLimitForMongo3_5() {
- int sizeLimit = MongoUtils.getNodeNameLimit("3.5.0");
+ int sizeLimit = MongoUtils.getNodeNameLimit(serverVersion("3.5.0"));
assertEquals(150, sizeLimit);
}
@Test
public void getSizeLimitForMongo4_2() {
- int sizeLimit = MongoUtils.getNodeNameLimit("4.2.0");
+ int sizeLimit = MongoUtils.getNodeNameLimit(serverVersion("4.2.0"));
assertEquals(Integer.MAX_VALUE, sizeLimit);
}
@Test
public void getSizeLimitForMongo4_2_1() {
- int sizeLimit = MongoUtils.getNodeNameLimit("4.2.1");
+ int sizeLimit = MongoUtils.getNodeNameLimit(serverVersion("4.2.1"));
+ assertEquals(Integer.MAX_VALUE, sizeLimit);
+ }
+
+ @Test
+ public void getSizeLimitForMongo5_0_0rc() {
+ int sizeLimit = MongoUtils.getNodeNameLimit(serverVersion("5.0.0-rc0"));
assertEquals(Integer.MAX_VALUE, sizeLimit);
}
@@ -244,4 +252,11 @@ public class MongoUtilsTest {
response.put("errmsg", new BsonString("message"));
return response;
}
+
+ private static MongoStatus serverVersion(String version) {
+ MongoClient client = mock(MongoClient.class);
+ MongoStatus status = new MongoStatus(client, "db");
+ status.setVersion(version);
+ return status;
+ }
}