Changeset 207832 in webkit

Timestamp:

Oct 25, 2016 12:17:38 PM (8 years ago)

Author:

Chris Dumez

Message:

IDBObjectStore.createIndex() should take a union in parameter
​https://bugs.webkit.org/show_bug.cgi?id=163935

Reviewed by Darin Adler.

IDBObjectStore.createIndex() should take a union in parameter:

• ​https://www.w3.org/TR/IndexedDB/#idl-def-IDBObjectStore

No new tests, no expected Web-exposed behavior change.

• Modules/indexeddb/IDBDatabase.cpp:

(WebCore::IDBDatabase::createObjectStore):

• Modules/indexeddb/IDBKeyPath.cpp:

(WebCore::isIDBKeyPathValid):
(WebCore::IDBKeyPath::isValid): Deleted.

• Modules/indexeddb/IDBKeyPath.h:

(WebCore::IDBKeyPath::isNull):

• Modules/indexeddb/IDBObjectStore.cpp:

(WebCore::IDBObjectStore::createIndex):

• Modules/indexeddb/IDBObjectStore.h:
• Modules/indexeddb/IDBObjectStore.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/IDBDatabase.cpp (modified) (1 diff)
• Modules/indexeddb/IDBKeyPath.cpp (modified) (1 diff)
• Modules/indexeddb/IDBKeyPath.h (modified) (2 diffs)
• Modules/indexeddb/IDBObjectStore.cpp (modified) (3 diffs)
• Modules/indexeddb/IDBObjectStore.h (modified) (2 diffs)
• Modules/indexeddb/IDBObjectStore.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-25  Chris Dumez  <cdumez@apple.com>
+
+        IDBObjectStore.createIndex() should take a union in parameter
+        https://bugs.webkit.org/show_bug.cgi?id=163935
+
+        Reviewed by Darin Adler.
+
+        IDBObjectStore.createIndex() should take a union in parameter:
+        - https://www.w3.org/TR/IndexedDB/#idl-def-IDBObjectStore
+
+        No new tests, no expected Web-exposed behavior change.
+
+        * Modules/indexeddb/IDBDatabase.cpp:
+        (WebCore::IDBDatabase::createObjectStore):
+        * Modules/indexeddb/IDBKeyPath.cpp:
+        (WebCore::isIDBKeyPathValid):
+        (WebCore::IDBKeyPath::isValid): Deleted.
+        * Modules/indexeddb/IDBKeyPath.h:
+        (WebCore::IDBKeyPath::isNull):
+        * Modules/indexeddb/IDBObjectStore.cpp:
+        (WebCore::IDBObjectStore::createIndex):
+        * Modules/indexeddb/IDBObjectStore.h:
+        * Modules/indexeddb/IDBObjectStore.idl:
+
 2016-10-24  Sam Weinig  <sam@webkit.org>
 

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

@@ -147 +147 @@
         return Exception { IDBDatabaseException::ConstraintError, ASCIILiteral("Failed to execute 'createObjectStore' on 'IDBDatabase': An object store with the specified name already exists.") };
 
-    IDBKeyPath keyPath(WTFMove(parameters.keyPath));
-    if (!keyPath.isNull() && !keyPath.isValid())
+    auto& keyPath = parameters.keyPath;
+    if (keyPath && !isIDBKeyPathValid(keyPath.value()))
         return Exception { IDBDatabaseException::SyntaxError, ASCIILiteral("Failed to execute 'createObjectStore' on 'IDBDatabase': The keyPath option is not a valid key path.") };
 
-    if (parameters.autoIncrement && ((keyPath.type() == IDBKeyPath::Type::String && keyPath.string().isEmpty()) || keyPath.type() == IDBKeyPath::Type::Array))
+    if (keyPath && parameters.autoIncrement && ((WTF::holds_alternative<String>(keyPath.value()) && WTF::get<String>(keyPath.value()).isEmpty()) || WTF::holds_alternative<Vector<String>>(keyPath.value())))
         return Exception { IDBDatabaseException::InvalidAccessError, ASCIILiteral("Failed to execute 'createObjectStore' on 'IDBDatabase': The autoIncrement option was set but the keyPath option was empty or an array.") };
 
     // Install the new ObjectStore into the connection's metadata.
-    auto info = m_info.createNewObjectStore(name, keyPath, parameters.autoIncrement);
+    auto info = m_info.createNewObjectStore(name, WTFMove(keyPath), parameters.autoIncrement);
 
     // Create the actual IDBObjectStore from the transaction, which also schedules the operation server side.

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

@@ -223 +223 @@
 }
 
