summaryrefslogtreecommitdiffstats
path: root/indexinglanguage/src/main
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@verizonmedia.com>2019-12-02 15:21:52 +0100
committerTor Brede Vekterli <vekterli@verizonmedia.com>2019-12-02 15:36:17 +0100
commit423d127475495cd485085648db49e2ad5b923bb6 (patch)
tree78338691551bce779f94259ec1564311b6954d58 /indexinglanguage/src/main
parent4e0290915f15ff1edd530daa5b53217e76b785c6 (diff)
Preserve AssignValueUpdates to struct fields in indexing docproc
Would previously be rewritten as MapValueUpdates for unknown reasons. This wouldn't actually work, as an exception would be thrown during serialization when sanity checking code figured out that the MapValue update was attempted used for a non-array/wset field data type.
Diffstat (limited to 'indexinglanguage/src/main')
-rw-r--r--indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java
index cffbd21f7c5..7296e4ce61e 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java
@@ -242,7 +242,6 @@ public class FieldUpdateAdapter implements UpdateAdapter {
private static class CompleteBuilder extends PartialBuilder {
- static final ValueUpdate nullMap = new MapValueUpdate(null, null);
static final ValueUpdate nullAssign = new AssignValueUpdate(null);
CompleteBuilder() {
@@ -251,11 +250,7 @@ public class FieldUpdateAdapter implements UpdateAdapter {
@Override
List<ValueUpdate> createValueUpdates(FieldValue val, ValueUpdate upd) {
- if (val instanceof StructuredFieldValue) {
- return super.createValueUpdates(val, nullMap);
- } else {
- return super.createValueUpdates(val, nullAssign);
- }
+ return super.createValueUpdates(val, nullAssign);
}
}
}