diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-10-06 23:55:41 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2022-10-06 23:55:41 +0200 |
| commit | 8fcec55c82a1035dd17a59eb7bd1b1b65fb16f17 (patch) | |
| tree | 4ea47e490d61b657601e338d70dbeb8977c2cdb8 /vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java | |
| parent | 24c70d22397fad2c2d5d2e8b45d7da664283fd85 (diff) | |
Return X-Vespa-Ignored-Fields if fields were ignored
Diffstat (limited to 'vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java')
| -rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 4ec5b196dbc..1009177761b 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java @@ -304,7 +304,7 @@ public class Join<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMETYP for (Iterator<Tensor.Cell> bIterator = b.cellIterator(); bIterator.hasNext(); ) { Map.Entry<TensorAddress, Double> bCell = bIterator.next(); TensorAddress combinedAddress = joinAddresses(aCell.getKey(), aToIndexes, - bCell.getKey(), bToIndexes, joinedType); + bCell.getKey(), bToIndexes, joinedType); if (combinedAddress == null) continue; // not combinable builder.cell(combinedAddress, combinator.applyAsDouble(aCell.getValue(), bCell.getValue())); } @@ -347,7 +347,7 @@ public class Join<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMETYP TensorAddress partialCommonAddress = partialCommonAddress(bCell, bIndexesInCommon); for (Tensor.Cell aCell : aCellsByCommonAddress.getOrDefault(partialCommonAddress, Collections.emptyList())) { TensorAddress combinedAddress = joinAddresses(aCell.getKey(), aIndexesInJoined, - bCell.getKey(), bIndexesInJoined, joinedType); + bCell.getKey(), bIndexesInJoined, joinedType); if (combinedAddress == null) continue; // not combinable double combinedValue = swapTensors ? combinator.applyAsDouble(bCell.getValue(), aCell.getValue()) : |