net/disk_cache/simple: Reduce size of EntrySet nodes.

net/disk_cache/simple/simple_index_file.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/disk_cache/simple/simple_index_file.h"
 
 #include "base/file_util.h"
 #include "base/hash.h"
 #include "base/logging.h"
 #include "base/pickle.h"
@@ skipping 93 matching lines @@
   }
 
   if (!index_metadata.CheckIndexMetadata()) {
     LOG(ERROR) << "Invalid index_metadata on Simple Cache Index.";
     return scoped_ptr<SimpleIndex::EntrySet>(NULL);
   }
 
   scoped_ptr<SimpleIndex::EntrySet> index_file_entries(
       new SimpleIndex::EntrySet());
   while (index_file_entries->size() < index_metadata.GetNumberOfEntries()) {
+    uint64 hash_key;
     EntryMetadata entry_metadata;
-    if (!entry_metadata.Deserialize(&pickle_it)) {
+    if (!pickle_it.ReadUInt64(&hash_key) ||
+        !entry_metadata.Deserialize(&pickle_it)) {
       LOG(WARNING) << "Invalid EntryMetadata in Simple Index file.";
       return scoped_ptr<SimpleIndex::EntrySet>(NULL);
     }
-    SimpleIndex::InsertInEntrySet(entry_metadata, index_file_entries.get());
+    SimpleIndex::InsertInEntrySet(
+        hash_key, entry_metadata, index_file_entries.get());
   }
 
   return index_file_entries.Pass();
 }
 
 // static
 scoped_ptr<Pickle> SimpleIndexFile::Serialize(
     const SimpleIndexFile::IndexMetadata& index_metadata,
     const SimpleIndex::EntrySet& entries) {
   scoped_ptr<Pickle> pickle(new Pickle(sizeof(SimpleIndexFile::PickleHeader)));
 
   index_metadata.Serialize(pickle.get());
   for (SimpleIndex::EntrySet::const_iterator it = entries.begin();
        it != entries.end(); ++it) {
+    pickle->WriteUInt64(it->first);
     it->second.Serialize(pickle.get());
   }
   SimpleIndexFile::PickleHeader* header_p =
       pickle->headerT<SimpleIndexFile::PickleHeader>();
   header_p->crc = CalculatePickleCRC(*pickle);
   return pickle.Pass();
 }
 
 // static
 void SimpleIndexFile::WriteToDisk(const base::FilePath& index_filename,
@@ skipping 11 matching lines @@
                << temp_filename.value();
     file_util::Delete(temp_filename, /* recursive = */ false);
     return;
   }
   // Swap temp and index_file.
   bool result = file_util::ReplaceFile(temp_filename, index_filename);
   DCHECK(result);
 }
 
 }  // namespace disk_cache