Changeset 278651 in webkit

Timestamp:

Jun 9, 2021, 12:02:40 AM (5 years ago)

Author:

Chris Dumez

Message:

Rely on SQLiteDatabase::setMaximumSize() for quota management in LocalStorageDatabase
​https://bugs.webkit.org/show_bug.cgi?id=226788

Reviewed by Sihui Liu.

Source/WebCore:

Export SQLiteDatabase::setMaximumSize() so it can be used from WebKit2.

• platform/sql/SQLiteDatabase.h:

Source/WebKit:

Rely on SQLiteDatabase::setMaximumSize() for quota management in LocalStorageDatabase.
It simplifies the code a bit.

No new test, covered by storage/domstorage/quota.html that is still passing.

• NetworkProcess/WebStorage/LocalStorageDatabase.cpp:

(WebKit::LocalStorageDatabase::openDatabase):
(WebKit::LocalStorageDatabase::removeItem):
(WebKit::LocalStorageDatabase::setItem):
(WebKit::LocalStorageDatabase::clear):

• NetworkProcess/WebStorage/LocalStorageDatabase.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/sql/SQLiteDatabase.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/WebStorage/LocalStorageDatabase.cpp (modified) (5 diffs)
• WebKit/NetworkProcess/WebStorage/LocalStorageDatabase.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-09  Chris Dumez  <cdumez@apple.com>
+
+        Rely on SQLiteDatabase::setMaximumSize() for quota management in LocalStorageDatabase
+        https://bugs.webkit.org/show_bug.cgi?id=226788
+
+        Reviewed by Sihui Liu.
+
+        Export SQLiteDatabase::setMaximumSize() so it can be used from WebKit2.
+
+        * platform/sql/SQLiteDatabase.h:
+
 2021-06-08  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/sql/SQLiteDatabase.h

@@ -104 +104 @@
     // setMaximumSize() will round the size down to the next smallest chunk if the passed size doesn't align.
     int64_t maximumSize();
-    void setMaximumSize(int64_t);
+    WEBCORE_EXPORT void setMaximumSize(int64_t);
     
     // Gets the number of unused bytes in the database file.

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-06-09  Chris Dumez  <cdumez@apple.com>
+
+        Rely on SQLiteDatabase::setMaximumSize() for quota management in LocalStorageDatabase
+        https://bugs.webkit.org/show_bug.cgi?id=226788
+
+        Reviewed by Sihui Liu.
+
+        Rely on SQLiteDatabase::setMaximumSize() for quota management in LocalStorageDatabase.
+        It simplifies the code a bit.
+
+        No new test, covered by storage/domstorage/quota.html that is still passing.
+
+        * NetworkProcess/WebStorage/LocalStorageDatabase.cpp:
+        (WebKit::LocalStorageDatabase::openDatabase):
+        (WebKit::LocalStorageDatabase::removeItem):
+        (WebKit::LocalStorageDatabase::setItem):
+        (WebKit::LocalStorageDatabase::clear):
+        * NetworkProcess/WebStorage/LocalStorageDatabase.h:
+
 2021-06-08  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/WebStorage/LocalStorageDatabase.cpp

@@ -91 +91 @@
     }
 
+    if (m_quotaInBytes != WebCore::StorageMap::noQuota)
+        m_database.setMaximumSize(m_quotaInBytes);
+
     return true;
 }
@@ -182 +185 @@
         return;
     }
-
-    if (m_databaseSize) {
-        auto sizeDecrease = key.sizeInBytes() + oldValue.sizeInBytes();
-        if (sizeDecrease >= *m_databaseSize)
-            *m_databaseSize = 0;
-        else
-            *m_databaseSize -= sizeDecrease;
-    }
 }
 
@@ -223 +218 @@
     oldValue = item(key);
 
-    if (m_quotaInBytes != WebCore::StorageMap::noQuota) {
-        if (!m_databaseSize)
-            m_databaseSize = SQLiteFileSystem::databaseFileSize(m_databasePath);
-        CheckedUint64 newDatabaseSize = *m_databaseSize;
-        newDatabaseSize -= oldValue.sizeInBytes();
-        newDatabaseSize += value.sizeInBytes();
-        if (oldValue.isNull())
-            newDatabaseSize += key.sizeInBytes();
-        if (newDatabaseSize.hasOverflowed() || newDatabaseSize > m_quotaInBytes) {
-            quotaException = true;
-            return;
-        }
-        m_databaseSize = newDatabaseSize;
-    }
-
     auto insertStatement = scopedStatement(m_insertStatement, "INSERT INTO ItemTable VALUES (?, ?)"_s);
     if (!insertStatement) {
@@ -248 +228 @@
 
     int result = insertStatement->step();
-    if (result != SQLITE_DONE)
+    if (result != SQLITE_DONE) {
         LOG_ERROR("Failed to update item in the local storage database - %i", result);
+        if (result == SQLITE_FULL)
+            quotaException = true;
+    }
 }
 
@@ -269 +252 @@
         return false;
     }
-
-    m_databaseSize = 0;
 
     return m_database.lastChanges() > 0;

trunk/Source/WebKit/NetworkProcess/WebStorage/LocalStorageDatabase.h

@@ -69 +69 @@
     const unsigned m_quotaInBytes { 0 };
     bool m_isClosed { false };
-    std::optional<uint64_t> m_databaseSize;
 
     mutable std::unique_ptr<WebCore::SQLiteStatement> m_clearStatement;