2010-10-14 19:50, Alfranio Correia wrote:
> Hi Daogang,
>
> Great analysis.
> I will conditionally approve the patch.
>
> Please, see comments in-line that you need to take care before pushing
> the patch. If you don't agree with my requests let's discuss it.
Thanks for these good suggestions. I will totally follow them.
Just make sure it's rli->sql_thd instead of rli->info_thd. Right?
Best Regards,
Daogang
>
> Cheers.
>
>
> On 10/12/2010 02:21 AM, Dao-Gang.Qu@stripped wrote:
>> #At
>> file:///home/daogangqu/mysql/bzrwork1/pushwl5404/mysql-next-mr-bugfixing/
>> based on revid:luis.soares@stripped
>>
>> 3321 Dao-Gang.Qu@stripped 2010-10-12
>> Bug #56913 rpl_row_ignorable_event fails sporadically on
>> next-mr-bugfixing codebase
>>
>> In RBR, The rows are inserted to a queue by the thread that
>> executing
>> the 'INSERT DELAYED' statement, and are taken out from the
>> queue by
>> the handler thread to do the real insertion. Because these two
>> threads
>> are running in parallel, there is a possibility that they are
>> run in a
>> interweaved manner, and result in different number of
>> table_map and
>> rows events.
>
> either s/that executing/executing/ or s/that executing/that is executing/
> s/interweaved/interleaved/
>
>>
>> Added a debug option for the test to make the binlog of multi
>> 'INSERT DELAYED ...' stmt stable to force every value is executed
>> in one separate execution series, and then it will be binlogged
>> into separate rows event with its table map event. And the
>> original
>> SQL statement will be displayed just for the first separate rows
>> event because the query is NULL in other separate rows.
>
> "to force every value is executed
> in one separate execution serie, and then it will be binlogged
> into on separate rows event with its table map event"
>
> I would write
>
> "by forcing that every value is executed into one execution series,
> and then
> each value will be binlogged into a separate rows event with its table
> map
> event"
>
>> @ mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
>> Updated for the patch of Bug#56913.
>> @ mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
>> Update to test single 'INSERT DELAYED ...' stmt as the binlog
>> of multi 'INSERT DELAYED ...' stmt is unstable.
>
> s/Update/Updated/
>
>> @ sql/log_event.cc
>> Added code to clear query in case the randomizing pointer
>> to the query will be used to binlog Rows_query_log_event
>> for the second and following separate rows events for
>> multi 'INSERT DELAYED ...' stmt
>> @ sql/sql_insert.cc
>> Set DBUG point to make every value is executed in one separate
>> execution series for multi 'INSERT DELAYED ...' stmt.
>>
>> modified:
>> mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
>> mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
>> sql/log_event.cc
>> sql/log_event.h
>> sql/rpl_slave.cc
>> sql/sql_binlog.cc
>> sql/sql_insert.cc
>> === modified file
>> 'mysql-test/suite/rpl/r/rpl_row_ignorable_event.result'
>> --- a/mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
>> 2010-09-01 02:51:08 +0000
>> +++ b/mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
>> 2010-10-12 01:20:57 +0000
>> @@ -4,6 +4,8 @@ reset master;
>> reset slave;
>> drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
>> start slave;
>> +SET @old_debug= @@global.debug;
>> +SET GLOBAL debug="+d,waiting_for_delayed_insert_queue_is_empty";
>> # Test non-transaction
>> create table t1(a int, b int) engine= myisam;
>> insert into t1(a,b) values(1,1),(2,1);
>> @@ -42,6 +44,7 @@ insert into t5(a, b) values(3,1);
>> update t4,t5 set t4.a=4, t5.a=5 where t4.b=t5.b;
>> # Test insert delayed ...
>> insert delayed into t3(a,b) values(1,5),(1,6),(1,7);
>> +SET @@global.debug= @old_debug;
>> # Test load data infile
>> create table t6(a VARCHAR(60)) engine= myisam;
>> load data infile '../../std_data/words.dat' into table t6;
>> @@ -132,6 +135,10 @@ master-bin.000001 # Query # # BEGIN
>> master-bin.000001 # Rows_query # # # insert delayed
>> into t3(a,b) values(1,5),(1,6),(1,7)
>> master-bin.000001 # Table_map # # table_id: # (test.t3)
>> master-bin.000001 # Write_rows # # table_id: #
>> flags: STMT_END_F
>> +master-bin.000001 # Table_map # # table_id: # (test.t3)
>> +master-bin.000001 # Write_rows # # table_id: # flags:
>> STMT_END_F
>> +master-bin.000001 # Table_map # # table_id: # (test.t3)
>> +master-bin.000001 # Write_rows # # table_id: # flags:
>> STMT_END_F
>> master-bin.000001 # Query # # COMMIT
>> master-bin.000001 # Query # # use `test`; create
>> table t6(a VARCHAR(60)) engine= myisam
>> master-bin.000001 # Query # # BEGIN
>> @@ -526,10 +533,18 @@ BEGIN
>> ### SET
>> ### @1=1 /* INT meta=0 nullable=1 is_null=0 */
>> ### @2=5 /* INT meta=0 nullable=1 is_null=0 */
>> +# at #
>> +# at #
>> +#server id # end_log_pos # Table_map: `test`.`t3` mapped to
>> number #
>> +#server id # end_log_pos # Write_rows: table id # flags:
>> STMT_END_F
>> ### INSERT INTO test.t3
>> ### SET
>> ### @1=1 /* INT meta=0 nullable=1 is_null=0 */
>> ### @2=6 /* INT meta=0 nullable=1 is_null=0 */
>> +# at #
>> +# at #
>> +#server id # end_log_pos # Table_map: `test`.`t3` mapped to
>> number #
>> +#server id # end_log_pos # Write_rows: table id # flags:
>> STMT_END_F
>> ### INSERT INTO test.t3
>> ### SET
>> ### @1=1 /* INT meta=0 nullable=1 is_null=0 */
>> @@ -935,6 +950,14 @@ slave-bin.000001 # Rows_query # #
>> # inse
>> slave-bin.000001 # Table_map # # table_id: # (test.t3)
>> slave-bin.000001 # Write_rows # # table_id: # flags:
>> STMT_END_F
>> slave-bin.000001 # Query # # COMMIT
>> +slave-bin.000001 # Query # # BEGIN
>> +slave-bin.000001 # Table_map # # table_id: # (test.t3)
>> +slave-bin.000001 # Write_rows # # table_id: # flags:
>> STMT_END_F
>> +slave-bin.000001 # Query # # COMMIT
>> +slave-bin.000001 # Query # # BEGIN
>> +slave-bin.000001 # Table_map # # table_id: # (test.t3)
>> +slave-bin.000001 # Write_rows # # table_id: # flags:
>> STMT_END_F
>> +slave-bin.000001 # Query # # COMMIT
>> slave-bin.000001 # Query # # use `test`; create
>> table t6(a VARCHAR(60)) engine= myisam
>> slave-bin.000001 # Query # # BEGIN
>> slave-bin.000001 # Rows_query # # # load data infile
>> '../../std_data/words.dat' into table t6
>>
>> === modified file 'mysql-test/suite/rpl/t/rpl_row_ignorable_event.test'
>> --- a/mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
>> 2010-08-06 02:20:44 +0000
>> +++ b/mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
>> 2010-10-12 01:20:57 +0000
>> @@ -12,6 +12,8 @@ source include/master-slave.inc;
>> source include/have_binlog_rows_query.inc;
>> source include/have_innodb.inc;
>>
>> +SET @old_debug= @@global.debug;
>> +SET GLOBAL debug="+d,waiting_for_delayed_insert_queue_is_empty";
>> --echo # Test non-transaction
>> let $binlog_start= query_get_value("SHOW MASTER STATUS", Position, 1);
>> let $master_binlog= query_get_value(SHOW MASTER STATUS, File, 1);
>> @@ -58,7 +60,12 @@ insert into t5(a, b) values(3,1);
>> update t4,t5 set t4.a=4, t5.a=5 where t4.b=t5.b;
>>
>> --echo # Test insert delayed ...
>
>> +let $table=t3;
>> +let $count=1;
>> insert delayed into t3(a,b) values(1,5),(1,6),(1,7);
>> +inc $count; inc $count; inc $count;
>
> Please, just do let $count=3;
>
>> +--source include/wait_until_rows_count.inc
>> +SET @@global.debug= @old_debug;
>>
>> --echo # Test load data infile
>> create table t6(a VARCHAR(60)) engine= myisam;
>>
>> === modified file 'sql/log_event.cc'
>> --- a/sql/log_event.cc 2010-09-24 15:24:54 +0000
>> +++ b/sql/log_event.cc 2010-10-12 01:20:57 +0000
>> @@ -128,10 +128,11 @@ static const char *HA_ERR(int i)
>> /**
>> Delay to delete the Rows_query log event until all its rows event
>> are applied
>>
>> + @param thd pointer to the thread for executing the log event
>> @param ev log event should be deleted
>> @param rli Relay_log_info structure for the slave IO thread.
>> */
>> -void handle_rows_query_log_event(Log_event *ev, Relay_log_info *rli)
>> +void handle_rows_query_log_event(THD* thd, Log_event *ev,
>> Relay_log_info *rli)
>> {
>
>
> I don't think you need to change the signature here.
> You can access the thread by doing rli->info_thd.
>
>> DBUG_ENTER("handle_rows_query_log_event");
>> Log_event_type ev_type= ev->get_type_code();
>> @@ -143,6 +144,7 @@ void handle_rows_query_log_event(Log_eve
>> {
>> delete rli->rows_query_ev;
>> rli->rows_query_ev= NULL;
>> + thd->set_query(NULL, 0);
>> }
>>
>
> Cheers.
>
