Support specifying a distance metric for nearest neighbor search when not having a hnsw index.

This also changes the syntax in the sd file to specifying the distance metric in the attribute tag.

24 files changed, 174 insertions, 3 deletions

diff --git a/config-model/src/test/derived/advanced/attributes.cfg b/config-model/src/test/derived/advanced/attributes.cfg
index 0a76e44c4ac..0217d957432 100644
--- a/config-model/src/test/derived/advanced/attributes.cfg
+++ b/config-model/src/test/derived/advanced/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
index 006400c09d4..8391a8a9bdd 100644
--- a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
+++ b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/attributeprefetch/attributes.cfg b/config-model/src/test/derived/attributeprefetch/attributes.cfg
index cd91c15700b..448f9a82d36 100644
--- a/config-model/src/test/derived/attributeprefetch/attributes.cfg
+++ b/config-model/src/test/derived/attributeprefetch/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -94,6 +97,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -119,6 +123,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -144,6 +149,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -169,6 +175,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -194,6 +201,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -219,6 +227,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -244,6 +253,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -269,6 +279,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -294,6 +305,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -319,6 +331,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -344,6 +357,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -369,6 +383,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -394,6 +409,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -419,6 +435,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -444,6 +461,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/attributes/attributes.cfg b/config-model/src/test/derived/attributes/attributes.cfg
index 29e4c209ef2..d88c6b8b70a 100644
--- a/config-model/src/test/derived/attributes/attributes.cfg
+++ b/config-model/src/test/derived/attributes/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -94,6 +97,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -119,6 +123,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -144,6 +149,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -169,6 +175,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -194,6 +201,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -219,6 +227,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -244,6 +253,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -269,6 +279,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -294,6 +305,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -319,6 +331,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -344,6 +357,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -369,6 +383,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -394,6 +409,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -419,6 +435,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -444,6 +461,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/complex/attributes.cfg b/config-model/src/test/derived/complex/attributes.cfg
index 5606e5ea730..337b736471d 100644
--- a/config-model/src/test/derived/complex/attributes.cfg
+++ b/config-model/src/test/derived/complex/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -94,6 +97,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -119,6 +123,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -144,6 +149,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -169,6 +175,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -194,6 +201,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -219,6 +227,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/hnsw_index/attributes.cfg b/config-model/src/test/derived/hnsw_index/attributes.cfg
index b61fd7e2ee5..087a116f4cd 100644
--- a/config-model/src/test/derived/hnsw_index/attributes.cfg
+++ b/config-model/src/test/derived/hnsw_index/attributes.cfg
@@ -19,7 +19,34 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype "tensor(x[128])"
 attribute[].imported false
+attribute[].distancemetric ANGULAR
 attribute[].index.hnsw.enabled true
 attribute[].index.hnsw.maxlinkspernode 32
 attribute[].index.hnsw.distancemetric ANGULAR
 attribute[].index.hnsw.neighborstoexploreatinsert 300
+attribute[].name "t2"
+attribute[].datatype TENSOR
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].ismutable false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype "tensor(x[2])"
+attribute[].imported false
+attribute[].distancemetric GEODEGREES
+attribute[].index.hnsw.enabled false
+attribute[].index.hnsw.maxlinkspernode 16
+attribute[].index.hnsw.distancemetric EUCLIDEAN
+attribute[].index.hnsw.neighborstoexploreatinsert 200
diff --git a/config-model/src/test/derived/hnsw_index/ilscripts.cfg b/config-model/src/test/derived/hnsw_index/ilscripts.cfg
index e9fc265ca67..0c8266336b1 100644
--- a/config-model/src/test/derived/hnsw_index/ilscripts.cfg
+++ b/config-model/src/test/derived/hnsw_index/ilscripts.cfg
@@ -2,4 +2,6 @@ maxtermoccurrences 100
 fieldmatchmaxlength 1000000
 ilscript[].doctype "test"
 ilscript[].docfield[] "t1"
