gibheer
/
bleve
0
0
Fork 0
Code

fix ineffectual assignments

This commit is contained in:
Marty Schoch 2016-04-02 22:42:56 -04:00
parent 7892882519
commit 2a703376ea
6 changed files with 40 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
analysis/language/fr/light_stemmer_fr.go
View File

@ -241,9 +241,8 @@ func stem(input []rune) []rune {
func norm(input []rune) []rune {
inputLen := len(input)
if inputLen > 4 {
for i := 0; i < inputLen; i++ {
if len(input) > 4 {
for i := 0; i < len(input); i++ {
switch input[i] {
case 'à', 'á', 'â':
input[i] = 'a'
@ -260,11 +259,10 @@ func norm(input []rune) []rune {
}
ch := input[0]
for i := 1; i < inputLen; i++ {
for i := 1; i < len(input); i++ {
if input[i] == ch && unicode.IsLetter(ch) {
input = analysis.DeleteRune(input, i)
i -= 1
inputLen = len(input)
} else {
ch = input[i]
}
@ -272,27 +270,22 @@ func norm(input []rune) []rune {
}
}
if inputLen > 4 && analysis.RunesEndsWith(input, "ie") {
input = input[0 : inputLen-2]
inputLen = len(input)
if len(input) > 4 && analysis.RunesEndsWith(input, "ie") {
input = input[0 : len(input)-2]
}
if inputLen > 4 {
if input[inputLen-1] == 'r' {
input = input[0 : inputLen-1]
inputLen = len(input)
if len(input) > 4 {
if input[len(input)-1] == 'r' {
input = input[0 : len(input)-1]
}
if input[inputLen-1] == 'e' {
input = input[0 : inputLen-1]
inputLen = len(input)
if input[len(input)-1] == 'e' {
input = input[0 : len(input)-1]
}
if input[inputLen-1] == 'e' {
input = input[0 : inputLen-1]
inputLen = len(input)
if input[len(input)-1] == 'e' {
input = input[0 : len(input)-1]
}
if input[inputLen-1] == input[inputLen-2] && unicode.IsLetter(input[inputLen-1]) {
input = input[0 : inputLen-1]
inputLen = len(input)
if input[len(input)-1] == input[len(input)-2] && unicode.IsLetter(input[len(input)-1]) {
input = input[0 : len(input)-1]
}
}

37
analysis/language/fr/minimal_stemmer_fr.go
View File

@ -36,38 +36,31 @@ func (s *FrenchMinimalStemmerFilter) Filter(input analysis.TokenStream) analysis
func minstem(input []rune) []rune {
inputLen := len(input)
if inputLen < 6 {
if len(input) < 6 {
return input
}
if input[inputLen-1] == 'x' {
if input[inputLen-3] == 'a' && input[inputLen-2] == 'u' {
input[inputLen-2] = 'l'
if input[len(input)-1] == 'x' {
if input[len(input)-3] == 'a' && input[len(input)-2] == 'u' {
input[len(input)-2] = 'l'
}
return input[0 : inputLen-1]
return input[0 : len(input)-1]
}
if input[inputLen-1] == 's' {
input = input[0 : inputLen-1]
inputLen = len(input)
if input[len(input)-1] == 's' {
input = input[0 : len(input)-1]
}
if input[inputLen-1] == 'r' {
input = input[0 : inputLen-1]
inputLen = len(input)
if input[len(input)-1] == 'r' {
input = input[0 : len(input)-1]
}
if input[inputLen-1] == 'e' {
input = input[0 : inputLen-1]
inputLen = len(input)
if input[len(input)-1] == 'e' {
input = input[0 : len(input)-1]
}
if input[inputLen-1] == 'é' {
input = input[0 : inputLen-1]
inputLen = len(input)
if input[len(input)-1] == 'é' {
input = input[0 : len(input)-1]
}
if input[inputLen-1] == input[inputLen-2] {
input = input[0 : inputLen-1]
inputLen = len(input)
if input[len(input)-1] == input[len(input)-2] {
input = input[0 : len(input)-1]
}
return input
}

2
index/firestorm/dict_updater.go
View File

@ -134,7 +134,7 @@ func (d *DictUpdater) update() {
atomic.AddUint64(&d.batchesFlushed, 1)
err = writer.Close()
_ = writer.Close()
}
// this is not intended to be used publicly, only for unit tests

4
index/firestorm/util.go
View File

@ -21,9 +21,9 @@ type KVVisitor func(key, val []byte) (bool, error)
func visitPrefix(reader store.KVReader, prefix []byte, visitor KVVisitor) (err error) {
start := prefix
if start == nil {
start = []byte{0}
start = []byte{}
}
it := reader.PrefixIterator(prefix)
it := reader.PrefixIterator(start)
defer func() {
if cerr := it.Close(); err == nil && cerr != nil {
err = cerr

6
index_alias_impl_test.go
View File

@ -442,6 +442,9 @@ func TestIndexAliasEmpty(t *testing.T) {
}
count, err := alias.DocCount()
if err != nil {
t.Errorf("error getting alias doc count: %v", err)
}
if count != 0 {
t.Errorf("expected %d, got %d", 0, count)
}
@ -588,6 +591,9 @@ func TestIndexAliasMulti(t *testing.T) {
}
count, err := alias.DocCount()
if err != nil {
t.Errorf("error getting alias doc count: %v", err)
}
if count != (*ei1.docCountResult + *ei2.docCountResult) {
t.Errorf("expected %d, got %d", (*ei1.docCountResult + *ei2.docCountResult), count)
}

3
search/searchers/search_term_prefix.go
View File

@ -30,7 +30,8 @@ func NewTermPrefixSearcher(indexReader index.IndexReader, prefix string, field s
qsearchers := make([]search.Searcher, 0, 25)
tfd, err := fieldDict.Next()
for err == nil && tfd != nil {
qsearcher, err := NewTermSearcher(indexReader, string(tfd.Term), field, 1.0, explain)
var qsearcher *TermSearcher
qsearcher, err = NewTermSearcher(indexReader, string(tfd.Term), field, 1.0, explain)
if err != nil {
return nil, err
}