Plumb latest schema name through deserialization.

Author: shaunrd0

tiledb/sm/array/array.cc

@@ -919,16 +919,13 @@ std::vector<shared_ptr<const Enumeration>> Array::get_enumerations(
         names_to_load.push_back(enmr_name);
       }
 
-      loaded = rest_client
-                   ->post_enumerations_from_rest(
-                       array_uri_,
-                       array_dir_timestamp_start_,
-                       array_dir_timestamp_end_,
-                       this,
-                       names_to_load,
-                       memory_tracker_)
-                   .begin()
-                   ->second;
+      loaded = rest_client->post_enumerations_from_rest(
+          array_uri_,
+          array_dir_timestamp_start_,
+          array_dir_timestamp_end_,
+          this,
+          names_to_load,
+          memory_tracker_)[array_schema_latest().name()];
     } else {
       // Create a vector of paths to be loaded.
       std::vector<std::string> paths_to_load;

tiledb/sm/rest/rest_client_remote.cc

@@ -658,7 +658,7 @@ RestClientRemote::post_enumerations_from_rest(
   // Ensure data has a null delimiter for cap'n proto if using JSON
   throw_if_not_ok(ensure_json_null_delimited_string(&returned_data));
   return serialization::deserialize_load_enumerations_response(
-      serialization_type_, returned_data, memory_tracker);
+      *array, serialization_type_, returned_data, memory_tracker);
 }
 
 void RestClientRemote::post_query_plan_from_rest(

tiledb/sm/serialization/enumeration.cc

@@ -190,6 +190,7 @@ void load_enumerations_response_to_capnp(
 std::unordered_map<std::string, std::vector<shared_ptr<const Enumeration>>>
 load_enumerations_response_from_capnp(
     const capnp::LoadEnumerationsResponse::Reader& reader,
+    const Array& array,
     shared_ptr<MemoryTracker> memory_tracker) {
   std::unordered_map<std::string, std::vector<shared_ptr<const Enumeration>>>
       ret;
@@ -202,7 +203,7 @@ load_enumerations_response_from_capnp(
     }
     // The name of the array schema will not be used if we only loaded
     // enumerations on the latest array schema.
-    return {{"", loaded_enmrs}};
+    return {{array.array_schema_latest().name(), loaded_enmrs}};
   } else if (reader.hasAllEnumerations()) {
     auto all_enmrs_reader = reader.getAllEnumerations();
     for (auto enmr_entry_reader : all_enmrs_reader.getEntries()) {
@@ -343,6 +344,7 @@ void serialize_load_enumerations_response(
 
 std::unordered_map<std::string, std::vector<shared_ptr<const Enumeration>>>
 deserialize_load_enumerations_response(
+    const Array& array,
     SerializationType serialize_type,
     span<const char> response,
     shared_ptr<MemoryTracker> memory_tracker) {
@@ -355,7 +357,8 @@ deserialize_load_enumerations_response(
             message_builder.initRoot<capnp::LoadEnumerationsResponse>();
         json.decode(kj::StringPtr(response.data(), response.size()), builder);
         capnp::LoadEnumerationsResponse::Reader reader = builder.asReader();
-        return load_enumerations_response_from_capnp(reader, memory_tracker);
+        return load_enumerations_response_from_capnp(
+            reader, array, memory_tracker);
       }
       case SerializationType::CAPNP: {
         const auto mBytes = reinterpret_cast<const kj::byte*>(response.data());
@@ -364,7 +367,8 @@ deserialize_load_enumerations_response(
             response.size() / sizeof(::capnp::word)));
         capnp::LoadEnumerationsResponse::Reader reader =
             array_reader.getRoot<capnp::LoadEnumerationsResponse>();
-        return load_enumerations_response_from_capnp(reader, memory_tracker);
+        return load_enumerations_response_from_capnp(
+            reader, array, memory_tracker);
       }
       default: {
         throw EnumerationSerializationException(
@@ -408,7 +412,10 @@ void serialize_load_enumerations_response(
 
 std::unordered_map<std::string, std::vector<shared_ptr<const Enumeration>>>
 deserialize_load_enumerations_response(
-    SerializationType, span<const char>, shared_ptr<MemoryTracker>) {
+    const Array&,
+    SerializationType,
+    span<const char>,
+    shared_ptr<MemoryTracker>) {
   throw EnumerationSerializationDisabledException();
 }
 

tiledb/sm/serialization/enumeration.h

@@ -92,6 +92,7 @@ void serialize_load_enumerations_response(
 
 std::unordered_map<std::string, std::vector<shared_ptr<const Enumeration>>>
 deserialize_load_enumerations_response(
+    const Array& array,
     SerializationType serialization_type,
     span<const char> response,
     shared_ptr<MemoryTracker> memory_tracker);