fix typo

Author: methane

compress.go

@@ -128,10 +128,10 @@ func (c *compressor) uncompressPacket() error {
 		fmt.Fprintf(os.Stderr, "uncompress cmplen=%v uncomplen=%v seq=%v\n",
 			comprLength, uncompressedLength, compressionSequence)
 	}
-	if compressionSequence != c.mc.compresSequence {
+	if compressionSequence != c.mc.compressSequence {
 		return ErrPktSync
 	}
-	c.mc.compresSequence++
+	c.mc.compressSequence++
 
 	comprData, err := c.mc.buf.readNext(comprLength)
 	if err != nil {
@@ -214,15 +214,15 @@ func (c *compressor) writeCompressedPacket(data []byte, uncompressedLen int) err
 		c.mc.cfg.Logger.Print(
 			fmt.Sprintf(
 				"writeCompressedPacket: comprLength=%v, uncompressedLen=%v, seq=%v",
-				comprLength, uncompressedLen, c.mc.compresSequence))
+				comprLength, uncompressedLen, c.mc.compressSequence))
 	}
 
 	// compression header
 	data[0] = byte(0xff & comprLength)
 	data[1] = byte(0xff & (comprLength >> 8))
 	data[2] = byte(0xff & (comprLength >> 16))
 
-	data[3] = c.mc.compresSequence
+	data[3] = c.mc.compressSequence
 
 	// this value is never greater than maxPayloadLength
 	data[4] = byte(0xff & uncompressedLen)
@@ -234,6 +234,6 @@ func (c *compressor) writeCompressedPacket(data []byte, uncompressedLen int) err
 		return err
 	}
 
-	c.mc.compresSequence++
+	c.mc.compressSequence++
 	return nil
 }

compress_test.go

@@ -38,7 +38,7 @@ func newMockBuf(data []byte) buffer {
 func compressHelper(t *testing.T, mc *mysqlConn, uncompressedPacket []byte) []byte {
 	// get status variables
 
-	cs := mc.compresSequence
+	cs := mc.compressSequence
 
 	var b bytes.Buffer
 	cw := newCompressor(mc, &b)
@@ -54,13 +54,13 @@ func compressHelper(t *testing.T, mc *mysqlConn, uncompressedPacket []byte) []by
 	}
 
 	if len(uncompressedPacket) > 0 {
-		if mc.compresSequence != (cs + 1) {
-			t.Fatalf("mc.compressionSequence updated incorrectly, expected %d and saw %d", (cs + 1), mc.compresSequence)
+		if mc.compressSequence != (cs + 1) {
+			t.Fatalf("mc.compressionSequence updated incorrectly, expected %d and saw %d", (cs + 1), mc.compressSequence)
 		}
 
 	} else {
-		if mc.compresSequence != cs {
-			t.Fatalf("mc.compressionSequence updated incorrectly for case of empty write, expected %d and saw %d", cs, mc.compresSequence)
+		if mc.compressSequence != cs {
+			t.Fatalf("mc.compressionSequence updated incorrectly for case of empty write, expected %d and saw %d", cs, mc.compressSequence)
 		}
 	}
 
@@ -70,7 +70,7 @@ func compressHelper(t *testing.T, mc *mysqlConn, uncompressedPacket []byte) []by
 // uncompressHelper uncompresses compressedPacket and checks state variables
 func uncompressHelper(t *testing.T, mc *mysqlConn, compressedPacket []byte, expSize int) []byte {
 	// get status variables
-	cs := mc.compresSequence
+	cs := mc.compressSequence
 
 	// mocking out buf variable
 	mc.buf = newMockBuf(compressedPacket)
@@ -84,12 +84,12 @@ func uncompressHelper(t *testing.T, mc *mysqlConn, compressedPacket []byte, expS
 	}
 
 	if expSize > 0 {
-		if mc.compresSequence != (cs + 1) {
-			t.Fatalf("mc.compressionSequence updated incorrectly, expected %d and saw %d", (cs + 1), mc.compresSequence)
+		if mc.compressSequence != (cs + 1) {
+			t.Fatalf("mc.compressionSequence updated incorrectly, expected %d and saw %d", (cs + 1), mc.compressSequence)
 		}
 	} else {
-		if mc.compresSequence != cs {
-			t.Fatalf("mc.compressionSequence updated incorrectly for case of empty read, expected %d and saw %d", cs, mc.compresSequence)
+		if mc.compressSequence != cs {
+			t.Fatalf("mc.compressionSequence updated incorrectly for case of empty read, expected %d and saw %d", cs, mc.compressSequence)
 		}
 	}
 	return uncompressedPacket

connection.go

@@ -35,7 +35,7 @@ type mysqlConn struct {
 	flags            clientFlag
 	status           statusFlag
 	sequence         uint8
-	compresSequence  uint8
+	compressSequence uint8
 	parseTime        bool
 	compress         bool
 
@@ -54,7 +54,7 @@ type packetReader interface {
 
 func (mc *mysqlConn) resetSequenceNr() {
 	mc.sequence = 0
-	mc.compresSequence = 0
+	mc.compressSequence = 0
 }
 
 // syncSequenceNr must be called when finished writing some packet and before start reading.
@@ -64,7 +64,7 @@ func (mc *mysqlConn) syncSequenceNr() {
 	// https://github.com/mariadb-corporation/mariadb-connector-c/blob/8228164f850b12353da24df1b93a1e53cc5e85e9/libmariadb/ma_net.c#L170-L171
 	// https://github.com/mysql/mysql-server/blob/824e2b4064053f7daf17d7f3f84b7a3ed92e5fb4/sql-common/net_serv.cc#L293
 	if mc.compress {
-		mc.sequence = mc.compresSequence
+		mc.sequence = mc.compressSequence
 	}
 }