Author: reschke Date: Sun Apr 26 09:38:04 2020 New Revision: 1877013 URL: http://svn.apache.org/viewvc?rev=1877013&view=rev Log: OAK-8907: RDBDocumentStore: change diagnostics from String to Map (merged r1874023 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/RDBDocumentStore.java jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java Propchange: jackrabbit/oak/branches/1.8/ ------------------------------------------------------------------------------ Merged /jackrabbit/oak/trunk:r1874023 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=1877013&r1=1877012&r2=1877013&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 Sun Apr 26 09:38:04 2020 @@ -1074,7 +1074,7 @@ public class RDBDocumentStore implements tableDiags.insert(0, ", "); } - String diag = dbInfo.getAdditionalDiagnostics(this.ch, this.tableMeta.get(Collection.NODES).getName()); + String diag = dbInfo.getAdditionalDiagnostics(this.ch, this.tableMeta.get(Collection.NODES).getName()).toString(); LOG.info("RDBDocumentStore (" + getModuleVersion() + ") instantiated for database " + dbDesc + ", using driver: " + driverDesc + ", connecting to: " + dbUrl + (diag.isEmpty() ? "" : (", properties: " + diag)) Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.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/RDBDocumentStoreDB.java?rev=1877013&r1=1877012&r2=1877013&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java Sun Apr 26 09:38:04 2020 @@ -170,11 +170,11 @@ public enum RDBDocumentStoreDB { } @Override - public String getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) { + public Map<String, String> getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) { Connection con = null; PreparedStatement stmt = null; ResultSet rs = null; - Map<String, String> result = new HashMap<String, String>(); + Map<String, String> result = new HashMap<>(); try { con = ch.getROConnection(); String cat = con.getCatalog(); @@ -193,7 +193,7 @@ public enum RDBDocumentStoreDB { closeStatement(stmt); ch.closeConnection(con); } - return result.toString(); + return result; } @Override @@ -288,11 +288,11 @@ public enum RDBDocumentStoreDB { } @Override - public String getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) { + public Map<String, String> getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) { Connection con = null; PreparedStatement stmt = null; ResultSet rs = null; - Map<String, String> result = new HashMap<String, String>(); + Map<String, String> result = new HashMap<>(); try { con = ch.getROConnection(); @@ -328,7 +328,7 @@ public enum RDBDocumentStoreDB { closeStatement(stmt); ch.closeConnection(con); } - return result.toString(); + return result; } @Override @@ -423,11 +423,11 @@ public enum RDBDocumentStoreDB { } @Override - public String getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) { + public Map<String, String> getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) { Connection con = null; Statement stmt = null; ResultSet rs = null; - Map<String, String> result = new HashMap<String, String>(); + Map<String, String> result = new HashMap<>(); try { con = ch.getROConnection(); stmt = con.createStatement(); @@ -445,7 +445,7 @@ public enum RDBDocumentStoreDB { closeStatement(stmt); ch.closeConnection(con); } - return result.toString(); + return result; } @Override @@ -558,11 +558,11 @@ public enum RDBDocumentStoreDB { } @Override - public String getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) { + public Map<String, String> getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) { Connection con = null; PreparedStatement stmt = null; ResultSet rs = null; - Map<String, String> result = new HashMap<String, String>(); + Map<String, String> result = new HashMap<>(); try { con = ch.getROConnection(); stmt = con.prepareStatement("SHOW TABLE STATUS LIKE ?"); @@ -589,7 +589,7 @@ public enum RDBDocumentStoreDB { closeStatement(stmt); ch.closeConnection(con); } - return result.toString(); + return result; } @Override @@ -695,7 +695,7 @@ public enum RDBDocumentStoreDB { } @Override - public String getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) { + public Map<String, String> getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) { Connection con = null; PreparedStatement stmt = null; ResultSet rs = null; @@ -719,7 +719,7 @@ public enum RDBDocumentStoreDB { closeStatement(stmt); ch.closeConnection(con); } - return result.toString(); + return result; } private long parseSize(String readable) { @@ -895,6 +895,11 @@ public enum RDBDocumentStoreDB { return result; } + @NotNull + public Map<String, String> getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) { + return Collections.emptyMap(); + } + /** * Returns additional DB-specific statistics, augmenting the return value of * {@link RDBDocumentStore#getStats()}. @@ -963,10 +968,6 @@ public enum RDBDocumentStoreDB { * "http://db.apache.org/derby/docs/10.14/ref/rrefsyscsdiagspacetable.html">SYSCS_DIAG.SPACE_TABLE diagnostic table function</a> * </ul> */ - public String getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) { - return ""; - } - public Map<String, String> getAdditionalStatistics(RDBConnectionHandler ch, String catalog, String tableName) { return Collections.emptyMap(); }