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 2018/10/31 17:11:45 UTC
svn commit: r1845352 - in /jackrabbit/oak/branches/1.8: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/
Author: reschke
Date: Wed Oct 31 17:11:45 2018
New Revision: 1845352
URL: http://svn.apache.org/viewvc?rev=1845352&view=rev
Log:
OAK-7855: rdbmk: Invalid SplitDocType when run on non-upgraded DB (ported to 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 31 17:11:45 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157
-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844642,1844728,1844932
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157
-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845336
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java?rev=1845352&r1=1845351&r2=1845352&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java Wed Oct 31 17:11:45 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/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1845352&r1=1845351&r2=1845352&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java Wed Oct 31 17:11:45 2018
@@ -446,8 +446,8 @@ 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 sdMaxRevTime = tmd.hasSplitDocs() ? readLongFromResultSet(rs, field++) : 0;
+ long sdType = tmd.hasSplitDocs() ? readLongFromResultSet(rs, field++) : RDBRow.LONG_UNSET;
+ 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,
@@ -602,8 +602,8 @@ 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 sdMaxRevTime = tmd.hasSplitDocs() ? readLongFromResultSet(rs, field++) : 0;
+ long sdType = tmd.hasSplitDocs() ? readLongFromResultSet(rs, field++) : RDBRow.LONG_UNSET;
+ 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,
@@ -748,8 +748,8 @@ 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 sdMaxRevTime = tmd.hasSplitDocs() ? readLongFromResultSet(rs, field++) : 0;
+ long sdType = tmd.hasSplitDocs() ? readLongFromResultSet(rs, field++) : RDBRow.LONG_UNSET;
+ 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,
@@ -826,8 +826,8 @@ 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 sdMaxRevTime = tmd.hasSplitDocs() ? readLongFromResultSet(rs, field++) : 0;
+ long sdType = tmd.hasSplitDocs() ? readLongFromResultSet(rs, field++) : RDBRow.LONG_UNSET;
+ 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/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java?rev=1845352&r1=1845351&r2=1845352&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java Wed Oct 31 17:11:45 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;
@@ -259,6 +260,72 @@ public class RDBDocumentStoreSchemaUpgra
if (rdb != null) {
rdb.dispose();
}
+ }
+ }
+
+ @Test
+ public void init12fail() {
+ LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class.getName()).enable(Level.INFO)
+ .contains("Attempted to upgrade").create();
+ logCustomizer.starting();
+
+ Assume.assumeTrue(ds instanceof RDBDataSourceWrapper);
+ RDBDataSourceWrapper wds = (RDBDataSourceWrapper)ds;
+ wds.setFailAlterTableAddColumnStatements(true);
+
+ RDBOptions op = new RDBOptions().tablePrefix("T12F").initialSchema(1).upgradeToSchema(2).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());
+ assertEquals("unexpected # of log entries: " + logCustomizer.getLogs(), RDBDocumentStore.getTableNames().size() * 4,
+ logCustomizer.getLogs().size());
+ 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);
+ testUpdate.set("p", 42);
+ assertNotNull(rdb.findAndUpdate(Collection.NODES, testUpdate));
+ rdb.getNodeDocumentCache().invalidate(id);
+ 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();
+ if (rdb != null) {
+ rdb.dispose();
+ }
+ }
+ }
+
+ @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();
+ }
}
}