This is an automated cherry-pick of pingcap#45177

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Jul 5, 2023 · 438edcd · 438edcd
1 parent 9d4f30d
commit 438edcd
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/executor/analyze.go b/executor/analyze.go
@@ -19,9 +19,13 @@ import (
 	"context"
 	"fmt"
 	"math"
+<<<<<<< HEAD
 	"math/rand"
 	"runtime"
 	"sort"
+=======
+	"net"
+>>>>>>> db381848680 (statistic: improve ipv6 for analyze job meta (#45177))
 	"strconv"
 	"strings"
 	"sync"
@@ -387,7 +391,11 @@ func (e *AnalyzeIndexExec) fetchAnalyzeResult(ranges []*ranger.Range, isNullRang
 	if e.isCommonHandle && e.idxInfo.Primary {
 		kvReqBuilder = builder.SetHandleRangesForTables(e.ctx.GetSessionVars().StmtCtx, []int64{e.tableID.GetStatisticsID()}, true, ranges, nil)
 	} else {
+<<<<<<< HEAD
 		kvReqBuilder = builder.SetIndexRangesForTables(e.ctx.GetSessionVars().StmtCtx, []int64{e.tableID.GetStatisticsID()}, e.idxInfo.ID, ranges)
+=======
+		instance = net.JoinHostPort(serverInfo.IP, strconv.Itoa(int(serverInfo.Port)))
+>>>>>>> db381848680 (statistic: improve ipv6 for analyze job meta (#45177))
 	}
 	kvReqBuilder.SetResourceGroupTag(e.ctx.GetSessionVars().StmtCtx)
 	kvReq, err := kvReqBuilder.