-bool IDBKeyPath::isValid() const
-{
-    switch (m_type) {
-    case Type::Null:
-        return false;
-    case Type::String:
-        return IDBIsValidKeyPath(m_string);
-    case Type::Array:
-        if (m_array.isEmpty())
+bool isIDBKeyPathValid(const IDBKeyPathVariant& keyPath)
+{
+    auto visitor = WTF::makeVisitor([](const String& string) {
+        return IDBIsValidKeyPath(string);
+    }, [](const Vector<String>& vector) {
+        if (vector.isEmpty())
             return false;
-        for (auto& key : m_array) {
+        for (auto& key : vector) {
             if (!IDBIsValidKeyPath(key))
                 return false;
         }
         return true;
-    }
-    ASSERT_NOT_REACHED();
-    return false;
+    });
+    return WTF::visit(visitor, keyPath);
 }
 

trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h

@@ -35 +35 @@
 
 using IDBKeyPathVariant = WTF::Variant<String, Vector<String>>;
+bool isIDBKeyPathValid(const IDBKeyPathVariant&);
 
 class KeyedDecoder;
@@ -72 +73 @@
 
     bool isNull() const { return m_type == Type::Null; }
-    bool isValid() const;
     bool operator==(const IDBKeyPath& other) const;
 

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

@@ -372 +372 @@
 }
 
-ExceptionOr<Ref<IDBIndex>> IDBObjectStore::createIndex(ExecState&, const String& name, const IDBKeyPath& keyPath, const IndexParameters& parameters)
+ExceptionOr<Ref<IDBIndex>> IDBObjectStore::createIndex(ExecState&, const String& name, IDBKeyPathVariant&& keyPath, const IndexParameters& parameters)
 {
     LOG(IndexedDB, "IDBObjectStore::createIndex %s", name.utf8().data());
@@ -386 +386 @@
         return Exception { IDBDatabaseException::TransactionInactiveError };
 
-    if (!keyPath.isValid())
+    if (!isIDBKeyPathValid(keyPath))
         return Exception { IDBDatabaseException::SyntaxError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': The keyPath argument contains an invalid key path.") };
 
@@ -395 +395 @@
         return Exception { IDBDatabaseException::ConstraintError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': An index with the specified name already exists.") };
 
-    if (keyPath.type() == IDBKeyPath::Type::Array && parameters.multiEntry)
+    if (parameters.multiEntry && WTF::holds_alternative<Vector<String>>(keyPath))
         return Exception { IDBDatabaseException::InvalidAccessError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': The keyPath argument was an array and the multiEntry option is true.") };
 
     // Install the new Index into the ObjectStore's info.
-    IDBIndexInfo info = m_info.createNewIndex(name, keyPath, parameters.unique, parameters.multiEntry);
+    IDBIndexInfo info = m_info.createNewIndex(name, Optional<IDBKeyPathVariant>(WTFMove(keyPath)), parameters.unique, parameters.multiEntry);
     m_transaction->database().didCreateIndexInfo(info);
 

trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h

@@ -30 +30 @@
 #include "ActiveDOMObject.h"
 #include "ExceptionOr.h"
+#include "IDBKeyPath.h"
 #include "IDBObjectStoreInfo.h"
 #include <wtf/HashSet.h>
@@ -81 +82 @@
     ExceptionOr<Ref<IDBRequest>> deleteFunction(JSC::ExecState&, JSC::JSValue key);
     ExceptionOr<Ref<IDBRequest>> clear(JSC::ExecState&);
-    ExceptionOr<Ref<IDBIndex>> createIndex(JSC::ExecState&, const String& name, const IDBKeyPath&, const IndexParameters&);
+    ExceptionOr<Ref<IDBIndex>> createIndex(JSC::ExecState&, const String& name, IDBKeyPathVariant&&, const IndexParameters&);
     ExceptionOr<Ref<IDBIndex>> index(const String& name);
     ExceptionOr<void> deleteIndex(const String& name);

trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl

@@ -46 +46 @@
     [CallWith=ScriptState, MayThrowException] IDBRequest openCursor(optional IDBKeyRange? range = null, optional DOMString direction = "next");
     [CallWith=ScriptState, MayThrowException] IDBRequest openCursor(any key, optional DOMString direction = "next");
-    [CallWith=ScriptState, MayThrowException] IDBIndex createIndex(DOMString name, sequence<DOMString> keyPath, optional IDBIndexParameters options);
-    [CallWith=ScriptState, MayThrowException] IDBIndex createIndex(DOMString name, DOMString keyPath, optional IDBIndexParameters options);
+    [CallWith=ScriptState, MayThrowException] IDBIndex createIndex(DOMString name, (DOMString or sequence<DOMString>) keyPath, optional IDBIndexParameters options);
     [MayThrowException] IDBIndex index(DOMString name);
     [MayThrowException] void deleteIndex(DOMString name);