fix integration test

pingcap · Mar 15, 2021 · 45de1c3 · 45de1c3
1 parent cb0846c
commit 45de1c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -4851,9 +4851,9 @@ func (s *testSplitTable) TestClusterIndexSplitTableIntegration(c *C) {
 	tk.MustGetErrMsg("split table t between ('aaa', 0.0) and (100.0, 'aaa') regions 10;", errMsg)
 
 	// lower bound >= upper bound.
-	errMsg = "Split table `t` region lower value (aaa,0) should less than the upper value (aaa,0)"
+	errMsg = "[executor:8212]Failed to split region ranges: Split table `t` region lower value (aaa,0) should less than the upper value (aaa,0)"
 	tk.MustGetErrMsg("split table t between ('aaa', 0.0) and ('aaa', 0.0) regions 10;", errMsg)
-	errMsg = "Split table `t` region lower value (bbb,0) should less than the upper value (aaa,0)"
+	errMsg = "[executor:8212]Failed to split region ranges: Split table `t` region lower value (bbb,0) should less than the upper value (aaa,0)"
 	tk.MustGetErrMsg("split table t between ('bbb', 0.0) and ('aaa', 0.0) regions 10;", errMsg)
 
 	// Exceed limit 1000.

diff --git a/executor/split.go b/executor/split.go
@@ -237,13 +237,8 @@ func (e *SplitIndexRegionExec) getSplitIdxPhysicalKeysFromBound(physicalID int64
 	}
 
 	if bytes.Compare(lowerIdxKey, upperIdxKey) >= 0 {
-		lowerStr, err1 := datumSliceToString(e.lower)
-		upperStr, err2 := datumSliceToString(e.upper)
-		if err1 != nil || err2 != nil {
-			errMsg := fmt.Sprintf("Split index `%v` region lower value %v should less than the upper value %v",
-				e.indexInfo.Name, e.lower, e.upper)
-			return nil, ErrInvalidSplitRegionRanges.GenWithStackByArgs(errMsg)
-		}
+		lowerStr := datumSliceToString(e.lower)
+		upperStr := datumSliceToString(e.upper)
 		errMsg := fmt.Sprintf("Split index `%v` region lower value %v should less than the upper value %v",
 			e.indexInfo.Name, lowerStr, upperStr)
 		return nil, ErrInvalidSplitRegionRanges.GenWithStackByArgs(errMsg)
@@ -307,20 +302,20 @@ func getUint64FromBytes(bs []byte, pad byte) uint64 {
 	return binary.BigEndian.Uint64(buf)
 }
 
-func datumSliceToString(ds []types.Datum) (string, error) {
+func datumSliceToString(ds []types.Datum) string {
 	str := "("
 	for i, d := range ds {
 		s, err := d.ToString()
 		if err != nil {
-			return str, err
+			return fmt.Sprintf("%v", ds)
 		}
 		if i > 0 {
 			str += ","
 		}
 		str += s
 	}
 	str += ")"
-	return str, nil
+	return str
 }
 
 // SplitTableRegionExec represents a split table regions executor.
@@ -602,13 +597,8 @@ func (e *SplitTableRegionExec) getSplitTablePhysicalKeysFromBound(physicalID int
 		return nil, err
 	}
 	if lowerHandle.Compare(upperHandle) >= 0 {
-		lowerStr, err1 := datumSliceToString(e.lower)
-		upperStr, err2 := datumSliceToString(e.upper)
-		if err1 != nil || err2 != nil {
-			errMsg := fmt.Sprintf("Split table `%v` region lower value %v should less than the upper value %v",
-				e.tableInfo.Name.O, e.lower, e.upper)
-			return nil, ErrInvalidSplitRegionRanges.GenWithStackByArgs(errMsg)
-		}
+		lowerStr := datumSliceToString(e.lower)
+		upperStr := datumSliceToString(e.upper)
 		errMsg := fmt.Sprintf("Split table `%v` region lower value %v should less than the upper value %v",
 			e.tableInfo.Name.O, lowerStr, upperStr)
 		return nil, ErrInvalidSplitRegionRanges.GenWithStackByArgs(errMsg)