refactor: use a single field for ngram-analysed fields using multiple fields was never necessary: bleve supports multiple mappings per field
6 files changed, 14 insertions(+), 13 deletions(-)
M internal/importer/options.go → internal/importer/options.go
@@ -172,7 +172,6 @@ // log.Debug("sending option", "name", kv.Key) results <- nix.Option{ Name: kv.Key, - NameNGram: kv.Key, Source: i.source.Key, Declarations: decs, Default: i.convertValue(i.optJSON.Default),
M internal/importer/package.go → internal/importer/package.go
@@ -314,9 +314,7 @@ } results <- &nix.Package{ Name: i.pkg.Name, - NameNGram: i.pkg.Name, Attribute: strings.TrimPrefix(kv.Key, "nur.repos."), - AttributeNGram: strings.TrimPrefix(kv.Key, "nur.repos."), Source: i.source.Key, PackageSet: pkgSet, Version: i.pkg.Version,
M internal/index/index_meta.go → internal/index/index_meta.go
@@ -11,7 +11,7 @@ "gitlab.com/tozd/go/errors" ) -const CurrentSchemaVersion = 3 +const CurrentSchemaVersion = 4 type SourceMeta struct { Updated time.Time
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)
M internal/nix/option.go → internal/nix/option.go
@@ -22,7 +22,6 @@ } type Option struct { Name string - NameNGram string Source string Declarations []Link Default *Value `json:",omitempty"`
M internal/nix/package.go → internal/nix/package.go
@@ -2,9 +2,7 @@ package nix type Package struct { Name string - NameNGram string Attribute string - AttributeNGram string Source string Broken bool Definition string