all repos — searchix @ 0e697e5fda223d848f92d56c2c814a32a48b23a1

Search engine for NixOS, nix-darwin, home-manager and NUR users

refactor: use a single field for ngram-analysed fields using multiple fields was never necessary: bleve supports multiple mappings per field

Alan Pearce
commit

0e697e5fda223d848f92d56c2c814a32a48b23a1

parent

1d4eff79b408b95f2dde5db8aa3cec0a7f43adb4

1 file changed, 13 insertions(+), 6 deletions(-)

changed files
M internal/index/indexer.go → internal/index/indexer.go
@@ -137,8 +137,12 @@ locFieldMapping.Store = false
 
 	optionMapping := bleve.NewDocumentStaticMapping()
 
-	optionMapping.AddFieldMappingsAt("Name", attributeFieldMapping, locFieldMapping)
-	optionMapping.AddFieldMappingsAt("NameNGram", nameNGramMapping)
+	optionMapping.AddFieldMappingsAt(
+		"Name",
+		attributeFieldMapping,
+		locFieldMapping,
+		nameNGramMapping,
+	)
 	optionMapping.AddFieldMappingsAt("Source", identityFieldMapping)
 	optionMapping.AddFieldMappingsAt("Loc", locFieldMapping)
 	optionMapping.AddFieldMappingsAt("RelatedPackages", textFieldMapping)

@@ -149,10 +153,13 @@ optionMapping.AddSubDocumentMapping("Example", nixValueMapping)
 
 	packageMapping := bleve.NewDocumentStaticMapping()
 
-	packageMapping.AddFieldMappingsAt("Name", keywordFieldMapping, locFieldMapping)
-	packageMapping.AddFieldMappingsAt("NameNGram", nameNGramMapping)
-	packageMapping.AddFieldMappingsAt("Attribute", attributeFieldMapping)
-	packageMapping.AddFieldMappingsAt("AttributeNGram", nameNGramMapping)
+	packageMapping.AddFieldMappingsAt(
+		"Name",
+		keywordFieldMapping,
+		locFieldMapping,
+		nameNGramMapping,
+	)
+	packageMapping.AddFieldMappingsAt("Attribute", attributeFieldMapping, nameNGramMapping)
 	packageMapping.AddFieldMappingsAt("Source", keywordFieldMapping)
 	packageMapping.AddFieldMappingsAt("Description", descriptionFieldMapping)
 	packageMapping.AddFieldMappingsAt("Homepages", keywordFieldMapping)