diff options
Diffstat (limited to 'config-model/src/main')
5 files changed, 18 insertions, 15 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java index 8ca82008e8b..91f86bb1c2a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java @@ -14,7 +14,7 @@ import com.yahoo.searchdefinition.document.SDDocumentType; import com.yahoo.searchdefinition.parser.ParseException; import com.yahoo.searchdefinition.parser.SDParser; import com.yahoo.searchdefinition.parser.SimpleCharStream; -import com.yahoo.searchdefinition.parser.TokenMgrError; +import com.yahoo.searchdefinition.parser.TokenMgrException; import com.yahoo.searchdefinition.processing.Processing; import com.yahoo.vespa.documentmodel.DocumentModel; import com.yahoo.vespa.model.container.search.QueryProfiles; @@ -151,7 +151,7 @@ public class SearchBuilder { SimpleCharStream stream = new SimpleCharStream(str); try { search = new SDParser(stream, deployLogger, app, rankProfileRegistry).search(docTypeMgr, searchDefDir); - } catch (TokenMgrError e) { + } catch (TokenMgrException e) { throw new ParseException("Unknown symbol: " + e.getMessage()); } catch (ParseException pe) { throw new ParseException(stream.formatException(Exceptions.toMessageString(pe))); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java index c7b9c93c67c..e8985b094ac 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java @@ -300,8 +300,12 @@ public class VespaMetricSet { // document store cache metrics.add(new Metric("content.proton.documentdb.ready.document_store.cache.memory_usage.average")); metrics.add(new Metric("content.proton.documentdb.ready.document_store.cache.hit_rate.average")); + metrics.add(new Metric("content.proton.documentdb.ready.document_store.cache.lookups.rate")); + metrics.add(new Metric("content.proton.documentdb.ready.document_store.cache.invalidations.rate")); metrics.add(new Metric("content.proton.documentdb.notready.document_store.cache.memory_usage.average")); metrics.add(new Metric("content.proton.documentdb.notready.document_store.cache.hit_rate.average")); + metrics.add(new Metric("content.proton.documentdb.notready.document_store.cache.lookups.rate")); + metrics.add(new Metric("content.proton.documentdb.notready.document_store.cache.invalidations.rate")); // attribute metrics.add(new Metric("content.proton.documentdb.ready.attribute.memory_usage.allocated_bytes.average")); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java index 025075be8fd..1e717f89819 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java @@ -10,18 +10,18 @@ import com.yahoo.vespa.model.container.component.Handler; /** * @author Henrik Høiness */ - public class GUIHandler extends Handler<AbstractConfigProducer<?>> { - public static final String BUNDLE = "container-search-gui"; - public static final String CLASS = "com.yahoo.search.query.gui.GUIHandler"; - public static final String BINDING = "*/querybuilder/*"; - public GUIHandler() { - super(new ComponentModel(bundleSpec(CLASS, BUNDLE))); - } + public static final String BUNDLE = "container-search-gui"; + public static final String CLASS = "com.yahoo.search.query.gui.GUIHandler"; + public static final String BINDING = "*/querybuilder/*"; + + public GUIHandler() { + super(new ComponentModel(bundleSpec(CLASS, BUNDLE))); + } - public static BundleInstantiationSpecification bundleSpec(String className, String bundle) { - return BundleInstantiationSpecification.getFromStrings(className, className, bundle); - } + public static BundleInstantiationSpecification bundleSpec(String className, String bundle) { + return BundleInstantiationSpecification.getFromStrings(className, className, bundle); + } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleMapper.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleMapper.java index cca6f43faa3..13dfc3ae745 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleMapper.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleMapper.java @@ -11,8 +11,7 @@ import java.util.Optional; /** * @author gjoranv - * @author lulf - * @since 5.45 + * @author Ulf Lilleengen */ public class BundleMapper { diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index 12e61dea450..2c4c9a47fec 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -1772,7 +1772,7 @@ Object indexBody(IndexOperation index) : | <ALIAS> <COLON> str = identifier() { index.addAlias(str); } | <STEMMING> <COLON> str = identifier() { index.setStemming(str); } | <RISE> { - throw new ParseException("'index:rise' is no longer an option. Use 'indexing:attribute' instead. " + + if (true) throw new ParseException("'index:rise' is no longer an option. Use 'indexing:attribute' instead. " + "If it is a weighted set field you should also add 'attribute:fast-search'." + "This change will require refeeding."); } |