Author: reschke
Date: Tue Dec 8 17:33:37 2015
New Revision: 1718655
URL: http://svn.apache.org/viewvc?rev=1718655&view=rev
Log:
OAK-3729: RDBDocumentStore: implement RDB-specific VersionGC support for lookup
of deleted documents (ported to 1.2)
Added:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java
- copied unchanged from r1718626,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java
- copied unchanged from r1718626,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 8 17:33:37 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618
,1684820,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695
905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1
711248,1711282,1711296,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717988
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618
,1684820,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695
905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1
711248,1711282,1711296,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717988,1718626
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1718655&r1=1718654&r2=1718655&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Tue Dec 8 17:33:37 2015
@@ -52,6 +52,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBBlobStore;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBVersionGCSupport;
import org.apache.jackrabbit.oak.plugins.document.util.RevisionsKey;
import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
@@ -877,6 +878,8 @@ public class DocumentMK implements Micro
DocumentStore store = getDocumentStore();
if (store instanceof MongoDocumentStore) {
return new MongoVersionGCSupport((MongoDocumentStore) store);
+ } else if (store instanceof RDBDocumentStore) {
+ return new RDBVersionGCSupport((RDBDocumentStore) store);
} else {
return new VersionGCSupport(store);
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1718655&r1=1718654&r2=1718655&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Tue Dec 8 17:33:37 2015
@@ -236,7 +236,17 @@ public class RDBDocumentStore implements
@Override
public <T extends Document> List<T> query(Collection<T> collection, String
fromKey, String toKey, String indexedProperty,
long startValue, int limit) {
- return internalQuery(collection, fromKey, toKey, indexedProperty,
startValue, limit);
+ List<QueryCondition> conditions = Collections.emptyList();
+ if (indexedProperty != null) {
+ conditions = Collections.singletonList(new
QueryCondition(indexedProperty, ">=", startValue));
+ }
+ return internalQuery(collection, fromKey, toKey, conditions, limit);
+ }
+
+ @Nonnull
+ protected <T extends Document> List<T> query(Collection<T> collection,
String fromKey, String toKey,
+ List<QueryCondition> conditions, int limit) {
+ return internalQuery(collection, fromKey, toKey, conditions, limit);
}
@Override
@@ -1203,14 +1213,16 @@ public class RDBDocumentStore implements
private Map<Thread, QueryContext> qmap = new ConcurrentHashMap<Thread,
QueryContext>();
private <T extends Document> List<T> internalQuery(Collection<T>
collection, String fromKey, String toKey,
- String indexedProperty, long startValue, int limit) {
+ List<QueryCondition> conditions, int limit) {
Connection connection = null;
RDBTableMetaData tmd = getTable(collection);
- if (indexedProperty != null &&
(!INDEXEDPROPERTIES.contains(indexedProperty))) {
- String message = "indexed property " + indexedProperty + " not
supported, query was '>= '" + startValue
- + "'; supported properties are " + INDEXEDPROPERTIES;
- LOG.info(message);
- throw new DocumentStoreException(message);
+ for (QueryCondition cond : conditions) {
+ if (!INDEXEDPROPERTIES.contains(cond.getPropertyName())) {
+ String message = "indexed property " + cond.getPropertyName()
+ " not supported, query was '" + cond.getOperator()
+ + "'" + cond.getValue() + "'; supported properties are
" + INDEXEDPROPERTIES;
+ LOG.info(message);
+ throw new DocumentStoreException(message);
+ }
}
try {
long now = System.currentTimeMillis();
@@ -1222,7 +1234,7 @@ public class RDBDocumentStore implements
connection = this.ch.getROConnection();
String from = collection == Collection.NODES &&
NodeDocument.MIN_ID_VALUE.equals(fromKey) ? null : fromKey;
String to = collection == Collection.NODES &&
NodeDocument.MAX_ID_VALUE.equals(toKey) ? null : toKey;
- List<RDBRow> dbresult = db.query(connection, tmd, from, to,
indexedProperty, startValue, limit);
+ List<RDBRow> dbresult = db.query(connection, tmd, from, to,
conditions, limit);
connection.commit();
int size = dbresult.size();
@@ -1788,4 +1800,34 @@ public class RDBDocumentStore implements
protected Cache<CacheValue, NodeDocument> getNodeDocumentCache() {
return nodesCache;
}
+
+ // slightly extended query support
+ protected static class QueryCondition {
+
+ private final String propertyName, operator;
+ private final long value;
+
+ public QueryCondition(String propertyName, String operator, long
value) {
+ this.propertyName = propertyName;
+ this.operator = operator;
+ this.value = value;
+ }
+
+ public String getPropertyName() {
+ return propertyName;
+ }
+
+ public String getOperator() {
+ return operator;
+ }
+
+ public long getValue() {
+ return value;
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s %s %d", propertyName, operator, value);
+ }
+ }
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1718655&r1=1718654&r2=1718655&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
Tue Dec 8 17:33:37 2015
@@ -29,9 +29,13 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Types;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
@@ -41,6 +45,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Condition;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
+import
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.QueryCondition;
import
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.RDBTableMetaData;
import
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStoreDB.FETCHFIRSTSYNTAX;
import
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStoreDB.PreparedStatementComponent;
@@ -318,9 +323,29 @@ public class RDBDocumentStoreJDBC {
}
}
+ private final static Map<String, String> INDEXED_PROP_MAPPING;
+ static {
+ Map<String, String> tmp = new HashMap<String, String>();
+ tmp.put(MODIFIED, "MODIFIED");
+ tmp.put(NodeDocument.HAS_BINARY_FLAG, "HASBINARY");
+ tmp.put(NodeDocument.DELETED_ONCE, "DELETEDONCE");
+ INDEXED_PROP_MAPPING = Collections.unmodifiableMap(tmp);
+ }
+
+ private final static Set<String> SUPPORTED_OPS;
+ static {
+ Set<String> tmp = new HashSet<String>();
+ tmp.add(">=");
+ tmp.add(">");
+ tmp.add("<=");
+ tmp.add("<");
+ tmp.add("=");
+ SUPPORTED_OPS = Collections.unmodifiableSet(tmp);
+ }
+
@Nonnull
- public List<RDBRow> query(Connection connection, RDBTableMetaData tmd,
String minId, String maxId, String indexedProperty,
- long startValue, int limit) throws SQLException {
+ public List<RDBRow> query(Connection connection, RDBTableMetaData tmd,
String minId, String maxId,
+ List<QueryCondition> conditions, int limit) throws SQLException {
long start = System.currentTimeMillis();
StringBuilder selectClause = new StringBuilder();
StringBuilder whereClause = new StringBuilder();
@@ -339,20 +364,16 @@ public class RDBDocumentStoreJDBC {
whereClause.append(whereSep).append("ID < ?");
whereSep = " and ";
}
-
- if (indexedProperty != null) {
- if (MODIFIED.equals(indexedProperty)) {
- whereClause.append(whereSep).append("MODIFIED >= ?");
- } else if (NodeDocument.HAS_BINARY_FLAG.equals(indexedProperty)) {
- if (startValue != NodeDocument.HAS_BINARY_VAL) {
- throw new DocumentStoreException("unsupported value for
property " + NodeDocument.HAS_BINARY_FLAG);
- }
- whereClause.append(whereSep).append("HASBINARY = 1");
- } else if (NodeDocument.DELETED_ONCE.equals(indexedProperty)) {
- if (startValue != 1) {
- throw new DocumentStoreException("unsupported value for
property " + NodeDocument.DELETED_ONCE);
- }
- whereClause.append(whereSep).append("DELETEDONCE = 1");
+ for (QueryCondition cond : conditions) {
+ String op = cond.getOperator();
+ if (!SUPPORTED_OPS.contains(op)) {
+ throw new DocumentStoreException("unsupported operator: " +
op);
+ }
+ String indexedProperty = cond.getPropertyName();
+ String column = INDEXED_PROP_MAPPING.get(indexedProperty);
+ if (column != null) {
+ whereClause.append(whereSep).append(column).append("
").append(op).append(" ?");
+ whereSep = " and ";
} else {
throw new DocumentStoreException("unsupported indexed
property: " + indexedProperty);
}
@@ -390,9 +411,8 @@ public class RDBDocumentStoreJDBC {
if (maxId != null) {
setIdInStatement(tmd, stmt, si++, maxId);
}
-
- if (MODIFIED.equals(indexedProperty)) {
- stmt.setLong(si++, startValue);
+ for (QueryCondition cond : conditions) {
+ stmt.setLong(si++, cond.getValue());
}
if (limit != Integer.MAX_VALUE) {
stmt.setFetchSize(limit);
@@ -423,14 +443,13 @@ public class RDBDocumentStoreJDBC {
long elapsed = System.currentTimeMillis() - start;
if (this.queryHitsLimit != 0 && result.size() > this.queryHitsLimit) {
String message = String.format(
- "Potentially excessive query with %d hits (limited to %d,
configured QUERYHITSLIMIT %d), elapsed time %dms, params minid '%s' maxid '%s'
indexedProperty %s startValue %d limit %d. Check calling method.",
- result.size(), limit, this.queryHitsLimit, elapsed, minId,
maxId, indexedProperty, startValue, limit);
+ "Potentially excessive query with %d hits (limited to %d,
configured QUERYHITSLIMIT %d), elapsed time %dms, params minid '%s' maxid '%s'
condition %s limit %d. Check calling method.",
+ result.size(), limit, this.queryHitsLimit, elapsed, minId,
maxId, conditions, limit);
LOG.info(message, new Exception("call stack"));
} else if (this.queryTimeLimit != 0 && elapsed > this.queryTimeLimit) {
String message = String.format(
- "Long running query with %d hits (limited to %d), elapsed
time %dms (configured QUERYTIMELIMIT %d), params minid '%s' maxid '%s'
indexedProperty %s startValue %d limit %d. Read %d chars from DATA and %d bytes
from BDATA. Check calling method.",
- result.size(), limit, elapsed, this.queryTimeLimit, minId,
maxId, indexedProperty, startValue, limit, dataTotal,
- bdataTotal);
+ "Long running query with %d hits (limited to %d), elapsed
time %dms (configured QUERYTIMELIMIT %d), params minid '%s' maxid '%s'
condition %s limit %d. Read %d chars from DATA and %d bytes from BDATA. Check
calling method.",
+ result.size(), limit, elapsed, this.queryTimeLimit, minId,
maxId, conditions, limit, dataTotal, bdataTotal);
LOG.info(message, new Exception("call stack"));
}
