From b8b3c730ee2fc5656d58e6c76acd4940d90fde91 Mon Sep 17 00:00:00 2001 From: Sergey Date: Mon, 28 Jan 2019 17:02:56 +0500 Subject: [PATCH] simplify of the if-else statement --- mysql/command.go | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/mysql/command.go b/mysql/command.go index 541895e..51299d3 100644 --- a/mysql/command.go +++ b/mysql/command.go @@ -171,21 +171,17 @@ func (c *Conn) handleSelectVariableExpr(v *ast.VariableExpr, columnName string) if err != nil { return err } - if v.Name == ServerUUID { - result, err = gomysql.BuildSimpleResultset( - []string{columnName}, - [][]interface{}{ - []interface{}{masterInfo.ServerUUID}, - }, - false) - } else { - result, err = gomysql.BuildSimpleResultset( - []string{columnName}, - [][]interface{}{ - []interface{}{masterInfo.ServerID}, - }, - false) + var value interface{} + value = masterInfo.ServerUUID + if v.Name != ServerUUID { + value = masterInfo.ServerID } + result, err = gomysql.BuildSimpleResultset( + []string{columnName}, + [][]interface{}{ + []interface{}{value}, + }, + false) case GtidMode: result, err = gomysql.BuildSimpleResultset( []string{columnName},