Changeset 273144 in webkit

Timestamp:

Feb 19, 2021 9:55:36 AM (3 years ago)

Author:

Kate Cheney

Message:

Add better error handling to ResourceLoadStatisticsDatabaseStore::needsUpdatedPrivateClickMeasurementSchema()
​https://bugs.webkit.org/show_bug.cgi?id=222169
<rdar://problem/74522283>

Reviewed by Darin Adler.

Add better error handling for the case where the query to find the
UnattributedPrivateClickMeasurement table fails. This is unlikely to
happen in practice, however, if it does, we should add logging and
a debug ASSERT.

• NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:

(WebKit::ResourceLoadStatisticsDatabaseStore::needsUpdatedPrivateClickMeasurementSchema):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-19  Kate Cheney  <katherine_cheney@apple.com>
+
+        Add better error handling to ResourceLoadStatisticsDatabaseStore::needsUpdatedPrivateClickMeasurementSchema()
+        https://bugs.webkit.org/show_bug.cgi?id=222169
+        <rdar://problem/74522283>
+
+        Reviewed by Darin Adler.
+
+        Add better error handling for the case where the query to find the
+        UnattributedPrivateClickMeasurement table fails. This is unlikely to
+        happen in practice, however, if it does, we should add logging and
+        a debug ASSERT.
+
+        * NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:
+        (WebKit::ResourceLoadStatisticsDatabaseStore::needsUpdatedPrivateClickMeasurementSchema):
+
 2021-02-19  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp

@@ -436 +436 @@
     SQLiteStatement statement(m_database, "SELECT type, sql FROM sqlite_master WHERE tbl_name='UnattributedPrivateClickMeasurement' AND type = 'table'");
     if (statement.prepare() != SQLITE_OK) {
-        LOG_ERROR("Unable to prepare statement to fetch schema for the UnattributedPrivateClickMeasurement table.");
-        ASSERT_NOT_REACHED();
-        return false;
-    }
-
-    if (statement.step() == SQLITE_ROW)
-        currentSchema = statement.getColumnText(1);
+        RELEASE_LOG_ERROR(Network, "%p - ResourceLoadStatisticsDatabaseStore::needsUpdatedPrivateClickMeasurementSchema Unable to prepare statement to fetch schema for the UnattributedPrivateClickMeasurement table, error message: %{private}s", this, m_database.lastErrorMsg());
+        ASSERT_NOT_REACHED();
+        return false;
+    }
+
+    if (statement.step() != SQLITE_ROW) {
+        RELEASE_LOG_ERROR(Network, "%p - ResourceLoadStatisticsDatabaseStore::needsUpdatedPrivateClickMeasurementSchema error executing statement to fetch UnattributedPrivateClickMeasurement schema, error message: %{private}s", this, m_database.lastErrorMsg());
+        ASSERT_NOT_REACHED();
+        return false;
+    }
+
+    currentSchema = statement.getColumnText(1);
 
     if (!currentSchema.isEmpty()