Merge #38949

38949: exec: catch panics coming from CFetcher and columnarizer r=yuzefovich a=yuzefovich Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
cockroachdb · Jul 18, 2019 · 6d644df · 6d644df
2 parents 729a7bc + 5ae858a
commit 6d644df
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/sql/exec/error.go b/pkg/sql/exec/error.go
@@ -80,6 +80,8 @@ func CatchVectorizedRuntimeError(operation func()) (retErr error) {
 const (
 	execPackagePrefix  = "github.com/cockroachdb/cockroach/pkg/sql/exec"
 	colBatchScanPrefix = "github.com/cockroachdb/cockroach/pkg/sql/distsqlrun.(*colBatchScan)"
+	cFetcherPrefix     = "github.com/cockroachdb/cockroach/pkg/sql/row.(*CFetcher)"
+	columnarizerPrefix = "github.com/cockroachdb/cockroach/pkg/sql/distsqlrun.(*columnarizer)"
 )
 
 // isPanicFromVectorizedEngine checks whether the panic that was emitted from
@@ -88,7 +90,9 @@ const (
 // panicEmittedFrom must be trimmed to not have any white spaces in the prefix.
 func isPanicFromVectorizedEngine(panicEmittedFrom string) bool {
 	return strings.HasPrefix(panicEmittedFrom, execPackagePrefix) ||
-		strings.HasPrefix(panicEmittedFrom, colBatchScanPrefix)
+		strings.HasPrefix(panicEmittedFrom, colBatchScanPrefix) ||
+		strings.HasPrefix(panicEmittedFrom, cFetcherPrefix) ||
+		strings.HasPrefix(panicEmittedFrom, columnarizerPrefix)
 }
 
 // TestVectorizedErrorEmitter is an Operator that panics on every odd-numbered