Histogram versions and extended error codes for SQLite databases.

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index e05a3583b4ae25d9074821f1429675ea6b9a83f7..bcc89b6ad39bf88f6caa01e7b6054c2f1504f8ef 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -6854,53 +6854,151 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Sqlite.AppCache.Error" enum="SqliteErrorCode">
-  <summary>Error codes returned by sqlite for the appcache db.</summary>
+  <summary>SQLite error codes for appcache db.</summary>
+</histogram>
+
+<histogram name="Sqlite.AppCache.ExtendedError" enum="SqliteErrorCode">

[jar (doing other things), 2013/05/13 22:05:59]

As we discussed... I think you don't need to rename these to use the sparse
histogram.  Both enumerated, and sparse, and have buckets that are exactly
one-wide, so teh deltas (which list min/max for bucket, and count) be
indistinguishable by the time they reach our UMA servers.

[Scott Hess - ex-Googler, 2013/05/13 22:43:08]

Done.

+  <summary>SQLite extended error codes for appcache db.</summary>
+</histogram>
+
+<histogram name="Sqlite.AppCache.Version">
+  <summary>Appcache db version at startup.</summary>
 </histogram>
 
 <histogram name="Sqlite.Cookie.Error" enum="SqliteErrorCode">
-  <summary>Error codes returned by sqlite the cookie db.</summary>
+  <summary>SQLite error codes for cookie db.</summary>
+</histogram>
+
+<histogram name="Sqlite.Cookie.ExtendedError" enum="SqliteErrorCode">
+  <summary>SQLite extended error codes for cookie db.</summary>
+</histogram>
+
+<histogram name="Sqlite.Cookie.Version">
+  <summary>Cookie db version at startup.</summary>
 </histogram>
 
 <histogram name="Sqlite.DatabaseTracker.Error" enum="SqliteErrorCode">
-  <summary>Error codes returned by sqlite the websqldb tracker db.</summary>
+  <summary>SQLite error codes for websqldb tracker db.</summary>
+</histogram>
+
+<histogram name="Sqlite.DatabaseTracker.ExtendedError" enum="SqliteErrorCode">
+  <summary>SQLite extended error codes for websqldb tracker db.</summary>
+</histogram>
+
+<histogram name="Sqlite.DatabaseTracker.Version">
+  <summary>Websqldb tracker db version at startup.</summary>
 </histogram>
 
 <histogram name="Sqlite.DomainBoundCerts.Error" enum="SqliteErrorCode">
-  <summary>
-    Error codes returned by sqlite for the domain-bound certs db.
-  </summary>
+  <summary>SQLite error codes for domain-bound certs db.</summary>
+</histogram>
+
+<histogram name="Sqlite.DomainBoundCerts.ExtendedError" enum="SqliteErrorCode">
+  <summary>SQLite extended error codes for domain-bound certs db.</summary>
+</histogram>
+
+<histogram name="Sqlite.DomainBoundCerts.Version">
+  <summary>Domain-bound certs db version at startup.</summary>
 </histogram>
 
 <histogram name="Sqlite.DomStorageDatabase.Error" enum="SqliteErrorCode">
-  <summary>Error codes returned by sqlite for the domstorage db.</summary>
+  <summary>SQLite error codes for domstorage db.</summary>
+</histogram>
+
+<histogram name="Sqlite.DomStorageDatabase.ExtendedError"
+    enum="SqliteErrorCode">
+  <summary>SQLite extended error codes for domstorage db.</summary>
+</histogram>
+
+<histogram name="Sqlite.DomStorageDatabase.Version">
+  <summary>Domstorage db version at startup.</summary>
 </histogram>
 
 <histogram name="Sqlite.Error" enum="SqliteErrorCode">
-  <summary>Error codes returned by sqlite for all databases.</summary>
+  <summary>Error codes returned by SQLite for all databases.</summary>
 </histogram>
 
 <histogram name="Sqlite.Error.IOERR" enum="SqliteIOERRCode">
