From d747fcf9c3d545b051e70a24dcc10320f4c954c7 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 6 May 2020 08:46:33 -0700
Subject: [PATCH] toDataQueryResponse: check arrow parse errors (#24349)

---
 .../grafana-runtime/src/utils/queryResponse.ts    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/grafana-runtime/src/utils/queryResponse.ts b/packages/grafana-runtime/src/utils/queryResponse.ts
index cea33b5addd..231774ea846 100644
--- a/packages/grafana-runtime/src/utils/queryResponse.ts
+++ b/packages/grafana-runtime/src/utils/queryResponse.ts
@@ -37,12 +37,17 @@ export function toDataQueryResponse(res: any): DataQueryResponse {
 
         if (dr.dataframes) {
           for (const b64 of dr.dataframes) {
-            const t = base64StringToArrowTable(b64);
-            const f = arrowTableToDataFrame(t);
-            if (!f.refId) {
-              f.refId = refId;
+            try {
+              const t = base64StringToArrowTable(b64);
+              const f = arrowTableToDataFrame(t);
+              if (!f.refId) {
+                f.refId = refId;
+              }
+              rsp.data.push(f);
+            } catch (err) {
+              rsp.state = LoadingState.Error;
+              rsp.error = toDataQueryError(err);
             }
-            rsp.data.push(f);
           }
         }
       }