gibheer
/
bleve
0
0
Fork 0
Code

another round of golint

This commit is contained in:
Marty Schoch 2014-09-03 19:53:59 -04:00
parent 8b9255f52f
commit 9d2187706e
6 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index/index.go
View File

@ -22,7 +22,7 @@ type Index interface {
Batch(batch Batch) error
TermFieldReader(term []byte, field string) (TermFieldReader, error)
DocIdReader(start, end string) (DocIdReader, error)
DocIDReader(start, end string) (DocIDReader, error)
FieldReader(field string, startTerm []byte, endTerm []byte) (FieldReader, error)
@ -71,7 +71,7 @@ type FieldReader interface {
Close()
}
type DocIdReader interface {
type DocIDReader interface {
Next() (string, error)
Advance(ID string) (string, error)
Close()

18
index/upside_down/reader.go
View File

@ -76,8 +76,8 @@ func (r *UpsideDownCouchTermFieldReader) Next() (*index.TermFieldDoc, error) {
return nil, nil
}
func (r *UpsideDownCouchTermFieldReader) Advance(docId string) (*index.TermFieldDoc, error) {
tfr := NewTermFrequencyRow(r.term, r.field, docId, 0, 0)
func (r *UpsideDownCouchTermFieldReader) Advance(docID string) (*index.TermFieldDoc, error) {
tfr := NewTermFrequencyRow(r.term, r.field, docID, 0, 0)
r.iterator.Seek(tfr.Key())
key, val, valid := r.iterator.Current()
if valid {
@ -104,14 +104,14 @@ func (r *UpsideDownCouchTermFieldReader) Close() {
r.iterator.Close()
}
type UpsideDownCouchDocIdReader struct {
type UpsideDownCouchDocIDReader struct {
index *UpsideDownCouch
iterator store.KVIterator
start string
end string
}
func newUpsideDownCouchDocIdReader(index *UpsideDownCouch, start, end string) (*UpsideDownCouchDocIdReader, error) {
func newUpsideDownCouchDocIDReader(index *UpsideDownCouch, start, end string) (*UpsideDownCouchDocIDReader, error) {
if start == "" {
start = string([]byte{0x0})
}
@ -121,7 +121,7 @@ func newUpsideDownCouchDocIdReader(index *UpsideDownCouch, start, end string) (*
bisr := NewBackIndexRow(start, nil, nil)
it := index.store.Iterator(bisr.Key())
return &UpsideDownCouchDocIdReader{
return &UpsideDownCouchDocIDReader{
index: index,
iterator: it,
start: start,
@ -129,7 +129,7 @@ func newUpsideDownCouchDocIdReader(index *UpsideDownCouch, start, end string) (*
}, nil
}
func (r *UpsideDownCouchDocIdReader) Next() (string, error) {
func (r *UpsideDownCouchDocIDReader) Next() (string, error) {
key, val, valid := r.iterator.Current()
if valid {
bier := NewBackIndexRow(r.end, nil, nil)
@ -147,8 +147,8 @@ func (r *UpsideDownCouchDocIdReader) Next() (string, error) {
return "", nil
}
func (r *UpsideDownCouchDocIdReader) Advance(docId string) (string, error) {
bir := NewBackIndexRow(docId, nil, nil)
func (r *UpsideDownCouchDocIDReader) Advance(docID string) (string, error) {
bir := NewBackIndexRow(docID, nil, nil)
r.iterator.Seek(bir.Key())
key, val, valid := r.iterator.Current()
if valid {
@ -167,6 +167,6 @@ func (r *UpsideDownCouchDocIdReader) Advance(docId string) (string, error) {
return "", nil
}
func (r *UpsideDownCouchDocIdReader) Close() {
func (r *UpsideDownCouchDocIDReader) Close() {
r.iterator.Close()
}

4
index/upside_down/reader_test.go
View File

@ -191,7 +191,7 @@ func TestIndexDocIdReader(t *testing.T) {
expectedCount++
// first get all doc ids
reader, err := idx.DocIdReader("", "")
reader, err := idx.DocIDReader("", "")
if err != nil {
t.Errorf("Error accessing doc id reader: %v", err)
}
@ -208,7 +208,7 @@ func TestIndexDocIdReader(t *testing.T) {
}
// try it again, but jump to the second doc this time
reader, err = idx.DocIdReader("", "")
reader, err = idx.DocIDReader("", "")
if err != nil {
t.Errorf("Error accessing doc id reader: %v", err)
}

30
index/upside_down/upside_down.go
View File

@ -335,12 +335,12 @@ func (udc *UpsideDownCouch) updateSingle(doc *document.Document, backIndexRow *B
return addRows, updateRows, deleteRows
}
func (udc *UpsideDownCouch) storeField(docId string, field document.Field, fieldIndex uint16, existingKeys map[string]bool) ([]UpsideDownCouchRow, []UpsideDownCouchRow, []*BackIndexStoreEntry) {
func (udc *UpsideDownCouch) storeField(docID string, field document.Field, fieldIndex uint16, existingKeys map[string]bool) ([]UpsideDownCouchRow, []UpsideDownCouchRow, []*BackIndexStoreEntry) {
updateRows := make([]UpsideDownCouchRow, 0)
addRows := make([]UpsideDownCouchRow, 0)
backIndexStoredEntries := make([]*BackIndexStoreEntry, 0)
fieldType := encodeFieldType(field)
storedRow := NewStoredRow(docId, fieldIndex, field.ArrayPositions(), fieldType, field.Value())
storedRow := NewStoredRow(docID, fieldIndex, field.ArrayPositions(), fieldType, field.Value())
// record the back index entry
backIndexStoredEntry := BackIndexStoreEntry{Field: proto.Uint32(uint32(fieldIndex)), ArrayPositions: field.ArrayPositions()}
@ -374,7 +374,7 @@ func encodeFieldType(f document.Field) byte {
return fieldType
}
func (udc *UpsideDownCouch) indexField(docId string, field document.Field, fieldIndex uint16, fieldLength int, tokenFreqs analysis.TokenFrequencies, existingKeys map[string]bool) ([]UpsideDownCouchRow, []UpsideDownCouchRow, []*BackIndexTermEntry) {
func (udc *UpsideDownCouch) indexField(docID string, field document.Field, fieldIndex uint16, fieldLength int, tokenFreqs analysis.TokenFrequencies, existingKeys map[string]bool) ([]UpsideDownCouchRow, []UpsideDownCouchRow, []*BackIndexTermEntry) {
updateRows := make([]UpsideDownCouchRow, 0)
addRows := make([]UpsideDownCouchRow, 0)
@ -386,9 +386,9 @@ func (udc *UpsideDownCouch) indexField(docId string, field document.Field, field
if field.Options().IncludeTermVectors() {
tv, newFieldRows := udc.termVectorsFromTokenFreq(fieldIndex, tf)
updateRows = append(updateRows, newFieldRows...)
termFreqRow = NewTermFrequencyRowWithTermVectors(tf.Term, fieldIndex, docId, uint64(frequencyFromTokenFreq(tf)), fieldNorm, tv)
termFreqRow = NewTermFrequencyRowWithTermVectors(tf.Term, fieldIndex, docID, uint64(frequencyFromTokenFreq(tf)), fieldNorm, tv)
} else {
termFreqRow = NewTermFrequencyRow(tf.Term, fieldIndex, docId, uint64(frequencyFromTokenFreq(tf)), fieldNorm)
termFreqRow = NewTermFrequencyRow(tf.Term, fieldIndex, docID, uint64(frequencyFromTokenFreq(tf)), fieldNorm)
}
// record the back index entry
@ -461,10 +461,10 @@ func (udc *UpsideDownCouch) deleteSingle(id string, backIndexRow *BackIndexRow,
return deleteRows
}
func (udc *UpsideDownCouch) backIndexRowForDoc(docId string) (*BackIndexRow, error) {
func (udc *UpsideDownCouch) backIndexRowForDoc(docID string) (*BackIndexRow, error) {
// use a temporary row structure to build key
tempRow := &BackIndexRow{
doc: []byte(docId),
doc: []byte(docID),
}
key := tempRow.Key()
value, err := udc.store.Get(key)
@ -485,12 +485,12 @@ func (udc *UpsideDownCouch) backIndexRowsForBatch(batch index.Batch) (map[string
// FIXME faster to order the ids and scan sequentially
// for now just get it working
rv := make(map[string]*BackIndexRow, 0)
for docId := range batch {
backIndexRow, err := udc.backIndexRowForDoc(docId)
for docID := range batch {
backIndexRow, err := udc.backIndexRowForDoc(docID)
if err != nil {
return nil, err
}
rv[docId] = backIndexRow
rv[docID] = backIndexRow
}
return rv, nil
}
@ -537,8 +537,8 @@ func (udc *UpsideDownCouch) FieldReader(fieldName string, startTerm []byte, endT
return newUpsideDownCouchTermFieldReader(udc, []byte{ByteSeparator}, ^uint16(0))
}
func (udc *UpsideDownCouch) DocIdReader(start, end string) (index.DocIdReader, error) {
return newUpsideDownCouchDocIdReader(udc, start, end)
func (udc *UpsideDownCouch) DocIDReader(start, end string) (index.DocIDReader, error) {
return newUpsideDownCouchDocIDReader(udc, start, end)
}
func (udc *UpsideDownCouch) Document(id string) (*document.Document, error) {
@ -677,11 +677,11 @@ func (udc *UpsideDownCouch) Batch(batch index.Batch) error {
docsAdded := uint64(0)
docsDeleted := uint64(0)
for docId, doc := range batch {
backIndexRow := backIndexRows[docId]
for docID, doc := range batch {
backIndexRow := backIndexRows[docID]
if doc == nil && backIndexRow != nil {
//delete
deleteRows = udc.deleteSingle(docId, backIndexRow, deleteRows)
deleteRows = udc.deleteSingle(docID, backIndexRow, deleteRows)
docsDeleted++
} else if doc != nil {
addRows, updateRows, deleteRows = udc.updateSingle(doc, backIndexRow, addRows, updateRows, deleteRows)

10
index/upside_down/upside_down_test.go
View File

@ -444,15 +444,15 @@ func TestIndexBatch(t *testing.T) {
t.Errorf("Expected document count to be %d got %d", expectedCount, docCount)
}
docIdReader, err := idx.DocIdReader("", "")
docIDReader, err := idx.DocIDReader("", "")
if err != nil {
t.Error(err)
}
docIds := make([]string, 0)
docId, err := docIdReader.Next()
for docId != "" && err == nil {
docIds = append(docIds, docId)
docId, err = docIdReader.Next()
docID, err := docIDReader.Next()
for docID != "" && err == nil {
docIds = append(docIds, docID)
docID, err = docIDReader.Next()
}
if err != nil {
t.Error(err)

4
search/searchers/search_match_all.go
View File

@ -17,12 +17,12 @@ import (
type MatchAllSearcher struct {
index index.Index
reader index.DocIdReader
reader index.DocIDReader
scorer *scorers.ConstantScorer
}
func NewMatchAllSearcher(index index.Index, boost float64, explain bool) (*MatchAllSearcher, error) {
reader, err := index.DocIdReader("", "")
reader, err := index.DocIDReader("", "")
if err != nil {
return nil, err
}