Changeset 127669 in webkit

Timestamp:

Sep 5, 2012 6:07:57 PM (12 years ago)

Author:

jsbell@chromium.org

Message:

IndexedDB: Integer version lost after first open/close/open cycle
​https://bugs.webkit.org/show_bug.cgi?id=95864

Reviewed by Tony Chang.

Source/WebCore:

New backing stores were being created with an old schema version, causing migration
to occur when the backing store was re-opened, which would overwrite valid integer
version metadata. New backing stores should be created with the latest schema version
since no migration is desired.

Test: storage/indexeddb/intversion-persistence.html

• Modules/indexeddb/IDBLevelDBBackingStore.cpp:

(WebCore::setUpMetadata):

LayoutTests:

Ensure integer versions are persisted across open/close/open cycles.

Note that although this is a useful and valid test in general, the specific bug that
prompted adding this test will only repro if the origin has no pre-existing backing
store, which is not guaranteed by DRT or other shells. See ​http://webkit.org/b/92166

• storage/indexeddb/intversion-persistence-expected.txt: Added.
• storage/indexeddb/intversion-persistence.html: Added.
• storage/indexeddb/resources/intversion-persistence.js: Added.

(test):
(openFirstTime.request.onupgradeneeded):
(openFirstTime.request.onsuccess):
(openFirstTime):
(openSecondTime.request.onsuccess):
(openSecondTime):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/intversion-persistence-expected.txt (added)
• LayoutTests/storage/indexeddb/intversion-persistence.html (added)
• LayoutTests/storage/indexeddb/resources/intversion-persistence.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-05  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Integer version lost after first open/close/open cycle
+        https://bugs.webkit.org/show_bug.cgi?id=95864
+
+        Reviewed by Tony Chang.
+
+        Ensure integer versions are persisted across open/close/open cycles.
+
+        Note that although this is a useful and valid test in general, the specific bug that
+        prompted adding this test will only repro if the origin has no pre-existing backing
+        store, which is not guaranteed by DRT or other shells. See http://webkit.org/b/92166
+
+        * storage/indexeddb/intversion-persistence-expected.txt: Added.
+        * storage/indexeddb/intversion-persistence.html: Added.
+        * storage/indexeddb/resources/intversion-persistence.js: Added.
+        (test):
+        (openFirstTime.request.onupgradeneeded):
+        (openFirstTime.request.onsuccess):
+        (openFirstTime):
+        (openSecondTime.request.onsuccess):
+        (openSecondTime):
+
 2012-09-05  Yoshifumi Inoue  <yosin@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-05  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Integer version lost after first open/close/open cycle
+        https://bugs.webkit.org/show_bug.cgi?id=95864
+
+        Reviewed by Tony Chang.
+
+        New backing stores were being created with an old schema version, causing migration
+        to occur when the backing store was re-opened, which would overwrite valid integer
+        version metadata. New backing stores should be created with the latest schema version
+        since no migration is desired.
+
+        Test: storage/indexeddb/intversion-persistence.html
+
+        * Modules/indexeddb/IDBLevelDBBackingStore.cpp:
+        (WebCore::setUpMetadata):
+
 2012-09-05  Kenichi Ishibashi  <bashi@chromium.org>
 

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

@@ -139 +139 @@
 static bool setUpMetadata(LevelDBDatabase* db, const String& origin)
 {
+    const int64_t latestSchemaVersion = 1;
     const Vector<char> metaDataKey = SchemaVersionKey::encode();
 
     int64_t schemaVersion = 0;
     if (!getInt(db, metaDataKey, schemaVersion)) {
-        schemaVersion = 0;
-        if (!putInt(db, metaDataKey, schemaVersion))
+        schemaVersion = latestSchemaVersion;
+        if (!putInt(db, metaDataKey, latestSchemaVersion))
             return false;
     } else {
         if (!schemaVersion) {
-            schemaVersion = 1;
+            schemaVersion = latestSchemaVersion;
             RefPtr<LevelDBTransaction> transaction = LevelDBTransaction::create(db);
             transaction->put(metaDataKey, encodeInt(schemaVersion));
@@ -177 +178 @@
             }
         }
-        ASSERT(schemaVersion == 1);
-    }
+    }
+
+    ASSERT(schemaVersion == latestSchemaVersion);
 
     return true;