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/22 11:05:47 UTC
svn commit: r1861845 - in /jackrabbit/oak/branches/1.8: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke
Date: Sat Jun 22 11:05:47 2019
New Revision: 1861845
URL: http://svn.apache.org/viewvc?rev=1861845&view=rev
Log:
OAK-8337: RDBDocumentStore: refactor index dumping code (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
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 22 11:05:47 2019
@@ -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,1822182,1822201,1822207,1822527,1822642,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,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239
,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846486,1846581,1846
617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854701,1854773,1854827,1854848,1854859,1854930,1855032,1855776,1856818,1857010,1857247,1857253,1857294,1857314,1857463,1857480,1857638,1857936,1858032,1858139,1858571,1858578,1858810,1858926,1859231,1859292,1859294,1859716,1859776,1859780,1859843,1859881,1860202,1860328,1861626
+/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,1822182,1822201,1822207,1822527,1822642,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,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239
,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846486,1846581,1846
617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854701,1854773,1854827,1854848,1854859,1854930,1855032,1855776,1856818,1857010,1857247,1857253,1857294,1857314,1857463,1857480,1857638,1857936,1858032,1858139,1858571,1858578,1858810,1858926,1859231,1859292,1859294,1859711,1859716,1859776,1859780,1859843,1859881,1860202,1860328,1861626
/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=1861845&r1=1861844&r2=1861845&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 Jun 22 11:05:47 2019
@@ -1144,7 +1144,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
@@ -1152,10 +1152,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);
@@ -1170,75 +1168,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 {