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 14:59:59 UTC
svn commit: r1682235 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb:
RDBBlobStore.java RDBDocumentStore.java
Author: reschke
Date: Thu May 28 12:59:58 2015
New Revision: 1682235
URL: http://svn.apache.org/r1682235
Log:
OAK-2923 - lower minimal supported DB2 version to 10.1; also include decimal version numbers in startup messages of RDB{Blob|Document}Store
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1682235&r1=1682234&r2=1682235&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java Thu May 28 12:59:58 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/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1682235&r1=1682234&r2=1682235&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Thu May 28 12:59:58 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());