Commit af61af46 authored by Butkovits Atila's avatar Butkovits Atila
Browse files

Merge mozilla-central to autoland. CLOSED TREE

parents 70fa9b9b 7fd9ee2c

browser/base/content/test/performance/browser_startup_mainthreadio.js

+2 −2
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ const startupPhases = { 
      stat: 4,

      fsync: 3,

      read: 48,

      write: 184,

      write: 172,

    },

    {

      // bug 1391590
@@ -490,7 +490,7 @@ const startupPhases = { 
      fsync: 2,

      read: 4,

      stat: 3,

      write: 1324,

      write: 1321,

    },

    {

      // bug 1391590

toolkit/components/places/Database.cpp

+1 −40
Original line number Diff line number Diff line
@@ -1225,12 +1225,7 @@ nsresult Database::InitSchema(bool* aDatabaseMigrated) { 
        NS_ENSURE_SUCCESS(rv, rv);

      }



      if (currentSchemaVersion < 62) {

        rv = MigrateV62Up();

        NS_ENSURE_SUCCESS(rv, rv);

      }



      // Firefox 97 uses schema version 62

      // Firefox 97 uses schema version 61



      // Schema Upgrades must add migration code here.

      // >>> IMPORTANT! <<<
@@ -1327,8 +1322,6 @@ nsresult Database::InitSchema(bool* aDatabaseMigrated) { 
    rv = mMainConn->ExecuteSimpleSQL(

        CREATE_IDX_MOZ_PLACES_METADATA_PLACECREATED);

    NS_ENSURE_SUCCESS(rv, rv);

    rv = mMainConn->ExecuteSimpleSQL(CREATE_IDX_MOZ_PLACES_METADATA_REFERRER);

    NS_ENSURE_SUCCESS(rv, rv);



    // moz_places_metadata_search_queries

    rv = mMainConn->ExecuteSimpleSQL(CREATE_MOZ_PLACES_METADATA_SEARCH_QUERIES);
@@ -1337,17 +1330,11 @@ nsresult Database::InitSchema(bool* aDatabaseMigrated) { 
    // moz_places_metadata_snapshots

    rv = mMainConn->ExecuteSimpleSQL(CREATE_MOZ_PLACES_METADATA_SNAPSHOTS);

    NS_ENSURE_SUCCESS(rv, rv);

    rv = mMainConn->ExecuteSimpleSQL(

        CREATE_IDX_MOZ_PLACES_METADATA_SNAPSHOTS_PINNNED);

    NS_ENSURE_SUCCESS(rv, rv);



    // moz_places_metadata_snapshots_extra

    rv =

        mMainConn->ExecuteSimpleSQL(CREATE_MOZ_PLACES_METADATA_SNAPSHOTS_EXTRA);

    NS_ENSURE_SUCCESS(rv, rv);

    rv = mMainConn->ExecuteSimpleSQL(

        CREATE_IDX_MOZ_PLACES_METADATA_SNAPSHOTS_EXTRA_TYPE);

    NS_ENSURE_SUCCESS(rv, rv);



    // moz_places_metadata_snapshots_groups

    rv = mMainConn->ExecuteSimpleSQL(
@@ -2379,32 +2366,6 @@ nsresult Database::MigrateV61Up() { 
  return NS_OK;

}



nsresult Database::MigrateV62Up() {

  // Add previews tombstones table if necessary.

  nsCOMPtr<mozIStorageStatement> stmt;

  nsresult rv = mMainConn->CreateStatement(

      "SELECT builder FROM moz_places_metadata_snapshots_groups"_ns,

      getter_AddRefs(stmt));

  if (NS_FAILED(rv)) {

    rv = mMainConn->ExecuteSimpleSQL(

        "ALTER TABLE moz_places "

        "ADD COLUMN builder TEXT NOT NULL "

        "ADD COLUMN builder_data TEXT "_ns);

    NS_ENSURE_SUCCESS(rv, rv);

  }



  rv = mMainConn->ExecuteSimpleSQL(CREATE_IDX_MOZ_PLACES_METADATA_REFERRER);

  NS_ENSURE_SUCCESS(rv, rv);

  rv = mMainConn->ExecuteSimpleSQL(

      CREATE_IDX_MOZ_PLACES_METADATA_SNAPSHOTS_PINNNED);

  NS_ENSURE_SUCCESS(rv, rv);

  rv = mMainConn->ExecuteSimpleSQL(

      CREATE_IDX_MOZ_PLACES_METADATA_SNAPSHOTS_EXTRA_TYPE);

  NS_ENSURE_SUCCESS(rv, rv);



  return NS_OK;

}



nsresult Database::ConvertOldStyleQuery(nsCString& aURL) {

  AutoTArray<QueryKeyValuePair, 8> tokens;

  nsresult rv = TokenizeQueryString(aURL, &tokens);

toolkit/components/places/Database.h

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


// This is the schema version. Update it at any schema change and add a

// corresponding migrateVxx method below.

#define DATABASE_SCHEMA_VERSION 62

#define DATABASE_SCHEMA_VERSION 61



// Fired after Places inited.

#define TOPIC_PLACES_INIT_COMPLETE "places-init-complete"
@@ -334,7 +334,6 @@ class Database final : public nsIObserver, public nsSupportsWeakReference { 
  nsresult MigrateV59Up();

  nsresult MigrateV60Up();

  nsresult MigrateV61Up();

  nsresult MigrateV62Up();



  void MigrateV52OriginFrecencies();

toolkit/components/places/nsPlacesIndexes.h

+0 −14
Original line number Diff line number Diff line
@@ -108,18 +108,4 @@ 
  CREATE_PLACES_IDX("placecreated_uniqueindex", "moz_places_metadata", \

                    "place_id, created_at", "UNIQUE")



#define CREATE_IDX_MOZ_PLACES_METADATA_REFERRER             \

  CREATE_PLACES_IDX("referrerindex", "moz_places_metadata", \

                    "referrer_place_id", "")



// moz_places_metadata_snapshots

#define CREATE_IDX_MOZ_PLACES_METADATA_SNAPSHOTS_PINNNED            \

  CREATE_PLACES_IDX("pinnedindex", "moz_places_metadata_snapshots", \

                    "user_persisted, last_interaction_at", "")



// moz_places_metadata_snapshots_extra

#define CREATE_IDX_MOZ_PLACES_METADATA_SNAPSHOTS_EXTRA_TYPE             \

  CREATE_PLACES_IDX("typeindex", "moz_places_metadata_snapshots_extra", \

                    "type", "")



#endif  // nsPlacesIndexes_h__

toolkit/components/places/nsPlacesTables.h

+1 −3
Original line number Diff line number Diff line
@@ -334,9 +334,7 @@ 
  nsLiteralCString(                                                        \

      "CREATE TABLE IF NOT EXISTS moz_places_metadata_snapshots_groups ( " \

      "  id INTEGER PRIMARY KEY, "                                         \

      "  title TEXT NOT NULL, "                                            \

      "  builder TEXT NOT NULL, "                                          \

      "  builder_data TEXT "                                               \

      "  title TEXT NOT NULL "                                             \

      ")")



#define CREATE_MOZ_PLACES_METADATA_GROUPS_TO_SNAPSHOTS                        \