From 419d1ed05dbf7ac802a36ff1cc677b04e19b13fb Mon Sep 17 00:00:00 2001
From: Todd Gruben <todd@pilosa.com>
Date: Mon, 13 Sep 2021 14:16:20 -0500
Subject: [PATCH] linter cleanup

---
 pg/message/message.go |  2 ++
 pg/pgtest/handler.go  |  3 +++
 pg/protocol.go        | 25 +++++++++++++++++--------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/pg/message/message.go b/pg/message/message.go
index 5d6f67014..757053297 100644
--- a/pg/message/message.go
+++ b/pg/message/message.go
@@ -172,11 +172,13 @@ func (e *Encoder) i32(i int32) error {
 	return err
 }
 
+/* removed for linter now
 func (e *Encoder) u32(i uint32) error {
 	binary.BigEndian.PutUint32(e.scratch[:], i)
 	_, err := e.buf.Write(e.scratch[:])
 	return err
 }
+*/
 
 // ReadyForQuery encodes a "ready for query" message.
 func (e *Encoder) ReadyForQuery(status TransactionStatus) (Message, error) {
diff --git a/pg/pgtest/handler.go b/pg/pgtest/handler.go
index b146359d8..02b1361e2 100644
--- a/pg/pgtest/handler.go
+++ b/pg/pgtest/handler.go
@@ -30,6 +30,9 @@ type HandlerFunc func(context.Context, pg.QueryResultWriter, pg.Query) error
 func (h HandlerFunc) HandleQuery(ctx context.Context, w pg.QueryResultWriter, q pg.Query) error {
 	return h(ctx, w, q)
 }
+func (h HandlerFunc) HandleSchema(ctx context.Context, portal *pg.Portal) error {
+	return nil
+}
 
 var _ pg.QueryHandler = HandlerFunc(nil)
 
diff --git a/pg/protocol.go b/pg/protocol.go
index 754e128e3..377e2ac16 100644
--- a/pg/protocol.go
+++ b/pg/protocol.go
@@ -273,12 +273,12 @@ const (
 )
 
 type Portal struct {
-	Name         string
-	Writer       *message.WireWriter
-	commands     []message.Message
-	Encoder      *message.Encoder
-	mapper       *sql.Mapper
-	results      []Result
+	Name     string
+	Writer   *message.WireWriter
+	commands []message.Message
+	Encoder  *message.Encoder
+	mapper   *sql.Mapper
+	//results      []Result
 	sql          string
 	pgspecial    PgType
 	pid          int32
@@ -491,7 +491,11 @@ func (p *Portal) Execute() (shouldTerminate bool, queryReady bool) {
 		// need to return something so that the id can be queried
 		//need to return  SELECT pid as id, query as stmt, EXTRACT(seconds from query_start - NOW()) as elapsed_time          FROM pg_stat_activity
 		//seems like we need a map of pids to querys
-		p.server.dumpPortalsTo(p)
+		err := p.server.dumpPortalsTo(p)
+		if err != nil {
+			return
+		}
+
 	case pgTerminate:
 		//note just have 1 lock that blocks all who try to count the activities
 		vprint.VV("removing the block ")
@@ -577,7 +581,12 @@ func (p *Portal) Execute() (shouldTerminate bool, queryReady bool) {
 func (p *Portal) Sync() {
 	for _, m := range p.commands {
 		vprint.VV("Sending: '%v'", m.Type)
-		p.Writer.WriteMessage(m)
+		err := p.Writer.WriteMessage(m)
+		if err != nil {
+			//TODO (twg) need to change signature to return error
+			vprint.VV("error %v", err)
+			return
+		}
 	}
 	p.Writer.Flush()
 	p.Reset()