[Backport release-2.30] Update group URI to Logical URI coming from the Server (#5702)

tiledb/sm/group/group.cc

@@ -317,6 +317,12 @@ const shared_ptr<GroupDetails> Group::group_details() const {
   return group_details_;
 }
 
+void Group::set_uri(const URI& uri) {
+  std::lock_guard<std::mutex> lck(mtx_);
+  group_uri_ = uri;
+  group_details_->set_group_uri(uri);
+}
+
 QueryType Group::get_query_type() const {
   // Error if the group is not open
   if (!is_open_) {

tiledb/sm/group/group.h

@@ -423,6 +423,13 @@ class Group {
    */
   const shared_ptr<GroupDetails> group_details() const;
 
+  /**
+   * Set the group URI
+   *
+   * @param uri
+   */
+  void set_uri(const URI& uri);
+
  protected:
   /* ********************************* */
   /*       PROTECTED ATTRIBUTES        */

tiledb/sm/group/group_details.cc

@@ -36,6 +36,7 @@
 #include "tiledb/sm/enums/datatype.h"
 #include "tiledb/sm/enums/encryption_type.h"
 #include "tiledb/sm/enums/query_type.h"
+#include "tiledb/sm/filesystem/uri.h"
 #include "tiledb/sm/global_state/unit_test_config.h"
 #include "tiledb/sm/group/group_details_v1.h"
 #include "tiledb/sm/group/group_details_v2.h"
@@ -260,6 +261,11 @@ const URI& GroupDetails::group_uri() const {
   return group_uri_;
 }
 
+void GroupDetails::set_group_uri(const URI& uri) {
+  std::lock_guard<std::mutex> lck(mtx_);
+  group_uri_ = uri;
+}
+
 uint64_t GroupDetails::member_count() const {
   std::lock_guard<std::mutex> lck(mtx_);
 

tiledb/sm/group/group_details.h

@@ -184,6 +184,9 @@ class GroupDetails {
   /** Returns the group URI. */
   const URI& group_uri() const;
 
+  /** Sets the group URI. */
+  void set_group_uri(const URI& uri);
+
   /**
    * Get count of members
    *

tiledb/sm/serialization/group.cc

@@ -184,6 +184,11 @@ Status group_details_from_capnp(
     group->set_metadata_loaded(true);
   }
 
+  if (group_details_reader.hasLogicalURI()) {
+    const char* logical_uri = group_details_reader.getLogicalURI().cStr();
+    group->set_uri(URI(logical_uri));
+  }
+
   group->group_details()->set_modified();
 
   return Status::Ok();

tiledb/sm/serialization/tiledb-rest.capnp

@@ -996,6 +996,8 @@ struct Group {
 
     metadata  @1 :ArrayMetadata;
     # metadata attached to group
+
+    logicalURI @2 :Text;
   }
 
   config @0 :Config;

tiledb/sm/serialization/tiledb-rest.capnp.h

@@ -1387,7 +1387,7 @@ struct Group::GroupDetails {
   class Pipeline;
 
   struct _capnpPrivate {
-    CAPNP_DECLARE_STRUCT_HEADER(a2ea10c715b475c1, 0, 2)
+    CAPNP_DECLARE_STRUCT_HEADER(a2ea10c715b475c1, 0, 3)
 #if !CAPNP_LITE
     static constexpr ::capnp::_::RawBrandedSchema const* brand() {
       return &schema->defaultBrand;
@@ -12205,6 +12205,9 @@ class Group::GroupDetails::Reader {
   inline ::tiledb::sm::serialization::capnp::ArrayMetadata::Reader getMetadata()
       const;
 
+  inline bool hasLogicalURI() const;
+  inline ::capnp::Text::Reader getLogicalURI() const;
+
  private:
   ::capnp::_::StructReader _reader;
   template <typename, ::capnp::Kind>
@@ -12277,6 +12280,13 @@ class Group::GroupDetails::Builder {
   inline ::capnp::Orphan<::tiledb::sm::serialization::capnp::ArrayMetadata>
   disownMetadata();
 
+  inline bool hasLogicalURI();
+  inline ::capnp::Text::Builder getLogicalURI();
+  inline void setLogicalURI(::capnp::Text::Reader value);
+  inline ::capnp::Text::Builder initLogicalURI(unsigned int size);
+  inline void adoptLogicalURI(::capnp::Orphan<::capnp::Text>&& value);
+  inline ::capnp::Orphan<::capnp::Text> disownLogicalURI();
+
  private:
   ::capnp::_::StructBuilder _builder;
   template <typename, ::capnp::Kind>
@@ -29915,6 +29925,47 @@ Group::GroupDetails::Builder::disownMetadata() {
           _builder.getPointerField(::capnp::bounded<1>() * ::capnp::POINTERS));
 }
 
+inline bool Group::GroupDetails::Reader::hasLogicalURI() const {
+  return !_reader.getPointerField(::capnp::bounded<2>() * ::capnp::POINTERS)
+              .isNull();
+}
+inline bool Group::GroupDetails::Builder::hasLogicalURI() {
+  return !_builder.getPointerField(::capnp::bounded<2>() * ::capnp::POINTERS)
+              .isNull();
+}
+inline ::capnp::Text::Reader Group::GroupDetails::Reader::getLogicalURI()
+    const {
+  return ::capnp::_::PointerHelpers<::capnp::Text>::get(
+      _reader.getPointerField(::capnp::bounded<2>() * ::capnp::POINTERS));
+}
+inline ::capnp::Text::Builder Group::GroupDetails::Builder::getLogicalURI() {
+  return ::capnp::_::PointerHelpers<::capnp::Text>::get(
+      _builder.getPointerField(::capnp::bounded<2>() * ::capnp::POINTERS));
+}
+inline void Group::GroupDetails::Builder::setLogicalURI(
+    ::capnp::Text::Reader value) {
+  ::capnp::_::PointerHelpers<::capnp::Text>::set(
+      _builder.getPointerField(::capnp::bounded<2>() * ::capnp::POINTERS),
+      value);
+}
+inline ::capnp::Text::Builder Group::GroupDetails::Builder::initLogicalURI(
+    unsigned int size) {
+  return ::capnp::_::PointerHelpers<::capnp::Text>::init(
+      _builder.getPointerField(::capnp::bounded<2>() * ::capnp::POINTERS),
+      size);
+}
+inline void Group::GroupDetails::Builder::adoptLogicalURI(
+    ::capnp::Orphan<::capnp::Text>&& value) {
+  ::capnp::_::PointerHelpers<::capnp::Text>::adopt(
+      _builder.getPointerField(::capnp::bounded<2>() * ::capnp::POINTERS),
+      kj::mv(value));
+}
+inline ::capnp::Orphan<::capnp::Text>
+Group::GroupDetails::Builder::disownLogicalURI() {
+  return ::capnp::_::PointerHelpers<::capnp::Text>::disown(
+      _builder.getPointerField(::capnp::bounded<2>() * ::capnp::POINTERS));
+}
+
 inline bool GroupUpdate::Reader::hasConfig() const {
   return !_reader.getPointerField(::capnp::bounded<0>() * ::capnp::POINTERS)
               .isNull();