Add read/write tests, index creation/deletion test.

chrome/test/data/indexeddb/perf_shared.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 window.indexedDB = window.indexedDB || window.webkitIndexedDB ||
     window.mozIndexedDB || window.msIndexedDB;
 
 var automation = {
   results: {}
 };
@@ skipping 31 matching lines @@
 function onError(e) {
   var s = "Caught error.";
   if (e.target && e.target.webkitErrorMessage)
     s += "\n" + e.target.webkitErrorMessage;
   console.log(s);
   automation.setStatus(s);
   e.stopPropagation();
   throw new Error(e);
 }
 
-var version = 2;  // The version with our object stores.
-var db;
+var baseVersion = 2;  // The version with our object stores.
+var curVersion;
 
 // Valid options fields:
 //  indexName: the name of an index to create on each object store
-//  indexKeyPath: likewise
+//  indexKeyPath: the key path for that index
 //  indexIsUnique: the "unique" option for IDBIndexParameters
 //  indexIsMultiEntry: the "multiEntry" option for IDBIndexParameters
 //
 function createDatabase(name, objectStores, handler, errorHandler, options) {
-  var openRequest = indexedDB.open(name, version);
+  var openRequest = indexedDB.open(name, baseVersion);
   openRequest.onblocked = errorHandler;
   function createObjectStores(db) {
     for (var store in objectStores) {
       var name = objectStores[store];
       assert(!db.objectStoreNames.contains(name));
       var os = db.createObjectStore(name);
       if (options && options.indexName) {
         assert(options.indexKeyPath || options.indexKeyPath == "");
         os.createIndex(options.indexName, options.indexKeyPath,
             { unique: options.indexIsUnique,
               multiEntry: options.indexIsMultiEntry });
       }
     }
   }
   openRequest.onupgradeneeded = function(ev) {
     // TODO: This is the spec-compliant path, which doesn't yet work in Chrome,
     // and isn't yet tested, as this function won't currently be called.
     assert(openRequest == ev.target);
-    db = openRequest.result;
+    var db = openRequest.result;

[jsbell, 2012/07/26 18:52:41]

Ignore my comment in the previous review.

     createObjectStores(db);
     // onsuccess will get called after this exits.
   };
   openRequest.onsuccess = function(ev) {
     assert(openRequest == ev.target);
-    db = openRequest.result;
+    var db = openRequest.result;
     db.onerror = function(ev) {
       console.log("db error", arguments, openRequest.webkitErrorMessage);
       errorHandler();
     }
-    if (db.version != version) {
+    if (db.version != baseVersion) {
       // This is the current Chrome path.
-      var setVersionRequest = db.setVersion(version);
-      setVersionRequest.onfailure = errorHandler;
+      var setVersionRequest = db.setVersion(baseVersion);
+      setVersionRequest.onerror = errorHandler;
       setVersionRequest.onsuccess =
           function(e) {
+            curVersion = db.version;
             assert(setVersionRequest == e.target);
             createObjectStores(db);
             var versionTransaction = setVersionRequest.result;
-            versionTransaction.oncomplete = function() {handler(db); };
+            versionTransaction.oncomplete = function() { handler(db); };
             versionTransaction.onerror = onError;
           }
     } else {
       handler(db);
     }
   }
 }
 
+// You must close all database connections before calling this.
+function alterObjectStores(
+    name, objectStoreNames, func, handler, errorHandler) {
+  var version = curVersion + 1;
+  var openRequest = indexedDB.open(name, version);
+  openRequest.onblocked = errorHandler;
+  // TODO: This won't work in Firefox yet; see above in createDatabase.

[jsbell, 2012/07/26 18:52:41]

I wrote an upgradeneeded shim for the current version of Chrome you could use
until we land the real version (coming real soon!)

https://bugs.webkit.org/attachment.cgi?id=154148&action=review

Search for "feature-detect"

[ericu, 2012/07/26 21:03:12]

I'll consider adding that in a later CL, especially if this hack doesn't work
when I start testing in Firefox.  Thanks for the pointer.

+  openRequest.onsuccess = function(ev) {
+    assert(openRequest == ev.target);
+    var db = openRequest.result;
+    db.onerror = function(ev) {
+      console.log("error altering db", arguments,
+          openRequest.webkitErrorMessage);
+      errorHandler();
+    }
+    if (db.version != version) {
+      var setVersionRequest = db.setVersion(version);
+      setVersionRequest.onerror = errorHandler;
+      setVersionRequest.onsuccess =
+          function(e) {
+            curVersion = db.version;
+            assert(setVersionRequest == e.target);
+            var versionTransaction = setVersionRequest.result;
+            versionTransaction.oncomplete = function() { handler(db); };
+            versionTransaction.onerror = onError;
+            for (var store in objectStoreNames) {
+              func(versionTransaction.objectStore(objectStoreNames[store]));
+            }
+          }
+    } else {
+      errorHandler();
+    }
+  }
+}
+
 function getTransaction(db, objectStoreNames, mode, opt_handler) {
   var transaction = db.transaction(objectStoreNames, mode);
   transaction.onerror = onError;
   transaction.onabort = onError;
   if (opt_handler) {
     transaction.oncomplete = opt_handler;
   }
   return transaction;
 }
 
@@ skipping 14 matching lines @@
     var duration = Date.now() - startTime;
     // Ignore the cleanup time for this test.
     automation.addResult(testName, duration);
     automation.setStatus("Deleting database.");
     // TODO: Turn on actual deletion; for now it's way too slow.
     // deleteDatabase(testName, onDeleted);
     onTestComplete();
   }
 }
 
