From 0c3971e57371a3c8ee7a2a8cfa93a005cba9da77 Mon Sep 17 00:00:00 2001 From: Yuanjia Zhang Date: Wed, 5 Aug 2020 14:11:06 +0800 Subject: [PATCH] cherry pick #18543 to release-3.0 Signed-off-by: ti-srebot --- cmd/explaintest/r/explain_union_scan.result | 20 ++++++++++++ planner/core/cbo_test.go | 6 ++++ planner/core/testdata/analyze_suite_out.json | 13 ++++++++ statistics/handle/update_test.go | 4 +-- statistics/histogram.go | 12 +++++-- statistics/selectivity_test.go | 34 ++++++++++++++++++-- statistics/table.go | 26 +++++++++++---- 7 files changed, 101 insertions(+), 14 deletions(-) diff --git a/cmd/explaintest/r/explain_union_scan.result b/cmd/explaintest/r/explain_union_scan.result index 75b1e85280c52..dc2bd657b3549 100644 --- a/cmd/explaintest/r/explain_union_scan.result +++ b/cmd/explaintest/r/explain_union_scan.result @@ -11,6 +11,7 @@ insert into city values("06766b3ef41d484d8878606393f1ed0b", 88, "chongqing", "ch begin; update city set province_id = 77 where id="06766b3ef41d484d8878606393f1ed0b"; explain select t1.*, t2.province_id as provinceID, t2.city_name as cityName, t3.description as description from city t1 inner join city t2 on t1.id = t2.id left join city t3 on t1.province_id = t3.province_id where t1.province_id > 1 and t1.province_id < 100 limit 10; +<<<<<<< HEAD id count task operator info Projection_17 10.00 root test.t1.id, test.t1.province_id, test.t1.city_name, test.t1.description, test.t2.province_id, test.t2.city_name, test.t3.description └─Limit_20 10.00 root offset:0, count:10 @@ -29,4 +30,23 @@ Projection_17 10.00 root test.t1.id, test.t1.province_id, test.t1.city_name, tes └─TableReader_55 519304.44 root data:Selection_54 └─Selection_54 519304.44 cop gt(test.t3.province_id, 1), lt(test.t3.province_id, 100), not(isnull(test.t3.province_id)) └─TableScan_53 536284.00 cop table:city, range:[-inf,+inf], keep order:false +======= +id estRows task access object operator info +Limit_20 10.00 root offset:0, count:10 +└─HashJoin_22 10.00 root left outer join, equal:[eq(test.city.province_id, test.city.province_id)] + ├─Limit_25(Build) 10.00 root offset:0, count:10 + │ └─IndexJoin_38 10.00 root inner join, inner:UnionScan_37, outer key:test.city.id, inner key:test.city.id + │ ├─UnionScan_47(Build) 10.00 root + │ │ └─TableReader_49 10.00 root data:TableFullScan_48 + │ │ └─TableFullScan_48 10.00 cop[tikv] table:t2 keep order:false + │ └─UnionScan_37(Probe) 1.00 root gt(test.city.province_id, 1), lt(test.city.province_id, 100) + │ └─IndexLookUp_36 1.00 root + │ ├─IndexRangeScan_33(Build) 1.00 cop[tikv] table:t1, index:PRIMARY(id) range: decided by [eq(test.city.id, test.city.id)], keep order:false + │ └─Selection_35(Probe) 1.00 cop[tikv] gt(test.city.province_id, 1), lt(test.city.province_id, 100) + │ └─TableRowIDScan_34 1.00 cop[tikv] table:t1 keep order:false + └─UnionScan_57(Probe) 536284.00 root gt(test.city.province_id, 1), lt(test.city.province_id, 100), not(isnull(test.city.province_id)) + └─TableReader_60 536284.00 root data:Selection_59 + └─Selection_59 536284.00 cop[tikv] gt(test.city.province_id, 1), lt(test.city.province_id, 100), not(isnull(test.city.province_id)) + └─TableFullScan_58 536284.00 cop[tikv] table:t3 keep order:false +>>>>>>> aeee152... planner: fix the inappropriate heuristic rule to estimate the EQ selectivity when out of range (#18543) commit; diff --git a/planner/core/cbo_test.go b/planner/core/cbo_test.go index 80795462b3aa2..c042b10167d18 100644 --- a/planner/core/cbo_test.go +++ b/planner/core/cbo_test.go @@ -590,9 +590,15 @@ func (s *testAnalyzeSuite) TestOutdatedAnalyze(c *C) { c.Assert(h.Update(dom.InfoSchema()), IsNil) statistics.RatioOfPseudoEstimate.Store(10.0) testKit.MustQuery("explain select * from t where a <= 5 and b <= 5").Check(testkit.Rows( +<<<<<<< HEAD "TableReader_7 35.91 root data:Selection_6", "└─Selection_6 35.91 cop le(test.t.a, 5), le(test.t.b, 5)", " └─TableScan_5 80.00 cop table:t, range:[-inf,+inf], keep order:false", +======= + "TableReader_7 29.77 root data:Selection_6", + "└─Selection_6 29.77 cop[tikv] le(test.t.a, 5), le(test.t.b, 5)", + " └─TableFullScan_5 80.00 cop[tikv] table:t keep order:false", +>>>>>>> aeee152... planner: fix the inappropriate heuristic rule to estimate the EQ selectivity when out of range (#18543) )) statistics.RatioOfPseudoEstimate.Store(0.7) testKit.MustQuery("explain select * from t where a <= 5 and b <= 5").Check(testkit.Rows( diff --git a/planner/core/testdata/analyze_suite_out.json b/planner/core/testdata/analyze_suite_out.json index d046cb1e868c2..6e4e43e26d109 100644 --- a/planner/core/testdata/analyze_suite_out.json +++ b/planner/core/testdata/analyze_suite_out.json @@ -138,17 +138,30 @@ { "SQL": "explain select * from t where a = 7639902", "Plan": [ +<<<<<<< HEAD "IndexReader_6 2.03 root index:IndexScan_5", "└─IndexScan_5 2.03 cop table:t, index:a, c, b, range:[7639902,7639902], keep order:false" +======= + "IndexReader_6 6.68 root index:IndexRangeScan_5", + "└─IndexRangeScan_5 6.68 cop[tikv] table:t, index:PRIMARY(a, c, b) range:[7639902,7639902], keep order:false" +>>>>>>> aeee152... planner: fix the inappropriate heuristic rule to estimate the EQ selectivity when out of range (#18543) ] }, { "SQL": "explain select c, b from t where a = 7639902 order by b asc limit 6", "Plan": [ +<<<<<<< HEAD "Projection_7 2.03 root test.t.c, test.t.b", "└─TopN_10 2.03 root test.t.b:asc, offset:0, count:6", " └─IndexReader_18 2.03 root index:IndexScan_17", " └─IndexScan_17 2.03 cop table:t, index:a, c, b, range:[7639902,7639902], keep order:false" +======= + "Projection_7 6.00 root test.t.c, test.t.b", + "└─TopN_8 6.00 root test.t.b, offset:0, count:6", + " └─IndexReader_16 6.00 root index:TopN_15", + " └─TopN_15 6.00 cop[tikv] test.t.b, offset:0, count:6", + " └─IndexRangeScan_14 6.68 cop[tikv] table:t, index:PRIMARY(a, c, b) range:[7639902,7639902], keep order:false" +>>>>>>> aeee152... planner: fix the inappropriate heuristic rule to estimate the EQ selectivity when out of range (#18543) ] } ] diff --git a/statistics/handle/update_test.go b/statistics/handle/update_test.go index 1c86e60e5813c..a44ad417e960a 100644 --- a/statistics/handle/update_test.go +++ b/statistics/handle/update_test.go @@ -1523,8 +1523,8 @@ func (s *testStatsSuite) TestAbnormalIndexFeedback(c *C) { sql: "select * from t where a = 2 and b > 10", hist: "column:2 ndv:20 totColSize:20\n" + "num: 5 lower_bound: -9223372036854775808 upper_bound: 7 repeats: 0\n" + - "num: 6 lower_bound: 7 upper_bound: 14 repeats: 0\n" + - "num: 7 lower_bound: 14 upper_bound: 9223372036854775807 repeats: 0", + "num: 4 lower_bound: 7 upper_bound: 14 repeats: 0\n" + + "num: 5 lower_bound: 14 upper_bound: 9223372036854775807 repeats: 0", rangeID: tblInfo.Columns[1].ID, idxID: tblInfo.Indices[0].ID, eqCount: 3, diff --git a/statistics/histogram.go b/statistics/histogram.go index 3414f80da1020..645e6a3b40dfd 100644 --- a/statistics/histogram.go +++ b/statistics/histogram.go @@ -719,7 +719,7 @@ func (c *Column) equalRowCount(sc *stmtctx.StatementContext, val types.Datum, mo return 0.0, nil } if c.NDV > 0 && c.outOfRange(val) { - return float64(modifyCount) / float64(c.NDV), nil + return outOfRangeEQSelectivity(c.NDV, modifyCount, int64(c.TotalRowCount())) * c.TotalRowCount(), nil } if c.CMSketch != nil { count, err := c.CMSketch.queryValue(sc, val) @@ -754,9 +754,15 @@ func (c *Column) GetColumnRowCount(sc *stmtctx.StatementContext, ranges []*range continue } // The interval case. +<<<<<<< HEAD cnt := c.BetweenRowCount(rg.LowVal[0], rg.HighVal[0]) if (c.outOfRange(rg.LowVal[0]) && !rg.LowVal[0].IsNull()) || c.outOfRange(rg.HighVal[0]) { cnt += float64(modifyCount) / outOfRangeBetweenRate +======= + cnt := c.BetweenRowCount(lowVal, highVal) + if (c.outOfRange(lowVal) && !lowVal.IsNull()) || c.outOfRange(highVal) { + cnt += outOfRangeEQSelectivity(outOfRangeBetweenRate, modifyCount, int64(c.TotalRowCount())) * c.TotalRowCount() +>>>>>>> aeee152... planner: fix the inappropriate heuristic rule to estimate the EQ selectivity when out of range (#18543) } // `betweenRowCount` returns count for [l, h) range, we adjust cnt for boudaries here. // Note that, `cnt` does not include null values, we need specially handle cases @@ -818,7 +824,7 @@ func (idx *Index) equalRowCount(sc *stmtctx.StatementContext, b []byte, modifyCo } val := types.NewBytesDatum(b) if idx.NDV > 0 && idx.outOfRange(val) { - return float64(modifyCount) / (float64(idx.NDV)), nil + return outOfRangeEQSelectivity(idx.NDV, modifyCount, int64(idx.TotalRowCount())) * idx.TotalRowCount(), nil } if idx.CMSketch != nil { return float64(idx.CMSketch.QueryBytes(b)), nil @@ -870,7 +876,7 @@ func (idx *Index) GetRowCount(sc *stmtctx.StatementContext, indexRanges []*range totalCount += idx.BetweenRowCount(l, r) lowIsNull := bytes.Equal(lb, nullKeyBytes) if (idx.outOfRange(l) && !(isSingleCol && lowIsNull)) || idx.outOfRange(r) { - totalCount += float64(modifyCount) / outOfRangeBetweenRate + totalCount += outOfRangeEQSelectivity(outOfRangeBetweenRate, modifyCount, int64(idx.TotalRowCount())) * idx.TotalRowCount() } if isSingleCol && lowIsNull { totalCount += float64(idx.NullCount) diff --git a/statistics/selectivity_test.go b/statistics/selectivity_test.go index f79821b17124a..3698f46cfcb87 100644 --- a/statistics/selectivity_test.go +++ b/statistics/selectivity_test.go @@ -340,6 +340,34 @@ func getRange(start, end int64) []*ranger.Range { return []*ranger.Range{ran} } +func (s *testStatsSuite) TestOutOfRangeEQEstimation(c *C) { + defer cleanEnv(c, s.store, s.do) + testKit := testkit.NewTestKit(c, s.store) + testKit.MustExec("use test") + testKit.MustExec("drop table if exists t") + testKit.MustExec("create table t(a int)") + for i := 0; i < 1000; i++ { + testKit.MustExec(fmt.Sprintf("insert into t values (%v)", i/4)) // 0 ~ 249 + } + testKit.MustExec("analyze table t") + + h := s.do.StatsHandle() + table, err := s.do.InfoSchema().TableByName(model.NewCIStr("test"), model.NewCIStr("t")) + c.Assert(err, IsNil) + statsTbl := h.GetTableStats(table.Meta()) + sc := &stmtctx.StatementContext{} + col := statsTbl.Columns[table.Meta().Columns[0].ID] + count, err := col.GetColumnRowCount(sc, getRange(250, 250), 0, false) + c.Assert(err, IsNil) + c.Assert(count, Equals, float64(0)) + + for i := 0; i < 8; i++ { + count, err := col.GetColumnRowCount(sc, getRange(250, 250), int64(i+1), false) + c.Assert(err, IsNil) + c.Assert(count, Equals, math.Min(float64(i+1), 4)) // estRows must be less than modifyCnt + } +} + func (s *testStatsSuite) TestEstimationForUnknownValues(c *C) { defer cleanEnv(c, s.store, s.do) testKit := testkit.NewTestKit(c, s.store) @@ -366,15 +394,15 @@ func (s *testStatsSuite) TestEstimationForUnknownValues(c *C) { colID := table.Meta().Columns[0].ID count, err := statsTbl.GetRowCountByColumnRanges(sc, colID, getRange(30, 30)) c.Assert(err, IsNil) - c.Assert(count, Equals, 2.0) + c.Assert(count, Equals, 0.2) count, err = statsTbl.GetRowCountByColumnRanges(sc, colID, getRange(9, 30)) c.Assert(err, IsNil) - c.Assert(count, Equals, 4.2) + c.Assert(count, Equals, 2.4000000000000004) count, err = statsTbl.GetRowCountByColumnRanges(sc, colID, getRange(9, math.MaxInt64)) c.Assert(err, IsNil) - c.Assert(count, Equals, 4.2) + c.Assert(count, Equals, 2.4000000000000004) idxID := table.Meta().Indices[0].ID count, err = statsTbl.GetRowCountByIndexRanges(sc, idxID, getRange(30, 30)) diff --git a/statistics/table.go b/statistics/table.go index 8b464727ed5d7..e66764124ca6b 100644 --- a/statistics/table.go +++ b/statistics/table.go @@ -362,6 +362,24 @@ func isSingleColIdxNullRange(idx *Index, ran *ranger.Range) bool { return false } +// outOfRangeEQSelectivity estimates selectivities for out-of-range values. +// It assumes all modifications are insertions and all new-inserted rows are uniformly distributed +// and has the same distribution with analyzed rows, which means each unique value should have the +// same number of rows(Tot/NDV) of it. +func outOfRangeEQSelectivity(ndv, modifyRows, totalRows int64) float64 { + if modifyRows == 0 { + return 0 // it must be 0 since the histogram contains the whole data + } + if ndv < outOfRangeBetweenRate { + ndv = outOfRangeBetweenRate // avoid inaccurate selectivity caused by small NDV + } + selectivity := 1 / float64(ndv) // TODO: After extracting TopN from histograms, we can minus the TopN fraction here. + if selectivity*float64(totalRows) > float64(modifyRows) { + selectivity = float64(modifyRows) / float64(totalRows) + } + return selectivity +} + // getEqualCondSelectivity gets the selectivity of the equal conditions. func (coll *HistColl) getEqualCondSelectivity(idx *Index, bytes []byte, usedColsLen int) float64 { coverAll := len(idx.Info.Columns) == usedColsLen @@ -374,8 +392,7 @@ func (coll *HistColl) getEqualCondSelectivity(idx *Index, bytes []byte, usedCols // When the value is out of range, we could not found this value in the CM Sketch, // so we use heuristic methods to estimate the selectivity. if idx.NDV > 0 && coverAll { - // for equality queries - return float64(coll.ModifyCount) / float64(idx.NDV) / idx.TotalRowCount() + return outOfRangeEQSelectivity(idx.NDV, coll.ModifyCount, int64(idx.TotalRowCount())) } // The equal condition only uses prefix columns of the index. colIDs := coll.Idx2ColumnIDs[idx.ID] @@ -386,10 +403,7 @@ func (coll *HistColl) getEqualCondSelectivity(idx *Index, bytes []byte, usedCols } ndv = mathutil.MaxInt64(ndv, coll.Columns[colID].NDV) } - if ndv > 0 { - return float64(coll.ModifyCount) / float64(ndv) / idx.TotalRowCount() - } - return float64(coll.ModifyCount) / outOfRangeBetweenRate / idx.TotalRowCount() + return outOfRangeEQSelectivity(ndv, coll.ModifyCount, int64(idx.TotalRowCount())) } return float64(idx.CMSketch.QueryBytes(bytes)) / float64(idx.TotalRowCount()) }