summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@oath.com>2018-08-12 22:35:04 +0200
committerHenning Baldersheim <balder@oath.com>2018-08-12 22:35:04 +0200
commitd38b49ddb881a67250ed738382d1ff72283cd45b (patch)
tree150bd862d7d66a2928b8b45773102ccedfb50eff /searchlib
parentfded37d945ca2539c96621b9ae33806ebbadf875 (diff)
Remove whitespace
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/vespa/searchlib/attribute/attributevector.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/attribute/attributevector.h6
-rw-r--r--searchlib/src/vespa/searchlib/expression/documentfieldnode.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/expression/stringbucketresultnode.h4
-rw-r--r--searchlib/src/vespa/searchlib/expression/stringresultnode.h4
-rw-r--r--searchlib/src/vespa/searchlib/features/dotproductfeature.h6
-rw-r--r--searchlib/src/vespa/searchlib/fef/blueprint.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/fef/blueprint.h2
-rw-r--r--searchlib/src/vespa/searchlib/fef/parametervalidator.h2
-rw-r--r--searchlib/src/vespa/searchlib/index/indexbuilder.h2
-rw-r--r--searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.h4
-rw-r--r--searchlib/src/vespa/searchlib/query/queryterm.cpp2
13 files changed, 20 insertions, 20 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
index fbeaaa6070c..e86c3018242 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
@@ -118,7 +118,7 @@ AttributeVector::BaseName::getSnapshotName() const
AttributeVector::BaseName::string
-AttributeVector::BaseName::createAttributeName(vespalib::stringref s)
+AttributeVector::BaseName::createAttributeName(vespalib::stringref s)
{
size_t p(s.rfind('/'));
if (p == string::npos) {
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h
index 53736a62572..21ffe811a80 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h
@@ -131,7 +131,7 @@ public:
: string(s),
_name(createAttributeName(s))
{ }
- BaseName & operator = (vespalib::stringref s) {
+ BaseName & operator = (vespalib::stringref s) {
BaseName n(s);
std::swap(*this, n);
return *this;
@@ -147,7 +147,7 @@ public:
const string & getAttributeName() const { return _name; }
string getDirName() const;
private:
- static string createAttributeName(vespalib::stringref s);
+ static string createAttributeName(vespalib::stringref s);
string _name;
};
@@ -403,7 +403,7 @@ public:
BasicType getInternalBasicType() const { return _config.basicType(); }
CollectionType getInternalCollectionType() const { return _config.collectionType(); }
const BaseName & getBaseFileName() const { return _baseFileName; }
- void setBaseFileName(vespalib::stringref name) { _baseFileName = name; }
+ void setBaseFileName(vespalib::stringref name) { _baseFileName = name; }
// Implements IAttributeVector
const vespalib::string & getName() const override final { return _baseFileName.getAttributeName(); }
diff --git a/searchlib/src/vespa/searchlib/expression/documentfieldnode.cpp b/searchlib/src/vespa/searchlib/expression/documentfieldnode.cpp
index 6ae90642383..b0884d51db9 100644
--- a/searchlib/src/vespa/searchlib/expression/documentfieldnode.cpp
+++ b/searchlib/src/vespa/searchlib/expression/documentfieldnode.cpp
@@ -49,7 +49,7 @@ DocumentFieldNode & DocumentFieldNode::operator = (const DocumentFieldNode & rhs
}
std::unique_ptr<ResultNode>
-deduceResultNode(vespalib::stringref fieldName, const FieldValue & fv, bool preserveAccurateTypes, bool nestedMultiValue)
+deduceResultNode(vespalib::stringref fieldName, const FieldValue & fv, bool preserveAccurateTypes, bool nestedMultiValue)
{
std::unique_ptr<ResultNode> value;
const Identifiable::RuntimeClass & cInfo = fv.getClass();
diff --git a/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp b/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp
index a072e06d811..603600847b7 100644
--- a/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp
+++ b/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp
@@ -40,7 +40,7 @@ StringBucketResultNode::StringBucketResultNode()
: _from(new StringResultNode()),
_to(new StringResultNode())
{}
-StringBucketResultNode::StringBucketResultNode(vespalib::stringref from, vespalib::stringref to)
+StringBucketResultNode::StringBucketResultNode(vespalib::stringref from, vespalib::stringref to)
: _from(new StringResultNode(from)),
_to(new StringResultNode(to))
{}
diff --git a/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.h b/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.h
index c53fa06487c..dac84febeeb 100644
--- a/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.h
+++ b/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.h
@@ -23,7 +23,7 @@ public:
DECLARE_EXPRESSIONNODE(StringBucketResultNode);
DECLARE_NBO_SERIALIZE;
StringBucketResultNode();
- StringBucketResultNode(vespalib::stringref from, vespalib::stringref to);
+ StringBucketResultNode(vespalib::stringref from, vespalib::stringref to);
StringBucketResultNode(ResultNode::UP from, ResultNode::UP to) : _from(from.release()), _to(to.release()) {}
~StringBucketResultNode();
size_t hash() const override;
@@ -32,7 +32,7 @@ public:
int contains(const ConstBufferRef & v) const { return contains(v.c_str()); }
int contains(const char * v) const;
void visitMembers(vespalib::ObjectVisitor &visitor) const override;
- StringBucketResultNode &setRange(vespalib::stringref from, vespalib::stringref to) {
+ StringBucketResultNode &setRange(vespalib::stringref from, vespalib::stringref to) {
_from.reset(new StringResultNode(from));
_to.reset(new StringResultNode(to));
return *this;
diff --git a/searchlib/src/vespa/searchlib/expression/stringresultnode.h b/searchlib/src/vespa/searchlib/expression/stringresultnode.h
index a071467e76c..2e8ddd57d94 100644
--- a/searchlib/src/vespa/searchlib/expression/stringresultnode.h
+++ b/searchlib/src/vespa/searchlib/expression/stringresultnode.h
@@ -13,14 +13,14 @@ public:
DECLARE_NBO_SERIALIZE;
void visitMembers(vespalib::ObjectVisitor &visitor) const override;
StringResultNode(const char * v="") : _value(v) { }
- StringResultNode(vespalib::stringref v) : _value(v) { }
+ StringResultNode(vespalib::stringref v) : _value(v) { }
size_t hash() const override;
int onCmp(const Identifiable & b) const override;
void set(const ResultNode & rhs) override;
StringResultNode & append(const ResultNode & rhs);
StringResultNode & clear() { _value.clear(); return *this; }
const vespalib::string & get() const { return _value; }
- void set(vespalib::stringref value) { _value = value; }
+ void set(vespalib::stringref value) { _value = value; }
void min(const ResultNode & b) override;
void max(const ResultNode & b) override;
void add(const ResultNode & b) override;
diff --git a/searchlib/src/vespa/searchlib/features/dotproductfeature.h b/searchlib/src/vespa/searchlib/features/dotproductfeature.h
index 61fb418636d..c350494db0e 100644
--- a/searchlib/src/vespa/searchlib/features/dotproductfeature.h
+++ b/searchlib/src/vespa/searchlib/features/dotproductfeature.h
@@ -73,7 +73,7 @@ public:
**/
class IntegerVector : public VectorBase<int64_t, int64_t, feature_t> {
public:
- void insert(vespalib::stringref label, vespalib::stringref value) {
+ void insert(vespalib::stringref label, vespalib::stringref value) {
_vector.push_back(std::make_pair(util::strToNum<int64_t>(label), util::strToNum<feature_t>(value)));
}
};
@@ -85,7 +85,7 @@ class StringVector : public VectorBase<vespalib::string, const char *, feature_t
public:
StringVector();
~StringVector();
- void insert(vespalib::stringref label, vespalib::stringref value) {
+ void insert(vespalib::stringref label, vespalib::stringref value) {
_vector.push_back(std::make_pair(label, util::strToNum<feature_t>(value)));
}
};
@@ -98,7 +98,7 @@ private:
const search::attribute::IAttributeVector * _attribute;
public:
EnumVector(const search::attribute::IAttributeVector * attribute) : _attribute(attribute) {}
- void insert(vespalib::stringref label, vespalib::stringref value) {
+ void insert(vespalib::stringref label, vespalib::stringref value) {
search::attribute::EnumHandle e;
if (_attribute->findEnum(label.data(), e)) {
_vector.push_back(std::make_pair(e, util::strToNum<feature_t>(value)));
diff --git a/searchlib/src/vespa/searchlib/fef/blueprint.cpp b/searchlib/src/vespa/searchlib/fef/blueprint.cpp
index 4e1ccee99c4..6e04ede5253 100644
--- a/searchlib/src/vespa/searchlib/fef/blueprint.cpp
+++ b/searchlib/src/vespa/searchlib/fef/blueprint.cpp
@@ -27,7 +27,7 @@ Blueprint::describeOutput(vespalib::stringref outName,
_dependency_handler->define_output(outName, type);
}
-Blueprint::Blueprint(vespalib::stringref baseName)
+Blueprint::Blueprint(vespalib::stringref baseName)
: _baseName(baseName),
_name(),
_dependency_handler(nullptr)
diff --git a/searchlib/src/vespa/searchlib/fef/blueprint.h b/searchlib/src/vespa/searchlib/fef/blueprint.h
index 617edbd0613..53c06dbd4cc 100644
--- a/searchlib/src/vespa/searchlib/fef/blueprint.h
+++ b/searchlib/src/vespa/searchlib/fef/blueprint.h
@@ -107,7 +107,7 @@ public:
* class. The @ref setup method is used to tailor a blueprint
* object for a specific set of parameters.
**/
- Blueprint(vespalib::stringref baseName);
+ Blueprint(vespalib::stringref baseName);
/**
* Obtain the base name of this blueprint. This method will
diff --git a/searchlib/src/vespa/searchlib/fef/parametervalidator.h b/searchlib/src/vespa/searchlib/fef/parametervalidator.h
index baf2260957e..6e0fd7199c8 100644
--- a/searchlib/src/vespa/searchlib/fef/parametervalidator.h
+++ b/searchlib/src/vespa/searchlib/fef/parametervalidator.h
@@ -43,7 +43,7 @@ public:
Result & operator=(Result &&) = default;
~Result();
Result & addParameter(const Parameter & param) { _params.push_back(param); return *this; }
- Result & setError(vespalib::stringref str) {
+ Result & setError(vespalib::stringref str) {
_errorStr = str;
_params.clear();
_valid = false;
diff --git a/searchlib/src/vespa/searchlib/index/indexbuilder.h b/searchlib/src/vespa/searchlib/index/indexbuilder.h
index 4c79e744da6..e5769ccdb75 100644
--- a/searchlib/src/vespa/searchlib/index/indexbuilder.h
+++ b/searchlib/src/vespa/searchlib/index/indexbuilder.h
@@ -24,7 +24,7 @@ public:
~IndexBuilder();
virtual void
- startWord(vespalib::stringref word) = 0;
+ startWord(vespalib::stringref word) = 0;
virtual void
endWord() = 0;
diff --git a/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.h b/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.h
index c4583d7f49f..5b4ab7eb4fd 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.h
@@ -43,8 +43,8 @@ public:
class KeyComp {
private:
- const WordStore &_wordStore;
- const vespalib::stringref _word;
+ const WordStore &_wordStore;
+ const vespalib::stringref _word;
const char *
getWord(datastore::EntryRef wordRef) const
diff --git a/searchlib/src/vespa/searchlib/query/queryterm.cpp b/searchlib/src/vespa/searchlib/query/queryterm.cpp
index dc23f5f34c0..c48def1b24d 100644
--- a/searchlib/src/vespa/searchlib/query/queryterm.cpp
+++ b/searchlib/src/vespa/searchlib/query/queryterm.cpp
@@ -348,7 +348,7 @@ QueryTermSimple::~QueryTermSimple() = default;
namespace {
-bool isFullRange(vespalib::stringref s) {
+bool isFullRange(vespalib::stringref s) {
const size_t sz(s.size());
return (sz >= 3u) &&
(s[0] == '<' || s[0] == '[') &&