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 2018/09/05 16:46:14 UTC
svn commit: r1840146 - in /jackrabbit/oak/branches/1.8: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/
Author: reschke
Date: Wed Sep 5 16:46:14 2018
New Revision: 1840146
URL: http://svn.apache.org/viewvc?rev=1840146&view=rev
Log:
OAK-7704: RDB*Store: log message after failed DB upgrade too verbose (ported to 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/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBStatementWrapper.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 5 16:46:14 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1831157-1831158,1831163,1831190
,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834336,1834428,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835642,1835780,1835819,1836487,1836493,1837057,1837274,1837326,1837475,1837600,1837657,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1831157-1831158,1831163,1831190
,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834336,1834428,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835642,1835780,1835819,1836487,1836493,1837057,1837274,1837326,1837475,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024
/jackrabbit/trunk:1345480
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=1840146&r1=1840145&r2=1840146&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 Wed Sep 5 16:46:14 2018
@@ -1346,7 +1346,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 {
@@ -1358,8 +1358,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);
}
@@ -1378,12 +1384,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/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBStatementWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBStatementWrapper.java?rev=1840146&r1=1840145&r2=1840146&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBStatementWrapper.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBStatementWrapper.java Wed Sep 5 16:46:14 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);
}
}
}