diff options
author | Arne H Juul <arnej27959@users.noreply.github.com> | 2018-07-06 15:45:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-06 15:45:26 +0200 |
commit | 37b4bd60b1740780d00f455ea32a825f978884e3 (patch) | |
tree | a7af5334f1841518cabb89305f0e408d73c3d302 /indexinglanguage | |
parent | 81c70357d1e85dddd8c1bfd87df012f92eb37cf4 (diff) | |
parent | 6941144fcdeac8bf32b18098ea177c07ce13ac7d (diff) |
Merge pull request #6353 from vespa-engine/geirst/fix-assign-null-json-operation-for-position-fields
Use default long field value instead of null when position field is n…
Diffstat (limited to 'indexinglanguage')
2 files changed, 8 insertions, 4 deletions
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java index 2a3935b6606..9e77c439303 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java @@ -22,7 +22,7 @@ public class ZCurveExpression extends Expression { if (x != null && y != null) { ctx.setValue(new LongFieldValue(ZCurve.encode(x, y))); } else { - ctx.setValue(null); + ctx.setValue(DataType.LONG.createFieldValue()); } } diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveTestCase.java index 2fcc032563c..746fdc36e13 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveTestCase.java @@ -41,8 +41,12 @@ public class ZCurveTestCase { } @Test - public void requireThatMissingFieldEvaluatesToNull() { - assertNull(new ZCurveExpression().execute(PositionDataType.valueOf(null, 9))); - assertNull(new ZCurveExpression().execute(PositionDataType.valueOf(6, null))); + public void requireThatMissingFieldEvaluatesToDefaultValue() { + assertEquals(DataType.LONG.createFieldValue(), + new ZCurveExpression().execute(PositionDataType.valueOf(null, 9))); + assertEquals(DataType.LONG.createFieldValue(), + new ZCurveExpression().execute(PositionDataType.valueOf(6, null))); + assertEquals(DataType.LONG.createFieldValue(), + new ZCurveExpression().execute(PositionDataType.valueOf(null, null))); } } |