predictors: Refactor resource_prefetch_predictor_tables.

chrome/browser/predictors/resource_prefetch_predictor_tables.cc

Index: chrome/browser/predictors/resource_prefetch_predictor_tables.cc
diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables.cc b/chrome/browser/predictors/resource_prefetch_predictor_tables.cc
index a300d5b0f2921d6dd316954579df3e6fdf583691..8c1416cfb48caf6ab34b575ffa8e308b394fb960 100644
--- a/chrome/browser/predictors/resource_prefetch_predictor_tables.cc
+++ b/chrome/browser/predictors/resource_prefetch_predictor_tables.cc
@@ -23,7 +23,7 @@ using sql::Statement;
 
 namespace {
 
-using ResourceData = predictors::ResourceData;
+using PrefetchData = predictors::PrefetchData;
 using RedirectData = predictors::RedirectData;
 
 const char kMetadataTableName[] = "resource_prefetch_predictor_metadata";
@@ -43,13 +43,7 @@ const char kCreateGlobalMetadataStatementTemplate[] =
 const char kCreateResourceTableStatementTemplate[] =

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

Can you remove the duplication here?

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

Done.

     "CREATE TABLE %s ( "
     "main_page_url TEXT, "
-    "resource_url TEXT, "
     "proto BLOB, "
-    "PRIMARY KEY(main_page_url, resource_url))";
-const char kCreateMetadataTableStatementTemplate[] =
-    "CREATE TABLE %s ( "
-    "main_page_url TEXT, "
-    "last_visit_time INTEGER, "
     "PRIMARY KEY(main_page_url))";
 const char kCreateRedirectTableStatementTemplate[] =
     "CREATE TABLE %s ( "
@@ -58,24 +52,20 @@ const char kCreateRedirectTableStatementTemplate[] =
     "PRIMARY KEY(main_page_url))";
 
 const char kInsertResourceTableStatementTemplate[] =
-    "INSERT INTO %s (main_page_url, resource_url, proto) VALUES (?,?,?)";
+    "INSERT INTO %s (main_page_url, proto) VALUES (?,?)";
 const char kInsertRedirectTableStatementTemplate[] =
     "INSERT INTO %s (main_page_url, proto) VALUES (?,?)";
-const char kInsertMetadataTableStatementTemplate[] =
-    "INSERT INTO %s (main_page_url, last_visit_time) VALUES (?,?)";
 const char kDeleteStatementTemplate[] = "DELETE FROM %s WHERE main_page_url=?";
 
-void BindResourceDataToStatement(const ResourceData& data,
-                                 const std::string& primary_key,
+void BindPrefetchDataToStatement(const PrefetchData& data,
                                  Statement* statement) {
   int size = data.ByteSize();
   DCHECK_GT(size, 0);
   std::vector<char> proto_buffer(size);
   data.SerializeToArray(&proto_buffer[0], size);
 
-  statement->BindString(0, primary_key);
-  statement->BindString(1, data.resource_url());
-  statement->BindBlob(2, &proto_buffer[0], size);
+  statement->BindString(0, data.primary_key());
+  statement->BindBlob(1, &proto_buffer[0], size);
 }
 
 void BindRedirectDataToStatement(const RedirectData& data,

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

This function is now identical to the one above. Can you remove the duplication?

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

Done.

@@ -89,20 +79,20 @@ void BindRedirectDataToStatement(const RedirectData& data,
   statement->BindBlob(1, &proto_buffer[0], size);
 }
 
-bool StepAndInitializeResourceData(Statement* statement,
-                                   ResourceData* data,
+bool StepAndInitializePrefetchData(Statement* statement,
+                                   PrefetchData* data,
                                    std::string* primary_key) {
   if (!statement->Step())
     return false;
 
   *primary_key = statement->ColumnString(0);
-  int size = statement->ColumnByteLength(2);
-  const void* blob = statement->ColumnBlob(2);
+
+  int size = statement->ColumnByteLength(1);
+  const void* blob = statement->ColumnBlob(1);
   DCHECK(blob);
   data->ParseFromArray(blob, size);
 
-  std::string resource_url = statement->ColumnString(1);
-  DCHECK(resource_url == data->resource_url());
+  DCHECK_EQ(data->primary_key(), *primary_key);
 
   return true;
 }
@@ -147,24 +137,6 @@ void ResourcePrefetchPredictorTables::SortRedirects(
             });
 }
 
-ResourcePrefetchPredictorTables::PrefetchData::PrefetchData(
-    PrefetchKeyType i_key_type,
-    const std::string& i_primary_key)
-    : key_type(i_key_type),
-      primary_key(i_primary_key) {
-}
-
-ResourcePrefetchPredictorTables::PrefetchData::PrefetchData(
-    const PrefetchData& other)
-    : key_type(other.key_type),
-      primary_key(other.primary_key),
-      last_visit(other.last_visit),
-      resources(other.resources) {
-}
-
-ResourcePrefetchPredictorTables::PrefetchData::~PrefetchData() {
-}
-
 void ResourcePrefetchPredictorTables::GetAllData(
     PrefetchDataMap* url_data_map,
     PrefetchDataMap* host_data_map,
@@ -183,16 +155,10 @@ void ResourcePrefetchPredictorTables::GetAllData(
   url_redirect_data_map->clear();
   host_redirect_data_map->clear();
 
-  std::vector<std::string> urls_to_delete, hosts_to_delete;
-  GetAllResourceDataHelper(PREFETCH_KEY_TYPE_URL, url_data_map,
-                           &urls_to_delete);
-  GetAllResourceDataHelper(PREFETCH_KEY_TYPE_HOST, host_data_map,
-                           &hosts_to_delete);
+  GetAllResourceDataHelper(PREFETCH_KEY_TYPE_URL, url_data_map);
+  GetAllResourceDataHelper(PREFETCH_KEY_TYPE_HOST, host_data_map);
   GetAllRedirectDataHelper(PREFETCH_KEY_TYPE_URL, url_redirect_data_map);
   GetAllRedirectDataHelper(PREFETCH_KEY_TYPE_HOST, host_redirect_data_map);
-
-  if (!urls_to_delete.empty() || !hosts_to_delete.empty())
-    DeleteResourceData(urls_to_delete, hosts_to_delete);
 }
 
 void ResourcePrefetchPredictorTables::UpdateData(
@@ -204,17 +170,16 @@ void ResourcePrefetchPredictorTables::UpdateData(
   if (CantAccessDatabase())
     return;
 
-  DCHECK(!url_data.is_host() && host_data.is_host());
-  DCHECK(!url_data.primary_key.empty() || !host_data.primary_key.empty() ||
+  DCHECK(url_data.has_primary_key() || host_data.has_primary_key() ||
          url_redirect_data.has_primary_key() ||
          host_redirect_data.has_primary_key());
 
   DB()->BeginTransaction();
 
   bool success =
-      (url_data.primary_key.empty() ||
+      (!url_data.has_primary_key() ||
        UpdateResourceDataHelper(PREFETCH_KEY_TYPE_URL, url_data)) &&
-      (host_data.primary_key.empty() ||
+      (!host_data.has_primary_key() ||
        UpdateResourceDataHelper(PREFETCH_KEY_TYPE_HOST, host_data)) &&
       (!url_redirect_data.has_primary_key() ||
        UpdateRedirectDataHelper(PREFETCH_KEY_TYPE_URL, url_redirect_data)) &&
@@ -282,8 +247,7 @@ void ResourcePrefetchPredictorTables::DeleteAllData() {
 
   Statement deleter;
   for (const char* table_name :
-       {kUrlResourceTableName, kUrlMetadataTableName, kUrlRedirectTableName,
-        kHostResourceTableName, kHostMetadataTableName,
+       {kUrlResourceTableName, kUrlRedirectTableName, kHostResourceTableName,
         kHostRedirectTableName}) {
     deleter.Assign(DB()->GetUniqueStatement(
         base::StringPrintf("DELETE FROM %s", table_name).c_str()));
@@ -292,16 +256,13 @@ void ResourcePrefetchPredictorTables::DeleteAllData() {
 }
 
 ResourcePrefetchPredictorTables::ResourcePrefetchPredictorTables()
-    : PredictorTableBase() {
-}
+    : PredictorTableBase() {}
 
-ResourcePrefetchPredictorTables::~ResourcePrefetchPredictorTables() {
-}
+ResourcePrefetchPredictorTables::~ResourcePrefetchPredictorTables() {}
 
 void ResourcePrefetchPredictorTables::GetAllResourceDataHelper(
     PrefetchKeyType key_type,
-    PrefetchDataMap* data_map,
-    std::vector<std::string>* to_delete) {
+    PrefetchDataMap* data_map) {
   bool is_host = key_type == PREFETCH_KEY_TYPE_HOST;
 
   // Read the resources table and organize it per primary key.
@@ -310,39 +271,19 @@ void ResourcePrefetchPredictorTables::GetAllResourceDataHelper(
   Statement resource_reader(DB()->GetUniqueStatement(
       base::StringPrintf("SELECT * FROM %s", resource_table_name).c_str()));
 
-  ResourceData resource;
+  PrefetchData data;
   std::string primary_key;
-  while (StepAndInitializeResourceData(&resource_reader, &resource,
-                                       &primary_key)) {
-    PrefetchDataMap::iterator it = data_map->find(primary_key);
-    if (it == data_map->end()) {
-      it = data_map->insert(std::make_pair(
-          primary_key, PrefetchData(key_type, primary_key))).first;
-    }
-    it->second.resources.push_back(resource);
-  }
-
-  // Sort each of the resource row vectors by score.
-  for (auto& kv : *data_map)
-    SortResources(&(kv.second.resources));
-
-  // Read the metadata and keep track of entries that have metadata, but no
-  // resource entries, so they can be deleted.
-  const char* metadata_table_name =
-      is_host ? kHostMetadataTableName : kUrlMetadataTableName;
-  Statement metadata_reader(DB()->GetUniqueStatement(
-      base::StringPrintf("SELECT * FROM %s", metadata_table_name).c_str()));
-
-  while (metadata_reader.Step()) {
-    std::string primary_key = metadata_reader.ColumnString(0);
-
-    PrefetchDataMap::iterator it = data_map->find(primary_key);
-    if (it != data_map->end()) {
-      int64_t last_visit = metadata_reader.ColumnInt64(1);
-      it->second.last_visit = base::Time::FromInternalValue(last_visit);
-    } else {
-      to_delete->push_back(primary_key);
-    }
+  while (StepAndInitializePrefetchData(&resource_reader, &data, &primary_key))
+    data_map->insert(std::make_pair(primary_key, data));
+
+  // Sort each of the resource vectors by score.
+  for (auto& kv : *data_map) {
+    std::vector<ResourceData> resources(kv.second.resources().begin(),

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

Is it possible to sort directly the .mutable_resources()?

std::sort(kv.second.mutable_resources().begin(),
kv.second.mutable_resources().end())

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

Done.

+                                        kv.second.resources().end());
+    SortResources(&resources);
+    kv.second.clear_resources();
+    for (const ResourceData& resource : resources)
+      kv.second.add_resources()->CopyFrom(resource);
   }
 }
 
@@ -367,41 +308,25 @@ void ResourcePrefetchPredictorTables::GetAllRedirectDataHelper(
 bool ResourcePrefetchPredictorTables::UpdateResourceDataHelper(
     PrefetchKeyType key_type,
     const PrefetchData& data) {
-  DCHECK(!data.primary_key.empty());
+  DCHECK(data.has_primary_key());
 
   if (!StringsAreSmallerThanDBLimit(data)) {
     UMA_HISTOGRAM_BOOLEAN("ResourcePrefetchPredictor.DbStringTooLong", true);
     return false;
   }
 
-  // Delete the older data from both the tables.
+  // Delete the older data from the table.
   std::unique_ptr<Statement> deleter(GetTableUpdateStatement(
       key_type, PrefetchDataType::RESOURCE, TableOperationType::REMOVE));
-  deleter->BindString(0, data.primary_key);
-  if (!deleter->Run())
-    return false;
-
-  deleter = GetTableUpdateStatement(key_type, PrefetchDataType::METADATA,
-                                    TableOperationType::REMOVE);
-  deleter->BindString(0, data.primary_key);
+  deleter->BindString(0, data.primary_key());
   if (!deleter->Run())
     return false;
 
-  // Add the new data to the tables.
-  for (const ResourceData& resource : data.resources) {
-    std::unique_ptr<Statement> resource_inserter(GetTableUpdateStatement(
-        key_type, PrefetchDataType::RESOURCE, TableOperationType::INSERT));
-    BindResourceDataToStatement(resource, data.primary_key,
-                                resource_inserter.get());
-    if (!resource_inserter->Run())
-      return false;
-  }
-
-  std::unique_ptr<Statement> metadata_inserter(GetTableUpdateStatement(
-      key_type, PrefetchDataType::METADATA, TableOperationType::INSERT));
-  metadata_inserter->BindString(0, data.primary_key);
-  metadata_inserter->BindInt64(1, data.last_visit.ToInternalValue());
-  return metadata_inserter->Run();
+  // Add the new data to the table.
+  std::unique_ptr<Statement> inserter(GetTableUpdateStatement(
+      key_type, PrefetchDataType::RESOURCE, TableOperationType::INSERT));
+  BindPrefetchDataToStatement(data, inserter.get());
+  return inserter->Run();
 }
 
 bool ResourcePrefetchPredictorTables::UpdateRedirectDataHelper(
@@ -432,31 +357,21 @@ void ResourcePrefetchPredictorTables::DeleteDataHelper(
     PrefetchKeyType key_type,
     PrefetchDataType data_type,
     const std::vector<std::string>& keys) {
-  bool is_resource = data_type == PrefetchDataType::RESOURCE;
-
   for (const std::string& key : keys) {
     std::unique_ptr<Statement> deleter(GetTableUpdateStatement(
         key_type, data_type, TableOperationType::REMOVE));
     deleter->BindString(0, key);
     deleter->Run();
-
-    if (is_resource) {
-      // Delete corresponding resource metadata as well.
-      deleter = GetTableUpdateStatement(key_type, PrefetchDataType::METADATA,
-                                        TableOperationType::REMOVE);
-      deleter->BindString(0, key);
-      deleter->Run();
-    }
   }
 }
 
 // static
 bool ResourcePrefetchPredictorTables::StringsAreSmallerThanDBLimit(
     const PrefetchData& data) {
-  if (data.primary_key.length() > kMaxStringLength)
+  if (data.primary_key().length() > kMaxStringLength)
     return false;
 
-  for (const ResourceData& resource : data.resources) {
+  for (const ResourceData& resource : data.resources()) {
     if (resource.resource_url().length() > kMaxStringLength)
       return false;
   }
@@ -577,10 +492,6 @@ void ResourcePrefetchPredictorTables::CreateTableIfNonExistent() {
        db->Execute(base::StringPrintf(kCreateResourceTableStatementTemplate,
                                       kUrlResourceTableName)
                        .c_str())) &&
-      (db->DoesTableExist(kUrlMetadataTableName) ||
-       db->Execute(base::StringPrintf(kCreateMetadataTableStatementTemplate,
-                                      kUrlMetadataTableName)
-                       .c_str())) &&
       (db->DoesTableExist(kUrlRedirectTableName) ||
        db->Execute(base::StringPrintf(kCreateRedirectTableStatementTemplate,
                                       kUrlRedirectTableName)
@@ -589,10 +500,6 @@ void ResourcePrefetchPredictorTables::CreateTableIfNonExistent() {
        db->Execute(base::StringPrintf(kCreateResourceTableStatementTemplate,
                                       kHostResourceTableName)
                        .c_str())) &&
-      (db->DoesTableExist(kHostMetadataTableName) ||
-       db->Execute(base::StringPrintf(kCreateMetadataTableStatementTemplate,
-                                      kHostMetadataTableName)
-                       .c_str())) &&
       (db->DoesTableExist(kHostRedirectTableName) ||
        db->Execute(base::StringPrintf(kCreateRedirectTableStatementTemplate,
                                       kHostRedirectTableName)
@@ -632,8 +539,13 @@ ResourcePrefetchPredictorTables::GetTableUpdateStatement(
     PrefetchKeyType key_type,
     PrefetchDataType data_type,
     TableOperationType op_type) {
+  DCHECK(key_type == PREFETCH_KEY_TYPE_URL ||
+         key_type == PREFETCH_KEY_TYPE_HOST);
+  DCHECK(data_type == PrefetchDataType::RESOURCE ||
+         data_type == PrefetchDataType::REDIRECT);
+
   sql::StatementID id(__FILE__, key_type | (static_cast<int>(data_type) << 1) |
-                                    (static_cast<int>(op_type) << 3));
+                                    (static_cast<int>(op_type) << 2));
   const char* statement_template =
       GetTableUpdateStatementTemplate(op_type, data_type);
   const char* table_name =
@@ -650,14 +562,9 @@ const char* ResourcePrefetchPredictorTables::GetTableUpdateStatementTemplate(
     case TableOperationType::REMOVE:
       return kDeleteStatementTemplate;
     case TableOperationType::INSERT:
-      switch (data_type) {
-        case PrefetchDataType::RESOURCE:
-          return kInsertResourceTableStatementTemplate;
-        case PrefetchDataType::REDIRECT:
-          return kInsertRedirectTableStatementTemplate;
-        case PrefetchDataType::METADATA:
-          return kInsertMetadataTableStatementTemplate;
-      }
+      bool is_resource = data_type == PrefetchDataType::RESOURCE;
+      return is_resource ? kInsertResourceTableStatementTemplate
+                         : kInsertRedirectTableStatementTemplate;
   }
 
   NOTREACHED();
@@ -676,8 +583,6 @@ const char* ResourcePrefetchPredictorTables::GetTableUpdateStatementTableName(
       return is_host ? kHostResourceTableName : kUrlResourceTableName;
     case PrefetchDataType::REDIRECT:
       return is_host ? kHostRedirectTableName : kUrlRedirectTableName;
-    case PrefetchDataType::METADATA:
-      return is_host ? kHostMetadataTableName : kUrlMetadataTableName;
   }
 
   NOTREACHED();