predictors: Add the request priority to the reource_prefetch_predictor DB.

chrome/browser/predictors/resource_prefetch_predictor_tables.cc

 // 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.
 
 #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 20 matching lines @@
     const predictors::ResourcePrefetchPredictorTables::ResourceRow& row,
     const std::string& primary_key,
     Statement* statement) {
   statement->BindString(0, primary_key);
   statement->BindString(1, row.resource_url.spec());
   statement->BindInt(2, static_cast<int>(row.resource_type));
   statement->BindInt(3, row.number_of_hits);
   statement->BindInt(4, row.number_of_misses);
   statement->BindInt(5, row.consecutive_misses);
   statement->BindDouble(6, row.average_position);
+  statement->BindInt(7, static_cast<int>(row.priority));
 }
 
 bool StepAndInitializeResourceRow(
     Statement* statement,
     predictors::ResourcePrefetchPredictorTables::ResourceRow* row) {
   if (!statement->Step())
     return false;
 
   row->primary_key = statement->ColumnString(0);
   row->resource_url = GURL(statement->ColumnString(1));
   row->resource_type = static_cast<content::ResourceType>(
       statement->ColumnInt(2));
   row->number_of_hits = statement->ColumnInt(3);
   row->number_of_misses = statement->ColumnInt(4);
   row->consecutive_misses = statement->ColumnInt(5);
   row->average_position = statement->ColumnDouble(6);
+  row->priority = static_cast<net::RequestPriority>(statement->ColumnInt(7));
   return true;
 }
 
 }  // namespace
 
 namespace predictors {
 
 // static
 const size_t ResourcePrefetchPredictorTables::kMaxStringLength = 1024;
 
 ResourcePrefetchPredictorTables::ResourceRow::ResourceRow()
     : resource_type(content::RESOURCE_TYPE_LAST_TYPE),
       number_of_hits(0),
       number_of_misses(0),
       consecutive_misses(0),
       average_position(0.0),
-      score(0.0) {
-}
+      priority(net::IDLE),
+      score(0.0) {}
 
 ResourcePrefetchPredictorTables::ResourceRow::ResourceRow(
     const ResourceRow& other)
-        : primary_key(other.primary_key),
-          resource_url(other.resource_url),
-          resource_type(other.resource_type),
-          number_of_hits(other.number_of_hits),
-          number_of_misses(other.number_of_misses),
-          consecutive_misses(other.consecutive_misses),
-          average_position(other.average_position),
-          score(other.score) {
-}
+    : primary_key(other.primary_key),
+      resource_url(other.resource_url),
+      resource_type(other.resource_type),
+      number_of_hits(other.number_of_hits),
+      number_of_misses(other.number_of_misses),
+      consecutive_misses(other.consecutive_misses),
+      average_position(other.average_position),
+      priority(other.priority),
+      score(other.score) {}
 
 ResourcePrefetchPredictorTables::ResourceRow::ResourceRow(
     const std::string& i_primary_key,
     const std::string& i_resource_url,
     content::ResourceType i_resource_type,
     int i_number_of_hits,
     int i_number_of_misses,
     int i_consecutive_misses,
-    double i_average_position)
-        : primary_key(i_primary_key),
-          resource_url(i_resource_url),
-          resource_type(i_resource_type),
-          number_of_hits(i_number_of_hits),
-          number_of_misses(i_number_of_misses),
-          consecutive_misses(i_consecutive_misses),
-          average_position(i_average_position) {
+    double i_average_position,
+    net::RequestPriority i_priority)
+    : primary_key(i_primary_key),
+      resource_url(i_resource_url),
+      resource_type(i_resource_type),
+      number_of_hits(i_number_of_hits),
+      number_of_misses(i_number_of_misses),
+      consecutive_misses(i_consecutive_misses),
+      average_position(i_average_position),
+      priority(i_priority) {
   UpdateScore();
 }
 
 void ResourcePrefetchPredictorTables::ResourceRow::UpdateScore() {
   // The score is calculated so that when the rows are sorted, the stylesheets
   // and scripts appear first, sorted by position(ascending) and then the rest
   // of the resources sorted by position(ascending).
   static const int kMaxResourcesPerType = 100;
   switch (resource_type) {
     case content::RESOURCE_TYPE_STYLESHEET:
     case content::RESOURCE_TYPE_SCRIPT:
       score = (2 * kMaxResourcesPerType) - average_position;
       break;
 
     case content::RESOURCE_TYPE_IMAGE:
     default:
       score = kMaxResourcesPerType - average_position;
       break;
   }
+  // TODO(lizeb): Take priority into account.

[pasko, 2016/07/29 17:13:32]

is it obvious that this should be done? :)
I think a bug works better than a TODO, there are a few details we may want to
discuss about it

 }
 
 bool ResourcePrefetchPredictorTables::ResourceRow::operator==(
     const ResourceRow& rhs) const {
-  return primary_key == rhs.primary_key &&
-      resource_url == rhs.resource_url &&
-      resource_type == rhs.resource_type &&
-      number_of_hits == rhs.number_of_hits &&
-      number_of_misses == rhs.number_of_misses &&
-      consecutive_misses == rhs.consecutive_misses &&
-      average_position == rhs.average_position &&
-      score == rhs.score;
+  return primary_key == rhs.primary_key && resource_url == rhs.resource_url &&
+         resource_type == rhs.resource_type &&
+         number_of_hits == rhs.number_of_hits &&
+         number_of_misses == rhs.number_of_misses &&
+         consecutive_misses == rhs.consecutive_misses &&
+         average_position == rhs.average_position && priority == rhs.priority &&
+         score == rhs.score;
 }
 
 bool ResourcePrefetchPredictorTables::ResourceRowSorter::operator()(
     const ResourceRow& x, const ResourceRow& y) const {
   return x.score > y.score;
 }
 
 ResourcePrefetchPredictorTables::PrefetchData::PrefetchData(
     PrefetchKeyType i_key_type,
     const std::string& i_primary_key)
