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/05/26 14:52:45 UTC
svn commit: r1832314 - in /jackrabbit/oak/branches/1.8: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
Author: reschke
Date: Sat May 26 14:52:45 2018
New Revision: 1832314
URL: http://svn.apache.org/viewvc?rev=1832314&view=rev
Log:
OAK-7331: RDBDocumentStore: add index on _MODIFIED to improve VersionGC performance (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/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 26 14:52:45 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,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1824196,1824198,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826640,1826932,1826957,1827472,1827486,1827977,1828529,1829527,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830197,1830748,1831157-1831158,1831163,1831374,1831560
+/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,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1824196,1824198,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826640,1826730,1826932,1826957,1827472,1827486,1827977,1828529,1829527,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830197,1830748,1831157-1831158,1831163,1831374,1831560
/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=1832314&r1=1832313&r2=1832314&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 Sat May 26 14:52:45 2018
@@ -1111,7 +1111,7 @@ public class RDBDocumentStore implements
}
}
- private static String dumpIndexData(DatabaseMetaData met, ResultSetMetaData rmet, String tableName) {
+ private static String dumpIndexData(DatabaseMetaData met, ResultSetMetaData rmet, String tableName, Set<String> indexedColumns) {
ResultSet rs = null;
try {
@@ -1134,6 +1134,13 @@ public class RDBDocumentStore implements
rs = met.getIndexInfo(null, null, tableName.toUpperCase(Locale.ENGLISH), false, true);
indices = getIndexInformation(rs, rmetSchemaName);
}
+ if (indexedColumns != null) {
+ for (Map<String, Object> map : indices.values()) {
+ if (map.containsKey("columns")) {
+ indexedColumns.addAll((Set<String>) (map.get("columns")));
+ }
+ }
+ }
return dumpIndexData(indices);
} catch (SQLException ex) {
// well it was best-effort
@@ -1204,7 +1211,7 @@ public class RDBDocumentStore implements
info.put("tname", tname);
String cname = rs.getString("COLUMN_NAME");
if (cname != null) {
- columns.add(cname);
+ columns.add(cname.toUpperCase(Locale.ENGLISH));
String order = "A".equals(rs.getString("ASC_OR_DESC")) ? " ASC" : ("D".equals(rs.getString("ASC_OR_DESC")) ? " DESC" : "");
((Map<Integer, String>) info.get("fields")).put(rs.getInt("ORDINAL_POSITION"), cname + order);
}
@@ -1272,7 +1279,8 @@ public class RDBDocumentStore implements
String tableInfo = RDBJDBCTools.dumpResultSetMeta(met);
tmd.setSchemaInfo(tableInfo);
- String indexInfo = dumpIndexData(con.getMetaData(), met, tableName);
+ Set<String> indexOn = new HashSet<String>();
+ String indexInfo = dumpIndexData(con.getMetaData(), met, tableName, indexOn);
tmd.setIndexInfo(indexInfo);
closeResultSet(checkResultSet);
@@ -1286,6 +1294,10 @@ public class RDBDocumentStore implements
dbWasChanged |= upgradeTable(con, tableName, 2);
}
+ if (!indexOn.contains("MODIFIED") && col == Collection.NODES) {
+ dbWasChanged |= addModifiedIndex(con, tableName);
+ }
+
tablesPresent.add(tableName);
if (dbWasChanged) {
@@ -1352,7 +1364,30 @@ public class RDBDocumentStore implements
closeStatement(upgradeStatement);
}
}
-
+
+ return wasChanged;
+ }
+
+ private boolean addModifiedIndex(Connection con, String tableName) throws SQLException {
+ boolean wasChanged = false;
+
+ String statement = this.dbInfo.getModifiedIndexStatement(tableName);
+ Statement upgradeStatement = null;
+ try {
+ upgradeStatement = con.createStatement();
+ upgradeStatement.execute(statement);
+ upgradeStatement.close();
+ con.commit();
+ 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);
+ } finally {
+ closeStatement(upgradeStatement);
+ }
+
return wasChanged;
}
@@ -1370,7 +1405,7 @@ public class RDBDocumentStore implements
String tableInfo = RDBJDBCTools.dumpResultSetMeta(met);
tmd.setSchemaInfo(tableInfo);
- String indexInfo = dumpIndexData(con.getMetaData(), met, tmd.getName());
+ String indexInfo = dumpIndexData(con.getMetaData(), met, tmd.getName(), null);
tmd.setIndexInfo(indexInfo);
} finally {
closeResultSet(checkResultSet);
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=1832314&r1=1832313&r2=1832314&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 Sat May 26 14:52:45 2018
@@ -798,9 +798,6 @@ public enum RDBDocumentStoreDB {
private static final String SYSPROP_PREFIX = "org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore";
- // whether to create indices
- private static final String CREATEINDEX = System.getProperty(SYSPROP_PREFIX + ".CREATEINDEX", "");
-
public enum FETCHFIRSTSYNTAX {
FETCHFIRST, LIMIT, TOP
};
@@ -880,13 +877,7 @@ public enum RDBDocumentStoreDB {
public List<String> getIndexCreationStatements(String tableName, int level) {
List<String> result = Lists.newArrayList();
- if (CREATEINDEX.equals("modified-id")) {
- result.add("create index " + tableName + "_MI on " + tableName + " (MODIFIED, ID)");
- } else if (CREATEINDEX.equals("id-modified")) {
- result.add("create index " + tableName + "_MI on " + tableName + " (ID, MODIFIED)");
- } else if (CREATEINDEX.equals("modified")) {
- result.add("create index " + tableName + "_MI on " + tableName + " (MODIFIED)");
- }
+ result.add("create index " + tableName + "_MOD on " + tableName + " (MODIFIED)");
if (level == 2) {
result.add("create index " + tableName + "_VSN on " + tableName + " (VERSION)");
result.add("create index " + tableName + "_SDT on " + tableName + " (SDTYPE)");
@@ -979,6 +970,10 @@ public enum RDBDocumentStoreDB {
return "bigint";
}
+ public String getModifiedIndexStatement(String tableName) {
+ return "create index " + tableName + "_MOD on " + tableName + " (MODIFIED)";
+ }
+
/**
* Statements needed to upgrade the DB
*