Changeset 163245 in webkit

Timestamp:

Feb 1, 2014 11:04:02 AM (10 years ago)

Author:

beidson@apple.com

Message:

IDB: Index cursor complete advance() and iterate() support
<rdar://problem/15941916> and ​https://bugs.webkit.org/show_bug.cgi?id=127870

Reviewed by Dan Bernstein.

Source/WebCore:

• Modules/indexeddb/IDBRequest.cpp:

(WebCore::IDBRequest::onSuccess): Always use the value buffer for the script object.

Source/WebKit2:

• DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp:

(WebKit::SQLiteIDBCursor::advanceOnce): Look up the found record value from the

object store records based on the key we found from the index.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/indexeddb/IDBRequest.cpp (modified) (3 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-01  Brady Eidson  <beidson@apple.com>
+
+        IDB: Index cursor complete advance() and iterate() support
+        <rdar://problem/15941916> and https://bugs.webkit.org/show_bug.cgi?id=127870
+
+        Reviewed by Dan Bernstein.
+
+        * Modules/indexeddb/IDBRequest.cpp:
+        (WebCore::IDBRequest::onSuccess): Always use the value buffer for the script object.
+
 2014-02-01  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp

@@ -288 +288 @@
     RefPtr<IDBKey> primaryKey = backend->primaryKey();
 
-    Deprecated::ScriptValue value;
-
-    if (backend->valueKey())
-        value = idbKeyToScriptValue(requestState(), backend->valueKey());
-    else
-        value = deserializeIDBValueBuffer(requestState(), backend->valueBuffer());
+    Deprecated::ScriptValue value = deserializeIDBValueBuffer(requestState(), backend->valueBuffer());
 
     ASSERT(!m_pendingCursor);
@@ -410 +405 @@
 }
 
-void IDBRequest::onSuccess(PassRefPtr<IDBKey> key, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer> buffer, PassRefPtr<IDBKey> valueKey)
+void IDBRequest::onSuccess(PassRefPtr<IDBKey> key, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer> buffer, PassRefPtr<IDBKey>)
 {
     LOG(StorageAPI, "IDBRequest::onSuccess(key, primaryKey, valueBuffer, valueKey)");
@@ -418 +413 @@
     DOMRequestState::Scope scope(m_requestState);
 
-    Deprecated::ScriptValue value;
-    if (valueKey)
-        value = idbKeyToScriptValue(requestState(), valueKey);
-    else
-        value = deserializeIDBValueBuffer(requestState(), buffer);
+    Deprecated::ScriptValue value = deserializeIDBValueBuffer(requestState(), buffer);
 
     ASSERT(m_pendingCursor);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-01  Brady Eidson  <beidson@apple.com>
+
+        IDB: Index cursor complete advance() and iterate() support
+        <rdar://problem/15941916> and https://bugs.webkit.org/show_bug.cgi?id=127870
+
+        Reviewed by Dan Bernstein.
+
+        * DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp:
+        (WebKit::SQLiteIDBCursor::advanceOnce): Look up the found record value from the
+          object store records based on the key we found from the index.
+
 2014-01-31  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp

@@ -284 +284 @@
     if (m_indexID != IDBIndexMetadata::InvalidId) {
         if (!deserializeIDBKeyData(reinterpret_cast<const uint8_t*>(keyData.data()), keyData.size(), m_currentValueKey)) {
-            LOG_ERROR("Unable to deserialize value data from database while advancing cursor");
+            LOG_ERROR("Unable to deserialize value data from database while advancing index cursor");
             m_completed = true;
             return false;
         }
 
-        // Index cursors should only have a m_currentValueKey, and not m_currentValueBuffer
-        m_currentValueBuffer.clear();
+        SQLiteStatement objectStoreStatement(*m_statement->database(), "SELECT value FROM Records WHERE key = CAST(? AS TEXT) and objectStoreID = ?;");
+
+        if (objectStoreStatement.prepare() != SQLResultOk
+            || objectStoreStatement.bindBlob(1, m_currentValueBuffer.data(), m_currentValueBuffer.size()) != SQLResultOk
+            || objectStoreStatement.bindInt64(2, m_objectStoreID) != SQLResultOk
+            || objectStoreStatement.step() != SQLResultRow) {
+            LOG_ERROR("Could not create index cursor statement into object store records");
+            return false;
+        }
+
+        objectStoreStatement.getColumnBlobAsVector(0, m_currentValueBuffer);
     }