Commit f498c244 authored by dpranke@chromium.org's avatar dpranke@chromium.org

Revert r271097 - "Add most of the metadata-handling code for blobs."

This change caused most of the indexeddb tests to fail on win7 :(.

TBR=ericu@chromium.org
BUG=108012

Review URL: https://codereview.chromium.org/287093004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271146 0039d316-1c4b-4281-b951-d872f2087c98
parent 058c1670
...@@ -308,9 +308,7 @@ class CONTENT_EXPORT IndexedDBBackingStore ...@@ -308,9 +308,7 @@ class CONTENT_EXPORT IndexedDBBackingStore
virtual bool LoadCurrentRow() = 0; virtual bool LoadCurrentRow() = 0;
protected: protected:
Cursor(scoped_refptr<IndexedDBBackingStore> backing_store, Cursor(LevelDBTransaction* transaction,
Transaction* transaction,
int64 database_id,
const CursorOptions& cursor_options); const CursorOptions& cursor_options);
explicit Cursor(const IndexedDBBackingStore::Cursor* other); explicit Cursor(const IndexedDBBackingStore::Cursor* other);
...@@ -321,9 +319,7 @@ class CONTENT_EXPORT IndexedDBBackingStore ...@@ -321,9 +319,7 @@ class CONTENT_EXPORT IndexedDBBackingStore
bool IsPastBounds() const; bool IsPastBounds() const;
bool HaveEnteredRange() const; bool HaveEnteredRange() const;
IndexedDBBackingStore* backing_store_; LevelDBTransaction* transaction_;
Transaction* transaction_;
int64 database_id_;
const CursorOptions cursor_options_; const CursorOptions cursor_options_;
scoped_ptr<LevelDBIterator> iterator_; scoped_ptr<LevelDBIterator> iterator_;
scoped_ptr<IndexedDBKey> current_key_; scoped_ptr<IndexedDBKey> current_key_;
...@@ -403,11 +399,6 @@ class CONTENT_EXPORT IndexedDBBackingStore ...@@ -403,11 +399,6 @@ class CONTENT_EXPORT IndexedDBBackingStore
LevelDBTransaction* transaction() { return transaction_; } LevelDBTransaction* transaction() { return transaction_; }
leveldb::Status GetBlobInfoForRecord(
int64 database_id,
const std::string& object_store_data_key,
IndexedDBValue* value);
// This holds a BlobEntryKey and the encoded IndexedDBBlobInfo vector stored // This holds a BlobEntryKey and the encoded IndexedDBBlobInfo vector stored
// under that key. // under that key.
typedef std::vector<std::pair<BlobEntryKey, std::string> > typedef std::vector<std::pair<BlobEntryKey, std::string> >
...@@ -484,8 +475,6 @@ class CONTENT_EXPORT IndexedDBBackingStore ...@@ -484,8 +475,6 @@ class CONTENT_EXPORT IndexedDBBackingStore
bool is_incognito() const { return !indexed_db_factory_; } bool is_incognito() const { return !indexed_db_factory_; }
bool SetUpMetadata();
virtual bool WriteBlobFile( virtual bool WriteBlobFile(
int64 database_id, int64 database_id,
const Transaction::WriteDescriptor& descriptor, const Transaction::WriteDescriptor& descriptor,
......
...@@ -46,8 +46,7 @@ ...@@ -46,8 +46,7 @@
// <0, 0, 0, 2> => SerializedScriptValue version [DataVersionKey] // <0, 0, 0, 2> => SerializedScriptValue version [DataVersionKey]
// <0, 0, 0, 3> // <0, 0, 0, 3>
// => Blob journal // => Blob journal
// The format of the journal is: // The format of the journal is: {database_id, blobKey}*.
// {database_id (var int), blobKey (var int)}*.
// If the blobKey is kAllBlobsKey, the whole database should be deleted. // If the blobKey is kAllBlobsKey, the whole database should be deleted.
// [BlobJournalKey] // [BlobJournalKey]
// <0, 0, 0, 4> => Live blob journal; same format. [LiveBlobJournalKey] // <0, 0, 0, 4> => Live blob journal; same format. [LiveBlobJournalKey]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment