Change array schema format for schema evolution

test/src/unit-backwards_compat.cc

@@ -1163,4 +1163,4 @@ TEST_CASE(
       delete array;
     }
   }
-}
+}

tiledb/sm/array_schema/array_schema.cc

@@ -721,12 +721,12 @@ void ArraySchema::set_uri(URI& uri) {
   utils::parse::get_timestamp_range(uri_, &timestamp_range_);
 }
 
-Status ArraySchema::get_uri(URI& uri) {
+Status ArraySchema::get_uri(URI* uri) {
   if (uri_.is_invalid()) {
     return LOG_STATUS(
         Status::ArraySchemaError("Error in ArraySchema; invalid URI"));
   }
-  uri = uri_;
+  *uri = uri_;
   return Status::Ok();
 }
 
@@ -738,12 +738,12 @@ const std::string& ArraySchema::name() {
   return name_;
 }
 
-Status ArraySchema::get_name(std::string& name) const {
+Status ArraySchema::get_name(std::string* name) const {
   if (name_.empty()) {
     return LOG_STATUS(
         Status::ArraySchemaError("Error in ArraySchema; Empty name"));
   }
-  name = name_;
+  *name = name_;
   return Status::Ok();
 }
 

tiledb/sm/array_schema/array_schema.h

@@ -313,13 +313,13 @@ class ArraySchema {
   void set_uri(URI& uri);
 
   /** Get schema URI with return status */
-  Status get_uri(URI& uri);
+  Status get_uri(URI* uri);
 
   /** Returns the schema name. If it is not set, will build it */
   const std::string& name();
 
   /** Returns the schema name. If it is not set, will returns error status */
-  Status get_name(std::string& name) const;
+  Status get_name(std::string* name) const;
 
  private:
   /* ********************************* */

tiledb/sm/fragment/fragment_metadata.cc

@@ -90,7 +90,7 @@ FragmentMetadata::FragmentMetadata(
     idx_map_[dim_name] = array_schema_->attribute_num() + 1 + i;
   }
 
-  array_schema_->get_name(array_schema_name_);
+  array_schema_->get_name(&array_schema_name_);
 }
 
 FragmentMetadata::~FragmentMetadata() = default;
@@ -2187,10 +2187,7 @@ Status FragmentMetadata::write_generic_tile_offsets(Buffer* buff) const {
 
 Status FragmentMetadata::write_array_schema_name(Buffer* buff) const {
   uint64_t size = array_schema_name_.size();
-  Status status = buff->write(&size, sizeof(uint64_t));
-  if (!status.ok()) {
-    return status;
-  }
+  RETURN_NOT_OK(buff->write(&size, sizeof(uint64_t)));
   return buff->write(array_schema_name_.c_str(), size);
 }
 

tiledb/sm/misc/utils.cc

@@ -277,7 +277,7 @@ Status get_fragment_name_version(const std::string& name, uint32_t* version) {
     // version is greater than or equal to 7, we have a footer version of 4.
     // Otherwise, it is version 3.
     const int frag_version = std::stoi(name.substr(name.find_last_of('_') + 1));
-    if (frag_version >= 8)
+    if (frag_version >= 10)
       *version = 5;
     else if (frag_version >= 7)
       *version = 4;

tiledb/sm/storage_manager/storage_manager.cc

@@ -1572,19 +1572,18 @@ Status StorageManager::get_array_schema_uris(
     const URI& array_uri, std::vector<URI>* uris) const {
   STATS_START_TIMER(stats::GlobalStats::TimerType::READ_GET_ARRAY_SCHEMAS)
 
+  // Always add array_name/__array_schema.tdb as the first schema uri
+  uris->clear();
+  auto schema_uri_old = array_uri.join_path(constants::array_schema_filename);
+  uris->emplace_back(schema_uri_old);
+
+  // Add schema uris under directory array_name/__schema
   const URI schema_uri =
       array_uri.join_path(constants::array_schema_folder_name);
-  bool is_dir = false;
-  RETURN_NOT_OK(vfs_->is_dir(schema_uri, &is_dir));
-  if (!is_dir) {
-    // If it is not a directory, the array schema could be stored in the
-    // previous format
-    uris->clear();
-    return Status::Ok();
-  }
-  RETURN_NOT_OK(vfs_->ls(schema_uri, uris));
-  // Sort schema URIs
-  std::sort(uris->begin(), uris->end());
+
+  // Since ls could return NOT Ok status, we will not use RETURN_NOT_OK here
+  vfs_->ls(schema_uri, uris);
+
   return Status::Ok();
 
   STATS_END_TIMER(stats::GlobalStats::TimerType::READ_GET_ARRAY_SCHEMAS)
@@ -1594,13 +1593,12 @@ Status StorageManager::get_latest_array_schema_uri(
     const URI& array_uri, URI* uri) const {
   STATS_START_TIMER(stats::GlobalStats::TimerType::READ_GET_LATEST_ARRAY_SCHEMA)
   std::vector<URI> uris;
-  Status status = get_array_schema_uris(array_uri, &uris);
-  if (status.ok() && (!uris.empty())) {
-    *uri = uris.back();
-  } else {
-    // For older version, array schema file is under the array folder
-    *uri = array_uri.join_path(constants::array_schema_filename);
+  RETURN_NOT_OK(get_array_schema_uris(array_uri, &uris));
+  if (uris.size() == 0) {
+    return LOG_STATUS(Status::StorageManagerError(
+        "Can not get the latest array schema; Empty array schemas."));
   }
+  *uri = uris.back();
   if (uri->is_invalid()) {
     return LOG_STATUS(
         Status::StorageManagerError("Could not find array schema URI"));