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

[mr...@apache.org]

Author: mreutegg
Date: Wed Oct 24 13:56:23 2018
New Revision: 1844775

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

Suppress invalid _sdType on read

Modified:
    jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.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/RDBDocumentSerializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java?rev=1844775&r1=1844774&r2=1844775&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java Wed Oct 24 13:56:23 2018
@@ -232,6 +232,9 @@ public class RDBDocumentSerializer {
             }
             json.read(JsopReader.END);
 
+            // OAK-7855: check and fix _sdType
+            checkSdType(doc);
+
             return doc;
         } catch (Exception ex) {
             String message = String.format("Error processing persisted data for document '%s'", row.getId());
@@ -321,6 +324,17 @@ public class RDBDocumentSerializer {
         }
     }
 
+    private static void checkSdType(Document doc) {
+        Object sdType = doc.get(NodeDocument.SD_TYPE);
+        if (sdType instanceof Long) {
+            long value = (long) sdType;
+            if (value == 0) {
+                doc.remove(NodeDocument.SD_TYPE);
+                LOG.debug("Incorrect _sdType 0 in {}", doc.getId());
+            }
+        }
+    }
+
     // low level operations
 
     private static byte[] GZIPSIG = { 31, -117 };

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=1844775&r1=1844774&r2=1844775&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 24 13:56:23 2018
@@ -301,6 +301,33 @@ public class RDBDocumentStoreSchemaUpgra
     }
 
     @Test
+    public void autoFixOAK7855() {
+        RDBOptions op = new RDBOptions().tablePrefix("OAK7855").dropTablesOnClose(true);
+        RDBDocumentStore rdb = null;
+        try {
+            rdb = new RDBDocumentStore(this.ds, new DocumentMK.Builder(), op);
+            RDBTableMetaData meta = rdb.getTable(Collection.NODES);
+            assertEquals(op.getTablePrefix() + "_NODES", meta.getName());
+            assertTrue(meta.hasVersion());
+            String id = Utils.getIdFromPath("/foo");
+            UpdateOp testInsert = new UpdateOp(id, true);
+            assertTrue(rdb.create(Collection.NODES, Collections.singletonList(testInsert)));
+            UpdateOp testUpdate = new UpdateOp(id, false);
+            // set the invalid split doc type introduced by OAK-7855
+            testUpdate.set(NodeDocument.SD_TYPE, 0);
+            assertNotNull(rdb.findAndUpdate(Collection.NODES, testUpdate));
+            rdb.getNodeDocumentCache().invalidate(id);
+            NodeDocument doc = rdb.find(Collection.NODES, id);
+            assertNotNull(doc);
+            assertEquals(SplitDocType.NONE, doc.getSplitDocType());
+        } finally {
+            if (rdb != null) {
+                rdb.dispose();
+            }
+        }
+    }
+
+    @Test
     public void testVersionGCOnOldDB() {
         RDBOptions op = new RDBOptions().tablePrefix("T11").initialSchema(1).upgradeToSchema(1).dropTablesOnClose(true);
         RDBDocumentStore rdb = null;