tables: Address comment and refactor AddRecord methord

table/tables/tables.go

@@ -413,6 +413,77 @@ func (t *Table) AddRecord(ctx context.Context, r []interface{}) (recordID int64,
 	bs := kv.NewBufferStore(txn)
 	defer bs.Release()
 
+	// Insert new entries into indices.
+	h, err := t.addIndices(ctx, recordID, r, bs)
+	if err != nil {
+		return h, errors.Trace(err)
+	}
+
+	if err = t.LockRow(ctx, recordID); err != nil {
+		return 0, errors.Trace(err)
+	}
+
+	// Set public and write only column value.
+	for _, col := range t.writableCols() {
+		if col.IsPKHandleColumn(t.meta) {
+			continue
+		}
+		var value interface{}
+		if col.State == model.StateWriteOnly || col.State == model.StateWriteReorganization {
+			// if col is in write only or write reorganization state, we must add it with its default value.
+			value, _, err = GetColDefaultValue(ctx, &col.ColumnInfo)
+			if err != nil {
+				return 0, errors.Trace(err)
+			}
+			value, err = types.Convert(value, &col.FieldType)
+			if err != nil {
+				return 0, errors.Trace(err)
+			}
+		} else {
+			value = r[col.Offset]
+		}
+
+		key := t.RecordKey(recordID, col)
+		err = t.SetColValue(txn, key, value)
+		if err != nil {
+			return 0, errors.Trace(err)
+		}
+	}
+
+	if err = bs.SaveTo(txn); err != nil {
+		return 0, errors.Trace(err)
+	}
+
+	variable.GetSessionVars(ctx).AddAffectedRows(1)
+	return recordID, nil
+}
+
+// Generate index content string representation.
+func (t *Table) genIndexKeyStr(colVals []interface{}) (string, error) {
+	// Pass pre-composed error to txn.
+	strVals := make([]string, 0, len(colVals))
+	for _, cv := range colVals {
+		cvs := "NULL"
+		var err error
+		if cv != nil {
+			cvs, err = types.ToString(cv)
+			if err != nil {
+				return "", errors.Trace(err)
+			}
+		}
+		strVals = append(strVals, cvs)
+	}
+	return strings.Join(strVals, "-"), nil
+}
+
+// Add data into indices.
+func (t *Table) addIndices(ctx context.Context, recordID int64, r []interface{}, bs *kv.BufferStore) (int64, error) {
+	txn, err := ctx.GetTxn(false)
+	if err != nil {
+		return 0, errors.Trace(err)
+	}
+	// Clean up lazy check error environment
+	defer txn.DelOption(kv.PresumeKeyNotExistsError)
 	if t.meta.PKIsHandle {
 		// Check key exists.
 		recordKey := t.RecordKey(recordID, nil)
@@ -433,23 +504,14 @@ func (t *Table) AddRecord(ctx context.Context, r []interface{}) (recordID int64,
 			continue
 		}
 		colVals, _ := v.FetchValues(r)
-
+		var dupKeyErr error
 		if v.Unique || v.Primary {
-			// Pass pre-composed error to txn.
-			strVals := make([]string, 0, len(colVals))
-			for _, cv := range colVals {
-				cvs := "NULL"
-				if cv != nil {
-					cvs, err = types.ToString(cv)
-					if err != nil {
-						return 0, errors.Trace(err)
-					}
-				}
-				strVals = append(strVals, cvs)
+			entryKey, err1 := t.genIndexKeyStr(colVals)
+			if err1 != nil {
+				return 0, errors.Trace(err1)
 			}
-			entryKey := strings.Join(strVals, "-")
-			e := kv.ErrKeyExists.Gen("Duplicate entry '%s' for key '%s'", entryKey, v.Name)
-			txn.SetOption(kv.PresumeKeyNotExistsError, e)
+			dupKeyErr = kv.ErrKeyExists.Gen("Duplicate entry '%s' for key '%s'", entryKey, v.Name)
+			txn.SetOption(kv.PresumeKeyNotExistsError, dupKeyErr)
 		}
 		if err = v.X.Create(bs, colVals, recordID); err != nil {
 			if terror.ErrorEqual(err, kv.ErrKeyExists) {
@@ -463,51 +525,13 @@ func (t *Table) AddRecord(ctx context.Context, r []interface{}) (recordID int64,
 				if err1 != nil {
 					return 0, errors.Trace(err1)
 				}
-				return h, errors.Trace(err)
+				return h, errors.Trace(dupKeyErr)
 			}
 			return 0, errors.Trace(err)
 		}
 		txn.DelOption(kv.PresumeKeyNotExistsError)
 	}
-
-	if err = t.LockRow(ctx, recordID); err != nil {
-		return 0, errors.Trace(err)
-	}
-
-	// Set public and write only column value.
-	for _, col := range t.writableCols() {
-		if col.IsPKHandleColumn(t.meta) {
-			continue
-		}
-
-		var value interface{}
-		if col.State == model.StateWriteOnly || col.State == model.StateWriteReorganization {
-			// if col is in write only or write reorganization state, we must add it with its default value.
-			value, _, err = GetColDefaultValue(ctx, &col.ColumnInfo)
-			if err != nil {
-				return 0, errors.Trace(err)
-			}
-			value, err = types.Convert(value, &col.FieldType)
-			if err != nil {
-				return 0, errors.Trace(err)
-			}
-		} else {
-			value = r[col.Offset]
-		}
-
-		key := t.RecordKey(recordID, col)
-		err = t.SetColValue(txn, key, value)
-		if err != nil {
-			return 0, errors.Trace(err)
-		}
-	}
-
-	if err = bs.SaveTo(txn); err != nil {
-		return 0, errors.Trace(err)
-	}
-
-	variable.GetSessionVars(ctx).AddAffectedRows(1)
-	return recordID, nil
+	return 0, nil
 }
 
 // EncodeValue implements table.Table EncodeValue interface.