Correct over-eager renaming

7 files changed, 15 insertions, 9 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/tensor/MapTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/MapTensor.java
index d5beb60b22b..436b31e7dae 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/MapTensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/MapTensor.java
@@ -75,7 +75,7 @@ public class MapTensor implements Tensor {
         for (String elementString : addressBody.split(",")) {
             String[] pair = elementString.split(":");
             if (pair.length != 2)
-                throw new IllegalArgumentException("Expecting argument labels to be on the form dimension:label, " +
+                throw new IllegalArgumentException("Expecting argument elements to be on the form dimension:label, " +
                                                    "got '" + elementString + "'");
             builder.mapped(pair[0].trim());
         }
@@ -120,7 +120,7 @@ public class MapTensor implements Tensor {
         for (String elementString : addressBody.split(",")) {
             String[] pair = elementString.split(":");
             if (pair.length != 2)
-                throw new IllegalArgumentException("Expecting argument labels to be on the form dimension:label, " +
+                throw new IllegalArgumentException("Expecting argument elements to be on the form dimension:label, " +
                                                    "got '" + elementString + "'");
             builder.add(pair[0].trim(), pair[1].trim());
         }
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/MapTensorBuilder.java b/vespajlib/src/main/java/com/yahoo/tensor/MapTensorBuilder.java
index ee62d555cd3..0cca1454ad3 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/MapTensorBuilder.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/MapTensorBuilder.java
@@ -5,7 +5,9 @@ import com.google.common.annotations.Beta;
 import com.google.common.collect.ImmutableMap;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Builder class for a MapTensor.
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
index 05cf2ac625a..b1e845b4506 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
@@ -30,7 +30,7 @@ public final class TensorAddress implements Comparable<TensorAddress> {
     }
 
     /** Returns the labels of this as an immutable list in the order of the tensor this is the type of */
-    public List<String> labels() { return labels; }
+    public List<String> elements() { return labels; }
 
     @Override
     public int compareTo(TensorAddress other) {
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java
index 8b1f2fb806f..d424b3f0f18 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java
@@ -7,9 +7,11 @@ import com.yahoo.tensor.Tensor;
 import com.yahoo.tensor.TensorAddress;
 import com.yahoo.tensor.TensorType;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.DoubleBinaryOperator;
 
 /**
@@ -117,8 +119,8 @@ public class Join extends PrimitiveTensorFunction {
     private TensorAddress combineAddresses(TensorAddress a, int[] aToIndexes, TensorAddress b, int[] bToIndexes, 
                                            TensorType joinedType) {
         String[] joinedLabels = new String[joinedType.dimensions().size()];
-        mapContent(a.labels(), joinedLabels, aToIndexes);
-        boolean compatible = mapContent(b.labels(), joinedLabels, bToIndexes);
+        mapContent(a.elements(), joinedLabels, aToIndexes);
+        boolean compatible = mapContent(b.elements(), joinedLabels, bToIndexes);
         if ( ! compatible) return null;
         return new TensorAddress(joinedLabels);
     }
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java
index 0a94a1e7b5e..9251521f6bf 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java
@@ -14,6 +14,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * The <i>reduce</i> tensor operation returns a tensor produced from the argument tensor where some dimensions 
@@ -124,9 +125,9 @@ public class Reduce extends PrimitiveTensorFunction {
 
         String[] reducedLabels = new String[reducedType.dimensions().size()];
         int reducedLabelIndex = 0;
-        for (int i = 0; i < address.labels().size(); i++)
+        for (int i = 0; i < address.elements().size(); i++)
             if ( ! indexesToRemove.contains(i))
-                reducedLabels[reducedLabelIndex++] = address.labels().get(i);
+                reducedLabels[reducedLabelIndex++] = address.elements().get(i);
         return new TensorAddress(reducedLabels);
     }
     
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java
index 4b3a2f4142f..81582fd64ac 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java
@@ -84,7 +84,7 @@ public class Rename extends PrimitiveTensorFunction {
     private TensorAddress rename(TensorAddress address, int[] toIndexes) {
         String[] reorderedLabels = new String[toIndexes.length];
         for (int i = 0; i < toIndexes.length; i++)
-            reorderedLabels[toIndexes[i]] = address.labels().get(i);
+            reorderedLabels[toIndexes[i]] = address.elements().get(i);
         return new TensorAddress(reorderedLabels);
     }
 
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/SparseBinaryFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/SparseBinaryFormat.java
index b707802c55f..967c05f0878 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/SparseBinaryFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/SparseBinaryFormat.java
@@ -2,6 +2,7 @@
 package com.yahoo.tensor.serialization;
 
 import com.google.common.annotations.Beta;
+import com.google.common.collect.Sets;
 import com.yahoo.io.GrowableByteBuffer;
 import com.yahoo.tensor.MapTensorBuilder;
 import com.yahoo.tensor.Tensor;
@@ -49,7 +50,7 @@ class SparseBinaryFormat implements BinaryFormat {
     }
 
     private static void encodeAddress(GrowableByteBuffer buffer, TensorAddress address) {
-        for (String label : address.labels())
+        for (String label : address.elements())
             encodeString(buffer, label);
     }