Changeset 194173 in webkit

Timestamp:

Dec 16, 2015 1:52:11 PM (8 years ago)

Author:

beidson@apple.com

Message:

Modern IDB: Refactor UniqueIDBDatabase in preparation for consolidation open and delete requests.
​https://bugs.webkit.org/show_bug.cgi?id=152355

Reviewed by Alex Christensen.

No new tests (Refactor, existing tests pass).

• Modules/indexeddb/server/UniqueIDBDatabase.cpp:

(WebCore::IDBServer::UniqueIDBDatabase::openDatabaseConnection):
(WebCore::IDBServer::UniqueIDBDatabase::performCurrentOpenOperation):
(WebCore::IDBServer::UniqueIDBDatabase::performCurrentDeleteOperation):
(WebCore::IDBServer::UniqueIDBDatabase::handleDatabaseOperations):
(WebCore::IDBServer::UniqueIDBDatabase::didOpenBackingStore):
(WebCore::IDBServer::UniqueIDBDatabase::operationAndTransactionTimerFired):
(WebCore::IDBServer::UniqueIDBDatabase::handleOpenDatabaseOperations): Deleted.

• Modules/indexeddb/server/UniqueIDBDatabase.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/server/UniqueIDBDatabase.cpp (modified) (7 diffs)
• Modules/indexeddb/server/UniqueIDBDatabase.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-16  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: Refactor UniqueIDBDatabase in preparation for consolidation open and delete requests.
+        https://bugs.webkit.org/show_bug.cgi?id=152355
+
+        Reviewed by Alex Christensen.
+
+        No new tests (Refactor, existing tests pass).
+
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::openDatabaseConnection):
+        (WebCore::IDBServer::UniqueIDBDatabase::performCurrentOpenOperation):
+        (WebCore::IDBServer::UniqueIDBDatabase::performCurrentDeleteOperation):
+        (WebCore::IDBServer::UniqueIDBDatabase::handleDatabaseOperations):
+        (WebCore::IDBServer::UniqueIDBDatabase::didOpenBackingStore):
+        (WebCore::IDBServer::UniqueIDBDatabase::operationAndTransactionTimerFired):
+        (WebCore::IDBServer::UniqueIDBDatabase::handleOpenDatabaseOperations): Deleted.
+        * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
 2015-12-16  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp

@@ -68 +68 @@
 
     if (m_databaseInfo) {
-        handleOpenDatabaseOperations();
+        handleDatabaseOperations();
         return;
     }
@@ -119 +119 @@
 }
 
-void UniqueIDBDatabase::handleOpenDatabaseOperations()
-{
-    ASSERT(isMainThread());
-    LOG(IndexedDB, "(main) UniqueIDBDatabase::handleOpenDatabaseOperations");
-
-    // If a version change transaction is currently in progress, no new connections can be opened right now.
-    // We will try again later.
-    if (m_versionChangeDatabaseConnection)
-        return;
-
-    if (m_pendingOpenDatabaseOperations.isEmpty())
-        return;
-
-    auto operation = m_pendingOpenDatabaseOperations.takeFirst();
+void UniqueIDBDatabase::performCurrentOpenOperation()
+{
+    LOG(IndexedDB, "(main) UniqueIDBDatabase::performCurrentOpenOperation");
+
+    ASSERT(m_currentOperation);
+    ASSERT(m_currentOperation->isOpenRequest());
 
     // 3.3.1 Opening a database
     // If requested version is undefined, then let requested version be 1 if db was created in the previous step,
     // or the current version of db otherwise.
-    uint64_t requestedVersion = operation->requestData().requestedVersion();
+    uint64_t requestedVersion = m_currentOperation->requestData().requestedVersion();
     if (!requestedVersion)
         requestedVersion = m_databaseInfo->version() ? m_databaseInfo->version() : 1;
@@ -144 +136 @@
     // If the database version higher than the requested version, abort these steps and return a VersionError.
     if (requestedVersion < m_databaseInfo->version()) {
-        auto result = IDBResultData::error(operation->requestData().requestIdentifier(), IDBError(IDBDatabaseException::VersionError));
-        operation->connection().didOpenDatabase(result);
-        return;
-    }
-
-    Ref<UniqueIDBDatabaseConnection> connection = UniqueIDBDatabaseConnection::create(*this, operation->connection());
+        auto result = IDBResultData::error(m_currentOperation->requestData().requestIdentifier(), IDBError(IDBDatabaseException::VersionError));
+        m_currentOperation->connection().didOpenDatabase(result);
+        m_currentOperation = nullptr;
+
+        return;
+    }
+
+    Ref<UniqueIDBDatabaseConnection> connection = UniqueIDBDatabaseConnection::create(*this, m_currentOperation->connection());
     UniqueIDBDatabaseConnection* rawConnection = &connection.get();
 
@@ -155 +149 @@
         addOpenDatabaseConnection(WTF::move(connection));
 
-        auto result = IDBResultData::openDatabaseSuccess(operation->requestData().requestIdentifier(), *rawConnection);
-        operation->connection().didOpenDatabase(result);
-        return;
-    }
-
-    ASSERT(!m_currentOperation);
+        auto result = IDBResultData::openDatabaseSuccess(m_currentOperation->requestData().requestIdentifier(), *rawConnection);
+        m_currentOperation->connection().didOpenDatabase(result);
+        m_currentOperation = nullptr;
+
+        return;
+    }
+
     ASSERT(!m_versionChangeDatabaseConnection);