@@ skipping 235 matching lines @@
     return false;
 
   for (ResourceRows::const_iterator it = data.resources.begin();
        it != data.resources.end(); ++it) {
     if (it->resource_url.spec().length() > kMaxStringLength)
       return false;
   }
   return true;
 }
 
+bool ResourcePrefetchPredictorTables::DropTablesIfOutdated(
+    sql::Connection* db) {
+  bool success = true;
+  for (const char* table_name :
+       {kUrlResourceTableName, kHostResourceTableName}) {
+    if (db->DoesTableExist(table_name) &&
+        !db->DoesColumnExist(table_name, "priority")) {
+      success &=
+          db->Execute(base::StringPrintf("DROP TABLE %s", table_name).c_str());
+    }
+  }
+  return success;
+}
+
 void ResourcePrefetchPredictorTables::CreateTableIfNonExistent() {
   DCHECK_CURRENTLY_ON(BrowserThread::DB);
   if (CantAccessDatabase())
     return;
 
   const char resource_table_creator[] =
       "CREATE TABLE %s ( "
       "main_page_url TEXT, "
       "resource_url TEXT, "
       "resource_type INTEGER, "
       "number_of_hits INTEGER, "
       "number_of_misses INTEGER, "
       "consecutive_misses INTEGER, "
       "average_position DOUBLE, "
+      "priority INTEGER, "
       "PRIMARY KEY(main_page_url, resource_url))";
   const char* metadata_table_creator =
       "CREATE TABLE %s ( "
       "main_page_url TEXT, "
       "last_visit_time INTEGER, "
       "PRIMARY KEY(main_page_url))";
 
   sql::Connection* db = DB();
-  bool success =
-      (db->DoesTableExist(kUrlResourceTableName) ||
-       db->Execute(base::StringPrintf(resource_table_creator,
-                                      kUrlResourceTableName).c_str())) &&
-      (db->DoesTableExist(kUrlMetadataTableName) ||
-       db->Execute(base::StringPrintf(metadata_table_creator,
-                                      kUrlMetadataTableName).c_str())) &&
-      (db->DoesTableExist(kHostResourceTableName) ||
-       db->Execute(base::StringPrintf(resource_table_creator,
-                                      kHostResourceTableName).c_str())) &&
-      (db->DoesTableExist(kHostMetadataTableName) ||
-       db->Execute(base::StringPrintf(metadata_table_creator,
-                                      kHostMetadataTableName).c_str()));
+  bool success = DropTablesIfOutdated(db) &&
+                 (db->DoesTableExist(kUrlResourceTableName) ||
+                  db->Execute(base::StringPrintf(resource_table_creator,
+                                                 kUrlResourceTableName)
+                                  .c_str())) &&
+                 (db->DoesTableExist(kUrlMetadataTableName) ||
+                  db->Execute(base::StringPrintf(metadata_table_creator,
+                                                 kUrlMetadataTableName)
+                                  .c_str())) &&
+                 (db->DoesTableExist(kHostResourceTableName) ||
+                  db->Execute(base::StringPrintf(resource_table_creator,
+                                                 kHostResourceTableName)
+                                  .c_str())) &&
+                 (db->DoesTableExist(kHostMetadataTableName) ||
+                  db->Execute(base::StringPrintf(metadata_table_creator,
+                                                 kHostMetadataTableName)
+                                  .c_str()));
 
   if (!success)
     ResetDB();
 }
 
 void ResourcePrefetchPredictorTables::LogDatabaseStats()  {
   DCHECK_CURRENTLY_ON(BrowserThread::DB);
   if (CantAccessDatabase())
     return;
 
@@ skipping 20 matching lines @@
                          kUrlResourceTableName).c_str()));
 }
 
 Statement*
     ResourcePrefetchPredictorTables::GetUrlResourceUpdateStatement() {
   return new Statement(DB()->GetCachedStatement(
       SQL_FROM_HERE,
       base::StringPrintf(
           "INSERT INTO %s "
           "(main_page_url, resource_url, resource_type, number_of_hits, "
-          "number_of_misses, consecutive_misses, average_position) "
-          "VALUES (?,?,?,?,?,?,?)", kUrlResourceTableName).c_str()));
+          "number_of_misses, consecutive_misses, average_position, priority) "
+          "VALUES (?,?,?,?,?,?,?,?)",
+          kUrlResourceTableName)
+          .c_str()));
 }
 
 Statement*
     ResourcePrefetchPredictorTables::GetUrlMetadataDeleteStatement() {
   return new Statement(DB()->GetCachedStatement(
       SQL_FROM_HERE,
       base::StringPrintf("DELETE FROM %s WHERE main_page_url=?",
                          kUrlMetadataTableName).c_str()));
 }
 