+function getDisplayName(args) {
+  return getDisplayName.caller.name + "_" +
+      Array.prototype.slice.call(args, 0, args.length - 1).join("_");

[jsbell, 2012/07/26 18:52:41]

Cute. :) Maybe a comment that last argument is assumed to be a callback function
and so not included.

(Alternately, could do a map() that does a typeof check and uses the name for
function args.)

[ericu, 2012/07/26 21:03:12]

Done.

+}
+
+function getSimpleKey(i) {
+  return "key " + i;
+}
+
+function getSimpleValue(i) {
+  return "value " + i;
+}
+
+function putLinearValues(
+    transaction, objectStoreNames, numKeys, getKey, getValue) {
+  if (!getKey)
+    getKey = getSimpleKey;
+  if (!getValue)
+    getValue = getSimpleValue;
+  for (var i in objectStoreNames) {
+    var os = transaction.objectStore(objectStoreNames[i]);

[jsbell, 2012/07/26 18:52:41]

This will throw if not found, never return null. So the assertion is fine, but
it validates the IDB implementation more than the test logic.

[ericu, 2012/07/26 21:03:13]

Removed.  It'll fail quickly enough anyway.

+    assert(os);
+    for (var j = 0; j < numKeys; ++j) {
+      var request = os.put(getValue(j), getKey(j));
+      request.onerror = onError;
+    }
+  }
+}
+
+function getRandomValues(
+    transaction, objectStoreNames, numReads, numKeys, indexName, getKey) {
+  if (!getKey)
+    getKey = getSimpleKey;
+  for (var i in objectStoreNames) {
+    var os = transaction.objectStore(objectStoreNames[i]);
+    assert(os);
+    var queryObject = os;

[jsbell, 2012/07/26 18:52:41]

FYI, in the IDB spec itself this (a store or index) would be called the "source"
of a request.

[ericu, 2012/07/26 21:03:13]

Sounds good; changed to "source".

+    if (indexName)
+      queryObject = queryObject.index(indexName);
+    for (var j = 0; j < numReads; ++j) {
+      var rand = Math.floor(Math.random() * numKeys);
+      var request = queryObject.get(getKey(rand));
+      request.onerror = onError;
+    }
+  }
+}
+
+function putRandomValues(
+    transaction, objectStoreNames, numPuts, numKeys, getKey, getValue) {
+  if (!getKey)
+    getKey = getSimpleKey;
+  if (!getValue)
+    getValue = getSimpleValue;
+  for (var i in objectStoreNames) {
+    var os = transaction.objectStore(objectStoreNames[i]);
+    assert(os);
+    for (var j = 0; j < numPuts; ++j) {
+      var rand = Math.floor(Math.random() * numKeys);
+      var request = os.put(getValue(rand), getKey(rand));
+      request.onerror = onError;
+    }
+  }
+}
+
 function stringOfLength(n) {
   assert(n > 0);
   assert(n == Math.floor(n));
   return new Array(n + 1).join('0');
 }