*: fix typo (pingcap#101)

lightning/kv/sql2kv.go

@@ -79,7 +79,7 @@ func (kvcodec *TableKVEncoder) init(sqlMode string) error {
 		reserve := (encodeBatchRows * kvcodec.columns) << 1 // TODO : rows x ( cols + indices )
 		kvcodec.bufValues = make([]interface{}, 0, reserve)
 
-		stmtIds, err := kvcodec.makeStatments(encodeBatchRows)
+		stmtIds, err := kvcodec.makeStatements(encodeBatchRows)
 		if err != nil {
 			return errors.Trace(err)
 		}
@@ -89,10 +89,10 @@ func (kvcodec *TableKVEncoder) init(sqlMode string) error {
 	return nil
 }
 
-func (kvcodec *TableKVEncoder) makeStatments(maxRows int) ([]uint32, error) {
+func (kvcodec *TableKVEncoder) makeStatements(maxRows int) ([]uint32, error) {
 	stmtIds := make([]uint32, maxRows+1)
 	for rows := 1; rows <= maxRows; rows++ {
-		stmtID, err := kvcodec.prepareStatment(rows)
+		stmtID, err := kvcodec.prepareStatement(rows)
 		if err != nil {
 			return nil, errors.Trace(err)
 		}
@@ -109,7 +109,7 @@ func (kvcodec *TableKVEncoder) Close() error {
 
 func (kvcodec *TableKVEncoder) SQL2KV(sql string) ([]kvec.KvPair, uint64, error) {
 	if PrepareStmtMode {
-		// via prepare statment
+		// via prepare statement
 		kvPairs, rowsAffected, err := kvcodec.encodeViaPstmt([]byte(sql))
 		if err == nil {
 			return kvPairs, rowsAffected, nil
@@ -185,10 +185,10 @@ func (kvcodec *TableKVEncoder) applyStmtID(rows int) (uint32, error) {
 		return kvcodec.stmtIds[rows], nil
 	}
 
-	return kvcodec.prepareStatment(rows)
+	return kvcodec.prepareStatement(rows)
 }
 
-func (kvcodec *TableKVEncoder) prepareStatment(rows int) (uint32, error) {
+func (kvcodec *TableKVEncoder) prepareStatement(rows int) (uint32, error) {
 	stmt := sqltool.MakePrepareStatement(kvcodec.table, kvcodec.columns, rows)
 	stmtID, err := kvcodec.encoder.PrepareStmt(stmt)
 	if err != nil {

lightning/mydump/reader.go

@@ -93,8 +93,8 @@ func ExportStatement(sqlFile string, characterSet string) ([]byte, error) {
 
 		buffer = append(buffer, []byte(line)...)
 		if buffer[len(buffer)-1] == ';' {
-			statment := string(buffer)
-			if !(strings.HasPrefix(statment, "/*") && strings.HasSuffix(statment, "*/;")) {
+			statement := string(buffer)
+			if !(strings.HasPrefix(statement, "/*") && strings.HasSuffix(statement, "*/;")) {
 				data = append(data, buffer...)
 			}
 			buffer = buffer[:0]
@@ -145,7 +145,7 @@ func NewMDDataReader(file string, offset int64) (*MDDataReader, error) {
 		fsize:      fstat.Size(),
 		file:       file,
 		start:      offset,
-		stmtHeader: getInsertStatmentHeader(file),
+		stmtHeader: getInsertStatementHeader(file),
 	}
 
 	if len(mdr.stmtHeader) == 0 {
@@ -212,7 +212,7 @@ func (r *MDDataReader) currOffset() int64 {
 	return off
 }
 
-func getInsertStatmentHeader(file string) []byte {
+func getInsertStatementHeader(file string) []byte {
 	f, err := os.Open(file)
 	if err != nil {
 		common.AppLogger.Errorf("open file failed (%s) : %v", file, err)
@@ -267,7 +267,7 @@ func (r *MDDataReader) Read(minSize int64) ([][]byte, error) {
 				return
 			}
 			if sqlLen == len(r.stmtHeader) {
-				return // ps : empty sql statment without any actual values ~
+				return // ps : empty sql statement without any actual values ~
 			}
 
 			// check suffix
@@ -293,7 +293,7 @@ func (r *MDDataReader) Read(minSize int64) ([][]byte, error) {
 			(...);
 		'''
 	*/
-	var statment = make([]byte, 0, minSize+4096)
+	var statement = make([]byte, 0, minSize+4096)
 	var readSize, lineSize int64
 	var line []byte
 	var err error
@@ -317,14 +317,14 @@ func (r *MDDataReader) Read(minSize int64) ([][]byte, error) {
 				continue
 			}
 
-			if len(statment) == 0 && !bytes.HasPrefix(line, r.stmtHeader) {
-				statment = append(statment, r.stmtHeader...)
+			if len(statement) == 0 && !bytes.HasPrefix(line, r.stmtHeader) {
+				statement = append(statement, r.stmtHeader...)
 			}
-			statment = append(statment, line...)
+			statement = append(statement, line...)
 
-			if statment[len(statment)-1] == ';' {
-				appendSQL(statment)
-				statment = make([]byte, 0, minSize+4096)
+			if statement[len(statement)-1] == ';' {
+				appendSQL(statement)
+				statement = make([]byte, 0, minSize+4096)
 			}
 		}
 
@@ -335,8 +335,8 @@ func (r *MDDataReader) Read(minSize int64) ([][]byte, error) {
 		}
 	}
 
-	if len(statment) > 0 {
-		appendSQL(statment)
+	if len(statement) > 0 {
+		appendSQL(statement)
 	}
 
 	return stmts, nil

lightning/sql/parser_test.go

@@ -172,12 +172,12 @@ func (s *testParserSuite) testParseRealFile(c *C) {
 			defer reader.Close()
 
 			for {
-				statments, err := reader.Read(4 * 1024)
+				statements, err := reader.Read(4 * 1024)
 				if errors.Cause(err) == io.EOF {
 					break
 				}
 
-				for _, sql := range statments {
+				for _, sql := range statements {
 					sql2storage(c, sql, store)
 				}
 			}