pkg

Author: hawkingrei

pkg/planner/core/rule_collect_plan_stats.go

@@ -106,7 +106,6 @@ func RequestLoadStats(ctx base.PlanContext, neededHistItems []model.StatsLoadIte
 	if maxExecutionTime > 0 && maxExecutionTime < uint64(syncWait) {
 		syncWait = int64(maxExecutionTime)
 	}
-	logutil.BgLogger().Info("wwz")
 	failpoint.Inject("assertSyncWaitFailed", func(val failpoint.Value) {
 		if val.(bool) {
 			if syncWait != 1 {

pkg/statistics/handle/syncload/stats_syncload.go

@@ -15,7 +15,7 @@
 package syncload
 
 import (
-	"fmt"
+	stderrors "errors"
 	"math/rand"
 	"runtime"
 	"time"
@@ -94,7 +94,6 @@ func (s *statsSyncLoad) SendLoadRequests(sc *stmtctx.StatementContext, neededHis
 			}
 		}
 	})
-	logutil.BgLogger().Info("wtf start work")
 	if len(remainedItems) <= 0 {
 		return nil
 	}
@@ -302,7 +301,6 @@ func (s *statsSyncLoad) handleOneItemTask(task *statstypes.NeededItemTask) (err
 		}
 	}()
 	item := task.Item.TableItemID
-	logutil.BgLogger().Info("wtf start")
 	tbl, ok := s.statsHandle.Get(item.TableID)
 
 	if !ok {
@@ -311,7 +309,6 @@ func (s *statsSyncLoad) handleOneItemTask(task *statstypes.NeededItemTask) (err
 	is := sctx.GetDomainInfoSchema().(infoschema.InfoSchema)
 	tblInfo, ok := s.statsHandle.TableInfoByID(is, item.TableID)
 	if !ok {
-		logutil.BgLogger().Info("wtf no find")
 		return nil
 	}
 	isPkIsHandle := tblInfo.Meta().PKIsHandle
@@ -324,7 +321,6 @@ func (s *statsSyncLoad) handleOneItemTask(task *statstypes.NeededItemTask) (err
 		if index != nil {
 			wrapper.idxInfo = index.Info
 		} else {
-			logutil.BgLogger().Info("debug WTF")
 			wrapper.idxInfo = tblInfo.Meta().FindIndexByID(item.ID)
 		}
 	} else {
@@ -355,7 +351,7 @@ func (s *statsSyncLoad) handleOneItemTask(task *statstypes.NeededItemTask) (err
 	t := time.Now()
 	needUpdate := false
 	wrapper, err = s.readStatsForOneItem(sctx, item, wrapper, isPkIsHandle, task.Item.FullLoad)
-	if err != nil {
+	if err != nil || stderrors.As(err, failToGetHistMeta) {
 		return err
 	}
 	if item.IsIndex {
@@ -374,9 +370,10 @@ func (s *statsSyncLoad) handleOneItemTask(task *statstypes.NeededItemTask) (err
 	return nil
 }
 
+var failToGetHistMeta = 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) {
-	logutil.BgLogger().Info("debug readStatsForOneItem", zap.Int64("table_id", item.TableID), zap.Int64("hist_id", item.ID), zap.Bool("is_index", item.IsIndex))
 	failpoint.Inject("mockReadStatsForOnePanic", nil)
 	failpoint.Inject("mockReadStatsForOneFail", func(val failpoint.Value) {
 		if val.(bool) {
@@ -394,7 +391,8 @@ func (*statsSyncLoad) readStatsForOneItem(sctx sessionctx.Context, item model.Ta
 	if hg == nil {
 		logutil.BgLogger().Error("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))
+		// Although it is errors, we don't return err, because raise error will have to retry. it is unnecessay.
+		return nil, failToGetHistMeta
 	}
 	if item.IsIndex {
 		isIndexFlag = 1

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

@@ -723,3 +723,30 @@ 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;

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

@@ -498,3 +498,22 @@ 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;