Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions internal/server/spanner/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (

"cloud.google.com/go/spanner"
pb "github.com/datacommonsorg/mixer/internal/proto"
pbv1 "github.com/datacommonsorg/mixer/internal/proto/v1"
v2 "github.com/datacommonsorg/mixer/internal/server/v2"
"github.com/datacommonsorg/mixer/internal/translator/types"
"gopkg.in/yaml.v3"
Expand All @@ -39,6 +40,8 @@ type SpannerClient interface {
SearchNodes(ctx context.Context, query string, types []string) ([]*SearchNode, error)
ResolveByID(ctx context.Context, nodes []string, in, out string) (map[string][]string, error)
GetEventCollectionDate(ctx context.Context, placeID, eventType string) ([]string, error)
GetEventCollectionDcids(ctx context.Context, placeID, eventType, date string) ([]string, error)
GetEventCollection(ctx context.Context, req *pbv1.EventCollectionRequest) (*pbv1.EventCollection, error)
Sparql(ctx context.Context, nodes []types.Node, queries []*types.Query, opts *types.QueryOptions) ([][]string, error)
GetProvenanceSummary(ctx context.Context, ids []string) (map[string]map[string]*pb.StatVarSummary_ProvenanceSummary, error)
Id() string
Expand Down
68 changes: 68 additions & 0 deletions internal/server/spanner/datasource.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/datacommonsorg/mixer/internal/server/datasource"
"github.com/datacommonsorg/mixer/internal/server/recon"
v2 "github.com/datacommonsorg/mixer/internal/server/v2"
v2e "github.com/datacommonsorg/mixer/internal/server/v2/event"
v3 "github.com/datacommonsorg/mixer/internal/server/v3"
"github.com/datacommonsorg/mixer/internal/store/files"
"github.com/datacommonsorg/mixer/internal/translator/sparql"
Expand Down Expand Up @@ -347,6 +348,14 @@ func (sds *SpannerDataSource) Event(ctx context.Context, req *pbv2.EventRequest)
return sds.handleEventCollectionDate(ctx, parsedReq)
}

parsedReq, err := parseEventCollection(req, arcs)
if err != nil {
return nil, err
}
if parsedReq != nil {
return sds.handleEventCollection(ctx, parsedReq)
}

return nil, status.Errorf(codes.InvalidArgument, "unsupported event request property: %s", req.GetProperty())
}

Expand Down Expand Up @@ -395,3 +404,62 @@ func (sds *SpannerDataSource) BulkVariableInfo(ctx context.Context, req *pbv1.Bu
}
return generateBulkVariableInfoResponse(metadata), nil
}

// parseEventCollection checks if the arcs match the pattern for EventCollection and returns the parsed request.
// Pattern: <-location{typeOf:EventType, date:Date, filter_prop:filter_val}
func parseEventCollection(req *pbv2.EventRequest, arcs []*v2.Arc) (*pbv1.EventCollectionRequest, error) {
if len(arcs) != 1 {
return nil, nil
}
arc := arcs[0]
if arc.Out || arc.SingleProp != "location" {
return nil, nil
}
typeOfs, ok := arc.Filter["typeOf"]
if !ok || len(typeOfs) == 0 {
return nil, fmt.Errorf("event collection requires 'typeOf' filter")
}

res := &pbv1.EventCollectionRequest{
EventType: typeOfs[0],
AffectedPlaceDcid: req.GetNode(),
}

if dates, ok := arc.Filter["date"]; ok && len(dates) > 0 {
res.Date = dates[0]
}

// Handle standard filters (e.g. area).
for k, v := range arc.Filter {
if k == "typeOf" || k == "date" {
continue
}
if len(v) != 1 {
return nil, fmt.Errorf("extra filter '%s' can only have one value", k)
}
spec, err := v2e.ParseEventCollectionFilter(k, v[0])
if err != nil {
return nil, fmt.Errorf("invalid filter format for '%s': %v", k, err)
}
res.FilterProp = spec.Prop
res.FilterLowerLimit = spec.LowerLimit
res.FilterUpperLimit = spec.UpperLimit
res.FilterUnit = spec.Unit
break // V2 supports at most one extra filter
}

return res, nil
}

// handleEventCollection handles EventCollection requests.
func (sds *SpannerDataSource) handleEventCollection(ctx context.Context, req *pbv1.EventCollectionRequest) (*pbv2.EventResponse, error) {
collection, err := sds.client.GetEventCollection(ctx, req)
if err != nil {
return nil, fmt.Errorf("error getting event collection: %v", err)
}

return &pbv2.EventResponse{
EventCollection: collection,
}, nil

}
Loading
Loading