fix bug: panic when executing some time-consuming sql task, the resp.… (#28)

liracle · xieli · web-flow · commit c564157a8512 · 2020-12-28T09:08:25.000+05:30
* bugfix: panic when executing some time-consuming sql task, the resp.Results that  function(operation.go) return is nil

* bugfix: fix blocking when caller context is emptyContext

* panic bugfix, check resp.Results nil in length function

Co-authored-by: xieli &lt;xieli@tencent.com&gt;
diff --git a/hive/result_set.go b/hive/result_set.go
@@ -107,6 +107,9 @@ func value(col *cli_service.TColumn, cd *ColDesc, i int) (interface{}, error) {
 }
 
 func length(rs *cli_service.TRowSet) int {
+	if rs == nil {
+		return 0
+	}
 	for _, col := range rs.Columns {
 		if col.BoolVal != nil {
 			return len(col.BoolVal.Values)

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,9 @@ func value(col cli_service.TColumn, cd ColDesc, i int) (interface{}, error) {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`func length(rs *cli_service.TRowSet) int {`
	`110`	`+ if rs == nil {`
	`111`	`+ return 0`
	`112`	`+ }`
`110`	`113`	`for _, col := range rs.Columns {`
`111`	`114`	`if col.BoolVal != nil {`
`112`	`115`	`return len(col.BoolVal.Values)`