From c37136242e8fdf628b64e79a0bad265657ce61aa Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Sat, 13 May 2023 16:56:09 +0200 Subject: Remove unused field/attribute access hinting. --- .../searchcore/proton/matching/indexenvironment.cpp | 6 ------ .../searchcore/proton/matching/indexenvironment.h | 2 -- .../src/vespa/searchlib/features/agefeature.cpp | 3 +-- .../vespa/searchlib/features/attributefeature.cpp | 1 - .../searchlib/features/attributematchfeature.cpp | 1 - .../searchlib/features/debug_attribute_wait.cpp | 3 +-- .../src/vespa/searchlib/features/distancefeature.cpp | 14 +++++--------- .../src/vespa/searchlib/features/distancefeature.h | 4 ++-- .../searchlib/features/distancetopathfeature.cpp | 4 +--- .../vespa/searchlib/features/dotproductfeature.cpp | 3 +-- .../features/element_completeness_feature.cpp | 1 - .../features/element_similarity_feature.cpp | 1 - .../features/euclidean_distance_feature.cpp | 3 +-- .../vespa/searchlib/features/fieldinfofeature.cpp | 1 - .../vespa/searchlib/features/fieldmatchfeature.cpp | 1 - .../searchlib/features/fieldtermmatchfeature.cpp | 3 +-- .../searchlib/features/flow_completeness_feature.cpp | 1 - .../features/great_circle_distance_feature.cpp | 5 ++--- .../features/great_circle_distance_feature.h | 2 +- .../internal_max_reduce_prod_join_feature.cpp | 3 +-- .../features/jarowinklerdistancefeature.cpp | 1 - .../searchlib/features/nativefieldmatchfeature.cpp | 1 - .../searchlib/features/nativeproximityfeature.cpp | 1 - .../vespa/searchlib/features/proximityfeature.cpp | 3 +-- .../searchlib/features/querycompletenessfeature.cpp | 3 +-- .../searchlib/features/reverseproximityfeature.cpp | 3 +-- .../features/tensor_from_weighted_set_feature.cpp | 3 --- .../searchlib/features/term_field_md_feature.cpp | 3 +-- .../searchlib/features/termeditdistancefeature.cpp | 1 - .../searchlib/features/text_similarity_feature.cpp | 3 +-- .../src/vespa/searchlib/fef/iindexenvironment.h | 20 -------------------- .../src/vespa/searchlib/fef/test/indexenvironment.h | 2 -- .../src/vespa/searchvisitor/indexenvironment.cpp | 4 ---- .../src/vespa/searchvisitor/indexenvironment.h | 4 ---- 34 files changed, 22 insertions(+), 92 deletions(-) diff --git a/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.cpp b/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.cpp index 6fceb0db87f..e6b6022b34b 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.cpp @@ -161,12 +161,6 @@ IndexEnvironment::hintFeatureMotivation(FeatureMotivation motivation) const { _motivation = motivation; } -void -IndexEnvironment::hintFieldAccess(uint32_t ) const { } - -void -IndexEnvironment::hintAttributeAccess(const string &) const { } - IndexEnvironment::~IndexEnvironment() = default; } diff --git a/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.h b/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.h index 1fa6c7c3917..686833e6af1 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.h +++ b/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.h @@ -61,8 +61,6 @@ public: const search::fef::ITableManager &getTableManager() const override; FeatureMotivation getFeatureMotivation() const override; void hintFeatureMotivation(FeatureMotivation motivation) const override; - void hintFieldAccess(uint32_t fieldId) const override; - void hintAttributeAccess(const string &name) const override; uint32_t getDistributionKey() const override { return _distributionKey; } vespalib::eval::ConstantValue::UP getConstantValue(const vespalib::string &name) const override { diff --git a/searchlib/src/vespa/searchlib/features/agefeature.cpp b/searchlib/src/vespa/searchlib/features/agefeature.cpp index d0ba622219f..42c2b50868f 100644 --- a/searchlib/src/vespa/searchlib/features/agefeature.cpp +++ b/searchlib/src/vespa/searchlib/features/agefeature.cpp @@ -50,14 +50,13 @@ AgeBlueprint::visitDumpFeatures(const search::fef::IIndexEnvironment &, } bool -AgeBlueprint::setup(const search::fef::IIndexEnvironment &env, +AgeBlueprint::setup(const search::fef::IIndexEnvironment&, const search::fef::ParameterList ¶ms) { _attribute = params[0].getValue(); defineInput("now"); describeOutput("out", "The age of the document, in seconds."); - env.hintAttributeAccess(_attribute); return true; } diff --git a/searchlib/src/vespa/searchlib/features/attributefeature.cpp b/searchlib/src/vespa/searchlib/features/attributefeature.cpp index dae1ccc994b..68f1d352179 100644 --- a/searchlib/src/vespa/searchlib/features/attributefeature.cpp +++ b/searchlib/src/vespa/searchlib/features/attributefeature.cpp @@ -534,7 +534,6 @@ AttributeBlueprint::setup(const fef::IIndexEnvironment & env, describeOutput("count", "Returns the number of elements in this array or weighted set attribute."); _numOutputs = 4; } - env.hintAttributeAccess(_attrName); return !_tensorType.is_error(); } diff --git a/searchlib/src/vespa/searchlib/features/attributematchfeature.cpp b/searchlib/src/vespa/searchlib/features/attributematchfeature.cpp index 54a7c225dcd..e0a4d292f11 100644 --- a/searchlib/src/vespa/searchlib/features/attributematchfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/attributematchfeature.cpp @@ -333,7 +333,6 @@ AttributeMatchBlueprint::setup(const IIndexEnvironment & env, describeOutput("averageWeight", "totalWeight/matches"); describeOutput("maxWeight", "The max weight of the attribute keys matched in a weighted set attribute"); - env.hintAttributeAccess(_params.attrInfo->name()); return true; } diff --git a/searchlib/src/vespa/searchlib/features/debug_attribute_wait.cpp b/searchlib/src/vespa/searchlib/features/debug_attribute_wait.cpp index a19b5c7daa1..eaff6b2a942 100644 --- a/searchlib/src/vespa/searchlib/features/debug_attribute_wait.cpp +++ b/searchlib/src/vespa/searchlib/features/debug_attribute_wait.cpp @@ -68,13 +68,12 @@ DebugAttributeWaitBlueprint::createInstance() const } bool -DebugAttributeWaitBlueprint::setup(const IIndexEnvironment &env, const ParameterList ¶ms) +DebugAttributeWaitBlueprint::setup(const IIndexEnvironment &, const ParameterList ¶ms) { _attribute = params[0].getValue(); _params.busyWait = (params[1].asDouble() == 1.0); describeOutput("out", "actual time waited"); - env.hintAttributeAccess(_attribute); return true; } diff --git a/searchlib/src/vespa/searchlib/features/distancefeature.cpp b/searchlib/src/vespa/searchlib/features/distancefeature.cpp index 4f98625d0e1..5047c9d15e8 100644 --- a/searchlib/src/vespa/searchlib/features/distancefeature.cpp +++ b/searchlib/src/vespa/searchlib/features/distancefeature.cpp @@ -164,8 +164,7 @@ DistanceBlueprint::createInstance() const } bool -DistanceBlueprint::setup_geopos(const IIndexEnvironment & env, - const vespalib::string &attr) +DistanceBlueprint::setup_geopos(const vespalib::string &attr) { _arg_string = attr; _use_geo_pos = true; @@ -174,18 +173,15 @@ DistanceBlueprint::setup_geopos(const IIndexEnvironment & env, describeOutput("latitude", "Latitude of closest point"); describeOutput("longitude", "Longitude of closest point"); describeOutput("km", "Distance in kilometer units"); - env.hintAttributeAccess(_arg_string); return true; } bool -DistanceBlueprint::setup_nns(const IIndexEnvironment & env, - const vespalib::string &attr) +DistanceBlueprint::setup_nns(const vespalib::string &attr) { _arg_string = attr; _use_nns_tensor = true; describeOutput("out", "The euclidean distance from the query position."); - env.hintAttributeAccess(_arg_string); return true; } @@ -215,7 +211,7 @@ DistanceBlueprint::setup(const IIndexEnvironment & env, const FieldInfo *fi = env.getFieldByName(z); if (fi != nullptr && fi->hasAttribute()) { // can't check anything here because streaming has wrong information - return setup_geopos(env, z); + return setup_geopos(z); } fi = env.getFieldByName(arg); if (fi != nullptr && fi->hasAttribute()) { @@ -223,11 +219,11 @@ DistanceBlueprint::setup(const IIndexEnvironment & env, auto ct = fi->collection(); if (dt == DataType::TENSOR && ct == CollectionType::SINGLE) { _attr_id = fi->id(); - return setup_nns(env, arg); + return setup_nns(arg); } // could check if ct is CollectionType::SINGLE or CollectionType::ARRAY) if (dt == DataType::INT64) { - return setup_geopos(env, arg); + return setup_geopos(arg); } } if (env.getFieldByName(arg) == nullptr) { diff --git a/searchlib/src/vespa/searchlib/features/distancefeature.h b/searchlib/src/vespa/searchlib/features/distancefeature.h index bf578d45f42..f190ddcaa96 100644 --- a/searchlib/src/vespa/searchlib/features/distancefeature.h +++ b/searchlib/src/vespa/searchlib/features/distancefeature.h @@ -51,8 +51,8 @@ private: bool _use_nns_tensor; bool _use_item_label; - bool setup_geopos(const fef::IIndexEnvironment & env, const vespalib::string &attr); - bool setup_nns(const fef::IIndexEnvironment & env, const vespalib::string &attr); + bool setup_geopos(const vespalib::string &attr); + bool setup_nns(const vespalib::string &attr); public: DistanceBlueprint(); diff --git a/searchlib/src/vespa/searchlib/features/distancetopathfeature.cpp b/searchlib/src/vespa/searchlib/features/distancetopathfeature.cpp index 3469d776960..4ebfca90f84 100644 --- a/searchlib/src/vespa/searchlib/features/distancetopathfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/distancetopathfeature.cpp @@ -112,15 +112,13 @@ DistanceToPathBlueprint::createInstance() const } bool -DistanceToPathBlueprint::setup(const search::fef::IIndexEnvironment & env, +DistanceToPathBlueprint::setup(const search::fef::IIndexEnvironment&, const search::fef::ParameterList & params) { _posAttr = params[0].getValue(); describeOutput("distance", "The euclidean distance from the query path."); describeOutput("traveled", "The normalized distance traveled along the path before intersection."); describeOutput("product", "The cross-product of the intersecting line segment and the intersection-to-document vector."); - env.hintAttributeAccess(_posAttr); - env.hintAttributeAccess(document::PositionDataType::getZCurveFieldName(_posAttr)); return true; } diff --git a/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp b/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp index accd3ea694f..91326c59a1a 100644 --- a/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp @@ -795,7 +795,7 @@ DotProductBlueprint::visitDumpFeatures(const IIndexEnvironment &, IDumpFeatureVi } bool -DotProductBlueprint::setup(const IIndexEnvironment & env, const ParameterList & params) +DotProductBlueprint::setup(const IIndexEnvironment&, const ParameterList & params) { _defaultAttribute = params[0].getValue(); _attributeOverride = _defaultAttribute + ".override.name"; @@ -804,7 +804,6 @@ DotProductBlueprint::setup(const IIndexEnvironment & env, const ParameterList & _queryVectorKey = make_queryvector_key(getBaseName(), _queryVector); describeOutput("scalar", "The result after calculating the dot product of the vector represented by the weighted set " "and the vector sent down with the query"); - env.hintAttributeAccess(_defaultAttribute); return true; } diff --git a/searchlib/src/vespa/searchlib/features/element_completeness_feature.cpp b/searchlib/src/vespa/searchlib/features/element_completeness_feature.cpp index 6128850bd1f..7220d044f72 100644 --- a/searchlib/src/vespa/searchlib/features/element_completeness_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/element_completeness_feature.cpp @@ -138,7 +138,6 @@ ElementCompletenessBlueprint::setup(const fef::IIndexEnvironment &env, describeOutput(_output[1], "best scored element completeness"); describeOutput(_output[2], "query completeness for best scored element"); describeOutput(_output[3], "element weight of best scored element"); - env.hintFieldAccess(field->id()); return true; } diff --git a/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp b/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp index d039b80930b..5dd19d3c648 100644 --- a/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp @@ -430,7 +430,6 @@ ElementSimilarityBlueprint::setup(const fef::IIndexEnvironment &env, const fef:: } _outputs.push_back(OutputContext_UP(new OutputContext(*function, std::move(aggr)))); } - env.hintFieldAccess(field->id()); return true; } diff --git a/searchlib/src/vespa/searchlib/features/euclidean_distance_feature.cpp b/searchlib/src/vespa/searchlib/features/euclidean_distance_feature.cpp index 6c56628b894..27aaae71824 100644 --- a/searchlib/src/vespa/searchlib/features/euclidean_distance_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/euclidean_distance_feature.cpp @@ -66,13 +66,12 @@ EuclideanDistanceBlueprint::visitDumpFeatures(const IIndexEnvironment &, IDumpFe } bool -EuclideanDistanceBlueprint::setup(const IIndexEnvironment &env, const ParameterList ¶ms) +EuclideanDistanceBlueprint::setup(const IIndexEnvironment &, const ParameterList ¶ms) { _attributeName = params[0].getValue(); _queryVector = params[1].getValue(); describeOutput("distance", "The result after calculating the euclidean distance of the vector represented by the array " "and the vector sent down with the query"); - env.hintAttributeAccess(_attributeName); return true; } diff --git a/searchlib/src/vespa/searchlib/features/fieldinfofeature.cpp b/searchlib/src/vespa/searchlib/features/fieldinfofeature.cpp index 77efe6a18fa..e1a2fb33d4f 100644 --- a/searchlib/src/vespa/searchlib/features/fieldinfofeature.cpp +++ b/searchlib/src/vespa/searchlib/features/fieldinfofeature.cpp @@ -174,7 +174,6 @@ FieldInfoBlueprint::setup(const fef::IIndexEnvironment &indexEnv, if (fi != 0) { _fieldId = fi->id(); if (fi->type() == fef::FieldType::INDEX) { - indexEnv.hintFieldAccess(_fieldId); _type = 1.0; } else if (fi->type() == fef::FieldType::ATTRIBUTE) { _type = 2.0; diff --git a/searchlib/src/vespa/searchlib/features/fieldmatchfeature.cpp b/searchlib/src/vespa/searchlib/features/fieldmatchfeature.cpp index 51f47f65c10..1300a14df2d 100644 --- a/searchlib/src/vespa/searchlib/features/fieldmatchfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/fieldmatchfeature.cpp @@ -334,7 +334,6 @@ FieldMatchBlueprint::setup(const IIndexEnvironment & env, "positions separating the start of each field adjacent segment."); describeOutput("degradedMatches", "The number of degraded query terms (no position information available) which was matched in this field."); - env.hintFieldAccess(_field->id()); return true; } diff --git a/searchlib/src/vespa/searchlib/features/fieldtermmatchfeature.cpp b/searchlib/src/vespa/searchlib/features/fieldtermmatchfeature.cpp index 980e8ec833b..9fa6f49eaac 100644 --- a/searchlib/src/vespa/searchlib/features/fieldtermmatchfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/fieldtermmatchfeature.cpp @@ -106,7 +106,7 @@ FieldTermMatchBlueprint::visitDumpFeatures(const search::fef::IIndexEnvironment } bool -FieldTermMatchBlueprint::setup(const search::fef::IIndexEnvironment &env, +FieldTermMatchBlueprint::setup(const search::fef::IIndexEnvironment &, const search::fef::ParameterList ¶ms) { _fieldId = params[0].asField()->id(); @@ -116,7 +116,6 @@ FieldTermMatchBlueprint::setup(const search::fef::IIndexEnvironment &env, describeOutput("occurrences", "The number of occurrence of this term."); describeOutput("weight", "The sum occurence weights of this term."); describeOutput("exactness", "The average exactness this term."); - env.hintFieldAccess(_fieldId); return true; } diff --git a/searchlib/src/vespa/searchlib/features/flow_completeness_feature.cpp b/searchlib/src/vespa/searchlib/features/flow_completeness_feature.cpp index 5f9c5543f57..166280b289d 100644 --- a/searchlib/src/vespa/searchlib/features/flow_completeness_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/flow_completeness_feature.cpp @@ -310,7 +310,6 @@ FlowCompletenessBlueprint::setup(const fef::IIndexEnvironment &env, describeOutput(_output[3], "element weight of best scored element"); describeOutput(_output[4], "field weight"); describeOutput(_output[5], "query terms matching in best element (measured by flow)"); - env.hintFieldAccess(field->id()); return true; } diff --git a/searchlib/src/vespa/searchlib/features/great_circle_distance_feature.cpp b/searchlib/src/vespa/searchlib/features/great_circle_distance_feature.cpp index 39a82ca8237..5257a27cb55 100644 --- a/searchlib/src/vespa/searchlib/features/great_circle_distance_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/great_circle_distance_feature.cpp @@ -96,13 +96,12 @@ GreatCircleDistanceBlueprint::createInstance() const } bool -GreatCircleDistanceBlueprint::setup_geopos(const IIndexEnvironment & env, const vespalib::string &attr) +GreatCircleDistanceBlueprint::setup_geopos(const vespalib::string &attr) { _attr_name = attr; describeOutput("km", "The distance (in km) from the query position."); describeOutput("latitude", "Latitude of closest point"); describeOutput("longitude", "Longitude of closest point"); - env.hintAttributeAccess(_attr_name); return true; } @@ -144,7 +143,7 @@ GreatCircleDistanceBlueprint::setup(const IIndexEnvironment & env, } } */ - return setup_geopos(env, z); + return setup_geopos(z); } if (env.getFieldByName(_field_name) == nullptr && fi == nullptr) { LOG(error, "unknown field '%s' for rank feature %s\n", _field_name.c_str(), getName().c_str()); diff --git a/searchlib/src/vespa/searchlib/features/great_circle_distance_feature.h b/searchlib/src/vespa/searchlib/features/great_circle_distance_feature.h index 22a464ed5fa..feaf1e75226 100644 --- a/searchlib/src/vespa/searchlib/features/great_circle_distance_feature.h +++ b/searchlib/src/vespa/searchlib/features/great_circle_distance_feature.h @@ -41,7 +41,7 @@ class GreatCircleDistanceBlueprint : public fef::Blueprint { private: vespalib::string _field_name; vespalib::string _attr_name; - bool setup_geopos(const fef::IIndexEnvironment & env, const vespalib::string &attr); + bool setup_geopos(const vespalib::string &attr); public: GreatCircleDistanceBlueprint(); ~GreatCircleDistanceBlueprint(); 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 875c8574029..c814b870563 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 @@ -223,13 +223,12 @@ InternalMaxReduceProdJoinBlueprint::getDescriptions() const { } bool -InternalMaxReduceProdJoinBlueprint::setup(const IIndexEnvironment &env, const ParameterList ¶ms) { +InternalMaxReduceProdJoinBlueprint::setup(const IIndexEnvironment &, const ParameterList ¶ms) { _attribute = params[0].getValue(); _attrKey = createAttributeKey(_attribute); _queryVector = params[1].getValue(); _queryVectorKey = make_queryvector_key(getBaseName(), _queryVector); describeOutput("scalar", "Internal executor for optimized execution of reduce(join(A,Q,f(x,y)(x*y)),max)"); - env.hintAttributeAccess(_attribute); return true; } diff --git a/searchlib/src/vespa/searchlib/features/jarowinklerdistancefeature.cpp b/searchlib/src/vespa/searchlib/features/jarowinklerdistancefeature.cpp index 89d3041ac3d..d42a4cec55d 100644 --- a/searchlib/src/vespa/searchlib/features/jarowinklerdistancefeature.cpp +++ b/searchlib/src/vespa/searchlib/features/jarowinklerdistancefeature.cpp @@ -163,7 +163,6 @@ JaroWinklerDistanceBlueprint::setup(const search::fef::IIndexEnvironment &env, defineInput(vespalib::make_string("fieldLength(%s)", params[0].getValue().c_str())); describeOutput("out", "JaroWinklerDistance distance measure."); - env.hintFieldAccess(_config.fieldId); return true; } diff --git a/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.cpp b/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.cpp index 499fa2bdc00..48447a20153 100644 --- a/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.cpp @@ -180,7 +180,6 @@ NativeFieldMatchBlueprint::setup(const IIndexEnvironment & env, } } if (param.field) { - env.hintFieldAccess(fieldId); if (first_field) { first_field = false; } else { diff --git a/searchlib/src/vespa/searchlib/features/nativeproximityfeature.cpp b/searchlib/src/vespa/searchlib/features/nativeproximityfeature.cpp index 6f49d92d042..8b68476aa16 100644 --- a/searchlib/src/vespa/searchlib/features/nativeproximityfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/nativeproximityfeature.cpp @@ -214,7 +214,6 @@ NativeProximityBlueprint::setup(const IIndexEnvironment & env, } } if (param.field) { - env.hintFieldAccess(fieldId); if (first_field) { first_field = false; } else { diff --git a/searchlib/src/vespa/searchlib/features/proximityfeature.cpp b/searchlib/src/vespa/searchlib/features/proximityfeature.cpp index 92cc78db165..e1a21252b01 100644 --- a/searchlib/src/vespa/searchlib/features/proximityfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/proximityfeature.cpp @@ -121,7 +121,7 @@ ProximityBlueprint::visitDumpFeatures(const search::fef::IIndexEnvironment &, } bool -ProximityBlueprint::setup(const search::fef::IIndexEnvironment &env, +ProximityBlueprint::setup(const search::fef::IIndexEnvironment&, const search::fef::ParameterList ¶ms) { _config.fieldId = params[0].asField()->id(); @@ -130,7 +130,6 @@ ProximityBlueprint::setup(const search::fef::IIndexEnvironment &env, describeOutput("out" , "The proximity of the query terms."); describeOutput("posA", "The best position of the first query term."); describeOutput("posB", "The best position of the second query term."); - env.hintFieldAccess(_config.fieldId); return true; } diff --git a/searchlib/src/vespa/searchlib/features/querycompletenessfeature.cpp b/searchlib/src/vespa/searchlib/features/querycompletenessfeature.cpp index 225f8b87411..5caa2bd577e 100644 --- a/searchlib/src/vespa/searchlib/features/querycompletenessfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/querycompletenessfeature.cpp @@ -81,7 +81,7 @@ QueryCompletenessBlueprint::visitDumpFeatures(const search::fef::IIndexEnvironme } bool -QueryCompletenessBlueprint::setup(const search::fef::IIndexEnvironment &env, +QueryCompletenessBlueprint::setup(const search::fef::IIndexEnvironment &, const search::fef::ParameterList ¶ms) { _config.fieldId = params[0].asField()->id(); @@ -98,7 +98,6 @@ QueryCompletenessBlueprint::setup(const search::fef::IIndexEnvironment &env, } describeOutput("hit", "The number of query terms matched in field."); describeOutput("miss", "The number of query terms not matched in field."); - env.hintFieldAccess(_config.fieldId); return true; } diff --git a/searchlib/src/vespa/searchlib/features/reverseproximityfeature.cpp b/searchlib/src/vespa/searchlib/features/reverseproximityfeature.cpp index cc68b4bab3e..5461741a60a 100644 --- a/searchlib/src/vespa/searchlib/features/reverseproximityfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/reverseproximityfeature.cpp @@ -107,7 +107,7 @@ ReverseProximityBlueprint::visitDumpFeatures(const search::fef::IIndexEnvironmen } bool -ReverseProximityBlueprint::setup(const search::fef::IIndexEnvironment &env, +ReverseProximityBlueprint::setup(const search::fef::IIndexEnvironment &, const search::fef::ParameterList ¶ms) { _config.fieldId = params[0].asField()->id(); @@ -116,7 +116,6 @@ ReverseProximityBlueprint::setup(const search::fef::IIndexEnvironment &env, describeOutput("out" , "The reverse proximity of the query terms."); describeOutput("posA", "The best position of the first query term."); describeOutput("posB", "The best position of the second query term."); - env.hintFieldAccess(_config.fieldId); return true; } diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp b/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp index 00eca7b680e..cbe262a0cbd 100644 --- a/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp @@ -62,9 +62,6 @@ TensorFromWeightedSetBlueprint::setup(const search::fef::IIndexEnvironment &env, describeOutput("tensor", "The tensor created from the given weighted set source (attribute field or query parameter)", FeatureType::object(ValueType::make_type(CellType::DOUBLE, {{_dimension}}))); - if (validSource && _sourceType == ATTRIBUTE_SOURCE) { - env.hintAttributeAccess(_sourceParam); - } return validSource; } diff --git a/searchlib/src/vespa/searchlib/features/term_field_md_feature.cpp b/searchlib/src/vespa/searchlib/features/term_field_md_feature.cpp index 42e71fd35a1..413ef2a50e4 100644 --- a/searchlib/src/vespa/searchlib/features/term_field_md_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/term_field_md_feature.cpp @@ -87,7 +87,7 @@ TermFieldMdBlueprint::createInstance() const } bool -TermFieldMdBlueprint::setup(const IIndexEnvironment & env, +TermFieldMdBlueprint::setup(const IIndexEnvironment &, const ParameterList & params) { _field = params[0].asField(); @@ -101,7 +101,6 @@ TermFieldMdBlueprint::setup(const IIndexEnvironment & env, describeOutput("occurrences", "The sum of occurrences (positions) in the match data"); describeOutput("maxTermWeight", "The max term weight among ranked terms matching this field"); - env.hintFieldAccess(_field->id()); return true; } diff --git a/searchlib/src/vespa/searchlib/features/termeditdistancefeature.cpp b/searchlib/src/vespa/searchlib/features/termeditdistancefeature.cpp index c0ea4a2b8c1..2ef1e5f2602 100644 --- a/searchlib/src/vespa/searchlib/features/termeditdistancefeature.cpp +++ b/searchlib/src/vespa/searchlib/features/termeditdistancefeature.cpp @@ -214,7 +214,6 @@ TermEditDistanceBlueprint::setup(const search::fef::IIndexEnvironment &env, describeOutput("del", "Number of deletions performed."); describeOutput("ins", "Number of insertions performed."); describeOutput("sub", "Number of substitutions performed."); - env.hintFieldAccess(_config.fieldId); return true; } diff --git a/searchlib/src/vespa/searchlib/features/text_similarity_feature.cpp b/searchlib/src/vespa/searchlib/features/text_similarity_feature.cpp index b11998d8c1e..2c0e7e8fc2a 100644 --- a/searchlib/src/vespa/searchlib/features/text_similarity_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/text_similarity_feature.cpp @@ -201,7 +201,7 @@ TextSimilarityBlueprint::createInstance() const } bool -TextSimilarityBlueprint::setup(const fef::IIndexEnvironment &env, +TextSimilarityBlueprint::setup(const fef::IIndexEnvironment &, const fef::ParameterList ¶ms) { const fef::FieldInfo *field = params[0].asField(); @@ -211,7 +211,6 @@ TextSimilarityBlueprint::setup(const fef::IIndexEnvironment &env, describeOutput(order_output, "normalized match order score"); describeOutput(query_coverage_output, "normalized query match coverage"); describeOutput(field_coverage_output, "normalized field match coverage"); - env.hintFieldAccess(field->id()); return true; } diff --git a/searchlib/src/vespa/searchlib/fef/iindexenvironment.h b/searchlib/src/vespa/searchlib/fef/iindexenvironment.h index ff0188fe36e..e7f0ba2844a 100644 --- a/searchlib/src/vespa/searchlib/fef/iindexenvironment.h +++ b/searchlib/src/vespa/searchlib/fef/iindexenvironment.h @@ -97,26 +97,6 @@ public: **/ virtual void hintFeatureMotivation(FeatureMotivation motivation) const = 0; - /** - * Hint about the future access of a field. This method may be - * used by blueprints during setup to hint the enclosing system - * that a feature executor created by it might try to access the - * field iterator for a specific field during execution. - * - * @param fieldId field id - **/ - virtual void hintFieldAccess(uint32_t fieldId) const = 0; - - /** - * Hint about the future access of an attribute. This method may - * be used by blueprints during setup to hint the enclosing system - * that a feature executor created by it might try to access a - * specific attribute during execution. - * - * @param name attribute name - **/ - virtual void hintAttributeAccess(const string &name) const = 0; - /** * Returns a constant rank value with the given name or null ptr if no such value exists. */ diff --git a/searchlib/src/vespa/searchlib/fef/test/indexenvironment.h b/searchlib/src/vespa/searchlib/fef/test/indexenvironment.h index cb14a7cdaea..73ca3e621f2 100644 --- a/searchlib/src/vespa/searchlib/fef/test/indexenvironment.h +++ b/searchlib/src/vespa/searchlib/fef/test/indexenvironment.h @@ -63,8 +63,6 @@ public: const ITableManager &getTableManager() const override { return _tableMan; } FeatureMotivation getFeatureMotivation() const override { return UNKNOWN; } void hintFeatureMotivation(FeatureMotivation) const override {} - void hintFieldAccess(uint32_t) const override {} - void hintAttributeAccess(const string &) const override {} uint32_t getDistributionKey() const override { return 3; } /** Returns a reference to the properties map of this. */ diff --git a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp index 0e4c082dea3..180db59e9b2 100644 --- a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp @@ -38,10 +38,6 @@ IndexEnvironment::addField(const vespalib::string& name, return true; } -void -IndexEnvironment::hintAttributeAccess(const string &) const { -} - void IndexEnvironment::set_ranking_assets_repo(std::shared_ptr ranking_assets_repo) { diff --git a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h index f741af77e35..2cb154e2eb5 100644 --- a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h +++ b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h @@ -68,10 +68,6 @@ public: _motivation = motivation; } - void hintFieldAccess(uint32_t) const override {} - - void hintAttributeAccess(const string & name) const override; - vespalib::eval::ConstantValue::UP getConstantValue(const vespalib::string& name) const override; vespalib::string getRankingExpression(const vespalib::string& name) const override; -- cgit v1.2.3