diff options
| author | Arne Juul <arnej@verizonmedia.com> | 2021-04-23 12:36:41 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@verizonmedia.com> | 2021-04-26 06:45:24 +0000 |
| commit | 7cfadbbbd3d17fcf54afd8f4a5f1b32ddeaf8962 (patch) | |
| tree | 409529bceefcb9a1b959502701d3a16671096d92 /vespajlib | |
| parent | fb98651ec8775d2347a3e42310e14d1b59c38a42 (diff) | |
allow rename of non-existing dimension (with warning) for now
Diffstat (limited to 'vespajlib')
| -rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/TypeResolver.java | 3 | ||||
| -rw-r--r-- | vespajlib/src/test/java/com/yahoo/tensor/TypeResolverTestCase.java | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TypeResolver.java b/vespajlib/src/main/java/com/yahoo/tensor/TypeResolver.java index 651bec6a1aa..7f00e53af6b 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/TypeResolver.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/TypeResolver.java @@ -100,7 +100,8 @@ public class TypeResolver { var dim = oldDims.remove(oldName); newDims.put(newName, dim.withName(newName)); } else { - throw new IllegalArgumentException("bad rename, dimension "+oldName+" not found"); + logger.log(Level.WARNING, "renaming non-existing dimension "+oldName+" in type "+inputType); + // throw new IllegalArgumentException("bad rename, dimension "+oldName+" not found"); } } for (var keep : oldDims.values()) { diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TypeResolverTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/TypeResolverTestCase.java index 7eee50c6785..f0be02a1b53 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/TypeResolverTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/TypeResolverTestCase.java @@ -193,8 +193,13 @@ public class TypeResolverTestCase { checkRenameFails("tensor()", mkl(), mkl()); checkRenameFails("tensor(x{},y{})", mkl("x"), mkl("y","z")); checkRenameFails("tensor(x{},y{})", mkl("x","y"), mkl("z")); - checkRenameFails("tensor()", mkl("a"), mkl("b")); checkRenameFails("tensor(x[10],y[20],z[30])", mkl("y","z"), mkl("a", "x")); + + // allowed (with warning) for now: + checkRename("tensor()", mkl("a"), mkl("b"), "tensor()"); + checkRename("tensor(x{},y[10])", mkl("a"), mkl("b"), "tensor(x{},y[10])"); + //checkRenameFails("tensor()", mkl("a"), mkl("b")); + } @Test |