Pass FieldIdT by value in FieldSearcher.

5 files changed, 7 insertions, 7 deletions

diff --git a/streamingvisitors/src/vespa/vsm/common/document.h b/streamingvisitors/src/vespa/vsm/common/document.h
index de9ab052aa1..365d0e33ed0 100644
--- a/streamingvisitors/src/vespa/vsm/common/document.h
+++ b/streamingvisitors/src/vespa/vsm/common/document.h
@@ -13,7 +13,7 @@ namespace vespalib {
 namespace vsm {
 
 /// Type to identify fields in documents.
-using FieldIdT = unsigned int;
+using FieldIdT = uint32_t;
 /// A type to represent a list of FieldIds.
 using FieldIdTList = std::vector<FieldIdT>;
 /// A type to represent all the fields contained in all the indexs.
diff --git a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
index cbf8903caab..3fc668ca691 100644
--- a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
@@ -67,7 +67,7 @@ void FieldSearcherBase::prepare(const QueryTermList & qtl)
     }
 }
 
-FieldSearcher::FieldSearcher(const FieldIdT & fId, bool defaultPrefix) :
+FieldSearcher::FieldSearcher(FieldIdT fId, bool defaultPrefix) :
     FieldSearcherBase(),
     _field(fId),
     _matchType(defaultPrefix ? PREFIX : REGULAR),
diff --git a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h
index 879902ca514..abc2bc9d870 100644
--- a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h
@@ -52,7 +52,7 @@ public:
         EXACT
     };
 
-    FieldSearcher(const FieldIdT & fId, bool defaultPrefix=false);
+    FieldSearcher(FieldIdT fId, bool defaultPrefix=false);
     ~FieldSearcher() override;
     virtual std::unique_ptr<FieldSearcher> duplicate() const = 0;
     bool search(const StorageDocument & doc);
@@ -61,8 +61,8 @@ public:
                          const vsm::FieldPathMapT& field_paths,
                          search::fef::IQueryEnvironment& query_env);
 
-    const FieldIdT & field()         const { return _field; }
-    void field(const FieldIdT & v)         { _field = v; prepareFieldId(); }
+    FieldIdT field()                 const { return _field; }
+    void field(FieldIdT v)                 { _field = v; prepareFieldId(); }
     bool prefix()                    const { return _matchType == PREFIX; }
     bool substring()                 const { return _matchType == SUBSTRING; }
     bool suffix()                    const { return _matchType == SUFFIX; }
diff --git a/streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.cpp
index 045ec9b04a3..f064760e55d 100644
--- a/streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.cpp
@@ -52,7 +52,7 @@ NearestNeighborFieldSearcher::NodeAndCalc::NodeAndCalc(search::streaming::Neares
 {
 }
 
-NearestNeighborFieldSearcher::NearestNeighborFieldSearcher(const FieldIdT& fid,
+NearestNeighborFieldSearcher::NearestNeighborFieldSearcher(FieldIdT fid,
                                                            search::attribute::DistanceMetric metric)
     : FieldSearcher(fid),
       _metric(metric),
diff --git a/streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.h b/streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.h
index 83f2c444e5a..ba39b91c677 100644
--- a/streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.h
@@ -38,7 +38,7 @@ private:
     std::vector<NodeAndCalc> _calcs;
 
 public:
-    NearestNeighborFieldSearcher(const FieldIdT& fid,
+    NearestNeighborFieldSearcher(FieldIdT fid,
                                  search::attribute::DistanceMetric metric);
     ~NearestNeighborFieldSearcher();