Author: reschke
Date: Sun May 27 15:28:46 2018
New Revision: 1832338
URL: http://svn.apache.org/viewvc?rev=1832338&view=rev
Log:
OAK-7330: RDBDocumentStore: make indices on SD* sparse where possible (ported
to 1.8)
special-case DB2 and SQLServer (Oracle already creates sparse indices by
default)
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/RDBDocumentStoreDB.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 27 15:28:46 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,1822527,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,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258
+/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,1822527,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,1826638,1826640,1826730,1826932,1826957,1827472,1827486,1827977,1828529,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258
/jackrabbit/trunk:1345480
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=1832338&r1=1832337&r2=1832338&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
Sun May 27 15:28:46 2018
@@ -389,6 +389,10 @@ public enum RDBDocumentStoreDB {
return result;
}
+
+ public String makeIndexConditionalForColumn(String columnName) {
+ return " exclude null keys";
+ }
},
ORACLE("Oracle") {
@@ -792,6 +796,10 @@ public enum RDBDocumentStoreDB {
return result;
}
+
+ public String makeIndexConditionalForColumn(String columnName) {
+ return " where " + columnName + " is not null";
+ }
};
private static final Logger LOG =
LoggerFactory.getLogger(RDBDocumentStoreDB.class);
@@ -880,8 +888,10 @@ public enum RDBDocumentStoreDB {
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)");
- result.add("create index " + tableName + "_SDM on " + tableName +
" (SDMAXREVTIME)");
+ result.add(
+ "create index " + tableName + "_SDT on " + tableName + "
(SDTYPE)" + makeIndexConditionalForColumn("SDTYPE"));
+ result.add("create index " + tableName + "_SDM on " + tableName +
" (SDMAXREVTIME)"
+ + makeIndexConditionalForColumn("SDMAXREVTIME"));
}
return result;
}
@@ -970,6 +980,10 @@ public enum RDBDocumentStoreDB {
return "bigint";
}
+ public String makeIndexConditionalForColumn(String columnName) {
+ return "";
+ }
+
public String getModifiedIndexStatement(String tableName) {
return "create index " + tableName + "_MOD on " + tableName + "
(MODIFIED)";
}
@@ -988,8 +1002,9 @@ public enum RDBDocumentStoreDB {
String[] statements = new String[] { "alter table " + tableName +
" add SDTYPE " + smallint,
"alter table " + tableName + " add SDMAXREVTIME " + bigint,
"create index " + tableName + "_VSN on " + tableName + "
(VERSION)",
- "create index " + tableName + "_SDT on " + tableName + "
(SDTYPE)",
- "create index " + tableName + "_SDM on " + tableName + "
(SDMAXREVTIME)", };
+ "create index " + tableName + "_SDT on " + tableName + "
(SDTYPE)" + makeIndexConditionalForColumn("SDTYPE"),
+ "create index " + tableName + "_SDM on " + tableName + "
(SDMAXREVTIME)"
+ + makeIndexConditionalForColumn("SDMAXREVTIME"), };
return Arrays.asList(statements);
} else {
throw new IllegalArgumentException("level must be 1 or 2");
