This is an automated cherry-pick of pingcap#56614

Signed-off-by: ti-chi-bot <[email protected]>

Author: hawkingrei

pkg/statistics/handle/handle_hist.go

@@ -15,7 +15,7 @@
 package handle
 
 import (
-	"fmt"
+	stderrors "errors"
 	"math/rand"
 	"sync"
 	"time"
@@ -80,7 +80,6 @@ func (h *Handle) SendLoadRequests(sc *stmtctx.StatementContext, neededHistItems
 			}
 		}
 	})
-
 	if len(remainedItems) <= 0 {
 		return nil
 	}
@@ -326,7 +325,14 @@ func (h *Handle) handleOneItemTask(task *NeededItemTask) (err error) {
 	failpoint.Inject("handleOneItemTaskPanic", nil)
 	t := time.Now()
 	needUpdate := false
+<<<<<<< HEAD:pkg/statistics/handle/handle_hist.go
 	wrapper, err = h.readStatsForOneItem(sctx, item, wrapper)
+=======
+	wrapper, err = s.readStatsForOneItem(sctx, item, wrapper, isPkIsHandle, task.Item.FullLoad)
+	if stderrors.Is(err, errGetHistMeta) {
+		return nil
+	}
+>>>>>>> 10647c9d733 (statstics: avoid unnecessary try when to sync load (#56614)):pkg/statistics/handle/syncload/stats_syncload.go
 	if err != nil {
 		return err
 	}
@@ -346,6 +352,8 @@ func (h *Handle) handleOneItemTask(task *NeededItemTask) (err error) {
 	return nil
 }
 
+var errGetHistMeta = errors.New("fail to get hist meta")
+
 // readStatsForOneItem reads hist for one column/index, TODO load data via kv-get asynchronously
 func (h *Handle) readStatsForOneItem(sctx sessionctx.Context, item model.TableItemID, w *statsWrapper) (*statsWrapper, error) {
 	failpoint.Inject("mockReadStatsForOnePanic", nil)
@@ -360,6 +368,18 @@ func (h *Handle) readStatsForOneItem(sctx sessionctx.Context, item model.TableIt
 	var hg *statistics.Histogram
 	var err error
 	isIndexFlag := int64(0)
+<<<<<<< HEAD:pkg/statistics/handle/handle_hist.go
+=======
+	hg, lastAnalyzePos, statsVer, flag, err := storage.HistMetaFromStorageWithHighPriority(sctx, &item, w.colInfo)
+	if err != nil {
+		return nil, err
+	}
+	if hg == nil {
+		logutil.BgLogger().Warn("fail to get hist meta for this histogram, possibly a deleted one", zap.Int64("table_id", item.TableID),
+			zap.Int64("hist_id", item.ID), zap.Bool("is_index", item.IsIndex))
+		return nil, errGetHistMeta
+	}
+>>>>>>> 10647c9d733 (statstics: avoid unnecessary try when to sync load (#56614)):pkg/statistics/handle/syncload/stats_syncload.go
 	if item.IsIndex {
 		isIndexFlag = 1
 	}

tests/integrationtest/r/planner/core/issuetest/planner_issue.result

@@ -582,6 +582,7 @@ CREATE TABLE t0(c0 int);
 CREATE TABLE t1(c0 int);
 SELECT t0.c0, t1.c0 FROM t0 NATURAL JOIN t1 WHERE '1' AND (t0.c0 IN (SELECT c0 FROM t0));
 c0	c0
+<<<<<<< HEAD
 drop table if exists t;
 create table t (id int unique key, c int);
 insert into t values (1, 10);
@@ -592,3 +593,32 @@ _tidb_rowid
 1
 2
 3
+=======
+drop table if exists t1, t2, t3, t4;
+CREATE TABLE t1 (a int, b int, c int);
+CREATE TABLE t2 (a int, b int, c int);
+CREATE TABLE t3 (a int, b int, c int);
+CREATE TABLE t4 (a int, b int, c int);
+INSERT INTO t1 VALUES (1,3,0), (2,2,0), (3,2,0);
+INSERT INTO t2 VALUES (3,3,0), (4,2,0), (5,3,0);
+INSERT INTO t3 VALUES (1,2,0), (2,2,0);
+INSERT INTO t4 VALUES (3,2,0), (4,2,0);
+CREATE INDEX idx_b ON t2(b);
+SELECT t2.a,t2.b,t3.a,t3.b,t4.a,t4.b
+FROM (t3,t4)
+LEFT JOIN
+(t1,t2)
+ON t3.a=1 AND t3.b=t2.b AND t2.b=t4.b order by 1, 2, 3, 4, 5;
+a	b	a	b	a	b
+NULL	NULL	2	2	3	2
+NULL	NULL	2	2	4	2
+4	2	1	2	3	2
+4	2	1	2	3	2
+4	2	1	2	3	2
+4	2	1	2	4	2
+4	2	1	2	4	2
+4	2	1	2	4	2
+show warnings;
+Level	Code	Message
+drop table if exists t1, t2, t3, t4;
+>>>>>>> 10647c9d733 (statstics: avoid unnecessary try when to sync load (#56614))

tests/integrationtest/t/planner/core/issuetest/planner_issue.test

@@ -453,10 +453,31 @@ CREATE TABLE t0(c0 int);
 CREATE TABLE t1(c0 int);
 SELECT t0.c0, t1.c0 FROM t0 NATURAL JOIN t1 WHERE '1' AND (t0.c0 IN (SELECT c0 FROM t0));
 
+<<<<<<< HEAD
 # TestIssue58581
 drop table if exists t;
 create table t (id int unique key, c int);
 insert into t values (1, 10);
 insert into t values (2, 20);
 insert into t values (3, 30);
 select _tidb_rowid from t where id in (1, 2, 3);
+=======
+# TestIssue56472
+drop table if exists t1, t2, t3, t4;
+CREATE TABLE t1 (a int, b int, c int);
+CREATE TABLE t2 (a int, b int, c int);
+CREATE TABLE t3 (a int, b int, c int);
+CREATE TABLE t4 (a int, b int, c int);
+INSERT INTO t1 VALUES (1,3,0), (2,2,0), (3,2,0);
+INSERT INTO t2 VALUES (3,3,0), (4,2,0), (5,3,0);
+INSERT INTO t3 VALUES (1,2,0), (2,2,0);
+INSERT INTO t4 VALUES (3,2,0), (4,2,0);
+CREATE INDEX idx_b ON t2(b);
+SELECT t2.a,t2.b,t3.a,t3.b,t4.a,t4.b
+  FROM (t3,t4)
+       LEFT JOIN
+       (t1,t2)
+       ON t3.a=1 AND t3.b=t2.b AND t2.b=t4.b order by 1, 2, 3, 4, 5;
+show warnings;
+drop table if exists t1, t2, t3, t4;
+>>>>>>> 10647c9d733 (statstics: avoid unnecessary try when to sync load (#56614))