This is an automated cherry-pick of pingcap#56614

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

Author: hawkingrei

pkg/statistics/handle/syncload/stats_syncload.go

@@ -15,7 +15,7 @@
 package syncload
 
 import (
-	"fmt"
+	stderrors "errors"
 	"math/rand"
 	"time"
 
@@ -77,7 +77,6 @@ func (s *statsSyncLoad) SendLoadRequests(sc *stmtctx.StatementContext, neededHis
 			}
 		}
 	})
-
 	if len(remainedItems) <= 0 {
 		return nil
 	}
@@ -323,7 +322,14 @@ func (s *statsSyncLoad) handleOneItemTask(task *statstypes.NeededItemTask) (err
 	}
 	t := time.Now()
 	needUpdate := false
+<<<<<<< HEAD
 	wrapper, err = s.readStatsForOneItem(sctx, item, wrapper, tbl.IsPkIsHandle, task.Item.FullLoad)
+=======
+	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))
 	if err != nil {
 		return err
 	}
@@ -343,6 +349,8 @@ func (s *statsSyncLoad) handleOneItemTask(task *statstypes.NeededItemTask) (err
 	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 (*statsSyncLoad) readStatsForOneItem(sctx sessionctx.Context, item model.TableItemID, w *statsWrapper, isPkIsHandle bool, fullLoad bool) (*statsWrapper, error) {
 	failpoint.Inject("mockReadStatsForOnePanic", nil)
@@ -360,9 +368,9 @@ func (*statsSyncLoad) readStatsForOneItem(sctx sessionctx.Context, item model.Ta
 		return nil, err
 	}
 	if hg == nil {
-		logutil.BgLogger().Error("fail to get hist meta for this histogram, possibly a deleted one", zap.Int64("table_id", item.TableID),
+		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, errors.Trace(fmt.Errorf("fail to get hist meta for this histogram, table_id:%v, hist_id:%v, is_index:%v", item.TableID, item.ID, item.IsIndex))
+		return nil, errGetHistMeta
 	}
 	if item.IsIndex {
 		isIndexFlag = 1

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

@@ -681,6 +681,7 @@ JOIN tceb7972c ON tceb7972c.col_19 = t61a85298.col_71
 WHERE 16739493649928310215 MEMBER OF (derived_table.col_60767)
 OR NOT (JSON_CONTAINS(derived_table.col_60767, '6019730272580550835'));
 id	estRows	task	access object	operator info
+<<<<<<< HEAD
 Projection_12	10000.00	root		1->Column#19
 └─HashJoin_13	10000.00	root		inner join, equal:[eq(planner__core__issuetest__planner_issue.tceb7972c.col_19, Column#20)]
   ├─Projection_19(Build)	10000.00	root		cast(planner__core__issuetest__planner_issue.t61a85298.col_71, double BINARY)->Column#20
@@ -691,3 +692,45 @@ Projection_12	10000.00	root		1->Column#19
       └─Selection_17	8000.00	cop[tikv]		or(json_memberof(cast(16739493649928310215, json BINARY), planner__core__issuetest__planner_issue.tceb7972c.col_17), not(istrue_with_null(json_contains(planner__core__issuetest__planner_issue.tceb7972c.col_17, cast("6019730272580550835", json BINARY)))))
         └─TableFullScan_16	10000.00	cop[tikv]	table:tceb7972c	keep order:false, stats:pseudo
 set @@tidb_enable_global_index=0;
+=======
+Projection_11	6.00	root		1->Column#18
+└─HashJoin_13	6.00	root		inner join, equal:[eq(test.tceb7972c.col_19, Column#19)]
+  ├─TableReader_16(Build)	4.80	root	partition:all	data:Selection_15
+  │ └─Selection_15	4.80	cop[tikv]		or(json_memberof(cast(16739493649928310215, json BINARY), test.tceb7972c.col_17), not(istrue_with_null(json_contains(test.tceb7972c.col_17, cast("6019730272580550835", json BINARY)))))
+  │   └─TableFullScan_14	6.00	cop[tikv]	table:tceb7972c	keep order:false, stats:partial[col_17:missing]
+  └─Projection_17(Probe)	10000.00	root		cast(test.t61a85298.col_71, double BINARY)->Column#19
+    └─TableReader_19	10000.00	root		data:TableFullScan_18
+      └─TableFullScan_18	10000.00	cop[tikv]	table:t61a85298	keep order:false, stats:pseudo
+drop table if exists t0, t1;
+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
+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

@@ -477,4 +477,32 @@ FROM (
 ) AS derived_table
 WHERE 16739493649928310215 MEMBER OF (derived_table.col_60767)
    OR NOT (JSON_CONTAINS(derived_table.col_60767, '6019730272580550835'));
+<<<<<<< HEAD
 set @@tidb_enable_global_index=0;
+=======
+
+# TestIssue53766
+drop table if exists t0, t1;
+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));
+
+# 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))