From 7393983d2f3bd3d5e003a5de3faeaa6a8d814471 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Wed, 11 Jan 2017 16:09:23 +0100 Subject: Move remaining parts of search.rnc into content.rnc. --- config-model/src/main/resources/schema/content.rnc | 87 +++++++++++++++++++++ config-model/src/main/resources/schema/search.rnc | 89 ---------------------- .../src/main/resources/schema/services.rnc | 1 - 3 files changed, 87 insertions(+), 90 deletions(-) delete mode 100644 config-model/src/main/resources/schema/search.rnc diff --git a/config-model/src/main/resources/schema/content.rnc b/config-model/src/main/resources/schema/content.rnc index c3a8386ac5e..a1fef689253 100644 --- a/config-model/src/main/resources/schema/content.rnc +++ b/config-model/src/main/resources/schema/content.rnc @@ -1,6 +1,9 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" +include "container.rnc" +include "searchchains.rnc" + Redundancy = element redundancy { attribute reply-after { xsd:nonNegativeInteger }? & xsd:nonNegativeInteger @@ -275,3 +278,87 @@ Group = element group { ) ) } + +Tuning = element tuning { + element dispatch { + element max-hits-per-partition { xsd:nonNegativeInteger }? + }? & + element searchnode { + element requestthreads { + element search { xsd:nonNegativeInteger }? & + element persearch { xsd:nonNegativeInteger }? & + element summary { xsd:nonNegativeInteger }? + }? & + element flushstrategy { + element native { + element total { + element maxmemorygain { xsd:nonNegativeInteger }? & + element diskbloatfactor { xsd:double { minInclusive = "0.0" } }? + }? & + element component { + element maxmemorygain { xsd:nonNegativeInteger }? & + element diskbloatfactor { xsd:double { minInclusive = "0.0" } }? & + element maxage { xsd:nonNegativeInteger }? + }? & + element transactionlog { + element maxentries { xsd:nonNegativeInteger }? & + element maxsize { xsd:nonNegativeInteger }? + }? & + element conservative { + element memory-limit-factor { xsd:double { minInclusive = "0.0" maxInclusive = "1.0" } }? & + element disk-limit-factor { xsd:double { minInclusive = "0.0" maxInclusive = "1.0" } }? + }? + }? + }? & + element resizing { + element initialdocumentcount { xsd:nonNegativeInteger }? + }? & + element index { + element io { + element write { TuningIoOptionsLight }? & + element read { TuningIoOptionsLight }? & + element search { TuningIoOptionsFull }? + } + }? & + element attribute { + element io { + element write { TuningIoOptionsLight }? + } + }? & + element summary { + element io { + element write { TuningIoOptionsLight }? & + element read { TuningIoOptionsFull }? + }? & + element store { + element cache { + element maxsize { xsd:nonNegativeInteger }? & + element initialentries { xsd:nonNegativeInteger }? & + element maxentries { xsd:nonNegativeInteger }? & + TuningCompression? + }? & + element logstore { + element maxfilesize { xsd:nonNegativeInteger }? & + element maxdiskbloatfactor { xsd:double { minInclusive = "0.0" } }? & + element minfilesizefactor { xsd:double { minInclusive = "0.10" maxInclusive = "1.0" } }? & + element chunk { + element maxsize { xsd:nonNegativeInteger }? & + element maxentries { xsd:nonNegativeInteger }? & + TuningCompression? + }? + }? + }? + }? & + element initialize { + element threads { xsd:nonNegativeInteger }? + }? + }? +} + +TuningIoOptionsLight = string "normal" | string "directio" +TuningIoOptionsFull = string "normal" | string "directio" | string "mmap" | string "mlock" + +TuningCompression = element compression { + element type { string "none" | string "lz4" }? & + element level { xsd:nonNegativeInteger }? +} diff --git a/config-model/src/main/resources/schema/search.rnc b/config-model/src/main/resources/schema/search.rnc deleted file mode 100644 index 0cde860a8b6..00000000000 --- a/config-model/src/main/resources/schema/search.rnc +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" - -include "searchchains.rnc" -include "container.rnc" - -Tuning = element tuning { - element dispatch { - element max-hits-per-partition { xsd:nonNegativeInteger }? - }? & - element searchnode { - element requestthreads { - element search { xsd:nonNegativeInteger }? & - element persearch { xsd:nonNegativeInteger }? & - element summary { xsd:nonNegativeInteger }? - }? & - element flushstrategy { - element native { - element total { - element maxmemorygain { xsd:nonNegativeInteger }? & - element diskbloatfactor { xsd:double { minInclusive = "0.0" } }? - }? & - element component { - element maxmemorygain { xsd:nonNegativeInteger }? & - element diskbloatfactor { xsd:double { minInclusive = "0.0" } }? & - element maxage { xsd:nonNegativeInteger }? - }? & - element transactionlog { - element maxentries { xsd:nonNegativeInteger }? & - element maxsize { xsd:nonNegativeInteger }? - }? & - element conservative { - element memory-limit-factor { xsd:double { minInclusive = "0.0" maxInclusive = "1.0" } }? & - element disk-limit-factor { xsd:double { minInclusive = "0.0" maxInclusive = "1.0" } }? - }? - }? - }? & - element resizing { - element initialdocumentcount { xsd:nonNegativeInteger }? - }? & - element index { - element io { - element write { TuningIoOptionsLight }? & - element read { TuningIoOptionsLight }? & - element search { TuningIoOptionsFull }? - } - }? & - element attribute { - element io { - element write { TuningIoOptionsLight }? - } - }? & - element summary { - element io { - element write { TuningIoOptionsLight }? & - element read { TuningIoOptionsFull }? - }? & - element store { - element cache { - element maxsize { xsd:nonNegativeInteger }? & - element initialentries { xsd:nonNegativeInteger }? & - element maxentries { xsd:nonNegativeInteger }? & - TuningCompression? - }? & - element logstore { - element maxfilesize { xsd:nonNegativeInteger }? & - element maxdiskbloatfactor { xsd:double { minInclusive = "0.0" } }? & - element minfilesizefactor { xsd:double { minInclusive = "0.10" maxInclusive = "1.0" } }? & - element chunk { - element maxsize { xsd:nonNegativeInteger }? & - element maxentries { xsd:nonNegativeInteger }? & - TuningCompression? - }? - }? - }? - }? & - element initialize { - element threads { xsd:nonNegativeInteger }? - }? - }? -} - -TuningIoOptionsLight = string "normal" | string "directio" -TuningIoOptionsFull = string "normal" | string "directio" | string "mmap" | string "mlock" - -TuningCompression = element compression { - element type { string "none" | string "lz4" }? & - element level { xsd:nonNegativeInteger }? -} diff --git a/config-model/src/main/resources/schema/services.rnc b/config-model/src/main/resources/schema/services.rnc index c52ed90bbd4..31001fa1d8e 100644 --- a/config-model/src/main/resources/schema/services.rnc +++ b/config-model/src/main/resources/schema/services.rnc @@ -5,7 +5,6 @@ include "clients.rnc" include "content.rnc" include "docproc.rnc" include "storage.rnc" -include "search.rnc" include "routing.rnc" include "containercluster.rnc" include "genericcluster.rnc" -- cgit v1.2.3