diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2019-01-22 12:54:54 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@oath.com> | 2019-01-22 12:54:54 +0100 |
| commit | 1db80c6ab30aafd0e8c3cc09091f9949e9488145 (patch) | |
| tree | e4534ee6925175563beb5c294976f70755903d02 /configdefinitions/src | |
| parent | b1a1038d66df81646bed462295761d1aeed2c1e9 (diff) | |
| parent | 8372a883c5a5fa100f88fc9b80824359b5bb70cd (diff) | |
Merge branch 'master' into hakonhall/define-enable-logserver-flag
Diffstat (limited to 'configdefinitions/src')
| -rw-r--r-- | configdefinitions/src/vespa/imported-fields.def | 9 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/indexschema.def | 4 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/slobroks.def | 3 |
3 files changed, 2 insertions, 14 deletions
diff --git a/configdefinitions/src/vespa/imported-fields.def b/configdefinitions/src/vespa/imported-fields.def index 051226f1615..0947ff63e2a 100644 --- a/configdefinitions/src/vespa/imported-fields.def +++ b/configdefinitions/src/vespa/imported-fields.def @@ -9,12 +9,3 @@ attribute[].referencefield string # The name of the target attribute field in the parent document type that is imported into this document type. attribute[].targetfield string - -# Deprecated. TODO: Remove when going to Vespa 7. -# The data type of the target attribute field. This enum should match the one in attributes.def. -attribute[].datatype enum { STRING, UINT1, UINT2, UINT4, INT8, INT16, INT32, INT64, FLOAT, DOUBLE, PREDICATE, TENSOR, REFERENCE, NONE } default=NONE - -# Deprecated. TODO: Remove when going to Vespa 7. -# The collection type of the target attribute field. This enum should match the one in attributes.def. -attribute[].collectiontype enum { SINGLE, ARRAY, WEIGHTEDSET } default=SINGLE - diff --git a/configdefinitions/src/vespa/indexschema.def b/configdefinitions/src/vespa/indexschema.def index 5352e4d9009..7153164bfab 100644 --- a/configdefinitions/src/vespa/indexschema.def +++ b/configdefinitions/src/vespa/indexschema.def @@ -4,10 +4,8 @@ namespace=vespa.config.search ## The name of the index field. indexfield[].name string -## This is the type of an index. Currently only rise and vespa are supported -indexfield[].indextype enum {VESPA, RISE} default=VESPA ## The data type of the index field. -indexfield[].datatype enum { STRING, INT64, BOOLEANTREE } default=STRING +indexfield[].datatype enum { STRING, INT64 } default=STRING ## The collection type of the index field. indexfield[].collectiontype enum { SINGLE, ARRAY, WEIGHTEDSET } default=SINGLE ## Whether the index should support prefix searches. diff --git a/configdefinitions/src/vespa/slobroks.def b/configdefinitions/src/vespa/slobroks.def index 2dd17b307e1..b4e5536d2df 100644 --- a/configdefinitions/src/vespa/slobroks.def +++ b/configdefinitions/src/vespa/slobroks.def @@ -2,8 +2,7 @@ namespace=cloud.config ### All params must be flagged as 'restart' because this config is manually -### retrieved by ConfiguredApplication.start to init the rpc server in -### com.yahoo.container.Server. +### retrieved by ConfiguredApplication.start to init the rpc server ## The connectionspec for a slobrok is used for connecting to it using ## the FNET Remote Tools framework. It is normally on the form |