summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-08-25 10:11:54 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2021-08-25 10:11:54 +0200
commite4bccfb7a2c0c561e3a820807df82e7492999471 (patch)
tree2aca578a165298696e4b4fb80b896f96d7cd4ad7
parentd94a32088a0720bba178c95a7bfaff14c60d2f03 (diff)
parent5e5f90f03bdd55f6e8eb6f7f7883aa1ea74de282 (diff)
Merge branch 'balder/debug-1' of github.com:yahoo/vespa into balder/debug-1
-rw-r--r--searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp2
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/ranking_expressions.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
index 7a3803626c8..b52f804bbe1 100644
--- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
+++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
@@ -2,7 +2,6 @@
#include "config-verify-ranksetup.h"
#include <vespa/config-attributes.h>
-#include <vespa/config-imported-fields.h>
#include <vespa/config-indexschema.h>
#include <vespa/config-rank-profiles.h>
#include <vespa/config/config.h>
@@ -65,6 +64,7 @@ RankingExpressions make_expressions(const RankingExpressionsConfig &expressionsC
RankingExpressions expressions;
for (const auto &entry: expressionsCfg.expression) {
if (auto file = get_file(entry.fileref, myCfg)) {
+ LOG(info, "Add expression %s with ref=%s and path=%s", entry.name.c_str(), entry.fileref.c_str(), file.value().c_str());
expressions.add(entry.name, file.value());
} else {
LOG(warning, "could not find file name for ranking expression '%s' (ref:'%s')",
diff --git a/searchcore/src/vespa/searchcore/proton/matching/ranking_expressions.cpp b/searchcore/src/vespa/searchcore/proton/matching/ranking_expressions.cpp
index 49cf08d76c0..59f2d551bf3 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/ranking_expressions.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/ranking_expressions.cpp
@@ -46,7 +46,7 @@ RankingExpressions::loadExpression(const vespalib::string &name) const
auto path = pos->second;
vespalib::MappedFileInput file(path);
if (!file.valid()) {
- LOG(warning, "could not read file: %s", path.c_str());
+ LOG(warning, "rankexpression: %s -> could not read file: %s", name.c_str(), path.c_str());
return {};
}
if (ends_with(path, ".lz4")) {