-
-    m_currentOperation = WTF::move(operation);
     m_versionChangeDatabaseConnection = rawConnection;
 
@@ -178 +171 @@
     // And we notify this OpenDBRequest that it is blocked until those connections close.
     m_versionChangeDatabaseConnection->connectionToClient().notifyOpenDBRequestBlocked(m_currentOperation->requestData().requestIdentifier(), m_databaseInfo->version(), requestedVersion);
+}
+
+void UniqueIDBDatabase::performCurrentDeleteOperation()
+{
+    LOG(IndexedDB, "(main) UniqueIDBDatabase::performCurrentDeleteOperation");
+
+    // Not used yet.
+}
+
+void UniqueIDBDatabase::handleDatabaseOperations()
+{
+    ASSERT(isMainThread());
+    LOG(IndexedDB, "(main) UniqueIDBDatabase::handleDatabaseOperations");
+
+    // If a version change transaction is currently in progress, no new connections can be opened right now.
+    // We will try again later.
+    if (m_versionChangeDatabaseConnection)
+        return;
+
+    if (m_pendingOpenDatabaseOperations.isEmpty())
+        return;
+
+    if (m_currentOperation)
+        return;
+
+    m_currentOperation = m_pendingOpenDatabaseOperations.takeFirst();
+
+    // FIXME: Once handleDatabaseOperations also handles delete operations, remove this ASSERT.
+    ASSERT(m_currentOperation->isOpenRequest());
+
+    if (m_currentOperation->isOpenRequest())
+        performCurrentOpenOperation();
+    else if (m_currentOperation->isDeleteRequest())
+        performCurrentDeleteOperation();
+    else
+        ASSERT_NOT_REACHED();
 }
 
@@ -327 +356 @@
     m_isOpeningBackingStore = false;
 
-    handleOpenDatabaseOperations();
+    handleDatabaseOperations();
 }
 
@@ -917 +946 @@
     LOG(IndexedDB, "(main) UniqueIDBDatabase::operationAndTransactionTimerFired");
 
-    handleOpenDatabaseOperations();
+    handleDatabaseOperations();
 
     if (m_deletePending && maybeDeleteDatabase(nullptr))

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h

@@ -105 +105 @@
     UniqueIDBDatabase(IDBServer&, const IDBDatabaseIdentifier&);
     
-    void handleOpenDatabaseOperations();
+    void handleDatabaseOperations();
+    void performCurrentOpenOperation();
+    void performCurrentDeleteOperation();
     void addOpenDatabaseConnection(Ref<UniqueIDBDatabaseConnection>&&);
     bool maybeDeleteDatabase(IDBServerOperation*);