Skip to content

fix: Fix registry proto #2435

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
feast-ci-bot merged 7 commits into from
Mar 23, 2022
Merged

fix: Fix registry proto #2435

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2e1931f
Fix registry
kevjumba Mar 22, 2022
c13e9bc
Clean up
kevjumba Mar 22, 2022
3e137b4
Clean up
kevjumba Mar 22, 2022
9b6a2f6
Fix issues
kevjumba Mar 22, 2022
c9ad601
Remove the allowCache flag
kevjumba Mar 22, 2022
110a1c3
Address review issues
kevjumba Mar 23, 2022
a3b8214
Fix dumb mistake
kevjumba Mar 23, 2022
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
Prev Previous commit
Next Next commit
Fix issues 
Signed-off-by: Kevin Zhang <kzhang@tecton.ai>
  • Loading branch information
@kevjumba
kevjumba committed Mar 22, 2022
commit 9b6a2f659744ca9012669c6550239f8d89207184
68 changes: 34 additions & 34 deletions go/internal/feast/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,16 @@ func (r *Registry) listEntities(project string, allowCache bool) ([]*Entity, err
if err != nil {
return nil, err
}
if entities, ok := r.cachedEntities[project]; !ok {
if cachedEntities, ok := r.cachedEntities[project]; !ok {
return []*Entity{}, nil
} else {
entityList := make([]*Entity, len(entities))
entities := make([]*Entity, len(cachedEntities))
index := 0
for _, entity := range entities {
entityList[index] = NewEntityFromProto(entity)
for _, entityProto := range cachedEntities {
entities[index] = NewEntityFromProto(entityProto)
index += 1
}
return entityList, nil
return entities, nil
}
}

Expand Down Expand Up @@ -207,12 +207,12 @@ func (r *Registry) listFeatureServices(project string, allowCache bool) ([]*Feat
if err != nil {
return nil, err
}
if featureServiceProtos, ok := r.cachedFeatureServices[project]; !ok {
if cachedFeatureServices, ok := r.cachedFeatureServices[project]; !ok {
return []*FeatureService{}, nil
} else {
featureServices := make([]*FeatureService, len(featureServiceProtos))
featureServices := make([]*FeatureService, len(cachedFeatureServices))
index := 0
for _, featureServiceProto := range featureServiceProtos {
for _, featureServiceProto := range cachedFeatureServices {
featureServices[index] = NewFeatureServiceFromProto(featureServiceProto)
index += 1
}
Expand All @@ -230,12 +230,12 @@ func (r *Registry) listOnDemandFeatureViews(project string, allowCache bool) ([]
if err != nil {
return nil, err
}
if onDemandFeatureViewProtos, ok := r.cachedOnDemandFeatureViews[project]; !ok {
if cachedOnDemandFeatureViews, ok := r.cachedOnDemandFeatureViews[project]; !ok {
return []*OnDemandFeatureView{}, nil
} else {
onDemandFeatureViews := make([]*OnDemandFeatureView, len(onDemandFeatureViewProtos))
onDemandFeatureViews := make([]*OnDemandFeatureView, len(cachedOnDemandFeatureViews))
index := 0
for _, onDemandFeatureViewProto := range onDemandFeatureViewProtos {
for _, onDemandFeatureViewProto := range cachedOnDemandFeatureViews {
onDemandFeatureViews[index] = NewOnDemandFeatureViewFromProto(onDemandFeatureViewProto)
index += 1
}
Expand All @@ -253,12 +253,12 @@ func (r *Registry) listRequestFeatureViews(project string, allowCache bool) ([]*
if err != nil {
return nil, err
}
if requestFeatureViewProtos, ok := r.cachedRequestFeatureViews[project]; !ok {
if cachedRequestFeatureViews, ok := r.cachedRequestFeatureViews[project]; !ok {
return []*RequestFeatureView{}, nil
} else {
requestFeatureViews := make([]*RequestFeatureView, len(requestFeatureViewProtos))
requestFeatureViews := make([]*RequestFeatureView, len(cachedRequestFeatureViews))
index := 0
for _, requestFeatureViewProto := range requestFeatureViewProtos {
for _, requestFeatureViewProto := range cachedRequestFeatureViews {
requestFeatureViews[index] = NewRequestFeatureViewFromProto(requestFeatureViewProto)
index += 1
}
Expand All @@ -271,11 +271,11 @@ func (r *Registry) getEntity(project, entityName string, allowCache bool) (*Enti
if err != nil {
return nil, err
}
if entities, ok := r.cachedEntities[project]; !ok {
return nil, fmt.Errorf("project %s not found in getEntity", project)
if cachedEntities, ok := r.cachedEntities[project]; !ok {
return nil, fmt.Errorf("no cached entities found for project %s", project)
} else {
if entity, ok := entities[entityName]; !ok {
return nil, fmt.Errorf("entity %s not found inside project %s", entityName, project)
if entity, ok := cachedEntities[entityName]; !ok {
return nil, fmt.Errorf("no cached entity %s found for project %s", entityName, project)
} else {
return NewEntityFromProto(entity), nil
}
Expand All @@ -287,11 +287,11 @@ func (r *Registry) getFeatureView(project, featureViewName string, allowCache bo
if err != nil {
return nil, err
}
if featureViews, ok := r.cachedFeatureViews[project]; !ok {
return nil, fmt.Errorf("project %s not found in getFeatureView", project)
if cachedFeatureViews, ok := r.cachedFeatureViews[project]; !ok {
return nil, fmt.Errorf("no cached feature views found for project %s", project)
} else {
if featureViewProto, ok := featureViews[featureViewName]; !ok {
return nil, fmt.Errorf("featureView %s not found inside project %s", featureViewName, project)
if featureViewProto, ok := cachedFeatureViews[featureViewName]; !ok {
return nil, fmt.Errorf("no cached feature view %s found for project %s", featureViewName, project)
} else {
return NewFeatureViewFromProto(featureViewProto), nil
}
Expand All @@ -303,11 +303,11 @@ func (r *Registry) getFeatureService(project, featureServiceName string, allowCa
if err != nil {
return nil, err
}
if featureServices, ok := r.cachedFeatureServices[project]; !ok {
return nil, fmt.Errorf("project %s not found in getFeatureService", project)
if cachedFeatureServices, ok := r.cachedFeatureServices[project]; !ok {
return nil, fmt.Errorf("no cached feature services found for project %s", project)
} else {
if featureServiceProto, ok := featureServices[featureServiceName]; !ok {
return nil, fmt.Errorf("featureService %s not found inside project %s", featureServiceName, project)
if featureServiceProto, ok := cachedFeatureServices[featureServiceName]; !ok {
return nil, fmt.Errorf("no cached feature service %s found for project %s", featureServiceName, project)
} else {
return NewFeatureServiceFromProto(featureServiceProto), nil
}
Expand All @@ -319,11 +319,11 @@ func (r *Registry) getOnDemandFeatureView(project, onDemandFeatureViewName strin
if err != nil {
return nil, err
}
if onDemandFeatureViews, ok := r.cachedOnDemandFeatureViews[project]; !ok {
return nil, fmt.Errorf("project %s not found in getOnDemandFeatureView", project)
if cachedOnDemandFeatureViews, ok := r.cachedOnDemandFeatureViews[project]; !ok {
return nil, fmt.Errorf("no cached on demand feature views found for project %s", project)
} else {
if onDemandFeatureViewProto, ok := onDemandFeatureViews[onDemandFeatureViewName]; !ok {
return nil, fmt.Errorf("onDemandFeatureView %s not found inside project %s", onDemandFeatureViewName, project)
if onDemandFeatureViewProto, ok := cachedOnDemandFeatureViews[onDemandFeatureViewName]; !ok {
return nil, fmt.Errorf("no cached on demand feature view %s found for project %s", onDemandFeatureViewName, project)
} else {
return NewOnDemandFeatureViewFromProto(onDemandFeatureViewProto), nil
}
Expand All @@ -335,11 +335,11 @@ func (r *Registry) getRequestFeatureView(project, requestFeatureViewName string,
if err != nil {
return nil, err
}
if requestFeatureViews, ok := r.cachedRequestFeatureViews[project]; !ok {
return nil, fmt.Errorf("project %s not found in getRequestFeatureView", project)
if cachedRequestFeatureViews, ok := r.cachedRequestFeatureViews[project]; !ok {
return nil, fmt.Errorf("no cached on request feature views found for project %s", project)
} else {
if requestFeatureViewProto, ok := requestFeatureViews[requestFeatureViewName]; !ok {
return nil, fmt.Errorf("requestFeatureView %s not found inside project %s", requestFeatureViewName, project)
if requestFeatureViewProto, ok := cachedRequestFeatureViews[requestFeatureViewName]; !ok {
return nil, fmt.Errorf("no cached request feature view %s found for project %s", requestFeatureViewName, project)
} else {
return NewRequestFeatureViewFromProto(requestFeatureViewProto), nil
}
Expand Down