forked from blevesearch/bleve
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor mapping to inteface and move into separate package
the index mapping contains some relatively messy logic and the top-level bleve package only cares about a relatively small portion of this the motivation for this change is to codify the part that the top-level bleve package cares about into an interface then move all the details into its own package NOTE: the top-level bleve package still has hard dependency on the actual implementation (for now) because it must deserialize mappings from JSON and simply assumes it is this one instance. this is seen as OK for now, and this issue could be revisited in a future change. moving the logic into a separate package is seen as a simplification of top-level bleve, even though we still depend on the one particular implementation.
- Loading branch information
Showing
37 changed files
with
348 additions
and
212 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // Copyright (c) 2014 Couchbase, Inc. | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file | ||
| // except in compliance with the License. You may obtain a copy of the License at | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // Unless required by applicable law or agreed to in writing, software distributed under the | ||
| // License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
| // either express or implied. See the License for the specific language governing permissions | ||
| // and limitations under the License. | ||
|
|
||
| package bleve | ||
|
|
||
| import "github.com/blevesearch/bleve/mapping" | ||
|
|
||
| // NewIndexMapping creates a new IndexMapping that will use all the default indexing rules | ||
| func NewIndexMapping() *mapping.IndexMappingImpl { | ||
| return mapping.NewIndexMapping() | ||
| } | ||
|
|
||
| // NewDocumentMapping returns a new document mapping | ||
| // with all the default values. | ||
| func NewDocumentMapping() *mapping.DocumentMapping { | ||
| return mapping.NewDocumentMapping() | ||
| } | ||
|
|
||
| // NewDocumentStaticMapping returns a new document | ||
| // mapping that will not automatically index parts | ||
| // of a document without an explicit mapping. | ||
| func NewDocumentStaticMapping() *mapping.DocumentMapping { | ||
| return mapping.NewDocumentStaticMapping() | ||
| } | ||
|
|
||
| // NewDocumentDisabledMapping returns a new document | ||
| // mapping that will not perform any indexing. | ||
| func NewDocumentDisabledMapping() *mapping.DocumentMapping { | ||
| return mapping.NewDocumentDisabledMapping() | ||
| } | ||
|
|
||
| // NewTextFieldMapping returns a default field mapping for text | ||
| func NewTextFieldMapping() *mapping.FieldMapping { | ||
| return mapping.NewTextFieldMapping() | ||
| } | ||
|
|
||
| // NewNumericFieldMapping returns a default field mapping for numbers | ||
| func NewNumericFieldMapping() *mapping.FieldMapping { | ||
| return mapping.NewNumericFieldMapping() | ||
| } | ||
|
|
||
| // NewDateTimeFieldMapping returns a default field mapping for dates | ||
| func NewDateTimeFieldMapping() *mapping.FieldMapping { | ||
| return mapping.NewDateTimeFieldMapping() | ||
| } | ||
|
|
||
| // NewBooleanFieldMapping returns a default field mapping for booleans | ||
| func NewBooleanFieldMapping() *mapping.FieldMapping { | ||
| return mapping.NewBooleanFieldMapping() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| // Copyright (c) 2014 Couchbase, Inc. | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file | ||
| // except in compliance with the License. You may obtain a copy of the License at | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // Unless required by applicable law or agreed to in writing, software distributed under the | ||
| // License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
| // either express or implied. See the License for the specific language governing permissions | ||
| // and limitations under the License. | ||
|
|
||
| package mapping | ||
|
|
||
| type customAnalysis struct { | ||
| CharFilters map[string]map[string]interface{} `json:"char_filters,omitempty"` | ||
| Tokenizers map[string]map[string]interface{} `json:"tokenizers,omitempty"` | ||
| TokenMaps map[string]map[string]interface{} `json:"token_maps,omitempty"` | ||
| TokenFilters map[string]map[string]interface{} `json:"token_filters,omitempty"` | ||
| Analyzers map[string]map[string]interface{} `json:"analyzers,omitempty"` | ||
| DateTimeParsers map[string]map[string]interface{} `json:"date_time_parsers,omitempty"` | ||
| } | ||
|
|
||
| func (c *customAnalysis) registerAll(i *IndexMappingImpl) error { | ||
| for name, config := range c.CharFilters { | ||
| _, err := i.cache.DefineCharFilter(name, config) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| if len(c.Tokenizers) > 0 { | ||
| // put all the names in map tracking work to do | ||
| todo := map[string]struct{}{} | ||
| for name := range c.Tokenizers { | ||
| todo[name] = struct{}{} | ||
| } | ||
| registered := 1 | ||
| errs := []error{} | ||
| // as long as we keep making progress, keep going | ||
| for len(todo) > 0 && registered > 0 { | ||
| registered = 0 | ||
| errs = []error{} | ||
| for name := range todo { | ||
| config := c.Tokenizers[name] | ||
| _, err := i.cache.DefineTokenizer(name, config) | ||
| if err != nil { | ||
| errs = append(errs, err) | ||
| } else { | ||
| delete(todo, name) | ||
| registered++ | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if len(errs) > 0 { | ||
| return errs[0] | ||
| } | ||
| } | ||
| for name, config := range c.TokenMaps { | ||
| _, err := i.cache.DefineTokenMap(name, config) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| for name, config := range c.TokenFilters { | ||
| _, err := i.cache.DefineTokenFilter(name, config) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| for name, config := range c.Analyzers { | ||
| _, err := i.cache.DefineAnalyzer(name, config) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| for name, config := range c.DateTimeParsers { | ||
| _, err := i.cache.DefineDateTimeParser(name, config) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func newCustomAnalysis() *customAnalysis { | ||
| rv := customAnalysis{ | ||
| CharFilters: make(map[string]map[string]interface{}), | ||
| Tokenizers: make(map[string]map[string]interface{}), | ||
| TokenMaps: make(map[string]map[string]interface{}), | ||
| TokenFilters: make(map[string]map[string]interface{}), | ||
| Analyzers: make(map[string]map[string]interface{}), | ||
| DateTimeParsers: make(map[string]map[string]interface{}), | ||
| } | ||
| return &rv | ||
| } |
Oops, something went wrong.