move distance-metric specification, part 1

* move distance-metric in grammar, and change
  wiring within config-model.  It still has the
  same place in generated config and only has
  effect if hnsw index is specified.

1 files changed, 2 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java
index 5b87fdcf5f6..8b5f7658475 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java
@@ -240,13 +240,14 @@ public class AttributeFields extends Derived implements AttributesConfig.Produce
             aaB.tensortype(attribute.tensorType().get().toString());
         }
         aaB.imported(imported);
+        var dma = attribute.distanceMetric();
         if (attribute.hnswIndexParams().isPresent()) {
             var ib = new AttributesConfig.Attribute.Index.Builder();
             var params = attribute.hnswIndexParams().get();
             ib.hnsw.enabled(true);
             ib.hnsw.maxlinkspernode(params.maxLinksPerNode());
             ib.hnsw.neighborstoexploreatinsert(params.neighborsToExploreAtInsert());
-            var dm = AttributesConfig.Attribute.Index.Hnsw.Distancemetric.Enum.valueOf(params.distanceMetric().toString());
+            var dm = AttributesConfig.Attribute.Index.Hnsw.Distancemetric.Enum.valueOf(dma.toString());
             ib.hnsw.distancemetric(dm);
             aaB.index(ib);
         }