vendor: update tipb (#7055)

pingcap · Jul 15, 2018 · 2945ddd · 2945ddd
1 parent 419e5cf
commit 2945ddd
Show file tree

Hide file tree

Showing 6 changed files with 1,612 additions and 662 deletions.
diff --git a/distsql/distsql_test.go b/distsql/distsql_test.go
@@ -149,7 +149,7 @@ func (s *testSuite) TestAnalyze(c *C) {
 
 	bytes, err := response.NextRaw(context.TODO())
 	c.Assert(err, IsNil)
-	c.Assert(len(bytes), Equals, 14)
+	c.Assert(len(bytes), Equals, 16)
 
 	err = response.Close()
 	c.Assert(err, IsNil)

diff --git a/distsql/stream.go b/distsql/stream.go
@@ -84,8 +84,6 @@ func (r *streamResult) readDataFromResponse(ctx context.Context, resp kv.Respons
 		r.ctx.GetSessionVars().StmtCtx.AppendWarning(terror.ClassTiKV.New(terror.ErrCode(warning.Code), warning.Msg))
 	}
 
-	// TODO: Check stream.GetEncodeType() here if we support tipb.EncodeType_TypeArrow some day.
-
 	err = result.Unmarshal(stream.Data)
 	if err != nil {
 		return false, errors.Trace(err)

diff --git a/store/mockstore/mocktikv/cop_handler_dag.go b/store/mockstore/mocktikv/cop_handler_dag.go
@@ -480,10 +480,9 @@ func (mock *mockCopStreamClient) Recv() (*coprocessor.Response, error) {
 		}
 	}
 	streamResponse := tipb.StreamResponse{
-		Error:      toPBError(err),
-		EncodeType: tipb.EncodeType_TypeDefault,
-		Data:       data,
-		Warnings:   Warnings,
+		Error:    toPBError(err),
+		Data:     data,
+		Warnings: Warnings,
 	}
 	// The counts was the output count of each executor, but now it is the scan count of each range,
 	// so we need a flag to tell them apart.

diff --git a/vendor/github.com/pingcap/tipb/go-binlog/pump.pb.go b/vendor/github.com/pingcap/tipb/go-binlog/pump.pb.go