Skip to content

Commit

Permalink
Fix rebase issue
Browse files Browse the repository at this point in the history
  • Loading branch information
ypatia committed Jun 21, 2024
1 parent dc3957d commit 155a23c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tiledb/sm/consolidator/consolidator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void Consolidator::array_consolidate(
throw_if_not_ok(
resources.rest_client()->post_consolidation_to_rest(array_uri, config));
} else {
// Check if array exists
// Check if array exists
if (object_type(resources, array_uri) != ObjectType::ARRAY) {
throw ConsolidatorException(
"Cannot consolidate array; Array does not exist");
Expand Down Expand Up @@ -217,7 +217,7 @@ void Consolidator::fragments_consolidate(
storage_manager->resources().rest_client()->post_consolidation_to_rest(
array_uri, config, &fragment_uris));
} else {
// Check if array exists
// Check if array exists
if (object_type(resources, array_uri) != ObjectType::ARRAY) {
throw ConsolidatorException(
"Cannot consolidate array; Array does not exist");
Expand Down Expand Up @@ -251,8 +251,8 @@ void Consolidator::fragments_consolidate(
}

// Consolidate
auto fragment_consolidator =
make_shared<FragmentConsolidator>(HERE(), config, storage_manager);
auto fragment_consolidator = make_shared<FragmentConsolidator>(
HERE(), resources, config, storage_manager);
throw_if_not_ok(fragment_consolidator->consolidate_fragments(
array_name,
encryption_type,
Expand Down

0 comments on commit 155a23c

Please sign in to comment.