Skip to content

update compare plugin to generate compare for standard well known types #606

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

Open
jmarais wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update compare plugin to generate compare for standard well known types #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
232 changes: 151 additions & 81 deletions plugin/compare/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,29 +74,34 @@ func (p *plugin) Generate(file *generator.FileDescriptor) {
}
}

func (p *plugin) generateNullableField(fieldname string) {
p.P(`if this.`, fieldname, ` != nil && that1.`, fieldname, ` != nil {`)
p.In()
p.P(`if *this.`, fieldname, ` != *that1.`, fieldname, `{`)
func (p *plugin) generateNullableFieldPre(fieldname string) {
p.P(`if that1.`, fieldname, ` == nil {`)
p.In()
p.P(`if *this.`, fieldname, ` < *that1.`, fieldname, `{`)
p.P(`if this.`, fieldname, ` != nil {`)
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.Out()
p.P(`}`)
p.Out()
p.P(`} else if this.`, fieldname, ` != nil {`)
p.P(`} else if this.`, fieldname, ` == nil {`)
p.In()
p.P(`return 1`)
p.P(`return -1`)
p.Out()
p.P(`} else if that1.`, fieldname, ` != nil {`)
p.P(`} else `)
}

func (p *plugin) generateNullableField(fieldname string) {
p.generateNullableFieldPre(fieldname)
p.P(`if *this.`, fieldname, ` != *that1.`, fieldname, `{`)
p.In()
p.P(`if *this.`, fieldname, ` < *that1.`, fieldname, `{`)
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.Out()
p.P(`}`)
}

func (p *plugin) generateMsgNullAndTypeCheck(ccTypeName string) {
Expand Down Expand Up @@ -148,7 +153,12 @@ func (p *plugin) generateField(file *generator.FileDescriptor, message *generato
repeated := field.IsRepeated()
ctype := gogoproto.IsCustomType(field)
nullable := gogoproto.IsNullable(field)
// oneof := field.OneofIndex != nil
stdType := gogoproto.IsStdType(field)
// Currently do not case about proto3 if stdType == true
// stdType can be nullable with proto3
if stdType {
proto3 = !stdType
}
if !repeated {
if ctype {
if nullable {
Expand All @@ -173,7 +183,7 @@ func (p *plugin) generateField(file *generator.FileDescriptor, message *generato
p.Out()
p.P(`}`)
} else {
if field.IsMessage() || p.IsGroup(field) {
if !stdType && (field.IsMessage() || p.IsGroup(field)) {
if nullable {
p.P(`if c := this.`, fieldname, `.Compare(that1.`, fieldname, `); c != 0 {`)
} else {
Expand All @@ -183,13 +193,18 @@ func (p *plugin) generateField(file *generator.FileDescriptor, message *generato
p.P(`return c`)
p.Out()
p.P(`}`)
} else if field.IsBytes() {
p.P(`if c := `, p.bytesPkg.Use(), `.Compare(this.`, fieldname, `, that1.`, fieldname, `); c != 0 {`)
} else if field.IsBytes() || gogoproto.IsStdBytes(field) {
if stdType && nullable && !proto3 {
p.generateNullableFieldPre(fieldname)
p.P(`if c := `, p.bytesPkg.Use(), `.Compare(*this.`, fieldname, `, *that1.`, fieldname, `); c != 0 {`)
} else {
p.P(`if c := `, p.bytesPkg.Use(), `.Compare(this.`, fieldname, `, that1.`, fieldname, `); c != 0 {`)
}
p.In()
p.P(`return c`)
p.Out()
p.P(`}`)
} else if field.IsString() {
} else if field.IsString() || gogoproto.IsStdString(field) {
if nullable && !proto3 {
p.generateNullableField(fieldname)
} else {
Expand All @@ -204,42 +219,42 @@ func (p *plugin) generateField(file *generator.FileDescriptor, message *generato
p.Out()
p.P(`}`)
}
} else if field.IsBool() {
} else if field.IsBool() || gogoproto.IsStdBool(field) {
if nullable && !proto3 {
p.P(`if this.`, fieldname, ` != nil && that1.`, fieldname, ` != nil {`)
p.In()
p.generateNullableFieldPre(fieldname)
p.P(`if *this.`, fieldname, ` != *that1.`, fieldname, `{`)
p.In()
p.P(`if !*this.`, fieldname, ` {`)
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.Out()
p.P(`}`)
p.Out()
p.P(`} else if this.`, fieldname, ` != nil {`)
p.In()
p.P(`return 1`)
p.Out()
p.P(`} else if that1.`, fieldname, ` != nil {`)
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
} else {
p.P(`if this.`, fieldname, ` != that1.`, fieldname, `{`)
p.In()
p.P(`if !this.`, fieldname, ` {`)
}
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.Out()
p.P(`}`)
} else if gogoproto.IsStdTime(field) {
if nullable && !proto3 {
p.generateNullableFieldPre(fieldname)
p.P(`if !this.`, fieldname, `.Equal(*that1.`, fieldname, `) {`)
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.Out()
p.P(`}`)
p.P(`if this.`, fieldname, `.Before(*that1.`, fieldname, `) {`)
} else {
p.P(`if !this.`, fieldname, `.Equal(that1.`, fieldname, `) {`)
p.In()
p.P(`if this.`, fieldname, `.Before(that1.`, fieldname, `) {`)
}
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.Out()
p.P(`}`)
} else {
if nullable && !proto3 {
p.generateNullableField(fieldname)
Expand Down Expand Up @@ -282,9 +297,11 @@ func (p *plugin) generateField(file *generator.FileDescriptor, message *generato
valuegoTyp, _ := p.GoType(nil, m.ValueField)
valuegoAliasTyp, _ := p.GoType(nil, m.ValueAliasField)
nullable, valuegoTyp, valuegoAliasTyp = generator.GoMapValueTypes(field, m.ValueField, valuegoTyp, valuegoAliasTyp)

mapValue := m.ValueAliasField
if mapValue.IsMessage() || p.IsGroup(mapValue) {
stdTypeMapValueField := gogoproto.IsStdType(m.ValueField)
stdTypeMapValueAliasField := gogoproto.IsStdType(m.ValueAliasField)
stdTypeMapValueField = stdTypeMapValueField || stdTypeMapValueAliasField
if !stdTypeMapValueField && mapValue.IsMessage() || p.IsGroup(mapValue) {
if nullable && valuegoTyp == valuegoAliasTyp {
p.P(`if c := this.`, fieldname, `[i].Compare(that1.`, fieldname, `[i]); c != 0 {`)
} else {
Expand All @@ -308,88 +325,141 @@ func (p *plugin) generateField(file *generator.FileDescriptor, message *generato
p.P(`return c`)
p.Out()
p.P(`}`)
} else if mapValue.IsBytes() {
p.P(`if c := `, p.bytesPkg.Use(), `.Compare(this.`, fieldname, `[i], that1.`, fieldname, `[i]); c != 0 {`)
} else if mapValue.IsBytes() || gogoproto.IsStdBytes(mapValue) {
if stdTypeMapValueField && nullable {
p.generateNullableFieldPre(fieldname + `[i]`)
p.P(`if c := `, p.bytesPkg.Use(), `.Compare(*this.`, fieldname, `[i], *that1.`, fieldname, `[i]); c != 0 {`)
} else {
p.P(`if c := `, p.bytesPkg.Use(), `.Compare(this.`, fieldname, `[i], that1.`, fieldname, `[i]); c != 0 {`)
}
p.In()
p.P(`return c`)
p.Out()
p.P(`}`)
} else if mapValue.IsString() {
p.P(`if this.`, fieldname, `[i] != that1.`, fieldname, `[i] {`)
p.In()
p.P(`if this.`, fieldname, `[i] < that1.`, fieldname, `[i] {`)
} else if mapValue.IsBool() || gogoproto.IsStdBool(mapValue) {
if stdTypeMapValueField && nullable {
p.generateNullableFieldPre(fieldname + `[i]`)
p.P(`if *this.`, fieldname, `[i] != *that1.`, fieldname, `[i] {`)
p.In()
p.P(`if !*this.`, fieldname, `[i] {`)
} else {
p.P(`if this.`, fieldname, `[i] != that1.`, fieldname, `[i] {`)
p.In()
p.P(`if !this.`, fieldname, `[i] {`)
}
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.Out()
p.P(`}`)
} else {
p.P(`if this.`, fieldname, `[i] != that1.`, fieldname, `[i] {`)
p.In()
p.P(`if this.`, fieldname, `[i] < that1.`, fieldname, `[i] {`)
} else if gogoproto.IsStdTime(mapValue) {
if stdTypeMapValueField && nullable {
p.generateNullableFieldPre(fieldname + `[i]`)
p.P(`if !this.`, fieldname, `[i].Equal(*that1.`, fieldname, `[i]) {`)
p.In()
p.P(`if this.`, fieldname, `[i].Before(*that1.`, fieldname, `[i]) {`)
} else {
p.P(`if !this.`, fieldname, `[i].Equal(that1.`, fieldname, `[i]) {`)
p.In()
p.P(`if this.`, fieldname, `[i].Before(that1.`, fieldname, `[i]) {`)
}
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.Out()
p.P(`}`)
} else {
if stdTypeMapValueField && nullable {
p.generateNullableField(fieldname + "[i]")
} else {
p.P(`if this.`, fieldname, `[i] != that1.`, fieldname, `[i] {`)
p.In()
p.P(`if this.`, fieldname, `[i] < that1.`, fieldname, `[i] {`)
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.Out()
p.P(`}`)
}
}
} else if field.IsMessage() || p.IsGroup(field) {
} else if !stdType && (field.IsMessage() || p.IsGroup(field)) {
if nullable {
p.P(`if c := this.`, fieldname, `[i].Compare(that1.`, fieldname, `[i]); c != 0 {`)
p.In()
p.P(`return c`)
p.Out()
p.P(`}`)
} else {
p.P(`if c := this.`, fieldname, `[i].Compare(&that1.`, fieldname, `[i]); c != 0 {`)
p.In()
p.P(`return c`)
p.Out()
p.P(`}`)
}
} else if field.IsBytes() {
p.P(`if c := `, p.bytesPkg.Use(), `.Compare(this.`, fieldname, `[i], that1.`, fieldname, `[i]); c != 0 {`)
p.In()
p.P(`return c`)
p.Out()
p.P(`}`)
} else if field.IsString() {
p.P(`if this.`, fieldname, `[i] != that1.`, fieldname, `[i] {`)
p.In()
p.P(`if this.`, fieldname, `[i] < that1.`, fieldname, `[i] {`)
} else if field.IsBytes() || gogoproto.IsStdBytes(field) {
if stdType && nullable && !proto3 {
p.generateNullableFieldPre(fieldname + `[i]`)
p.P(`if c := `, p.bytesPkg.Use(), `.Compare(*this.`, fieldname, `[i], *that1.`, fieldname, `[i]); c != 0 {`)
} else {
p.P(`if c := `, p.bytesPkg.Use(), `.Compare(this.`, fieldname, `[i], that1.`, fieldname, `[i]); c != 0 {`)
}
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.P(`return c`)
p.Out()
p.P(`}`)
} else if field.IsBool() {
p.P(`if this.`, fieldname, `[i] != that1.`, fieldname, `[i] {`)
p.In()
p.P(`if !this.`, fieldname, `[i] {`)
} else if field.IsBool() || gogoproto.IsStdBool(field) {
if stdType && nullable && !proto3 {
p.generateNullableFieldPre(fieldname + `[i]`)
p.P(`if *this.`, fieldname, `[i] != *that1.`, fieldname, `[i] {`)
p.In()
p.P(`if !*this.`, fieldname, `[i] {`)
} else {
p.P(`if this.`, fieldname, `[i] != that1.`, fieldname, `[i] {`)
p.In()
p.P(`if !this.`, fieldname, `[i] {`)
}
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.Out()
p.P(`}`)
} else {
p.P(`if this.`, fieldname, `[i] != that1.`, fieldname, `[i] {`)
p.In()
p.P(`if this.`, fieldname, `[i] < that1.`, fieldname, `[i] {`)
} else if gogoproto.IsStdTime(field) {
if nullable && !proto3 {
p.generateNullableFieldPre(fieldname + `[i]`)
p.P(`if !this.`, fieldname, `[i].Equal(*that1.`, fieldname, `[i]) {`)
p.In()
p.P(`if this.`, fieldname, `[i].Before(*that1.`, fieldname, `[i]) {`)
} else {
p.P(`if !this.`, fieldname, `[i].Equal(that1.`, fieldname, `[i]) {`)
p.In()
p.P(`if this.`, fieldname, `[i].Before(that1.`, fieldname, `[i]) {`)
}
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.Out()
p.P(`}`)
} else {
if stdType && nullable && !proto3 {
p.generateNullableField(fieldname + "[i]")
} else {
p.P(`if this.`, fieldname, `[i] != that1.`, fieldname, `[i] {`)
p.In()
p.P(`if this.`, fieldname, `[i] < that1.`, fieldname, `[i] {`)
p.In()
p.P(`return -1`)
p.Out()
p.P(`}`)
p.P(`return 1`)
p.Out()
p.P(`}`)
}
}
}
p.Out()
Expand Down
Loading