Bug#37397306 - looks like not use pruning when it inserts with now()

Nimita Joshi · dahlerlend · commit 3247c023ee5b · 2025-03-14T11:09:25.000+01:00
function in 8.0.

Issue:
All partitions are being retrieved when inserting the now() value
into a non-partition key column in a partition table.

Analysis:
In case of an INSERT query partition pruning takes place in the
prepare stage only. now() was changed from being const to
const_for_execution due to which pruning cannot take place as it
requires all the values in the INSERT to be const.

Fix:
Enable partition pruning to be performed at the execution stage.

Change-Id: I68b7d9d3d880c873a880991d564eca1975900dd0
diff --git a/mysql-test/r/explain_dml.result b/mysql-test/r/explain_dml.result
@@ -95,12 +95,12 @@ Warning	3005	INSERT DELAYED is no longer supported. The statement was converted
 Note	1003	insert ignore into `test`.`t1` PARTITION (`p0`,`p1`) (`test`.`t1`.`c1`,`test`.`t1`.`c2`) /* select#1 */ select `test`.`t2`.`c1` AS `c1`,'a' AS `a` from `test`.`t2` on duplicate key update `test`.`t1`.`c2` = 'c'
 EXPLAIN
 INSERT INTO t1 PARTITION(p0, p1)
-SET c1 = (SELECT c1 from t2);
+SET c1 = (SELECT c1 from t2 LIMIT 1);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	INSERT	t1	p0_subp0,p0_subp1,p1_subp6,p1_subp7	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+1	INSERT	t1	p1_subp6	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 2	SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
 Warnings:
-Note	1003	insert into `test`.`t1` PARTITION (`p0`,`p1`) (`test`.`t1`.`c1`) values ((/* select#2 */ select `test`.`t2`.`c1` from `test`.`t2`))
+Note	1003	insert into `test`.`t1` PARTITION (`p0`,`p1`) (`test`.`t1`.`c1`) values ((/* select#2 */ select `test`.`t2`.`c1` from `test`.`t2` limit 1))
 EXPLAIN
 REPLACE LOW_PRIORITY INTO t1 PARTITION(p0, p1) (c1, c2)
 VALUES (1, 'a'), (2, 'b');
@@ -119,12 +119,12 @@ Warning	3005	REPLACE DELAYED is no longer supported. The statement was converted
 Note	1003	replace into `test`.`t1` PARTITION (`p0`,`p1`) (`test`.`t1`.`c1`,`test`.`t1`.`c2`) /* select#1 */ select `test`.`t2`.`c1` AS `c1`,'a' AS `a` from `test`.`t2`
 EXPLAIN
 REPLACE INTO t1 PARTITION(p0, p1)
-SET c1 = (SELECT c1 from t2);
+SET c1 = (SELECT c1 from t2 LIMIT 1);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	REPLACE	t1	p0_subp0,p0_subp1,p1_subp6,p1_subp7	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+1	REPLACE	t1	p1_subp6	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 2	SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
 Warnings:
-Note	1003	replace into `test`.`t1` PARTITION (`p0`,`p1`) (`test`.`t1`.`c1`) values ((/* select#2 */ select `test`.`t2`.`c1` from `test`.`t2`))
+Note	1003	replace into `test`.`t1` PARTITION (`p0`,`p1`) (`test`.`t1`.`c1`) values ((/* select#2 */ select `test`.`t2`.`c1` from `test`.`t2` limit 1))
 EXPLAIN FORMAT=TRADITIONAL FOR QUERY 'DELETE FROM t3 WHERE c1 > 0'
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	DELETE	t3	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
diff --git a/mysql-test/r/partition_locking.result b/mysql-test/r/partition_locking.result
@@ -4784,14 +4784,17 @@ FLUSH STATUS;
 EXPLAIN INSERT INTO t2 VALUES ((SELECT max(a) FROM t1),
 (SELECT min(a) FROM t1));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	INSERT	t2	p0,p1,p2	ALL	NULL	NULL	NULL	NULL	#	NULL	NULL
