diff options
author | Lester Solbakken <lesters@yahoo-inc.com> | 2017-08-18 12:57:22 +0000 |
---|---|---|
committer | Lester Solbakken <lesters@yahoo-inc.com> | 2017-08-18 12:57:22 +0000 |
commit | 137199441aa224788995c7c5c2f273e9f5ee5b4d (patch) | |
tree | e7e3002eb5d414befa8ae4f5dbad2048ce9d889d /searchlib | |
parent | 256703c082d879f54a3f20e9393320fdb662f996 (diff) |
Make pointer and reference symbol placement consistent
Diffstat (limited to 'searchlib')
3 files changed, 11 insertions, 14 deletions
diff --git a/searchlib/src/tests/features/internal_max_reduce_prod_join_feature/internal_max_reduce_prod_join_feature_test.cpp b/searchlib/src/tests/features/internal_max_reduce_prod_join_feature/internal_max_reduce_prod_join_feature_test.cpp index 596b01c5307..72e2240a12a 100644 --- a/searchlib/src/tests/features/internal_max_reduce_prod_join_feature/internal_max_reduce_prod_join_feature_test.cpp +++ b/searchlib/src/tests/features/internal_max_reduce_prod_join_feature/internal_max_reduce_prod_join_feature_test.cpp @@ -37,7 +37,7 @@ struct SetupFixture addAttribute("doublearray", CollectionType::ARRAY, DataType::DOUBLE); } - void addAttribute(const vespalib::string& name, const CollectionType& collType, const DataType& dataType) { + void addAttribute(const vespalib::string &name, const CollectionType &collType, const DataType &dataType) { FieldInfo attrInfo(FieldType::ATTRIBUTE, collType, name, 0); attrInfo.set_data_type(dataType); indexEnv.getFields().push_back(attrInfo); diff --git a/searchlib/src/vespa/searchlib/features/internal_max_reduce_prod_join_feature.cpp b/searchlib/src/vespa/searchlib/features/internal_max_reduce_prod_join_feature.cpp index 57283b29277..a5d72d399c8 100644 --- a/searchlib/src/vespa/searchlib/features/internal_max_reduce_prod_join_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/internal_max_reduce_prod_join_feature.cpp @@ -29,11 +29,11 @@ namespace features { template <typename BaseType> class RawExecutor : public FeatureExecutor { protected: - const IAttributeVector * _attribute; + const IAttributeVector *_attribute; IntegerVector _queryVector; public: - RawExecutor(const IAttributeVector * attribute, const IntegerVector & queryVector); + RawExecutor(const IAttributeVector *attribute, const IntegerVector &queryVector); void execute(uint32_t docId) override; }; @@ -48,7 +48,7 @@ RawExecutor<BaseType>::RawExecutor(const IAttributeVector *attribute, } template <typename A, typename V> -feature_t maxProduct(const A& array, size_t count, const V& query) +feature_t maxProduct(const A &array, size_t count, const V &query) { feature_t val = -std::numeric_limits<double>::max(); for (size_t i = 0; i < count; ++i) { @@ -83,7 +83,7 @@ private: WeightedIntegerContent _buffer; public: - BufferedExecutor(const IAttributeVector * attribute, const IntegerVector & queryVector); + BufferedExecutor(const IAttributeVector *attribute, const IntegerVector &queryVector); void execute(uint32_t docId) override; }; @@ -136,7 +136,7 @@ InternalMaxReduceProdJoinBlueprint::getDescriptions() const bool InternalMaxReduceProdJoinBlueprint::setup(const IIndexEnvironment &env, const ParameterList ¶ms) { - const FieldInfo* attributeInfo = params[0].asField(); + const FieldInfo *attributeInfo = params[0].asField(); if (attributeInfo == nullptr) { return false; } @@ -154,7 +154,7 @@ InternalMaxReduceProdJoinBlueprint::setup(const IIndexEnvironment &env, const Pa return true; } -bool isImportedAttribute(const IAttributeVector& attribute) noexcept { +bool isImportedAttribute(const IAttributeVector &attribute) noexcept { return dynamic_cast<const ImportedAttributeVector*>(&attribute) != nullptr; } @@ -172,7 +172,7 @@ bool supportsGetRawValues(const A &attr) noexcept { template <typename BaseType> FeatureExecutor & -selectTypedExecutor(const IAttributeVector* attribute, const IntegerVector& vector, vespalib::Stash &stash) +selectTypedExecutor(const IAttributeVector *attribute, const IntegerVector &vector, vespalib::Stash &stash) { if (!isImportedAttribute(*attribute)) { using A = IntegerAttributeTemplate<BaseType>; @@ -191,7 +191,7 @@ selectTypedExecutor(const IAttributeVector* attribute, const IntegerVector& vect } FeatureExecutor & -selectExecutor(const IAttributeVector* attribute, const IntegerVector& vector, vespalib::Stash &stash) +selectExecutor(const IAttributeVector *attribute, const IntegerVector &vector, vespalib::Stash &stash) { if (attribute->getCollectionType() == CollectionType::ARRAY) { switch (attribute->getBasicType()) { diff --git a/searchlib/src/vespa/searchlib/features/internal_max_reduce_prod_join_feature.h b/searchlib/src/vespa/searchlib/features/internal_max_reduce_prod_join_feature.h index 82dfbd3231e..2c576b58345 100644 --- a/searchlib/src/vespa/searchlib/features/internal_max_reduce_prod_join_feature.h +++ b/searchlib/src/vespa/searchlib/features/internal_max_reduce_prod_join_feature.h @@ -34,14 +34,11 @@ public: fef::ParameterDescriptions getDescriptions() const override; fef::Blueprint::UP createInstance() const override; - bool setup(const fef::IIndexEnvironment & env, const fef::ParameterList & params) override; + bool setup(const fef::IIndexEnvironment &env, const fef::ParameterList ¶ms) override; fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; - void visitDumpFeatures(const fef::IIndexEnvironment & env, fef::IDumpFeatureVisitor & visitor) const override; + void visitDumpFeatures(const fef::IIndexEnvironment &env, fef::IDumpFeatureVisitor &visitor) const override; }; } } - - - |