Skip to content

Commit

Permalink
Remove use of Status by Tile classes (#4483)
Browse files Browse the repository at this point in the history
This is a standard mechanical removal of the Status class from the
headers in `tiledb/sm/tile/*.h` and then fixing every compiler error
that comes up.

---
TYPE: NO_HISTORY
DESC: Remove use of Status by Tile classes
  • Loading branch information
davisp authored Nov 2, 2023
1 parent 836f981 commit 6134a69
Show file tree
Hide file tree
Showing 19 changed files with 362 additions and 407 deletions.
4 changes: 2 additions & 2 deletions test/src/test-capi-dimension-label-encrypted.cc
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ TEST_CASE_METHOD(
tiledb_array_schema_t* loaded_array_schema{nullptr};
check_tiledb_error_with(
tiledb_array_schema_load(ctx, array_name.c_str(), &loaded_array_schema),
"[TileDB::TileIO] Error: Error reading generic tile; tile is encrypted "
"GenericTileIO: Error reading generic tile; tile is encrypted "
"with AES_256_GCM but given key is for NO_ENCRYPTION");

// Check the array schema can be loaded with the encryption key.
Expand All @@ -123,7 +123,7 @@ TEST_CASE_METHOD(
tiledb_array_schema_t* loaded_label_array_schema{nullptr};
require_tiledb_error_with(
tiledb_array_schema_load(ctx, dim_label_uri, &loaded_label_array_schema),
"[TileDB::TileIO] Error: Error reading generic tile; tile is encrypted "
"GenericTileIO: Error reading generic tile; tile is encrypted "
"with AES_256_GCM but given key is for NO_ENCRYPTION");

// Check the dimension label can be opened with the encryption key.
Expand Down
2 changes: 1 addition & 1 deletion test/src/unit-DenseTiler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ template <class T>
bool DenseTilerFx::check_tile(WriterTile& tile, const std::vector<T>& data) {
std::vector<T> tile_data(data.size());
CHECK(tile.size_as<T>() == data.size());
CHECK(tile.read(&tile_data[0], 0, data.size() * sizeof(T)).ok());
CHECK_NOTHROW(tile.read(&tile_data[0], 0, data.size() * sizeof(T)));
CHECK(tile_data == data);
return tile_data == data;
}
Expand Down
Loading

0 comments on commit 6134a69

Please sign in to comment.