Merge pull request #7910 from vespa-engine/toregge/add-position-field-tech-debt-commentds

Adjust some comments related to position fields.

3 files changed, 4 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java
index b62639961bf..233075155b5 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java
@@ -43,6 +43,7 @@ public class AddExtraFieldsToDocument extends Processor {
             return;
         }
         for (Attribute atr : field.getAttributes().values()) {
+            // TODO Vespa 8 or before: Check if this sould be removed or changed to _zcurve.
             if (atr.getName().equals(field.getName() + "_position")) {
                 DataType type = PositionDataType.INSTANCE;
                 if (atr.getCollectionType().equals(Attribute.CollectionType.ARRAY)) {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java
index c56c4f6b056..8df5443b98f 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java
@@ -27,7 +27,7 @@ import java.util.Set;
 import java.util.logging.Level;
 
 /**
- * Adds a "fieldName.zcurve" long attribute and a "fieldName.distance" summary field to all position type fields.
+ * Adds a "fieldName_zcurve" long attribute and "fieldName.distance" and "FieldName.position" summary fields to all position type fields.
  *
  * @author bratseth
  */
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexFieldNames.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexFieldNames.java
index 210a8e7009c..3286d7ea0a4 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexFieldNames.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexFieldNames.java
@@ -34,8 +34,8 @@ public class IndexFieldNames extends Processor {
     }
 
     /**
-     * In {@link CreatePositionZCurve} we add some .position and .distance fields for pos fields. Make an exception for those for now. For 6.0, rename
-     * to _position and _distance and delete this method.
+     * In {@link CreatePositionZCurve} we add some .position and .distance fields for pos fields. Make an exception for those for now.
+     * TODO Vespa 8: Rename to _position and _distance and delete this method.
      *
      * @param field an {@link com.yahoo.searchdefinition.document.SDField}
      * @return true if allowed