Merge pull request #23655 from vespa-engine/arnej/less-internal-details-in-issue-reports

external error messages should not contain too many internal details.

7 files changed, 13 insertions, 13 deletions

diff --git a/searchlib/src/vespa/searchlib/features/attributefeature.cpp b/searchlib/src/vespa/searchlib/features/attributefeature.cpp
index 10cca2213e2..8afb5ec1f21 100644
--- a/searchlib/src/vespa/searchlib/features/attributefeature.cpp
+++ b/searchlib/src/vespa/searchlib/features/attributefeature.cpp
@@ -352,7 +352,7 @@ fef::FeatureExecutor &
 createAttributeExecutor(uint32_t numOutputs, const IAttributeVector *attribute, const vespalib::string &attrName, const vespalib::string &extraParam, vespalib::Stash &stash)
 {
     if (attribute == nullptr) {
-        Issue::report("attribute feature: The attribute vector '%s' was not found in the attribute manager, returning default values.",
+        Issue::report("attribute feature: The attribute vector '%s' was not found, returning default values.",
                       attrName.c_str());
         std::vector<feature_t> values(numOutputs, 0.0f);
         return stash.create<ValueExecutor>(values);
@@ -440,7 +440,7 @@ createTensorAttributeExecutor(const IAttributeVector *attribute, const vespalib:
                               vespalib::Stash &stash)
 {
     if (attribute == nullptr) {
-        Issue::report("attribute feature: The attribute vector '%s' was not found in the attribute manager."
+        Issue::report("attribute feature: The attribute vector '%s' was not found."
                       " Returning empty tensor.", attrName.c_str());
         return ConstantTensorExecutor::createEmpty(tensorType, stash);
     }
diff --git a/searchlib/src/vespa/searchlib/features/attributematchfeature.cpp b/searchlib/src/vespa/searchlib/features/attributematchfeature.cpp
index 51af40f19f2..a86a91fb4a8 100644
--- a/searchlib/src/vespa/searchlib/features/attributematchfeature.cpp
+++ b/searchlib/src/vespa/searchlib/features/attributematchfeature.cpp
@@ -342,7 +342,7 @@ AttributeMatchBlueprint::createExecutor(const IQueryEnvironment & env, vespalib:
 {
     const IAttributeVector * attribute = env.getAttributeContext().getAttribute(_params.attrInfo->name());
     if (attribute == nullptr) {
-        Issue::report("attribute_match feature: The attribute vector '%s' was not found in the attribute manager.", _params.attrInfo->name().c_str());
+        Issue::report("attribute_match feature: The attribute vector '%s' was not found.", _params.attrInfo->name().c_str());
         std::vector<feature_t> values;
         values.push_back(0.0); // completeness
         values.push_back(0.0); // queryCompleteness
diff --git a/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp b/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp
index ce7df5c9fb7..ef09f9734f1 100644
--- a/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp
+++ b/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp
@@ -555,7 +555,7 @@ createFromObject(const IAttributeVector * attribute, const fef::Anything & objec
     // TODO: Add support for creating executor for weighted set string / integer attribute
     //       where the query vector is represented as an object instead of a string.
     Issue::report("dot_product feature: The attribute vector '%s' is NOT of type array<int/long/float/double>"
-                  ", returning executor with default value.", attribute->getName().c_str());
+                  ", returning default value.", attribute->getName().c_str());
     return stash.create<SingleZeroValueExecutor>();
 }
 
@@ -644,7 +644,7 @@ createFromString(const IAttributeVector * attribute, const Property & prop, vesp
 
     if (executor == nullptr) {
         Issue::report("dot_product feature: The attribute vector '%s' is not of type weighted set string/integer nor"
-                      " array<int/long/float/double>, returning executor with default value.", attribute->getName().c_str());
+                      " array<int/long/float/double>, returning default value.", attribute->getName().c_str());
         executor = &stash.create<SingleZeroValueExecutor>();
     }
     return *executor;
@@ -854,7 +854,7 @@ DotProductBlueprint::createExecutor(const IQueryEnvironment & env, vespalib::Sta
         attribute = upgradeIfNecessary(attribute, env);
     }
     if (attribute == nullptr) {
-        Issue::report("dot_product feature: The attribute vector '%s' was not found in the attribute manager, returning executor with default value.",
+        Issue::report("dot_product feature: The attribute vector '%s' was not found, returning default value.",
                       getAttribute(env).c_str());
         return stash.create<SingleZeroValueExecutor>();
     }
diff --git a/searchlib/src/vespa/searchlib/features/euclidean_distance_feature.cpp b/searchlib/src/vespa/searchlib/features/euclidean_distance_feature.cpp
index d41bff62baa..1380d36bc55 100644
--- a/searchlib/src/vespa/searchlib/features/euclidean_distance_feature.cpp
+++ b/searchlib/src/vespa/searchlib/features/euclidean_distance_feature.cpp
@@ -99,7 +99,7 @@ EuclideanDistanceBlueprint::createExecutor(const IQueryEnvironment &env, vespali
 {
     const IAttributeVector * attribute = env.getAttributeContext().getAttribute(_attributeName);
     if (attribute == nullptr) {
-        Issue::report("euclidean_distance feature: The attribute vector '%s' was not found in the attribute manager, returning executor with default value.",
+        Issue::report("euclidean_distance feature: The attribute vector '%s' was not found, returning default value.",
                       _attributeName.c_str());
         return stash.create<SingleZeroValueExecutor>();
     }
@@ -114,7 +114,7 @@ EuclideanDistanceBlueprint::createExecutor(const IQueryEnvironment &env, vespali
         }
     }
     Issue::report("euclidean_distance feature: The attribute vector '%s' is NOT of type array<int/long/float/double>"
-                  ", returning executor with default value.", attribute->getName().c_str());
+                  ", returning default value.", attribute->getName().c_str());
     return stash.create<SingleZeroValueExecutor>();
 
 }
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 49d4149953a..875c8574029 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
@@ -169,7 +169,7 @@ selectExecutor(const IAttributeVector *attribute, V && vector, vespalib::Stash &
         }
     }
     Issue::report("intrinsic max_reduce_prod_join feature: The attribute vector '%s' is not of type "
-                  "array<int/long>, returning executor with default value.", attribute->getName().c_str());
+                  "array<int/long>, returning default value.", attribute->getName().c_str());
     return stash.create<SingleZeroValueExecutor>();
 }
 
@@ -253,8 +253,8 @@ InternalMaxReduceProdJoinBlueprint::createExecutor(const IQueryEnvironment &env,
 {
     const IAttributeVector * attribute = lookupAttribute(_attrKey, _attribute, env);
     if (attribute == nullptr) {
-        Issue::report("intrinsic max_reduce_prod_join feature: The attribute vector '%s' was not found in the attribute manager, "
-                      "returning executor with default value.", _attribute.c_str());
+        Issue::report("intrinsic max_reduce_prod_join feature: The attribute vector '%s' was not found, "
+                      "returning default value.", _attribute.c_str());
         return stash.create<SingleZeroValueExecutor>();
     }
     const fef::Anything * queryVectorArg = env.getObjectStore().get(_queryVectorKey);
diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp b/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp
index bbae87b2240..b72a75bd19f 100644
--- a/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp
+++ b/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp
@@ -61,7 +61,7 @@ createAttributeExecutor(const search::fef::IQueryEnvironment &env,
 {
     const IAttributeVector *attribute = env.getAttributeContext().getAttribute(attrName);
     if (attribute == NULL) {
-        Issue::report("tensor_from_labels feature: The attribute vector '%s' was not found in the attribute manager."
+        Issue::report("tensor_from_labels feature: The attribute vector '%s' was not found."
                       " Returning empty tensor.", attrName.c_str());
         return ConstantTensorExecutor::createEmpty(ValueType::make_type(CellType::DOUBLE, {{dimension}}), stash);
     }
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 9db9f4616e3..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
@@ -75,7 +75,7 @@ createAttributeExecutor(const search::fef::IQueryEnvironment &env,
 {
     const IAttributeVector *attribute = env.getAttributeContext().getAttribute(attrName);
     if (attribute == NULL) {
-        Issue::report("tensor_from_weighted_set feature: The attribute vector '%s' was not found in the attribute manager."
+        Issue::report("tensor_from_weighted_set feature: The attribute vector '%s' was not found."
                       " Returning empty tensor.", attrName.c_str());
         return ConstantTensorExecutor::createEmpty(ValueType::make_type(CellType::DOUBLE, {{dimension}}), stash);
     }