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 2018/08/14 15:29:30 UTC
svn commit: r1838030 - in /jackrabbit/oak/branches/1.6: oak-core/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/
oak-core/src/test/java/com/mongodb/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/
oak-p...
Author: mreutegg
Date: Tue Aug 14 15:29:29 2018
New Revision: 1838030
URL: http://svn.apache.org/viewvc?rev=1838030&view=rev
Log:
OAK-7359: Update to MongoDB Java driver 3.6
Merged revision 1828349 from trunk
Modified:
jackrabbit/oak/branches/1.6/oak-core/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/pom.xml
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
jackrabbit/oak/branches/1.6/oak-core/src/test/java/com/mongodb/OakFongo.java
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java
jackrabbit/oak/branches/1.6/oak-parent/pom.xml
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 14 15:29:29 2018
@@ -2,5 +2,5 @@
/jackrabbit/oak/trunk:1834823
/jackrabbit/oak/trunk/oak-blob-plugins:1819950
/jackrabbit/oak/trunk/oak-core:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785652,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789441,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799861,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,180226
2,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1811380,1811952,1811963,1811986,1814332,1818645,1821325,1821358,1821516,1830160
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825065,1825442,1825470,1830048,1830209,1834610,1834823
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825065,1825442,1825470,1828349,1830048,1830209,1834610,1834823
/jackrabbit/trunk/oak-core:1345480
Modified: jackrabbit/oak/branches/1.6/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/pom.xml?rev=1838030&r1=1838029&r2=1838030&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-core/pom.xml Tue Aug 14 15:29:29 2018
@@ -354,7 +354,7 @@
<dependency>
<groupId>com.github.fakemongo</groupId>
<artifactId>fongo</artifactId>
- <version>2.0.6</version>
+ <version>2.2.0-RC1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java?rev=1838030&r1=1838029&r2=1838030&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java Tue Aug 14 15:29:29 2018
@@ -45,9 +45,6 @@ public class MongoConnection {
private final MongoClientURI mongoURI;
private final MongoClient mongo;
- private static boolean SO_KEEP_ALIVE =
- Boolean.getBoolean("oak.mongo.socketKeepAlive");
-
/**
* Constructs a new connection using the specified MongoDB connection string.
* See also http://docs.mongodb.org/manual/reference/connection-string/
@@ -122,7 +119,6 @@ public class MongoConnection {
return new MongoClientOptions.Builder()
.description("MongoConnection for Oak DocumentMK")
.maxWaitTime(DEFAULT_MAX_WAIT_TIME)
- .socketKeepAlive(SO_KEEP_ALIVE)
.threadsAllowedToBlockForConnectionMultiplier(100);
}
Modified: jackrabbit/oak/branches/1.6/oak-core/src/test/java/com/mongodb/OakFongo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/com/mongodb/OakFongo.java?rev=1838030&r1=1838029&r2=1838030&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/test/java/com/mongodb/OakFongo.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/test/java/com/mongodb/OakFongo.java Tue Aug 14 15:29:29 2018
@@ -120,13 +120,14 @@ public class OakFongo extends Fongo {
@Override
public synchronized FongoDBCollection doGetCollection(String name,
- boolean idIsNotUniq) {
+ boolean idIsNotUniq,
+ boolean validateOnInsert) {
if (name.startsWith("system.")) {
- return super.doGetCollection(name, idIsNotUniq);
+ return super.doGetCollection(name, idIsNotUniq, validateOnInsert);
}
FongoDBCollection coll = collMap.get(name);
if (coll == null) {
- coll = new OakFongoDBCollection(this, name, idIsNotUniq);
+ coll = new OakFongoDBCollection(this, name, idIsNotUniq, validateOnInsert);
collMap.put(name, coll);
}
return coll;
@@ -148,8 +149,9 @@ public class OakFongo extends Fongo {
public OakFongoDBCollection(FongoDB db,
String name,
- boolean idIsNotUniq) {
- super(db, name, idIsNotUniq);
+ boolean idIsNotUniq,
+ boolean validateOnInsert) {
+ super(db, name, idIsNotUniq, validateOnInsert);
}
@Override
Modified: jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java?rev=1838030&r1=1838029&r2=1838030&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java Tue Aug 14 15:29:29 2018
@@ -90,17 +90,17 @@ public class MongoConnectionTest {
public void socketKeepAlive() throws Exception {
assumeTrue(MongoUtils.isAvailable());
MongoClientOptions.Builder options = MongoConnection.getDefaultBuilder();
- options.socketKeepAlive(true);
+ options.socketKeepAlive(false);
MongoConnection c = new MongoConnection(MongoUtils.URL, options);
try {
- assertTrue(c.getDB().getMongo().getMongoOptions().isSocketKeepAlive());
+ assertFalse(c.getDB().getMongo().getMongoOptions().isSocketKeepAlive());
} finally {
c.close();
}
- // default is without keep-alive
+ // default is with keep-alive (starting with 3.6 driver)
c = new MongoConnection(MongoUtils.URL);
try {
- assertFalse(c.getDB().getMongo().getMongoOptions().isSocketKeepAlive());
+ assertTrue(c.getDB().getMongo().getMongoOptions().isSocketKeepAlive());
} finally {
c.close();
}
Modified: jackrabbit/oak/branches/1.6/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-parent/pom.xml?rev=1838030&r1=1838029&r2=1838030&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-parent/pom.xml Tue Aug 14 15:29:29 2018
@@ -50,7 +50,7 @@
<segment.db>SegmentMK</segment.db>
<lucene.version>4.7.1</lucene.version>
<solr.version>5.5.5</solr.version>
- <mongo.driver.version>3.4.0</mongo.driver.version>
+ <mongo.driver.version>3.6.3</mongo.driver.version>
<!-- Note that we're using SLF4J API version 1.7 when compiling -->
<!-- core Oak components but more recent SLF4J and Logback versions -->
<!-- when compiling and running test cases and the oak-run jar. -->