diff options
9 files changed, 6 insertions, 33 deletions
diff --git a/application/src/test/resources/test.sd b/application/src/test/resources/test.sd index 85600ef9546..81d10391294 100644 --- a/application/src/test/resources/test.sd +++ b/application/src/test/resources/test.sd @@ -4,19 +4,15 @@ search test { document test { field title type string { - # index-to: title, default weight: 30 stemming: none bolding: on - body } field body type string { - # index-to: body, default weight: 6 stemming: none summary: dynamic - body } } diff --git a/docproc/src/test/java/com/yahoo/docproc/util/docindoc.sd b/docproc/src/test/java/com/yahoo/docproc/util/docindoc.sd index 8b6acd71f47..b05f8d71c89 100644 --- a/docproc/src/test/java/com/yahoo/docproc/util/docindoc.sd +++ b/docproc/src/test/java/com/yahoo/docproc/util/docindoc.sd @@ -1,7 +1,7 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search docindoc { document docindoc { - field name type string { header } - field content type string { body } + field name type string { } + field content type string { } } } diff --git a/docproc/src/test/java/com/yahoo/docproc/util/outerdoc.sd b/docproc/src/test/java/com/yahoo/docproc/util/outerdoc.sd index 6fdbd402ffe..57a1bda323a 100644 --- a/docproc/src/test/java/com/yahoo/docproc/util/outerdoc.sd +++ b/docproc/src/test/java/com/yahoo/docproc/util/outerdoc.sd @@ -1,6 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search outerdoc { document outerdoc { - field innerdocuments type array<docindoc> { body } + field innerdocuments type array<docindoc> { } } } diff --git a/document/src/test/java/com/yahoo/document/datatypes/blog.sd b/document/src/test/java/com/yahoo/document/datatypes/blog.sd index 545c46cb149..1723e942370 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/blog.sd +++ b/document/src/test/java/com/yahoo/document/datatypes/blog.sd @@ -4,26 +4,19 @@ search blog { document blog { field title type string { - header indexing: summary | index - # index-to: default } field author type string { - header indexing: summary | index - # index-to: default } field body type string { - header indexing: summary | index } field url type uri { - header indexing: index | summary - # index-to: default } } diff --git a/document/src/test/java/com/yahoo/document/docindoc.sd b/document/src/test/java/com/yahoo/document/docindoc.sd index 8b6acd71f47..b05f8d71c89 100644 --- a/document/src/test/java/com/yahoo/document/docindoc.sd +++ b/document/src/test/java/com/yahoo/document/docindoc.sd @@ -1,7 +1,7 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search docindoc { document docindoc { - field name type string { header } - field content type string { body } + field name type string { } + field content type string { } } } diff --git a/document/src/test/java/com/yahoo/document/outerdoc.sd b/document/src/test/java/com/yahoo/document/outerdoc.sd index 6fdbd402ffe..57a1bda323a 100644 --- a/document/src/test/java/com/yahoo/document/outerdoc.sd +++ b/document/src/test/java/com/yahoo/document/outerdoc.sd @@ -1,6 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search outerdoc { document outerdoc { - field innerdocuments type array<docindoc> { body } + field innerdocuments type array<docindoc> { } } } diff --git a/documentgen-test/etc/complex/book.sd b/documentgen-test/etc/complex/book.sd index 90dff0982af..872634bf53b 100644 --- a/documentgen-test/etc/complex/book.sd +++ b/documentgen-test/etc/complex/book.sd @@ -44,22 +44,17 @@ search book { } field author type string { bolding: on - # index-to: default, author indexing: summary | index - header } field isbn type string { - # index-to: default, isbn indexing: summary | index } field year type int { indexing: summary | index } field description type string { - # index-to: default, description indexing: summary | index summary: dynamic - body } field myraw type raw { diff --git a/documentgen-test/etc/complex/common.sd b/documentgen-test/etc/complex/common.sd index 017bce4f612..fb49c8b0e52 100644 --- a/documentgen-test/etc/complex/common.sd +++ b/documentgen-test/etc/complex/common.sd @@ -6,10 +6,8 @@ search common { } field title type string { bolding: on - # index-to: default, title indexing: index|summary summary-to: smallsum - body } field mid type int { indexing: attribute|index|summary @@ -33,7 +31,6 @@ search common { indexing: index|summary } field content type raw { - body } annotation date { field exacttime type long { } diff --git a/vespa-documentgen-plugin/etc/music/music.sd b/vespa-documentgen-plugin/etc/music/music.sd index 2e40523a6d9..b5083d4e490 100644 --- a/vespa-documentgen-plugin/etc/music/music.sd +++ b/vespa-documentgen-plugin/etc/music/music.sd @@ -7,33 +7,25 @@ search music { field title type string { indexing: summary | index # How this field should be indexed - # index-to: title, default # Create two indexes weight: 75 # Ranking importancy of this field, used by the built in nativeRank feature - header } field artist type string { indexing: summary | attribute | index - # index-to: artist, default - weight: 25 - header } field year type int { indexing: summary | attribute - header } # Increase query field popularity type int { indexing: summary | attribute - body } field url type uri { indexing: summary | index - header } } |