Fix compile errors.

Author: teo-tsirpanis

tiledb/sm/query/writers/unordered_writer.cc

@@ -165,6 +165,10 @@ std::string UnorderedWriter::name() {
   return "UnorderedWriter";
 }
 
+ContextResources* UnorderedWriter::resources() {
+  return &storage_manager_->resources();
+}
+
 /* ****************************** */
 /*        PRIVATE METHODS         */
 /* ****************************** */

tiledb/sm/query/writers/unordered_writer.h

@@ -85,12 +85,10 @@ class UnorderedWriter : public WriterBase {
   std::string name();
 
   /** Returns the context resources of the writer. */
-  ContextResources* resources() {
-    return &storage_manager_->resources();
-  }
+  ContextResources* resources();
 
   /** Set fragment metadata. */
-  Status set_frag_meta(shared_ptr<FragmentMetadata> frag_meta) {
+  void set_frag_meta(shared_ptr<FragmentMetadata> frag_meta) {
     frag_meta_ = frag_meta;
   }
 

tiledb/sm/serialization/capnp_utils.h

@@ -173,18 +173,21 @@ std::vector<T> capnp_list_to_vector(
 /**
  * Converts a capnproto list of lists of primitives to a vector of vectors.
  *
+ * @tparam T The type of items in the capnproto list.
+ * @tparam TConverted The type of items in the resulting vector.
+ * Defaults to T.
  * @param has_value whether the list actually contains any value.
  * @param list The capnproto list.
  * @param initial_size The initial size of the returning value.
  */
-template <class T>
-std::vector<std::vector<T>> capnp_2d_list_to_vector(
+template <class T, class TConverted = T>
+std::vector<std::vector<TConverted>> capnp_2d_list_to_vector(
     bool has_value,
     typename ::capnp::List<
         typename ::capnp::List<T, ::capnp::Kind::PRIMITIVE>,
         ::capnp::Kind::LIST>::Reader list,
     uint64_t initial_size = 0) {
-  std::vector<std::vector<T>> result(initial_size);
+  std::vector<std::vector<TConverted>> result(initial_size);
   if (has_value) {
     result.reserve(list.size());
     for (const auto& t : list) {
@@ -483,7 +486,7 @@ Status copy_capnp_list(
   return Status::Ok();
 }
 
-void serialize_non_empty_domain_rv(
+inline void serialize_non_empty_domain_rv(
     capnp::NonEmptyDomainList::Builder& builder,
     const NDRange& nonEmptyDomain,
     uint32_t dim_num) {
@@ -519,15 +522,15 @@ void serialize_non_empty_domain_rv(
  * @param builder Builder to set subarray onto
  * @param array Array to get nonEmptyDomain from
  */
-void serialize_non_empty_domain(
+inline void serialize_non_empty_domain(
     capnp::NonEmptyDomainList::Builder& builder, tiledb::sm::Array* array) {
   serialize_non_empty_domain_rv(
       builder,
       array->non_empty_domain(),
       array->array_schema_latest().dim_num());
 }
 
-NDRange deserialize_non_empty_domain_rv(
+inline NDRange deserialize_non_empty_domain_rv(
     const capnp::NonEmptyDomainList::Reader& reader) {
   NDRange ndRange;
   if (reader.hasNonEmptyDomains() && reader.getNonEmptyDomains().size() > 0) {
@@ -560,7 +563,7 @@ NDRange deserialize_non_empty_domain_rv(
  * @param builder Builder to get nonEmptyDomain from
  * @param array Array to set the nonEmptyDomain on
  */
-void deserialize_non_empty_domain(
+inline void deserialize_non_empty_domain(
     const capnp::NonEmptyDomainList::Reader& reader, tiledb::sm::Array* array) {
   array->set_non_empty_domain(deserialize_non_empty_domain_rv(reader));
 }

tiledb/sm/serialization/fragment_metadata.cc

@@ -239,13 +239,13 @@ shared_ptr<FragmentMetadata> fragment_metadata_from_capnp(
       utils::capnp_2d_list_to_vector<uint8_t>(
           frag_meta_reader.hasTileMinBuffer(),
           frag_meta_reader.getTileMinBuffer()),
-      utils::capnp_2d_list_to_vector<uint8_t>(
+      utils::capnp_2d_list_to_vector<uint8_t, char>(
           frag_meta_reader.hasTileMinVarBuffer(),
           frag_meta_reader.getTileMinVarBuffer()),
       utils::capnp_2d_list_to_vector<uint8_t>(
           frag_meta_reader.hasTileMaxBuffer(),
           frag_meta_reader.getTileMaxBuffer()),
-      utils::capnp_2d_list_to_vector<uint8_t>(
+      utils::capnp_2d_list_to_vector<uint8_t, char>(
           frag_meta_reader.hasTileMaxVarBuffer(),
           frag_meta_reader.getTileMaxVarBuffer()),
       utils::capnp_2d_list_to_vector<uint8_t>(

tiledb/sm/serialization/query.cc

@@ -3036,10 +3036,8 @@ Status global_write_state_from_capnp(
   write_state->last_hilbert_value_ = state_reader.getLastHilbertValue();
 
   if (state_reader.hasFragMeta()) {
-    auto frag_meta = write_state->frag_meta_;
-    auto frag_meta_reader = state_reader.getFragMeta();
-    RETURN_NOT_OK(fragment_metadata_from_capnp(
-        query.array_schema_shared(), frag_meta_reader, frag_meta));
+    write_state->frag_meta_ = fragment_metadata_from_capnp(
+        query.array_schema_shared(), state_reader.getFragMeta());
   }
 
   // Deserialize the multipart upload state