+1	INSERT	t2	p2	ALL	NULL	NULL	NULL	NULL	#	NULL	NULL
 3	SUBQUERY	t1	p0,p1,p2	ALL	NULL	NULL	NULL	NULL	#	100.00	NULL
 2	SUBQUERY	t1	p0,p1,p2	ALL	NULL	NULL	NULL	NULL	#	100.00	NULL
 Warnings:
 Note	1003	insert into `test`.`t2` values ((/* select#2 */ select max(`test`.`t1`.`a`) from `test`.`t1`),(/* select#3 */ select min(`test`.`t1`.`a`) from `test`.`t1`))
 VARIABLE_NAME	VARIABLE_VALUE
 Handler_commit	1
 Handler_external_lock	6
+Handler_read_first	3
+Handler_read_key	3
+Handler_read_rnd_next	8
 # I.e. No lock pruning possible
 FLUSH STATUS;
 INSERT INTO t2 VALUES ((SELECT a FROM t1 WHERE a = 1),
@@ -4809,14 +4812,17 @@ FLUSH STATUS;
 EXPLAIN INSERT INTO t2 VALUES ((SELECT a FROM t1 WHERE a = 1),
 (SELECT b FROM t1 WHERE a = 2));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	INSERT	t2	p0,p1,p2	ALL	NULL	NULL	NULL	NULL	#	NULL	NULL
+1	INSERT	t2	p1	ALL	NULL	NULL	NULL	NULL	#	NULL	NULL
 3	SUBQUERY	t1	p2	ALL	NULL	NULL	NULL	NULL	#	25.00	Using where
 2	SUBQUERY	t1	p1	ALL	NULL	NULL	NULL	NULL	#	25.00	Using where
 Warnings:
 Note	1003	insert into `test`.`t2` values ((/* select#2 */ select `test`.`t1`.`a` from `test`.`t1` where (`test`.`t1`.`a` = 1)),(/* select#3 */ select `test`.`t1`.`b` from `test`.`t1` where (`test`.`t1`.`a` = 2)))
 VARIABLE_NAME	VARIABLE_VALUE
 Handler_commit	1
 Handler_external_lock	6
+Handler_read_first	1
+Handler_read_key	1
+Handler_read_rnd_next	4
 # I.e. No lock pruning possible on insert table
 SELECT * FROM t2 ORDER BY a, b;
 a	b
diff --git a/mysql-test/r/partition_pruning.result b/mysql-test/r/partition_pruning.result
@@ -6327,3 +6327,116 @@ c1	c2
 SELECT * from t2 WHERE c2 NOT IN ((SELECT c0 FROM t1 LIMIT 1),null);
 c1	c2
 DROP TABLE t1, t2;
+#
+# Bug#37397306 - looks like not use pruning when it inserts with now() function in 8.0
+#
+CREATE TABLE t1 (
+f1 DATETIME NOT NULL,
+f2 INT NOT NULL,
+f3 DATE NOT NULL,
+PRIMARY KEY (f1,f2)
+)
+PARTITION BY RANGE COLUMNS(f1)
+(
+PARTITION p01 VALUES LESS THAN ('1975-12-31 10:21:55'),
+PARTITION p02 VALUES LESS THAN ('1976-12-31 10:21:55'),
+PARTITION p03 VALUES LESS THAN ('2090-12-31 10:21:55')
+);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SET TIMESTAMP=UNIX_TIMESTAMP('2019-03-11 12:00:00');
+EXPLAIN INSERT INTO t1 (f1,f2,f3) VALUES (now(),10001,'1976-11-31');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	INSERT	t1	p03	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+Warnings:
+Note	1003	insert into `test`.`t1` (`test`.`t1`.`f1`,`test`.`t1`.`f2`,`test`.`t1`.`f3`) values (now(),10001,'1976-11-31')
+SET TIMESTAMP=UNIX_TIMESTAMP('1975-03-11 12:00:00');
+EXPLAIN INSERT INTO t1 (f1,f2,f3) VALUES (now(),10001,'2000-11-31');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	INSERT	t1	p01	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+Warnings:
+Note	1003	insert into `test`.`t1` (`test`.`t1`.`f1`,`test`.`t1`.`f2`,`test`.`t1`.`f3`) values (now(),10001,'2000-11-31')
+SET TIMESTAMP=DEFAULT;
+DROP TABLE t1;
+CREATE TABLE t1(a INTEGER PRIMARY KEY, b INTEGER)
+PARTITION BY RANGE (a)
+(
+PARTITION p1 VALUES LESS THAN (10),
+PARTITION p2 VALUES LESS THAN MAXVALUE
+);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+set @a=1,@b=22;
+EXPLAIN INSERT INTO t1(a,b) VALUES (@a,@b);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	INSERT	t1	p1	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+Warnings:
+Note	1003	insert into `test`.`t1` (`test`.`t1`.`a`,`test`.`t1`.`b`) values ((@`a`),(@`b`))
+EXPLAIN INSERT INTO t1 VALUES (@a, 1), (@b, 2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	INSERT	t1	p1,p2	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+Warnings:
+Note	1003	insert into `test`.`t1` values ((@`a`),1),((@`b`),2)
+set @a=11,@b=22;
+EXPLAIN INSERT INTO t1(a,b) VALUES (@a,@b);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	INSERT	t1	p2	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+Warnings:
+Note	1003	insert into `test`.`t1` (`test`.`t1`.`a`,`test`.`t1`.`b`) values ((@`a`),(@`b`))
+EXPLAIN INSERT INTO t1 VALUES (@a, 1), (@b, 2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	INSERT	t1	p2	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+Warnings:
+Note	1003	insert into `test`.`t1` values ((@`a`),1),((@`b`),2)
+PREPARE s from "EXPLAIN INSERT INTO t1(a,b) VALUES (?,?)";
+set @a=1,@b=22;
+EXECUTE s USING @a,@b;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	INSERT	t1	p1	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+Warnings:
+Note	1003	insert into `test`.`t1` (`test`.`t1`.`a`,`test`.`t1`.`b`) values (?,?)
+set @a=11,@b=22;
+EXECUTE s USING @a,@b;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	INSERT	t1	p2	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+Warnings:
+Note	1003	insert into `test`.`t1` (`test`.`t1`.`a`,`test`.`t1`.`b`) values (?,?)
+PREPARE p from "EXPLAIN INSERT INTO t1(a,b) VALUES (?,1), (?,2)";
+set @a=1,@b=22;
+EXECUTE p USING @a,@b;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	INSERT	t1	p1,p2	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+Warnings:
+Note	1003	insert into `test`.`t1` (`test`.`t1`.`a`,`test`.`t1`.`b`) values (?,1),(?,2)
+set @a=11,@b=22;
+EXECUTE p USING @a,@b;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	INSERT	t1	p2	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+Warnings:
+Note	1003	insert into `test`.`t1` (`test`.`t1`.`a`,`test`.`t1`.`b`) values (?,1),(?,2)
+DROP TABLE t1;
+CREATE TABLE t1 (
+id INT PRIMARY KEY,
+f1 FLOAT
+)
+PARTITION BY RANGE (id)
+(
+PARTITION p0 VALUES LESS THAN (10),
+PARTITION p1 VALUES LESS THAN MAXVALUE
+);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN INSERT INTO t1 (id, f1) VALUES (1,RAND());
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	INSERT	t1	p0	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+Warnings:
+Note	1003	insert into `test`.`t1` (`test`.`t1`.`id`,`test`.`t1`.`f1`) values (1,rand())
+EXPLAIN INSERT INTO t1  VALUES (20,RAND());
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	INSERT	t1	p1	ALL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+Warnings:
+Note	1003	insert into `test`.`t1` values (20,rand())
+DROP TABLE t1;
diff --git a/mysql-test/t/explain_dml.test b/mysql-test/t/explain_dml.test
@@ -80,7 +80,7 @@ INSERT DELAYED IGNORE INTO t1 PARTITION(p0, p1) (c1, c2)
 #INSERT .... SET
 EXPLAIN
 INSERT INTO t1 PARTITION(p0, p1)
-  SET c1 = (SELECT c1 from t2);
+  SET c1 = (SELECT c1 from t2 LIMIT 1);
 
 
 #REPLACE .... VALUES
@@ -96,7 +96,7 @@ REPLACE DELAYED INTO t1 PARTITION(p0, p1) (c1, c2)
 #REPLACE .... SET
 EXPLAIN
 REPLACE INTO t1 PARTITION(p0, p1)
-  SET c1 = (SELECT c1 from t2);
+  SET c1 = (SELECT c1 from t2 LIMIT 1);
 
 #No effect on EXPLAIN FOR CONNECTION .... for both SINGLE/MULTI-TABLE DML
 let $QID= `SELECT CONNECTION_ID()`;
diff --git a/mysql-test/t/partition_pruning.test b/mysql-test/t/partition_pruning.test
@@ -2511,3 +2511,79 @@ SELECT * from t2 WHERE c2 IN ((SELECT c0 FROM t1 LIMIT 1),null);
 SELECT * from t2 WHERE c2 NOT IN ((SELECT c0 FROM t1 LIMIT 1),null);
 
 DROP TABLE t1, t2;
+
+--echo #
+--echo # Bug#37397306 - looks like not use pruning when it inserts with now() function in 8.0
+--echo #
+
+CREATE TABLE t1 (
+ f1 DATETIME NOT NULL,
+ f2 INT NOT NULL,
+ f3 DATE NOT NULL,
+ PRIMARY KEY (f1,f2)
+)
+PARTITION BY RANGE COLUMNS(f1)
+(
+ PARTITION p01 VALUES LESS THAN ('1975-12-31 10:21:55'),
+ PARTITION p02 VALUES LESS THAN ('1976-12-31 10:21:55'),
+ PARTITION p03 VALUES LESS THAN ('2090-12-31 10:21:55')
+);
+
+ANALYZE TABLE t1;
+SET TIMESTAMP=UNIX_TIMESTAMP('2019-03-11 12:00:00');
+EXPLAIN INSERT INTO t1 (f1,f2,f3) VALUES (now(),10001,'1976-11-31');
+SET TIMESTAMP=UNIX_TIMESTAMP('1975-03-11 12:00:00');
+EXPLAIN INSERT INTO t1 (f1,f2,f3) VALUES (now(),10001,'2000-11-31');
+
+SET TIMESTAMP=DEFAULT;
+DROP TABLE t1;
+
+CREATE TABLE t1(a INTEGER PRIMARY KEY, b INTEGER)
+PARTITION BY RANGE (a)
+(
+ PARTITION p1 VALUES LESS THAN (10),
+ PARTITION p2 VALUES LESS THAN MAXVALUE
+);
+
+ANALYZE TABLE t1;
+
+set @a=1,@b=22;
+EXPLAIN INSERT INTO t1(a,b) VALUES (@a,@b);
+EXPLAIN INSERT INTO t1 VALUES (@a, 1), (@b, 2);
+
+set @a=11,@b=22;
+EXPLAIN INSERT INTO t1(a,b) VALUES (@a,@b);
+EXPLAIN INSERT INTO t1 VALUES (@a, 1), (@b, 2);
+
+PREPARE s from "EXPLAIN INSERT INTO t1(a,b) VALUES (?,?)";
+set @a=1,@b=22;
+EXECUTE s USING @a,@b;
+
+set @a=11,@b=22;
+EXECUTE s USING @a,@b;
+
+PREPARE p from "EXPLAIN INSERT INTO t1(a,b) VALUES (?,1), (?,2)";
+set @a=1,@b=22;
+EXECUTE p USING @a,@b;
+
+set @a=11,@b=22;
+EXECUTE p USING @a,@b;
+
+DROP TABLE t1;
+
+CREATE TABLE t1 (
+  id INT PRIMARY KEY,
+  f1 FLOAT
+)
+PARTITION BY RANGE (id)
+(
+ PARTITION p0 VALUES LESS THAN (10),
+ PARTITION p1 VALUES LESS THAN MAXVALUE
+);
+
+ANALYZE TABLE t1;
+
+EXPLAIN INSERT INTO t1 (id, f1) VALUES (1,RAND());
+EXPLAIN INSERT INTO t1  VALUES (20,RAND());
+
+DROP TABLE t1;
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
@@ -460,6 +460,7 @@ bool partition_info::can_prune_insert(
   @param info             COPY_INFO used for default values handling
   @param copy_default_values  True if we should copy default values
   @param used_partitions  Bitmap to set
+  @param tables_locked    True if tables are locked
 
   @returns Operational status
     @retval false  Success
@@ -468,20 +469,43 @@ bool partition_info::can_prune_insert(
   so caller must check thd->is_error().
 */
 
-bool partition_info::set_used_partition(THD *thd,
-                                        const mem_root_deque<Item *> &fields,
-                                        const mem_root_deque<Item *> &values,
-                                        COPY_INFO &info,
-                                        bool copy_default_values,
-                                        MY_BITMAP *used_partitions) {
+bool partition_info::set_used_partition(
+    THD *thd, const mem_root_deque<Item *> &fields,
+    const mem_root_deque<Item *> &values, COPY_INFO &info,
+    bool copy_default_values, MY_BITMAP *used_partitions, bool tables_locked) {
   uint32 part_id;
   longlong func_value;
 
   assert(thd);
 
-  /* Only allow checking of constant values */
-  for (Item *item : values) {
-    if (!item->const_item()) return true;
+  /*
+    In prepare phase, allow partition pruning from constant values.
+    In execution phase, allow partition pruning for values that are
+    const-for-execution.
+  */
+  if (!fields.empty()) {
+    auto value_it = values.begin();
+    for (Item *fld : fields) {
+      Item *value = *value_it++;
+      Item_field *field = fld->field_for_view_update();
+      if (bitmap_is_set(&full_part_field_set, field->field->field_index())) {
+        if (!(value->const_item() ||
+              (tables_locked && value->const_for_execution()))) {
+          return true;
+        }
+      }
+    }
+  } else {
+    Field *field = nullptr;
+    for (Item *value : values) {
+      field = *table->field++;
+      if (bitmap_is_set(&full_part_field_set, field->field_index())) {
+        if (!(value->const_item() ||
+              (tables_locked && value->const_for_execution()))) {
+          return true;
+        }
+      }
+    }
   }
 
   if (copy_default_values) restore_record(table, s->default_values);
diff --git a/sql/partition_info.h b/sql/partition_info.h
@@ -511,7 +511,8 @@ class partition_info {
   void report_part_expr_error(bool use_subpart_expr);
   bool set_used_partition(THD *thd, const mem_root_deque<Item *> &fields,
                           const mem_root_deque<Item *> &values, COPY_INFO &info,
-                          bool copy_default_values, MY_BITMAP *used_partitions);
+                          bool copy_default_values, MY_BITMAP *used_partitions,
+                          bool tables_locked);
   /**
     PRUNE_NO - Unable to prune.
     PRUNE_DEFAULTS - Partitioning field is only set to
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
diff --git a/sql/sql_insert.h b/sql/sql_insert.h
