gibheer
/
bleve
0
0
Fork 0
Code

fix errors identified by errcheck 

part of #169
This commit is contained in:
Marty Schoch 2015-04-07 18:05:41 -04:00
parent ba6b3c8bb3
commit 539aeb8dc7
14 changed files with 367 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
index/upside_down/dump_test.go
View File

@ -36,7 +36,12 @@ func TestDump(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
var expectedCount uint64
docCount, err := idx.DocCount()

60
index/upside_down/field_dict_test.go
View File

@ -33,7 +33,12 @@ func TestIndexFieldDict(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
var expectedCount uint64
doc := document.NewDocument("1")
@ -58,13 +63,23 @@ func TestIndexFieldDict(t *testing.T) {
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
dict, err := indexReader.FieldDict("name")
if err != nil {
t.Errorf("error creating reader: %v", err)
}
defer dict.Close()
defer func() {
err := dict.Close()
if err != nil {
t.Fatal(err)
}
}()
termCount := 0
curr, err := dict.Next()
@ -79,19 +94,24 @@ func TestIndexFieldDict(t *testing.T) {
t.Errorf("expected 1 term for this field, got %d", termCount)
}
dict, err = indexReader.FieldDict("desc")
dict2, err := indexReader.FieldDict("desc")
if err != nil {
t.Errorf("error creating reader: %v", err)
}
defer dict.Close()
defer func() {
err := dict2.Close()
if err != nil {
t.Fatal(err)
}
}()
termCount = 0
terms := make([]string, 0)
curr, err = dict.Next()
curr, err = dict2.Next()
for err == nil && curr != nil {
termCount++
terms = append(terms, curr.Term)
curr, err = dict.Next()
curr, err = dict2.Next()
}
if termCount != 3 {
t.Errorf("expected 3 term for this field, got %d", termCount)
@ -102,19 +122,24 @@ func TestIndexFieldDict(t *testing.T) {
}
// test start and end range
dict, err = indexReader.FieldDictRange("desc", []byte("fun"), []byte("nice"))
dict3, err := indexReader.FieldDictRange("desc", []byte("fun"), []byte("nice"))
if err != nil {
t.Errorf("error creating reader: %v", err)
}
defer dict.Close()
defer func() {
err := dict3.Close()
if err != nil {
t.Fatal(err)
}
}()
termCount = 0
terms = make([]string, 0)
curr, err = dict.Next()
curr, err = dict3.Next()
for err == nil && curr != nil {
termCount++
terms = append(terms, curr.Term)
curr, err = dict.Next()
curr, err = dict3.Next()
}
if termCount != 1 {
t.Errorf("expected 1 term for this field, got %d", termCount)
@ -125,19 +150,24 @@ func TestIndexFieldDict(t *testing.T) {
}
// test use case for prefix
dict, err = indexReader.FieldDictPrefix("prefix", []byte("cat"))
dict4, err := indexReader.FieldDictPrefix("prefix", []byte("cat"))
if err != nil {
t.Errorf("error creating reader: %v", err)
}
defer dict.Close()
defer func() {
err := dict4.Close()
if err != nil {
t.Fatal(err)
}
}()
termCount = 0
terms = make([]string, 0)
curr, err = dict.Next()
curr, err = dict4.Next()
for err == nil && curr != nil {
termCount++
terms = append(terms, curr.Term)
curr, err = dict.Next()
curr, err = dict4.Next()
}
if termCount != 3 {
t.Errorf("expected 3 term for this field, got %d", termCount)

48
index/upside_down/reader_test.go
View File

@ -34,7 +34,12 @@ func TestIndexReader(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
var expectedCount uint64
doc := document.NewDocument("1")
@ -58,7 +63,12 @@ func TestIndexReader(t *testing.T) {
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
// first look for a term that doesn't exist
reader, err := indexReader.TermFieldReader([]byte("nope"), "name")
@ -197,7 +207,12 @@ func TestIndexDocIdReader(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
var expectedCount uint64
doc := document.NewDocument("1")
@ -221,14 +236,24 @@ func TestIndexDocIdReader(t *testing.T) {
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader.Close()
if err != nil {
t.Error(err)
}
}()
// first get all doc ids
reader, err := indexReader.DocIDReader("", "")
if err != nil {
t.Errorf("Error accessing doc id reader: %v", err)
}
defer reader.Close()
defer func() {
err := reader.Close()
if err != nil {
t.Fatal(err)
}
}()
id, err := reader.Next()
count := uint64(0)
@ -241,13 +266,18 @@ func TestIndexDocIdReader(t *testing.T) {
}
// try it again, but jump to the second doc this time
reader, err = indexReader.DocIDReader("", "")
reader2, err := indexReader.DocIDReader("", "")
if err != nil {
t.Errorf("Error accessing doc id reader: %v", err)
}
defer reader.Close()
defer func() {
err := reader2.Close()
if err != nil {
t.Error(err)
}
}()
id, err = reader.Advance("2")
id, err = reader2.Advance("2")
if err != nil {
t.Error(err)
}
@ -255,7 +285,7 @@ func TestIndexDocIdReader(t *testing.T) {
t.Errorf("expected to find id '2', got '%s'", id)
}
id, err = reader.Advance("3")
id, err = reader2.Advance("3")
if err != nil {
t.Error(err)
}

182
index/upside_down/upside_down_test.go
View File

@ -100,7 +100,12 @@ func TestIndexInsert(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
var expectedCount uint64
docCount, err := idx.DocCount()
@ -153,7 +158,12 @@ func TestIndexInsertThenDelete(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
var expectedCount uint64
docCount, err := idx.DocCount()
@ -242,7 +252,12 @@ func TestIndexInsertThenUpdate(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
doc := document.NewDocument("1")
doc.AddField(document.NewTextField("name", []uint64{}, []byte("test")))
@ -344,7 +359,12 @@ func TestIndexInsertMultiple(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
doc = document.NewDocument("3")
doc.AddField(document.NewTextField("name", []uint64{}, []byte("test")))
@ -381,7 +401,12 @@ func TestIndexInsertWithStore(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
var expectedCount uint64
docCount, err := idx.DocCount()
@ -422,7 +447,12 @@ func TestIndexInsertWithStore(t *testing.T) {
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
storedDoc, err := indexReader.Document("1")
if err != nil {
@ -456,13 +486,23 @@ func TestIndexInternalCRUD(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
indexReader, err := idx.Reader()
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
// get something that doesn't exist yet
val, err := indexReader.GetInternal([]byte("key"))
@ -479,14 +519,19 @@ func TestIndexInternalCRUD(t *testing.T) {
t.Error(err)
}
indexReader, err = idx.Reader()
indexReader2, err := idx.Reader()
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader2.Close()
if err != nil {
t.Fatal(err)
}
}()
// get
val, err = indexReader.GetInternal([]byte("key"))
val, err = indexReader2.GetInternal([]byte("key"))
if err != nil {
t.Error(err)
}
@ -500,14 +545,19 @@ func TestIndexInternalCRUD(t *testing.T) {
t.Error(err)
}
indexReader, err = idx.Reader()
indexReader3, err := idx.Reader()
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader3.Close()
if err != nil {
t.Fatal(err)
}
}()
// get again
val, err = indexReader.GetInternal([]byte("key"))
val, err = indexReader3.GetInternal([]byte("key"))
if err != nil {
t.Error(err)
}
@ -531,7 +581,12 @@ func TestIndexBatch(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
var expectedCount uint64
@ -576,7 +631,12 @@ func TestIndexBatch(t *testing.T) {
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
docCount := indexReader.DocCount()
if docCount != expectedCount {
@ -620,7 +680,12 @@ func TestIndexInsertUpdateDeleteWithMultipleTypesStored(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
var expectedCount uint64
docCount, err := idx.DocCount()
@ -677,7 +742,12 @@ func TestIndexInsertUpdateDeleteWithMultipleTypesStored(t *testing.T) {
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader.Close()
if err != nil {
t.Error(err)
}
}()
storedDoc, err := indexReader.Document("1")
if err != nil {
@ -728,20 +798,25 @@ func TestIndexInsertUpdateDeleteWithMultipleTypesStored(t *testing.T) {
t.Errorf("Error updating index: %v", err)
}
indexReader, err = idx.Reader()
indexReader2, err := idx.Reader()
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader2.Close()
if err != nil {
t.Error(err)
}
}()
// expected doc count shouldn't have changed
docCount = indexReader.DocCount()
docCount = indexReader2.DocCount()
if docCount != expectedCount {
t.Errorf("Expected document count to be %d got %d", expectedCount, docCount)
}
// should only get 2 fields back now though
storedDoc, err = indexReader.Document("1")
storedDoc, err = indexReader2.Document("1")
if err != nil {
t.Error(err)
}
@ -801,7 +876,12 @@ func TestIndexInsertFields(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
doc := document.NewDocument("1")
doc.AddField(document.NewTextFieldWithIndexingOptions("name", []uint64{}, []byte("test"), document.IndexField|document.StoreField))
@ -820,7 +900,12 @@ func TestIndexInsertFields(t *testing.T) {
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
fields, err := indexReader.Fields()
if err != nil {
@ -852,7 +937,12 @@ func TestIndexUpdateComposites(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
doc := document.NewDocument("1")
doc.AddField(document.NewTextFieldWithIndexingOptions("name", []uint64{}, []byte("test"), document.IndexField|document.StoreField))
@ -893,7 +983,12 @@ func TestIndexUpdateComposites(t *testing.T) {
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
// make sure new values are in index
storedDoc, err := indexReader.Document("1")
@ -939,7 +1034,12 @@ func TestIndexFieldsMisc(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
doc := document.NewDocument("1")
doc.AddField(document.NewTextFieldWithIndexingOptions("name", []uint64{}, []byte("test"), document.IndexField|document.StoreField))
@ -982,7 +1082,12 @@ func TestIndexTermReaderCompositeFields(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
doc := document.NewDocument("1")
doc.AddField(document.NewTextFieldWithIndexingOptions("name", []uint64{}, []byte("test"), document.IndexField|document.StoreField|document.IncludeTermVectors))
@ -997,7 +1102,12 @@ func TestIndexTermReaderCompositeFields(t *testing.T) {
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
termFieldReader, err := indexReader.TermFieldReader([]byte("mister"), "_all")
if err != nil {
@ -1034,7 +1144,12 @@ func TestIndexDocumentFieldTerms(t *testing.T) {
if err != nil {
t.Errorf("error opening index: %v", err)
}
defer idx.Close()
defer func() {
err := idx.Close()
if err != nil {
t.Fatal(err)
}
}()
doc := document.NewDocument("1")
doc.AddField(document.NewTextFieldWithIndexingOptions("name", []uint64{}, []byte("test"), document.IndexField|document.StoreField|document.IncludeTermVectors))
@ -1048,7 +1163,12 @@ func TestIndexDocumentFieldTerms(t *testing.T) {
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
fieldTerms, err := indexReader.DocumentFieldTerms("1")
if err != nil {

21
index_test.go
View File

@ -137,7 +137,12 @@ func TestCrud(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer index.Close()
defer func() {
err := index.Close()
if err != nil {
t.Fatal(err)
}
}()
count, err := index.DocCount()
if err != nil {
@ -345,7 +350,12 @@ func TestSlowSearch(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer index.Close()
defer func() {
err := index.Close()
if err != nil {
t.Fatal(err)
}
}()
Config.SlowSearchLogThreshold = 1 * time.Minute
@ -392,7 +402,12 @@ func TestStoredFieldPreserved(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer index.Close()
defer func() {
err := index.Close()
if err != nil {
t.Fatal(err)
}
}()
doca := map[string]interface{}{
"name": "Marty",

14
search/searchers/search_boolean_test.go
View File

@ -21,7 +21,12 @@ func TestBooleanSearch(t *testing.T) {
if err != nil {
t.Error(err)
}
defer twoDocIndexReader.Close()
defer func() {
err := twoDocIndexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
// test 0
beerTermSearcher, err := NewTermSearcher(twoDocIndexReader, "beer", "desc", 1.0, true)
@ -327,7 +332,12 @@ func TestBooleanSearch(t *testing.T) {
}
for testIndex, test := range tests {
defer test.searcher.Close()
defer func() {
err := test.searcher.Close()
if err != nil {
t.Fatal(err)
}
}()
next, err := test.searcher.Next()
i := 0

14
search/searchers/search_conjunction_test.go
View File

@ -21,7 +21,12 @@ func TestConjunctionSearch(t *testing.T) {
if err != nil {
t.Error(err)
}
defer twoDocIndexReader.Close()
defer func() {
err := twoDocIndexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
// test 0
beerTermSearcher, err := NewTermSearcher(twoDocIndexReader, "beer", "desc", 1.0, true)
@ -175,7 +180,12 @@ func TestConjunctionSearch(t *testing.T) {
}
for testIndex, test := range tests {
defer test.searcher.Close()
defer func() {
err := test.searcher.Close()
if err != nil {
t.Fatal(err)
}
}()
next, err := test.searcher.Next()
i := 0

22
search/searchers/search_disjunction_test.go
View File

@ -21,7 +21,12 @@ func TestDisjunctionSearch(t *testing.T) {
if err != nil {
t.Error(err)
}
defer twoDocIndexReader.Close()
defer func() {
err := twoDocIndexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
martyTermSearcher, err := NewTermSearcher(twoDocIndexReader, "marty", "name", 1.0, true)
if err != nil {
@ -96,8 +101,12 @@ func TestDisjunctionSearch(t *testing.T) {
}
for testIndex, test := range tests {
defer test.searcher.Close()
defer func() {
err := test.searcher.Close()
if err != nil {
t.Fatal(err)
}
}()
next, err := test.searcher.Next()
i := 0
@ -129,7 +138,12 @@ func TestDisjunctionAdvance(t *testing.T) {
if err != nil {
t.Error(err)
}
defer twoDocIndexReader.Close()
defer func() {
err := twoDocIndexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
martyTermSearcher, err := NewTermSearcher(twoDocIndexReader, "marty", "name", 1.0, true)
if err != nil {

14
search/searchers/search_match_all_test.go
View File

@ -21,7 +21,12 @@ func TestMatchAllSearch(t *testing.T) {
if err != nil {
t.Error(err)
}
defer twoDocIndexReader.Close()
defer func() {
err := twoDocIndexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
allSearcher, err := NewMatchAllSearcher(twoDocIndexReader, 1.0, true)
if err != nil {
@ -97,7 +102,12 @@ func TestMatchAllSearch(t *testing.T) {
if test.queryNorm != 1.0 {
test.searcher.SetQueryNorm(test.queryNorm)
}
defer test.searcher.Close()
defer func() {
err := test.searcher.Close()
if err != nil {
t.Fatal(err)
}
}()
next, err := test.searcher.Next()
i := 0

14
search/searchers/search_match_none_test.go
View File

@ -21,7 +21,12 @@ func TestMatchNoneSearch(t *testing.T) {
if err != nil {
t.Error(err)
}
defer twoDocIndexReader.Close()
defer func() {
err := twoDocIndexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
noneSearcher, err := NewMatchNoneSearcher(twoDocIndexReader)
if err != nil {
@ -39,7 +44,12 @@ func TestMatchNoneSearch(t *testing.T) {
}
for testIndex, test := range tests {
defer test.searcher.Close()
defer func() {
err := test.searcher.Close()
if err != nil {
t.Fatal(err)
}
}()
next, err := test.searcher.Next()
i := 0

14
search/searchers/search_phrase_test.go
View File

@ -21,7 +21,12 @@ func TestPhraseSearch(t *testing.T) {
if err != nil {
t.Error(err)
}
defer twoDocIndexReader.Close()
defer func() {
err := twoDocIndexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
angstTermSearcher, err := NewTermSearcher(twoDocIndexReader, "angst", "desc", 1.0, true)
if err != nil {
@ -56,7 +61,12 @@ func TestPhraseSearch(t *testing.T) {
}
for testIndex, test := range tests {
defer test.searcher.Close()
defer func() {
err := test.searcher.Close()
if err != nil {
t.Fatal(err)
}
}()
next, err := test.searcher.Next()
i := 0

14
search/searchers/search_regexp_test.go
View File

@ -22,7 +22,12 @@ func TestRegexpSearch(t *testing.T) {
if err != nil {
t.Error(err)
}
defer twoDocIndexReader.Close()
defer func() {
err := twoDocIndexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
pattern, err := regexp.Compile("ma.*")
if err != nil {
@ -73,7 +78,12 @@ func TestRegexpSearch(t *testing.T) {
}
for testIndex, test := range tests {
defer test.searcher.Close()
defer func() {
err := test.searcher.Close()
if err != nil {
t.Fatal(err)
}
}()
next, err := test.searcher.Next()
i := 0

14
search/searchers/search_term_test.go
View File

@ -123,13 +123,23 @@ func TestTermSearcher(t *testing.T) {
if err != nil {
t.Error(err)
}
defer indexReader.Close()
defer func() {
err := indexReader.Close()
if err != nil {
t.Fatal(err)
}
}()
searcher, err := NewTermSearcher(indexReader, queryTerm, queryField, queryBoost, queryExplain)
if err != nil {
t.Fatal(err)
}
defer searcher.Close()
defer func() {
err := searcher.Close()
if err != nil {
t.Fatal(err)
}
}()
searcher.SetQueryNorm(2.0)
docCount, err := i.DocCount()

7
test/integration_test.go
View File

@ -83,7 +83,12 @@ func runTestDir(t *testing.T, dir string) {
t.Errorf("error creating new index: %v", err)
return
}
defer index.Close()
defer func() {
err := index.Close()
if err != nil {
t.Fatal(err)
}
}()
// index data
fis, err := ioutil.ReadDir(dir + string(filepath.Separator) + "data")