Unify on using reference where possible.

2 files changed, 21 insertions, 18 deletions

diff --git a/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp b/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp
index 27f2f3bb5d0..7d994ee4cd6 100644
--- a/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp
+++ b/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp
@@ -39,13 +39,16 @@ struct WeightOrder {
 };
 
 struct RememberExecuteInfo : public MyLeaf {
-    ExecuteInfo executeInfo;
+    bool   is_strict;
+    double hit_rate;
 
-    using MyLeaf::MyLeaf;
+    RememberExecuteInfo() : MyLeaf(), is_strict(false), hit_rate(0.0) {}
+    RememberExecuteInfo(FieldSpecBaseList fields) : MyLeaf(std::move(fields)), is_strict(false), hit_rate(0.0) {}
 
     void fetchPostings(const ExecuteInfo &execInfo) override {
         LeafBlueprint::fetchPostings(execInfo);
-        executeInfo = execInfo;
+        is_strict = execInfo.is_strict();
+        hit_rate = execInfo.hit_rate();
     }
 };
 
@@ -134,11 +137,11 @@ TEST("test And propagates updated histestimate") {
     EXPECT_EQUAL(3u, bp->childCnt());
     for (uint32_t i = 0; i < bp->childCnt(); i++) {
         const auto & child = dynamic_cast<const RememberExecuteInfo &>(bp->getChild(i));
-        EXPECT_EQUAL((i == 0), child.executeInfo.is_strict());
+        EXPECT_EQUAL((i == 0), child.is_strict);
     }
-    EXPECT_EQUAL(1.0, dynamic_cast<const RememberExecuteInfo &>(bp->getChild(0)).executeInfo.hit_rate());
-    EXPECT_EQUAL(1.0/250, dynamic_cast<const RememberExecuteInfo &>(bp->getChild(1)).executeInfo.hit_rate());
-    EXPECT_EQUAL(1.0/(250*25), dynamic_cast<const RememberExecuteInfo &>(bp->getChild(2)).executeInfo.hit_rate());
+    EXPECT_EQUAL(1.0, dynamic_cast<const RememberExecuteInfo &>(bp->getChild(0)).hit_rate);
+    EXPECT_EQUAL(1.0/250, dynamic_cast<const RememberExecuteInfo &>(bp->getChild(1)).hit_rate);
+    EXPECT_EQUAL(1.0/(250*25), dynamic_cast<const RememberExecuteInfo &>(bp->getChild(2)).hit_rate);
 }
 
 TEST("test Or propagates updated histestimate") {
@@ -154,12 +157,12 @@ TEST("test Or propagates updated histestimate") {
     EXPECT_EQUAL(4u, bp->childCnt());
     for (uint32_t i = 0; i < bp->childCnt(); i++) {
         const auto & child = dynamic_cast<const RememberExecuteInfo &>(bp->getChild(i));
-        EXPECT_TRUE(child.executeInfo.is_strict());
+        EXPECT_TRUE(child.is_strict);
     }
-    EXPECT_EQUAL(1.0, dynamic_cast<const RememberExecuteInfo &>(bp->getChild(0)).executeInfo.hit_rate());
-    EXPECT_APPROX(0.5, dynamic_cast<const RememberExecuteInfo &>(bp->getChild(1)).executeInfo.hit_rate(), 1e-6);
-    EXPECT_APPROX(0.5*3.0/5.0, dynamic_cast<const RememberExecuteInfo &>(bp->getChild(2)).executeInfo.hit_rate(), 1e-6);
-    EXPECT_APPROX(0.5*3.0*42.0/(5.0*50.0), dynamic_cast<const RememberExecuteInfo &>(bp->getChild(3)).executeInfo.hit_rate(), 1e-6);
+    EXPECT_EQUAL(1.0, dynamic_cast<const RememberExecuteInfo &>(bp->getChild(0)).hit_rate);
+    EXPECT_APPROX(0.5, dynamic_cast<const RememberExecuteInfo &>(bp->getChild(1)).hit_rate, 1e-6);
+    EXPECT_APPROX(0.5*3.0/5.0, dynamic_cast<const RememberExecuteInfo &>(bp->getChild(2)).hit_rate, 1e-6);
+    EXPECT_APPROX(0.5*3.0*42.0/(5.0*50.0), dynamic_cast<const RememberExecuteInfo &>(bp->getChild(3)).hit_rate, 1e-6);
 }
 
 TEST("test And Blueprint") {
diff --git a/searchlib/src/tests/queryeval/blueprint/mysearch.h b/searchlib/src/tests/queryeval/blueprint/mysearch.h
index 6cfc7a04368..db7dd2adae6 100644
--- a/searchlib/src/tests/queryeval/blueprint/mysearch.h
+++ b/searchlib/src/tests/queryeval/blueprint/mysearch.h
@@ -58,10 +58,10 @@ public:
         if (!_isLeaf) {
             ok &= (_md == &md);
         }
-        for (size_t i = 0; i < _children.size(); ++i) {
-            MySearch *child = dynamic_cast<MySearch *>(_children[i].get());
-            ok &= (child != 0);
-            if (child != 0) {
+        for (const auto & my_search : _children) {
+            auto *child = dynamic_cast<MySearch *>(my_search.get());
+            ok &= (child != nullptr);
+            if (child != nullptr) {
                 ok &= child->verifyAndInferImpl(md);
             }
         }
@@ -80,8 +80,8 @@ public:
     }
 
     static bool verifyAndInfer(SearchIterator *search, MatchData &md) {
-        MySearch *self = dynamic_cast<MySearch *>(search);
-        if (self == 0) {
+        auto *self = dynamic_cast<MySearch *>(search);
+        if (self == nullptr) {
             return false;
         } else {
             return self->verifyAndInferImpl(md);