diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2019-08-20 12:21:37 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2019-08-20 12:21:37 +0000 |
| commit | 7df067cfb84f0d6e00e87bf69276d7a353c9f972 (patch) | |
| tree | c537a1291c9f91a47e7a660cc49de11f722783bb /vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java | |
| parent | d88f2b235136691dcf08014cca60121ad2e3b62a (diff) | |
use same rules for cell value type resolving as C++
* pick cell value type from tensors with dimensions only
* in Concat, use the expected combined cell value type for unit tensor
Diffstat (limited to 'vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java')
| -rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java index db950e6c8b9..1134e8177ad 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java @@ -268,8 +268,7 @@ public class ReduceJoin extends CompositeTensorFunction { } private TensorType dimensionsInCommon(IndexedTensor a, IndexedTensor b) { - TensorType.Builder builder = new TensorType.Builder(TensorType.Value.largestOf(a.type().valueType(), - b.type().valueType())); + TensorType.Builder builder = new TensorType.Builder(TensorType.combinedValueType(a.type(), b.type())); for (TensorType.Dimension aDim : a.type().dimensions()) { for (TensorType.Dimension bDim : b.type().dimensions()) { if (aDim.name().equals(bDim.name())) { |