diff options
6 files changed, 17 insertions, 12 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/ByteField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/ByteField.java index 22069d0270c..8fdc093122e 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/ByteField.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/ByteField.java @@ -24,7 +24,7 @@ public class ByteField extends DocsumField { if (value == EMPTY_VALUE) { return NanNumber.NaN; } else { - return Byte.valueOf(value); + return value; } } diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/RawData.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/RawData.java index a0c9b10c519..2e9d9d8cad9 100644 --- a/container-search/src/main/java/com/yahoo/prelude/hitfield/RawData.java +++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/RawData.java @@ -8,27 +8,27 @@ package com.yahoo.prelude.hitfield; */ public final class RawData { - private byte[] content; + private final byte[] content; /** - * Constructor, takes ownership + * Constructor, takes ownership of the given byte array. + * * @param content some bytes, handover */ public RawData(byte[] content) { this.content = content; } - /** - * @return internal byte array containing the actual data received - **/ + /** Returns the internal byte array containing the actual data received */ public byte[] getInternalData() { return content; } /** - * an ascii string; non-ascii data is escaped with hex notation - * NB: not always uniquely reversible - **/ + * An ascii string; non-ascii data is escaped with hex notation. + * NB: not always uniquely reversible. + */ + @Override public String toString() { StringBuilder buf = new StringBuilder(); for (byte b : content) { @@ -46,7 +46,7 @@ public final class RawData { } else { // XXX maybe we should only do this? creates possibly-invalid XML though. buf.append("&"); - buf.append(Integer.toString(i)); + buf.append(i); buf.append(";"); } } diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java index 54dfbfe1a85..af453983f89 100644 --- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java +++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java @@ -776,7 +776,6 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> { } else { renderInspectorDirect(data); } - } private void renderInspectorDirect(Inspector data) throws IOException { diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java index a245d61bafb..104db31cd45 100644 --- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java @@ -24,6 +24,7 @@ import com.yahoo.prelude.IndexModel; import com.yahoo.prelude.SearchDefinition; import com.yahoo.prelude.fastsearch.FastHit; import com.yahoo.prelude.hitfield.JSONString; +import com.yahoo.prelude.hitfield.RawData; import com.yahoo.prelude.searcher.JuniperSearcher; import com.yahoo.search.Query; import com.yahoo.search.Result; @@ -65,6 +66,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; +import java.nio.charset.StandardCharsets; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -147,7 +149,8 @@ public class JsonRendererTestCase { + " \"scalar2\":2.5," + " \"tensor1\":{\"type\":\"tensor(x[3])\",\"cells\":[{\"address\":{\"x\":\"0\"},\"value\":1.5},{\"address\":{\"x\":\"1\"},\"value\":2.0},{\"address\":{\"x\":\"2\"},\"value\":2.5}]}," + " \"tensor2\":{\"type\":\"tensor()\",\"cells\":[{\"address\":{},\"value\":0.5}]}" - + " }" + + " }," + + " \"data\": \"...\"" + " }," + " \"id\": \"datatypestuff\"," + " \"relevance\": 1.0" @@ -175,6 +178,7 @@ public class JsonRendererTestCase { h.setField("tensor3", Tensor.from("{ {x:a, y:0}: 2.0, {x:a, y:1}: -1 }")); h.setField("object", new Thingie()); h.setField("summaryfeatures", createSummaryFeatures()); + h.setField("data", new RawData("Unknown artist from the moon".getBytes(StandardCharsets.US_ASCII))); r.hits().add(h); r.setTotalHitCount(1L); String summary = render(r); diff --git a/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java b/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java index 89a5134943a..5881267c252 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java +++ b/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java @@ -18,6 +18,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; public class SingleValueReader { + public static final String UPDATE_ASSIGN = "assign"; public static final String UPDATE_INCREMENT = "increment"; public static final String UPDATE_DECREMENT = "decrement"; diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java index 764029f18e0..0b392ebfa03 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java @@ -13,6 +13,7 @@ public final class Base64DecodeExpression extends Expression { public Base64DecodeExpression() { super(DataType.STRING); } + @Override protected void doExecute(ExecutionContext ctx) { String input = String.valueOf(ctx.getValue()); |