-  <summary>Error codes returned by sqlite for all databases.</summary>
+  <obsolete>
+    Replaced 5/8/2013 by Sqlite.ExtendedError sparse histogram.
+  </obsolete>
+  <summary>SQLite extended SQLITE_IOERR codes for all databases.</summary>
+</histogram>
+
+<histogram name="Sqlite.ExtendedError" enum="SqliteErrorCode">
+  <summary>SQLite extended error codes for all databases.</summary>
 </histogram>
 
 <histogram name="Sqlite.History.Error" enum="SqliteErrorCode">
-  <summary>Error codes returned by sqlite for the history db.</summary>
+  <summary>SQLite error codes for history db.</summary>
+</histogram>
+
+<histogram name="Sqlite.History.ExtendedError" enum="SqliteErrorCode">
+  <summary>SQLite extended error codes for history db.</summary>
+</histogram>
+
+<histogram name="Sqlite.History.Version">
+  <summary>History db version at startup.</summary>
 </histogram>
 
 <histogram name="Sqlite.Quota.Error" enum="SqliteErrorCode">
-  <summary>Error codes returned by sqlite for the quota db.</summary>
+  <summary>SQLite error codes for quota db.</summary>
+</histogram>
+
+<histogram name="Sqlite.Quota.ExtendedError" enum="SqliteErrorCode">
+  <summary>SQLite extended error codes for quota db.</summary>
+</histogram>
+
+<histogram name="Sqlite.Quota.Version">
+  <summary>Quota db version at startup.</summary>
 </histogram>
 
 <histogram name="Sqlite.Text.Error" enum="SqliteErrorCode">
-  <summary>Error codes returned by sqlite the full text db.</summary>
+  <summary>SQLite error codes for full text db.</summary>
+</histogram>
+
+<histogram name="Sqlite.Text.ExtendedError" enum="SqliteErrorCode">
+  <summary>SQLite extended error codes for full text db.</summary>
+</histogram>
+
+<histogram name="Sqlite.Text.Version">
+  <summary>Full-text db version at startup.</summary>
 </histogram>
 
 <histogram name="Sqlite.Thumbnail.Error" enum="SqliteErrorCode">
-  <summary>Error codes returned by sqlite for the thumbnail db.</summary>
+  <summary>SQLite error codes for thumbnail db.</summary>
+</histogram>
+
+<histogram name="Sqlite.Thumbnail.ExtendedError" enum="SqliteErrorCode">
+  <summary>SQLite extended error codes for thumbnail db.</summary>
+</histogram>
+
+<histogram name="Sqlite.Thumbnail.Version">
+  <summary>Thumbnail db version at startup.</summary>
+</histogram>
+
+<histogram name="Sqlite.TopSites.Error" enum="SqliteErrorCode">
+  <summary>SQLite error codes for top sites db.</summary>
+</histogram>
+
+<histogram name="Sqlite.TopSites.ExtendedError" enum="SqliteErrorCode">
+  <summary>SQLite extended error codes for top sites db.</summary>
+</histogram>
+
+<histogram name="Sqlite.TopSites.Version">
+  <summary>Top sites db version at startup.</summary>
 </histogram>
 
 <histogram name="Sqlite.Web.Error" enum="SqliteErrorCode">
-  <summary>Error codes returned by sqlite the web db.</summary>
+  <summary>SQLite error codes for web db.</summary>
+</histogram>
+
+<histogram name="Sqlite.Web.ExtendedError" enum="SqliteErrorCode">
+  <summary>SQLite extended error codes for web db.</summary>
+</histogram>
+
+<histogram name="Sqlite.Web.Version">
+  <summary>Web db version at startup.</summary>
 </histogram>
 
 <histogram name="Tab.SwitchedToForegroundAge" units="ms">
@@ -10651,7 +10749,7 @@ other types of suffix sets.
 </enum>
 
 <enum name="SqliteErrorCode" type="int">
