[Storage] Blob Storage Refactoring pt 1

content/browser/loader/upload_data_stream_builder.cc

 // Copyright 2013 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.
 
 #include "content/browser/loader/upload_data_stream_builder.h"
 
 #include "base/logging.h"
 #include "content/browser/fileapi/upload_file_system_file_element_reader.h"
 #include "content/common/resource_request_body.h"
 #include "net/base/elements_upload_data_stream.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_file_element_reader.h"
 #include "storage/browser/blob/blob_data_handle.h"
 #include "storage/browser/blob/blob_storage_context.h"
-
-using storage::BlobData;
-using storage::BlobDataHandle;
-using storage::BlobStorageContext;
+#include "storage/common/blob/blob_data.h"
 
 namespace content {
 namespace {
 
 // A subclass of net::UploadBytesElementReader which owns ResourceRequestBody.
 class BytesElementReader : public net::UploadBytesElementReader {
  public:
   BytesElementReader(ResourceRequestBody* resource_request_body,
                      const ResourceRequestBody::Element& element)
       : net::UploadBytesElementReader(element.bytes(), element.length()),
@@ skipping 38 matching lines @@
     storage::BlobStorageContext* blob_context,
     const ResourceRequestBody::Element& element,
     std::vector<const ResourceRequestBody::Element*>* resolved_elements) {
   DCHECK(blob_context);
   scoped_ptr<storage::BlobDataHandle> handle =
       blob_context->GetBlobDataFromUUID(element.blob_uuid());
   DCHECK(handle);
   if (!handle)
     return;
 
+  // TODO(dmurph): store this snapshot.  This works for now, as the items

[mmenke, 2015/01/20 22:03:57]

nit:  Capitalize S

[dmurph, 2015/01/21 22:40:11]

Done.

+  // that the snapshot points to are refcounted and kept in memory.  But as

[mmenke, 2015/01/20 22:03:57]

Should mention that they're attached to the request by the RDH.  (+1 to cleaning
that up - the current ownership model is weird and ugly)

[dmurph, 2015/01/21 22:40:11]

Done.

+  // soon as we implement evicting to disk this will break, so we need a reader
+  // that can store this snapshot and have it used below instead of this
+  // decomposition.

[michaeln, 2015/01/21 01:46:41]

It would be really good to store snapshots in this CL so spilling over to disk
isn't gated on a reader type.

I think if the snapshot class derived from base::SupportsUserData::Data, it
could be attached to the ResourceRequestBody*, which SupportsUserData, passed
into Build(). Having that class derive from userdata makes sense sense to me
it's intended as a 'scoping' device for various operations (same reason it makes
sense for BDH to derived from that class).

[dmurph, 2015/01/21 22:40:11]

Done.

+  scoped_ptr<storage::BlobDataSnapshot> snapshot = handle->CreateSnapshot();
   // If there is no element in the referred blob data, just return.
-  if (handle->data()->items().empty())
+  if (snapshot->items().empty())
     return;
 
   // Append the elements in the referenced blob data.
-  for (size_t i = 0; i < handle->data()->items().size(); ++i) {
-    const BlobData::Item& item = handle->data()->items().at(i);
-    DCHECK_NE(BlobData::Item::TYPE_BLOB, item.type());
-    resolved_elements->push_back(&item);
+  for (const auto& item : snapshot->items()) {
+    DCHECK_NE(storage::DataElement::TYPE_BLOB, item->type());
+    resolved_elements->push_back(item->data_element_ptr());
   }
 }
 
 }  // namespace
 
 scoped_ptr<net::UploadDataStream> UploadDataStreamBuilder::Build(
     ResourceRequestBody* body,
-    BlobStorageContext* blob_context,
+    storage::BlobStorageContext* blob_context,
     storage::FileSystemContext* file_system_context,
     base::TaskRunner* file_task_runner) {
   // Resolve all blob elements.
   std::vector<const ResourceRequestBody::Element*> resolved_elements;
   for (size_t i = 0; i < body->elements()->size(); ++i) {
     const ResourceRequestBody::Element& element = (*body->elements())[i];
     if (element.type() == ResourceRequestBody::Element::TYPE_BLOB)
       ResolveBlobReference(blob_context, element, &resolved_elements);
     else
       resolved_elements.push_back(&element);
@@ skipping 17 matching lines @@
         element_readers.push_back(
             new content::UploadFileSystemFileElementReader(
                 file_system_context,
                 element.filesystem_url(),
                 element.offset(),
                 element.length(),
                 element.expected_modification_time()));
         break;
       case ResourceRequestBody::Element::TYPE_BLOB:
         // Blob elements should be resolved beforehand.
+        // TODO(dmurph): Create blob reader and store the snapshot in there.
         NOTREACHED();
         break;
       case ResourceRequestBody::Element::TYPE_UNKNOWN:
         NOTREACHED();
         break;
     }
   }
 
   return make_scoped_ptr(
       new net::ElementsUploadDataStream(element_readers.Pass(),
                                         body->identifier()));
 }
 
 }  // namespace content