From 447b8fc915602c2929f1d38d6c1c28ed22675342 Mon Sep 17 00:00:00 2001 From: "Sascha L. Teichmann" Date: Sun, 7 Jan 2024 04:22:22 +0100 Subject: [PATCH] unexport mtredisalize connection --- cmd/mtredisalize/connection.go | 42 +++++++++++++++++----------------- cmd/mtredisalize/main.go | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cmd/mtredisalize/connection.go b/cmd/mtredisalize/connection.go index 7b0cc83..4d10546 100644 --- a/cmd/mtredisalize/connection.go +++ b/cmd/mtredisalize/connection.go @@ -23,22 +23,22 @@ var ( redisFalse = []byte(":0\r\n") ) -type Connection struct { +type connection struct { conn net.Conn session Session maxBulkStringSize int64 boolArray []bool } -func NewConnection(conn net.Conn, session Session, maxBulkStringSize int64) *Connection { - return &Connection{ +func newConnection(conn net.Conn, session Session, maxBulkStringSize int64) *connection { + return &connection{ conn: conn, session: session, maxBulkStringSize: maxBulkStringSize, boolArray: []bool{}} } -func (c *Connection) Run() { +func (c *connection) run() { defer func() { c.session.Close() c.conn.Close() @@ -57,7 +57,7 @@ func logError(err error) bool { return true } -func (c *Connection) Hdel(hash, key []byte) bool { +func (c *connection) Hdel(hash, key []byte) bool { success, err := c.session.Del(hash, key) if err != nil { @@ -67,7 +67,7 @@ func (c *Connection) Hdel(hash, key []byte) bool { return c.writeBool(success) } -func (c *Connection) Hget(hash, key []byte) bool { +func (c *connection) Hget(hash, key []byte) bool { var err error var data []byte @@ -78,7 +78,7 @@ func (c *Connection) Hget(hash, key []byte) bool { return c.writeBlock(data) } -func (c *Connection) Hset(hash, key, data []byte) bool { +func (c *connection) Hset(hash, key, data []byte) bool { var err error var exists bool @@ -94,7 +94,7 @@ func (c *Connection) Hset(hash, key, data []byte) bool { return c.writeBool(exists) } -func (c *Connection) Multi() bool { +func (c *connection) Multi() bool { if c.session.InTransaction() { log.Println("WARN: Already running transaction.") } else { @@ -105,7 +105,7 @@ func (c *Connection) Multi() bool { return c.writeOk() } -func (c *Connection) Exec() bool { +func (c *connection) Exec() bool { if !c.session.InTransaction() { return c.writeEmptyArray() } @@ -117,7 +117,7 @@ func (c *Connection) Exec() bool { return c.writeBoolArray(arr) } -func (c *Connection) Hkeys(hash []byte) bool { +func (c *connection) Hkeys(hash []byte) bool { var ( err error n int @@ -146,11 +146,11 @@ func (c *Connection) Hkeys(hash []byte) bool { return true } -func (c *Connection) Ping() bool { +func (c *connection) Ping() bool { return c.writeMessage(redisPong) } -func (c *Connection) HSpatial(hash, first, second []byte) bool { +func (c *connection) HSpatial(hash, first, second []byte) bool { var ( err error blocks <-chan Block @@ -174,16 +174,16 @@ func (c *Connection) HSpatial(hash, first, second []byte) bool { return logError(c.writeBulkString(nil)) } -func (c *Connection) writeError(err error) bool { +func (c *connection) writeError(err error) bool { logError(err) return c.writeMessage(redisError) } -func (c *Connection) writeEmptyArray() bool { +func (c *connection) writeEmptyArray() bool { return c.writeMessage(redisEmptyArray) } -func (c *Connection) writeBool(b bool) bool { +func (c *connection) writeBool(b bool) bool { if b { return c.writeMessage(redisTrue) } @@ -195,7 +195,7 @@ func redisLength(prefix byte, s int) []byte { return append(strconv.AppendInt(buf, int64(s), 10), '\r', '\n') } -func (c *Connection) writeBoolArray(arr []bool) bool { +func (c *connection) writeBoolArray(arr []bool) bool { if _, err := c.conn.Write(redisLength('*', len(arr))); err != nil { return logError(err) } @@ -207,24 +207,24 @@ func (c *Connection) writeBoolArray(arr []bool) bool { return true } -func (c *Connection) writeMessage(msg []byte) bool { +func (c *connection) writeMessage(msg []byte) bool { _, err := c.conn.Write(msg) return logError(err) } -func (c *Connection) writeOk() bool { +func (c *connection) writeOk() bool { return c.writeMessage(redisOk) } -func (c *Connection) writeQueued() bool { +func (c *connection) writeQueued() bool { return c.writeMessage(redisQueued) } -func (c *Connection) writeBlock(data []byte) bool { +func (c *connection) writeBlock(data []byte) bool { return logError(c.writeBulkString(data)) } -func (c *Connection) writeBulkString(data []byte) (err error) { +func (c *connection) writeBulkString(data []byte) (err error) { con := c.conn if data == nil { _, err = con.Write(redisNoSuchBlock) diff --git a/cmd/mtredisalize/main.go b/cmd/mtredisalize/main.go index 37c3d43..1a750ed 100644 --- a/cmd/mtredisalize/main.go +++ b/cmd/mtredisalize/main.go @@ -160,7 +160,7 @@ func main() { log.Printf("Cannot create session: %s\n", err) conn.Close() } else { - go NewConnection(conn, session, maxBulkStringSize).Run() + go newConnection(conn, session, maxBulkStringSize).run() } case <-sigChan: log.Println("Shutting down")