Skip to content

Commit 6e95f2b

Browse files
committed
Fix tests
1 parent bc4a152 commit 6e95f2b

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

tiledb/sm/serialization/query.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ Subarray subarray_from_capnp(
359359
}
360360
}
361361

362+
auto frag_meta_size = array->opened_array()->fragment_metadata().size();
362363
return {
363364
array,
364365
layout,
@@ -368,7 +369,8 @@ Subarray subarray_from_capnp(
368369
is_default,
369370
label_range_subset,
370371
attr_range_subset,
371-
relevant_fragments,
372+
reader.hasRelevantFragments() ? relevant_fragments :
373+
RelevantFragments(frag_meta_size),
372374
coalesce_ranges};
373375
}
374376

tiledb/sm/subarray/subarray.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Subarray::Subarray(
159159
std::vector<bool> is_default,
160160
std::vector<optional<Subarray::LabelRangeSubset>> label_range_subset,
161161
std::unordered_map<std::string, std::vector<Range>> attr_range_subset,
162-
std::vector<unsigned int> relevant_fragments,
162+
RelevantFragments relevant_fragments,
163163
bool coalesce_ranges)
164164
: stats_(stats)
165165
, logger_(std::move(logger))
@@ -171,7 +171,7 @@ Subarray::Subarray(
171171
, attr_range_subset_(std::move(attr_range_subset))
172172
, is_default_(std::move(is_default))
173173
, est_result_size_computed_(false)
174-
, relevant_fragments_(relevant_fragments)
174+
, relevant_fragments_(std::move(relevant_fragments))
175175
, coalesce_ranges_(coalesce_ranges)
176176
, ranges_sorted_(false) {
177177
}

tiledb/sm/subarray/subarray.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ class Subarray {
350350
std::vector<bool> is_default,
351351
std::vector<optional<LabelRangeSubset>> label_range_subset,
352352
std::unordered_map<std::string, std::vector<Range>> attr_range_subset,
353-
std::vector<unsigned int> relevant_fragments,
353+
RelevantFragments relevant_fragments,
354354
bool coalesce_ranges = true);
355355

356356
/**

0 commit comments

Comments
 (0)