From c9e3e0f1c0ee773f06f7487615824fd077734725 Mon Sep 17 00:00:00 2001
From: Tom Tung <shes050117@gmail.com>
Date: Mon, 10 Jul 2017 16:45:56 +0800
Subject: [PATCH] Bug 1290481 - P2: Upgrade the version of cache.sqlite to
 store opaque responses' padding size in SQLite. r=bkelly

MozReview-Commit-ID: 6poDeyErBjc

--HG--
extra : rebase_source : 5c9748ac9d4b269666f66bfb1661b095eb099bc1
---
 dom/cache/DBSchema.cpp | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/dom/cache/DBSchema.cpp b/dom/cache/DBSchema.cpp
index df8397b9b4d4..5fa3ce88e532 100644
--- a/dom/cache/DBSchema.cpp
+++ b/dom/cache/DBSchema.cpp
@@ -35,7 +35,7 @@ namespace db {
 const int32_t kFirstShippedSchemaVersion = 15;
 namespace {
 // Update this whenever the DB schema is changed.
-const int32_t kLatestSchemaVersion = 25;
+const int32_t kLatestSchemaVersion = 26;
 // ---------
 // The following constants define the SQL schema.  These are defined in the
 // same order the SQL should be executed in CreateOrMigrateSchema().  They are
@@ -101,7 +101,8 @@ const char* const kTableEntries =
     "request_redirect INTEGER NOT NULL, "
     "request_referrer_policy INTEGER NOT NULL, "
     "request_integrity TEXT NOT NULL, "
-    "request_url_fragment TEXT NOT NULL"
+    "request_url_fragment TEXT NOT NULL, "
+    "response_padding_size INTEGER NULL "
     // New columns must be added at the end of table to migrate and
     // validate properly.
   ")";
@@ -2482,6 +2483,7 @@ nsresult MigrateFrom21To22(mozIStorageConnection* aConn, bool& aRewriteSchema);
 nsresult MigrateFrom22To23(mozIStorageConnection* aConn, bool& aRewriteSchema);
 nsresult MigrateFrom23To24(mozIStorageConnection* aConn, bool& aRewriteSchema);
 nsresult MigrateFrom24To25(mozIStorageConnection* aConn, bool& aRewriteSchema);
+nsresult MigrateFrom25To26(mozIStorageConnection* aConn, bool& aRewriteSchema);
 // Configure migration functions to run for the given starting version.
 Migration sMigrationList[] = {
   Migration(15, MigrateFrom15To16),
@@ -2494,6 +2496,7 @@ Migration sMigrationList[] = {
   Migration(22, MigrateFrom22To23),
   Migration(23, MigrateFrom23To24),
   Migration(24, MigrateFrom24To25),
+  Migration(25, MigrateFrom25To26),
 };
 uint32_t sMigrationListLength = sizeof(sMigrationList) / sizeof(Migration);
 nsresult
@@ -3030,6 +3033,33 @@ nsresult MigrateFrom24To25(mozIStorageConnection* aConn, bool& aRewriteSchema)
   return rv;
 }
 
+nsresult MigrateFrom25To26(mozIStorageConnection* aConn, bool& aRewriteSchema)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_DIAGNOSTIC_ASSERT(aConn);
+
+  // Add the response_padding_size column.
+  // Note: only opaque repsonse should be non-null interger.
+  nsresult rv = aConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+    "ALTER TABLE entries "
+    "ADD COLUMN response_padding_size INTEGER NULL "
+  ));
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  aConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+    "UPDATE entries SET response_padding_size = 0"
+    "WHERE response_type = 4" // opaque response
+  ));
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = aConn->SetSchemaVersion(26);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  aRewriteSchema = true;
+
+  return rv;
+}
+
 } // anonymous namespace
 } // namespace db
 } // namespace cache