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/23 14:30:13 UTC
svn commit: r1745197 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb:
RDBDocumentStore.java RDBDocumentStoreJDBC.java
Author: reschke
Date: Mon May 23 14:30:12 2016
New Revision: 1745197
URL: http://svn.apache.org/viewvc?rev=1745197&view=rev
Log:
OAK-4388: RDBDocumentStore - fix UpdateOp with max(_modified) when not using DB append mode
refactor the change, essentially undoing the change on the JDBC layer because it wasn't needed down there
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
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=1745197&r1=1745196&r2=1745197&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 Mon May 23 14:30:12 2016
@@ -1550,9 +1550,6 @@ public class RDBDocumentStore implements
String data = null;
try {
connection = this.ch.getRWConnection();
- Operation modOperation = update.getChanges().get(MODIFIEDKEY);
- long modified = getModifiedFromOperation(modOperation);
- boolean modifiedIsConditional = modOperation == null || modOperation.type != UpdateOp.Operation.Type.SET;
Number flagB = (Number) document.get(NodeDocument.HAS_BINARY_FLAG);
Boolean hasBinary = flagB != null && flagB.intValue() == NodeDocument.HAS_BINARY_VAL;
Boolean flagD = (Boolean) document.get(NodeDocument.DELETED_ONCE);
@@ -1567,6 +1564,9 @@ public class RDBDocumentStore implements
String appendData = ser.asString(update);
if (appendData.length() < tmd.getDataLimitInOctets() / CHAR2OCTETRATIO) {
try {
+ Operation modOperation = update.getChanges().get(MODIFIEDKEY);
+ long modified = getModifiedFromOperation(modOperation);
+ boolean modifiedIsConditional = modOperation == null || modOperation.type != UpdateOp.Operation.Type.SET;
success = db.appendingUpdate(connection, tmd, document.getId(), modified, modifiedIsConditional, hasBinary,
deletedOnce, modcount, cmodcount, oldmodcount, appendData);
// if we get here, a retry is not going to help (the SQL
@@ -1584,8 +1584,10 @@ public class RDBDocumentStore implements
}
if (!success && shouldRetry) {
data = ser.asString(document);
- success = db.update(connection, tmd, document.getId(), modified, modifiedIsConditional, hasBinary, deletedOnce,
- modcount, cmodcount, oldmodcount, data);
+ Object m = document.get(MODIFIED);
+ long modified = (m instanceof Long) ? ((Long)m).longValue() : 0;
+ success = db.update(connection, tmd, document.getId(), modified, 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=1745197&r1=1745196&r2=1745197&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 Mon May 23 14:30:12 2016
@@ -682,14 +682,13 @@ public class RDBDocumentStoreJDBC {
}
}
- 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 {
+ 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 {
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 = ?");
+ t.append("MODIFIED = ?, HASBINARY = ?, DELETEDONCE = ?, MODCOUNT = ?, CMODCOUNT = ?, DSIZE = ?, DATA = ?, BDATA = ? ");
+ t.append("where ID = ?");
if (oldmodcount != null) {
t.append(" and MODCOUNT = ?");
}
@@ -697,9 +696,6 @@ public class RDBDocumentStoreJDBC {
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);