summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-01-14 00:00:20 +0100
committergjoranv <gv@oath.com>2019-01-21 15:09:30 +0100
commit87f79861f042b6467350f720e82267994d3bf267 (patch)
treed14ebf04ad0c7ec862fa383f938fca76695ed6ce
parent5227880b0749a243d396f3443e0d988abcfae7af (diff)
Follow api change
-rw-r--r--document/abi-spec.json4
-rw-r--r--document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java8
-rw-r--r--document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java6
3 files changed, 17 insertions, 1 deletions
diff --git a/document/abi-spec.json b/document/abi-spec.json
index c5a88ac9a41..a17bc298289 100644
--- a/document/abi-spec.json
+++ b/document/abi-spec.json
@@ -4669,6 +4669,7 @@
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.Array)",
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.MapFieldValue)",
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.CollectionFieldValue)",
+ "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.BoolFieldValue)",
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.ByteFieldValue)",
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.DoubleFieldValue)",
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.FloatFieldValue)",
@@ -4716,8 +4717,8 @@
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.Array)",
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.MapFieldValue)",
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.CollectionFieldValue)",
- "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.BoolFieldValue)",
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.ByteFieldValue)",
+ "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.BoolFieldValue)",
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.DoubleFieldValue)",
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.FloatFieldValue)",
"public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.IntegerFieldValue)",
@@ -4824,6 +4825,7 @@
"public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.Array)",
"public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.MapFieldValue)",
"public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.ByteFieldValue)",
+ "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.BoolFieldValue)",
"public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.CollectionFieldValue)",
"public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.DoubleFieldValue)",
"public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.FloatFieldValue)",
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java
index 624a074421e..e8da3d66611 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java
@@ -18,6 +18,7 @@ import com.yahoo.document.CollectionDataType;
import com.yahoo.document.DataType;
import com.yahoo.document.DataTypeName;
import com.yahoo.document.datatypes.Array;
+import com.yahoo.document.datatypes.BoolFieldValue;
import com.yahoo.document.datatypes.ByteFieldValue;
import com.yahoo.document.datatypes.CollectionFieldValue;
import com.yahoo.document.datatypes.DoubleFieldValue;
@@ -202,6 +203,13 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu
throw new IllegalArgumentException("read not implemented yet.");
}
public void read(FieldBase field, ByteFieldValue value) { value.assign(getByte(null)); }
+
+ @Override
+ public void read(FieldBase field, BoolFieldValue value) {
+ byte asByte = value.getBoolean() ? (byte)1 : (byte)0;
+ buf.put(asByte);
+ }
+
public void read(FieldBase field, DoubleFieldValue value) { value.assign(getDouble(null)); }
public void read(FieldBase field, FloatFieldValue value) { value.assign(getFloat(null)); }
public void read(FieldBase field, IntegerFieldValue value) { value.assign(getInt(null)); }
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java
index 2d381c23916..dab94906c39 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java
@@ -20,6 +20,7 @@ import com.yahoo.document.annotation.SpanList;
import com.yahoo.document.annotation.SpanNode;
import com.yahoo.document.annotation.SpanTree;
import com.yahoo.document.datatypes.Array;
+import com.yahoo.document.datatypes.BoolFieldValue;
import com.yahoo.document.datatypes.ByteFieldValue;
import com.yahoo.document.datatypes.CollectionFieldValue;
import com.yahoo.document.datatypes.DoubleFieldValue;
@@ -164,6 +165,11 @@ public class VespaDocumentSerializer6 extends BufferSerializer implements Docume
buf.put(value.getByte());
}
+ @Override
+ public void write(FieldBase field, BoolFieldValue value) {
+ value.setBoolean((getByte(null) != 0));
+ }
+
/**
* Write out the value of collection field
*