Author: reschke
Date: Thu Aug 9 11:44:29 2018
New Revision: 1837718
URL: http://svn.apache.org/viewvc?rev=1837718&view=rev
Log:
OAK-7704: RDB*Store: log message after failed DB upgrade too verbose
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBStatementWrapper.java
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1837718&r1=1837717&r2=1837718&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Thu Aug 9 11:44:29 2018
@@ -1347,7 +1347,7 @@ public class RDBDocumentStore implements
private boolean upgradeTable(Connection con, String tableName, int level)
throws SQLException {
boolean wasChanged = false;
-
+
for (String statement :
this.dbInfo.getTableUpgradeStatements(tableName, level)) {
Statement upgradeStatement = null;
try {
@@ -1359,8 +1359,14 @@ public class RDBDocumentStore implements
wasChanged = true;
} catch (SQLException exup) {
con.rollback();
- LOG.info("Attempted to upgrade " + tableName + " to DB level "
+ level + " using '" + statement
- + "', but failed - will continue without.", exup);
+ String message = String.format(
+ "Attempted to upgrade %s to DB level %d using '%s',
but failed with SQLException '%s' (code: %d/state: %s) - will continue
without.",
+ tableName, level, statement, exup.getMessage(),
exup.getErrorCode(), exup.getSQLState());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(message, exup);
+ } else {
+ LOG.info(message);
+ }
} finally {
closeStatement(upgradeStatement);
}
@@ -1379,12 +1385,18 @@ public class RDBDocumentStore implements
upgradeStatement.execute(statement);
upgradeStatement.close();
con.commit();
- LOG.info("Added modified index to " + tableName + " using '" +
statement + "'");
+ LOG.info("Added 'modified' index to " + tableName + " using '" +
statement + "'");
wasChanged = true;
} catch (SQLException exup) {
con.rollback();
- LOG.info("Attempted to add modified index to " + tableName + "
using '" + statement
- + "', but failed - will continue without.", exup);
+ String message = String.format(
+ "Attempted to add 'modified' index to %s using '%s', but
failed with SQLException '%s' (code: %d/state: %s) - will continue without.",
+ tableName, statement, exup.getMessage(),
exup.getErrorCode(), exup.getSQLState());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(message, exup);
+ } else {
+ LOG.info(message);
+ }
} finally {
closeStatement(upgradeStatement);
}
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBStatementWrapper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBStatementWrapper.java?rev=1837718&r1=1837717&r2=1837718&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBStatementWrapper.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBStatementWrapper.java
Thu Aug 9 11:44:29 2018
@@ -74,7 +74,7 @@ public class RDBStatementWrapper impleme
String l = sql.toLowerCase(Locale.ENGLISH).trim();
if (l.startsWith("alter table ") && l.contains(" add ")) {
if (!l.contains(" constraint ")) {
- throw new SQLException("table alter statement rejected: "
+ sql);
+ throw new SQLException("table alter statement rejected: "
+ sql, "ABCDE", 17);
}
}
}
