predictors: Refactor resource_prefetch_predictor_tables.

chrome/browser/predictors/resource_prefetch_predictor_tables.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TABLES_H_
 #define CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TABLES_H_
 
 #include <stddef.h>
 
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/time/time.h"
 #include "chrome/browser/predictors/predictor_table_base.h"
 #include "chrome/browser/predictors/resource_prefetch_common.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor.pb.h"
 #include "content/public/common/resource_type.h"
 #include "net/base/request_priority.h"
 #include "url/gurl.h"
 
 namespace sql {
 class Statement;
 }
 
 namespace predictors {
 
 // From resource_prefetch_predictor.proto.
+using ResourceData = PrefetchData_ResourceData;
 using RedirectStat = RedirectData_RedirectStat;
 
 // Interface for database tables used by the ResourcePrefetchPredictor.
 // All methods except the constructor and destructor need to be called on the DB
 // thread.
 //
 // Currently manages:
 //  - UrlResourceTable - resources per Urls.
-//  - UrlMetadataTable - misc data for Urls (like last visit time).
 //  - UrlRedirectTable - redirects per Urls.
 //  - HostResourceTable - resources per host.
-//  - HostMetadataTable - misc data for hosts.
 //  - HostRedirectTable - redirects per host.
 class ResourcePrefetchPredictorTables : public PredictorTableBase {
  public:
-  // Aggregated data for a Url or Host. Although the data differs slightly, we
-  // store them in the same structure, because most of the fields are common and
-  // it allows us to use the same functions.
-  struct PrefetchData {
-    PrefetchData(PrefetchKeyType key_type, const std::string& primary_key);
-    PrefetchData(const PrefetchData& other);
-    ~PrefetchData();
-
-    bool is_host() const { return key_type == PREFETCH_KEY_TYPE_HOST; }
-
-    // Is the data a host as opposed to a Url?
-    PrefetchKeyType key_type;  // Not const to be able to assign.
-    std::string primary_key;   // is_host() ? host : main frame url.
-
-    base::Time last_visit;
-    std::vector<ResourceData> resources;
-  };
   // Map from primary key to PrefetchData for the key.
   typedef std::map<std::string, PrefetchData> PrefetchDataMap;
 
   // Map from primary key to RedirectData for the key.
   typedef std::map<std::string, RedirectData> RedirectDataMap;
 
   // Returns data for all Urls and Hosts.
   virtual void GetAllData(PrefetchDataMap* url_data_map,
                           PrefetchDataMap* host_data_map,
                           RedirectDataMap* url_redirect_data_map,
@@ skipping 33 matching lines @@
   static void SortResources(std::vector<ResourceData>* resources);
 
   // Sorts the redirects by score, decreasing.
   static void SortRedirects(std::vector<RedirectStat>* redirects);
 
   // The maximum length of the string that can be stored in the DB.
   static constexpr size_t kMaxStringLength = 1024;
 
  private:
   // Represents the type of information that is stored in prefetch database.
-  enum class PrefetchDataType { RESOURCE, REDIRECT, METADATA };
+  enum class PrefetchDataType { RESOURCE, REDIRECT };
 
   enum class TableOperationType { INSERT, REMOVE };
 
   friend class PredictorDatabaseInternal;
   friend class MockResourcePrefetchPredictorTables;
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTablesTest,
                            DatabaseVersionIsSet);
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTablesTest,
                            DatabaseIsResetWhenIncompatible);
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTablesTest,
                            ComputeResourceScore);
 
   ResourcePrefetchPredictorTables();
   ~ResourcePrefetchPredictorTables() override;
 
   // Helper functions below help perform functions on the Url and host table
   // using the same code.
   void GetAllResourceDataHelper(PrefetchKeyType key_type,
-                                PrefetchDataMap* data_map,
-                                std::vector<std::string>* to_delete);
+                                PrefetchDataMap* data_map);
   void GetAllRedirectDataHelper(PrefetchKeyType key_type,
                                 RedirectDataMap* redirect_map);
   bool UpdateResourceDataHelper(PrefetchKeyType key_type,
                                 const PrefetchData& data);
   bool UpdateRedirectDataHelper(PrefetchKeyType key_type,
                                 const RedirectData& data);
   void DeleteDataHelper(PrefetchKeyType key_type,
                         PrefetchDataType data_type,
                         const std::vector<std::string>& keys);
 
   // Returns true if the strings in the |data| are less than |kMaxStringLength|
   // in length.
   static bool StringsAreSmallerThanDBLimit(const PrefetchData& data);
   static bool StringsAreSmallerThanDBLimit(const RedirectData& data);
 
   // Computes score of |data|.
   static float ComputeResourceScore(const ResourceData& data);
   static float ComputeRedirectScore(const RedirectStat& data);
 
   // PredictorTableBase methods.
   void CreateTableIfNonExistent() override;
   void LogDatabaseStats() override;
 
   // Database version. Always increment it when any change is made to the data
   // schema (including the .proto).
   static constexpr int kDatabaseVersion = 3;

[Benoit L, 2016/10/04 08:22:42]

This needs to change.

[alexilin, 2016/10/04 09:43:48]

Done.

 
   static bool DropTablesIfOutdated(sql::Connection* db);
   static int GetDatabaseVersion(sql::Connection* db);
   static bool SetDatabaseVersion(sql::Connection* db, int version);
 
   // Helper to return Statements for cached Statements.
   std::unique_ptr<sql::Statement> GetTableUpdateStatement(
       PrefetchKeyType key_type,
       PrefetchDataType data_type,
       TableOperationType op_type);
 
   static const char* GetTableUpdateStatementTemplate(
       TableOperationType op_type,
       PrefetchDataType data_type);
   static const char* GetTableUpdateStatementTableName(
       PrefetchKeyType key_type,
       PrefetchDataType data_type);
 
   DISALLOW_COPY_AND_ASSIGN(ResourcePrefetchPredictorTables);
 };
 
 }  // namespace predictors
 
 #endif  // CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TABLES_H_