Support mixed tensor type in Java evaluation

1 files changed, 1 insertions, 19 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
index d8959147ee0..790743c745c 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
@@ -520,27 +520,9 @@ public class TensorType {
             }
         }
 
-        private static final boolean supportsMixedTypes = false;
-
         private void addDimensionsOf(TensorType type, boolean allowDifferentSizes) {
-            if ( ! supportsMixedTypes) {  // TODO: Support it
-                addDimensionsOfAndDisallowMixedDimensions(type, allowDifferentSizes);
-            }
-            else {
-                for (Dimension dimension : type.dimensions)
-                    set(dimension.combineWith(Optional.ofNullable(dimensions.get(dimension.name())), allowDifferentSizes));
-            }
-        }
-
-        private void addDimensionsOfAndDisallowMixedDimensions(TensorType type, boolean allowDifferentSizes) {
-            boolean containsMapped = dimensions.values().stream().anyMatch(d -> ! d.isIndexed());
-            containsMapped = containsMapped || type.dimensions().stream().anyMatch(d -> ! d.isIndexed());
-
             for (Dimension dimension : type.dimensions) {
-                if (containsMapped)
-                    dimension = new MappedDimension(dimension.name());
-                Dimension existing = dimensions.get(dimension.name());
-                set(dimension.combineWith(Optional.ofNullable(existing), allowDifferentSizes));
+                set(dimension.combineWith(Optional.ofNullable(dimensions.get(dimension.name())), allowDifferentSizes));
             }
         }