Author: reschke
Date: Tue Nov 21 16:09:49 2017
New Revision: 1815947
URL: http://svn.apache.org/viewvc?rev=1815947&view=rev
Log:
OAK-5028: Remove DocumentStore.update() (ported to 1.6)
Remove dead code in RDBDocumentStore
Modified:
jackrabbit/oak/branches/1.6/oak-core/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 21 16:09:49 2017
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0/oak-core:1665962
/jackrabbit/oak/trunk/oak-core:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789441,1789534,1790382,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-180395
5,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1811380,1811952,1811963,1811986,1814332
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940
/jackrabbit/trunk/oak-core:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1815947&r1=1815946&r2=1815947&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Tue Nov 21 16:09:49 2017
@@ -769,7 +769,6 @@ public class RDBDocumentStore implements
new String[] { "id", "dsize", "deletedonce", "bdata", "data",
"cmodcount", "modcount", "hasbinary", "modified" })));
// set of properties not serialized to JSON
- // when adding new columns also update UNHANDLEDPROPS!
private static final Set<String> COLUMNPROPERTIES = new
HashSet<String>(Arrays.asList(
new String[] { ID, NodeDocument.HAS_BINARY_FLAG,
NodeDocument.DELETED_ONCE, COLLISIONSMODCOUNT, MODIFIED, MODCOUNT }));
@@ -1632,7 +1631,7 @@ public class RDBDocumentStore implements
boolean shouldRetry = true;
// every 16th update is a full rewrite
- if (isAppendableUpdate(update, false) && modcount % 16 != 0) {
+ if (isAppendableUpdate(update) && modcount % 16 != 0) {
String appendData = ser.asString(update);
if (appendData.length() < tmd.getDataLimitInOctets() /
CHAR2OCTETRATIO) {
try {
@@ -1688,23 +1687,8 @@ public class RDBDocumentStore implements
}
}
- // set of properties not serialized and not handled specifically by update
code
- private static final Set<Key> UNHANDLEDPROPS = new HashSet<Key>(
- Arrays.asList(new Key[] { new Key(NodeDocument.HAS_BINARY_FLAG,
null), new Key(NodeDocument.DELETED_ONCE, null) }));
-
- private static boolean isAppendableUpdate(UpdateOp update, boolean
batched) {
- if (NOAPPEND) {
- return false;
- }
- if (batched) {
- // Detect update operations not supported when doing batch updates
- for (Key key : update.getChanges().keySet()) {
- if (UNHANDLEDPROPS.contains(key)) {
- return false;
- }
- }
- }
- return true;
+ private static boolean isAppendableUpdate(UpdateOp update) {
+ return NOAPPEND == false;
}
private static long getModifiedFromOperation(Operation op) {
