svn commit: r1845336 - in /jackrabbit/oak/trunk/oak-store-document/src: main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java

[reschke]

Author: reschke
Date: Wed Oct 31 14:50:09 2018
New Revision: 1845336

URL: http://svn.apache.org/viewvc?rev=1845336&view=rev
Log:
OAK-7855: Invalid SplitDocType

handle sdmaxrevtime as well

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1845336&r1=1845335&r2=1845336&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
 Wed Oct 31 14:50:09 2018
@@ -448,7 +448,7 @@ public class RDBDocumentStoreJDBC {
                 Boolean deletedOnce = readBooleanOrNullFromResultSet(rs, 
field++);
                 long schemaVersion = tmd.hasVersion() ? 
readLongFromResultSet(rs, field++) : 0;
                 long sdType = tmd.hasSplitDocs() ? readLongFromResultSet(rs, 
field++) : RDBRow.LONG_UNSET;
-                long sdMaxRevTime = tmd.hasSplitDocs() ? 
readLongFromResultSet(rs, field++) : 0;
+                long sdMaxRevTime = tmd.hasSplitDocs() ? 
readLongFromResultSet(rs, field++) : RDBRow.LONG_UNSET;
                 String data = rs.getString(field++);
                 byte[] bdata = rs.getBytes(field++);
                 result.add(new RDBRow(id, hasBinary, deletedOnce, modified, 
modcount, cmodcount, schemaVersion, sdType,
@@ -604,7 +604,7 @@ public class RDBDocumentStoreJDBC {
                     Boolean deletedOnce = 
readBooleanOrNullFromResultSet(this.rs, field++);
                     long schemaVersion = tmd.hasVersion() ? 
readLongFromResultSet(rs, field++) : 0;
                     long sdType = tmd.hasSplitDocs() ? 
readLongFromResultSet(rs, field++) : RDBRow.LONG_UNSET;
-                    long sdMaxRevTime = tmd.hasSplitDocs() ? 
readLongFromResultSet(rs, field++) : 0;
+                    long sdMaxRevTime = tmd.hasSplitDocs() ? 
readLongFromResultSet(rs, field++) : RDBRow.LONG_UNSET;
                     String data = this.rs.getString(field++);
                     byte[] bdata = this.rs.getBytes(field++);
                     return new RDBRow(id, hasBinary, deletedOnce, modified, 
modcount, cmodcount, schemaVersion, sdType,
@@ -750,7 +750,7 @@ public class RDBDocumentStoreJDBC {
                     Boolean deletedOnce = readBooleanOrNullFromResultSet(rs, 
field++);
                     long schemaVersion = tmd.hasVersion() ? 
readLongFromResultSet(rs, field++) : 0;
                     long sdType = tmd.hasSplitDocs() ? 
readLongFromResultSet(rs, field++) : RDBRow.LONG_UNSET;
-                    long sdMaxRevTime = tmd.hasSplitDocs() ? 
readLongFromResultSet(rs, field++) : 0;
+                    long sdMaxRevTime = tmd.hasSplitDocs() ? 
readLongFromResultSet(rs, field++) : RDBRow.LONG_UNSET;
                     String data = rs.getString(field++);
                     byte[] bdata = rs.getBytes(field++);
                     RDBRow row = new RDBRow(id, hasBinary, deletedOnce, 
modified, modcount, cmodcount, schemaVersion, sdType,
@@ -828,7 +828,7 @@ public class RDBDocumentStoreJDBC {
                 Boolean deletedOnce = readBooleanOrNullFromResultSet(rs, 
field++);
                 long schemaVersion = tmd.hasVersion() ? 
readLongFromResultSet(rs, field++) : 0;
                 long sdType = tmd.hasSplitDocs() ? readLongFromResultSet(rs, 
field++) : RDBRow.LONG_UNSET;
-                long sdMaxRevTime = tmd.hasSplitDocs() ? 
readLongFromResultSet(rs, field++) : 0;
+                long sdMaxRevTime = tmd.hasSplitDocs() ? 
readLongFromResultSet(rs, field++) : RDBRow.LONG_UNSET;
                 String data = rs.getString(field++);
                 byte[] bdata = rs.getBytes(field++);
                 return new RDBRow(id, hasBinary, deletedOnce, modified, 
modcount, cmodcount, schemaVersion, sdType, sdMaxRevTime,

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java?rev=1845336&r1=1845335&r2=1845336&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java
 Wed Oct 31 14:50:09 2018
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugin
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
@@ -291,6 +292,7 @@ public class RDBDocumentStoreSchemaUpgra
             NodeDocument doc = rdb.find(Collection.NODES, id);
             assertNotNull(doc);
             assertEquals(SplitDocType.NONE, doc.getSplitDocType());
+            assertNull(doc.get(NodeDocument.SD_MAX_REV_TIME_IN_SECS));
         } finally {
             wds.setFailAlterTableAddColumnStatements(false);
             logCustomizer.finished();