From 9b948718144e5d556cc6ea49d2ff6bbf05f00b0e Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 10 Sep 2020 19:54:48 +0200 Subject: Use full name in config definition file names --- vsm/src/vespa/vsm/config/CMakeLists.txt | 10 +++---- .../vsm/config/vespa.config.search.vsm.vsm.def | 13 +++++++++ .../config/vespa.config.search.vsm.vsmfields.def | 31 ++++++++++++++++++++++ .../config/vespa.config.search.vsm.vsmsummary.def | 21 +++++++++++++++ vsm/src/vespa/vsm/config/vsm.def | 13 --------- vsm/src/vespa/vsm/config/vsmfields.def | 31 ---------------------- vsm/src/vespa/vsm/config/vsmsummary.def | 21 --------------- 7 files changed, 69 insertions(+), 71 deletions(-) create mode 100644 vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsm.def create mode 100644 vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmfields.def create mode 100644 vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmsummary.def delete mode 100644 vsm/src/vespa/vsm/config/vsm.def delete mode 100644 vsm/src/vespa/vsm/config/vsmfields.def delete mode 100644 vsm/src/vespa/vsm/config/vsmsummary.def (limited to 'vsm') diff --git a/vsm/src/vespa/vsm/config/CMakeLists.txt b/vsm/src/vespa/vsm/config/CMakeLists.txt index e3bd2db68e2..ce84c569c0a 100644 --- a/vsm/src/vespa/vsm/config/CMakeLists.txt +++ b/vsm/src/vespa/vsm/config/CMakeLists.txt @@ -3,9 +3,7 @@ vespa_add_library(vsm_vconfig OBJECT SOURCES DEPENDS ) -vespa_generate_config(vsm_vconfig vsmfields.def) -install_config_definition(vsmfields.def vespa.config.search.vsm.vsmfields.def) -vespa_generate_config(vsm_vconfig vsm.def) -install_config_definition(vsm.def vespa.config.search.vsm.vsm.def) -vespa_generate_config(vsm_vconfig vsmsummary.def) -install_config_definition(vsmsummary.def vespa.config.search.vsm.vsmsummary.def) +vespa_generate_config(vsm_vconfig vespa.config.search.vsm.vsmfields.def) +vespa_generate_config(vsm_vconfig vespa.config.search.vsm.vsm.def) +vespa_generate_config(vsm_vconfig vespa.config.search.vsm.vsmsummary.def) +install_config_definitions(src/vespa/vsm/config) diff --git a/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsm.def b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsm.def new file mode 100644 index 00000000000..c446efe5588 --- /dev/null +++ b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsm.def @@ -0,0 +1,13 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=vespa.config.search.vsm + +## The document model for the documents used as input for the VSM +doctype reference + +## Configuration for storage client used by VSM +storagecfg reference + +## Config defining what search method should be applied to different +## fields in the documents. It also contains a mapping from index name +## to a set of fields making up that index. +vsmfields reference diff --git a/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmfields.def b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmfields.def new file mode 100644 index 00000000000..ca48692b526 --- /dev/null +++ b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmfields.def @@ -0,0 +1,31 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=vespa.config.search.vsm + +## Level of verification applied to the documents received. +documentverificationlevel int default=0 + +## Set if one should ignore limit hits. +searchall int default=1 + +## The name of a field for which we are assigning a search method. +## The field name refers directly to a field in the document model. +fieldspec[].name string + +## The search method for a given field. Note: same field in 2 different document types must match on type if not a random result might be expected. +fieldspec[].searchmethod enum { NONE, BOOL, AUTOUTF8, UTF8, SSE2UTF8, INT8, INT16, INT32, INT64, FLOAT16, FLOAT, DOUBLE } default=AUTOUTF8 +fieldspec[].arg1 string default="" + +## Maximum number of chars to search per field. +fieldspec[].maxlength int default=1048576 + +## Type of the field +fieldspec[].fieldtype enum {ATTRIBUTE, INDEX} default=INDEX + +## The name of a documenttype for which we are assigning a set of indexes. +documenttype[].name string +## The name of an index of a documenttype for which we are assigning a set of fields. +documenttype[].index[].name string + +## The name of a field part of an index. +## The field name refers directly to a field in the document model. +documenttype[].index[].field[].name string diff --git a/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmsummary.def b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmsummary.def new file mode 100644 index 00000000000..4664371faba --- /dev/null +++ b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmsummary.def @@ -0,0 +1,21 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=vespa.config.search.vsm + +## The name of the result class that should be generated for documents +## returned from the VSM. If this value is empty, the first found +## result class will be used. +outputclass string default="" + +## Mapping of field names between the result class and the document +## model. This value represents the name in the result class. Fields +## not mentioned here will get the identity mapping. +fieldmap[].summary string + +## Mapping of field names between the result class and the document +## model. This field vector represents the names in the document model +## that should be used as input when generating the summary field. +fieldmap[].document[].field string + +## This command specifies how the document fields should be combined +## when generating the summary field. +fieldmap[].command enum { NONE, FLATTENJUNIPER, FLATTENSPACE } default=NONE diff --git a/vsm/src/vespa/vsm/config/vsm.def b/vsm/src/vespa/vsm/config/vsm.def deleted file mode 100644 index c446efe5588..00000000000 --- a/vsm/src/vespa/vsm/config/vsm.def +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=vespa.config.search.vsm - -## The document model for the documents used as input for the VSM -doctype reference - -## Configuration for storage client used by VSM -storagecfg reference - -## Config defining what search method should be applied to different -## fields in the documents. It also contains a mapping from index name -## to a set of fields making up that index. -vsmfields reference diff --git a/vsm/src/vespa/vsm/config/vsmfields.def b/vsm/src/vespa/vsm/config/vsmfields.def deleted file mode 100644 index ca48692b526..00000000000 --- a/vsm/src/vespa/vsm/config/vsmfields.def +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=vespa.config.search.vsm - -## Level of verification applied to the documents received. -documentverificationlevel int default=0 - -## Set if one should ignore limit hits. -searchall int default=1 - -## The name of a field for which we are assigning a search method. -## The field name refers directly to a field in the document model. -fieldspec[].name string - -## The search method for a given field. Note: same field in 2 different document types must match on type if not a random result might be expected. -fieldspec[].searchmethod enum { NONE, BOOL, AUTOUTF8, UTF8, SSE2UTF8, INT8, INT16, INT32, INT64, FLOAT16, FLOAT, DOUBLE } default=AUTOUTF8 -fieldspec[].arg1 string default="" - -## Maximum number of chars to search per field. -fieldspec[].maxlength int default=1048576 - -## Type of the field -fieldspec[].fieldtype enum {ATTRIBUTE, INDEX} default=INDEX - -## The name of a documenttype for which we are assigning a set of indexes. -documenttype[].name string -## The name of an index of a documenttype for which we are assigning a set of fields. -documenttype[].index[].name string - -## The name of a field part of an index. -## The field name refers directly to a field in the document model. -documenttype[].index[].field[].name string diff --git a/vsm/src/vespa/vsm/config/vsmsummary.def b/vsm/src/vespa/vsm/config/vsmsummary.def deleted file mode 100644 index 4664371faba..00000000000 --- a/vsm/src/vespa/vsm/config/vsmsummary.def +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=vespa.config.search.vsm - -## The name of the result class that should be generated for documents -## returned from the VSM. If this value is empty, the first found -## result class will be used. -outputclass string default="" - -## Mapping of field names between the result class and the document -## model. This value represents the name in the result class. Fields -## not mentioned here will get the identity mapping. -fieldmap[].summary string - -## Mapping of field names between the result class and the document -## model. This field vector represents the names in the document model -## that should be used as input when generating the summary field. -fieldmap[].document[].field string - -## This command specifies how the document fields should be combined -## when generating the summary field. -fieldmap[].command enum { NONE, FLATTENJUNIPER, FLATTENSPACE } default=NONE -- cgit v1.2.3