Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove ngram offset code #616

Merged
merged 2 commits into from
Jul 17, 2023
Merged

remove ngram offset code #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb825fc
remove ngram offset code
keegancsmith Jul 14, 2023
40d709a
remove intermediate ngramIndex interface and fileNameNgrams
keegancsmith Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions btree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ type btreeIndex struct {
postingIndex simpleSection
}

// SizeBytes returns how much memory this structure uses in the heap.
func (b btreeIndex) SizeBytes() (sz int) {
// btree
if b.bt != nil {
Expand Down Expand Up @@ -401,6 +402,9 @@ func (b btreeIndex) getBucket(bucketIndex int) (off uint32, sz uint32) {
return
}

// DumpMap is a debug method which returns the btree as an in-memory
// representation. This is how zoekt represents the ngram index in
// google/zoekt.
func (b btreeIndex) DumpMap() map[ngram]simpleSection {
if b.bt == nil {
return nil
Expand All @@ -427,3 +431,11 @@ func (b btreeIndex) DumpMap() map[ngram]simpleSection {

return m
}

// GetBlob returns the raw encoded offset list for ng.
//
// Note: the returned byte slice is mmap backed normally.
func (b btreeIndex) GetBlob(ng ngram) ([]byte, error) {
sec := b.Get(ng)
return b.file.Read(sec.off, sec.sz)
}
4 changes: 0 additions & 4 deletions hititer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,6 @@ func (d *indexData) newDistanceTrigramIter(ng1, ng2 ngram, dist uint32, caseSens
}

func (d *indexData) trigramHitIterator(ng ngram, caseSensitive, fileName bool) (hitIterator, error) {
if d.ngrams == nil {
return nil, fmt.Errorf("trigramHitIterator: ngrams=nil")
}

variants := []ngram{ng}
if !caseSensitive {
variants = generateCaseNgrams(ng)
Expand Down
15 changes: 4 additions & 11 deletions indexdata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type indexData struct {

file IndexFile

ngrams ngramIndex
ngrams btreeIndex

newlinesStart uint32
newlinesIndex []uint32
Expand All @@ -56,7 +56,7 @@ type indexData struct {

fileNameContent []byte
fileNameIndex []uint32
fileNameNgrams fileNameNgrams
fileNameNgrams btreeIndex

// fileEndSymbol[i] is the index of the first symbol for document i.
fileEndSymbol []uint32
Expand Down Expand Up @@ -314,9 +314,7 @@ func (d *indexData) memoryUse() int {
}
sz += 8 * len(d.runeDocSections)
sz += 8 * len(d.fileBranchMasks)
if d.ngrams != nil {
sz += d.ngrams.SizeBytes()
}
sz += d.ngrams.SizeBytes()
sz += d.fileNameNgrams.SizeBytes()
return sz
}
Expand Down Expand Up @@ -349,13 +347,8 @@ func lastMinarg(xs []uint32) uint32 {

func (data *indexData) ngramFrequency(ng ngram, filename bool) uint32 {
if filename {
return data.fileNameNgrams.Frequency(ng)
}

if data.ngrams == nil {
return 0
return data.fileNameNgrams.Get(ng).sz
}

return data.ngrams.Get(ng).sz
}

Expand Down
Loading
Loading