SimpleCache: merge the first and second stream in one file

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 <vector>
 
 #include "base/file_util.h"
 #include "base/files/memory_mapped_file.h"
@@ skipping 99 matching lines @@
     last_used_time = file_info.last_modified;
 
   int64 file_size = file_info.size;
   SimpleIndex::EntrySet::iterator it = entries->find(hash_key);
   if (it == entries->end()) {
     SimpleIndex::InsertInEntrySet(
         hash_key,
         EntryMetadata(last_used_time, file_size),
         entries);
   } else {
     // Summing up the total size of the entry through all the *_[0-2] files

[pasko, 2013/09/17 14:17:36]

this comment needs to be updated, there is no longer [0-2] 

[clamy, 2013/09/18 16:17:14]

Done.

     it->second.SetEntrySize(it->second.GetEntrySize() + file_size);
   }
 }
 
 }  // namespace
 
 SimpleIndexLoadResult::SimpleIndexLoadResult() : did_load(false),
                                                  flush_required(false) {
 }
 
@@ skipping 274 matching lines @@
 void SimpleIndexFile::SyncRestoreFromDisk(
     const base::FilePath& cache_directory,
     const base::FilePath& index_file_path,
     SimpleIndexLoadResult* out_result) {
   LOG(INFO) << "Simple Cache Index is being restored from disk.";
   base::DeleteFile(index_file_path, /* recursive = */ false);
   out_result->Reset();
   SimpleIndex::EntrySet* entries = &out_result->entries;
 
   // TODO(felipeg,gavinp): Fix this once we have a one-file per entry format.
-  COMPILE_ASSERT(kSimpleEntryFileCount == 3,
+  COMPILE_ASSERT(kSimpleEntryFileCount == 2,

[pasko, 2013/09/17 14:17:36]

Please remove the assertion and the TODO. The assertion does not make sense
(there is no "format" for file entries any more, we just go through all files
that start with something looking like a key, with a length of filename equal to
exact number). The TODO will never get done, obviously. Also I like how the word
"Fix" is entertaining in the context.

[clamy, 2013/09/18 16:17:14]

Done.

                  file_pattern_must_match_file_count);
 
   const bool did_succeed = TraverseCacheDirectory(
       cache_directory, base::Bind(&ProcessEntryFile, entries));
   if (!did_succeed) {
     LOG(ERROR) << "Could not reconstruct index from disk";
     return;
   }
   out_result->did_load = true;
   // When we restore from disk we write the merged index file to disk right
   // away, this might save us from having to restore again next time.
   out_result->flush_required = true;
 }
 
 // static
 bool SimpleIndexFile::IsIndexFileStale(base::Time cache_last_modified,
                                        const base::FilePath& index_file_path) {
   base::Time index_mtime;
   if (!simple_util::GetMTime(index_file_path, &index_mtime))
     return true;
   return index_mtime < cache_last_modified;
 }
 
 }  // namespace disk_cache