Skip to content

Commit 2f29592

Browse files
committed
Address some PR feedback.
1 parent 0ad881e commit 2f29592

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

tiledb/sm/fragment/fragment_metadata.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ class FragmentMetadata {
791791
URI validity_uri(const std::string& name) const;
792792

793793
/** Return the array schema name. */
794-
const std::string& array_schema_name() const {
794+
inline const std::string& array_schema_name() const {
795795
return array_schema_name_;
796796
}
797797

@@ -1122,7 +1122,7 @@ class FragmentMetadata {
11221122
*
11231123
* @return
11241124
*/
1125-
const shared_ptr<const ArraySchema>& array_schema() const {
1125+
inline const shared_ptr<const ArraySchema>& array_schema() const {
11261126
return array_schema_;
11271127
}
11281128

tiledb/sm/query/strategy_base.cc

-5
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "tiledb/sm/misc/tdb_time.h"
3939
#include "tiledb/sm/query/query_buffer.h"
4040
#include "tiledb/sm/storage_manager/context_resources.h"
41-
#include "tiledb/sm/storage_manager/storage_manager.h"
4241

4342
namespace tiledb {
4443
namespace sm {
@@ -64,10 +63,6 @@ StrategyBase::StrategyBase(
6463
, offsets_bitsize_(constants::cell_var_offset_size * 8) {
6564
}
6665

67-
ContextResources& StrategyBase::resources() const {
68-
return storage_manager_->resources();
69-
}
70-
7166
void StrategyBase::set_stats(const stats::StatsData& data) {
7267
stats_->populate_with_data(data);
7368
}

tiledb/sm/query/strategy_base.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "tiledb/sm/array_schema/dimension.h"
4040
#include "tiledb/sm/misc/types.h"
4141
#include "tiledb/sm/storage_manager/context_resources.h"
42-
#include "tiledb/sm/storage_manager/storage_manager_declaration.h"
42+
#include "tiledb/sm/storage_manager/storage_manager.h"
4343

4444
namespace tiledb {
4545
namespace sm {
@@ -208,7 +208,9 @@ class StrategyBase {
208208
/* ********************************* */
209209

210210
/** Returns the context resources of the writer. */
211-
ContextResources& resources() const;
211+
inline ContextResources& resources() const {
212+
return storage_manager_->resources();
213+
}
212214

213215
/** Returns `stats_`. */
214216
inline stats::Stats* stats() const {

0 commit comments

Comments
 (0)