multipart upload support for global order writes - part3

TileDB-Inc · Aug 24, 2022 · 49cabd6 · 49cabd6
1 parent 68ca839
commit 49cabd6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/tiledb/sm/filesystem/s3.h b/tiledb/sm/filesystem/s3.h
@@ -93,6 +93,10 @@ namespace sm {
  * maintains buffer caches for writing into the various attribute files.
  */
 class S3 {
+ private:
+  /** Forward declaration */
+  struct MultiPartUploadState;
+
  public:
   /* ********************************* */
   /*     CONSTRUCTORS & DESTRUCTORS    */
@@ -399,7 +403,7 @@ class S3 {
    * @return Status
    */
   Status set_multipart_upload_state(
-      const URI& uri, const MultiPartUploadState& state);
+      const URI& uri, const S3::MultiPartUploadState& state);
 
  private:
   /* ********************************* */

diff --git a/tiledb/sm/filesystem/vfs.cc b/tiledb/sm/filesystem/vfs.cc
@@ -1833,13 +1833,14 @@ VFS::multipart_upload_state(const URI& uri) const {
 
 Status VFS::set_multipart_upload_state(
     const URI& uri, const MultiPartUploadState& state) {
+  (void)state;
   if (uri.is_s3()) {
 #ifdef HAVE_S3
     S3::MultiPartUploadState s3_state;
     s3_state.part_number = state.part_number;
     s3_state.upload_id = *state.upload_id;
     for (auto& part : state.completed_parts) {
-      auto rv = s3_state.completed_parts.emplace(part.part_number);
+      auto rv = s3_state.completed_parts.try_emplace(part.part_number);
       rv.first->second.SetETag(part.e_tag->c_str());
       rv.first->second.SetPartNumber(part.part_number);
     }

diff --git a/tiledb/sm/serialization/query.cc b/tiledb/sm/serialization/query.cc
@@ -1179,9 +1179,7 @@ Status writer_from_capnp(
       RETURN_NOT_OK(global_writer->init_global_write_state());
     }
     RETURN_NOT_OK(global_write_state_from_capnp(
-        query,
-        writer_reader.getGlobalWriteState(),
-        global_writer->get_global_state()));
+        query, writer_reader.getGlobalWriteState(), global_writer));
   }
 
   return Status::Ok();
@@ -2749,7 +2747,9 @@ Status global_write_state_to_capnp(
 Status global_write_state_from_capnp(
     const Query& query,
     const capnp::GlobalWriteState::Reader& state_reader,
-    GlobalOrderWriter::GlobalWriteState* write_state) {
+    GlobalOrderWriter* globalwriter) {
+  auto write_state = globalwriter->get_global_state();
+
   if (state_reader.hasCellsWritten()) {
     auto& cells_written = write_state->cells_written_;
     auto cell_written_reader = state_reader.getCellsWritten();
@@ -2977,7 +2977,7 @@ Status global_write_state_from_capnp(
         }
 
         RETURN_NOT_OK(
-            globalwriter.set_multipart_upload_state(uri, deserialized_state));
+            globalwriter->set_multipart_upload_state(uri, deserialized_state));
       }
     }
   }
@@ -3021,7 +3021,7 @@ Status global_write_state_to_capnp(
 Status global_write_state_from_capnp(
     const Query& query,
     const capnp::GlobalWriteState::Builder& state_reader,
-    GlobalOrderWriter::GlobalWriteState* write_state) {
+    GlobalOrderWriter* globalwriter) {
   return LOG_STATUS(Status_SerializationError(
       "Cannot serialize; serialization not enabled."));
 }

diff --git a/tiledb/sm/serialization/query.h b/tiledb/sm/serialization/query.h
@@ -202,7 +202,7 @@ Status global_write_state_to_capnp(
 Status global_write_state_from_capnp(
     const Query& query,
     const capnp::GlobalWriteState::Reader& state_reader,
-    GlobalOrderWriter::GlobalWriteState* write_state);
+    GlobalOrderWriter* globalwriter);
 
 Status condition_from_capnp(
     const capnp::Condition::Reader& condition_reader,