This is an automated cherry-pick of pingcap#54253

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

Author: ari-e

pkg/planner/core/casetest/index/BUILD.bazel

@@ -9,7 +9,11 @@ go_test(
     ],
     data = glob(["testdata/**"]),
     flaky = True,
+<<<<<<< HEAD
     shard_count = 14,
+=======
+    shard_count = 6,
+>>>>>>> 41ed0e508d9 (planner: use ordered index with is null predicate (#54253))
     deps = [
         "//pkg/sessionctx/variable",
         "//pkg/testkit",

pkg/planner/core/casetest/index/index_test.go

@@ -451,6 +451,7 @@ func TestIndexMergeIssue50382(t *testing.T) {
 	}
 }
 
+<<<<<<< HEAD
 func TestIndexMergeSingleCaseCouldFeelIndexMergeHint(t *testing.T) {
 	store := testkit.CreateMockStore(t)
 	tk := testkit.NewTestKit(t, store)
@@ -472,4 +473,16 @@ func TestIndexMergeSingleCaseCouldFeelIndexMergeHint(t *testing.T) {
 			"  └─Limit(Probe) 1.00 cop[tikv]  offset:0, count:1",
 			"    └─Selection 1.00 cop[tikv]  json_memberof(cast(\"OC8p1763XTkt.org/s/link\", json BINARY), test.t.nslc)",
 			"      └─TableRowIDScan 1.00 cop[tikv] table:t keep order:false, stats:pseudo"))
+=======
+func TestOrderedIndexWithIsNull(t *testing.T) {
+	store := testkit.CreateMockStore(t)
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("CREATE TABLE t1 (a int key, b int, c int, index (b, c));")
+	tk.MustQuery("explain select a from t1 where b is null order by c").Check(testkit.Rows(
+		"Projection_6 10.00 root  test.t1.a",
+		"└─IndexReader_12 10.00 root  index:IndexRangeScan_11",
+		"  └─IndexRangeScan_11 10.00 cop[tikv] table:t1, index:b(b, c) range:[NULL,NULL], keep order:true, stats:pseudo",
+	))
+>>>>>>> 41ed0e508d9 (planner: use ordered index with is null predicate (#54253))
 }

pkg/util/ranger/detacher.go

@@ -183,6 +183,16 @@ func getPotentialEqOrInColOffset(sctx sessionctx.Context, expr expression.Expres
 				return i
 			}
 		}
+	case ast.IsNull:
+		c, ok := f.GetArgs()[0].(*expression.Column)
+		if !ok {
+			return -1
+		}
+		for i, col := range cols {
+			if col.EqualColumn(c) {
+				return i
+			}
+		}
 	}
 	return -1
 }
@@ -575,27 +585,34 @@ func allEqOrIn(expr expression.Expression) bool {
 			}
 		}
 		return true
