From 281791560c479bdcfde21695c9557cf04a141f7a Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Thu, 24 Mar 2022 13:37:19 +0000 Subject: avoid DocumentTypeManager.getDataType(name) --- .../searchdefinition/parser/ConvertParsedTypes.java | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'config-model/src') diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java index 8e27b581769..3644cb9d924 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java @@ -248,11 +248,30 @@ public class ConvertParsedTypes { return new NewDocumentReferenceDataType(findDocFromSchemas(ref.name())); } + private DataType getBuiltinType(String name) { + switch (name) { + case "bool": return DataType.BOOL; + case "byte": return DataType.BYTE; + case "int": return DataType.INT; + case "long": return DataType.LONG; + case "string": return DataType.STRING; + case "float": return DataType.FLOAT; + case "double": return DataType.DOUBLE; + case "uri": return DataType.URI; + case "predicate": return DataType.PREDICATE; + case "raw": return DataType.RAW; + case "tag": return DataType.TAG; + case "float16": return DataType.FLOAT16; + default: + throw new IllegalArgumentException("Unknown builtin type: "+name); + } + } + private DataType resolveFromContext(ParsedType pType, ParsedDocument context) { String name = pType.name(); switch (pType.getVariant()) { case NONE: return DataType.NONE; - case BUILTIN: return docMan.getDataType(name); + case BUILTIN: return getBuiltinType(name); case POSITION: return PositionDataType.INSTANCE; case ARRAY: return createArray(pType, context); case WSET: return createWset(pType, context); -- cgit v1.2.3