Changed resources() to a const accessor

TileDB-Inc · Sep 5, 2024 · 3dc230b · 3dc230b
1 parent c1ccef9
commit 3dc230b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 13 deletions.
diff --git a/tiledb/sm/consolidator/consolidator.h b/tiledb/sm/consolidator/consolidator.h
@@ -235,7 +235,7 @@ class Consolidator : public JobBranch {
   /**
    * Derived from `JobBranch`
    */
-  ContextResources& resources() override {
+  ContextResources& resources() const override {
     return resources_;
   }
 

diff --git a/tiledb/sm/query/dimension_label/array_dimension_label_queries.h b/tiledb/sm/query/dimension_label/array_dimension_label_queries.h
@@ -250,7 +250,7 @@ class ArrayDimensionLabelQueries : public JobBranch {
   /**
    * Derived from `JobBranch`
    */
-  ContextResources& resources() override {
+  ContextResources& resources() const override {
     return resources_;
   }
 };

diff --git a/tiledb/sm/query/query.h b/tiledb/sm/query/query.h
@@ -1197,7 +1197,7 @@ class Query : public JobBranch {
   /**
    * Derived from `JobBranch`
    */
-  ContextResources& resources() override {
+  ContextResources& resources() const override {
     return resources_;
   }
 };

diff --git a/tiledb/sm/storage_manager/context.h b/tiledb/sm/storage_manager/context.h
@@ -165,7 +165,7 @@ class Context : public ContextBase, public JobRoot {
   /**
    * Derived from `JobRoot`
    */
-  [[nodiscard]] ContextResources& resources() override {
+  [[nodiscard]] ContextResources& resources() const override {
     return resources_;
   }
 

diff --git a/tiledb/sm/storage_manager/job.h b/tiledb/sm/storage_manager/job.h
@@ -157,7 +157,7 @@ struct JobResourceMixin {
      * Each class derived from `Parent` implements its own resources accessor.
      * Typically this accessor will simply return its own member variable.
      */
-    [[nodiscard]] virtual ContextResources& resources() = 0;
+    [[nodiscard]] virtual ContextResources& resources() const = 0;
 
     /**
      * Factory for cancellation source objects that are tied to the cancellation

diff --git a/tiledb/sm/storage_manager/test/unit_job.cc b/tiledb/sm/storage_manager/test/unit_job.cc
@@ -232,18 +232,24 @@ TEST_CASE("job::Child - construct and size") {
   CHECK(jf.context_.number_of_jobs() == 0);
 }
 
-class TestJobRoot : public JobRoot {
+
+class TestJobRootBase {
+ protected:
   Config config_{};
-  ContextResources resources_{
+  mutable ContextResources resources_{
       config_, std::make_shared<Logger>("log"), 1, 1, ""};
   StorageManager sm_{resources_, config_};
+  TestJobRootBase() = default;
+};
 
+class TestJobRoot : protected TestJobRootBase, public JobRoot {
+  using Base = TestJobRootBase;
  public:
   TestJobRoot()
-      : JobRoot(sm_) {
+      : TestJobRootBase(), JobRoot(Base::sm_) {
   }
-  ContextResources& resources() override {
-    return resources_;
+  ContextResources& resources() const override {
+    return Base::resources_;
   }
 };
 static_assert(TestJobRoot::is_parent);
@@ -258,7 +264,7 @@ class TestJobBranch : public JobBranch {
   TestJobBranch(JobParent& parent)
       : JobBranch(parent) {
   }
-  ContextResources& resources() override {
+  ContextResources& resources() const override {
     return parent().resources();
   }
 };
@@ -297,15 +303,20 @@ TEST_CASE("TestJobLeaf - construct from branch") {
   TestJobLeaf leaf{branch};
 }
 
-class TestJobIsolate : public JobIsolate {
+class TestJobIsolateBase {
+ protected:
   Config config_{};
   ContextResources resources_{
       config_, std::make_shared<Logger>("log"), 1, 1, ""};
   StorageManager sm_{resources_, config_};
+  TestJobIsolateBase() = default;
+};
 
+class TestJobIsolate : protected TestJobIsolateBase, public JobIsolate {
+  using Base = TestJobIsolateBase;
  public:
   TestJobIsolate()
-      : JobIsolate(sm_) {
+      : TestJobIsolateBase(), JobIsolate(Base::sm_) {
   }
 };
 static_assert(!TestJobIsolate::is_parent);