util/ranger: fix explain does not display range[NULL, NULL] (pingcap#…

…19028) (pingcap#19068)
PierreZ · Aug 11, 2020 · 3b35c89 · 3b35c89
1 parent 15a7db7
commit 3b35c89
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/planner/core/testdata/analyze_suite_out.json b/planner/core/testdata/analyze_suite_out.json
@@ -245,7 +245,7 @@
       ],
       [
         "IndexLookUp_7 2.00 root  ",
-        "├─IndexFullScan_5(Build) 2.00 cop[tikv] table:t, index:idx(a) keep order:false",
+        "├─IndexRangeScan_5(Build) 2.00 cop[tikv] table:t, index:idx(a) range:[NULL,NULL], keep order:false",
         "└─TableRowIDScan_6(Probe) 2.00 cop[tikv] table:t keep order:false"
       ],
       [

diff --git a/statistics/testdata/stats_suite_out.json b/statistics/testdata/stats_suite_out.json
@@ -11,8 +11,8 @@
     "Name": "TestColumnIndexNullEstimation",
     "Cases": [
       [
-        "IndexReader_6 4.00 root  index:IndexFullScan_5",
-        "└─IndexFullScan_5 4.00 cop[tikv] table:t, index:idx_b(b) keep order:false"
+        "IndexReader_6 4.00 root  index:IndexRangeScan_5",
+        "└─IndexRangeScan_5 4.00 cop[tikv] table:t, index:idx_b(b) range:[NULL,NULL], keep order:false"
       ],
       [
         "IndexReader_6 1.00 root  index:IndexFullScan_5",

diff --git a/util/ranger/types.go b/util/ranger/types.go
@@ -86,7 +86,8 @@ func (ran *Range) IsFullRange() bool {
 		lowValRawString := formatDatum(ran.LowVal[i], true)
 		highValRawString := formatDatum(ran.HighVal[i], false)
 		if ("-inf" != lowValRawString && "NULL" != lowValRawString) ||
-			("+inf" != highValRawString && "NULL" != highValRawString) {
+			("+inf" != highValRawString && "NULL" != highValRawString) ||
+			("NULL" == lowValRawString && "NULL" == highValRawString) {
 			return false
 		}
 	}

diff --git a/util/ranger/types_test.go b/util/ranger/types_test.go
@@ -172,7 +172,7 @@ func (s *testRangeSuite) TestIsFullRange(c *C) {
 				LowVal:  []types.Datum{*nullDatum.Clone()},
 				HighVal: []types.Datum{*nullDatum.Clone()},
 			},
-			isFullRange: true,
+			isFullRange: false,
 		},
 		{
 			ran: ranger.Range{