fix: fix not show plan issue (#1748) (#1750)

pingcap · Nov 4, 2024 · 7d37156 · 7d37156
1 parent 00b8142
commit 7d37156
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/pkg/apiserver/slowquery/service.go b/pkg/apiserver/slowquery/service.go
@@ -109,13 +109,15 @@ func (s *Service) getDetails(c *gin.Context) {
 	// See: https://github.com/pingcap/tidb-dashboard/issues/1515
 	if result.BinaryPlan != "" {
 		// may failed but it's ok
-		result.BinaryPlanText, _ = utils.GenerateBinaryPlanText(db, result.BinaryPlan)
+		result.BinaryPlanText, err = utils.GenerateBinaryPlanText(db, result.BinaryPlan)
 		// may failed but it's ok
 		result.BinaryPlanJSON, _ = utils.GenerateBinaryPlanJSON(result.BinaryPlan)
 
-		// reduce response size
-		result.BinaryPlan = ""
-		result.Plan = ""
+		if err == nil {
+			// reduce response size
+			result.BinaryPlan = ""
+			result.Plan = ""
+		}
 	}
 
 	c.JSON(http.StatusOK, *result)

diff --git a/pkg/apiserver/statement/service.go b/pkg/apiserver/statement/service.go
@@ -237,13 +237,15 @@ func (s *Service) planDetailHandler(c *gin.Context) {
 
 	if result.AggBinaryPlan != "" {
 		// may failed but it's ok
-		result.BinaryPlanText, _ = utils.GenerateBinaryPlanText(db, result.AggBinaryPlan)
+		result.BinaryPlanText, err = utils.GenerateBinaryPlanText(db, result.AggBinaryPlan)
 		// may failed but it's ok
 		result.BinaryPlanJSON, _ = utils.GenerateBinaryPlanJSON(result.AggBinaryPlan)
 
-		// reduce response size
-		result.AggBinaryPlan = ""
-		result.AggPlan = ""
+		if err == nil {
+			// reduce response size
+			result.AggBinaryPlan = ""
+			result.AggPlan = ""
+		}
 	}
 
 	c.JSON(http.StatusOK, result)

diff --git a/ui/packages/tidb-dashboard-lib/src/apps/SlowQuery/pages/Detail/index.tsx b/ui/packages/tidb-dashboard-lib/src/apps/SlowQuery/pages/Detail/index.tsx
@@ -170,7 +170,7 @@ function DetailPage() {
                     )
                 })()}
               </Descriptions>
-              {(binaryPlanObj || !!data.plan) && (
+              {(!!data.binary_plan_text || !!data.plan) && (
                 <>
                   <Space size="middle" style={{ color: '#8c8c8c' }}>
                     {t('slow_query.detail.plan.title')}

diff --git a/ui/packages/tidb-dashboard-lib/src/apps/Statement/pages/Detail/PlanDetail.tsx b/ui/packages/tidb-dashboard-lib/src/apps/Statement/pages/Detail/PlanDetail.tsx
@@ -175,7 +175,7 @@ function PlanDetail({ query }: IPlanDetailProps) {
               ) : null}
             </Descriptions>
 
-            {(binaryPlanObj || !!data.plan) && (
+            {(!!data.binary_plan_text || !!data.plan) && (
               <>
                 <Space size="middle" style={{ color: '#8c8c8c' }}>
                   {t('statement.pages.detail.desc.plans.execution.title')}