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 2015/05/28 15:06:13 UTC
svn commit: r1682236 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke
Date: Thu May 28 13:06:13 2015
New Revision: 1682236
URL: http://svn.apache.org/r1682236
Log:
OAK-2923 - lower minimal supported DB2 version to 10.1; also include decimal version numbers in startup messages of RDB{Blob|Document}Store (ported to 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 13:06:13 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675054-1675055,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675054-1675055,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1682236&r1=1682235&r2=1682236&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java Thu May 28 13:06:13 2015
@@ -158,7 +158,7 @@ public class RDBBlobStore extends Cachin
DB2("DB2") {
@Override
public void checkVersion(DatabaseMetaData md) throws SQLException {
- versionCheck(md, 10, 5, description);
+ versionCheck(md, 10, 1, description);
}
@Override
@@ -265,8 +265,10 @@ public class RDBBlobStore extends Cachin
this.ch = new RDBConnectionHandler(ds);
Connection con = this.ch.getRWConnection();
DatabaseMetaData md = con.getMetaData();
- String dbDesc = md.getDatabaseProductName() + " " + md.getDatabaseProductVersion();
- String driverDesc = md.getDriverName() + " " + md.getDriverVersion();
+ String dbDesc = String.format("%s %s (%d.%d)", md.getDatabaseProductName(), md.getDatabaseProductVersion(),
+ md.getDatabaseMajorVersion(), md.getDatabaseMinorVersion());
+ String driverDesc = String.format("%s %s (%d.%d)", md.getDriverName(), md.getDriverVersion(), md.getDriverMajorVersion(),
+ md.getDriverMinorVersion());
String dbUrl = md.getURL();
List<String> tablesCreated = new ArrayList<String>();
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1682236&r1=1682235&r2=1682236&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Thu May 28 13:06:13 2015
@@ -436,7 +436,7 @@ public class RDBDocumentStore implements
DB2("DB2") {
@Override
public void checkVersion(DatabaseMetaData md) throws SQLException {
- versionCheck(md, 10, 5, description);
+ versionCheck(md, 10, 1, description);
}
@Override
@@ -800,8 +800,10 @@ public class RDBDocumentStore implements
Connection con = this.ch.getRWConnection();
DatabaseMetaData md = con.getMetaData();
- String dbDesc = md.getDatabaseProductName() + " " + md.getDatabaseProductVersion();
- String driverDesc = md.getDriverName() + " " + md.getDriverVersion();
+ String dbDesc = String.format("%s %s (%d.%d)", md.getDatabaseProductName(), md.getDatabaseProductVersion(),
+ md.getDatabaseMajorVersion(), md.getDatabaseMinorVersion());
+ String driverDesc = String.format("%s %s (%d.%d)", md.getDriverName(), md.getDriverVersion(), md.getDriverMajorVersion(),
+ md.getDriverMinorVersion());
String dbUrl = md.getURL();
this.db = DB.getValue(md.getDatabaseProductName());