svn commit: r1660426 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb: RDBDocumentSerializer.java RDBDocumentStore.java

[reschke]

Author: reschke
Date: Tue Feb 17 15:50:55 2015
New Revision: 1660426

URL: http://svn.apache.org/r1660426
Log:
OAK-1941 - make use of CMODCOUNT depend on a switch (because of OAK-2044 in 1.0)

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java?rev=1660426&r1=1660425&r2=1660426&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
 Tue Feb 17 15:50:55 2015
@@ -182,7 +182,9 @@ public class RDBDocumentSerializer {
         doc.put(ID, row.getId());
         doc.put(MODIFIED, row.getModified());
         doc.put(MODCOUNT, row.getModcount());
-        doc.put(CMODCOUNT, row.getCollisionsModcount());
+        if (RDBDocumentStore.USECMODCOUNT) {
+            doc.put(CMODCOUNT, row.getCollisionsModcount());
+        }
         if (row.hasBinaryProperties()) {
             doc.put(HASBINARY, NodeDocument.HAS_BINARY_VAL);
         }

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=1660426&r1=1660425&r2=1660426&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
 Tue Feb 17 15:50:55 2015
@@ -555,6 +555,9 @@ public class RDBDocumentStore implements
     // number of retries for updates
     private static final int RETRIES = 10;
 
+    // see OAK-2044
+    protected static final boolean USECMODCOUNT = true;
+
     // DB-specific information
     private DB db;
 
@@ -1664,6 +1667,8 @@ public class RDBDocumentStore implements
     }
 
     private boolean hasChangesToCollisions(UpdateOp update) {
+        if (! USECMODCOUNT) return false;
+
         for (Entry<Key, Operation> e : 
checkNotNull(update).getChanges().entrySet()) {
             Key k = e.getKey();
             Operation op = e.getValue();