Author: reschke
Date: Wed Jul 10 10:19:15 2019
New Revision: 1862866
URL: http://svn.apache.org/viewvc?rev=1862866&view=rev
Log:
OAK-7333: RDBDocumentStore: refactor index report (merged r1826560 into 1.6)
Modified:
jackrabbit/oak/branches/1.6/oak-core/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 10 10:19:15 2019
@@ -3,5 +3,5 @@
/jackrabbit/oak/trunk:1834823
/jackrabbit/oak/trunk/oak-blob-plugins:1819950
/jackrabbit/oak/trunk/oak-core:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785652,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789441,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799861,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,180226
2,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1810084,1811380,1811952,1811963,1811986,1814332,1818645,1821325,1821358,1821516,1830160,1840226,1846057,1846162
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821178,1821477,1821487,1821617,1821663,1823163,1823169,1824962,1825065,1825442,1825470,1826833,1828349,1828868,1830048,1830209,1834610,1834823,1838076,1840455,1842089,1848073,1852451,1852492-1852493,1854455,1854701,1854827,1854930,1860202
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821178,1821477,1821487,1821617,1821663,1823163,1823169,1824962,1825065,1825442,1825470,1826560,1826833,1828349,1828868,1830048,1830209,1834610,1834823,1838076,1840455,1842089,1848073,1852451,1852492-1852493,1854455,1854701,1854827,1854930,1860202
/jackrabbit/trunk/oak-core:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1862866&r1=1862865&r2=1862866&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Wed Jul 10 10:19:15 2019
@@ -90,6 +90,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Function;
import com.google.common.base.Stopwatch;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
@@ -907,11 +908,13 @@ public class RDBDocumentStore implements
}
private static String asQualifiedDbName(String one, String two) {
- if (one == null && two == null) {
+ one = Strings.nullToEmpty(one).trim();
+ two = Strings.nullToEmpty(two).trim();
+
+ if (one.isEmpty() && two.isEmpty()) {
return null;
- }
- else {
- one = one == null ? "" : one.trim();
+ } else {
+ one = Strings.nullToEmpty(one).trim();
two = two == null ? "" : two.trim();
return one.isEmpty() ? two : one + "." + two;
}
@@ -936,84 +939,103 @@ public class RDBDocumentStore implements
ResultSet rs = null;
try {
- // if the result set metadata provides a table name, use that (the
other one
+ // if the result set metadata provides a table name, use that (the
+ // other one
// might be inaccurate due to case insensitivity issues
- String rmetTableName = rmet.getTableName(1);
- if (rmetTableName != null && !rmetTableName.trim().isEmpty()) {
- tableName = rmetTableName.trim();
+ String rmetTableName =
Strings.nullToEmpty(rmet.getTableName(1)).trim();
+ if (!rmetTableName.isEmpty()) {
+ tableName = rmetTableName;
}
- String rmetSchemaName = rmet.getSchemaName(1);
- rmetSchemaName = rmetSchemaName == null ? "" :
rmetSchemaName.trim();
+ String rmetSchemaName =
Strings.nullToEmpty(rmet.getSchemaName(1)).trim();
- Map<String, Map<String, Object>> indices = new TreeMap<String,
Map<String, Object>>();
- StringBuilder sb = new StringBuilder();
rs = met.getIndexInfo(null, null, tableName, false, true);
- getIndexInformation(rs, rmetSchemaName, indices);
- if (indices.isEmpty() && !
tableName.equals(tableName.toUpperCase(Locale.ENGLISH))) {
- // might have failed due to the DB's handling on ucase/lcase,
retry ucase
+
+ Map<String, Map<String, Object>> indices = getIndexInformation(rs,
rmetSchemaName);
+ if (indices.isEmpty() &&
!tableName.equals(tableName.toUpperCase(Locale.ENGLISH))) {
+ // might have failed due to the DB's handling on ucase/lcase,
+ // retry ucase
rs = met.getIndexInfo(null, null,
tableName.toUpperCase(Locale.ENGLISH), false, true);
- getIndexInformation(rs, rmetSchemaName, indices);
- }
- for (Entry<String, Map<String, Object>> index :
indices.entrySet()) {
- boolean nonUnique = ((Boolean)
index.getValue().get("nonunique"));
- Map<Integer, String> fields = (Map<Integer, String>)
index.getValue().get("fields");
- if (!fields.isEmpty()) {
- if (sb.length() != 0) {
- sb.append(", ");
- }
- sb.append(String.format("%sindex %s on %s (", nonUnique ?
"" : "unique ", index.getKey(),
- index.getValue().get("tname")));
- String delim = "";
- for (String field : fields.values()) {
- sb.append(delim);
- delim = ", ";
- sb.append(field);
- }
- sb.append(")");
- sb.append(" ").append(index.getValue().get("type"));
- }
- }
- if (sb.length() != 0) {
- sb.insert(0, "/* ").append(" */");
+ indices = getIndexInformation(rs, rmetSchemaName);
}
- return sb.toString();
+ return dumpIndexData(indices);
} catch (SQLException ex) {
// well it was best-effort
- return String.format("/* exception while retrieving index
information: %s, code %d, state %s */",
- ex.getMessage(), ex.getErrorCode(), ex.getSQLState());
+ return String.format("/* exception while retrieving index
information: %s, code %d, state %s */", ex.getMessage(),
+ ex.getErrorCode(), ex.getSQLState());
} finally {
closeResultSet(rs);
}
}
- private void getIndexInformation(ResultSet rs, String rmetSchemaName,
Map<String, Map<String, Object>> indices)
- throws SQLException {
+ private static String dumpIndexData(Map<String, Map<String, Object>>
indices) {
+ StringBuilder sb = new StringBuilder();
+ for (Entry<String, Map<String, Object>> index : indices.entrySet()) {
+ String indexName = index.getKey();
+ Map<String, Object> info = index.getValue();
+ boolean nonUnique = ((Boolean) index.getValue().get("nonunique"));
+ Map<Integer, String> fields = (Map<Integer, String>)
info.get("fields");
+ if (!fields.isEmpty()) {
+ if (sb.length() != 0) {
+ sb.append(", ");
+ }
+ sb.append(String.format("%sindex %s on %s (", nonUnique ? "" :
"unique ", indexName, info.get("tname")));
+ String delim = "";
+ for (String field : fields.values()) {
+ sb.append(delim);
+ delim = ", ";
+ sb.append(field);
+ }
+ sb.append(")");
+ sb.append(" ").append(info.get("type"));
+ }
+ Object filterCondition = info.get("filterCondition");
+ if (filterCondition != null) {
+ sb.append(" where ").append(filterCondition.toString());
+ }
+ sb.append(String.format(" (#%s, p%s)",
info.get("cardinality").toString(), info.get("pages").toString()));
+ }
+ return sb.toString();
+ }
+
+ // see
https://docs.oracle.com/javase/7/docs/api/java/sql/DatabaseMetaData.html#getIndexInfo(java.lang.String,%20java.lang.String,%20java.lang.String,%20boolean,%20boolean)
+ private static Map<String, Map<String, Object>>
getIndexInformation(ResultSet rs, String rmetSchemaName) throws SQLException {
+ Map<String, Map<String, Object>> result = new TreeMap<String,
Map<String, Object>>();
while (rs.next()) {
- String name = asQualifiedDbName(rs.getString(5), rs.getString(6));
+ String name = asQualifiedDbName(rs.getString("INDEX_QUALIFIER"),
rs.getString("INDEX_NAME"));
if (name != null) {
- Map<String, Object> info = indices.get(name);
+ Map<String, Object> info = result.get(name);
if (info == null) {
info = new HashMap<String, Object>();
- indices.put(name, info);
+ result.put(name, info);
info.put("fields", new TreeMap<Integer, String>());
}
- info.put("nonunique", rs.getBoolean(4));
- info.put("type", indexTypeAsString(rs.getInt(7)));
- String inSchema = rs.getString(2);
- inSchema = inSchema == null ? "" : inSchema.trim();
+ info.put("nonunique", rs.getBoolean("NON_UNIQUE"));
+ info.put("type", indexTypeAsString(rs.getInt("TYPE")));
+ String inSchema = rs.getString("TABLE_SCHEM");
+ inSchema = Strings.nullToEmpty(inSchema).trim();
+ String filterCondition =
Strings.nullToEmpty(rs.getString("FILTER_CONDITION")).trim();
+ if (!filterCondition.isEmpty()) {
+ info.put("filterCondition", filterCondition);
+ }
+ info.put("cardinality", rs.getInt("CARDINALITY"));
+ info.put("pages", rs.getInt("PAGES"));
+ Set<String> columns = new HashSet<String>();
+ info.put("columns", columns);
// skip indices on tables in other schemas in case we have
that information
if (rmetSchemaName.isEmpty() || inSchema.isEmpty() ||
rmetSchemaName.equals(inSchema)) {
- String tname = asQualifiedDbName(inSchema,
rs.getString(3));
+ String tname = asQualifiedDbName(inSchema,
rs.getString("TABLE_NAME"));
info.put("tname", tname);
- String cname = rs.getString(9);
+ String cname = rs.getString("COLUMN_NAME");
if (cname != null) {
- String order = "A".equals(rs.getString(10)) ? " ASC" :
("D".equals(rs.getString(10)) ? " DESC" : "");
- ((Map<Integer, String>)
info.get("fields")).put(rs.getInt(8), cname + order);
+ columns.add(cname);
+ 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);
}
}
}
}
+ return result;
}
private void createTableFor(Connection con, Collection<? extends Document>
col, RDBTableMetaData tmd, List<String> tablesCreated,
