Skip to content

MB-59633: Remove encoded polygons from term dictionaries #258

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

Merged
abhinavdangeti merged 9 commits into from
Mar 24, 2025
Merged

MB-59633: Remove encoded polygons from term dictionaries #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
42c2a70
MB-59633: Toy: Remove encoded polygons from term dictionaries
Likith101 Feb 25, 2025
dfe84ed
MB-59633: Added commentary
Likith101 Mar 6, 2025
8a8bc96
MB-59633: Minor Code Refactor
Likith101 Mar 6, 2025
5cb76a6
MB-59633: Add term to docvalues instead of removing from dicts
Likith101 Mar 7, 2025
ec86bc0
MB-59633: Minor Refactoring
Likith101 Mar 10, 2025
29b60ec
Upgrade bleve_index_api, scorch_segment_api for interface change
abhinavdangeti Mar 11, 2025
f8d2167
Merge branch 'master' into geo
abhinavdangeti Mar 11, 2025
6102d1e
MB-59633: Added some commentary
Likith101 Mar 14, 2025
a4754a5
MB-59633: Changed array type to uint16
Likith101 Mar 19, 2025
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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ go 1.21

require (
github.com/RoaringBitmap/roaring/v2 v2.4.5
github.com/blevesearch/bleve_index_api v1.2.3
github.com/blevesearch/bleve_index_api v1.2.4
github.com/blevesearch/go-faiss v1.0.24
github.com/blevesearch/mmap-go v1.0.4
github.com/blevesearch/scorch_segment_api/v2 v2.3.5
github.com/blevesearch/scorch_segment_api/v2 v2.3.6
github.com/blevesearch/vellum v1.1.0
github.com/golang/snappy v0.0.4
github.com/spf13/cobra v1.7.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ github.com/RoaringBitmap/roaring/v2 v2.4.5 h1:uGrrMreGjvAtTBobc0g5IrW1D5ldxDQYe2
github.com/RoaringBitmap/roaring/v2 v2.4.5/go.mod h1:FiJcsfkGje/nZBZgCu0ZxCPOKD/hVXDS2dXi7/eUFE0=
github.com/bits-and-blooms/bitset v1.12.0 h1:U/q1fAF7xXRhFCrhROzIfffYnu+dlS38vCZtmFVPHmA=
github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
github.com/blevesearch/bleve_index_api v1.2.3 h1:aJJPhTb30zc68qg2HbvCZLAF1Eh5Hhm296mDAUFaUeg=
github.com/blevesearch/bleve_index_api v1.2.3/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
github.com/blevesearch/bleve_index_api v1.2.4 h1:XRk+wWtbNZSxKvW2bNg4fUpoc3XQDD63krBzB45fJDY=
github.com/blevesearch/bleve_index_api v1.2.4/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
github.com/blevesearch/go-faiss v1.0.24 h1:K79IvKjoKHdi7FdiXEsAhxpMuns0x4fM0BO93bW5jLI=
github.com/blevesearch/go-faiss v1.0.24/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc=
github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs=
github.com/blevesearch/scorch_segment_api/v2 v2.3.5 h1:t6NVTdS8xp1xHMJoe5WjxdZWLKhsIIb6kB0U49rhAno=
github.com/blevesearch/scorch_segment_api/v2 v2.3.5/go.mod h1:7gG1vsL3lu2L+7RuEtZ7PJhxGYE+AV9zjxTSHuXFMdM=
github.com/blevesearch/scorch_segment_api/v2 v2.3.6 h1:W9tnVyNqaowWrg8BgndTI4BXmwM+Pr6R/5+Xof7nJMk=
github.com/blevesearch/scorch_segment_api/v2 v2.3.6/go.mod h1:JNx97hWfRl223SpaO9aq0C6WZI9SNdBovMp7X9K7XqU=
github.com/blevesearch/vellum v1.1.0 h1:CinkGyIsgVlYf8Y2LUQHvdelgXr6PYuvoDIajq6yR9w=
github.com/blevesearch/vellum v1.1.0/go.mod h1:QgwWryE8ThtNPxtgWJof5ndPfx0/YMBh+W2weHKPw8Y=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
Expand Down
32 changes: 28 additions & 4 deletions section_inverted_text_index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,11 @@ func (io *invertedIndexOpaque) writeDicts(w *CountHashWriter) (dictOffsets []uin
fdvEncoder := newChunkedContentCoder(chunkSize, uint64(len(io.results)-1), w, false)
if io.IncludeDocValues[fieldID] {
for docNum, docTerms := range docTermMap {
if fieldTermMap, ok := io.extraDocValues[docNum]; ok {
if sTerm, ok := fieldTermMap[uint16(fieldID)]; ok {
docTerms = append(append(docTerms, sTerm...), termSeparator)
}
}
if len(docTerms) > 0 {
err = fdvEncoder.Add(uint64(docNum), docTerms)
if err != nil {
Expand Down Expand Up @@ -755,7 +760,7 @@ func (i *invertedIndexOpaque) realloc() {
i.FieldsMap[fieldName] = uint16(fieldID + 1)
}

visitField := func(field index.Field) {
visitField := func(field index.Field, docNum int) {
fieldID := uint16(i.getOrDefineField(field.Name()))

dict := i.Dicts[fieldID]
Expand Down Expand Up @@ -789,6 +794,13 @@ func (i *invertedIndexOpaque) realloc() {
if field.Options().IncludeDocValues() {
i.IncludeDocValues[fieldID] = true
}

if f, ok := field.(index.GeoShapeField); ok {
if _, exists := i.extraDocValues[docNum]; !exists {
i.extraDocValues[docNum] = make(map[uint16][]byte)
}
i.extraDocValues[docNum][fieldID] = f.EncodedShape()
}
}

if cap(i.IncludeDocValues) >= len(i.FieldsInv) {
Expand All @@ -797,14 +809,20 @@ func (i *invertedIndexOpaque) realloc() {
i.IncludeDocValues = make([]bool, len(i.FieldsInv))
}

for _, result := range i.results {
if i.extraDocValues == nil {
i.extraDocValues = map[int]map[uint16][]byte{}
}

for docNum, result := range i.results {
// walk each composite field
result.VisitComposite(func(field index.CompositeField) {
visitField(field)
visitField(field, docNum)
})

// walk each field
result.VisitFields(visitField)
result.VisitFields(func(field index.Field) {
visitField(field, docNum)
})
}

numPostingsLists := pidNext
Expand Down Expand Up @@ -958,6 +976,11 @@ type invertedIndexOpaque struct {
numTermsPerPostingsList []int // key is postings list id
numLocsPerPostingsList []int // key is postings list id

// store terms that are unnecessary for the term dictionaries but needed in doc values
// eg - encoded geoshapes
// docNum -> fieldID -> term
extraDocValues map[int]map[uint16][]byte

builder *vellum.Builder
builderBuf bytes.Buffer

Expand Down Expand Up @@ -1017,6 +1040,7 @@ func (io *invertedIndexOpaque) Reset() (err error) {
io.reusableFieldTFs = io.reusableFieldTFs[:0]

io.tmp0 = io.tmp0[:0]
io.extraDocValues = nil
atomic.StoreUint64(&io.bytesWritten, 0)
io.fieldsSame = false
io.numDocs = 0
Expand Down