Skip to content
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

Conn: Improved extended query handling #73

Merged
merged 2 commits into from
Sep 18, 2021
Merged

Conn: Improved extended query handling #73

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a61da0d
removed unnecessary write back to client
AmoebaProtozoa Sep 18, 2021
20fa209
fixed extended query describe
AmoebaProtozoa Sep 18, 2021
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
39 changes: 14 additions & 25 deletions server/conn_stmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,7 @@ func (cc *clientConn) handleStmtPrepare(ctx context.Context, parser pgproto3.Par

stmt.SetParamsType(paramTypes)

err = cc.writeParseComplete()
if err != nil {
return err
}
return cc.flush(ctx)
return cc.writeParseComplete()
}

// handleStmtBind handle bind messages in pgsql's extended query.
Expand Down Expand Up @@ -156,11 +152,7 @@ func (cc *clientConn) handleStmtBind(ctx context.Context, bind pgproto3.Bind) (e
vars.Portal["0"] = stmtID
}

err = cc.writeBindComplete()
if err != nil {
return err
}
return cc.flush(ctx)
return cc.writeBindComplete()
}

// handleStmtDescription handle Description messages in pgsql's extended query，
Expand All @@ -177,14 +169,17 @@ func (cc *clientConn) handleStmtDescription(ctx context.Context, desc pgproto3.D

var stmtID uint32
var ok bool
var isPortal bool

// If it specify the prepared statement through portal,
// If it specifies the prepared statement through portal,
// here can directly find the corresponding stmtID through portal.
if desc.ObjectType == 'P' {
stmtID, ok = vars.Portal[desc.Name]
isPortal = true
} else {
// Or get prepared stmtID through stmtName.
stmtID, ok = vars.PreparedStmtNameToID[desc.Name]
isPortal = false
}

if !ok {
Expand All @@ -199,12 +194,13 @@ func (cc *clientConn) handleStmtDescription(ctx context.Context, desc pgproto3.D
strconv.FormatUint(uint64(stmtID), 10), "stmt_description")
}

numParams := stmt.NumParams()
if numParams > 0 {
// we send parameter description only if this is statement and not a portal
// https://www.postgresql.org/docs/current/protocol-flow.html#PROTOCOL-FLOW-EXT-QUERY
if !isPortal {
// Get param types that analyzed in `handleStmtBind`,
// And convert it to PgSQL data type and return it to the client
paramsType := stmt.GetParamsType()
pgType := make([]uint32, numParams)
pgType := make([]uint32, stmt.NumParams())
for i := range paramsType {
pgType[i] = convertMySQLDataTypeToPgSQLDataType(paramsType[i])
}
Expand All @@ -218,18 +214,11 @@ func (cc *clientConn) handleStmtDescription(ctx context.Context, desc pgproto3.D
// otherwise return `writeNoData`.
columnInfo := stmt.GetColumnInfo()
if columnInfo == nil || len(columnInfo) > 0 {
if err := cc.WriteRowDescription(columnInfo); err != nil {
return err
}

// If the row description information has been output here,
// it will not be output when `writeResultset` later.
} else {
if err := cc.writeNoData(); err != nil {
return err
}
return cc.WriteRowDescription(columnInfo)
}
return cc.flush(ctx)
// If the row description information has been output here,
// it will not be output when `writeResultset` later.
return cc.writeNoData()
}

// handleStmtExecute handle execute messages in pgsql's extended query.
Expand Down