gibheer
/
bleve
0
0
Fork 0
Code

fix issues identified by errcheck 

part of #169
This commit is contained in:
Marty Schoch 2015-04-07 14:52:00 -04:00
parent f1ec73e764
commit 93e01a803e
16 changed files with 231 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
analysis/token_map_test.go
View File

@ -16,7 +16,10 @@ import (
func TestTokenMapLoadFile(t *testing.T) {
tokenMap := NewTokenMap()
tokenMap.LoadFile("test_words.txt")
err := tokenMap.LoadFile("test_words.txt")
if err != nil {
t.Fatal(err)
}
expectedTokens := NewTokenMap()
expectedTokens.AddToken("marty")

5
examples_test.go
View File

@ -26,7 +26,10 @@ func TestMain(m *testing.M) {
panic(err)
}
toRun := m.Run()
os.RemoveAll("path_to_index")
err = os.RemoveAll("path_to_index")
if err != nil {
panic(err)
}
os.Exit(toRun)
}

5
http/handlers_test.go
View File

@ -22,7 +22,10 @@ func indexNameLookup(req *http.Request) string {
func TestHandlers(t *testing.T) {
basePath := "testbase"
os.MkdirAll(basePath, 0700)
err := os.MkdirAll(basePath, 0700)
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(basePath)
createIndexHandler := NewCreateIndexHandler(basePath)

20
index/store/boltdb/store_test.go
View File

@ -71,7 +71,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
reader, err := s.Reader()
if err != nil {
@ -114,7 +117,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
t.Fatalf("expected value val-i, got %s", val)
}
it.Close()
err = it.Close()
if err != nil {
t.Fatal(err)
}
}
func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
@ -127,7 +133,10 @@ func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
// create an isolated reader
reader, err := s.Reader()
@ -166,7 +175,10 @@ func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
// ensure that a newer reader sees it
newReader, err := s.Reader()

10
index/store/cznicb/cznicb_test.go
View File

@ -75,7 +75,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
reader, err := s.Reader()
if err != nil {
@ -118,5 +121,8 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
t.Fatalf("expected value val-i, got %s", val)
}
it.Close()
err = it.Close()
if err != nil {
t.Fatal(err)
}
}

50
index/store/forestdb/store_test.go
View File

@ -103,7 +103,10 @@ func TestRollbackSameHandle(t *testing.T) {
if string(val) != "val-c" {
t.Errorf("expected value 'val-c' got '%s'", val)
}
reader.Close()
err = reader.Close()
if err != nil {
t.Fatal(err)
}
// now rollback
err = s.RollbackTo(rollbackId)
@ -123,7 +126,10 @@ func TestRollbackSameHandle(t *testing.T) {
if val != nil {
t.Errorf("expected missing, got '%s'", val)
}
reader.Close()
err = reader.Close()
if err != nil {
t.Fatal(err)
}
}
// TestRollbackNewHandle tries to rollback the
@ -184,7 +190,10 @@ func TestRollbackNewHandle(t *testing.T) {
if string(val) != "val-c" {
t.Errorf("expected value 'val-c' got '%s'", val)
}
reader.Close()
err = reader.Close()
if err != nil {
t.Fatal(err)
}
// now rollback
err = s.RollbackTo(rollbackId)
@ -211,7 +220,10 @@ func TestRollbackNewHandle(t *testing.T) {
if val != nil {
t.Errorf("expected missing, got '%s'", val)
}
reader2.Close()
err = reader2.Close()
if err != nil {
t.Fatal(err)
}
}
// TestRollbackOtherHandle tries to create 2 handles
@ -279,7 +291,10 @@ func TestRollbackOtherHandle(t *testing.T) {
if string(val) != "val-c" {
t.Errorf("expected value 'val-c' got '%s'", val)
}
reader.Close()
err = reader.Close()
if err != nil {
t.Fatal(err)
}
// now rollback
err = s.RollbackTo(rollbackId)
@ -299,7 +314,10 @@ func TestRollbackOtherHandle(t *testing.T) {
if val != nil {
t.Errorf("expected missing, got '%s'", val)
}
reader2.Close()
err = reader2.Close()
if err != nil {
t.Fatal(err)
}
}
func CommonTestKVStore(t *testing.T, s store.KVStore) {
@ -336,7 +354,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
reader, err := s.Reader()
if err != nil {
@ -379,7 +400,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
t.Fatalf("expected value val-i, got %s", val)
}
it.Close()
err = it.Close()
if err != nil {
t.Fatal(err)
}
}
func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
@ -392,7 +416,10 @@ func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
// create an isolated reader
reader, err := s.Reader()
@ -431,7 +458,10 @@ func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
// ensure that a newer reader sees it
newReader, err := s.Reader()

20
index/store/gtreap/gtreap_test.go
View File

@ -70,7 +70,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
reader, err := s.Reader()
if err != nil {
@ -113,7 +116,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
t.Fatalf("expected value val-i, got %s", val)
}
it.Close()
err = it.Close()
if err != nil {
t.Fatal(err)
}
}
func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
@ -126,7 +132,10 @@ func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
// create an isolated reader
reader, err := s.Reader()
@ -166,7 +175,10 @@ func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
// ensure that a newer reader sees it
newReader, err := s.Reader()

20
index/store/inmem/store_test.go
View File

@ -60,7 +60,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
reader, err := s.Reader()
if err != nil {
@ -103,7 +106,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
t.Fatalf("expected value val-i, got %s", val)
}
it.Close()
err = it.Close()
if err != nil {
t.Fatal(err)
}
}
func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
@ -116,7 +122,10 @@ func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
// create an isolated reader
reader, err := s.Reader()
@ -155,7 +164,10 @@ func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
// ensure that a newer reader sees it
newReader, err := s.Reader()

20
index/store/leveldb/store_test.go
View File

@ -81,7 +81,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
reader, err := s.Reader()
if err != nil {
@ -124,7 +127,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
t.Fatalf("expected value val-i, got %s", val)
}
it.Close()
err = it.Close()
if err != nil {
t.Fatal(err)
}
}
func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
@ -137,7 +143,10 @@ func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
// create an isolated reader
reader, err := s.Reader()
@ -176,7 +185,10 @@ func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
// ensure that a newer reader sees it
newReader, err := s.Reader()

20
index/store/metrics/metrics_test.go
View File

@ -118,7 +118,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
reader, err := s.Reader()
if err != nil {
@ -161,7 +164,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
t.Fatalf("expected value val-i, got %s", val)
}
it.Close()
err = it.Close()
if err != nil {
t.Fatal(err)
}
}
func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
@ -174,7 +180,10 @@ func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
// create an isolated reader
reader, err := s.Reader()
@ -213,7 +222,10 @@ func CommonTestReaderIsolation(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
// ensure that a newer reader sees it
newReader, err := s.Reader()

5
index/store/null/null_test.go
View File

@ -51,7 +51,10 @@ func CommonTestKVStore(t *testing.T, s store.KVStore) {
if err != nil {
t.Fatal(err)
}
writer.Close()
err = writer.Close()
if err != nil {
t.Fatal(err)
}
reader, err := s.Reader()
if err != nil {

15
index/upside_down/reader_test.go
View File

@ -64,7 +64,10 @@ func TestIndexReader(t *testing.T) {
if count != 0 {
t.Errorf("Expected doc count to be: %d got: %d", 0, count)
}
reader.Close()
err = reader.Close()
if err != nil {
t.Fatal(err)
}
reader, err = indexReader.TermFieldReader([]byte("test"), "name")
if err != nil {
@ -115,7 +118,10 @@ func TestIndexReader(t *testing.T) {
if !reflect.DeepEqual(expectedMatch, match) {
t.Errorf("got %#v, expected %#v", match, expectedMatch)
}
reader.Close()
err = reader.Close()
if err != nil {
t.Fatal(err)
}
// now test usage of advance
reader, err = indexReader.TermFieldReader([]byte("test"), "name")
@ -140,7 +146,10 @@ func TestIndexReader(t *testing.T) {
if match != nil {
t.Errorf("expected nil, got %v", match)
}
reader.Close()
err = reader.Close()
if err != nil {
t.Fatal(err)
}
// now test creating a reader for a field that doesn't exist
reader, err = indexReader.TermFieldReader([]byte("water"), "doesnotexist")

17
index/upside_down/row_test.go
View File

@ -267,8 +267,11 @@ func BenchmarkTermFrequencyRowEncode(b *testing.B) {
func BenchmarkTermFrequencyRowDecode(b *testing.B) {
for i := 0; i < b.N; i++ {
k := []byte{'t', 0, 0, 'b', 'e', 'e', 'r', ByteSeparator, 'b', 'u', 'd', 'w', 'e', 'i', 's', 'e', 'r'}
v := []byte{3, 0, 0, 0, 0, 0, 0, 0, 195, 245, 72, 64, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 51, 0, 0, 0, 0, 0, 0, 0}
NewTermFrequencyRowKV(k, v)
v := []byte{3, 195, 235, 163, 130, 4, 0, 1, 3, 11, 0, 2, 23, 31, 0, 3, 43, 51}
_, err := NewTermFrequencyRowKV(k, v)
if err != nil {
b.Fatal(err)
}
}
}
@ -298,7 +301,10 @@ func BenchmarkBackIndexRowDecode(b *testing.B) {
for i := 0; i < b.N; i++ {
k := []byte{0x62, 0x62, 0x65, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65}
v := []byte{0x0a, 0x09, 0x0a, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x31, 0x10, 0x01, 0x12, 0x02, 0x08, 0x01}
NewTermFrequencyRowKV(k, v)
_, err := NewBackIndexRowKV(k, v)
if err != nil {
b.Fatal(err)
}
}
}
@ -315,6 +321,9 @@ func BenchmarkStoredRowDecode(b *testing.B) {
for i := 0; i < b.N; i++ {
k := []byte{'s', 'b', 'u', 'd', 'w', 'e', 'i', 's', 'e', 'r', ByteSeparator, 0, 0}
v := []byte{'t', 'a', 'n', ' ', 'a', 'm', 'e', 'r', 'i', 'c', 'a', 'n', ' ', 'b', 'e', 'e', 'r'}
NewTermFrequencyRowKV(k, v)
_, err := NewStoredRowKV(k, v)
if err != nil {
b.Fatal(err)
}
}
}

16
index/upside_down/upside_down_test.go
View File

@ -58,7 +58,10 @@ func TestIndexOpenReopen(t *testing.T) {
}
// now close it
idx.Close()
err = idx.Close()
if err != nil {
t.Fatal(err)
}
store, err = boltdb.Open("test", "bleve")
if err != nil {
@ -71,7 +74,10 @@ func TestIndexOpenReopen(t *testing.T) {
}
// now close it
idx.Close()
err = idx.Close()
if err != nil {
t.Fatal(err)
}
}
func TestIndexInsert(t *testing.T) {
@ -302,7 +308,11 @@ func TestIndexInsertMultiple(t *testing.T) {
}
// close, reopen and add one more to test that counting works correctly
idx.Close()
err = idx.Close()
if err != nil {
t.Fatal(err)
}
store, err = boltdb.Open("test", "bleve")
idx = NewUpsideDownCouch(store, analysisQueue)
err = idx.Open()

7
index_alias_impl_test.go
View File

@ -270,9 +270,12 @@ func TestIndexAliasSingle(t *testing.T) {
func TestIndexAliasClosed(t *testing.T) {
alias := NewIndexAlias()
alias.Close()
err := alias.Close()
if err != nil {
t.Fatal(err)
}
err := alias.Index("a", "a")
err = alias.Index("a", "a")
if err != ErrorIndexClosed {
t.Errorf("expected %v, got %v", ErrorIndexClosed, err)
}

55
index_test.go
View File

@ -68,7 +68,10 @@ func TestCrud(t *testing.T) {
"desc": "cbft master",
}
batch := index.NewBatch()
batch.Index("b", docb)
err = batch.Index("b", docb)
if err != nil {
t.Error(err)
}
batch.Delete("x")
batch.SetInternal([]byte("batchi"), []byte("batchv"))
batch.DeleteInternal([]byte("status"))
@ -120,7 +123,10 @@ func TestCrud(t *testing.T) {
}
// close the index, open it again, and try some more things
index.Close()
err = index.Close()
if err != nil {
t.Fatal(err)
}
index, err = Open("testidx")
if err != nil {
@ -182,7 +188,10 @@ func TestIndexCreateNewOverExisting(t *testing.T) {
if err != nil {
t.Fatal(err)
}
index.Close()
err = index.Close()
if err != nil {
t.Fatal(err)
}
index, err = New("testidx", NewIndexMapping())
if err != ErrorIndexPathExists {
t.Fatalf("expected error index path exists, got %v", err)
@ -203,10 +212,16 @@ func TestIndexOpenMetaMissingOrCorrupt(t *testing.T) {
if err != nil {
t.Fatal(err)
}
index.Close()
err = index.Close()
if err != nil {
t.Fatal(err)
}
// now intentionally change the storage type
ioutil.WriteFile("testidx/index_meta.json", []byte(`{"storage":"mystery"}`), 0666)
err = ioutil.WriteFile("testidx/index_meta.json", []byte(`{"storage":"mystery"}`), 0666)
if err != nil {
t.Fatal(err)
}
index, err = Open("testidx")
if err != ErrorUnknownStorageType {
@ -214,7 +229,10 @@ func TestIndexOpenMetaMissingOrCorrupt(t *testing.T) {
}
// now intentionally corrupt the metadata
ioutil.WriteFile("testidx/index_meta.json", []byte("corrupted"), 0666)
err = ioutil.WriteFile("testidx/index_meta.json", []byte("corrupted"), 0666)
if err != nil {
t.Fatal(err)
}
index, err = Open("testidx")
if err != ErrorIndexMetaCorrupt {
@ -222,7 +240,10 @@ func TestIndexOpenMetaMissingOrCorrupt(t *testing.T) {
}
// now intentionally remove the metadata
os.Remove("testidx/index_meta.json")
err = os.Remove("testidx/index_meta.json")
if err != nil {
t.Fatal(err)
}
index, err = Open("testidx")
if err != ErrorIndexMetaMissing {
@ -236,7 +257,10 @@ func TestInMemIndex(t *testing.T) {
if err != nil {
t.Fatal(err)
}
index.Close()
err = index.Close()
if err != nil {
t.Fatal(err)
}
}
func TestClosedIndex(t *testing.T) {
@ -244,7 +268,10 @@ func TestClosedIndex(t *testing.T) {
if err != nil {
t.Fatal(err)
}
index.Close()
err = index.Close()
if err != nil {
t.Fatal(err)
}
err = index.Index("test", "test")
if err != ErrorIndexClosed {
@ -304,14 +331,20 @@ func TestSlowSearch(t *testing.T) {
query := NewTermQuery("water")
req := NewSearchRequest(query)
index.Search(req)
_, err = index.Search(req)
if err != nil {
t.Fatal(err)
}
if sdw.sawData {
t.Errorf("expected to not see slow query logged, but did")
}
Config.SlowSearchLogThreshold = 1 * time.Microsecond
index.Search(req)
_, err = index.Search(req)
if err != nil {
t.Fatal(err)
}
if !sdw.sawData {
t.Errorf("expected to see slow query logged, but didn't")