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 2019/06/14 09:22:45 UTC
svn commit: r1861325 - in /jackrabbit/oak/branches/1.10: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke
Date: Fri Jun 14 09:22:45 2019
New Revision: 1861325
URL: http://svn.apache.org/viewvc?rev=1861325&view=rev
Log:
OAK-8337: RDBDocumentStore: refactor index dumping code (ported to 1.10)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 14 09:22:45 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857463,1857480,1857577,1857589,1857592,1857634-1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1858931,1859231,1859292,1859294,1859533,1859609,1859612,1859619,1859716,1859776,1859780,1859843,1859854,1859881,1860120,1860131,1860202,1860278,1860328
,1860330,1860355,1860393,1860442,1860548
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857463,1857480,1857577,1857589,1857592,1857634-1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1858931,1859231,1859292,1859294,1859533,1859609,1859612,1859619,1859711,1859716,1859776,1859780,1859843,1859854,1859881,1860120,1860131,1860202,1860278
,1860328,1860330,1860355,1860393,1860442,1860548
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.10/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.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1861325&r1=1861324&r2=1861325&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Fri Jun 14 09:22:45 2019
@@ -1165,7 +1165,7 @@ public class RDBDocumentStore implements
rs = met.getIndexInfo(null, null, tableName, false, true);
- Map<String, Map<String, Object>> indices = getIndexInformation(rs, rmetSchemaName);
+ Map<String, IndexInformation> 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
@@ -1173,10 +1173,8 @@ public class RDBDocumentStore implements
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")));
- }
+ for (IndexInformation idata : indices.values()) {
+ indexedColumns.addAll(idata.columns);
}
}
return dumpIndexData(indices);
@@ -1191,75 +1189,83 @@ public class RDBDocumentStore implements
}
}
- private static String dumpIndexData(Map<String, Map<String, Object>> indices) {
+ private static String dumpIndexData(Map<String, IndexInformation> indices) {
StringBuilder sb = new StringBuilder();
- for (Entry<String, Map<String, Object>> index : indices.entrySet()) {
+ for (Entry<String, IndexInformation> 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()) {
+ IndexInformation info = index.getValue();
+ if (!info.fields.isEmpty()) {
if (sb.length() != 0) {
sb.append(", ");
}
- sb.append(String.format("%sindex %s on %s (", nonUnique ? "" : "unique ", indexName, info.get("tname")));
+ sb.append(String.format("%sindex %s on %s (", info.nonunique ? "" : "unique ", indexName, info.tname));
String delim = "";
- for (String field : fields.values()) {
+ for (String field : info.fields.values()) {
sb.append(delim);
delim = ", ";
sb.append(field);
}
sb.append(")");
- sb.append(" ").append(info.get("type"));
+ sb.append(" ").append(info.type);
}
- Object filterCondition = info.get("filterCondition");
- if (filterCondition != null) {
- sb.append(" where ").append(filterCondition.toString());
+ if (info.filterCondition != null) {
+ sb.append(" where ").append(info.filterCondition);
}
- sb.append(String.format(" (#%s, p%s)", info.get("cardinality").toString(), info.get("pages").toString()));
+ sb.append(String.format(" (#%d, p%d)", info.cardinality, info.pages));
}
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>>();
+ private static Map<String, IndexInformation> getIndexInformation(ResultSet rs, String rmetSchemaName) throws SQLException {
+ Map<String, IndexInformation> result = new TreeMap<>();
while (rs.next()) {
String name = asQualifiedDbName(rs.getString("INDEX_QUALIFIER"), rs.getString("INDEX_NAME"));
if (name != null) {
- Map<String, Object> info = result.get(name);
+ IndexInformation info = result.get(name);
if (info == null) {
- info = new HashMap<String, Object>();
+ info = new IndexInformation();
result.put(name, info);
- info.put("fields", new TreeMap<Integer, String>());
+ info.fields = new TreeMap<>();
}
- info.put("nonunique", rs.getBoolean("NON_UNIQUE"));
- info.put("type", indexTypeAsString(rs.getInt("TYPE")));
+ info.nonunique = rs.getBoolean("NON_UNIQUE");
+ info.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.filterCondition = filterCondition;
}
- info.put("cardinality", rs.getInt("CARDINALITY"));
- info.put("pages", rs.getInt("PAGES"));
- Set<String> columns = new HashSet<String>();
- info.put("columns", columns);
+ info.cardinality = rs.getInt("CARDINALITY");
+ info.pages = rs.getInt("PAGES");
+ Set<String> columns = new HashSet<>();
+ info.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("TABLE_NAME"));
- info.put("tname", tname);
+ info.tname = tname;
String cname = rs.getString("COLUMN_NAME");
if (cname != null) {
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);
+ info.fields.put(rs.getInt("ORDINAL_POSITION"), cname + order);
}
}
}
}
return result;
}
+
+ private static class IndexInformation {
+ public Map<Integer, String> fields;
+ public boolean nonunique;
+ public String type;
+ public String filterCondition;
+ public int cardinality;
+ public int pages;
+ public Set<String> columns;
+ public String tname;
+ }
private void createTableFor(Connection con, Collection<? extends Document> col, RDBTableMetaData tmd, List<String> tablesCreated,
List<String> tablesPresent, int initialSchema, int upgradeToSchema) throws SQLException {