Author: mreutegg
Date: Tue Oct 23 09:47:44 2018
New Revision: 1844627
URL: http://svn.apache.org/viewvc?rev=1844627&view=rev
Log:
OAK-7855: Invalid SplitDocType
Apply Julian's patch and enable test
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=1844627&r1=1844626&r2=1844627&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
Tue Oct 23 09:47:44 2018
@@ -447,7 +447,7 @@ public class RDBDocumentStoreJDBC {
Long hasBinary = readLongOrNullFromResultSet(rs, field++);
Boolean deletedOnce = readBooleanOrNullFromResultSet(rs,
field++);
long schemaVersion = tmd.hasVersion() ?
readLongFromResultSet(rs, field++) : 0;
- long sdType = tmd.hasSplitDocs() ? readLongFromResultSet(rs,
field++) : 0;
+ long sdType = tmd.hasSplitDocs() ? readLongFromResultSet(rs,
field++) : RDBRow.LONG_UNSET;
long sdMaxRevTime = tmd.hasSplitDocs() ?
readLongFromResultSet(rs, field++) : 0;
String data = rs.getString(field++);
byte[] bdata = rs.getBytes(field++);
@@ -603,7 +603,7 @@ public class RDBDocumentStoreJDBC {
Long hasBinary = readLongOrNullFromResultSet(this.rs,
field++);
Boolean deletedOnce =
readBooleanOrNullFromResultSet(this.rs, field++);
long schemaVersion = tmd.hasVersion() ?
readLongFromResultSet(rs, field++) : 0;
- long sdType = tmd.hasSplitDocs() ?
readLongFromResultSet(rs, field++) : 0;
+ long sdType = tmd.hasSplitDocs() ?
readLongFromResultSet(rs, field++) : RDBRow.LONG_UNSET;
long sdMaxRevTime = tmd.hasSplitDocs() ?
readLongFromResultSet(rs, field++) : 0;
String data = this.rs.getString(field++);
byte[] bdata = this.rs.getBytes(field++);
@@ -749,7 +749,7 @@ public class RDBDocumentStoreJDBC {
Long hasBinary = readLongOrNullFromResultSet(rs, field++);
Boolean deletedOnce = readBooleanOrNullFromResultSet(rs,
field++);
long schemaVersion = tmd.hasVersion() ?
readLongFromResultSet(rs, field++) : 0;
- long sdType = tmd.hasSplitDocs() ?
readLongFromResultSet(rs, field++) : 0;
+ long sdType = tmd.hasSplitDocs() ?
readLongFromResultSet(rs, field++) : RDBRow.LONG_UNSET;
long sdMaxRevTime = tmd.hasSplitDocs() ?
readLongFromResultSet(rs, field++) : 0;
String data = rs.getString(field++);
byte[] bdata = rs.getBytes(field++);
@@ -827,7 +827,7 @@ public class RDBDocumentStoreJDBC {
Long hasBinary = readLongOrNullFromResultSet(rs, field++);
Boolean deletedOnce = readBooleanOrNullFromResultSet(rs,
field++);
long schemaVersion = tmd.hasVersion() ?
readLongFromResultSet(rs, field++) : 0;
- long sdType = tmd.hasSplitDocs() ? readLongFromResultSet(rs,
field++) : 0;
+ long sdType = tmd.hasSplitDocs() ? readLongFromResultSet(rs,
field++) : RDBRow.LONG_UNSET;
long sdMaxRevTime = tmd.hasSplitDocs() ?
readLongFromResultSet(rs, field++) : 0;
String data = rs.getString(field++);
byte[] bdata = rs.getBytes(field++);
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=1844627&r1=1844626&r2=1844627&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
Tue Oct 23 09:47:44 2018
@@ -40,7 +40,6 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.RDBTableMetaData;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.junit.Assume;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -263,7 +262,6 @@ public class RDBDocumentStoreSchemaUpgra
}
}
- @Ignore("OAK-7855")
@Test
public void init12fail() {
LogCustomizer logCustomizer =
LogCustomizer.forLogger(RDBDocumentStore.class.getName()).enable(Level.INFO)
