*: add the error check (#8770) (#8806)

pingcap · Dec 25, 2018 · fcd6d7d · fcd6d7d
1 parent 305a083
commit fcd6d7d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/ddl/ddl_worker_test.go b/ddl/ddl_worker_test.go
@@ -633,6 +633,7 @@ func (s *testDDLSuite) TestCancelJob(c *C) {
 		Options: []*ast.ColumnOption{},
 	}
 	col, _, err := buildColumnAndConstraint(ctx, 2, newColumnDef)
+	c.Assert(err, IsNil)
 	addColumnArgs := []interface{}{col, &ast.ColumnPosition{Tp: ast.ColumnPositionNone}, 0}
 	doDDLJobErrWithSchemaState(ctx, d, c, dbInfo.ID, tblInfo.ID, model.ActionAddColumn, addColumnArgs, &cancelState)
 	c.Check(errors.ErrorStack(checkErr), Equals, "")

diff --git a/privilege/privileges/privileges_test.go b/privilege/privileges/privileges_test.go
@@ -230,7 +230,6 @@ func (s *testPrivilegeSuite) TestShowGrants(c *C) {
 	c.Assert(err, IsNil)
 	// It should not be "GRANT ON `te%`.* to 'show'@'localhost'"
 	c.Assert(gs, HasLen, 0)
-
 }
 
 func (s *testPrivilegeSuite) TestDropTablePriv(c *C) {

diff --git a/store/tikv/gcworker/gc_worker_test.go b/store/tikv/gcworker/gc_worker_test.go
@@ -86,6 +86,7 @@ func (s *testGCWorkerSuite) TestPrepareGC(c *C) {
 	close(s.gcWorker.done)
 	ok, _, err := s.gcWorker.prepare()
 	c.Assert(err, IsNil)
+	c.Assert(ok, IsFalse)
 	lastRun, err := s.gcWorker.loadTime(gcLastRunTimeKey, s.gcWorker.session)
 	c.Assert(err, IsNil)
 	c.Assert(lastRun, NotNil)

diff --git a/util/admin/admin_test.go b/util/admin/admin_test.go
@@ -265,10 +265,10 @@ func (s *testSuite) TestScan(c *C) {
 	idxRow2 := &RecordData{Handle: int64(2), Values: types.MakeDatums(int64(20))}
 	kvIndex := tables.NewIndex(tb.Meta(), indices[0].Meta())
 	sc := &stmtctx.StatementContext{TimeZone: time.Local}
-	idxRows, nextVals, err := ScanIndexData(sc, txn, kvIndex, idxRow1.Values, 2)
+	idxRows, _, err := ScanIndexData(sc, txn, kvIndex, idxRow1.Values, 2)
 	c.Assert(err, IsNil)
 	c.Assert(idxRows, DeepEquals, []*RecordData{idxRow1, idxRow2})
-	idxRows, nextVals, err = ScanIndexData(sc, txn, kvIndex, idxRow1.Values, 1)
+	idxRows, nextVals, err := ScanIndexData(sc, txn, kvIndex, idxRow1.Values, 1)
 	c.Assert(err, IsNil)
 	c.Assert(idxRows, DeepEquals, []*RecordData{idxRow1})
 	idxRows, nextVals, err = ScanIndexData(sc, txn, kvIndex, nextVals, 1)

diff --git a/util/ranger/detacher.go b/util/ranger/detacher.go
@@ -298,7 +298,7 @@ func DetachSimpleCondAndBuildRangeForIndex(sctx sessionctx.Context, conditions [
 		newTpSlice = append(newTpSlice, newFieldType(col.RetType))
 	}
 	ranges, accessConds, _, _, err = detachCNFCondAndBuildRangeForIndex(sctx, conditions, cols, newTpSlice, lengths, false)
-	return ranges, accessConds, nil
+	return ranges, accessConds, errors.Trace(err)
 }
 
 func removeAccessConditions(conditions, accessConds []expression.Expression) []expression.Expression {