Merge pull request #85 from ydb-platform/panic-on-reset

asmyasnikov · web-flow · commit a151d972ed3d · 2022-01-17T16:18:03.000+03:00
fix panic on result.Reset(nil)
diff --git a/internal/table/scanner/result.go b/internal/table/scanner/result.go
@@ -96,7 +96,9 @@ func NewUnary(sets []*Ydb.ResultSet, stats *Ydb_TableStats.QueryStats) UnaryResu
 
 func (r *result) Reset(set *Ydb.ResultSet, columnNames ...string) {
 	r.reset(set)
-	r.setColumnIndexes(columnNames)
+	if set != nil {
+		r.setColumnIndexes(columnNames)
+	}
 }
 
 // NextResultSet selects next result set in the result.

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,9 @@ func NewUnary(sets []Ydb.ResultSet, stats Ydb_TableStats.QueryStats) UnaryResu`
`96`	`96`
`97`	`97`	`func (r result) Reset(set Ydb.ResultSet, columnNames ...string) {`
`98`	`98`	`r.reset(set)`
`99`		`- r.setColumnIndexes(columnNames)`
	`99`	`+ if set != nil {`
	`100`	`+ r.setColumnIndexes(columnNames)`
	`101`	`+ }`
`100`	`102`	`}`
`101`	`103`
`102`	`104`	`// NextResultSet selects next result set in the result.`