wu-sheng commented on code in PR #505:
URL:
https://github.com/apache/skywalking-banyandb/pull/505#discussion_r1704344628
##########
pkg/index/inverted/inverted.go:
##########
@@ -210,21 +210,31 @@ func (s *store) Iterator(fieldKey index.FieldKey,
termRange index.RangeOpts,
}
if fieldKey.HasSeriesID() {
- query =
query.AddMust(bluge.NewTermQuery(string(fieldKey.SeriesID.Marshal())).
+ rangeQuery =
rangeQuery.AddMust(bluge.NewTermQuery(string(fieldKey.SeriesID.Marshal())).
SetField(seriesIDField))
if termRange.Lower != nil || termRange.Upper != nil {
- query = addRange(query, termRange)
+ rangeQuery = addRange(rangeQuery, termRange)
}
} else {
- query = addRange(query, termRange)
+ rangeQuery = addRange(rangeQuery, termRange)
}
sortedKey := fk
if order == modelv1.Sort_SORT_DESC {
sortedKey = "-" + sortedKey
}
+ query := bluge.NewBooleanQuery().AddMust(rangeQuery)
+ if indexQuery != nil && indexQuery.(*Query).query != nil {
+ query.AddMust(indexQuery.(*Query).query)
+ }
+ fields := make([]string, 0, len(fieldKeys))
+ for i := range fieldKeys {
+ fields = append(fields, fieldKeys[i].Marshal())
+ }
+ // TODO: add trace information
Review Comment:
Should we finish todo in this pr?
##########
pkg/index/inverted/inverted_series.go:
##########
@@ -64,17 +58,37 @@ func (s *store) Search(ctx context.Context, seriesMatchers
[]index.SeriesMatcher
return nil, errors.Errorf("unsupported series matcher
type: %v", seriesMatchers[i].Type)
}
}
- var query bluge.Query
+ var primaryQuery bluge.Query
if len(qs) > 1 {
bq := bluge.NewBooleanQuery()
bq.AddShould(qs...)
bq.SetMinShould(1)
- query = bq
+ primaryQuery = bq
} else {
- query = qs[0]
+ primaryQuery = qs[0]
+ }
+
+ query := bluge.NewBooleanQuery().AddMust(primaryQuery)
+ if secondaryQuery != nil && secondaryQuery.(*Query).query != nil {
+ query.AddMust(secondaryQuery.(*Query).query)
}
+ // TODO: add node for Query
Review Comment:
Same question here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
