Skip to content

Commit 155a23c

Browse files
committed
Fix rebase issue
1 parent dc3957d commit 155a23c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tiledb/sm/consolidator/consolidator.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void Consolidator::array_consolidate(
155155
throw_if_not_ok(
156156
resources.rest_client()->post_consolidation_to_rest(array_uri, config));
157157
} else {
158-
// Check if array exists
158+
// Check if array exists
159159
if (object_type(resources, array_uri) != ObjectType::ARRAY) {
160160
throw ConsolidatorException(
161161
"Cannot consolidate array; Array does not exist");
@@ -217,7 +217,7 @@ void Consolidator::fragments_consolidate(
217217
storage_manager->resources().rest_client()->post_consolidation_to_rest(
218218
array_uri, config, &fragment_uris));
219219
} else {
220-
// Check if array exists
220+
// Check if array exists
221221
if (object_type(resources, array_uri) != ObjectType::ARRAY) {
222222
throw ConsolidatorException(
223223
"Cannot consolidate array; Array does not exist");
@@ -251,8 +251,8 @@ void Consolidator::fragments_consolidate(
251251
}
252252

253253
// Consolidate
254-
auto fragment_consolidator =
255-
make_shared<FragmentConsolidator>(HERE(), config, storage_manager);
254+
auto fragment_consolidator = make_shared<FragmentConsolidator>(
255+
HERE(), resources, config, storage_manager);
256256
throw_if_not_ok(fragment_consolidator->consolidate_fragments(
257257
array_name,
258258
encryption_type,

0 commit comments

Comments
 (0)