Author: reschke
Date: Wed Mar 14 15:20:18 2018
New Revision: 1826730
URL: http://svn.apache.org/viewvc?rev=1826730&view=rev
Log:
OAK-7331: RDBDocumentStore: add index on _MODIFIED to improve VersionGC
performance
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/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.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=1826730&r1=1826729&r2=1826730&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
Wed Mar 14 15:20:18 2018
@@ -1112,7 +1112,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 {
@@ -1135,6 +1135,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
@@ -1205,7 +1212,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);
}
@@ -1273,7 +1280,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);
@@ -1287,6 +1295,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) {
@@ -1353,7 +1365,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;
}
@@ -1371,7 +1406,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/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java?rev=1826730&r1=1826729&r2=1826730&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
Wed Mar 14 15:20:18 2018
@@ -806,9 +806,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
};
@@ -888,13 +885,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(
@@ -993,6 +984,10 @@ public enum RDBDocumentStoreDB {
return "";
}
+ public String getModifiedIndexStatement(String tableName) {
+ return "create index " + tableName + "_MOD on " + tableName + "
(MODIFIED)";
+ }
+
/**
* Statements needed to upgrade the DB
*
