Bug 1258127 - Explain some sync change counter update queries. draft
authorKit Cambridge <kcambridge@mozilla.com>
Tue, 24 May 2016 14:53:52 -0700
changeset 397476 d7b9f7144d7acb29ef13bb4004dffd4000fee2b8
parent 397475 8e8888b0f10b61491894af4028cd246035f9f6de
child 527469 bf2cd4a1989844aec8bd6cba42674efe459fd56a
push id25314
push userkcambridge@mozilla.com
push dateFri, 05 Aug 2016 23:57:12 +0000
bugs1258127
milestone50.0a1
Bug 1258127 - Explain some sync change counter update queries. MozReview-Commit-ID: AFnsYqv0SK8
toolkit/components/places/nsNavBookmarks.cpp
--- a/toolkit/components/places/nsNavBookmarks.cpp
+++ b/toolkit/components/places/nsNavBookmarks.cpp
@@ -1328,16 +1328,18 @@ nsNavBookmarks::MoveItem(int64_t aItemId
     NS_ENSURE_SUCCESS(rv, rv);
     rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("item_id"), bookmark.id);
     NS_ENSURE_SUCCESS(rv, rv);
     // The item itself only gets a change increment if it was re-parented.
     rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("delta"), sameParent ? 0 : 1);
     NS_ENSURE_SUCCESS(rv, rv);
     rv = stmt->Execute();
     NS_ENSURE_SUCCESS(rv, rv);
+    rv = stmt->Explain();
+    NS_ENSURE_SUCCESS(rv, rv);
   }
 
   PRTime now = RoundedPRNow();
   rv = SetItemDateInternal(LAST_MODIFIED, /* aSyncChangeDelta */ 1,
                            bookmark.parentId, now);
   NS_ENSURE_SUCCESS(rv, rv);
   rv = SetItemDateInternal(LAST_MODIFIED, sameParent ? 0 : 1,
                            aNewParent, now);
@@ -1464,16 +1466,19 @@ nsNavBookmarks::SetItemDateInternal(enum
   rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("item_id"), aItemId);
   NS_ENSURE_SUCCESS(rv, rv);
   rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("delta"), aSyncChangeDelta);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = stmt->Execute();
   NS_ENSURE_SUCCESS(rv, rv);
 
+  rv = stmt->Explain();
+  NS_ENSURE_SUCCESS(rv, rv);
+
   // note, we are not notifying the observers
   // that the item has changed.
 
   return NS_OK;
 }
 
 
 NS_IMETHODIMP
@@ -1592,17 +1597,23 @@ nsNavBookmarks::TrackSyncTagChange(int64
   NS_ENSURE_STATE(statement);
   mozStorageStatementScoper scoper(statement);
 
   nsresult rv = URIBinder::Bind(statement, NS_LITERAL_CSTRING("page_url"), aURI);
   NS_ENSURE_SUCCESS(rv, rv);
   rv = statement->BindInt64ByName(NS_LITERAL_CSTRING("tag_id"), aTagId);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  return statement->Execute();
+  rv = statement->Execute();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = statement->Explain();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsNavBookmarks::SetItemTitle(int64_t aItemId, const nsACString& aTitle,
                              uint16_t aSource)
 {
   NS_ENSURE_ARG_MIN(aItemId, 1);
 
@@ -1636,16 +1647,19 @@ nsNavBookmarks::SetItemTitle(int64_t aIt
                                   bookmark.lastModified);
   NS_ENSURE_SUCCESS(rv, rv);
   rv = statement->BindInt64ByName(NS_LITERAL_CSTRING("item_id"), bookmark.id);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = statement->Execute();
   NS_ENSURE_SUCCESS(rv, rv);
 
+  rv = statement->Explain();
+  NS_ENSURE_SUCCESS(rv, rv);
+
   NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
                    nsINavBookmarkObserver,
                    OnItemChanged(bookmark.id,
                                  NS_LITERAL_CSTRING("title"),
                                  false,
                                  title,
                                  bookmark.lastModified,
                                  bookmark.type,
@@ -2109,16 +2123,19 @@ nsNavBookmarks::ChangeBookmarkURI(int64_
   rv = statement->BindInt64ByName(NS_LITERAL_CSTRING("date"),
                                   bookmark.lastModified);
   NS_ENSURE_SUCCESS(rv, rv);
   rv = statement->BindInt64ByName(NS_LITERAL_CSTRING("item_id"), bookmark.id);
   NS_ENSURE_SUCCESS(rv, rv);
   rv = statement->Execute();
   NS_ENSURE_SUCCESS(rv, rv);
 
+  rv = statement->Explain();
+  NS_ENSURE_SUCCESS(rv, rv);
+
   rv = transaction.Commit();
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = history->UpdateFrecency(newPlaceId);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Upon changing the URI for a bookmark, update the frecency for the old
   // place as well.
@@ -2364,16 +2381,19 @@ nsNavBookmarks::SetItemIndex(int64_t aIt
     mozStorageStatementScoper scoper(stmt);
 
     rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("parent_id"),
                                bookmark.parentId);
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = stmt->Execute();
     NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = stmt->Explain();
+    NS_ENSURE_SUCCESS(rv, rv);
   }
 
   rv = transaction.Commit();
   NS_ENSURE_SUCCESS(rv, rv);
 
   NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
                    nsINavBookmarkObserver,
                    OnItemMoved(bookmark.id,
@@ -2470,16 +2490,19 @@ nsNavBookmarks::SetKeywordForBookmark(in
          "syncChangeCounter = syncChangeCounter + 1 "
         "WHERE id IN (") + changedIds + NS_LITERAL_CSTRING(")")
       );
       NS_ENSURE_STATE(stmt);
       mozStorageStatementScoper scoper(stmt);
 
       rv = stmt->Execute();
       NS_ENSURE_SUCCESS(rv, rv);
+
+      rv = stmt->Explain();
+      NS_ENSURE_SUCCESS(rv, rv);
     }
 
     rv = removeTxn.Commit();
     NS_ENSURE_SUCCESS(rv, rv);
 
     for (uint32_t i = 0; i < bookmarks.Length(); ++i) {
       NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
                        nsINavBookmarkObserver,
@@ -2590,16 +2613,19 @@ nsNavBookmarks::SetKeywordForBookmark(in
        "syncChangeCounter = syncChangeCounter + 1 "
       "WHERE id IN (") + changedIds + NS_LITERAL_CSTRING(")")
     );
     NS_ENSURE_STATE(stmt);
     mozStorageStatementScoper scoper(stmt);
 
     rv = stmt->Execute();
     NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = stmt->Explain();
+    NS_ENSURE_SUCCESS(rv, rv);
   }
 
   rv = updateTxn.Commit();
   NS_ENSURE_SUCCESS(rv, rv);
 
   // In both cases, notify about the change.
   for (uint32_t i = 0; i < bookmarks.Length(); ++i) {
     NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,