这是indexloc提供的服务，不要输入任何密码
Skip to content

Refactor aggregations #55

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
merged 1 commit into from
Jan 7, 2022
Merged

Refactor aggregations #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
94 changes: 93 additions & 1 deletion search/aggregations/aggregations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
package aggregations

import "sort"
import (
"encoding/json"
"sort"

"github.com/blugelabs/bluge/search"
"github.com/mosuka/phalanx/proto"
)

type AggregationType int

Expand Down Expand Up @@ -39,6 +45,92 @@ var (
}
)

func NewAggregations(requests map[string]*proto.AggregationRequest) (map[string]search.Aggregation, error) {
aggs := make(map[string]search.Aggregation)
for name, request := range requests {
switch request.Type {
case AggregationType_name[AggregationTypeTerms]:
opts := make(map[string]interface{})
if err := json.Unmarshal(request.Options, &opts); err != nil {
return nil, err
}
agg, err := NewTermsAggregationWithOptions(opts)
if err != nil {
return nil, err
}

aggs[name] = agg
case AggregationType_name[AggregationTypeRange]:
opts := make(map[string]interface{})
if err := json.Unmarshal(request.Options, &opts); err != nil {
return nil, err
}
agg, err := NewRangeAggregationWithOptions(opts)
if err != nil {
return nil, err
}

aggs[name] = agg
case AggregationType_name[AggregationTypeDateRange]:
opts := make(map[string]interface{})
if err := json.Unmarshal(request.Options, &opts); err != nil {
return nil, err
}
agg, err := NewDateRangeAggregationWithOptions(opts)
if err != nil {
return nil, err
}

aggs[name] = agg
case AggregationType_name[AggregationTypeSum]:
opts := make(map[string]interface{})
if err := json.Unmarshal(request.Options, &opts); err != nil {
return nil, err
}
agg, err := NewSumWithOptions(opts)
if err != nil {
return nil, err
}

aggs[name] = agg
case AggregationType_name[AggregationTypeMin]:
opts := make(map[string]interface{})
if err := json.Unmarshal(request.Options, &opts); err != nil {
return nil, err
}
agg, err := NewMinWithOptions(opts)
if err != nil {
return nil, err
}

aggs[name] = agg
case AggregationType_name[AggregationTypeMax]:
opts := make(map[string]interface{})
if err := json.Unmarshal(request.Options, &opts); err != nil {
return nil, err
}
agg, err := NewMaxWithOptions(opts)
if err != nil {
return nil, err
}

aggs[name] = agg
case AggregationType_name[AggregationTypeAvg]:
opts := make(map[string]interface{})
if err := json.Unmarshal(request.Options, &opts); err != nil {
return nil, err
}
agg, err := NewAvgWithOptions(opts)
if err != nil {
return nil, err
}

aggs[name] = agg
}
}
return aggs, nil
}

func SortByCount(values map[string]float64) PairList {
pl := make(PairList, len(values))
i := 0
Expand Down
204 changes: 13 additions & 191 deletions server/index_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,198 +1075,20 @@ func (s *IndexService) Search(req *proto.SearchRequest) (*proto.SearchResponse,
}

// Set aggregations
for name, agg := range request.Aggregations {
switch agg.Type {
case phalanxaggregations.AggregationType_name[phalanxaggregations.AggregationTypeTerms]:
opts := make(map[string]interface{})
if err := json.Unmarshal(agg.Options, &opts); err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}
termsAgg, err := phalanxaggregations.NewTermsAggregationWithOptions(opts)
if err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}

blugeRequest.AddAggregation(name, termsAgg)
case phalanxaggregations.AggregationType_name[phalanxaggregations.AggregationTypeRange]:
opts := make(map[string]interface{})
if err := json.Unmarshal(agg.Options, &opts); err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}
rangeAgg, err := phalanxaggregations.NewRangeAggregationWithOptions(opts)
if err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}

blugeRequest.AddAggregation(name, rangeAgg)
case phalanxaggregations.AggregationType_name[phalanxaggregations.AggregationTypeDateRange]:
opts := make(map[string]interface{})
if err := json.Unmarshal(agg.Options, &opts); err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}
dateRangeAgg, err := phalanxaggregations.NewDateRangeAggregationWithOptions(opts)
if err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}

blugeRequest.AddAggregation(name, dateRangeAgg)
case phalanxaggregations.AggregationType_name[phalanxaggregations.AggregationTypeSum]:
opts := make(map[string]interface{})
if err := json.Unmarshal(agg.Options, &opts); err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}
sumAgg, err := phalanxaggregations.NewSumWithOptions(opts)
if err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}

blugeRequest.AddAggregation(name, sumAgg)
case phalanxaggregations.AggregationType_name[phalanxaggregations.AggregationTypeMin]:
opts := make(map[string]interface{})
if err := json.Unmarshal(agg.Options, &opts); err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}
minAgg, err := phalanxaggregations.NewMinWithOptions(opts)
if err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}

blugeRequest.AddAggregation(name, minAgg)
case phalanxaggregations.AggregationType_name[phalanxaggregations.AggregationTypeMax]:
opts := make(map[string]interface{})
if err := json.Unmarshal(agg.Options, &opts); err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}
maxAgg, err := phalanxaggregations.NewMaxWithOptions(opts)
if err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}

blugeRequest.AddAggregation(name, maxAgg)
case phalanxaggregations.AggregationType_name[phalanxaggregations.AggregationTypeAvg]:
opts := make(map[string]interface{})
if err := json.Unmarshal(agg.Options, &opts); err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}
avgAgg, err := phalanxaggregations.NewAvgWithOptions(opts)
if err != nil {
s.logger.Error(err.Error(), zap.String("type", agg.Type), zap.String("options", string(agg.Options)))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}

blugeRequest.AddAggregation(name, avgAgg)
aggs, err := phalanxaggregations.NewAggregations(request.Aggregations)
if err != nil {
s.logger.Error(err.Error(), zap.String("index_name", request.IndexName))
responsesChan <- searchResponse{
nodeName: nodeName,
indexName: request.IndexName,
shardNames: request.ShardNames,
resp: nil,
err: err,
}
return err
}
for name, agg := range aggs {
blugeRequest.AddAggregation(name, agg)
}

docMatchIter, err := bluge.MultiSearch(ctx, blugeRequest, readers...)
Expand Down