Non-functional changes only

6 files changed, 7 insertions, 8 deletions

diff --git a/document/src/main/java/com/yahoo/document/json/readers/TensorAddUpdateReader.java b/document/src/main/java/com/yahoo/document/json/readers/TensorAddUpdateReader.java
index d54faabacdf..d01b54328cf 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/TensorAddUpdateReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/TensorAddUpdateReader.java
@@ -27,10 +27,10 @@ public class TensorAddUpdateReader {
         expectObjectStart(buffer.currentToken());
         expectTensorTypeHasSparseDimensions(field);
 
-        // Convert update type to sparse
+        // Convert update type to only have mapped dimensions - to avoid spanning out dense subspace
         TensorDataType tensorDataType = (TensorDataType)field.getDataType();
         TensorType originalType = tensorDataType.getTensorType();
-        TensorType convertedType = TensorModifyUpdate.convertToCompatibleType(originalType);
+        TensorType convertedType = TensorModifyUpdate.convertDimensionsToMapped(originalType);
 
         TensorFieldValue tensorFieldValue = new TensorFieldValue(convertedType);
         fillTensor(buffer, tensorFieldValue);
diff --git a/document/src/main/java/com/yahoo/document/json/readers/TensorModifyUpdateReader.java b/document/src/main/java/com/yahoo/document/json/readers/TensorModifyUpdateReader.java
index 69b36e7cfa4..aa5fed78bfe 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/TensorModifyUpdateReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/TensorModifyUpdateReader.java
@@ -110,7 +110,7 @@ public class TensorModifyUpdateReader {
     private static TensorFieldValue createTensor(TokenBuffer buffer, Field field) {
         TensorDataType tensorDataType = (TensorDataType)field.getDataType();
         TensorType originalType = tensorDataType.getTensorType();
-        TensorType convertedType = TensorModifyUpdate.convertToCompatibleType(originalType);
+        TensorType convertedType = TensorModifyUpdate.convertDimensionsToMapped(originalType);
 
         Tensor.Builder tensorBuilder = Tensor.Builder.of(convertedType);
         readTensorCells(buffer, tensorBuilder);
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
index d1855759cb6..65025fada8f 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
@@ -37,7 +37,7 @@ public class VespaDocumentDeserializerHead extends VespaDocumentDeserializer6 {
         }
         TensorDataType tensorDataType = (TensorDataType)type;
         TensorType tensorType = tensorDataType.getTensorType();
-        TensorType convertedType = TensorModifyUpdate.convertToCompatibleType(tensorType);
+        TensorType convertedType = TensorModifyUpdate.convertDimensionsToMapped(tensorType);
 
         TensorFieldValue tensor = new TensorFieldValue(convertedType);
         tensor.deserialize(this);
@@ -51,7 +51,7 @@ public class VespaDocumentDeserializerHead extends VespaDocumentDeserializer6 {
         }
         TensorDataType tensorDataType = (TensorDataType)type;
         TensorType tensorType = tensorDataType.getTensorType();
-        TensorType convertedType = TensorModifyUpdate.convertToCompatibleType(tensorType);
+        TensorType convertedType = TensorModifyUpdate.convertDimensionsToMapped(tensorType);
 
         TensorFieldValue tensor = new TensorFieldValue(convertedType);
         tensor.deserialize(this);
diff --git a/document/src/main/java/com/yahoo/document/update/TensorModifyUpdate.java b/document/src/main/java/com/yahoo/document/update/TensorModifyUpdate.java
index 6111b51ca4e..2773f9d31da 100644
--- a/document/src/main/java/com/yahoo/document/update/TensorModifyUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/TensorModifyUpdate.java
@@ -37,7 +37,7 @@ public class TensorModifyUpdate extends ValueUpdate<TensorFieldValue> {
     /**
      * Converts the given tensor type to a type that is compatible for being used in this update (has only mapped dimensions).
      */
-    public static TensorType convertToCompatibleType(TensorType type) {
+    public static TensorType convertDimensionsToMapped(TensorType type) {
         TensorType.Builder builder = new TensorType.Builder();
         type.dimensions().stream().forEach(dim -> builder.mapped(dim.name()));
         return builder.build();
diff --git a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java
index dd090f7ba32..0cc821680b2 100644
--- a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java
+++ b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java
@@ -432,7 +432,6 @@ public class DocumentUpdateJsonSerializerTest {
         ));
     }
 
-
     @Test
     public void reference_field_id_can_be_update_assigned_non_empty_id() {
         roundtripSerializeJsonAndMatch(inputJson(
diff --git a/document/src/test/java/com/yahoo/document/update/TensorModifyUpdateTest.java b/document/src/test/java/com/yahoo/document/update/TensorModifyUpdateTest.java
index e448f70cf54..20d0ccbcb3d 100644
--- a/document/src/test/java/com/yahoo/document/update/TensorModifyUpdateTest.java
+++ b/document/src/test/java/com/yahoo/document/update/TensorModifyUpdateTest.java
@@ -26,7 +26,7 @@ public class TensorModifyUpdateTest {
     }
 
     private static void assertConvertToCompatible(String expectedType, String inputType) {
-        assertEquals(expectedType, TensorModifyUpdate.convertToCompatibleType(TensorType.fromSpec(inputType)).toString());
+        assertEquals(expectedType, TensorModifyUpdate.convertDimensionsToMapped(TensorType.fromSpec(inputType)).toString());
     }
 
     @Test