Operating at speed now.

Stripe API is slowest to build at about 1.2s, the depth of the schemas on that spec are insane. The only way to speed things up here is to NOT wait for threads to finish before returning the model, and this creates a broken guarantee as the model won't be finished building by the time its returned to the consumer. When running tests against this - they fail randomly. depending on which thread reaches the finish first, before trying to be read.

This isn't an option, so for now, this is as fast as she will get, which is pretty good. 5ms for petstore and about 250ms for k8s.
This commit is contained in:
Dave Shanley
2022-08-12 09:41:03 -04:00
parent 51c4d08b5a
commit c320b2b9f1
6 changed files with 80 additions and 74 deletions

View File

@@ -32,7 +32,7 @@ func (i *Info) Build(root *yaml.Node) error {
license := License{} license := License{}
_, kln, ln := utils.FindKeyNodeFull("license", root.Content) _, kln, ln := utils.FindKeyNodeFull("license", root.Content)
go BuildModelAsync(ln, &license, &wg, &errs) go BuildModelAsync(ln, &license, &wg, &errs)
wg.Wait() //wg.Wait()
i.Contact = low.NodeReference[*Contact]{Value: &contact, ValueNode: cn, KeyNode: kln} i.Contact = low.NodeReference[*Contact]{Value: &contact, ValueNode: cn, KeyNode: kln}
i.License = low.NodeReference[*License]{Value: &license, ValueNode: ln, KeyNode: kln} i.License = low.NodeReference[*License]{Value: &license, ValueNode: ln, KeyNode: kln}
return nil return nil

View File

@@ -132,7 +132,7 @@ func (p *PathItem) Build(root *yaml.Node, idx *index.SpecIndex) error {
var op Operation var op Operation
wg.Add(1) wg.Add(1)
BuildModelAsync(pathNode, &op, &wg, &errors) go BuildModelAsync(pathNode, &op, &wg, &errors)
opRef := low.NodeReference[*Operation]{ opRef := low.NodeReference[*Operation]{
Value: &op, Value: &op,

View File

@@ -69,7 +69,6 @@ func (r *Response) Build(root *yaml.Node, idx *index.SpecIndex) error {
} }
} }
// handle content, if set.
con, clN, cN, cErr := ExtractMapFlat[*MediaType](ContentLabel, root, idx) con, clN, cN, cErr := ExtractMapFlat[*MediaType](ContentLabel, root, idx)
if cErr != nil { if cErr != nil {
return cErr return cErr

View File

@@ -886,7 +886,7 @@ func (index *SpecIndex) GetGlobalCallbacksCount() int {
return index.globalCallbacksCount return index.globalCallbacksCount
} }
index.pathRefsLock.Lock() //index.pathRefsLock.Lock()
for path, p := range index.pathRefs { for path, p := range index.pathRefs {
for _, m := range p { for _, m := range p {
@@ -918,7 +918,7 @@ func (index *SpecIndex) GetGlobalCallbacksCount() int {
} }
} }
} }
index.pathRefsLock.Unlock() //index.pathRefsLock.Unlock()
return index.globalCallbacksCount return index.globalCallbacksCount
} }
@@ -932,7 +932,7 @@ func (index *SpecIndex) GetGlobalLinksCount() int {
return index.globalLinksCount return index.globalLinksCount
} }
index.pathRefsLock.Lock() //index.pathRefsLock.Lock()
for path, p := range index.pathRefs { for path, p := range index.pathRefs {
for _, m := range p { for _, m := range p {
@@ -963,7 +963,7 @@ func (index *SpecIndex) GetGlobalLinksCount() int {
} }
} }
} }
index.pathRefsLock.Unlock() //index.pathRefsLock.Unlock()
return index.globalLinksCount return index.globalLinksCount
} }

View File

@@ -15,10 +15,6 @@ func CreateDocument(info *datamodel.SpecInfo) (*v3.Document, error) {
// build an index // build an index
idx := index.NewSpecIndex(info.RootNode) idx := index.NewSpecIndex(info.RootNode)
//rsolvr := resolver.NewResolver()
// todo handle errors
//rsolvr.Resolve()
var wg sync.WaitGroup var wg sync.WaitGroup
var errors []error var errors []error

View File

@@ -35,6 +35,17 @@ func BenchmarkCreateDocument_Stripe(b *testing.B) {
} }
} }
func BenchmarkCreateDocument_Petstore(b *testing.B) {
data, _ := ioutil.ReadFile("../test_specs/petstorev3.json")
info, _ := datamodel.ExtractSpecInfo(data)
for i := 0; i < b.N; i++ {
_, err := CreateDocument(info)
if err != nil {
panic("this should not error")
}
}
}
func TestCreateDocument(t *testing.T) { func TestCreateDocument(t *testing.T) {
assert.Equal(t, "3.0.1", doc.Version.Value) assert.Equal(t, "3.0.1", doc.Version.Value)
assert.Equal(t, "Burger Shop", doc.Info.Value.Title.Value) assert.Equal(t, "Burger Shop", doc.Info.Value.Title.Value)