-	case ast.EQ, ast.NullEQ, ast.In:
+	case ast.EQ, ast.NullEQ, ast.In, ast.IsNull:
 		return true
 	}
 	return false
 }
 
 func extractValueInfo(expr expression.Expression) *valueInfo {
-	if f, ok := expr.(*expression.ScalarFunction); ok && (f.FuncName.L == ast.EQ || f.FuncName.L == ast.NullEQ) {
-		getValueInfo := func(c *expression.Constant) *valueInfo {
-			mutable := c.ParamMarker != nil || c.DeferredExpr != nil
-			var value *types.Datum
-			if !mutable {
-				value = &c.Value
+	if f, ok := expr.(*expression.ScalarFunction); ok {
+		if f.FuncName.L == ast.IsNull {
+			val := &types.Datum{}
+			val.SetNull()
+			return &valueInfo{value: val, mutable: false}
+		}
+		if f.FuncName.L == ast.EQ || f.FuncName.L == ast.NullEQ {
+			getValueInfo := func(c *expression.Constant) *valueInfo {
+				mutable := c.ParamMarker != nil || c.DeferredExpr != nil
+				var value *types.Datum
+				if !mutable {
+					value = &c.Value
+				}
+				return &valueInfo{value, mutable}
+			}
+			if c, ok := f.GetArgs()[0].(*expression.Constant); ok {
+				return getValueInfo(c)
+			}
+			if c, ok := f.GetArgs()[1].(*expression.Constant); ok {
+				return getValueInfo(c)
 			}
-			return &valueInfo{value, mutable}
-		}
-		if c, ok := f.GetArgs()[0].(*expression.Constant); ok {
-			return getValueInfo(c)
-		}
-		if c, ok := f.GetArgs()[1].(*expression.Constant); ok {
-			return getValueInfo(c)
 		}
 	}
 	return nil
@@ -654,8 +671,12 @@ func ExtractEqAndInCondition(sctx sessionctx.Context, conditions []expression.Ex
 		if ma == nil {
 			if accesses[i] != nil {
 				if allEqOrIn(accesses[i]) {
-					newConditions = append(newConditions, accesses[i])
 					columnValues[i] = extractValueInfo(accesses[i])
+					if columnValues[i] != nil && columnValues[i].value != nil && columnValues[i].value.IsNull() {
+						accesses[i] = nil
+					} else {
+						newConditions = append(newConditions, accesses[i])
+					}
 				} else {
 					accesses[i] = nil
 				}

tests/integrationtest/r/planner/core/casetest/integration.result

@@ -607,6 +607,13 @@ explain format = 'brief' select * from t3 where a >= 'a' and a <= 'a' and b = 'b
 id	estRows	task	access object	operator info
 IndexReader	0.33	root		index:IndexRangeScan
 └─IndexRangeScan	0.33	cop[tikv]	table:t3, index:a(a, b, c)	range:("a" "b" "c","a" "b" +inf], keep order:false, stats:pseudo
+explain format = 'brief' select * from t1 where a is null or a in (1, 2, 3);
+id	estRows	task	access object	operator info
+IndexReader	260.00	root		index:IndexRangeScan
+└─IndexRangeScan	260.00	cop[tikv]	table:t1, index:a(a, b, c)	range:[NULL,NULL], [1,3], keep order:false, stats:pseudo
+explain format = 'brief' select * from t1 where a is null and a = 1;
+id	estRows	task	access object	operator info
+TableDual	0.00	root		rows:0
 drop table if exists t1;
 CREATE TABLE t1 (
 key1 int(11) NOT NULL,

tests/integrationtest/r/util/ranger.result

@@ -483,9 +483,8 @@ a	b	c
 1	2	2
 explain format='brief' select * from t where a = 1 and (b is null or b = 2) and c > 1;
 id	estRows	task	access object	operator info
-IndexReader	0.07	root		index:Selection
-└─Selection	0.07	cop[tikv]		gt(util__ranger.t.c, 1)
-  └─IndexRangeScan	0.20	cop[tikv]	table:t, index:a(a, b, c)	range:[1 NULL,1 NULL], [1 2,1 2], keep order:false, stats:pseudo
+IndexReader	0.67	root		index:IndexRangeScan
+└─IndexRangeScan	0.67	cop[tikv]	table:t, index:a(a, b, c)	range:(1 NULL 1,1 NULL +inf], (1 2 1,1 2 +inf], keep order:false, stats:pseudo
 select * from t where a = 1 and (b is null or b = 2) and c > 1;
 a	b	c
 1	2	2

tests/integrationtest/t/planner/core/casetest/integration.test

@@ -173,6 +173,8 @@ explain format = 'brief' select * from t0 where a > 1 and a < 3 order by b limit
 explain format = 'brief' select * from t1 where a >= 2 and a <= 2 and b = 2 and c > 2;
 explain format = 'brief' select * from t2 where a >= 2.5 and a <= 2.5 order by b limit 2;
 explain format = 'brief' select * from t3 where a >= 'a' and a <= 'a' and b = 'b' and c > 'c';
+explain format = 'brief' select * from t1 where a is null or a in (1, 2, 3);
+explain format = 'brief' select * from t1 where a is null and a = 1;
 
 # TestIssue22105
 drop table if exists t1;