-  <summary>Error codes returned by SQLite - see sqlite.h</summary>
+  <summary>Error codes returned by SQLite - see sqlite3.h</summary>
   <int value="0" label="SQLITE_OK">Successful result</int>
   <int value="1" label="SQLITE_ERROR">SQL error or missing database</int>
   <int value="2" label="SQLITE_INTERNAL">
@@ -10698,7 +10796,7 @@ other types of suffix sets.
   <int value="23" label="SQLITE_AUTH">Authorization denied</int>
   <int value="24" label="SQLITE_FORMAT">Auxiliary database format error</int>
   <int value="25" label="SQLITE_RANGE">
-    2nd parameter to sqlite3_bind out of range
+    2nd parameter to sqlite3_bind() out of range
   </int>
   <int value="26" label="SQLITE_NOTADB">
     File opened that is not a database file
@@ -10707,10 +10805,50 @@ other types of suffix sets.
   <int value="101" label="SQLITE_DONE">
     sqlite3_step() has finished executing
   </int>
+  <int value="261" label="SQLITE_BUSY_RECOVERY">TBD</int>
+  <int value="262" label="SQLITE_LOCKED_SHAREDCACHE">TBD</int>
+  <int value="266" label="SQLITE_IOERR_READ">Error reading from file</int>
+  <int value="270" label="SQLITE_CANTOPEN_NOTEMPDIR">TBD</int>
+  <int value="522" label="SQLITE_IOERR_SHORT_READ">Short read from file</int>
+  <int value="778" label="SQLITE_IOERR_WRITE">
+    Error writing to file (other than SQLITE_FULL)
+  </int>
+  <int value="1034" label="SQLITE_IOERR_FSYNC">Error syncing to disk</int>
+  <int value="1290" label="SQLITE_IOERR_DIR_FSYNC">
+    Error syncing directory changes to disk
+  </int>
+  <int value="1546" label="SQLITE_IOERR_TRUNCATE">Error truncating file</int>
+  <int value="1802" label="SQLITE_IOERR_FSTAT">Error reading file metadata</int>
+  <int value="2058" label="SQLITE_IOERR_UNLOCK">Error unlocking file</int>
+  <int value="2314" label="SQLITE_IOERR_RDLOCK">
+    Error getting read lock - should not be possible
+  </int>
+  <int value="2570" label="SQLITE_IOERR_DELETE">Error deleting file</int>
+  <int value="2826" label="SQLITE_IOERR_BLOCKED">
+    Deadlock due to other process access to SQLite files
+  </int>
+  <int value="3082" label="SQLITE_IOERR_NOMEM">Error mapping shared memory</int>
+  <int value="3338" label="SQLITE_IOERR_ACCESS">
+    Error getting file attributes (other than not found)
+  </int>
+  <int value="3594" label="SQLITE_IOERR_CHECKRESERVEDLOCK">
+    Error while querying lock status
+  </int>
+  <int value="3850" label="SQLITE_IOERR_LOCK">Error acquiring lock</int>
+  <int value="4106" label="SQLITE_IOERR_CLOSE">Error closing file</int>
+  <int value="4362" label="SQLITE_IOERR_DIR_CLOSE">Unused</int>
+  <int value="4618" label="SQLITE_IOERR_SHMOPEN">Error mmapping file</int>
+  <int value="4874" label="SQLITE_IOERR_SHMSIZE">
+    Error in stat while mmapping file
+  </int>
+  <int value="5130" label="SQLITE_IOERR_SHMLOCK">Unused</int>
 </enum>
 
 <enum name="SqliteIOERRCode" type="int">
-  <summary>Extended error codes returned by SQLite - see sqlite.h</summary>
+  <obsolete>
+    Replaced 5/8/2013 by Sqlite.ExtendedError sparse histogram.
+  </obsolete>
+  <summary>Extended error codes returned by SQLite - see sqlite3.h</summary>
   <int value="0" label="SQLITE_IOERR">No extended code given</int>
   <int value="1" label="SQLITE_IOERR_READ">Error reading from file</int>
   <int value="2" label="SQLITE_IOERR_SHORT_READ">Short read from file</int>