Changeset 193968 in webkit

Timestamp:

Dec 11, 2015 11:13:38 AM (8 years ago)

Author:

beidson@apple.com

Message:

Modern IDB: storage/indexeddb/index-count.html fails.
​https://bugs.webkit.org/show_bug.cgi?id=152175

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (At least one failing test now passes).

• Modules/indexeddb/client/IDBIndexImpl.cpp:

(WebCore::IDBClient::IDBIndex::count): If the passed in IDBKeyRange* is nullptr, use IDBKeyRangeData::allKeys.
(WebCore::IDBClient::IDBIndex::doCount): Change an isNull check to a more correct !isValid() check.

LayoutTests:

• platform/mac-wk1/TestExpectations:
• storage/indexeddb/index-count-expected.txt:
• storage/indexeddb/modern/index-get-count-failures-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• LayoutTests/storage/indexeddb/index-count-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/modern/index-get-count-failures-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/client/IDBIndexImpl.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-12-11  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: storage/indexeddb/index-count.html fails.
+        https://bugs.webkit.org/show_bug.cgi?id=152175
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk1/TestExpectations:
+        * storage/indexeddb/index-count-expected.txt:
+        * storage/indexeddb/modern/index-get-count-failures-expected.txt:
+
 2015-12-11  Daniel Bates  <dabates@apple.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -97 +97 @@
 storage/indexeddb/delete-closed-database-object.html [ Failure ]
 storage/indexeddb/index-basics.html [ Failure ]
-storage/indexeddb/index-count.html [ Failure ]
 storage/indexeddb/index-duplicate-keypaths.html [ Failure ]
 storage/indexeddb/intversion-abort-in-initial-upgradeneeded.html [ Failure ]

trunk/LayoutTests/storage/indexeddb/index-count-expected.txt

@@ -89 +89 @@
 PASS code is 0
 PASS ename is 'DataError'
-Exception message: DataError: DOM IDBDatabase Exception 0
+Exception message: Failed to execute 'count' on 'IDBIndex': The parameter is not a valid key.
 Expecting exception from index.count({})
 PASS Exception was thrown.
 PASS code is 0
 PASS ename is 'DataError'
-Exception message: DataError: DOM IDBDatabase Exception 0
+Exception message: Failed to execute 'count' on 'IDBIndex': The parameter is not a valid key.
 Expecting exception from index.count(/regex/)
 PASS Exception was thrown.
 PASS code is 0
 PASS ename is 'DataError'
-Exception message: DataError: DOM IDBDatabase Exception 0
+Exception message: Failed to execute 'count' on 'IDBIndex': The parameter is not a valid key.
 
 test = {"key":0,"expected":1}

trunk/LayoutTests/storage/indexeddb/modern/index-get-count-failures-expected.txt

@@ -3 +3 @@
 Failed to get with a null key
 Failed to getKey with a null key
-Failed to count with a null range
 Failed to get with deleted IDBIndex
 Failed to getKey with deleted IDBIndex

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-11  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: storage/indexeddb/index-count.html fails.
+        https://bugs.webkit.org/show_bug.cgi?id=152175
+
+        Reviewed by Alex Christensen.
+
+        No new tests (At least one failing test now passes).
+
+        * Modules/indexeddb/client/IDBIndexImpl.cpp:
+        (WebCore::IDBClient::IDBIndex::count): If the passed in IDBKeyRange* is nullptr, use IDBKeyRangeData::allKeys.
+        (WebCore::IDBClient::IDBIndex::doCount): Change an isNull check to a more correct !isValid() check.
+
 2015-12-11  Per Arne Vollan  <peavo@outlook.com>
 

trunk/Source/WebCore/Modules/indexeddb/client/IDBIndexImpl.cpp

@@ -140 +140 @@
     }
 
-    IDBKeyRangeData range;
-    range.isNull = false;
-    return doCount(*context, range, ec);}
+    return doCount(*context, IDBKeyRangeData::allKeys(), ec);}
 
 RefPtr<WebCore::IDBRequest> IDBIndex::count(ScriptExecutionContext* context, IDBKeyRange* range, ExceptionCodeWithMessage& ec)
@@ -153 +151 @@
     }
 
-    return doCount(*context, IDBKeyRangeData(range), ec);
+    return doCount(*context, range ? IDBKeyRangeData(range) : IDBKeyRangeData::allKeys(), ec);
 }
 
@@ -183 +181 @@
     }
 
-    if (range.isNull) {
+    if (!range.isValid()) {
         ec.code = IDBDatabaseException::DataError;
         return nullptr;