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 2020/04/27 15:15:57 UTC
svn commit: r1877085 - in /jackrabbit/oak/branches/1.8: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
Author: reschke
Date: Mon Apr 27 15:15:57 2020
New Revision: 1877085
URL: http://svn.apache.org/viewvc?rev=1877085&view=rev
Log:
OAK-8916: RDBBlobStore: log additional DB diagnostics (align with RDBDocumentStore) (merged r1874269 into 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1874269
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1877085&r1=1877084&r2=1877085&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java Mon Apr 27 15:15:57 2020
@@ -242,9 +242,11 @@ public class RDBBlobStore extends Cachin
tablesToBeDropped.addAll(tablesCreated);
}
+ Map<String, String> diag = db.getAdditionalDiagnostics(this.ch, this.tnData);
+
LOG.info("RDBBlobStore (" + getModuleVersion() + ") instantiated for database " + dbDesc + ", using driver: "
- + driverDesc + ", connecting to: " + dbUrl + ", transaction isolation level: " + isolationDiags + ", "
- + tableInfo);
+ + driverDesc + ", connecting to: " + dbUrl + (diag.isEmpty() ? "" : (", properties: " + diag.toString()))
+ + ", transaction isolation level: " + isolationDiags + ", " + tableInfo);
if (!tablesPresent.isEmpty()) {
LOG.info("Tables present upon startup: " + tablesPresent);
}
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java?rev=1877085&r1=1877084&r2=1877085&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java Mon Apr 27 15:15:57 2020
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import java.util.Map;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
@@ -41,7 +42,7 @@ public enum RDBBlobStoreDB {
}
},
- DB2("DB2") {
+ DB2("DB2", RDBCommonVendorSpecificCode.DB2) {
@Override
public String checkVersion(DatabaseMetaData md) throws SQLException {
return RDBJDBCTools.versionCheck(md, 10, 1, description);
@@ -54,7 +55,7 @@ public enum RDBBlobStoreDB {
}
},
- MSSQL("Microsoft SQL Server") {
+ MSSQL("Microsoft SQL Server", RDBCommonVendorSpecificCode.MSSQL) {
@Override
public String checkVersion(DatabaseMetaData md) throws SQLException {
return RDBJDBCTools.versionCheck(md, 11, 0, description);
@@ -75,7 +76,7 @@ public enum RDBBlobStoreDB {
}
},
- MYSQL("MySQL") {
+ MYSQL("MySQL", RDBCommonVendorSpecificCode.MYSQL) {
@Override
public String checkVersion(DatabaseMetaData md) throws SQLException {
return RDBJDBCTools.versionCheck(md, 5, 5, description);
@@ -87,7 +88,7 @@ public enum RDBBlobStoreDB {
}
},
- ORACLE("Oracle") {
+ ORACLE("Oracle", RDBCommonVendorSpecificCode.ORACLE) {
@Override
public String checkVersion(DatabaseMetaData md) throws SQLException {
return RDBJDBCTools.versionCheck(md, 12, 1, 12, 1, description);
@@ -100,7 +101,7 @@ public enum RDBBlobStoreDB {
}
},
- POSTGRES("PostgreSQL") {
+ POSTGRES("PostgreSQL", RDBCommonVendorSpecificCode.POSTGRES) {
@Override
public String checkVersion(DatabaseMetaData md) throws SQLException {
return RDBJDBCTools.versionCheck(md, 9, 5, 9, 4, description);
@@ -112,7 +113,7 @@ public enum RDBBlobStoreDB {
}
},
- DEFAULT("default") {
+ DEFAULT("default", RDBCommonVendorSpecificCode.DEFAULT) {
};
private static final Logger LOG = LoggerFactory.getLogger(RDBBlobStoreDB.class);
@@ -135,8 +136,21 @@ public enum RDBBlobStoreDB {
protected String description;
+ protected RDBCommonVendorSpecificCode vendorCode = RDBCommonVendorSpecificCode.DEFAULT;
+
private RDBBlobStoreDB(String description) {
this.description = description;
+ this.vendorCode = RDBCommonVendorSpecificCode.DEFAULT;
+ }
+
+ private RDBBlobStoreDB(String description, RDBCommonVendorSpecificCode vendorCode) {
+ this.description = description;
+ this.vendorCode = vendorCode;
+ }
+
+ @NotNull
+ public Map<String, String> getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) {
+ return vendorCode.getAdditionalDiagnostics(ch, tableName);
}
@Override
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1877085&r1=1877084&r2=1877085&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Mon Apr 27 15:15:57 2020
@@ -1074,10 +1074,10 @@ public class RDBDocumentStore implements
tableDiags.insert(0, ", ");
}
- String diag = dbInfo.getAdditionalDiagnostics(this.ch, this.tableMeta.get(Collection.NODES).getName()).toString();
+ Map<String, String> diag = dbInfo.getAdditionalDiagnostics(this.ch, this.tableMeta.get(Collection.NODES).getName());
LOG.info("RDBDocumentStore (" + getModuleVersion() + ") instantiated for database " + dbDesc + ", using driver: "
- + driverDesc + ", connecting to: " + dbUrl + (diag.isEmpty() ? "" : (", properties: " + diag))
+ + driverDesc + ", connecting to: " + dbUrl + (diag.isEmpty() ? "" : (", properties: " + diag.toString()))
+ ", transaction isolation level: " + isolationDiags + tableDiags);
if (!tablesPresent.isEmpty()) {
LOG.info("Tables present upon startup: " + tablesPresent);