+ilscript[].docfield[] "t2"
 ilscript[].content[] "clear_state | guard { input t1 | attribute t1 | index t1; }"
+ilscript[].content[] "clear_state | guard { input t2 | attribute t2; }"
diff --git a/config-model/src/test/derived/hnsw_index/test.sd b/config-model/src/test/derived/hnsw_index/test.sd
index 207ed764a87..82291be9747 100644
--- a/config-model/src/test/derived/hnsw_index/test.sd
+++ b/config-model/src/test/derived/hnsw_index/test.sd
@@ -2,13 +2,21 @@ search test {
   document test {
     field t1 type tensor(x[128]) {
       indexing: attribute | index
-      index {
+      attribute {
         distance-metric: angular
+      }
+      index {
         hnsw {
           max-links-per-node: 32
           neighbors-to-explore-at-insert: 300
         }
       }
     }
+    field t2 type tensor(x[2]) {
+      indexing: attribute
+      attribute {
+        distance-metric: geodegrees
+      }
+    }
   }
 }
diff --git a/config-model/src/test/derived/imported_position_field/attributes.cfg b/config-model/src/test/derived/imported_position_field/attributes.cfg
index 8f68068c8e7..685f708768a 100644
--- a/config-model/src/test/derived/imported_position_field/attributes.cfg
+++ b/config-model/src/test/derived/imported_position_field/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/imported_struct_fields/attributes.cfg b/config-model/src/test/derived/imported_struct_fields/attributes.cfg
index eb87c6cf53e..e8b7a7b6235 100644
--- a/config-model/src/test/derived/imported_struct_fields/attributes.cfg
+++ b/config-model/src/test/derived/imported_struct_fields/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -94,6 +97,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -119,6 +123,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -144,6 +149,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -169,6 +175,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -194,6 +201,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/importedfields/attributes.cfg b/config-model/src/test/derived/importedfields/attributes.cfg
index d3a51523e05..6f3514102b4 100644
--- a/config-model/src/test/derived/importedfields/attributes.cfg
+++ b/config-model/src/test/derived/importedfields/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -94,6 +97,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -119,6 +123,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -144,6 +149,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -169,6 +175,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -194,6 +201,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/inheritance/attributes.cfg b/config-model/src/test/derived/inheritance/attributes.cfg
index 397d8878792..541092622ff 100644
--- a/config-model/src/test/derived/inheritance/attributes.cfg
+++ b/config-model/src/test/derived/inheritance/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/inheritfromparent/attributes.cfg b/config-model/src/test/derived/inheritfromparent/attributes.cfg
index 3b30af10a8f..dda86f765be 100644
--- a/config-model/src/test/derived/inheritfromparent/attributes.cfg
+++ b/config-model/src/test/derived/inheritfromparent/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/map_attribute/attributes.cfg b/config-model/src/test/derived/map_attribute/attributes.cfg
index 4de78c52efd..702e065d15a 100644
--- a/config-model/src/test/derived/map_attribute/attributes.cfg
+++ b/config-model/src/test/derived/map_attribute/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
index 72e60b857a2..3eca0d5bbf8 100644
--- a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
+++ b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -94,6 +97,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -119,6 +123,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/music/attributes.cfg b/config-model/src/test/derived/music/attributes.cfg
index 4d19dc69b33..f75b8e06b80 100644
--- a/config-model/src/test/derived/music/attributes.cfg
+++ b/config-model/src/test/derived/music/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -94,6 +97,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -119,6 +123,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -144,6 +149,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -169,6 +175,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -194,6 +201,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -219,6 +227,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -244,6 +253,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -269,6 +279,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/newrank/attributes.cfg b/config-model/src/test/derived/newrank/attributes.cfg
index 2aed2288773..303ea35223a 100644
--- a/config-model/src/test/derived/newrank/attributes.cfg
+++ b/config-model/src/test/derived/newrank/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -94,6 +97,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -119,6 +123,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -144,6 +149,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -169,6 +175,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -194,6 +201,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -219,6 +227,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -244,6 +253,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/predicate_attribute/attributes.cfg b/config-model/src/test/derived/predicate_attribute/attributes.cfg
index 3a9daf7af94..d095b68752a 100644
--- a/config-model/src/test/derived/predicate_attribute/attributes.cfg
+++ b/config-model/src/test/derived/predicate_attribute/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 200
 attribute[].densepostinglistthreshold 0.2
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/prefixexactattribute/attributes.cfg b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
index 0a8cbd82186..5cae6b784ff 100644
--- a/config-model/src/test/derived/prefixexactattribute/attributes.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/reference_fields/attributes.cfg b/config-model/src/test/derived/reference_fields/attributes.cfg
index e83b187a0cc..ec3ca030373 100644
--- a/config-model/src/test/derived/reference_fields/attributes.cfg
+++ b/config-model/src/test/derived/reference_fields/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/sorting/attributes.cfg b/config-model/src/test/derived/sorting/attributes.cfg
index 83c310ca5ca..6e50bd625ee 100644
--- a/config-model/src/test/derived/sorting/attributes.cfg
+++ b/config-model/src/test/derived/sorting/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/tensor/attributes.cfg b/config-model/src/test/derived/tensor/attributes.cfg
index 780f47ee3d5..6ed960728c2 100644
--- a/config-model/src/test/derived/tensor/attributes.cfg
+++ b/config-model/src/test/derived/tensor/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype "tensor<float>(x[2],y[1])"
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype "tensor(x{})"
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype "tensor(x[10],y[10])"
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -94,6 +97,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype "tensor<float>(x[10])"
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -119,6 +123,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/derived/types/attributes.cfg b/config-model/src/test/derived/types/attributes.cfg
index 82535324864..8e37a1f1c63 100644
--- a/config-model/src/test/derived/types/attributes.cfg
+++ b/config-model/src/test/derived/types/attributes.cfg
@@ -19,6 +19,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -44,6 +45,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -69,6 +71,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -94,6 +97,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -119,6 +123,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -144,6 +149,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -169,6 +175,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -194,6 +201,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -219,6 +227,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -244,6 +253,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -269,6 +279,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -294,6 +305,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
@@ -319,6 +331,7 @@ attribute[].upperbound 9223372036854775807
 attribute[].densepostinglistthreshold 0.4
 attribute[].tensortype ""
 attribute[].imported false
+attribute[].distancemetric EUCLIDEAN
 attribute[].index.hnsw.enabled false
 attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.distancemetric EUCLIDEAN
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidatorTest.java
index a704938610b..e32bd09bc08 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidatorTest.java
@@ -168,10 +168,18 @@ public class AttributeChangeValidatorTest {
     }
 
     @Test
+    public void changing_distance_metric_without_hnsw_index_enabled_is_ok() throws Exception {
+        new Fixture("field f1 type tensor(x[2]) { indexing: attribute }",
+                "field f1 type tensor(x[2]) { indexing: attribute \n attribute { " +
+                        "distance-metric: geodegrees \n } }").
+                assertValidation();
+    }
+
+    @Test
     public void changing_distance_metric_with_hnsw_index_enabled_requires_restart() throws Exception {
         new Fixture("field f1 type tensor(x[2]) { indexing: attribute | index \n index { hnsw } }",
-                "field f1 type tensor(x[2]) { indexing: attribute | index \n index { " +
-                        "distance-metric: geodegrees \n hnsw } }").
+                "field f1 type tensor(x[2]) { indexing: attribute | index \n attribute { " +
+                        "distance-metric: geodegrees \n } }").
                 assertValidation(newRestartAction("Field 'f1' changed: change property " +
                         "'distance-metric' from 'EUCLIDEAN' to 'GEODEGREES'"));
     }