|
|
|
// Copyright 2017 The Prometheus Authors
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package index
|
|
|
|
|
|
|
|
import (
|
|
|
|
"encoding/binary"
|
|
|
|
"runtime"
|
|
|
|
"sort"
|
|
|
|
"strings"
|
|
|
|
"sync"
|
|
|
|
|
|
|
|
"github.com/prometheus/tsdb/labels"
|
|
|
|
)
|
|
|
|
|
|
|
|
var allPostingsKey = labels.Label{}
|
|
|
|
|
|
|
|
// AllPostingsKey returns the label key that is used to store the postings list of all existing IDs.
|
|
|
|
func AllPostingsKey() (name, value string) {
|
|
|
|
return allPostingsKey.Name, allPostingsKey.Value
|
|
|
|
}
|
|
|
|
|
|
|
|
// MemPostings holds postings list for series ID per label pair. They may be written
|
|
|
|
// to out of order.
|
|
|
|
// ensureOrder() must be called once before any reads are done. This allows for quick
|
|
|
|
// unordered batch fills on startup.
|
|
|
|
type MemPostings struct {
|
|
|
|
mtx sync.RWMutex
|
|
|
|
m map[labels.Label][]uint64
|
|
|
|
ordered bool
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewMemPostings returns a memPostings that's ready for reads and writes.
|
|
|
|
func NewMemPostings() *MemPostings {
|
|
|
|
return &MemPostings{
|
|
|
|
m: make(map[labels.Label][]uint64, 512),
|
|
|
|
ordered: true,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewUnorderedMemPostings returns a memPostings that is not safe to be read from
|
|
|
|
// until ensureOrder was called once.
|
|
|
|
func NewUnorderedMemPostings() *MemPostings {
|
|
|
|
return &MemPostings{
|
|
|
|
m: make(map[labels.Label][]uint64, 512),
|
|
|
|
ordered: false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// SortedKeys returns a list of sorted label keys of the postings.
|
|
|
|
func (p *MemPostings) SortedKeys() []labels.Label {
|
|
|
|
p.mtx.RLock()
|
|
|
|
keys := make([]labels.Label, 0, len(p.m))
|
|
|
|
|
|
|
|
for l := range p.m {
|
|
|
|
keys = append(keys, l)
|
|
|
|
}
|
|
|
|
p.mtx.RUnlock()
|
|
|
|
|
|
|
|
sort.Slice(keys, func(i, j int) bool {
|
|
|
|
if d := strings.Compare(keys[i].Name, keys[j].Name); d != 0 {
|
|
|
|
return d < 0
|
|
|
|
}
|
|
|
|
return keys[i].Value < keys[j].Value
|
|
|
|
})
|
|
|
|
return keys
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get returns a postings list for the given label pair.
|
|
|
|
func (p *MemPostings) Get(name, value string) Postings {
|
|
|
|
p.mtx.RLock()
|
|
|
|
l := p.m[labels.Label{Name: name, Value: value}]
|
|
|
|
p.mtx.RUnlock()
|
|
|
|
|
|
|
|
if l == nil {
|
|
|
|
return EmptyPostings()
|
|
|
|
}
|
|
|
|
return newListPostings(l)
|
|
|
|
}
|
|
|
|
|
|
|
|
// All returns a postings list over all documents ever added.
|
|
|
|
func (p *MemPostings) All() Postings {
|
|
|
|
return p.Get(AllPostingsKey())
|
|
|
|
}
|
|
|
|
|
|
|
|
// EnsureOrder ensures that all postings lists are sorted. After it returns all further
|
|
|
|
// calls to add and addFor will insert new IDs in a sorted manner.
|
|
|
|
func (p *MemPostings) EnsureOrder() {
|
|
|
|
p.mtx.Lock()
|
|
|
|
defer p.mtx.Unlock()
|
|
|
|
|
|
|
|
if p.ordered {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
n := runtime.GOMAXPROCS(0)
|
|
|
|
workc := make(chan []uint64)
|
|
|
|
|
|
|
|
var wg sync.WaitGroup
|
|
|
|
wg.Add(n)
|
|
|
|
|
|
|
|
for i := 0; i < n; i++ {
|
|
|
|
go func() {
|
|
|
|
for l := range workc {
|
|
|
|
sort.Slice(l, func(i, j int) bool { return l[i] < l[j] })
|
|
|
|
}
|
|
|
|
wg.Done()
|
|
|
|
}()
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, l := range p.m {
|
|
|
|
workc <- l
|
|
|
|
}
|
|
|
|
close(workc)
|
|
|
|
wg.Wait()
|
|
|
|
|
|
|
|
p.ordered = true
|
|
|
|
}
|
|
|
|
|
|
|
|
// Delete removes all ids in the given map from the postings lists.
|
|
|
|
func (p *MemPostings) Delete(deleted map[uint64]struct{}) {
|
|
|
|
var keys []labels.Label
|
|
|
|
|
|
|
|
// Collect all keys relevant for deletion once. New keys added afterwards
|
|
|
|
// can by definition not be affected by any of the given deletes.
|
|
|
|
p.mtx.RLock()
|
|
|
|
for l := range p.m {
|
|
|
|
keys = append(keys, l)
|
|
|
|
}
|
|
|
|
p.mtx.RUnlock()
|
|
|
|
|
|
|
|
// For each key we first analyse whether the postings list is affected by the deletes.
|
|
|
|
// If yes, we actually reallocate a new postings list.
|
|
|
|
for _, l := range keys {
|
|
|
|
// Only lock for processing one postings list so we don't block reads for too long.
|
|
|
|
p.mtx.Lock()
|
|
|
|
|
|
|
|
found := false
|
|
|
|
for _, id := range p.m[l] {
|
|
|
|
if _, ok := deleted[id]; ok {
|
|
|
|
found = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !found {
|
|
|
|
p.mtx.Unlock()
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
repl := make([]uint64, 0, len(p.m[l]))
|
|
|
|
|
|
|
|
for _, id := range p.m[l] {
|
|
|
|
if _, ok := deleted[id]; !ok {
|
|
|
|
repl = append(repl, id)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(repl) > 0 {
|
|
|
|
p.m[l] = repl
|
|
|
|
} else {
|
|
|
|
delete(p.m, l)
|
|
|
|
}
|
|
|
|
p.mtx.Unlock()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Iter calls f for each postings list. It aborts if f returns an error and returns it.
|
|
|
|
func (p *MemPostings) Iter(f func(labels.Label, Postings) error) error {
|
|
|
|
p.mtx.RLock()
|
|
|
|
defer p.mtx.RUnlock()
|
|
|
|
|
|
|
|
for l, p := range p.m {
|
|
|
|
if err := f(l, newListPostings(p)); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a label set to the postings index.
|
|
|
|
func (p *MemPostings) Add(id uint64, lset labels.Labels) {
|
|
|
|
p.mtx.Lock()
|
|
|
|
|
|
|
|
for _, l := range lset {
|
|
|
|
p.addFor(id, l)
|
|
|
|
}
|
|
|
|
p.addFor(id, allPostingsKey)
|
|
|
|
|
|
|
|
p.mtx.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *MemPostings) addFor(id uint64, l labels.Label) {
|
|
|
|
list := append(p.m[l], id)
|
|
|
|
p.m[l] = list
|
|
|
|
|
|
|
|
if !p.ordered {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
// There is no guarantee that no higher ID was inserted before as they may
|
|
|
|
// be generated independently before adding them to postings.
|
|
|
|
// We repair order violations on insert. The invariant is that the first n-1
|
|
|
|
// items in the list are already sorted.
|
|
|
|
for i := len(list) - 1; i >= 1; i-- {
|
|
|
|
if list[i] >= list[i-1] {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
list[i], list[i-1] = list[i-1], list[i]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// ExpandPostings returns the postings expanded as a slice.
|
|
|
|
func ExpandPostings(p Postings) (res []uint64, err error) {
|
|
|
|
for p.Next() {
|
|
|
|
res = append(res, p.At())
|
|
|
|
}
|
|
|
|
return res, p.Err()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Postings provides iterative access over a postings list.
|
|
|
|
type Postings interface {
|
|
|
|
// Next advances the iterator and returns true if another value was found.
|
|
|
|
Next() bool
|
|
|
|
|
|
|
|
// Seek advances the iterator to value v or greater and returns
|
|
|
|
// true if a value was found.
|
|
|
|
Seek(v uint64) bool
|
|
|
|
|
|
|
|
// At returns the value at the current iterator position.
|
|
|
|
At() uint64
|
|
|
|
|
|
|
|
// Err returns the last error of the iterator.
|
|
|
|
Err() error
|
|
|
|
}
|
|
|
|
|
|
|
|
// errPostings is an empty iterator that always errors.
|
|
|
|
type errPostings struct {
|
|
|
|
err error
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e errPostings) Next() bool { return false }
|
|
|
|
func (e errPostings) Seek(uint64) bool { return false }
|
|
|
|
func (e errPostings) At() uint64 { return 0 }
|
|
|
|
func (e errPostings) Err() error { return e.err }
|
|
|
|
|
|
|
|
var emptyPostings = errPostings{}
|
|
|
|
|
|
|
|
// EmptyPostings returns a postings list that's always empty.
|
|
|
|
func EmptyPostings() Postings {
|
|
|
|
return emptyPostings
|
|
|
|
}
|
|
|
|
|
|
|
|
// ErrPostings returns new postings that immediately error.
|
|
|
|
func ErrPostings(err error) Postings {
|
|
|
|
return errPostings{err}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Intersect returns a new postings list over the intersection of the
|
|
|
|
// input postings.
|
|
|
|
func Intersect(its ...Postings) Postings {
|
|
|
|
if len(its) == 0 {
|
|
|
|
return emptyPostings
|
|
|
|
}
|
|
|
|
if len(its) == 1 {
|
|
|
|
return its[0]
|
|
|
|
}
|
|
|
|
l := len(its) / 2
|
|
|
|
return newIntersectPostings(Intersect(its[:l]...), Intersect(its[l:]...))
|
|
|
|
}
|
|
|
|
|
|
|
|
type intersectPostings struct {
|
|
|
|
a, b Postings
|
|
|
|
aok, bok bool
|
|
|
|
cur uint64
|
|
|
|
}
|
|
|
|
|
|
|
|
func newIntersectPostings(a, b Postings) *intersectPostings {
|
|
|
|
return &intersectPostings{a: a, b: b}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *intersectPostings) At() uint64 {
|
|
|
|
return it.cur
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *intersectPostings) doNext(id uint64) bool {
|
|
|
|
for {
|
|
|
|
if !it.b.Seek(id) {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
if vb := it.b.At(); vb != id {
|
|
|
|
if !it.a.Seek(vb) {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
id = it.a.At()
|
|
|
|
if vb != id {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
it.cur = id
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *intersectPostings) Next() bool {
|
|
|
|
if !it.a.Next() {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
return it.doNext(it.a.At())
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *intersectPostings) Seek(id uint64) bool {
|
|
|
|
if !it.a.Seek(id) {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
return it.doNext(it.a.At())
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *intersectPostings) Err() error {
|
|
|
|
if it.a.Err() != nil {
|
|
|
|
return it.a.Err()
|
|
|
|
}
|
|
|
|
return it.b.Err()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Merge returns a new iterator over the union of the input iterators.
|
|
|
|
func Merge(its ...Postings) Postings {
|
|
|
|
if len(its) == 0 {
|
|
|
|
return EmptyPostings()
|
|
|
|
}
|
|
|
|
if len(its) == 1 {
|
|
|
|
return its[0]
|
|
|
|
}
|
|
|
|
l := len(its) / 2
|
|
|
|
return newMergedPostings(Merge(its[:l]...), Merge(its[l:]...))
|
|
|
|
}
|
|
|
|
|
|
|
|
type mergedPostings struct {
|
|
|
|
a, b Postings
|
|
|
|
initialized bool
|
|
|
|
aok, bok bool
|
|
|
|
cur uint64
|
|
|
|
}
|
|
|
|
|
|
|
|
func newMergedPostings(a, b Postings) *mergedPostings {
|
|
|
|
return &mergedPostings{a: a, b: b}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *mergedPostings) At() uint64 {
|
|
|
|
return it.cur
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *mergedPostings) Next() bool {
|
|
|
|
if !it.initialized {
|
|
|
|
it.aok = it.a.Next()
|
|
|
|
it.bok = it.b.Next()
|
|
|
|
it.initialized = true
|
|
|
|
}
|
|
|
|
|
|
|
|
if !it.aok && !it.bok {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
if !it.aok {
|
|
|
|
it.cur = it.b.At()
|
|
|
|
it.bok = it.b.Next()
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
if !it.bok {
|
|
|
|
it.cur = it.a.At()
|
|
|
|
it.aok = it.a.Next()
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
acur, bcur := it.a.At(), it.b.At()
|
|
|
|
|
|
|
|
if acur < bcur {
|
|
|
|
it.cur = acur
|
|
|
|
it.aok = it.a.Next()
|
|
|
|
} else if acur > bcur {
|
|
|
|
it.cur = bcur
|
|
|
|
it.bok = it.b.Next()
|
|
|
|
} else {
|
|
|
|
it.cur = acur
|
|
|
|
it.aok = it.a.Next()
|
|
|
|
it.bok = it.b.Next()
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *mergedPostings) Seek(id uint64) bool {
|
Fix missing postings in Merge and Intersect (#77)
* Test for a previous implematation of Intersect
Before we were moving the postings list everytime we create a new
chained `intersectPostings`. That was causing some postings to be
skipped. This test fails on the older version.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Advance on Seek only when valid.
Issue:
Before in mergedPostings and others we advance everytime we `Seek`,
which causes issues with `Intersect`.
Take the case, where we have a mergedPostings = m merging, a: {10, 20, 30} and
b: {15, 25, 35}. Everytime we `Seek`, we do a.Seek and b.Seek.
Now if we Intersect m with {21, 22, 23, 30}, we would do Seek({21,22,23}) which
would advance a and b beyond 30.
Fix:
Now we advance only when the seeking value is greater than the current
value, as the definition specifies.
Also, posting 0 will not be a valid posting and will be used to signal
finished or un-initialized PostingsList.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Add test for Merge+Intersect edgecase.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Add comments to trivial tests.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
8 years ago
|
|
|
if it.cur >= id {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
it.aok = it.a.Seek(id)
|
|
|
|
it.bok = it.b.Seek(id)
|
|
|
|
it.initialized = true
|
Fix missing postings in Merge and Intersect (#77)
* Test for a previous implematation of Intersect
Before we were moving the postings list everytime we create a new
chained `intersectPostings`. That was causing some postings to be
skipped. This test fails on the older version.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Advance on Seek only when valid.
Issue:
Before in mergedPostings and others we advance everytime we `Seek`,
which causes issues with `Intersect`.
Take the case, where we have a mergedPostings = m merging, a: {10, 20, 30} and
b: {15, 25, 35}. Everytime we `Seek`, we do a.Seek and b.Seek.
Now if we Intersect m with {21, 22, 23, 30}, we would do Seek({21,22,23}) which
would advance a and b beyond 30.
Fix:
Now we advance only when the seeking value is greater than the current
value, as the definition specifies.
Also, posting 0 will not be a valid posting and will be used to signal
finished or un-initialized PostingsList.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Add test for Merge+Intersect edgecase.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Add comments to trivial tests.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
8 years ago
|
|
|
|
|
|
|
return it.Next()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *mergedPostings) Err() error {
|
|
|
|
if it.a.Err() != nil {
|
|
|
|
return it.a.Err()
|
|
|
|
}
|
|
|
|
return it.b.Err()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Without returns a new postings list that contains all elements from the full list that
|
|
|
|
// are not in the drop list
|
|
|
|
func Without(full, drop Postings) Postings {
|
|
|
|
return newRemovedPostings(full, drop)
|
|
|
|
}
|
|
|
|
|
|
|
|
type removedPostings struct {
|
|
|
|
full, remove Postings
|
|
|
|
|
|
|
|
cur uint64
|
|
|
|
|
|
|
|
initialized bool
|
|
|
|
fok, rok bool
|
|
|
|
}
|
|
|
|
|
|
|
|
func newRemovedPostings(full, remove Postings) *removedPostings {
|
|
|
|
return &removedPostings{
|
|
|
|
full: full,
|
|
|
|
remove: remove,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (rp *removedPostings) At() uint64 {
|
|
|
|
return rp.cur
|
|
|
|
}
|
|
|
|
|
|
|
|
func (rp *removedPostings) Next() bool {
|
|
|
|
if !rp.initialized {
|
|
|
|
rp.fok = rp.full.Next()
|
|
|
|
rp.rok = rp.remove.Next()
|
|
|
|
rp.initialized = true
|
|
|
|
}
|
|
|
|
|
|
|
|
if !rp.fok {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
if !rp.rok {
|
|
|
|
rp.cur = rp.full.At()
|
|
|
|
rp.fok = rp.full.Next()
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
fcur, rcur := rp.full.At(), rp.remove.At()
|
|
|
|
if fcur < rcur {
|
|
|
|
rp.cur = fcur
|
|
|
|
rp.fok = rp.full.Next()
|
|
|
|
|
|
|
|
return true
|
|
|
|
} else if rcur < fcur {
|
|
|
|
// Forward the remove postings to the right position.
|
|
|
|
rp.rok = rp.remove.Seek(fcur)
|
|
|
|
} else {
|
|
|
|
// Skip the current posting.
|
|
|
|
rp.fok = rp.full.Next()
|
|
|
|
}
|
|
|
|
|
|
|
|
return rp.Next()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (rp *removedPostings) Seek(id uint64) bool {
|
|
|
|
if rp.cur >= id {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
rp.fok = rp.full.Seek(id)
|
|
|
|
rp.rok = rp.remove.Seek(id)
|
|
|
|
rp.initialized = true
|
|
|
|
|
|
|
|
return rp.Next()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (rp *removedPostings) Err() error {
|
|
|
|
if rp.full.Err() != nil {
|
|
|
|
return rp.full.Err()
|
|
|
|
}
|
|
|
|
|
|
|
|
return rp.remove.Err()
|
|
|
|
}
|
|
|
|
|
|
|
|
// listPostings implements the Postings interface over a plain list.
|
|
|
|
type listPostings struct {
|
|
|
|
list []uint64
|
|
|
|
cur uint64
|
|
|
|
}
|
|
|
|
|
|
|
|
func NewListPostings(list []uint64) Postings {
|
|
|
|
return newListPostings(list)
|
|
|
|
}
|
|
|
|
|
|
|
|
func newListPostings(list []uint64) *listPostings {
|
|
|
|
return &listPostings{list: list}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *listPostings) At() uint64 {
|
|
|
|
return it.cur
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *listPostings) Next() bool {
|
|
|
|
if len(it.list) > 0 {
|
|
|
|
it.cur = it.list[0]
|
|
|
|
it.list = it.list[1:]
|
|
|
|
return true
|
|
|
|
}
|
Fix missing postings in Merge and Intersect (#77)
* Test for a previous implematation of Intersect
Before we were moving the postings list everytime we create a new
chained `intersectPostings`. That was causing some postings to be
skipped. This test fails on the older version.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Advance on Seek only when valid.
Issue:
Before in mergedPostings and others we advance everytime we `Seek`,
which causes issues with `Intersect`.
Take the case, where we have a mergedPostings = m merging, a: {10, 20, 30} and
b: {15, 25, 35}. Everytime we `Seek`, we do a.Seek and b.Seek.
Now if we Intersect m with {21, 22, 23, 30}, we would do Seek({21,22,23}) which
would advance a and b beyond 30.
Fix:
Now we advance only when the seeking value is greater than the current
value, as the definition specifies.
Also, posting 0 will not be a valid posting and will be used to signal
finished or un-initialized PostingsList.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Add test for Merge+Intersect edgecase.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Add comments to trivial tests.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
8 years ago
|
|
|
it.cur = 0
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *listPostings) Seek(x uint64) bool {
|
Fix missing postings in Merge and Intersect (#77)
* Test for a previous implematation of Intersect
Before we were moving the postings list everytime we create a new
chained `intersectPostings`. That was causing some postings to be
skipped. This test fails on the older version.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Advance on Seek only when valid.
Issue:
Before in mergedPostings and others we advance everytime we `Seek`,
which causes issues with `Intersect`.
Take the case, where we have a mergedPostings = m merging, a: {10, 20, 30} and
b: {15, 25, 35}. Everytime we `Seek`, we do a.Seek and b.Seek.
Now if we Intersect m with {21, 22, 23, 30}, we would do Seek({21,22,23}) which
would advance a and b beyond 30.
Fix:
Now we advance only when the seeking value is greater than the current
value, as the definition specifies.
Also, posting 0 will not be a valid posting and will be used to signal
finished or un-initialized PostingsList.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Add test for Merge+Intersect edgecase.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Add comments to trivial tests.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
8 years ago
|
|
|
// If the current value satisfies, then return.
|
|
|
|
if it.cur >= x {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
// Do binary search between current position and end.
|
|
|
|
i := sort.Search(len(it.list), func(i int) bool {
|
|
|
|
return it.list[i] >= x
|
|
|
|
})
|
|
|
|
if i < len(it.list) {
|
|
|
|
it.cur = it.list[i]
|
|
|
|
it.list = it.list[i+1:]
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
it.list = nil
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *listPostings) Err() error {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// bigEndianPostings implements the Postings interface over a byte stream of
|
|
|
|
// big endian numbers.
|
|
|
|
type bigEndianPostings struct {
|
|
|
|
list []byte
|
|
|
|
cur uint32
|
|
|
|
}
|
|
|
|
|
|
|
|
func newBigEndianPostings(list []byte) *bigEndianPostings {
|
|
|
|
return &bigEndianPostings{list: list}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *bigEndianPostings) At() uint64 {
|
|
|
|
return uint64(it.cur)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *bigEndianPostings) Next() bool {
|
|
|
|
if len(it.list) >= 4 {
|
|
|
|
it.cur = binary.BigEndian.Uint32(it.list)
|
|
|
|
it.list = it.list[4:]
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *bigEndianPostings) Seek(x uint64) bool {
|
|
|
|
if uint64(it.cur) >= x {
|
Fix missing postings in Merge and Intersect (#77)
* Test for a previous implematation of Intersect
Before we were moving the postings list everytime we create a new
chained `intersectPostings`. That was causing some postings to be
skipped. This test fails on the older version.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Advance on Seek only when valid.
Issue:
Before in mergedPostings and others we advance everytime we `Seek`,
which causes issues with `Intersect`.
Take the case, where we have a mergedPostings = m merging, a: {10, 20, 30} and
b: {15, 25, 35}. Everytime we `Seek`, we do a.Seek and b.Seek.
Now if we Intersect m with {21, 22, 23, 30}, we would do Seek({21,22,23}) which
would advance a and b beyond 30.
Fix:
Now we advance only when the seeking value is greater than the current
value, as the definition specifies.
Also, posting 0 will not be a valid posting and will be used to signal
finished or un-initialized PostingsList.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Add test for Merge+Intersect edgecase.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
* Add comments to trivial tests.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
8 years ago
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
num := len(it.list) / 4
|
|
|
|
// Do binary search between current position and end.
|
|
|
|
i := sort.Search(num, func(i int) bool {
|
|
|
|
return binary.BigEndian.Uint32(it.list[i*4:]) >= uint32(x)
|
|
|
|
})
|
|
|
|
if i < num {
|
|
|
|
j := i * 4
|
|
|
|
it.cur = binary.BigEndian.Uint32(it.list[j:])
|
|
|
|
it.list = it.list[j+4:]
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
it.list = nil
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *bigEndianPostings) Err() error {
|
|
|
|
return nil
|
|
|
|
}
|