Author: amitj
Date: Wed Aug 29 06:39:00 2018
New Revision: 1839542
URL: http://svn.apache.org/viewvc?rev=1839542&view=rev
Log:
OAK-7389: Mongo/FileBlobStore does not update timestamp for already existing
blobs
Merge r1828502 from trunk
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java
jackrabbit/oak/branches/1.4/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/MemoryBlobStore.java
jackrabbit/oak/branches/1.4/oak-blob/src/test/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStoreTest.java
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 29 06:39:00 2018
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.6:1802566,1819951,1819977,1830228,1835110
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750656,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1753481,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762463,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772
228,1772593,1772768,1772906,1773190,1774141,1774256,1774445,1774497,1774519,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785161,1785172,1785283,1785838,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798832,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026,1804437,1807308,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809163,1809745,1811380,1811655,1811952,1811963,1811986,1813538,1814189,1814332,1814397,1815438,1817326,1818645,1819048,1819050,1821325,1821516,1823172,1823655,1826237,1826640,1826932,1826957,1829527,1829587,1829665,1829987,1830019,1830160,1830239,1831190,1831374,1
833308,1834648-1834649,1834681,1835060,1837475,1837998,1838637
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750656,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1753481,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762463,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772
228,1772593,1772768,1772906,1773190,1774141,1774256,1774445,1774497,1774519,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785161,1785172,1785283,1785838,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798832,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026,1804437,1807308,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809163,1809745,1811380,1811655,1811952,1811963,1811986,1813538,1814189,1814332,1814397,1815438,1817326,1818645,1819048,1819050,1821325,1821516,1823172,1823655,1826237,1826640,1826932,1826957,1828502,1829527,1829587,1829665,1829987,1830019,1830160,1830239,1831190,1
831374,1833308,1834648-1834649,1834681,1835060,1837475,1837998,1838637
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.4/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java?rev=1839542&r1=1839541&r2=1839542&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/FileBlobStore.java
Wed Aug 29 06:39:00 2018
@@ -109,6 +109,7 @@ public class FileBlobStore extends Abstr
protected synchronized void storeBlock(byte[] digest, int level, byte[]
data) throws IOException {
File f = getFile(digest, false);
if (f.exists()) {
+ FileUtils.touch(f);
return;
}
File parent = f.getParentFile();
Modified:
jackrabbit/oak/branches/1.4/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/MemoryBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/MemoryBlobStore.java?rev=1839542&r1=1839541&r2=1839542&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/MemoryBlobStore.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/MemoryBlobStore.java
Wed Aug 29 06:39:00 2018
@@ -33,6 +33,7 @@ public class MemoryBlobStore extends Abs
private HashMap<BlockId, byte[]> map = new HashMap<BlockId, byte[]>();
private HashMap<BlockId, byte[]> old = new HashMap<BlockId, byte[]>();
+ private HashMap<BlockId, Long> timestamps = new HashMap<BlockId, Long>();
private boolean mark;
@Override
@@ -46,7 +47,9 @@ public class MemoryBlobStore extends Abs
@Override
protected synchronized void storeBlock(byte[] digest, int level, byte[]
data) {
- map.put(new BlockId(digest, 0), data);
+ BlockId id = new BlockId(digest, 0);
+ map.put(id, data);
+ timestamps.put(id, System.currentTimeMillis());
}
@Override
@@ -90,8 +93,11 @@ public class MemoryBlobStore extends Abs
for (String chunkId : chunkIds) {
BlockId id = new BlockId(StringUtils.convertHexToBytes(chunkId),
0);
if (map.containsKey(id)) {
- map.remove(id);
- count++;
+ if (maxLastModifiedTime == 0 || (maxLastModifiedTime > 0 &&
maxLastModifiedTime > timestamps.get(id))) {
+ map.remove(id);
+ timestamps.remove(id);
+ count++;
+ }
} else if (old.containsKey(id)) {
old.remove(id);
count++;
Modified:
jackrabbit/oak/branches/1.4/oak-blob/src/test/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-blob/src/test/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStoreTest.java?rev=1839542&r1=1839541&r2=1839542&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-blob/src/test/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-blob/src/test/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStoreTest.java
Wed Aug 29 06:39:00 2018
@@ -446,6 +446,28 @@ public abstract class AbstractBlobStoreT
}
@Test
+ public void deleteUpdatedBlob() throws Exception {
+ String id = store.writeBlob(randomStream(0, getArtifactSize()));
+ Thread.sleep(100);
+
+ long beforeUpdateTime = System.currentTimeMillis();
+
+ Thread.sleep(1000);
+
+ // Should update the timestamp
+ String id2 = store.writeBlob(randomStream(0, getArtifactSize()));
+ assertEquals(id, id2);
+
+ Set<String> chunks = Sets.newHashSet();
+ Iterator<String> iter = store.resolveChunks(id.toString());
+ while (iter.hasNext()) {
+ chunks.add(iter.next());
+ }
+ long count = store.countDeleteChunks(Lists.newArrayList(chunks),
beforeUpdateTime);
+ assertEquals("Deleted updated blobs", 0, count);
+ }
+
+ @Test
public void uploadCallback() throws Exception {
assumeTrue(supportsStatsCollection());
TestCollector collector = new TestCollector();
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java?rev=1839542&r1=1839541&r2=1839542&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
Wed Aug 29 06:39:00 2018
@@ -21,6 +21,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import com.mongodb.MongoException;
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.plugins.blob.CachingBlobStore;
import org.slf4j.Logger;
@@ -33,7 +34,6 @@ import com.mongodb.DB;
import com.mongodb.DBCollection;
import com.mongodb.DBCursor;
import com.mongodb.DBObject;
-import com.mongodb.DuplicateKeyException;
import com.mongodb.QueryBuilder;
import com.mongodb.ReadPreference;
import com.mongodb.WriteResult;
@@ -78,18 +78,29 @@ public class MongoBlobStore extends Cach
protected void storeBlock(byte[] digest, int level, byte[] data) throws
IOException {
String id = StringUtils.convertBytesToHex(digest);
cache.put(id, data);
- // Check if it already exists?
- MongoBlob mongoBlob = new MongoBlob();
- mongoBlob.setId(id);
- mongoBlob.setData(data);
- mongoBlob.setLevel(level);
- mongoBlob.setLastMod(System.currentTimeMillis());
- // TODO check the return value
- // TODO verify insert is fast if the entry already exists
+
+ // Create the mongo blob object
+ BasicDBObject mongoBlob = new BasicDBObject(MongoBlob.KEY_ID, id);
+ mongoBlob.append(MongoBlob.KEY_DATA, data);
+ mongoBlob.append(MongoBlob.KEY_LEVEL, level);
+
+ // If update only the lastMod needs to be modified
+ BasicDBObject updateBlob =new BasicDBObject(MongoBlob.KEY_LAST_MOD,
System.currentTimeMillis());
+
+ BasicDBObject upsert = new BasicDBObject();
+ upsert.append("$setOnInsert", mongoBlob)
+ .append("$set", updateBlob);
+
try {
- getBlobCollection().insert(mongoBlob);
- } catch (DuplicateKeyException e) {
- // the same block was already stored before: ignore
+ DBObject query = getBlobQuery(id, -1);
+ WriteResult update = getBlobCollection().update(query, upsert,
true, false);
+ if (update != null && update.isUpdateOfExisting()) {
+ LOG.debug("Block with id [{}] updated", id);
+ } else {
+ LOG.trace("Block with id [{}] created", id);
+ }
+ } catch (MongoException e) {
+ throw new IOException(e.getMessage(), e);
}
}
