Changeset 209176 in webkit

Timestamp:

Nov 30, 2016 11:05:42 PM (7 years ago)

Author:

beidson@apple.com

Message:

Unreviewed, rolling out r209168.

Caused 2 API tests to fail

Reverted changeset:

"IndexedDB: When doing puts, don't
"updateAllIndexesForAddRecord" if there are no indexes."
​https://bugs.webkit.org/show_bug.cgi?id=165215
​http://trac.webkit.org/changeset/209168

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-30  Brady Eidson  <beidson@apple.com>
+
+        Unreviewed, rolling out r209168.
+
+        Caused 2 API tests to fail
+
+        Reverted changeset:
+
+        "IndexedDB: When doing puts, don't
+        "updateAllIndexesForAddRecord" if there are no indexes."
+        https://bugs.webkit.org/show_bug.cgi?id=165215
+        http://trac.webkit.org/changeset/209168
+
 2016-11-30  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 

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

@@ -1661 +1661 @@
     }
 
-    if (!objectStoreInfo.indexMap().isEmpty()) {
-        auto error = updateAllIndexesForAddRecord(objectStoreInfo, keyData, value.data());
-
-        if (!error.isNull()) {
-            auto* sql = cachedStatement(SQL::DeleteObjectStoreRecord, ASCIILiteral("DELETE FROM Records WHERE objectStoreID = ? AND key = CAST(? AS TEXT);"));
-            if (!sql
-                || sql->bindInt64(1, objectStoreInfo.identifier()) != SQLITE_OK
-                || sql->bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK
-                || sql->step() != SQLITE_DONE) {
-                LOG_ERROR("Indexing new object store record failed, but unable to remove the object store record itself");
-                return { IDBDatabaseException::UnknownError, ASCIILiteral("Indexing new object store record failed, but unable to remove the object store record itself") };
-            }
-
-            return error;
-        }
+    auto error = updateAllIndexesForAddRecord(objectStoreInfo, keyData, value.data());
+
+    if (!error.isNull()) {
+        auto* sql = cachedStatement(SQL::DeleteObjectStoreRecord, ASCIILiteral("DELETE FROM Records WHERE objectStoreID = ? AND key = CAST(? AS TEXT);"));
+        if (!sql
+            || sql->bindInt64(1, objectStoreInfo.identifier()) != SQLITE_OK
+            || sql->bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK
+            || sql->step() != SQLITE_DONE) {
+            LOG_ERROR("Indexing new object store record failed, but unable to remove the object store record itself");
+            return { IDBDatabaseException::UnknownError, ASCIILiteral("Indexing new object store record failed, but unable to remove the object store record itself") };
+        }
+
+        return error;
     }
 
@@ -1731 +1729 @@
     transaction->notifyCursorsOfChanges(objectStoreInfo.identifier());
 
-    return { };
+    return error;
 }