Author: reschke
Date: Mon Oct 30 14:11:59 2017
New Revision: 1813766
URL: http://svn.apache.org/viewvc?rev=1813766&view=rev
Log:
OAK-6789: RDB: RevisionGC performance on Oracle (ported to 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/RDBDocumentStoreJDBC.java
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 30 14:11:59 2017
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0/oak-core:1665962
/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,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,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,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1805851-1805852,180666
8,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931
/jackrabbit/trunk/oak-core:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1813766&r1=1813765&r2=1813766&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
Mon Oct 30 14:11:59 2017
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.collect.Iterables.transform;
import static com.google.common.collect.Sets.newHashSet;
+import static
org.apache.jackrabbit.oak.plugins.document.NodeDocument.MODIFIED_IN_SECS;
import static
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.CHAR2OCTETRATIO;
import static
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.asBytes;
import static
org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.closeResultSet;
@@ -52,6 +53,7 @@ import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
+import org.apache.jackrabbit.oak.plugins.document.UpdateOp;
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;
@@ -191,39 +193,33 @@ public class RDBDocumentStoreJDBC {
public int delete(Connection connection, RDBTableMetaData tmd, Map<String,
Map<Key, Condition>> toDelete)
throws SQLException, DocumentStoreException {
- String or = "";
- StringBuilder whereClause = new StringBuilder();
+ // sanity check on parameters; see OAK-6789
for (Entry<String, Map<Key, Condition>> entry : toDelete.entrySet()) {
- whereClause.append(or);
- or = " or ";
- whereClause.append("ID=?");
- for (Entry<Key, Condition> c : entry.getValue().entrySet()) {
- if (!c.getKey().getName().equals(MODIFIED)) {
- throw new DocumentStoreException("Unsupported condition: "
+ c);
- }
- whereClause.append(" and MODIFIED");
- if (c.getValue().type == Condition.Type.EQUALS &&
c.getValue().value instanceof Long) {
- whereClause.append("=?");
- } else if (c.getValue().type == Condition.Type.EXISTS) {
- whereClause.append(" is not null");
- } else {
- throw new DocumentStoreException("Unsupported condition: "
+ c);
- }
+ if (entry.getValue().entrySet().size() != 1) {
+ throw new DocumentStoreException("Unsupported number of
conditions in : " + entry.getValue().entrySet());
+ }
+ Entry<Key, Condition> c =
entry.getValue().entrySet().iterator().next();
+ if (!c.getKey().getName().equals(MODIFIED)) {
+ throw new DocumentStoreException("Unsupported condition: " +
c);
}
}
- PreparedStatement stmt = connection.prepareStatement("delete from " +
tmd.getName() + " where " + whereClause);
+ PreparedStatement stmt = connection.prepareStatement("delete from " +
tmd.getName() + " where ID=? and MODIFIED=?");
+ UpdateOp.Key MODIFIEDKEY = new UpdateOp.Key(MODIFIED_IN_SECS, null);
try {
- int i = 1;
for (Entry<String, Map<Key, Condition>> entry :
toDelete.entrySet()) {
- setIdInStatement(tmd, stmt, i++, entry.getKey());
- for (Entry<Key, Condition> c : entry.getValue().entrySet()) {
- if (c.getValue().type == Condition.Type.EQUALS) {
- stmt.setLong(i++, (Long) c.getValue().value);
- }
+ setIdInStatement(tmd, stmt, 1, entry.getKey());
+ stmt.setLong(2, (Long)
entry.getValue().get(MODIFIEDKEY).value);
+ stmt.addBatch();
+ }
+ int[] rets = stmt.executeBatch();
+ int updatedRows = 0;
+ for (int ret : rets) {
+ if (ret >= 0) {
+ updatedRows += ret;
}
}
- return stmt.executeUpdate();
+ return updatedRows;
} finally {
stmt.close();
}
