github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8577 from wojtek-t/fix_conversion_order

Browse Source 
Fix ordering of conversion methods so that it's deterministic
This commit is contained in:
Dawn Chen 2015-05-21 11:31:19 -07:00
commit bd335aa57d
3 changed files with 4343 additions and 4342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4412
pkg/api/v1/conversion_generated.go
View File

File diff suppressed because it is too large Load Diff

4254
pkg/api/v1beta3/conversion_generated.go
View File

File diff suppressed because it is too large Load Diff

19
pkg/runtime/conversion_generator.go
View File

@ -65,7 +65,12 @@ func (g *conversionGenerator) GenerateConversionsForType(version string, reflect
if internalObjType.Kind() != reflect.Ptr { if internalObjType.Kind() != reflect.Ptr {
return fmt.Errorf("created object should be of type Ptr: ", internalObjType.Kind()) return fmt.Errorf("created object should be of type Ptr: ", internalObjType.Kind())
} }
return g.generateConversionsBetween(reflection, internalObjType.Elem()) inErr := g.generateConversionsBetween(reflection, internalObjType.Elem())
outErr := g.generateConversionsBetween(internalObjType.Elem(), reflection)
if inErr != nil || outErr != nil {
return fmt.Errorf("errors: %v, %v", inErr, outErr)
}
return nil
} }
func (g *conversionGenerator) generateConversionsBetween(inType, outType reflect.Type) error { func (g *conversionGenerator) generateConversionsBetween(inType, outType reflect.Type) error {
@ -128,9 +133,7 @@ func (g *conversionGenerator) generateConversionsBetween(inType, outType reflect
return inErr return inErr
} }
if !existingConversion { if !existingConversion {
if _, found := g.convertibles[outType]; !found { g.convertibles[inType] = outType
g.convertibles[inType] = outType
}
} }
return nil return nil
default: default:
@ -226,7 +229,9 @@ func (s byName) Len() int {
} }
func (s byName) Less(i, j int) bool { func (s byName) Less(i, j int) bool {
return s[i].Name() < s[j].Name() fullNameI := s[i].PkgPath() + "/" + s[i].Name()
fullNameJ := s[j].PkgPath() + "/" + s[j].Name()
return fullNameI < fullNameJ
} }
func (s byName) Swap(i, j int) { func (s byName) Swap(i, j int) {
@ -253,9 +258,6 @@ func (g *conversionGenerator) WriteConversionFunctions(w io.Writer) error {
if err := g.writeConversionForType(buffer, inType, outType, indent); err != nil { if err := g.writeConversionForType(buffer, inType, outType, indent); err != nil {
return err return err
} }
if err := g.writeConversionForType(buffer, outType, inType, indent); err != nil {
return err
}
} }
if err := buffer.flushLines(w); err != nil { if err := buffer.flushLines(w); err != nil {
return err return err
@ -283,7 +285,6 @@ func (g *conversionGenerator) RegisterConversionFunctions(w io.Writer) error {
var names []string var names []string
for inType, outType := range g.convertibles { for inType, outType := range g.convertibles {
names = append(names, g.conversionFunctionName(inType, outType)) names = append(names, g.conversionFunctionName(inType, outType))
names = append(names, g.conversionFunctionName(outType, inType))
} }
sort.Strings(names) sort.Strings(names)