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 re...@apache.org on 2016/05/09 15:27:07 UTC
svn commit: r1742982 - in /jackrabbit/oak/branches/1.4: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/
Author: reschke
Date: Mon May 9 15:27:06 2016
New Revision: 1742982
URL: http://svn.apache.org/viewvc?rev=1742982&view=rev
Log:
OAK-3977: RDBDocumentStore: remove PostgreSQL workaround after upgrading to JDBC driver 9.4.1208 (ported to 1.4)
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 15:27:06 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1735052,1735405,1735484,1735549,1735564,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737998,1738004,1738775,1738963,1740971,1741032,1741339,1741343,1742520,1742888,1742916
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1734279,1735052,1735405,1735484,1735549,1735564,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737998,1738004,1738775,1738963,1740971,1741032,1741339,1741343,1742520,1742888,1742916
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java?rev=1742982&r1=1742981&r2=1742982&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java Mon May 9 15:27:06 2016
@@ -96,7 +96,7 @@ public enum RDBBlobStoreDB {
POSTGRES("PostgreSQL") {
@Override
public String checkVersion(DatabaseMetaData md) throws SQLException {
- return RDBJDBCTools.versionCheck(md, 9, 3, description);
+ return RDBJDBCTools.versionCheck(md, 9, 5, 9, 4, description);
}
@Override
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java?rev=1742982&r1=1742981&r2=1742982&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java Mon May 9 15:27:06 2016
@@ -77,7 +77,32 @@ public enum RDBDocumentStoreDB {
POSTGRES("PostgreSQL") {
@Override
public String checkVersion(DatabaseMetaData md) throws SQLException {
- return RDBJDBCTools.versionCheck(md, 9, 3, description);
+ String result = RDBJDBCTools.versionCheck(md, 9, 5, 9, 4, description);
+
+ if (result.isEmpty()) {
+ // special case: we need 9.4.1208 or newer (see OAK-3977)
+ if (md.getDriverMajorVersion() == 9 && md.getDriverMinorVersion() == 4) {
+ String versionString = md.getDriverVersion();
+ String scanfor = "9.4.";
+ int p = versionString.indexOf(scanfor);
+ if (p >= 0) {
+ StringBuilder build = new StringBuilder();
+ for (char c : versionString.substring(p + scanfor.length()).toCharArray()) {
+ if (c >= '0' && c <= '9') {
+ build.append(c);
+ } else {
+ break;
+ }
+ }
+ if (Integer.parseInt(build.toString()) < 1208) {
+ result = "Unsupported " + description + " driver version: " + md.getDriverVersion() + ", found build "
+ + build + ", but expected at least build 1208";
+ }
+ }
+ }
+ }
+
+ return result;
}
@Override
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1742982&r1=1742981&r2=1742982&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java Mon May 9 15:27:06 2016
@@ -302,11 +302,7 @@ public class RDBDocumentStoreJDBC {
results = stmt.executeBatch();
} catch (BatchUpdateException ex) {
LOG.debug("Some of the batch updates failed", ex);
- if (this.dbInfo == RDBDocumentStoreDB.POSTGRES) {
- results = new int[0];
- } else {
- results = ex.getUpdateCounts();
- }
+ results = ex.getUpdateCounts();
} finally {
stmt.close();
}
Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java?rev=1742982&r1=1742981&r2=1742982&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java Mon May 9 15:27:06 2016
@@ -105,9 +105,6 @@ public class RDBDocumentStoreJDBCTest ex
@Test
public void batchFailingInsertResult() throws SQLException {
- // https://issues.apache.org/jira/browse/OAK-3937 and https://issues.apache.org/jira/browse/OAK-3977
- assumeTrue(super.dsf != DocumentStoreFixture.RDB_PG);
-
String table = ((RDBDocumentStore) super.ds).getTable(Collection.NODES).getName();
Connection con = super.rdbDataSource.getConnection();