steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

using list for error tracing

This commit is contained in:
Shreyas Goenka 2023-01-13 19:37:35 +01:00
parent 1538422d27
commit d605ab1aa4
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bundle/schema/schema.go
View File

@ -32,8 +32,8 @@ type Item struct {
func NewSchema(golangType reflect.Type) (*Schema, error) { func NewSchema(golangType reflect.Type) (*Schema, error) {
traceSet := map[reflect.Type]struct{}{} traceSet := map[reflect.Type]struct{}{}
traceSlice := []reflect.Type{} trace := list.New()
rootProp, err := toProperity(golangType, traceSet, traceSlice) rootProp, err := toProperity(golangType, traceSet, trace)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -83,10 +83,12 @@ func javascriptType(golangType reflect.Type) (JsType, error) {
} }
// TODO: add a simple test for this // TODO: add a simple test for this
func errWithTrace(prefix string, trace []reflect.Type) error { func errWithTrace(prefix string, trace *list.List) error {
traceString := "" traceString := ""
for _, golangType := range trace { curr := trace.Front()
traceString += " -> " + golangType.Name() for curr.Next() != nil {
traceString += " -> " + curr.Value.(reflect.Type).Name()
curr = curr.Next()
} }
return fmt.Errorf("[ERROR] " + prefix + " type traveral trace: " + traceString) return fmt.Errorf("[ERROR] " + prefix + " type traveral trace: " + traceString)
} }
@ -98,24 +100,25 @@ func errWithTrace(prefix string, trace []reflect.Type) error {
// checks and errors out for cycles // checks and errors out for cycles
// wraps the error with context // wraps the error with context
func safeToProperty(golangType reflect.Type, traceSet map[reflect.Type]struct{}, traceSlice []reflect.Type) (*Property, error) { func safeToProperty(golangType reflect.Type, traceSet map[reflect.Type]struct{}, trace *list.List) (*Property, error) {
traceSlice = append(traceSlice, golangType) trace.PushBack(golangType)
// detect cycles. Fail if a cycle is detected // detect cycles. Fail if a cycle is detected
// TODO: Add references here for cycles // TODO: Add references here for cycles
// TODO: move this check somewhere nicer // TODO: move this check somewhere nicer
_, ok := traceSet[golangType] _, ok := traceSet[golangType]
if ok { if ok {
fmt.Println("[DEBUG] traceSet: ", traceSet) fmt.Println("[DEBUG] traceSet: ", traceSet)
return nil, errWithTrace("cycle detected", traceSlice) return nil, errWithTrace("cycle detected", trace)
} }
// add current child field to history // add current child field to history
traceSet[golangType] = struct{}{} traceSet[golangType] = struct{}{}
props, err := toProperity(golangType, traceSet, traceSlice) props, err := toProperity(golangType, traceSet, trace)
if err != nil { if err != nil {
return nil, errWithTrace(err.Error(), traceSlice) return nil, errWithTrace(err.Error(), trace)
} }
delete(traceSet, golangType) delete(traceSet, golangType)
traceSlice = traceSlice[:len(traceSlice)-1] back := trace.Back()
trace.Remove(back)
return props, nil return props, nil
} }
@ -153,10 +156,10 @@ func addStructFields(fields []reflect.StructField, golangType reflect.Type) []re
} }
// TODO: add doc string explaining numHistoryOccurances // TODO: add doc string explaining numHistoryOccurances
func toProperity(golangType reflect.Type, traceSet map[reflect.Type]struct{}, traceSlice []reflect.Type) (*Property, error) { func toProperity(golangType reflect.Type, traceSet map[reflect.Type]struct{}, trace *list.List) (*Property, error) {
// *Struct and Struct generate identical json schemas // *Struct and Struct generate identical json schemas
if golangType.Kind() == reflect.Pointer { if golangType.Kind() == reflect.Pointer {
return toProperity(golangType.Elem(), traceSet, traceSlice) return toProperity(golangType.Elem(), traceSet, trace)
} }
rootJavascriptType, err := javascriptType(golangType) rootJavascriptType, err := javascriptType(golangType)
@ -172,7 +175,7 @@ func toProperity(golangType reflect.Type, traceSet map[reflect.Type]struct{}, tr
if err != nil { if err != nil {
return nil, err return nil, err
} }
elemProps, err := safeToProperty(elemGolangType, traceSet, traceSlice) elemProps, err := safeToProperty(elemGolangType, traceSet, trace)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -187,9 +190,9 @@ func toProperity(golangType reflect.Type, traceSet map[reflect.Type]struct{}, tr
var additionalProperties *Property var additionalProperties *Property
if golangType.Kind() == reflect.Map { if golangType.Kind() == reflect.Map {
if golangType.Key().Kind() != reflect.String { if golangType.Key().Kind() != reflect.String {
return nil, errWithTrace("only string keyed maps allowed", traceSlice) return nil, errWithTrace("only string keyed maps allowed", trace)
} }
additionalProperties, err = safeToProperty(golangType.Elem(), traceSet, traceSlice) additionalProperties, err = safeToProperty(golangType.Elem(), traceSet, trace)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -211,9 +214,9 @@ func toProperity(golangType reflect.Type, traceSet map[reflect.Type]struct{}, tr
} }
// recursively compute properties for this child field // recursively compute properties for this child field
fieldProps, err := safeToProperty(child.Type, traceSet, traceSlice) fieldProps, err := safeToProperty(child.Type, traceSet, trace)
if err != nil { if err != nil {
return nil, errWithTrace(err.Error(), traceSlice) return nil, errWithTrace(err.Error(), trace)
} }
properities[childName] = fieldProps properities[childName] = fieldProps
} }