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 2016/05/21 15:42:33 UTC
svn commit: r1744959 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
test/java/org/apache/jackrabbit/oak/plugins/document/
Author: reschke
Date: Sat May 21 15:42:33 2016
New Revision: 1744959
URL: http://svn.apache.org/viewvc?rev=1744959&view=rev
Log:
OAK-4388: RDBDocumentStore - fix UpdateOp with max(_modified) when not using DB append mode
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1744959&r1=1744958&r2=1744959&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Sat May 21 15:42:33 2016
@@ -1584,8 +1584,8 @@ public class RDBDocumentStore implements
}
if (!success && shouldRetry) {
data = ser.asString(document);
- success = db.update(connection, tmd, document.getId(), modified, hasBinary, deletedOnce, modcount, cmodcount,
- oldmodcount, data);
+ success = db.update(connection, tmd, document.getId(), modified, modifiedIsConditional, hasBinary, deletedOnce,
+ modcount, cmodcount, oldmodcount, data);
connection.commit();
}
return success;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1744959&r1=1744958&r2=1744959&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java Sat May 21 15:42:33 2016
@@ -682,17 +682,24 @@ public class RDBDocumentStoreJDBC {
}
}
- public boolean update(Connection connection, RDBTableMetaData tmd, String id, Long modified, Boolean hasBinary,
- Boolean deletedOnce, Long modcount, Long cmodcount, Long oldmodcount, String data) throws SQLException {
- String t = "update " + tmd.getName()
- + " set MODIFIED = ?, HASBINARY = ?, DELETEDONCE = ?, MODCOUNT = ?, CMODCOUNT = ?, DSIZE = ?, DATA = ?, BDATA = ? where ID = ?";
+ public boolean update(Connection connection, RDBTableMetaData tmd, String id, Long modified, boolean setModifiedConditionally,
+ Boolean hasBinary, Boolean deletedOnce, Long modcount, Long cmodcount, Long oldmodcount, String data)
+ throws SQLException {
+
+ StringBuilder t = new StringBuilder();
+ t.append("update " + tmd.getName() + " set ");
+ t.append(setModifiedConditionally ? "MODIFIED = case when ? > MODIFIED then ? else MODIFIED end, " : "MODIFIED = ?, ");
+ t.append("HASBINARY = ?, DELETEDONCE = ?, MODCOUNT = ?, CMODCOUNT = ?, DSIZE = ?, DATA = ?, BDATA = ? where ID = ?");
if (oldmodcount != null) {
- t += " and MODCOUNT = ?";
+ t.append(" and MODCOUNT = ?");
}
- PreparedStatement stmt = connection.prepareStatement(t);
+ PreparedStatement stmt = connection.prepareStatement(t.toString());
try {
int si = 1;
stmt.setObject(si++, modified, Types.BIGINT);
+ if (setModifiedConditionally) {
+ stmt.setObject(si++, modified, Types.BIGINT);
+ }
stmt.setObject(si++, hasBinary ? 1 : 0, Types.SMALLINT);
stmt.setObject(si++, deletedOnce ? 1 : 0, Types.SMALLINT);
stmt.setObject(si++, modcount, Types.BIGINT);
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java?rev=1744959&r1=1744958&r2=1744959&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java Sat May 21 15:42:33 2016
@@ -443,6 +443,30 @@ public class BasicDocumentStoreTest exte
}
@Test
+ public void testModifiedMaxUpdateQuery2() {
+ // test for https://issues.apache.org/jira/browse/OAK-4388
+ String id = this.getClass().getName() + ".testModifiedMaxUpdate2";
+ // create a test node
+ UpdateOp up = new UpdateOp(id, true);
+ up.set("_id", id);
+ up.set("_modified", 1000L);
+ boolean success = super.ds.create(Collection.NODES, Collections.singletonList(up));
+ assertTrue(success);
+ removeMe.add(id);
+
+ for (int i = 0; i < 25; i++) {
+ // update with smaller _modified
+ UpdateOp up2 = new UpdateOp(id, true);
+ up2.set("_id", id);
+ up2.max("_modified", 100L);
+ super.ds.findAndUpdate(Collection.NODES, up2);
+ super.ds.invalidateCache();
+ NodeDocument doc = super.ds.find(Collection.NODES, id, 0);
+ assertEquals("modified should not have been set back (test iteration " + i + ")", 1000, (long)doc.getModified());
+ }
+ }
+
+ @Test
public void testModifyModified() {
// https://issues.apache.org/jira/browse/OAK-2940
String id = this.getClass().getName() + ".testModifyModified";