Use a templated find() to enable lookup without object creation when objects are comparable.

2 files changed, 24 insertions, 15 deletions

diff --git a/searchcommon/src/vespa/searchcommon/common/schema.cpp b/searchcommon/src/vespa/searchcommon/common/schema.cpp
index 5e9db03bf31..cef74409024 100644
--- a/searchcommon/src/vespa/searchcommon/common/schema.cpp
+++ b/searchcommon/src/vespa/searchcommon/common/schema.cpp
@@ -4,6 +4,7 @@
 #include <fstream>
 #include <vespa/config/common/configparser.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/vespalib/stllike/hashtable.hpp>
 #include <vespa/fastos/file.h>
 
 #include <vespa/log/log.h>
@@ -421,6 +422,25 @@ Schema::getFieldSetId(vespalib::stringref name) const
     return getFieldId(name, _fieldSetIds);
 }
 
+bool
+Schema::isIndexField(vespalib::stringref name) const
+{
+    return _indexIds.find(name) != _indexIds.end();
+}
+
+bool
+Schema::isSummaryField(vespalib::stringref name) const
+{
+    return _summaryIds.find(name) != _summaryIds.end();
+}
+
+bool
+Schema::isAttributeField(vespalib::stringref name) const
+{
+    return _attributeIds.find(name) != _attributeIds.end();
+}
+
+
 void
 Schema::swap(Schema &rhs)
 {
diff --git a/searchcommon/src/vespa/searchcommon/common/schema.h b/searchcommon/src/vespa/searchcommon/common/schema.h
index d066ccb0a27..f8020d6ed9a 100644
--- a/searchcommon/src/vespa/searchcommon/common/schema.h
+++ b/searchcommon/src/vespa/searchcommon/common/schema.h
@@ -293,11 +293,7 @@ public:
      * @return true if field is an index field.
      * @param name the name of the field.
      **/
-    bool
-    isIndexField(vespalib::stringref name) const
-    {
-        return _indexIds.find(name) != _indexIds.end();
-    }
+    bool isIndexField(vespalib::stringref name) const;
 
     /**
      * Check if a field is a summary field
@@ -305,22 +301,15 @@ public:
      * @return true if field is an summary field.
      * @param name the name of the field.
      **/
-    bool
-    isSummaryField(vespalib::stringref name) const
-    {
-        return _summaryIds.find(name) != _summaryIds.end();
-    }
+    bool isSummaryField(vespalib::stringref name) const;
+
     /**
      * Check if a field is a attribute field
      *
      * @return true if field is an attribute field.
      * @param name the name of the field.
      **/
-    bool
-    isAttributeField(vespalib::stringref name) const
-    {
-        return _attributeIds.find(name) != _attributeIds.end();
-    }
+    bool isAttributeField(vespalib::stringref name) const;
 
     /**
      * Get information about a specific attribute field using the given fieldId.