diff options
| author | Harald Musum <musum@oath.com> | 2018-09-22 16:16:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-22 16:16:41 +0200 |
| commit | e249cea8da57c677d5aa9c41ec3ac5558ee64f98 (patch) | |
| tree | 09809f26469325f49add277664eb95774ecbe305 | |
| parent | caf8b1bd4c7d46041f0def04a294a617e7eda141 (diff) | |
| parent | fdb8620cf0732ce5777e59d5f8d4e3673603160c (diff) | |
Merge pull request #7054 from vespa-engine/gjoranv/qr-templates-cleanup
Remove remains from qr-templates config
7 files changed, 0 insertions, 1390 deletions
diff --git a/config/src/test/java/com/yahoo/vespa/config/classes/app.1.def b/config/src/test/java/com/yahoo/vespa/config/classes/app.1.def deleted file mode 100644 index df2a57bad04..00000000000 --- a/config/src/test/java/com/yahoo/vespa/config/classes/app.1.def +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -message string default="Hello!" - -times int default=1 - -a[].name string diff --git a/config/src/test/java/com/yahoo/vespa/config/classes/qr-templates.3.def b/config/src/test/java/com/yahoo/vespa/config/classes/qr-templates.3.def deleted file mode 100644 index d3d7ff87cbd..00000000000 --- a/config/src/test/java/com/yahoo/vespa/config/classes/qr-templates.3.def +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -## Directory for temporary files -directory string default="tmp/templates" - -hey[].ho[].lets[].go string default="ramones" -hey[].ho[].lets[].fishing int default=-4 range=[-8,0] -hey[].ho[].lets[].gone int default=200 range=[0,1000000] -hey[].ho[].lets[].ref reference -hey[].ho[].gone int default=2000 range=[-10,2000000] -hey[].ho[].going bool default=false -hey[].ho[].wash double default=345.3 -hey[].ho[].me double default=-45.5 range=[-234.43,0] -hey[].ho[].now double default=-34 range=[-234,0] -hi[].there[].e enum { BATCH, REALTIME, INCREMENTAL} default=BATCH -hi[].ther[].f enum { BATCH, REALTIME } default=BATCH - -#hey[] int -mode enum { BATCH, REALTIME, INCREMENTAL} default=BATCH -bar.arrline[] string -az[] double -bar.arline[] int range=[0,999] -#bar[].version int -b1[].b2[].b3[].b4[] bool -## Capacities for all storage nodes -capacity[] double range=[0,100] - -longVal long -longWithDefault long default=9876543210 -longWithRange long range=[-9000000000,0] -longArr[] long -longArrWithRange[] long range=[0,9000000000] - -fileVal file -fileWithDefault file -fileArr[] file - -washing double default=5 range=[-1.4,34.324432] -washer double default=46 range=[-1.6,54] - -urlprefix string - -## Prefix to use in queries to choose a given template -templateset[].urlprefix string - -## The MIME type of a given template -templateset[].mimetype string default="text/html" - -## The character set of a given template -templateset[].encoding string default="iso-8859-1" - -## Not used -templateset[].rankprofile int default=0 - - -## Not used in 1.0 -templateset[].keepalive bool default=false - -## Header template. Always rendered. -templateset[].headertemplate string - -## Footer template. Always rendered. -templateset[].footertemplate string - -## Nohits template. Rendered if there are no hits in the result. -templateset[].nohitstemplate string - -## Hit template. Rendered if there are hits in the result. -templateset[].hittemplate string - -## Error template. Rendered if there is an error condition. This is -## not mutually exclusive with the (no)hit templates as such. -templateset[].errortemplate string - -groupsheadertemplate string default="[DEFAULT]" - -## Aggregated groups header template. -## Default rendering is used if missing -templateset[].groupsheadertemplate string default="[DEFAULT]" - -## Aggregated range group template. -## Default rendering is used if missing -templateset[].rangegrouptemplate string default="[DEFAULT]" - -## Aggregated exact group template -## Default rendering is used if missing -templateset[].exactgrouptemplate string default="[DEFAULT]" - -## Aggregated groups footer template. -## Default rendering is used if missing -templateset[].groupsfootertemplate string default="[DEFAULT]" - -## Tags used to highlight results, starting a bolded section. -## An empty string means the template should no override what -## was inserted by the search chain. -templateset[].highlightstarttag string default="" -## Tags used to highlight results, ending a bolded section -## An empty string means the template should no override what -## was inserted by the search chain. -templateset[].highlightendtag string default="" -## Tags used to highlight results, separating dynamic snippets -## An empty string means the template should no override what -## was inserted by the search chain. -templateset[].highlightseptag string default="" - -## The summary class to use for this template if there is none -## defined in the query. -ilscript[].name string -ilscript[].doctype string -ilscript[].content[] string -config[].id reference -config[].autostart string default="no" -musum string - -auran string - -route[].name string -route[].selector string -route[].feed string - -languages[] string -languages2[] string -foolang[].lang[] string - -# Maps -myIntMap{} int -myStringMap{} string -myStructMap{}.myInt int -myStructMap{}.myString string -myStructMap{}.myIntDef int default=56 -myStructMap{}.myStringDef string default="g" - -myStructMap{}.myNestedLeafMap{} long -myStructMap{}.myNestedArray[] long - -myStructMap{}.myNestedMap{}.myLong long -myStructMap{}.myNestedMap{}.myLongDef long default=-100 - -myStructMap{}.myStruct.a string -myStructMap{}.myStruct.b string default="pizza" -myStructMap{}.myStruct.c file diff --git a/config/src/test/java/com/yahoo/vespa/config/classes/ranges.1.def b/config/src/test/java/com/yahoo/vespa/config/classes/ranges.1.def deleted file mode 100644 index 5377b143d77..00000000000 --- a/config/src/test/java/com/yahoo/vespa/config/classes/ranges.1.def +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -quux int default=5 range=[,] -xyzzy double default=5 range=[,] -longVal long default=5 range=[,] diff --git a/config/src/test/java/com/yahoo/vespa/config/classes/testfoobar.12.def b/config/src/test/java/com/yahoo/vespa/config/classes/testfoobar.12.def deleted file mode 100644 index 863ac2b0fed..00000000000 --- a/config/src/test/java/com/yahoo/vespa/config/classes/testfoobar.12.def +++ /dev/null @@ -1,918 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -longVal long -longWithDefault long default=8589934592 - -fileVal file -fileWithDefault file - -vh[] double range=[-300,300] -bg[] int default=0 range=[-10,10] -gee[] string -storage[].feeder[] string -storage[].distributor[] string - -ju[].hu[].tu[] double default=-45 range=[0,1000.1] -ju[].hu[].wu[] enum { HEY, HO} default=HO -ju[].hu[].tang[] bool default=false -ju[].hu[].clan[] int default=45 range=[-90,90] -ju[].hu[].sann reference - -foo string -headertemplate string -## If true, the bitvector part of results with number of hits within -## max bin size will be merged into array form before applying static -## rank. NB: Setting this to true may reduce performance. -applystaticranktosmallbitvectors bool default=true - -## Size of bitvector cache (in bytes). -bitvectorcachesize int default=50000000 - -## Size of boolean occurrence cache (in bytes). -boolocccachesize int default=100000000 - -## Size of dictionary cache (in bytes). -dictcachesize int default=40000000 - -onedimstruct[].val string - -## Size of document info cache (in bytes). -documentinfocachesize int default=25000000 - -## Size of filter occurrence cache (in bytes). -## This cache is used to optimizse exclusion handling. -## A too small size limit will cause serious performance degradation -## if the staticfilterindexes keyword is used. -filterocccachesize int default=30000000 - -## Size of integer range bitvector cache (in bytes). -intrangebitvectorcachesize int default=50000000 - -## Size of integer occurrence cache (in bytes). -intocccachesize int default=100000000 - -## Size of phrase occurrence cache (in bytes). -phrasecachesize int default=150000000 - -## Size of phrase occurrence index cache (in bytes). -phraseidxcachesize int default=20000000 - -## Size of position occurrence cache (in bytes). -posocccachesize int default=100000000 - -## The filename of a file specifying which hosts that should have -## access to the internal web-server of the fsearch process. -accesslist string default="" - -## The filename of the log file for HTTP access. -accesslog string default="" - -## The number of threads to perform async occurrence fetch, i.e. -## read from posocc and boolocc files and possibly generation of -## posocc/boolocc arrays for phrases. Async occurrence fetches -## will use more system CPU but can reduce latency on lightly -## loaded systems. -asyncfetchocc int default=0 - -## specifies the high limit of the ranked result bin. -## If the percentage of the resultset specified in binsize is higher -## than this limit, this will be the max size. -binhigh int default=2147483647 - -## specifies the lowest possible size of a ranked result. This is -## the lower ramp of the percentage specified in the binsize variable. -binlow int default=10000 - -## specifies the size of the ranked results as a percentage of the -## total result set size. The percentage can be ramped off with the -## binlow and binhigh variables. NB: Setting this to 100.0 may lead to -## seriously reduced performance. -binsize double default=100.0 - -## Check cache lines beyond offset + maxhits for blacklisting -## in order to provide correct "totalhits" for queries with many hits. -checktrailingcachelines bool default=false - -## specifies the number of result entries that are processed when -## doing site collapsing. Site collapsing is performed by reordering -## the first collapseentries hits in the result set, listing -## the best hit from each site first. -collapseentries int default=200 range=[0,1000000] - -## Specifies what is the default field used for collapse -defaultcollapse string default="" - -## specifies the rank penalty for additional hits from a site found -## during site collapsing. When additional hits from a site are -## found, the rank values of those hits are reduced by shifting -## them collapserankshift places to the right. -collapserankshift int default=0 - -## The maximum number of active and queued requests. Exceeding -## requests will be discarded. -cutofftransportconns int default=1024 - -## specifies the directory where the dataset resides. Only the -## directory needs to be specified. fsearch will then read the config -## files (index.cf) in that directory to discover the structure. -datasetdir string default="" - -## If set to "yes", then fallback to the default index if a query -## term specifies a non-existing index. If set to "no", then always -## return 0 hits for a query term that specifies a non-existing index. -## Note that the result set for the entire query might still contain -## hits from other query terms unless the invalid query term was an -## and-term. Default value is "no". -defaultindexfallback string default="no" - -# ??? -docattrhashsize int default=8171 -# ??? -docidhashsize int default=8171 -# ??? -docport int default=0 - -## If present, the result cache is not flushed due to reload operation -## unless the document summaries have changed. -dontflushresultcacheonreload bool default=false - -## Colon-delimeted list of catalogs for which negative dictionary -## entries should not be cached. Default is unset. Most useful for -## dictionary files that are memorymaped or memorylocked in -## indextune.cf. Note that the list must start and end with a colon (:). -dropnegativedictionarycacheentriescatalogs string default="" - -## specifies a term (used in an ANDNOT) to be used for filtering ALL queries. -excludefilter string default="" - -## If set to "yes", use of firstoccproximity is enabled. If set to -## "no", use of firstoccproximity is disabled. -firstoccproximity string default="" - -## If present, the filter occurrence cache is flushed due to reload -## operation when all queries using the old configuration has completed. -flushfilteroccscacheonreload bool default=false - -## Do not use position occurrence information, even though it might -## be present in the index. -forceemptyposoccs bool default=false - -## The port to run Fnet Remote Tools (RPC) service on. -## If set to 0, no FRT service is provided. -frtport int default=0 - -## The directory where gid based blacklist files are found. -## Used for "realtime" indexing setups. -gidblacklistdir string default="../gidblacklist" - -## A semicolon-separated list of index names and index name prefixes -## defining the set of indexes that are relevant when highlighting -## query keywords. The terms and phrases from the query targeting any -## of these indexes will be highlighted when dynamic teasers are -## generated. In order to separate index names and index name prefixes -## in the list, index name prefixes have a trailing '*'. Note that -## index aliases are treated like actual index names. This means that -## if you have an index relevant for highlighting and an index alias -## pointing to that index, you need to configure both as relevant for -## highlighting if you want to highlight keywords targeting both the -## actual index and the alias. Example config value: "normal*;title". -## Default config value: "*" (highlight all keywords). -highlightindexes string default="*" - -# ??? -hostname string default="" - -## provide a HTTP server at the given port number. -hport int default=8002 - -## If true, the TCP_NODELAY option is set on the http connections. -## This causes non-full packets to be sent even though previously sent -## data hasn't yet been acknowledged (e.g. due to the delayed ack -## feature present on various tcp stacks). -httpdnodelay bool default=false - -# ??? -intoccpoolsize int default=32768 -# ??? -intoccpoolstep int default=32768 -# ??? -jobqueuethreads int default=5 - -## Juniper configuration property map. -## currently known keys with defaults: -## [juniper.dynsum.highlight_on] = "<b>" -## [juniper.dynsum.highlight_off] = "</b>" -## [juniper.dynsum.continuation] = "..." -## [juniper.dynsum.length] = "256" -## [juniper.dynsum.min_length] = "128" -## [juniper.stem.min_length] = "5" -## [juniper.stem.max_extend] = "3" -## [juniper.dynsum.surround_max] = "128" -## [juniper.dynsum.max_matches] = "3" -## [juniper.dynsum.escape_markup] = "auto" -## [juniper.matcher.winsize] = "200" -## [juniper.dynsum.separators] = "\0x1F\0x1D" -## [juniper.dynsum.connectors] = "\0x1F\0x1D" -## [juniper.proximity.factor] = "0.25" -## [juniper.debug_mask] = "0" -## -#junipersetup properties - -## The maximum number of HTTP connections. -maxhttpconns int default=1024 - -## The maximum interval between a successful read from a socket -## before timeout, in seconds. -maxsocksilent double default=5.0 - -## The maximum number of threads to use. -maxthreads int default=100 - -## The maximum number of active requests at any time. Exceeding -## requests will be queued. -maxtransportconns int default=15 - -## If present the index to the document summary file (docsum.idx) -## is accessed on disk on each access instead of being cached in -## memory. For experimental use on systems with very many docu- -## ments but very few actual docsum requests. -nodocsumidxinmemory bool default=false - -## If set then locks on result cache are held only for very -## short intervals and only a single cache element is locked at a -## time. This simplifies the mutex locking order, but cause extra -## load due to queries that would previously first block then use -## cached value now being fully evaluted. -nonblockingresultcache bool default=false - -## A boolean value controlling removal of several common accented -## uses of characters, used when matching for highlighting. -normalize.accentremoval bool default=true - -## A boolean value controlling normalizing of LATIN CAPITAL/SMALL -## LIGATURE OE (U+0152 U+0153) to the string "oe", used when matching -## for highlighting. -normalize.ligaturesubstitution bool default=true - -## A boolean value controlling normalizing of various accented letters -## to two chars, for linguistics compatibility. -normalize.multicharexpansion bool default=true - -## A boolean value controlling normalizing of LATIN SMALL LETTER SHARP S -## (U+00DF) to the string "ss", used when matching for highlighting. -normalize.sharpssubstitution bool default=true - -## If true, queries are still handled during the reload operation -## (even when the document summaries have changed). If false then -## queries are stalled until reload has completed. -overlappedreload bool default=true - -## The partition number to report to the connecting fdispatch process -## if the dataset label didn't specify the partition number. -partition int default=0 - -## If set to "yes", use of proximity (cf. proximity and firstoccproximity) -## will affect phrases in addition to single words. If set to "no", -## use of proximity is never used for phrases. -phraseproximity string default="" - -## The file name to write the PID of the fsearch process to. -pidfile string default="" - -## Minimum value for maximum value of number of 'posocc' entries -## for a word. If set to 0, computed as 2 * binlow. -posbinhigh int default=0 - -## Maximum value for maximum value of number of 'posocc' entries -## for a word. If set to 0, computed as min(4 * binhigh, 0x7fffffff) -posbinlow int default=0 - -## The maximum value for number of 'posocc' entries for a word, -## specified as a percentage of the number of documents in the index. -## If more entries are needed for evaluation, posocc entries are not -## used for that word and evaluation will be performed without full -## proximity support. The percentage can be ramped off with the posbinlow -## and posbinhigh variables. If set to 0, computed as 2.0 * binsize. -posbinsize double default=0 - -## If set to "yes", use of posocc files is enabled, except when -## "forceemptyposoccs" is set or posocc files doesn't exist. If -## set to "no", use of posocc files is disabled. -proximity string default="" - -## Selects behavior when proximity can be used for two words but -## not three words while firstoccproximity can be used for three -## words. If set to "yes", then use proximity for two words. If -## set to "no", then use firstoccproximity for three words. -proximitypairbeforefirstoccproximitytriple string default="" - -## Selects behavior when proximity can be used for three words but -## not four words while firstoccproximity can be used for four -## words. If set to "yes", then use proximity for three words. If -## set to "no", then use firstoccproximity for four words. The -## default is "yes". -proximitytriplebeforefirstoccproximityquad string default="" - -## specifies the port number for the persistent internal transport -## protocol provided for a multi-level dispatch system. -ptport int default=8003 - -## a reference to a rank-profiles.def type configuration -## describing how to rank results. If empty, fsearch loads -## rank.cf from the dataset directory, see rank.cf(5). -rankcf reference - -## specifies a lower limit for the rankvalue of the results -## returned from the search node. -rankcutoff int default=0 - -## if set, an internal calculation is used for determining a -## rank cutoff value as above. -rankcutoffadvanced bool default=false - -## Specifies the constant value used in the internal advanced rank -## cutoff calculations done when the rankcutoffadvanced parameter is set. -## This roughly reflects the expected rank contribution of -## one good term. -rankcutoffadvval int default=0 - -# ??? -rankinginfopoolsize int default=1048576 -# ??? -rankinginfopoolstep int default=262144 -## Grace period (in seconds) after index reload where old index is -## still available. -reloadgraceperiod int default=64 - -## Maximum number of entries in the resultattributescache. -resultattributescachequeries int default=0 -## Maximum number of entries in the resultattributescache. -## 0 means no limitation. -resultattributescachesize int default=5000000 - -## The maximum lifetime of a resultcache element in seconds. -resultcachemaximumlifetime int default=7200 -## The minimum lifetime of a resultcache element in seconds. -resultcacheminimumlifetime int default=3600 - -## Maximum number of entries in the resultcache. -## 0 means no limitation. -resultcachequeries int default=0 -## Maximum size (in bytes) in the resultcache. -resultcachesize int default=50000000 - -# ??? -rewriter.indexes string default="" -# ??? -rewriter.langfield string default="bsumlanguage" -# ??? -rewriter.rootdir string default="" -# ??? -#rewritersetup properties - -## Set the number of samples a disk is marked as slow before -## starting selftest when no progress occurred during the last -## slowdisksamples samples. -slowdisklatch int default=1 - -## Set the number of milliseconds to sleep between each sample of -## disk state. -slowdisksamplemillisleep int default=100 - -## Set the number of nanoseconds to sleep between each sample of -## disk state. If 0, use slowdisksamplemillisleep instead. -## Restriction: This option only has effect on FreeBSD -## using the LinuxThreads port. -slowdisksamplenanosleep int default=0 - -## Set the number of contigous disk samples without progress and -## outstanding requests before a disk is detected as slow. -## If zero, automatic slowdisk detection is turned off. -## Recommended value is '20' (when using default values for the -## other slowdisk detection parameters). -slowdisksamples int default=0 - -# ??? -staticfilter string default="" - -## specifies a set of indexes for which to optimize exclusion -## handling. Colon is used to separate index names. Default is unset. -## The optimization use entries in the filter occurrence cache, thus -## a too small size limit of the cache will cause serious performance -## degradation. -staticfilterindexes string default="" - -# ??? -strictbind bool default=false - -## Specifies a file containing url coded queries to run as part of self -## test initiated when a slow disk has been detected. -testloadfile string default="" - -## the type of transport to use. Currently only "fnet" is available. -transport string default="" - -## Specifies the transport access log file used by the http server. -## The real log file name is created by using the strftime function -## with the given argument as template. -transportaccesslog string default="" - -## Specifies the interval between transport access log rotation. -## This is the number of minutes between log rotation, e.g a value -## of 1440 indicates that the log should be rotated every 24 hour. -transportaccesslogcycle int default=1440 - -## Specifies the offset from the start of each cycle when the -## transport access log should be cycled automatically. The unit -## is seconds, e.g. a value of 1020 indicates that the log should -## be cycled at 17 minutes past each cycle. -transportaccesslogcycleoffset int default=0 - -## Reference to VSM (Vespa Stream Matcher) configuration. If this is -## set, fsearch will run in VSM mode. -vsmconfig reference - -## If true, the TCP_NODELAY option is set on the persistent transport -## connections. This causes non-full packets to be sent even though -## previously sent data hasn't yet been acknowledged (e.g. due to the -## delayed ack feature present on various tcp stacks). -transportnodelay bool default=true - -# ??? -wordfolder bool default=false -# ??? -wordhashsize int default=524269 -# ??? -wordoccpoolsize int default=2097152 -# ??? -wordoccpoolstep int default=524288 -# ??? -wordpoolsize int default=262144 -# ??? -wordpoolstep int default=65536 - -## Connect spec for transactionlog server. -tlsspec string default="" - -## Document manager config -documentmanagerconfigid reference - -functionmodules[] string restart - -specialchars string - -tokenlist[].name string -tokenlist[].tokens[].token string -tokenlist[].tokens[].replace string default="" - -afloat double default=34 range=[0,1002] - -## qr-searchers: -tag.bold.open string default="<hi>" -tag.bold.close string default="</hi>" -tag.separator string default="<sep />" - -## This array contains the built-in searchers that should -## normally always run in a Vespa-S system. The actual list is -## in the global/ directory on the configserver. -builtin[].searcher string - -## If for some reason you need to disable one of the built-in -## searchers you can set this flag to "false". Handle with great -## care. You need to match the array index from the global/ -## directory, and this may change depending on versions. -builtin[].enabled bool default=true - -# some searcher specific configuration parameters: - -com.yahoo.prelude.searcher.FieldCollapsingSearcher.collapsesize int default=1 -com.yahoo.prelude.searcher.FieldCollapsingSearcher.extrafactor double default=2.0 -com.yahoo.prelude.searcher.FieldCollapsingSearcher.collapsefield string default="mid" - -com.yahoo.prelude.searcher.BlendingSearcher.numthreads int default=200 -com.yahoo.prelude.searcher.BlendingSearcher.docid string default="" - -com.yahoo.prelude.searcher.BoldingSearcher.source string default="" - -com.yahoo.prelude.searcher.JuniperSearcher.source string default="" -com.yahoo.prelude.searcher.JuniperSearcher.defaultdoctype string default="" - -com.yahoo.prelude.searcher.XMLStringSearcher.source string default="" - -## relevancy as measured from the backend will usually be -## normalized into the [0,1000] range to make blending between -## several backends with different relevancy models possible; you -## can elect to skip this if you only have backends using -## relevancy scores that are directly comparable. -com.yahoo.prelude.fastsearch.FastSearcher.skipnormalizing bool default=true - -## how many aggregation groups to fetch from the backend -com.yahoo.prelude.grouping.AggregatingSearcher.maxgroups int default=100 - -com.yahoo.prelude.querytransform.PhrasingSearcher.automatonfile string default="" -com.yahoo.prelude.querytransform.NonPhrasingSearcher.automatonfile string default="" -com.yahoo.prelude.querytransform.TermReplacingSearcher.termlist[] string -com.yahoo.prelude.querytransform.CompleteBoostSearcher.source string default="" - -com.yahoo.prelude.querytransform.ExactStringSearcher.source string default="" -com.yahoo.prelude.querytransform.LiteralBoostSearcher.source string default="" -com.yahoo.prelude.querytransform.TermBoostSearcher.source string default="" -com.yahoo.prelude.querytransform.NormalizingSearcher.source string default="" -com.yahoo.prelude.querytransform.StemmingSearcher.source string default="" - -com.yahoo.prelude.statistics.StatisticsSearcher.latencybucketsize int default=30 - - -# here users may add their custom searchers -# (all strings should be class names) -customizedsearchers.rawquery[] string -customizedsearchers.transformedquery[] string -customizedsearchers.blendedresult[] string -customizedsearchers.unblendedresult[] string -customizedsearchers.backend[] string -customizedsearchers.argument[].key string -customizedsearchers.argument[].value string - -## This is for adding searchers which should be below BlendingSearcher, -## but not be linked to any Vespa cluster (directly). -external[].name string -external[].searcher[] string - -# Search cluster specific information. -## Name of search cluster. -searchcluster[].name string default="" - -## Names of search definitions served by search cluster. -searchcluster[].searchdef[] string - -## configid that may be used to get rank-profiles config for the cluster. -searchcluster[].rankprofiles.configid reference default="" - -## Indexing mode of search cluster. -searchcluster[].indexingmode enum { REALTIME, STREAMING } default=REALTIME - -## Storage cluster to use for search cluster if indexingmode is streaming. -searchcluster[].storagecluster string default="" - -# The available dispatchers on each search cluster -searchcluster[].dispatcher[].host string -searchcluster[].dispatcher[].port int - -## The number of least significant bits of the part id used to specify the -## row number (the rest of the bits specifies the column). Don't touch -## this unless you know why you are doing it. -searchcluster[].rowbits int default=0 - - -# 4 search-cluster-specific overrides of global cache parameters: - -## Internal searcher cache. Size is measured in megabytes of raw packet -## size. Hits larger than 1% of total cache size will not be cached. -searchcluster[].cache.size int default=1 - -## Timeout for internal searcher cache. Entries older than this number -## of seconds will be removed from cache. 0 means no cache timeout. -## If cachetimeoutseconds is used, the cache is not purged when reindexing. -searchcluster[].cache.timeout int default=-1 - -## If timeoutwithpurging is set, the index will be purged (possibly -## gradually) when index switching occurs, even if cache timeout > 0. -## Not used if cache timeout is 0. If searchcluster[].cache.timeout is -## not explicitly set, the global value will be used instead of the one -## set locally. -searchcluster[].cache.timeoutwithpurging bool default=false - -## Gradual cache switching causes the index to only be gradually purged -## when cache switching occurs. cacheswitchseconds is the length of the period -## when a given cache entry may be from either the previous or current -## index. Setting it to 0 makes QRS purges the cache entirely when a new -## index becomes available. At the end of the cacheswitchseconds period, -## the cache will be cleaned of any remaining entries from the previous -## index. -searchcluster[].cache.switchseconds int default=-1 - -# Per dispatcher config-id might be nice to have, remove it until needed. -# searchcluster[].dispatcher[].configid reference - -# rank-profiles -## name of this rank profile. maps to table index for internal use. -rankprofile[].name string - -## the name of a generic property available to the feature execution framework and feature plugins -rankprofile[].fef.property[].name string - -## the value of a generic property available to feature plugins -rankprofile[].fef.property[].value string - -## the catalog name overrides apply to -rankprofile[].catalog[].name string - -## Boost value for AND queries in this catalog. -rankprofile[].catalog[].andboost int default=0 - -## Boost value for OR queries in this catalog. -rankprofile[].catalog[].orboost int default=0 - -## Boost value for ANY queries in this catalog. -rankprofile[].catalog[].anyboost int default=0 - -## Boost value for NEAR queries in catalog. -rankprofile[].catalog[].nearboost int default=0 - -## Boost value for ORDEREDNEAR queries in this catalog. -rankprofile[].catalog[].orderednearboost int default=0 - -## Boost value for phrase queries in this catalog. -rankprofile[].catalog[].phraseboost int default=0 - -## Boost value for all queries in catalog. -rankprofile[].catalog[].rankboost int default=0 - -## If true, the context boost is the max value of -## the individual contextboosts. -## When false, the context boost when a term is in -## several contexts is the sum of the individual contextboosts. -rankprofile[].catalog[].bestcontextboostonly bool default=false - - -## If true, then use extnumoccboost only when calculating rank values. -## Also, do not normalize the extnumoccboost value with -## global term frequency. Default value is false. -rankprofile[].catalog[].extnumoccboostonly bool default=false - -## If yes, then use extnumoccboost only when calculating rank values. -## Also, do not normalize the extnumoccboost value with -## global term frequency. Default value is no. -rankprofile[].catalog[].numoccandextnumoccboostonly bool default=false - -## If yes, then use bitvectors when possible. -## Default value is false. -rankprofile[].catalog[].preferbitvector bool default=false - -## Load extnumoccboost for this catalog from the named file. -## extnumoccboost specifies boost values due to the number of -## occurences of a term that are external to the document. If -## "NULL" is given as file name, then all extnumoccboost values -## will be set to 0. -rankprofile[].catalog[].extnumoccboost.table string default="/home/vespa/conf/vespa/search/ranktables/constant-0000" - -## Load numoccboost for this catalog from the named file. -## numoccboost specifies boost values due to the number of occurences in -## a document. If "NULL" is given as file name, then all numoccboost -## values will be set to 0. -rankprofile[].catalog[].numoccboost.table string default="/home/vespa/conf/vespa/search/ranktables/constant-0000" - -## Load firstoccboost for catalog from the file named. -## firstoccboost specifies boost values due to the position of the -## first occurence in a document. If "NULL" is given as file name, -## then all firstoccboost values will be set to 0. -rankprofile[].catalog[].firstoccboost.table string default="/home/vespa/conf/vespa/search/ranktables/constant-0000" - - -## Load firstoccproximityboost for this catalog from the file named. -## firstoccproximity boost specifies boost values due to the correlation between -## positions of the first occurence in a document for two and two words. -## -## If "NULL" is given as file name, then all -## firstoccproximityboost values will be set to 0. If otherwise set, -## should be the name of a file to load into the table. The file -## should have 256 lines each containing a single integer. -## -## There are 256 elements in the table, handling forward distances from 1. -## The corresponding firstoccrevproximityboost table is used -## to handle closeness in reverse order. -## -## The last array index specifies the proximity table set. During -## evaluation, the bigram proximity weight supplied by the query segmenter -## specifies which proximity table set to use, with a fallback to set 0 -## when no information is available. -rankprofile[].catalog[].firstoccproximityboost[].table string default="/home/vespa/conf/vespa/search/ranktables/constant-0000" - -## Load firstoccrevproximityboost table for this catalog from the named file. -## Specifies boost values due to the correlation between positions -## of the first occurence in a document for two and two words when -## the second word in the query comes first in the document. -## See also firstoccproximityboost above. -rankprofile[].catalog[].firstoccrevproximityboost[].table string default="/home/vespa/conf/vespa/search/ranktables/constant-0000" - -## Load proximityboost for this catalog from the named file. -## proximity boost specifies boost values due to the correlation between -## positions of the occurences in a document for two and two words. -## See also firstoccproximityboost above. -rankprofile[].catalog[].proximityboost[].table string default="/home/vespa/conf/vespa/search/ranktables/constant-0000" - -## Load revproximityboost for this catalog from the named file. -## revproximity boost specifies boost values due to the correlation between -## positions of the occurences in a document for two and two words. -## See also firstoccproximityboost above. -rankprofile[].catalog[].revproximityboost[].table string default="/home/vespa/conf/vespa/search/ranktables/constant-0000" - -## Load divtable for this catalog from the named file. -## Rank values for a query term are divided by the entry -## in divtable indexed by log2 of term frequence. -## The file should contain ?? lines each with a single integer. -rankprofile[].catalog[].divtable string default="" - -## The name of a context in this catalog to specify boosts for. -rankprofile[].catalog[].context[].name string - -## Boost occurrences in this context with the given value. -## XXX -1 uses default (???) from somewhere(TM). -rankprofile[].catalog[].context[].contextboost int default=0 - -## Boost pair of occurrences in this context with -## the given value when evaluating 2 words from same catalog in -## parallell. -## XXX -1 uses default (???) from somewhere(TM). -rankprofile[].catalog[].context[].commoncontextboost.pair int default=0 - -## Boost triple of occurrences in this context with -## the given value when evaluating 3 words from same catalog in -## parallell. -## XXX -1 uses default (???) from somewhere(TM). -rankprofile[].catalog[].context[].commoncontextboost.triple int default=0 - -## Boost quad of occurrences in this context with -## the given value when evaluating 4 words from same catalog in -## parallell. -## XXX -1 uses default (???) from somewhere(TM). -rankprofile[].catalog[].context[].commoncontextboost.quad int default=0 - - -## The name of the attribute -rankprofile[].attribute[].name string - -## Boost value for queries that hit in this attribute -rankprofile[].attribute[].attributecontextboost int default=0 - -## Load weightboost for this attribute from the named file. -## weightboost specifies boost values due to the weight (weighted set) -## or number of occurences (single, array) in an attribute. -## If "NULL" is given as file name, then all weightboost values will be set to 0. -rankprofile[].attribute[].weightboost.table string default="/home/vespa/conf/vespa/search/ranktables/constant-0000" - - -## Load static rank values from the given staticrank docattr vector. -## Must be specified in index.cf as a staticrankfile. -rankprofile[].staticrankfile string default="" - -## Multiply static rank values with given value when calculating total -## rank value. -rankprofile[].staticcoefficient int default=1 - -## If false then use only static ranking when sorting result hits. -## Default is true. -rankprofile[].dynamicranking bool default=true - -## If dynamic ranking is turned off, then ascending will sort the -## result hits with lowest static rank values first, while -## descending will sort with highest static rank values -## first. Default is descending. This keyword has no effect if -## dynamic ranking is on. -rankprofile[].staticranksortorder string default="descending" - -## Load static rank mapping from the file named table. The static -## rank mapping maps each 8-bit static rank value into a 32-bit static -## rank value. This option may only be used with 8-bit static rank files. -rankprofile[].staticrankmap string default="" - -## If set to "true", total rank will be reduced when dynamic rank is less than -## 25% of static rank, to suppress irrelevant hits from popular sites. -## If set to "false", total rank is not reduced. -rankprofile[].clampstaticrank bool default=false - -## Load document datetime values used for freshness boost calculation from -## this file. The values must be coded as minutes since -## 1900-01-01T00:00Z. The value 0 has the special meaning -## "no datetime value exists". -rankprofile[].freshnessboost.file string default="" - -## Load freshnessboost lookup-table values from the file named -## table instead of using built-in default values. The file must -## contain 32 white-space separated non-negative integers. -rankprofile[].freshnessboost.table string default="/home/vespa/conf/vespa/search/ranktables/constant-0000" - -## When calculating the freshness boost value multiply difference between -## current datetime and document datetime with timeoffset before taking -## the base-2 logarithm. Default value is 1. Max value is 31. -rankprofile[].freshnessboost.timeoffset int default=1 - -## If a document has datetime value 0, then use defaultboostvalue -## as freshness boost value instead of doing table lookup. The default -## default value is 0 (no boost). -rankprofile[].freshnessboost.defaultboostvalue int default=0 - -## Multiply freshness boost value with coefficient when calculating -## total freshness boost value. If coefficient 0 is used, no freshness -## boost value will be computed or added. Default value is 0. -rankprofile[].freshnessboost.coefficient int default=0 - -## boost table files for distance ranking, 1 dimension. -## The tables have 465 elements each, where slots 0..15 represents -## distances 0..15 while the remaining slots represents distance -## (16 + (slot & 15)) << ((slot >> 4) - 1). Linear interpolation is -## used for distances "between" table slots. -## -## If "NULL" is given as the file name then all 1D distance boost values -## for that table will be set to 0. -rankprofile[].distance1dboosttable[].table string - -## boost table files for distance ranking, 2 dimensions. -## The tables have 977 elements each, where slots 0..15 represents -## square of distance being 0..15 while the remaining slots represents -## square of distance distance being -## (16 + (slot & 15)) << ((slot >> 4) - 1). Linear interpolation is -## used for distances "between" table slots. -## -## If "NULL" is given as the file name then all 2D distance boost values -## for that table will be set to 0. -rankprofile[].distance2dboosttable[].table string - -## The lowest possible size of a ranked result. This is the lower ramp -## of the percentage specified in the binsize variable. The default is -## specified in fsearchrc. -rankprofile[].binlow int default=-1 - -## The high limit of the ranked result bin. If the percentage of the -## resultset specified in binsize is higher than this limit, this will be -## the max size. The default is specified in fsearchrc. -rankprofile[].binhigh int default=-1 - -## The size of the ranked results as a percentage of the total result -## set size. The percentage can be ramped off with the binlow and binhigh -## variables. The default is specified in fsearchrc. -rankprofile[].binsize double default=-1 - -## Minimum value for maximum value of number of 'posocc' entries for a word. -## The default is specified in fsearchrc. -rankprofile[].posbinlow int default=-1 - -## Maximum value for maximum value of number of 'posocc' entries for a word. -## The default is specified in fsearchrc. -rankprofile[].posbinhigh int default=-1 - -## The maximum value for number of 'posocc' entries for a word, specified -## as a percentage of the number of documents in the index. If more -## entries are needed for evaluation, posocc entries are not used for that -## word and evaluation will be performed without full proximity support. -## The percentage can be ramped off with the posbinlow and posbinhigh -## variables. The default is specified in fsearchrc. -rankprofile[].posbinsize int default=-1 - -## After all other rank calculations, the rank value is tuned according -## to the tunefactor and tunebias values. The rank value is modified -## as follows: new_rank = old_rank * tunefactor + tunebias. -rankprofile[].tunefactor double default=1.0 - -## After all other rank calculations, the rank value is tuned according -## to the tunefactor and tunebias values. The rank value is modified -## as follows: new_rank = old_rank * tunefactor + tunebias. -rankprofile[].tunebias int default=0 - -## A lower limit for the rankvalue of the results returned from the -## search node. If rankcutoff.advanced is set to "true", determines -## the constant value used in the internal advanced rank cutoff -## calculations. This roughly reflects the expected rank contribution -## of one good term. -## The rankcutoff.val value and the rankcutoff.advanced parameter -## may be used if you only want hits with a minimum relevancy to show -## up in the resultset. -## A value below zero means no rankcutoff is done. -rankprofile[].rankcutoff.val int default=-1 - -## When rankcutoff.val is in use, this flag controls whether to use -## an internal calculation is used for determining the rank cutoff -## value. If "false", use rankcutoff.val as a direct lower limit. -rankprofile[].rankcutoff.advanced bool default=false - -## If set to "ON", use of posocc files is enabled, except when -## "forceemptyposoccs" is set in fsearchrc or posocc files doesn't exist. -## If set to "OFF", use of posocc files is disabled. -## If "NOTSET" the fsearchrc "proximity" parameter is used instead. -rankprofile[].proximity.full.enable enum { OFF, ON, NOTSET } default=NOTSET - -## If set to "ON", use of firstoccproximity is enabled. -## If set to "OFF", use of firstoccproximity is disabled. -## When NOTSET use the firstoccproximity value in fsearchrc configuration. -rankprofile[].proximity.firstocc.enable enum { OFF, ON, NOTSET } default=NOTSET - -## If set to "ON", use of proximity (cf. proximity and firstoccproximity) -## will affect phrases in addition to single words. -## If set to "OFF", proximity is never used for phrases. -## When NOTSET use the phraseproximity value in fsearchrc configuration. -rankprofile[].proximity.phrase.enable enum { OFF, ON, NOTSET } default=NOTSET - -## Selects behavior when proximity can be used for two words but not three -## words while firstoccproximity can be used for three words. -## If set to "ON", then use proximity for two words. -## If set to "OFF", then use firstoccproximity for three words. -## When NOTSET use the proximitypairbeforefirstoccproximitytriple value -## in fsearchrc configuration. -rankprofile[].proximity.pairbeforefirstocctriple.enable enum { OFF, ON, NOTSET } default=NOTSET - -## Selects behavior when proximity can be used for three words but not four -## words while firstoccproximity can be used for four words. -## If set to "ON", then use proximity for three words. -## If set to "OFF", then use firstoccproximity for four words. -## When NOTSET use the proximitytriplebeforefirstoccproximityquad value -rankprofile[].proximity.triplebeforefirstoccquad.enable enum { OFF, ON, NOTSET } default=NOTSET diff --git a/config/src/test/java/com/yahoo/vespa/config/configsglobal/qr-templates.3.cfg b/config/src/test/java/com/yahoo/vespa/config/configsglobal/qr-templates.3.cfg deleted file mode 100644 index 345c20157f9..00000000000 --- a/config/src/test/java/com/yahoo/vespa/config/configsglobal/qr-templates.3.cfg +++ /dev/null @@ -1,111 +0,0 @@ -washing -0.45 -washer 0 -hey[2] -hey[0].ho[1] -hey[0].ho[0].lets[3] -hey[0].ho[0].lets[0].go "slayer" -hey[0].ho[0].lets[0].fishing -1 -hey[0].ho[0].lets[0].ref JA -hey[0].ho[0].lets[1].go "gate" -hey[0].ho[0].lets[1].ref :parent: -hey[0].ho[0].lets[str].go "strung" -hey[0].ho[0].me 0.0 -hey[fooo].ho[0] - -hey[0] 78 - -longVal 500 -longWithRange -9000000000 -longArr[2] -longArr[0] 0 -longArr[1] 1 -longArrWithRange[1] -longArrWithRange[0] 9000000000 - -bar.arrline[0] "foo" -bar.arrline[1] "bar" - -fileVal "/nodefault/file" -fileArr[2] -fileArr[0] "keyb.com" -fileArr[1] "2b4a64d0cb36d44ba8a52506d9fe480bf3511be6" - -urlprefix "foo" -templateset[2] -templateset[0].urlprefix "/basic" -#templateset[0].mimetype "text/xml" -templateset[0].encoding "ut\"f-8\n' <hit relevancy=\"$relevancy\">\n#foreach" -templateset[0].headertemplate "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<resultset totalhits=\"$result.hitCount\">\n" -templateset[0].footertemplate "</resultset>\n" -templateset[0].nohitstemplate "<empty/>\n" -templateset[0].hittemplate "<hit relevancy=\"$relevancy\">\n#foreach( $key in $hit.getPropertyKeySet() )\n <field name='$key'>$hit.getPropertyXML($key)</field>\n#end\n</hit>\n" -templateset[0].errortemplate "<ERROR CODE=\"$result.error.code\">$result.error.message</ERROR>\n" -templateset[1].urlprefix "/xsearch" -templateset[1].mimetype "text/xml" -templateset[1].encoding "utf-8" -templateset[1].rankprofile 0 -templateset[1].headertemplate "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<RESULTSET TOTALHITS=\"$result.hitCount\">\n" -templateset[1].footertemplate "</RESULTSET>\n" -templateset[1].nohitstemplate "0.56" -templateset[1].hittemplate "<HIT RELEVANCY=\"$relevancy\" TYPE=\"$hit.typeString\">\n<FIELD NAME=\"uri\">$uri</FIELD>\n<FIELD NAME=\"category\">$category</FIELD>\n<FIELD NAME=\"bsumtitle\">$bsumtitle</FIELD>\n</HIT>\n" -templateset[1].errortemplate "45" -config[0].id :parent: -config[0].autostart -hi[0].there[0].e BATCH -ilscript[music].name music -ilscript[music].doctype music -ilscript[music].content[1] -ilscript[music].content[0] "\"music\" | summary sddocname | lowercase | index sddocname;" - -musum * - -auran "value=\"Confirm\"/></form>\"\"Tuna - step three." - -route[1] -route[0].name "search/cluster.books2" -route[0].selector "books.isbn=\"none\"" -route[0].feed "books" - -languages[3] -languages[2] "swahili" - -languages2[2] -languages2[0] "swedish" - -foolang[5] -foolang[0].lang[3] -foolang[0].lang[1] "Swahili" -foolang[1].lang[3] -foolang[2].lang[3] -foolang[2].lang[0] "Setswana" -foolang[3].lang[4] -foolang[3].lang[3] "Norwegian" -foolang[4].lang[2] - -myIntMap{"foo"} 67 -myIntMap{"bar"} 68 -myStringMap{"fo"} "gh" -myStringMap{"ba"} "ij" -myStructMap{"FOO"}.myInt 78 -myStructMap{"FOO"}.myString "myFoo" -myStructMap{"FOOO"}.myInt 89 -myStructMap{"FOOO"}.myString "myFooS" -myStructMap{"FOOO"}.myIntDef -99 -myStructMap{"FOOO"}.myStringDef "myFooSBall" - -myStructMap{"FOO"}.myStruct.a "guitar" -myStructMap{"FOO"}.myStruct.c /tmp - -myStructMap{"FOOO"}.myStruct.a "bass" -myStructMap{"FOOO"}.myStruct.b "drums" -myStructMap{"FOOO"}.myStruct.c /var/log - -myStructMap{"FOO"}.myStructNestedArray[0] -9 -myStructMap{"FOO"}.myStructNestedArray[1] -10 - -myStructMap{"FOO"}.myNestedLeafMap{"Nested1"} 90 -myStructMap{"FOO"}.myNestedLeafMap{"Nested2"} 9000 - -myStructMap{"FOO"}.myNestedMap{"Nested3"}.myLong 809 -myStructMap{"FOO"}.myNestedMap{"Nested3"}.myLongDef 810 -myStructMap{"FOO"}.myNestedMap{"Nested4"}.myLong 811 diff --git a/config/src/test/java/com/yahoo/vespa/config/configsglobal/testfoobar.12.cfg b/config/src/test/java/com/yahoo/vespa/config/configsglobal/testfoobar.12.cfg deleted file mode 100644 index 3d23f7fd29a..00000000000 --- a/config/src/test/java/com/yahoo/vespa/config/configsglobal/testfoobar.12.cfg +++ /dev/null @@ -1,105 +0,0 @@ -vh[5] -vh[0] 0.3345 -vh[1] -0.3 -vh[2] 134.3 -vh[3] 234.34 -vh[4] -24.3 -bg[5] -bg[0] 5 -bg[1] -bg[2] 10 -bg[3] 4 -bg[4] -2 -gee[2] -gee[0] "jabbaTuna" -gee[1] jabba:500/dusteri -storage[2] -storage[0].distributor[2] -storage[0].distributor[0] "tra" -storage[0].distributor[1] "de" -storage[0].feeder[1] -storage[0].feeder[0] "li" -#storage[0].feeder[1] "dum" -storage[1].distributor[3] -storage[1].distributor[0] "Etra" -storage[1].distributor[1] "Ede" -#storage[1].feeder[3] -storage[1].feeder[0] "Eli" -storage[1].feeder[1] "Edum" -storage[1].feeder[2] "TEdum" - -#ju[].hu[].tu[] double default=45 range=[0,100.1] -#ju[].hu[].wu[] enum { HEY, HO} default=HO -#ju[].hu[].tang[] bool default=false -#ju[].hu[].clan[] int default=45 range=[-90,90] - -ju[2] -ju[0].hu[2] -ju[0].hu[0].tu[2] -ju[0].hu[0].tu[0] 45.0 -ju[0].hu[0].tu[1] 0.0 -ju[0].hu[0].tang[2] -ju[0].hu[0].tang[0] true -#ju[0].hu[0].tang[1] 0.0 - -#ju[0].hu[1].tu[2] -ju[0].hu[1].tu[0] 667.865 -ju[0].hu[0].wu[2] -ju[0].hu[0].wu[0] HEY -ju[0].hu[0].wu[1] HEY -ju[0].hu[1].wu[1] -ju[0].hu[1].wu[0] HO - -ju[1].hu[2] -ju[1].hu[0].tu[2] -ju[1].hu[0].tu[0] 78 -ju[1].hu[0].tu[1] 78.9 -ju[1].hu[1].tu[1] -ju[1].hu[1].tu[0] 88.9 - -ju[1].hu[0].wu[3] -ju[1].hu[0].wu[0] HEY -ju[1].hu[0].wu[1] HEY -ju[1].hu[0].wu[2] HO -ju[1].hu[1].wu[1] -ju[1].hu[1].wu[0] HO -ju[1].hu[1].clan[4] -ju[1].hu[1].clan[0] 5 -ju[1].hu[1].clan[1] 6 -ju[1].hu[1].clan[2] 7 -ju[1].hu[1].clan[3] 8 -foo "123aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa gh:sann\" da" -headertemplate "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n<html>\n<head>\n<title>ranqualizer:$hostname:$profile:</title>\n<link type=\"text/css\" rel=\"stylesheet\" href=\"/layout.css\"/>\n<meta name=\"ROBOTS\" content=\"NOINDEX,NOFOLLOW\"/><meta http-equiv=\"Cache-control\" content=\"no-cache\"/><meta http-equiv=\"Cache-control\" content=\"must-revalidate\"/><meta http-equiv=\"Cache-control\" content=\"max-age=0\"/><meta http-equiv=\"Content-type\" content=\"text/html; charset=utf-8\"/><link rel=\"icon\" href=\"/favicon.ico\"/><script type=\"text/javascript\">function show(foo,f){document.getElementById(foo).style.display=\"block\";} function hide(foo,f){document.getElementById(foo).style.display = \"none\";}</script></head>\n<body>\n" -ptport 10108 -rankcf :parent: -hport 10109 -frtport 10107 -transportnodelay true -partition 0 -datasetdir none -proximity "yes" -vsmconfig "" -documentmanagerconfigid :parent: -include: search/cluster.music -include: search/cluster.music2 - -rankprofile[extra].fef.property[4] -rankprofile[ignore].fef.property[4].name "vespa.dump.ignoredefaultfeatures" -rankprofile[ignore].fef.property[4].value true - -specialchars "索 索尼 DVD±R" - -tokenlist[1] -tokenlist[0].name "default" -tokenlist[0].tokens[8] -tokenlist[0].tokens[0].token "c++" -tokenlist[0].tokens[1].token "wal-mart" -tokenlist[0].tokens[1].replace "walmart" -tokenlist[0].tokens[2].token ".net" -tokenlist[0].tokens[3].token "-索" -tokenlist[0].tokens[4].token "sony" -tokenlist[0].tokens[4].replace "索尼" -tokenlist[0].tokens[5].token "dvd+-r" -tokenlist[0].tokens[6].token "DVD±R" -tokenlist[0].tokens[7].token "dvdplusminusr" -tokenlist[0].tokens[7].replace "dvd+-r" diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/qr-templates.cfg b/container-search/src/test/java/com/yahoo/prelude/templates/test/qr-templates.cfg deleted file mode 100644 index 10efc3334be..00000000000 --- a/container-search/src/test/java/com/yahoo/prelude/templates/test/qr-templates.cfg +++ /dev/null @@ -1,104 +0,0 @@ -templateset[10] -templateset[0].urlprefix "/xsearch" -templateset[0].mimetype "text/xml" -templateset[0].encoding "utf-8" -templateset[0].rankprofile 0 -templateset[0].keepalive false -templateset[0].headertemplate "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<RESULTSET TOTALHITS=\"$result.totalHitCount\">\n" -templateset[0].footertemplate "</RESULTSET>" -templateset[0].nohitstemplate "<XTEMPLATENOHITS/>\n" -templateset[0].hittemplate "<XTEMPLATEHIT RELEVANCY=\"$hit.relevance\" SOURCE=\"$hit.source\" TYPE=\"$hit.typeString\" OFFSET=\"$hitno\">\n<FIELD NAME=\"uri\">$uri</FIELD>\n<FIELD NAME=\"category\">$category</FIELD>\n<FIELD NAME=\"bsumtitle\">$bsumtitle</FIELD>\n</XTEMPLATEHIT>\n" -templateset[0].errortemplate "<ERROR CODE=\"$result.hits().error.code\">$result.hits().error.message</ERROR>\n" -templateset[1].urlprefix "/cgi-bin/asearch" -templateset[1].mimetype "text/html" -templateset[1].encoding "utf-8" -templateset[1].rankprofile 0 -templateset[1].keepalive false -templateset[1].headertemplate "### Result\n" -templateset[1].footertemplate "### Result\n" -templateset[1].nohitstemplate "### Result\n" -templateset[1].hittemplate "### Result\n" -templateset[1].errortemplate "### Result\n" -templateset[2].urlprefix "/groups" -templateset[2].mimetype "text/xml" -templateset[2].encoding "utf-8" -templateset[2].rankprofile 0 -templateset[2].keepalive false -templateset[2].headertemplate "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<RESULTSET TOTALHITS=\"$result.totalHitCount\">\n" -templateset[2].footertemplate "</RESULTSET>" -templateset[2].nohitstemplate "<XTEMPLATENOHITS/>\n" -templateset[2].hittemplate "<XTEMPLATEHIT RELEVANCY=\"$relevancy\" SOURCE=\"$hit.source\" TYPE=\"$hit.typeString\" OFFSET=\"$hitno\">\n<FIELD NAME=\"uri\">$uri</FIELD>\n<FIELD NAME=\"category\">$category</FIELD>\n<FIELD NAME=\"bsumtitle\">$bsumtitle</FIELD>\n</XTEMPLATEHIT>\n" -templateset[2].errortemplate "<ERROR CODE=\"$result.error.code\">$result.error.message</ERROR>" -templateset[2].groupsheadertemplate "<GROUP ATTRIBUTE=\"$field\">\n" -templateset[2].rangegrouptemplate "<RANGE LOW=\"$group.from\" HIGH=\"$group.to\" AMOUNT=\"$group.count\"/>\n" -templateset[2].exactgrouptemplate "<VAL VAL=\"$group.value\" AMOUNT=\"$group.count\"/>\n" -templateset[2].groupsfootertemplate "</GROUP>\n" -templateset[3].urlprefix "/pertemplatebolding" -templateset[3].mimetype "text/xml" -templateset[3].encoding "utf-8" -templateset[3].rankprofile 0 -templateset[3].keepalive false -templateset[3].headertemplate "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<RESULTSET TOTALHITS=\"$result.totalHitCount\">\n" -templateset[3].footertemplate "</RESULTSET>" -templateset[3].nohitstemplate "<XTEMPLATENOHITS/>\n" -templateset[3].hittemplate "<BOLDINGTEST>\n<FIELD NAME=\"uri\">$uri</FIELD>\n<FIELD NAME=\"bsumtitle\" NOTE=\"bolded escaped\">$bsumtitle</FIELD>\n<FIELD NAME=\"bsumtitle\" NOTE=\"bolded unescaped\">$hit.getField(\"bsumtitle\")</FIELD>\n<FIELD NAME=\"bsumtitle\" NOTE=\"unbolded unescaped\">$hit.getField(\"bsumtitle\").bareContent(false, false)</FIELD>\n<FIELD NAME=\"bsumtitle\" NOTE=\"unbolded escaped\">$hit.getField(\"bsumtitle\").bareContent(true, false)</FIELD>\n</BOLDINGTEST>\n" -templateset[3].errortemplate "<ERROR CODE=\"$result.error.code\">$result.error.message</ERROR>\n" -templateset[4].urlprefix "/customhighlighttags" -templateset[4].mimetype "text/xml" -templateset[4].encoding "utf-8" -templateset[4].rankprofile 0 -templateset[4].keepalive false -templateset[4].headertemplate "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<RESULTSET TOTALHITS=\"$result.totalHitCount\">\n" -templateset[4].footertemplate "</RESULTSET>" -templateset[4].nohitstemplate "<XTEMPLATENOHITS/>\n" -templateset[4].hittemplate "<XTEMPLATEHIT RELEVANCY=\"$hit.relevance\" SOURCE=\"$hit.source\" TYPE=\"$hit.typeString\" OFFSET=\"$hitno\">\n<FIELD NAME=\"uri\">$uri</FIELD>\n<FIELD NAME=\"category\">$category</FIELD>\n<FIELD NAME=\"bsumtitle\">$bsumtitle</FIELD>\n</XTEMPLATEHIT>\n" -templateset[4].errortemplate "<ERROR CODE=\"$result.error.code\">$result.error.message</ERROR>\n" -templateset[4].highlightstarttag "<b>" -templateset[4].highlightendtag "</b>" -templateset[4].highlightseptag "<p />" -templateset[5].urlprefix "/checkunsigned" -templateset[5].mimetype "text/xml" -templateset[5].encoding "utf-8" -templateset[5].rankprofile 0 -templateset[5].keepalive false -templateset[5].headertemplate "" -templateset[5].footertemplate "" -templateset[5].nohitstemplate "" -templateset[5].hittemplate "$number $context.asUnsigned(\"number\")" -templateset[5].errortemplate "" -templateset[5].highlightstarttag "" -templateset[5].highlightendtag "" -templateset[5].highlightseptag "" -templateset[6].urlprefix "/summaryclasstest" -templateset[6].mimetype "text/xml" -templateset[6].encoding "utf-8" -templateset[6].rankprofile 0 -templateset[6].keepalive false -templateset[6].headertemplate "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<result>\n" -templateset[6].footertemplate "</result>" -templateset[6].nohitstemplate "<nohits />\n" -templateset[6].hittemplate "<hit />\n" -templateset[6].errortemplate "<error />\n" -templateset[6].defaultsummaryclass "gnurglegnokk" -templateset[7].urlprefix "/lazydecoding" -templateset[7].mimetype "text/plain" -templateset[7].encoding "utf-8" -templateset[7].rankprofile 0 -templateset[7].keepalive false -templateset[7].headertemplate "" -templateset[7].footertemplate "" -templateset[7].nohitstemplate "no hits" -templateset[7].hittemplate "$URL\n$TITLE\n$WORDS\n$IPADDRESS" -templateset[7].errortemplate "error" -templateset[8].urlprefix "/java" -templateset[8].classid "com.yahoo.prelude.templates.test.TestTemplate" -templateset[8].mimetype "text/plain" -templateset[8].encoding "utf-8" -templateset[8].rankprofile 0 -templateset[8].keepalive false -templateset[9].urlprefix "/boom" -templateset[9].classid "com.yahoo.prelude.templates.test.BoomTemplate" -templateset[9].mimetype "text/plain" -templateset[9].encoding "utf-8" -templateset[9].rankprofile 0 -templateset[9].keepalive false |