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/21 09:50:04 UTC
svn commit: r1838534 - in /jackrabbit/oak/branches/1.4: 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 21 09:50:04 2018
New Revision: 1838534
URL: http://svn.apache.org/viewvc?rev=1838534&view=rev
Log:
OAK-7359: Update to MongoDB Java driver 3.6
Merge revision 1828349 from trunk
Modified:
jackrabbit/oak/branches/1.4/oak-core/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/pom.xml
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/com/mongodb/OakFongo.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java
jackrabbit/oak/branches/1.4/oak-parent/pom.xml
Propchange: jackrabbit/oak/branches/1.4/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 21 09:50:04 2018
@@ -1,5 +1,5 @@
/jackrabbit/oak/branches/1.0/oak-core:1665962
/jackrabbit/oak/branches/1.6/oak-core:1802566,1830228
/jackrabbit/oak/trunk/oak-core:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-175007
7,1750287,1750457,1750462,1750465,1750495,1750626,1750656,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1753481,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762463,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,177
2162,1772228,1772593,1772768,1772906,1773190,1774141,1774256,1774445,1774497,1774519,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785838,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798832,1798834,1799219,1799389,1799861,1799924,1800974,1801011,1801013,1802548,1802973,1803026,1804437,1807308,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809163,1811380,1811952,1811963,1811986,1814332,1818645,1821325,1821516,1830160
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1815450,1815466,1817379,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825442,1830048,1830209,1838076
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1815450,1815466,1817379,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825442,1828349,1830048,1830209,1838076
/jackrabbit/trunk/oak-core:1345480
Modified: jackrabbit/oak/branches/1.4/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/pom.xml?rev=1838534&r1=1838533&r2=1838534&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-core/pom.xml Tue Aug 21 09:50:04 2018
@@ -39,7 +39,7 @@
<configuration>
<instructions>
<Import-Package>
- com.mongodb*;resolution:=optional,
+ com.mongodb*;version="[2.14, 4)";resolution:=optional,
*
</Import-Package>
<Export-Package>
@@ -353,7 +353,7 @@
<dependency>
<groupId>com.github.fakemongo</groupId>
<artifactId>fongo</artifactId>
- <version>1.6.8</version>
+ <version>2.2.0-RC1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java?rev=1838534&r1=1838533&r2=1838534&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java Tue Aug 21 09:50:04 2018
@@ -63,11 +63,7 @@ public class MongoConnection {
public MongoConnection(String uri, MongoClientOptions.Builder builder)
throws MongoException {
mongoURI = new MongoClientURI(uri, builder);
- try {
- mongo = new MongoClient(mongoURI);
- } catch (UnknownHostException e) {
- throw new MongoException(e.getMessage(), e);
- }
+ mongo = new MongoClient(mongoURI);
}
/**
Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/com/mongodb/OakFongo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/com/mongodb/OakFongo.java?rev=1838534&r1=1838533&r2=1838534&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/com/mongodb/OakFongo.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/com/mongodb/OakFongo.java Tue Aug 21 09:50:04 2018
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import com.github.fakemongo.Fongo;
+import com.mongodb.connection.ServerVersion;
public class OakFongo extends Fongo {
@@ -106,24 +107,11 @@ public class OakFongo extends Fongo {
@Override
public CommandResult command(DBObject cmd,
- int options,
- ReadPreference readPrefs) {
- if (cmd.containsField("buildInfo")) {
- CommandResult commandResult = okResult();
- commandResult.append("version", "2.6.0");
- return commandResult;
- } else {
- return super.command(cmd, options, readPrefs);
- }
- }
-
- @Override
- public CommandResult command(DBObject cmd,
ReadPreference readPreference,
DBEncoder encoder) {
if (cmd.containsField("serverStatus")) {
CommandResult commandResult = okResult();
- commandResult.append("version", "2.6.0");
+ commandResult.append("version", asString(getServerVersion()));
return commandResult;
} else {
return super.command(cmd, readPreference, encoder);
@@ -132,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;
@@ -160,16 +149,16 @@ 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
- public WriteResult insert(List<DBObject> documents,
- WriteConcern concern,
- DBEncoder encoder) {
- beforeInsert(documents, null);
- WriteResult result = super.insert(documents, concern, encoder);
+ public WriteResult insert(List<? extends DBObject> documents,
+ InsertOptions insertOptions) {
+ beforeInsert(documents, insertOptions);
+ WriteResult result = super.insert(documents, insertOptions);
afterInsert(result);
return result;
}
Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java?rev=1838534&r1=1838533&r2=1838534&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java Tue Aug 21 09:50:04 2018
@@ -72,17 +72,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.4/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-parent/pom.xml?rev=1838534&r1=1838533&r2=1838534&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-parent/pom.xml Tue Aug 21 09:50:04 2018
@@ -49,7 +49,7 @@
<mongo.db2>MongoMKDB2</mongo.db2>
<segment.db>SegmentMK</segment.db>
<lucene.version>4.7.1</lucene.version>
- <mongo.driver.version>2.14.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. -->