disallow bad position field

2 files changed, 2 insertions, 9 deletions

diff --git a/searchlib/src/tests/features/prod_features.cpp b/searchlib/src/tests/features/prod_features.cpp
index b213fd380d5..ecb1d7be137 100644
--- a/searchlib/src/tests/features/prod_features.cpp
+++ b/searchlib/src/tests/features/prod_features.cpp
@@ -483,8 +483,6 @@ Test::testCloseness()
         TEST_DO(assertCloseness(1,   "pos", 0));
         assertCloseness(0.8, "pos", 1802661);
         assertCloseness(0,   "pos", 9013306);
-        // use non-existing attribute -> default distance
-        TEST_DO(assertCloseness(0, "no", 0));
         // two-argument version
         TEST_DO(assertCloseness(0.8, "field,pos", 1802661));
 
@@ -893,8 +891,10 @@ Test::testDistance()
 
         StringList params, in, out;
         FT_SETUP_FAIL(pt, params);
+	/*
         FT_SETUP_OK(pt, params.add("pos"), in,
                     out.add("out").add("index").add("latitude").add("longitude").add("km"));
+		    */
         FT_DUMP_EMPTY(_factory, "distance");
     }
 
diff --git a/searchlib/src/vespa/searchlib/features/distancefeature.cpp b/searchlib/src/vespa/searchlib/features/distancefeature.cpp
index 7429f32cf4f..d0a2c1a3838 100644
--- a/searchlib/src/vespa/searchlib/features/distancefeature.cpp
+++ b/searchlib/src/vespa/searchlib/features/distancefeature.cpp
@@ -206,7 +206,6 @@ DistanceBlueprint::setup(const IIndexEnvironment & env,
 {
     // params[0] = attribute name
     vespalib::string arg = params[0].getValue();
-    bool allow_bad_field = true;
     if (params.size() == 2) {
         // params[0] = field / label
         // params[1] = attribute name / label value
@@ -217,7 +216,6 @@ DistanceBlueprint::setup(const IIndexEnvironment & env,
             return true;
         } else if (arg == "field") {
             arg = params[1].getValue();
-            allow_bad_field = false;
         } else {
             LOG(error, "first argument must be 'field' or 'label', but was '%s'", arg.c_str());
             return false;
@@ -243,11 +241,6 @@ DistanceBlueprint::setup(const IIndexEnvironment & env,
             return setup_geopos(env, arg);
         }
     }
-    if (allow_bad_field) {
-        // TODO remove on Vespa 8
-        // backwards compatibility fallback:
-        return setup_geopos(env, arg);
-    }
     if (env.getFieldByName(arg) == nullptr) {
         LOG(error, "unknown field '%s' for rank feature %s\n", arg.c_str(), getName().c_str());
     } else {