<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191354] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191354">191354</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-10-20 13:47:48 -0700 (Tue, 20 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/191306">r191306</a>.
https://bugs.webkit.org/show_bug.cgi?id=150371
"May have caused a significant warm PLT regression" (Requested
by cdumez_ on #webkit).
Reverted changeset:
"[WK2] Generalize NetworkCacheStorage API so it can store
different types of metadata"
https://bugs.webkit.org/show_bug.cgi?id=150221
http://trac.webkit.org/changeset/191306
Patch by Commit Queue <commit-queue@webkit.org> on 2015-10-20</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeycpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeyh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191353 => 191354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-20 20:42:01 UTC (rev 191353)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-20 20:47:48 UTC (rev 191354)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-10-20 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r191306.
+ https://bugs.webkit.org/show_bug.cgi?id=150371
+
+ "May have caused a significant warm PLT regression" (Requested
+ by cdumez_ on #webkit).
+
+ Reverted changeset:
+
+ "[WK2] Generalize NetworkCacheStorage API so it can store
+ different types of metadata"
+ https://bugs.webkit.org/show_bug.cgi?id=150221
+ http://trac.webkit.org/changeset/191306
+
</ins><span class="cx"> 2015-10-20 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix the build by disabling MAC_GESTURE_EVENTS on 10.9 and 10.10
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (191353 => 191354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-10-20 20:42:01 UTC (rev 191353)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-10-20 20:47:48 UTC (rev 191354)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><del>-#include <wtf/MainThread.h>
</del><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="lines">@@ -51,13 +50,6 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> namespace NetworkCache {
</span><span class="cx">
</span><del>-static const AtomicString& resourceType()
-{
- ASSERT(WTF::isMainThread());
- static NeverDestroyed<const AtomicString> resource("resource", AtomicString::ConstructFromLiteral);
- return resource;
-}
-
</del><span class="cx"> Cache& singleton()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<Cache> instance;
</span><span class="lines">@@ -121,7 +113,7 @@
</span><span class="cx"> // FIXME: This implements minimal Range header disk cache support. We don't parse
</span><span class="cx"> // ranges so only the same exact range request will be served from the cache.
</span><span class="cx"> String range = request.httpHeaderField(WebCore::HTTPHeaderName::Range);
</span><del>- return { partition, resourceType(), range, request.url().string() };
</del><ins>+ return { partition, range, request.url().string() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String headerValueForVary(const WebCore::ResourceRequest& request, const String& headerName)
</span><span class="lines">@@ -480,7 +472,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isEnabled());
</span><span class="cx">
</span><del>- m_storage->traverse(resourceType(), 0, [traverseHandler](const Storage::Record* record, const Storage::RecordInfo&) {
</del><ins>+ m_storage->traverse(0, [traverseHandler](const Storage::Record* record, const Storage::RecordInfo&) {
</ins><span class="cx"> if (!record) {
</span><span class="cx"> traverseHandler(nullptr);
</span><span class="cx"> return;
</span><span class="lines">@@ -517,7 +509,7 @@
</span><span class="cx"> Totals totals;
</span><span class="cx"> auto flags = Storage::TraverseFlag::ComputeWorth | Storage::TraverseFlag::ShareCount;
</span><span class="cx"> size_t capacity = m_storage->capacity();
</span><del>- m_storage->traverse(resourceType(), flags, [fd, totals, capacity](const Storage::Record* record, const Storage::RecordInfo& info) mutable {
</del><ins>+ m_storage->traverse(flags, [fd, totals, capacity](const Storage::Record* record, const Storage::RecordInfo& info) mutable {
</ins><span class="cx"> if (!record) {
</span><span class="cx"> StringBuilder epilogue;
</span><span class="cx"> epilogue.appendLiteral("{}\n],\n");
</span><span class="lines">@@ -575,8 +567,7 @@
</span><span class="cx"> RunLoop::main().dispatch(completionHandler);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- String anyType;
- m_storage->clear(anyType, modifiedSince, WTF::move(completionHandler));
</del><ins>+ m_storage->clear(modifiedSince, WTF::move(completionHandler));
</ins><span class="cx">
</span><span class="cx"> deleteDumpFile();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp (191353 => 191354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp 2015-10-20 20:42:01 UTC (rev 191353)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp 2015-10-20 20:47:48 UTC (rev 191354)
</span><span class="lines">@@ -38,16 +38,14 @@
</span><span class="cx">
</span><span class="cx"> Key::Key(const Key& o)
</span><span class="cx"> : m_partition(o.m_partition.isolatedCopy())
</span><del>- , m_type(o.m_type.isolatedCopy())
</del><span class="cx"> , m_identifier(o.m_identifier.isolatedCopy())
</span><span class="cx"> , m_range(o.m_range.isolatedCopy())
</span><span class="cx"> , m_hash(o.m_hash)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Key::Key(const String& partition, const String& type, const String& range, const String& identifier)
</del><ins>+Key::Key(const String& partition, const String& range, const String& identifier)
</ins><span class="cx"> : m_partition(partition.isolatedCopy())
</span><del>- , m_type(type.isolatedCopy())
</del><span class="cx"> , m_identifier(identifier.isolatedCopy())
</span><span class="cx"> , m_range(range.isolatedCopy())
</span><span class="cx"> , m_hash(computeHash())
</span><span class="lines">@@ -57,7 +55,6 @@
</span><span class="cx"> Key& Key::operator=(const Key& other)
</span><span class="cx"> {
</span><span class="cx"> m_partition = other.m_partition.isolatedCopy();
</span><del>- m_type = other.m_type.isolatedCopy();
</del><span class="cx"> m_identifier = other.m_identifier.isolatedCopy();
</span><span class="cx"> m_range = other.m_range.isolatedCopy();
</span><span class="cx"> m_hash = other.m_hash;
</span><span class="lines">@@ -86,7 +83,6 @@
</span><span class="cx"> // SHA1 just happens to be suitably sized, fast and available.
</span><span class="cx"> SHA1 sha1;
</span><span class="cx"> hashString(sha1, m_partition);
</span><del>- hashString(sha1, m_type);
</del><span class="cx"> hashString(sha1, m_identifier);
</span><span class="cx"> hashString(sha1, m_range);
</span><span class="cx"> SHA1::Digest hash;
</span><span class="lines">@@ -128,13 +124,12 @@
</span><span class="cx">
</span><span class="cx"> bool Key::operator==(const Key& other) const
</span><span class="cx"> {
</span><del>- return m_hash == other.m_hash && m_partition == other.m_partition && m_type == other.m_type && m_identifier == other.m_identifier && m_range == other.m_range;
</del><ins>+ return m_hash == other.m_hash && m_partition == other.m_partition && m_identifier == other.m_identifier && m_range == other.m_range;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Key::encode(Encoder& encoder) const
</span><span class="cx"> {
</span><span class="cx"> encoder << m_partition;
</span><del>- encoder << m_type;
</del><span class="cx"> encoder << m_identifier;
</span><span class="cx"> encoder << m_range;
</span><span class="cx"> encoder << m_hash;
</span><span class="lines">@@ -142,7 +137,7 @@
</span><span class="cx">
</span><span class="cx"> bool Key::decode(Decoder& decoder, Key& key)
</span><span class="cx"> {
</span><del>- return decoder.decode(key.m_partition) && decoder.decode(key.m_type) && decoder.decode(key.m_identifier) && decoder.decode(key.m_range) && decoder.decode(key.m_hash);
</del><ins>+ return decoder.decode(key.m_partition) && decoder.decode(key.m_identifier) && decoder.decode(key.m_range) && decoder.decode(key.m_hash);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h (191353 => 191354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h 2015-10-20 20:42:01 UTC (rev 191353)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h 2015-10-20 20:47:48 UTC (rev 191354)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> Key() { }
</span><span class="cx"> Key(const Key&);
</span><span class="cx"> Key(Key&&) = default;
</span><del>- Key(const String& partition, const String& type, const String& range, const String& identifier);
</del><ins>+ Key(const String& partition, const String& range, const String& identifier);
</ins><span class="cx">
</span><span class="cx"> Key& operator=(const Key&);
</span><span class="cx"> Key& operator=(Key&&) = default;
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx">
</span><span class="cx"> const String& partition() const { return m_partition; }
</span><span class="cx"> const String& identifier() const { return m_identifier; }
</span><del>- const String& type() const { return m_type; }
</del><span class="cx">
</span><span class="cx"> HashType hash() const { return m_hash; }
</span><span class="cx">
</span><span class="lines">@@ -72,7 +71,6 @@
</span><span class="cx"> HashType computeHash() const;
</span><span class="cx">
</span><span class="cx"> String m_partition;
</span><del>- String m_type;
</del><span class="cx"> String m_identifier;
</span><span class="cx"> String m_range;
</span><span class="cx"> HashType m_hash;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp (191353 => 191354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2015-10-20 20:42:01 UTC (rev 191353)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2015-10-20 20:47:48 UTC (rev 191354)
</span><span class="lines">@@ -144,10 +144,7 @@
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) Bootstrapping the network cache statistics database from the network cache...");
</span><span class="cx">
</span><span class="cx"> Vector<StringCapture> hashes;
</span><del>- traverseRecordsFiles(networkCachePath, ASCIILiteral("resource"), [&hashes](const String& fileName, const String& hashString, const String& type, bool isBodyBlob, const String& recordDirectoryPath) {
- if (isBodyBlob)
- return;
-
</del><ins>+ traverseRecordsFiles(networkCachePath, [&hashes](const String& hashString, const String&) {
</ins><span class="cx"> Key::HashType hash;
</span><span class="cx"> if (!Key::stringToHash(hashString, hash))
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (191353 => 191354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-10-20 20:42:01 UTC (rev 191353)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-10-20 20:47:48 UTC (rev 191354)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> static const char versionDirectoryPrefix[] = "Version ";
</span><span class="cx"> static const char recordsDirectoryName[] = "Records";
</span><span class="cx"> static const char blobsDirectoryName[] = "Blobs";
</span><del>-static const char blobSuffix[] = "-blob";
</del><ins>+static const char bodyPostfix[] = "-body";
</ins><span class="cx">
</span><span class="cx"> static double computeRecordWorth(FileTimes);
</span><span class="cx">
</span><span class="lines">@@ -113,13 +113,11 @@
</span><span class="cx"> struct Storage::TraverseOperation {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- TraverseOperation(const String& type, TraverseFlags flags, const TraverseHandler& handler)
- : type(type)
- , flags(flags)
</del><ins>+ TraverseOperation(TraverseFlags flags, const TraverseHandler& handler)
+ : flags(flags)
</ins><span class="cx"> , handler(handler)
</span><span class="cx"> { }
</span><span class="cx">
</span><del>- const String type;
</del><span class="cx"> const TraverseFlags flags;
</span><span class="cx"> const TraverseHandler handler;
</span><span class="cx">
</span><span class="lines">@@ -153,49 +151,27 @@
</span><span class="cx"> return WebCore::pathByAppendingComponent(makeVersionedDirectoryPath(baseDirectoryPath), blobsDirectoryName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void traverseRecordsFiles(const String& recordsPath, const String& expectedType, const std::function<void (const String& fileName, const String& hashString, const String& type, bool isBodyBlob, const String& recordDirectoryPath)>& function)
</del><ins>+void traverseRecordsFiles(const String& recordsPath, const std::function<void (const String&, const String&)>& function)
</ins><span class="cx"> {
</span><del>- traverseDirectory(recordsPath, [&recordsPath, &function, &expectedType](const String& partitionName, DirectoryEntryType entryType) {
- if (entryType != DirectoryEntryType::Directory)
</del><ins>+ traverseDirectory(recordsPath, [&recordsPath, &function](const String& subdirName, DirectoryEntryType type) {
+ if (type != DirectoryEntryType::Directory)
</ins><span class="cx"> return;
</span><del>- String partitionPath = WebCore::pathByAppendingComponent(recordsPath, partitionName);
- traverseDirectory(partitionPath, [&function, &partitionPath, &expectedType](const String& actualType, DirectoryEntryType entryType) {
- if (entryType != DirectoryEntryType::Directory)
</del><ins>+ String partitionPath = WebCore::pathByAppendingComponent(recordsPath, subdirName);
+ traverseDirectory(partitionPath, [&function, &partitionPath](const String& fileName, DirectoryEntryType type) {
+ if (type != DirectoryEntryType::File)
</ins><span class="cx"> return;
</span><del>- if (!actualType.isEmpty() && expectedType != actualType)
- return;
- String recordDirectoryPath = WebCore::pathByAppendingComponent(partitionPath, actualType);
- traverseDirectory(partitionPath, [&function, &recordDirectoryPath, &actualType](const String& fileName, DirectoryEntryType entryType) {
- if (entryType != DirectoryEntryType::File || fileName.length() < Key::hashStringLength())
- return;
-
- String hashString = fileName.substring(0, Key::hashStringLength());
- auto isBodyBlob = fileName.length() > Key::hashStringLength() && fileName.endsWith(blobSuffix);
- function(fileName, hashString, actualType, isBodyBlob, recordDirectoryPath);
- });
</del><ins>+ function(fileName, partitionPath);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void deleteEmptyRecordsDirectories(const String& recordsPath)
</span><span class="cx"> {
</span><del>- traverseDirectory(recordsPath, [&recordsPath](const String& partitionName, DirectoryEntryType type) {
</del><ins>+ traverseDirectory(recordsPath, [&recordsPath](const String& subdirName, DirectoryEntryType type) {
</ins><span class="cx"> if (type != DirectoryEntryType::Directory)
</span><span class="cx"> return;
</span><del>-
- // Delete [type] sub-folders.
- String partitionPath = WebCore::pathByAppendingComponent(recordsPath, partitionName);
- traverseDirectory(partitionPath, [&partitionPath](const String& subdirName, DirectoryEntryType entryType) {
- if (entryType != DirectoryEntryType::Directory)
- return;
-
- // Let system figure out if it is really empty.
- WebCore::deleteEmptyDirectory(WebCore::pathByAppendingComponent(partitionPath, subdirName));
- });
-
- // Delete [Partition] folders.
</del><span class="cx"> // Let system figure out if it is really empty.
</span><del>- WebCore::deleteEmptyDirectory(WebCore::pathByAppendingComponent(recordsPath, partitionName));
</del><ins>+ WebCore::deleteEmptyDirectory(WebCore::pathByAppendingComponent(recordsPath, subdirName));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -249,13 +225,14 @@
</span><span class="cx">
</span><span class="cx"> backgroundIOQueue().dispatch([this] {
</span><span class="cx"> auto recordFilter = std::make_unique<ContentsFilter>();
</span><del>- auto blobFilter = std::make_unique<ContentsFilter>();
</del><ins>+ auto bodyFilter = std::make_unique<ContentsFilter>();
</ins><span class="cx"> size_t recordsSize = 0;
</span><span class="cx"> unsigned count = 0;
</span><del>- String anyType;
- traverseRecordsFiles(recordsPath(), anyType, [&recordFilter, &blobFilter, &recordsSize, &count](const String& fileName, const String& hashString, const String& type, bool isBodyBlob, const String& recordDirectoryPath) {
- auto filePath = WebCore::pathByAppendingComponent(recordDirectoryPath, fileName);
</del><ins>+ traverseRecordsFiles(recordsPath(), [&recordFilter, &bodyFilter, &recordsSize, &count](const String& fileName, const String& partitionPath) {
+ auto filePath = WebCore::pathByAppendingComponent(partitionPath, fileName);
</ins><span class="cx">
</span><ins>+ bool isBody = fileName.endsWith(bodyPostfix);
+ String hashString = isBody ? fileName.substring(0, Key::hashStringLength()) : fileName;
</ins><span class="cx"> Key::HashType hash;
</span><span class="cx"> if (!Key::stringToHash(hashString, hash)) {
</span><span class="cx"> WebCore::deleteFile(filePath);
</span><span class="lines">@@ -267,33 +244,31 @@
</span><span class="cx"> WebCore::deleteFile(filePath);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- if (isBodyBlob) {
- blobFilter->add(hash);
</del><ins>+ if (isBody) {
+ bodyFilter->add(hash);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> recordFilter->add(hash);
</span><span class="cx"> recordsSize += fileSize;
</span><span class="cx"> ++count;
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> auto* recordFilterPtr = recordFilter.release();
</span><del>- auto* blobFilterPtr = blobFilter.release();
- RunLoop::main().dispatch([this, recordFilterPtr, blobFilterPtr, recordsSize] {
</del><ins>+ auto* bodyFilterPtr = bodyFilter.release();
+ RunLoop::main().dispatch([this, recordFilterPtr, bodyFilterPtr, recordsSize] {
</ins><span class="cx"> auto recordFilter = std::unique_ptr<ContentsFilter>(recordFilterPtr);
</span><del>- auto blobFilter = std::unique_ptr<ContentsFilter>(blobFilterPtr);
</del><ins>+ auto bodyFilter = std::unique_ptr<ContentsFilter>(bodyFilterPtr);
</ins><span class="cx">
</span><del>- for (auto& recordFilterKey : m_recordFilterHashesAddedDuringSynchronization)
- recordFilter->add(recordFilterKey);
</del><ins>+ for (auto& hash : m_recordFilterHashesAddedDuringSynchronization)
+ recordFilter->add(hash);
</ins><span class="cx"> m_recordFilterHashesAddedDuringSynchronization.clear();
</span><span class="cx">
</span><del>- for (auto& hash : m_blobFilterHashesAddedDuringSynchronization)
- blobFilter->add(hash);
- m_blobFilterHashesAddedDuringSynchronization.clear();
</del><ins>+ for (auto& hash : m_bodyFilterHashesAddedDuringSynchronization)
+ bodyFilter->add(hash);
+ m_bodyFilterHashesAddedDuringSynchronization.clear();
</ins><span class="cx">
</span><span class="cx"> m_recordFilter = WTF::move(recordFilter);
</span><del>- m_blobFilter = WTF::move(blobFilter);
</del><ins>+ m_bodyFilter = WTF::move(bodyFilter);
</ins><span class="cx"> m_approximateRecordsSize = recordsSize;
</span><span class="cx"> m_synchronizationInProgress = false;
</span><span class="cx"> });
</span><span class="lines">@@ -302,7 +277,7 @@
</span><span class="cx">
</span><span class="cx"> deleteEmptyRecordsDirectories(recordsPath());
</span><span class="cx">
</span><del>- LOG(NetworkCacheStorage, "(NetworkProcess) cache synchronization completed size=%zu count=%u", recordsSize, count);
</del><ins>+ LOG(NetworkCacheStorage, "(NetworkProcess) cache synchronization completed size=%zu count=%d", recordsSize, count);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -324,32 +299,30 @@
</span><span class="cx"> return !m_recordFilter || m_recordFilter->mayContain(key.hash());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Storage::mayContainBlob(const Key& key) const
</del><ins>+String Storage::partitionPathForKey(const Key& key) const
</ins><span class="cx"> {
</span><del>- ASSERT(RunLoop::isMain());
- return !m_blobFilter || m_blobFilter->mayContain(key.hash());
</del><ins>+ ASSERT(!key.partition().isEmpty());
+ return WebCore::pathByAppendingComponent(recordsPath(), key.partition());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String Storage::recordDirectoryPathForKey(const Key& key) const
</del><ins>+static String fileNameForKey(const Key& key)
</ins><span class="cx"> {
</span><del>- ASSERT(!key.partition().isEmpty());
- ASSERT(!key.type().isEmpty());
- return WebCore::pathByAppendingComponent(WebCore::pathByAppendingComponent(recordsPath(), key.partition()), key.type());
</del><ins>+ return key.hashAsString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Storage::recordPathForKey(const Key& key) const
</span><span class="cx"> {
</span><del>- return WebCore::pathByAppendingComponent(recordDirectoryPathForKey(key), key.hashAsString());
</del><ins>+ return WebCore::pathByAppendingComponent(partitionPathForKey(key), fileNameForKey(key));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static String blobPathForRecordPath(const String& recordPath)
</del><ins>+static String bodyPathForRecordPath(const String& recordPath)
</ins><span class="cx"> {
</span><del>- return recordPath + blobSuffix;
</del><ins>+ return recordPath + bodyPostfix;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String Storage::blobPathForKey(const Key& key) const
</del><ins>+String Storage::bodyPathForKey(const Key& key) const
</ins><span class="cx"> {
</span><del>- return blobPathForRecordPath(recordPathForKey(key));
</del><ins>+ return bodyPathForRecordPath(recordPathForKey(key));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct RecordMetaData {
</span><span class="lines">@@ -479,20 +452,20 @@
</span><span class="cx">
</span><span class="cx"> Optional<BlobStorage::Blob> Storage::storeBodyAsBlob(WriteOperation& writeOperation)
</span><span class="cx"> {
</span><del>- auto blobPath = blobPathForKey(writeOperation.record.key);
</del><ins>+ auto bodyPath = bodyPathForKey(writeOperation.record.key);
</ins><span class="cx">
</span><span class="cx"> // Store the body.
</span><del>- auto blob = m_blobStorage.add(blobPath, writeOperation.record.body);
</del><ins>+ auto blob = m_blobStorage.add(bodyPath, writeOperation.record.body);
</ins><span class="cx"> if (blob.data.isNull())
</span><span class="cx"> return { };
</span><span class="cx">
</span><span class="cx"> ++writeOperation.activeCount;
</span><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([this, blob, &writeOperation] {
</span><del>- if (m_blobFilter)
- m_blobFilter->add(writeOperation.record.key.hash());
</del><ins>+ if (m_bodyFilter)
+ m_bodyFilter->add(writeOperation.record.key.hash());
</ins><span class="cx"> if (m_synchronizationInProgress)
</span><del>- m_blobFilterHashesAddedDuringSynchronization.append(writeOperation.record.key.hash());
</del><ins>+ m_bodyFilterHashesAddedDuringSynchronization.append(writeOperation.record.key.hash());
</ins><span class="cx">
</span><span class="cx"> if (writeOperation.mappedBodyHandler)
</span><span class="cx"> writeOperation.mappedBodyHandler(blob.data);
</span><span class="lines">@@ -550,7 +523,7 @@
</span><span class="cx">
</span><span class="cx"> serialBackgroundIOQueue().dispatch([this, key] {
</span><span class="cx"> WebCore::deleteFile(recordPathForKey(key));
</span><del>- m_blobStorage.remove(blobPathForKey(key));
</del><ins>+ m_blobStorage.remove(bodyPathForKey(key));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -573,7 +546,7 @@
</span><span class="cx"> const auto readTimeout = 1500_ms;
</span><span class="cx"> m_readOperationTimeoutTimer.startOneShot(readTimeout);
</span><span class="cx">
</span><del>- bool shouldGetBodyBlob = mayContainBlob(readOperation.key);
</del><ins>+ bool shouldGetBodyBlob = !m_bodyFilter || m_bodyFilter->mayContain(readOperation.key.hash());
</ins><span class="cx">
</span><span class="cx"> ioQueue().dispatch([this, &readOperation, shouldGetBodyBlob] {
</span><span class="cx"> auto recordPath = recordPathForKey(readOperation.key);
</span><span class="lines">@@ -590,9 +563,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> if (shouldGetBodyBlob) {
</span><del>- // Read the blob in parallel with the record read.
- auto blobPath = blobPathForKey(readOperation.key);
- readOperation.resultBodyBlob = m_blobStorage.get(blobPath);
</del><ins>+ // Read the body blob in parallel with the record read.
+ auto bodyPath = bodyPathForKey(readOperation.key);
+ readOperation.resultBodyBlob = m_blobStorage.get(bodyPath);
</ins><span class="cx"> finishReadOperation(readOperation);
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -601,7 +574,7 @@
</span><span class="cx"> void Storage::finishReadOperation(ReadOperation& readOperation)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(readOperation.activeCount);
</span><del>- // Record and blob reads must finish.
</del><ins>+ // Record and body blob reads must finish.
</ins><span class="cx"> if (--readOperation.activeCount)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -708,17 +681,17 @@
</span><span class="cx"> addToRecordFilter(writeOperation.record.key);
</span><span class="cx">
</span><span class="cx"> backgroundIOQueue().dispatch([this, &writeOperation] {
</span><del>- auto recordDirectorPath = recordDirectoryPathForKey(writeOperation.record.key);
</del><ins>+ auto partitionPath = partitionPathForKey(writeOperation.record.key);
</ins><span class="cx"> auto recordPath = recordPathForKey(writeOperation.record.key);
</span><span class="cx">
</span><del>- WebCore::makeAllDirectories(recordDirectorPath);
</del><ins>+ WebCore::makeAllDirectories(partitionPath);
</ins><span class="cx">
</span><span class="cx"> ++writeOperation.activeCount;
</span><span class="cx">
</span><span class="cx"> bool shouldStoreAsBlob = shouldStoreBodyAsBlob(writeOperation.record.body);
</span><del>- auto blob = shouldStoreAsBlob ? storeBodyAsBlob(writeOperation) : Nullopt;
</del><ins>+ auto bodyBlob = shouldStoreAsBlob ? storeBodyAsBlob(writeOperation) : Nullopt;
</ins><span class="cx">
</span><del>- auto recordData = encodeRecord(writeOperation.record, blob);
</del><ins>+ auto recordData = encodeRecord(writeOperation.record, bodyBlob);
</ins><span class="cx">
</span><span class="cx"> auto channel = IOChannel::open(recordPath, IOChannel::Type::Create);
</span><span class="cx"> size_t recordSize = recordData.size();
</span><span class="lines">@@ -797,30 +770,28 @@
</span><span class="cx"> m_writeOperationDispatchTimer.startOneShot(initialWriteDelay);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Storage::traverse(const String& type, TraverseFlags flags, TraverseHandler&& traverseHandler)
</del><ins>+void Storage::traverse(TraverseFlags flags, TraverseHandler&& traverseHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx"> ASSERT(traverseHandler);
</span><span class="cx"> // Avoid non-thread safe std::function copies.
</span><span class="cx">
</span><del>- auto traverseOperationPtr = std::make_unique<TraverseOperation>(type, flags, WTF::move(traverseHandler));
</del><ins>+ auto traverseOperationPtr = std::make_unique<TraverseOperation>(flags, WTF::move(traverseHandler));
</ins><span class="cx"> auto& traverseOperation = *traverseOperationPtr;
</span><span class="cx"> m_activeTraverseOperations.add(WTF::move(traverseOperationPtr));
</span><span class="cx">
</span><span class="cx"> ioQueue().dispatch([this, &traverseOperation] {
</span><del>- traverseRecordsFiles(recordsPath(), traverseOperation.type, [this, &traverseOperation](const String& fileName, const String& hashString, const String& type, bool isBodyBlob, const String& recordDirectoryPath) {
- ASSERT(type == traverseOperation.type);
- if (isBodyBlob)
</del><ins>+ traverseRecordsFiles(recordsPath(), [this, &traverseOperation](const String& fileName, const String& partitionPath) {
+ if (fileName.length() != Key::hashStringLength())
</ins><span class="cx"> return;
</span><ins>+ auto recordPath = WebCore::pathByAppendingComponent(partitionPath, fileName);
</ins><span class="cx">
</span><del>- auto recordPath = WebCore::pathByAppendingComponent(recordDirectoryPath, fileName);
-
</del><span class="cx"> double worth = -1;
</span><span class="cx"> if (traverseOperation.flags & TraverseFlag::ComputeWorth)
</span><span class="cx"> worth = computeRecordWorth(fileTimes(recordPath));
</span><span class="cx"> unsigned bodyShareCount = 0;
</span><span class="cx"> if (traverseOperation.flags & TraverseFlag::ShareCount)
</span><del>- bodyShareCount = m_blobStorage.shareCount(blobPathForRecordPath(recordPath));
</del><ins>+ bodyShareCount = m_blobStorage.shareCount(bodyPathForRecordPath(recordPath));
</ins><span class="cx">
</span><span class="cx"> std::unique_lock<Lock> lock(traverseOperation.activeMutex);
</span><span class="cx"> ++traverseOperation.activeCount;
</span><span class="lines">@@ -885,24 +856,24 @@
</span><span class="cx"> shrinkIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Storage::clear(const String& type, std::chrono::system_clock::time_point modifiedSinceTime, std::function<void ()>&& completionHandler)
</del><ins>+void Storage::clear(std::chrono::system_clock::time_point modifiedSinceTime, std::function<void ()>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) clearing cache");
</span><span class="cx">
</span><span class="cx"> if (m_recordFilter)
</span><span class="cx"> m_recordFilter->clear();
</span><del>- if (m_blobFilter)
- m_blobFilter->clear();
</del><ins>+ if (m_bodyFilter)
+ m_bodyFilter->clear();
</ins><span class="cx"> m_approximateRecordsSize = 0;
</span><span class="cx">
</span><span class="cx"> // Avoid non-thread safe std::function copies.
</span><span class="cx"> auto* completionHandlerPtr = completionHandler ? new std::function<void ()>(WTF::move(completionHandler)) : nullptr;
</span><del>- StringCapture typeCapture(type);
- ioQueue().dispatch([this, modifiedSinceTime, completionHandlerPtr, typeCapture] {
</del><ins>+
+ ioQueue().dispatch([this, modifiedSinceTime, completionHandlerPtr] {
</ins><span class="cx"> auto recordsPath = this->recordsPath();
</span><del>- traverseRecordsFiles(recordsPath, typeCapture.string(), [modifiedSinceTime](const String& fileName, const String& hashString, const String& type, bool isBodyBlob, const String& recordDirectoryPath) {
- auto filePath = WebCore::pathByAppendingComponent(recordDirectoryPath, fileName);
</del><ins>+ traverseRecordsFiles(recordsPath, [modifiedSinceTime](const String& fileName, const String& partitionPath) {
+ auto filePath = WebCore::pathByAppendingComponent(partitionPath, fileName);
</ins><span class="cx"> if (modifiedSinceTime > std::chrono::system_clock::time_point::min()) {
</span><span class="cx"> auto times = fileTimes(filePath);
</span><span class="cx"> if (times.modification < modifiedSinceTime)
</span><span class="lines">@@ -913,7 +884,7 @@
</span><span class="cx">
</span><span class="cx"> deleteEmptyRecordsDirectories(recordsPath);
</span><span class="cx">
</span><del>- // This cleans unreferenced blobs.
</del><ins>+ // This cleans unreferences blobs.
</ins><span class="cx"> m_blobStorage.synchronize();
</span><span class="cx">
</span><span class="cx"> if (completionHandlerPtr) {
</span><span class="lines">@@ -979,16 +950,14 @@
</span><span class="cx">
</span><span class="cx"> backgroundIOQueue().dispatch([this] {
</span><span class="cx"> auto recordsPath = this->recordsPath();
</span><del>- String anyType;
- traverseRecordsFiles(recordsPath, anyType, [this](const String& fileName, const String& hashString, const String& type, bool isBodyBlob, const String& recordDirectoryPath) {
- if (isBodyBlob)
</del><ins>+ traverseRecordsFiles(recordsPath, [this](const String& fileName, const String& partitionPath) {
+ if (fileName.length() != Key::hashStringLength())
</ins><span class="cx"> return;
</span><ins>+ auto recordPath = WebCore::pathByAppendingComponent(partitionPath, fileName);
+ auto bodyPath = bodyPathForRecordPath(recordPath);
</ins><span class="cx">
</span><del>- auto recordPath = WebCore::pathByAppendingComponent(recordDirectoryPath, fileName);
- auto blobPath = blobPathForRecordPath(recordPath);
-
</del><span class="cx"> auto times = fileTimes(recordPath);
</span><del>- unsigned bodyShareCount = m_blobStorage.shareCount(blobPath);
</del><ins>+ unsigned bodyShareCount = m_blobStorage.shareCount(bodyPath);
</ins><span class="cx"> auto probability = deletionProbability(times, bodyShareCount);
</span><span class="cx">
</span><span class="cx"> bool shouldDelete = randomNumber() < probability;
</span><span class="lines">@@ -997,7 +966,7 @@
</span><span class="cx">
</span><span class="cx"> if (shouldDelete) {
</span><span class="cx"> WebCore::deleteFile(recordPath);
</span><del>- m_blobStorage.remove(blobPath);
</del><ins>+ m_blobStorage.remove(bodyPath);
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (191353 => 191354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-10-20 20:42:01 UTC (rev 191353)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-10-20 20:47:48 UTC (rev 191354)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> void store(const Record&, MappedBodyHandler&&);
</span><span class="cx">
</span><span class="cx"> void remove(const Key&);
</span><del>- void clear(const String& type, std::chrono::system_clock::time_point modifiedSinceTime, std::function<void ()>&& completionHandler);
</del><ins>+ void clear(std::chrono::system_clock::time_point modifiedSinceTime, std::function<void ()>&& completionHandler);
</ins><span class="cx">
</span><span class="cx"> struct RecordInfo {
</span><span class="cx"> size_t bodySize;
</span><span class="lines">@@ -80,13 +80,13 @@
</span><span class="cx"> typedef unsigned TraverseFlags;
</span><span class="cx"> typedef std::function<void (const Record*, const RecordInfo&)> TraverseHandler;
</span><span class="cx"> // Null record signals end.
</span><del>- void traverse(const String& type, TraverseFlags, TraverseHandler&&);
</del><ins>+ void traverse(TraverseFlags, TraverseHandler&&);
</ins><span class="cx">
</span><span class="cx"> void setCapacity(size_t);
</span><span class="cx"> size_t capacity() const { return m_capacity; }
</span><span class="cx"> size_t approximateSize() const;
</span><span class="cx">
</span><del>- static const unsigned version = 5;
</del><ins>+ static const unsigned version = 4;
</ins><span class="cx">
</span><span class="cx"> String basePath() const;
</span><span class="cx"> String versionPath() const;
</span><span class="lines">@@ -97,9 +97,9 @@
</span><span class="cx"> private:
</span><span class="cx"> Storage(const String& directoryPath);
</span><span class="cx">
</span><del>- String recordDirectoryPathForKey(const Key&) const;
</del><ins>+ String partitionPathForKey(const Key&) const;
</ins><span class="cx"> String recordPathForKey(const Key&) const;
</span><del>- String blobPathForKey(const Key&) const;
</del><ins>+ String bodyPathForKey(const Key&) const;
</ins><span class="cx">
</span><span class="cx"> void synchronize();
</span><span class="cx"> void deleteOldVersions();
</span><span class="lines">@@ -129,7 +129,6 @@
</span><span class="cx"> WorkQueue& serialBackgroundIOQueue() { return m_serialBackgroundIOQueue.get(); }
</span><span class="cx">
</span><span class="cx"> bool mayContain(const Key&) const;
</span><del>- bool mayContainBlob(const Key&) const;
</del><span class="cx">
</span><span class="cx"> void addToRecordFilter(const Key&);
</span><span class="cx">
</span><span class="lines">@@ -142,13 +141,13 @@
</span><span class="cx"> // 2^18 bit filter can support up to 26000 entries with false positive rate < 1%.
</span><span class="cx"> using ContentsFilter = BloomFilter<18>;
</span><span class="cx"> std::unique_ptr<ContentsFilter> m_recordFilter;
</span><del>- std::unique_ptr<ContentsFilter> m_blobFilter;
</del><ins>+ std::unique_ptr<ContentsFilter> m_bodyFilter;
</ins><span class="cx">
</span><span class="cx"> bool m_synchronizationInProgress { false };
</span><span class="cx"> bool m_shrinkInProgress { false };
</span><span class="cx">
</span><span class="cx"> Vector<Key::HashType> m_recordFilterHashesAddedDuringSynchronization;
</span><del>- Vector<Key::HashType> m_blobFilterHashesAddedDuringSynchronization;
</del><ins>+ Vector<Key::HashType> m_bodyFilterHashesAddedDuringSynchronization;
</ins><span class="cx">
</span><span class="cx"> static const int maximumRetrievePriority = 4;
</span><span class="cx"> Deque<std::unique_ptr<ReadOperation>> m_pendingReadOperationsByPriority[maximumRetrievePriority + 1];
</span><span class="lines">@@ -170,7 +169,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove, used by NetworkCacheStatistics only.
</span><del>-void traverseRecordsFiles(const String& recordsPath, const String& type, const std::function<void (const String& fileName, const String& hashString, const String& type, bool isBodyBlob, const String& recordDirectoryPath)>&);
</del><ins>+void traverseRecordsFiles(const String& recordsPath, const std::function<void (const String&, const String&)>&);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>