SimpleCache: merge the first and second stream in one file

net/disk_cache/simple/simple_util.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_util.h"
 
 #include <limits>
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
@@ skipping 59 matching lines @@
 uint64 GetEntryHashKey(const std::string& key) {
   union {
     unsigned char sha_hash[base::kSHA1Length];
     uint64 key_hash;
   } u;
   base::SHA1HashBytes(reinterpret_cast<const unsigned char*>(key.data()),
                       key.size(), u.sha_hash);
   return u.key_hash;
 }
 
-std::string GetFilenameFromEntryHashAndIndex(uint64 entry_hash,
-                                             int index) {
-  return base::StringPrintf("%016" PRIx64 "_%1d", entry_hash, index);
+std::string GetFilenameFromEntryHashAndFileIndex(uint64 entry_hash,
+                                                 int file_index) {
+  return base::StringPrintf("%016" PRIx64 "_%1d", entry_hash, file_index);
 }
 
-std::string GetFilenameFromKeyAndIndex(const std::string& key, int index) {
-  return GetEntryHashKeyAsHexString(key) + base::StringPrintf("_%1d", index);
+std::string GetFilenameFromKeyAndFileIndex(const std::string& key,
+                                           int file_index) {
+  return GetEntryHashKeyAsHexString(key) +
+         base::StringPrintf("_%1d", file_index);
 }
 
 int32 GetDataSizeFromKeyAndFileSize(const std::string& key, int64 file_size) {
   int64 data_size = file_size - key.size() - sizeof(SimpleFileHeader) -
                     sizeof(SimpleFileEOF);
   DCHECK_GE(implicit_cast<int64>(std::numeric_limits<int32>::max()), data_size);
   return data_size;
 }
 
 int64 GetFileSizeFromKeyAndDataSize(const std::string& key, int32 data_size) {
   return data_size + key.size() + sizeof(SimpleFileHeader) +
       sizeof(SimpleFileEOF);
 }
 
-int64 GetFileOffsetFromKeyAndDataOffset(const std::string& key,
-                                        int data_offset) {
-  const int64 headers_size = sizeof(disk_cache::SimpleFileHeader) + key.size();
-  return headers_size + data_offset;
+int GetFileIndexFromStreamIndex(int stream_index) {
+  return (stream_index == 2) ? 1 : 0;
 }
 
 // TODO(clamy, gavinp): this should go in base
 bool GetMTime(const base::FilePath& path, base::Time* out_mtime) {
   DCHECK(out_mtime);
 #if defined(OS_POSIX)
   base::ThreadRestrictions::AssertIOAllowed();
   struct stat file_stat;
   if (stat(path.value().c_str(), &file_stat) != 0)
     return false;
   time_t sec;
   long nsec;
   if (GetNanoSecsFromStat(file_stat, &sec, &nsec)) {
     int64 usec = (nsec / base::Time::kNanosecondsPerMicrosecond);
     *out_mtime = base::Time::FromTimeT(sec)
         + base::TimeDelta::FromMicroseconds(usec);
     return true;
   }
 #endif
   base::PlatformFileInfo file_info;
   if (!file_util::GetFileInfo(path, &file_info))
     return false;
   *out_mtime = file_info.last_modified;
   return true;
 }
 
 }  // namespace simple_backend
 
 }  // namespace disk_cache