@@ skipping 14 matching lines @@
                          kHostResourceTableName).c_str()));
 }
 
 Statement*
     ResourcePrefetchPredictorTables::GetHostResourceUpdateStatement() {
   return new Statement(DB()->GetCachedStatement(
       SQL_FROM_HERE,
       base::StringPrintf(
           "INSERT INTO %s "
           "(main_page_url, resource_url, resource_type, number_of_hits, "
-          "number_of_misses, consecutive_misses, average_position) "
-          "VALUES (?,?,?,?,?,?,?)", kHostResourceTableName).c_str()));
+          "number_of_misses, consecutive_misses, average_position, priority) "
+          "VALUES (?,?,?,?,?,?,?,?)",
+          kHostResourceTableName)
+          .c_str()));
 }
 
 Statement*
     ResourcePrefetchPredictorTables::GetHostMetadataDeleteStatement() {
   return new Statement(DB()->GetCachedStatement(
       SQL_FROM_HERE,
       base::StringPrintf("DELETE FROM %s WHERE main_page_url=?",
                          kHostMetadataTableName).c_str()));
 }
 
 Statement* ResourcePrefetchPredictorTables::GetHostMetadataUpdateStatement() {
   return new Statement(DB()->GetCachedStatement(
       SQL_FROM_HERE,
       base::StringPrintf(
           "INSERT INTO %s (main_page_url, last_visit_time) VALUES (?,?)",
           kHostMetadataTableName).c_str()));
 }
 
 }  // namespace predictors