Modified: trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp (128216 => 128217)
--- trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp 2012-09-11 19:14:30 UTC (rev 128216)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp 2012-09-11 19:17:20 UTC (rev 128217)
@@ -1139,7 +1139,6 @@
virtual PassRefPtr<IDBKey> primaryKey() { return m_currentKey; }
virtual String value() = 0;
virtual PassRefPtr<IDBBackingStore::ObjectStoreRecordIdentifier> objectStoreRecordIdentifier() = 0;
- virtual int64_t indexDataId() = 0;
virtual void close() { }
virtual bool loadCurrentRow() = 0;
@@ -1317,6 +1316,65 @@
return compareIndexKeys(m_iterator->key(), m_cursorOptions.lowKey) < 0;
}
+class ObjectStoreKeyCursorImpl : public CursorImplCommon {
+public:
+ static PassRefPtr<ObjectStoreKeyCursorImpl> create(LevelDBTransaction* transaction, const CursorOptions& cursorOptions)
+ {
+ return adoptRef(new ObjectStoreKeyCursorImpl(transaction, cursorOptions));
+ }
+
+ virtual PassRefPtr<IDBBackingStore::Cursor> clone()
+ {
+ return adoptRef(new ObjectStoreKeyCursorImpl(this));
+ }
+
+ // CursorImplCommon
+ virtual String value() { ASSERT_NOT_REACHED(); return String(); }
+ virtual PassRefPtr<IDBBackingStore::ObjectStoreRecordIdentifier> objectStoreRecordIdentifier() OVERRIDE
+ {
+ return m_identifier;
+ }
+ virtual bool loadCurrentRow();
+
+private:
+ ObjectStoreKeyCursorImpl(LevelDBTransaction* transaction, const CursorOptions& cursorOptions)
+ : CursorImplCommon(transaction, cursorOptions)
+ {
+ }
+
+ ObjectStoreKeyCursorImpl(const ObjectStoreKeyCursorImpl* other)
+ : CursorImplCommon(other)
+ {
+ }
+
+ RefPtr<LevelDBRecordIdentifier> m_identifier;
+};
+
+bool ObjectStoreKeyCursorImpl::loadCurrentRow()
+{
+ const char* keyPosition = m_iterator->key().begin();
+ const char* keyLimit = m_iterator->key().end();
+
+ ObjectStoreDataKey objectStoreDataKey;
+ keyPosition = ObjectStoreDataKey::decode(keyPosition, keyLimit, &objectStoreDataKey);
+ ASSERT(keyPosition);
+ if (!keyPosition)
+ return false;
+
+ m_currentKey = objectStoreDataKey.userKey();
+
+ int64_t version;
+ const char* valuePosition = decodeVarInt(m_iterator->value().begin(), m_iterator->value().end(), version);
+ ASSERT(valuePosition);
+ if (!valuePosition)
+ return false;
+
+ // FIXME: This re-encodes what was just decoded; try and optimize.
+ m_identifier = LevelDBRecordIdentifier::create(encodeIDBKey(*m_currentKey), version);
+
+ return true;
+}
+
class ObjectStoreCursorImpl : public CursorImplCommon {
public:
static PassRefPtr<ObjectStoreCursorImpl> create(LevelDBTransaction* transaction, const CursorOptions& cursorOptions)
@@ -1335,7 +1393,6 @@
{
return m_identifier;
}
- virtual int64_t indexDataId() { ASSERT_NOT_REACHED(); return 0; }
virtual bool loadCurrentRow();
private:
@@ -1356,27 +1413,27 @@
bool ObjectStoreCursorImpl::loadCurrentRow()
{
- const char* p = m_iterator->key().begin();
+ const char* keyPosition = m_iterator->key().begin();
const char* keyLimit = m_iterator->key().end();
ObjectStoreDataKey objectStoreDataKey;
- p = ObjectStoreDataKey::decode(p, keyLimit, &objectStoreDataKey);
- ASSERT(p);
- if (!p)
+ keyPosition = ObjectStoreDataKey::decode(keyPosition, keyLimit, &objectStoreDataKey);
+ ASSERT(keyPosition);
+ if (!keyPosition)
return false;
m_currentKey = objectStoreDataKey.userKey();
int64_t version;
- const char* q = decodeVarInt(m_iterator->value().begin(), m_iterator->value().end(), version);
- ASSERT(q);
- if (!q)
+ const char* valuePosition = decodeVarInt(m_iterator->value().begin(), m_iterator->value().end(), version);
+ ASSERT(valuePosition);
+ if (!valuePosition)
return false;
// FIXME: This re-encodes what was just decoded; try and optimize.
m_identifier = LevelDBRecordIdentifier::create(encodeIDBKey(*m_currentKey), version);
- m_currentValue = decodeString(q, m_iterator->value().end());
+ m_currentValue = decodeString(valuePosition, m_iterator->value().end());
return true;
}
@@ -1397,7 +1454,6 @@
virtual String value() { ASSERT_NOT_REACHED(); return String(); }
virtual PassRefPtr<IDBKey> primaryKey() { return m_primaryKey; }
virtual PassRefPtr<IDBBackingStore::ObjectStoreRecordIdentifier> objectStoreRecordIdentifier() { ASSERT_NOT_REACHED(); return 0; }
- virtual int64_t indexDataId() { ASSERT_NOT_REACHED(); return 0; }
virtual bool loadCurrentRow();
private:
@@ -1417,22 +1473,23 @@
bool IndexKeyCursorImpl::loadCurrentRow()
{
- const char* p = m_iterator->key().begin();
+ const char* keyPosition = m_iterator->key().begin();
const char* keyLimit = m_iterator->key().end();
+
IndexDataKey indexDataKey;
- p = IndexDataKey::decode(p, keyLimit, &indexDataKey);
+ keyPosition = IndexDataKey::decode(keyPosition, keyLimit, &indexDataKey);
m_currentKey = indexDataKey.userKey();
int64_t indexDataVersion;
- const char* q = decodeVarInt(m_iterator->value().begin(), m_iterator->value().end(), indexDataVersion);
- ASSERT(q);
- if (!q)
+ const char* valuePosition = decodeVarInt(m_iterator->value().begin(), m_iterator->value().end(), indexDataVersion);
+ ASSERT(valuePosition);
+ if (!valuePosition)
return false;
- q = decodeIDBKey(q, m_iterator->value().end(), m_primaryKey);
- ASSERT(q);
- if (!q)
+ valuePosition = decodeIDBKey(valuePosition, m_iterator->value().end(), m_primaryKey);
+ ASSERT(valuePosition);
+ if (!valuePosition)
return false;
Vector<char> primaryLevelDBKey = ObjectStoreDataKey::encode(indexDataKey.databaseId(), indexDataKey.objectStoreId(), *m_primaryKey);
@@ -1473,7 +1530,6 @@
virtual String value() { return m_value; }
virtual PassRefPtr<IDBKey> primaryKey() { return m_primaryKey; }
virtual PassRefPtr<IDBBackingStore::ObjectStoreRecordIdentifier> objectStoreRecordIdentifier() { ASSERT_NOT_REACHED(); return 0; }
- virtual int64_t indexDataId() { ASSERT_NOT_REACHED(); return 0; }
bool loadCurrentRow();
private:
@@ -1497,25 +1553,25 @@
bool IndexCursorImpl::loadCurrentRow()
{
- const char* p = m_iterator->key().begin();
- const char* limit = m_iterator->key().end();
+ const char* keyPosition = m_iterator->key().begin();
+ const char* keyLimit = m_iterator->key().end();
IndexDataKey indexDataKey;
- p = IndexDataKey::decode(p, limit, &indexDataKey);
+ keyPosition = IndexDataKey::decode(keyPosition, keyLimit, &indexDataKey);
m_currentKey = indexDataKey.userKey();
- const char* q = m_iterator->value().begin();
+ const char* valuePosition = m_iterator->value().begin();
const char* valueLimit = m_iterator->value().end();
int64_t indexDataVersion;
- q = decodeVarInt(q, valueLimit, indexDataVersion);
- ASSERT(q);
- if (!q)
+ valuePosition = decodeVarInt(valuePosition, valueLimit, indexDataVersion);
+ ASSERT(valuePosition);
+ if (!valuePosition)
return false;
- q = decodeIDBKey(q, valueLimit, m_primaryKey);
- ASSERT(q);
- if (!q)
+ valuePosition = decodeIDBKey(valuePosition, valueLimit, m_primaryKey);
+ ASSERT(valuePosition);
+ if (!valuePosition)
return false;
m_primaryLevelDBKey = ObjectStoreDataKey::encode(indexDataKey.databaseId(), indexDataKey.objectStoreId(), *m_primaryKey);
@@ -1541,14 +1597,8 @@
return true;
}
-}
-
-PassRefPtr<IDBBackingStore::Cursor> IDBLevelDBBackingStore::openObjectStoreCursor(int64_t databaseId, int64_t objectStoreId, const IDBKeyRange* range, IDBCursor::Direction direction)
+bool objectStoreCursorOptions(LevelDBTransaction* transaction, int64_t databaseId, int64_t objectStoreId, const IDBKeyRange* range, IDBCursor::Direction direction, CursorOptions& cursorOptions)
{
- IDB_TRACE("IDBLevelDBBackingStore::openObjectStoreCursor");
- ASSERT(m_currentTransaction);
- CursorOptions cursorOptions;
-
bool lowerBound = range && range->lower();
bool upperBound = range && range->upper();
cursorOptions.forward = (direction == IDBCursor::NEXT_NO_DUPLICATE || direction == IDBCursor::NEXT);
@@ -1569,8 +1619,8 @@
cursorOptions.highOpen = true; // Not included.
else {
// We need a key that exists.
- if (!findGreatestKeyLessThanOrEqual(m_currentTransaction.get(), cursorOptions.highKey, cursorOptions.highKey))
- return 0;
+ if (!findGreatestKeyLessThanOrEqual(transaction, cursorOptions.highKey, cursorOptions.highKey))
+ return false;
cursorOptions.highOpen = false;
}
} else {
@@ -1580,8 +1630,8 @@
if (!cursorOptions.forward) {
// For reverse cursors, we need a key that exists.
Vector<char> foundHighKey;
- if (!findGreatestKeyLessThanOrEqual(m_currentTransaction.get(), cursorOptions.highKey, foundHighKey))
- return 0;
+ if (!findGreatestKeyLessThanOrEqual(transaction, cursorOptions.highKey, foundHighKey))
+ return false;
// If the target key should not be included, but we end up with a smaller key, we should include that.
if (cursorOptions.highOpen && compareIndexKeys(foundHighKey, cursorOptions.highKey) < 0)
@@ -1591,18 +1641,12 @@
}
}
- RefPtr<ObjectStoreCursorImpl> cursor = ObjectStoreCursorImpl::create(m_currentTransaction.get(), cursorOptions);
- if (!cursor->firstSeek())
- return 0;
-
- return cursor.release();
+ return true;
}
-PassRefPtr<IDBBackingStore::Cursor> IDBLevelDBBackingStore::openIndexKeyCursor(int64_t databaseId, int64_t objectStoreId, int64_t indexId, const IDBKeyRange* range, IDBCursor::Direction direction)
+bool indexCursorOptions(LevelDBTransaction* transaction, int64_t databaseId, int64_t objectStoreId, int64_t indexId, const IDBKeyRange* range, IDBCursor::Direction direction, CursorOptions& cursorOptions)
{
- IDB_TRACE("IDBLevelDBBackingStore::openIndexKeyCursor");
- ASSERT(m_currentTransaction);
- CursorOptions cursorOptions;
+ ASSERT(transaction);
bool lowerBound = range && range->lower();
bool upperBound = range && range->upper();
cursorOptions.forward = (direction == IDBCursor::NEXT_NO_DUPLICATE || direction == IDBCursor::NEXT);
@@ -1621,8 +1665,8 @@
cursorOptions.highOpen = false; // Included.
if (!cursorOptions.forward) { // We need a key that exists.
- if (!findGreatestKeyLessThanOrEqual(m_currentTransaction.get(), cursorOptions.highKey, cursorOptions.highKey))
- return 0;
+ if (!findGreatestKeyLessThanOrEqual(transaction, cursorOptions.highKey, cursorOptions.highKey))
+ return false;
cursorOptions.highOpen = false;
}
} else {
@@ -1630,8 +1674,8 @@
cursorOptions.highOpen = range->upperOpen();
Vector<char> foundHighKey;
- if (!findGreatestKeyLessThanOrEqual(m_currentTransaction.get(), cursorOptions.highKey, foundHighKey)) // Seek to the *last* key in the set of non-unique keys.
- return 0;
+ if (!findGreatestKeyLessThanOrEqual(transaction, cursorOptions.highKey, foundHighKey)) // Seek to the *last* key in the set of non-unique keys.
+ return false;
// If the target key should not be included, but we end up with a smaller key, we should include that.
if (cursorOptions.highOpen && compareIndexKeys(foundHighKey, cursorOptions.highKey) < 0)
@@ -1640,55 +1684,60 @@
cursorOptions.highKey = foundHighKey;
}
- RefPtr<IndexKeyCursorImpl> cursor = IndexKeyCursorImpl::create(m_currentTransaction.get(), cursorOptions);
+ return true;
+}
+
+}
+
+PassRefPtr<IDBBackingStore::Cursor> IDBLevelDBBackingStore::openObjectStoreCursor(int64_t databaseId, int64_t objectStoreId, const IDBKeyRange* range, IDBCursor::Direction direction)
+{
+ IDB_TRACE("IDBLevelDBBackingStore::openObjectStoreCursor");
+ ASSERT(m_currentTransaction);
+ CursorOptions cursorOptions;
+ if (!objectStoreCursorOptions(m_currentTransaction.get(), databaseId, objectStoreId, range, direction, cursorOptions))
+ return 0;
+ RefPtr<ObjectStoreCursorImpl> cursor = ObjectStoreCursorImpl::create(m_currentTransaction.get(), cursorOptions);
if (!cursor->firstSeek())
return 0;
return cursor.release();
}
-PassRefPtr<IDBBackingStore::Cursor> IDBLevelDBBackingStore::openIndexCursor(int64_t databaseId, int64_t objectStoreId, int64_t indexId, const IDBKeyRange* range, IDBCursor::Direction direction)
+PassRefPtr<IDBBackingStore::Cursor> IDBLevelDBBackingStore::openObjectStoreKeyCursor(int64_t databaseId, int64_t objectStoreId, const IDBKeyRange* range, IDBCursor::Direction direction)
{
- IDB_TRACE("IDBLevelDBBackingStore::openIndexCursor");
+ IDB_TRACE("IDBLevelDBBackingStore::openObjectStoreKeyCursor");
ASSERT(m_currentTransaction);
CursorOptions cursorOptions;
- bool lowerBound = range && range->lower();
- bool upperBound = range && range->upper();
- cursorOptions.forward = (direction == IDBCursor::NEXT_NO_DUPLICATE || direction == IDBCursor::NEXT);
- cursorOptions.unique = (direction == IDBCursor::NEXT_NO_DUPLICATE || direction == IDBCursor::PREV_NO_DUPLICATE);
+ if (!objectStoreCursorOptions(m_currentTransaction.get(), databaseId, objectStoreId, range, direction, cursorOptions))
+ return 0;
+ RefPtr<ObjectStoreKeyCursorImpl> cursor = ObjectStoreKeyCursorImpl::create(m_currentTransaction.get(), cursorOptions);
+ if (!cursor->firstSeek())
+ return 0;
- if (!lowerBound) {
- cursorOptions.lowKey = IndexDataKey::encodeMinKey(databaseId, objectStoreId, indexId);
- cursorOptions.lowOpen = false; // Included.
- } else {
- cursorOptions.lowKey = IndexDataKey::encode(databaseId, objectStoreId, indexId, *range->lower());
- cursorOptions.lowOpen = range->lowerOpen();
- }
+ return cursor.release();
+}
- if (!upperBound) {
- cursorOptions.highKey = IndexDataKey::encodeMaxKey(databaseId, objectStoreId, indexId);
- cursorOptions.highOpen = false; // Included.
+PassRefPtr<IDBBackingStore::Cursor> IDBLevelDBBackingStore::openIndexKeyCursor(int64_t databaseId, int64_t objectStoreId, int64_t indexId, const IDBKeyRange* range, IDBCursor::Direction direction)
+{
+ IDB_TRACE("IDBLevelDBBackingStore::openIndexKeyCursor");
+ ASSERT(m_currentTransaction);
+ CursorOptions cursorOptions;
+ if (!indexCursorOptions(m_currentTransaction.get(), databaseId, objectStoreId, indexId, range, direction, cursorOptions))
+ return 0;
+ RefPtr<IndexKeyCursorImpl> cursor = IndexKeyCursorImpl::create(m_currentTransaction.get(), cursorOptions);
+ if (!cursor->firstSeek())
+ return 0;
- if (!cursorOptions.forward) { // We need a key that exists.
- if (!findGreatestKeyLessThanOrEqual(m_currentTransaction.get(), cursorOptions.highKey, cursorOptions.highKey))
- return 0;
- cursorOptions.highOpen = false;
- }
- } else {
- cursorOptions.highKey = IndexDataKey::encode(databaseId, objectStoreId, indexId, *range->upper());
- cursorOptions.highOpen = range->upperOpen();
+ return cursor.release();
+}
- Vector<char> foundHighKey;
- if (!findGreatestKeyLessThanOrEqual(m_currentTransaction.get(), cursorOptions.highKey, foundHighKey)) // Seek to the *last* key in the set of non-unique keys.
- return 0;
-
- // If the target key should not be included, but we end up with a smaller key, we should include that.
- if (cursorOptions.highOpen && compareIndexKeys(foundHighKey, cursorOptions.highKey) < 0)
- cursorOptions.highOpen = false;
-
- cursorOptions.highKey = foundHighKey;
- }
-
+PassRefPtr<IDBBackingStore::Cursor> IDBLevelDBBackingStore::openIndexCursor(int64_t databaseId, int64_t objectStoreId, int64_t indexId, const IDBKeyRange* range, IDBCursor::Direction direction)
+{
+ IDB_TRACE("IDBLevelDBBackingStore::openIndexCursor");
+ ASSERT(m_currentTransaction);
+ CursorOptions cursorOptions;
+ if (!indexCursorOptions(m_currentTransaction.get(), databaseId, objectStoreId, indexId, range, direction, cursorOptions))
+ return 0;
RefPtr<IndexCursorImpl> cursor = IndexCursorImpl::create(m_currentTransaction.get(), cursorOptions);
if (!cursor->firstSeek())
return 0;
