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/09/15 16:40:48 UTC
svn commit: r1703212 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
Author: reschke
Date: Tue Sep 15 14:40:47 2015
New Revision: 1703212
URL: http://svn.apache.org/r1703212
Log:
OAK-3408: RDBDocumentStore: improve MySQL diagnostics
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java?rev=1703212&r1=1703211&r2=1703212&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java Tue Sep 15 14:40:47 2015
@@ -210,7 +210,6 @@ public enum RDBDocumentStoreDB {
public String getConcatQueryString(int dataOctetLimit, int dataLength) {
return "CONCAT(DATA, ?)";
}
-
@Override
public String getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) {
Connection con = null;
@@ -226,6 +225,13 @@ public enum RDBDocumentStoreDB {
result.put("collation", rs.getString("Collation"));
}
stmt.close();
+ stmt = con.prepareStatement(
+ "SHOW VARIABLES WHERE variable_name LIKE 'character\\_set\\_%' OR variable_name LIKE 'collation%' OR variable_name = 'max_allowed_packet'");
+ rs = stmt.executeQuery();
+ while (rs.next()) {
+ result.put(rs.getString(1), rs.getString(2));
+ }
+ stmt.close();
con.commit();
} catch (SQLException ex) {
LOG.debug("while getting diagnostics", ex);