diff options
author | Jon Bratseth <bratseth@gmail.com> | 2023-12-15 10:41:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-15 10:41:44 +0100 |
commit | 684abb75b1967c2fa019d3454627ff95c3435aa8 (patch) | |
tree | fca3615e4bf729c721c99951ad006fc740e56f9c | |
parent | 9c8ba2608384ee79e143babd1e5a18a62166541f (diff) | |
parent | 0b137997746a2b467213b8e5fceea460813a868b (diff) |
Merge pull request #29668 from vespa-engine/lesters/slice-dimension-with-space
Add string indicators for dimensions with spaces in slice tostring
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java | 7 | ||||
-rw-r--r-- | vespajlib/src/test/java/com/yahoo/tensor/functions/SliceTestCase.java | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java index 97414d8859a..807f56b1a49 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java @@ -278,10 +278,11 @@ public class Slice<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMETY } private String valueToString(ToStringContext<NAMETYPE> context) { - if (label != null) - return label; - else + if (label != null) { + return TensorAddress.labelToString(label); + } else { return index.toString(context); + } } @Override diff --git a/vespajlib/src/test/java/com/yahoo/tensor/functions/SliceTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/functions/SliceTestCase.java index 94a06a416a5..3a21017ded4 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/functions/SliceTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/functions/SliceTestCase.java @@ -135,4 +135,13 @@ public class SliceTestCase { .toString()); } + @Test + public void testLabelsWithSpaceToString() { + Tensor input = Tensor.from("tensor(key{}):{a:1, 'b c':2}"); + assertEquals("tensor(key{}):{a:1.0, 'b c':2.0}{key:'b c'}", + new Slice<>(new ConstantTensor<>(input), + List.of(new Slice.DimensionValue<>("key", "b c"))) + .toString()); + } + } |