sequenceNr -> sequence

Author: methane

compress_test.go

@@ -98,8 +98,8 @@ func TestRoundtrip(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.desc, func(t *testing.T) {
-			cSend.resetSequenceNr()
-			cReceive.resetSequenceNr()
+			cSend.resetSequence()
+			cReceive.resetSequence()
 
 			uncompressed := roundtripHelper(t, cSend, cReceive, test.uncompressed)
 			if !bytes.Equal(uncompressed, test.uncompressed) {

connection.go

@@ -84,13 +84,13 @@ func (mc *mysqlConn) writeWithTimeout(b []byte) (int, error) {
 	return mc.netConn.Write(b)
 }
 
-func (mc *mysqlConn) resetSequenceNr() {
+func (mc *mysqlConn) resetSequence() {
 	mc.sequence = 0
 	mc.compressSequence = 0
 }
 
-// syncSequenceNr must be called when finished writing some packet and before start reading.
-func (mc *mysqlConn) syncSequenceNr() {
+// syncSequence must be called when finished writing some packet and before start reading.
+func (mc *mysqlConn) syncSequence() {
 	// Syncs compressionSequence to sequence.
 	// This is not documented but done in `net_flush()` in MySQL and MariaDB.
 	// https://github.com/mariadb-corporation/mariadb-connector-c/blob/8228164f850b12353da24df1b93a1e53cc5e85e9/libmariadb/ma_net.c#L170-L171

infile.go

@@ -172,7 +172,7 @@ func (mc *okHandler) handleInFileRequest(name string) (err error) {
 	if ioErr := mc.conn().writePacket(data[:4]); ioErr != nil {
 		return ioErr
 	}
-	mc.conn().syncSequenceNr()
+	mc.conn().syncSequence()
 
 	// read OK packet
 	if err == nil {

packets.go

@@ -431,7 +431,7 @@ func (mc *mysqlConn) writeAuthSwitchPacket(authData []byte) error {
 
 func (mc *mysqlConn) writeCommandPacket(command byte) error {
 	// Reset Packet Sequence
-	mc.resetSequenceNr()
+	mc.resetSequence()
 
 	data, err := mc.buf.takeSmallBuffer(4 + 1)
 	if err != nil {
@@ -447,7 +447,7 @@ func (mc *mysqlConn) writeCommandPacket(command byte) error {
 
 func (mc *mysqlConn) writeCommandPacketStr(command byte, arg string) error {
 	// Reset Packet Sequence
-	mc.resetSequenceNr()
+	mc.resetSequence()
 
 	pktLen := 1 + len(arg)
 	data, err := mc.buf.takeBuffer(pktLen + 4)
@@ -463,13 +463,13 @@ func (mc *mysqlConn) writeCommandPacketStr(command byte, arg string) error {
 
 	// Send CMD packet
 	err = mc.writePacket(data)
-	mc.syncSequenceNr()
+	mc.syncSequence()
 	return err
 }
 
 func (mc *mysqlConn) writeCommandPacketUint32(command byte, arg uint32) error {
 	// Reset Packet Sequence
-	mc.resetSequenceNr()
+	mc.resetSequence()
 
 	data, err := mc.buf.takeSmallBuffer(4 + 1 + 4)
 	if err != nil {
@@ -952,7 +952,7 @@ func (stmt *mysqlStmt) writeCommandLongData(paramID int, arg []byte) error {
 			pktLen = dataOffset + argLen
 		}
 
-		stmt.mc.resetSequenceNr()
+		stmt.mc.resetSequence()
 		// Add command byte [1 byte]
 		data[4] = comStmtSendLongData
 
@@ -976,7 +976,7 @@ func (stmt *mysqlStmt) writeCommandLongData(paramID int, arg []byte) error {
 	}
 
 	// Reset Packet Sequence
-	stmt.mc.resetSequenceNr()
+	stmt.mc.resetSequence()
 	return nil
 }
 
@@ -1001,7 +1001,7 @@ func (stmt *mysqlStmt) writeExecutePacket(args []driver.Value) error {
 	}
 
 	// Reset packet-sequence
-	mc.resetSequenceNr()
+	mc.resetSequence()
 
 	var data []byte
 	var err error
@@ -1218,7 +1218,7 @@ func (stmt *mysqlStmt) writeExecutePacket(args []driver.Value) error {
 	}
 
 	err = mc.writePacket(data)
-	mc.syncSequenceNr()
+	mc.syncSequence()
 	return err
 }