Skip to content

Commit c862c15

Browse files
vuvovavuvova
committed
cleanup: [partial] removal of llstr()
now when my_vsnprintf() supports %llu for a few years already.
1 parent fff6f42 commit c862c15

File tree

4 files changed

+97
-167
lines changed

4 files changed

+97
-167
lines changed

‎sql/log.cc

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4281,12 +4281,9 @@ int MYSQL_BIN_LOG::purge_first_log(Relay_log_info* rli, bool included)
42814281
if((error=find_log_pos(&rli->linfo, rli->event_relay_log_name, 0)) ||
42824282
(error=find_next_log(&rli->linfo, 0)))
42834283
{
4284-
char buff[22];
4285-
sql_print_error("next log error: %d offset: %s log: %s included: %d",
4286-
error,
4287-
llstr(rli->linfo.index_file_offset,buff),
4288-
rli->event_relay_log_name,
4289-
included);
4284+
sql_print_error("next log error: %d offset: %llu log: %s included: %d",
4285+
error, rli->linfo.index_file_offset,
4286+
rli->event_relay_log_name, included);
42904287
goto err;
42914288
}
42924289

@@ -4327,12 +4324,9 @@ int MYSQL_BIN_LOG::purge_first_log(Relay_log_info* rli, bool included)
43274324
*/
43284325
if((error=find_log_pos(&rli->linfo, rli->event_relay_log_name, 0)))
43294326
{
4330-
char buff[22];
4331-
sql_print_error("next log error: %d offset: %s log: %s included: %d",
4332-
error,
4333-
llstr(rli->linfo.index_file_offset,buff),
4334-
rli->group_relay_log_name,
4335-
included);
4327+
sql_print_error("next log error: %d offset: %llu log: %s included: %d",
4328+
error, rli->linfo.index_file_offset,
4329+
rli->group_relay_log_name, included);
43364330
goto err;
43374331
}
43384332

‎sql/log_event.cc

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3388,14 +3388,10 @@ Query_log_event::Query_log_event(const char* buf, uint event_len,
33883388
break;
33893389
case Q_SQL_MODE_CODE:
33903390
{
3391-
#ifndef DBUG_OFF
3392-
char buff[22];
3393-
#endif
33943391
CHECK_SPACE(pos, end, 8);
33953392
sql_mode_inited= 1;
33963393
sql_mode= (ulong) uint8korr(pos); // QQ: Fix when sql_mode is ulonglong
3397-
DBUG_PRINT("info",("In Query_log_event, read sql_mode: %s",
3398-
llstr(sql_mode, buff)));
3394+
DBUG_PRINT("info",("In Query_log_event, read sql_mode: %llu", sql_mode));
33993395
pos+= 8;
34003396
break;
34013397
}
@@ -5787,7 +5783,6 @@ int Load_log_event::do_apply_event(NET* net, rpl_group_info *rgi,
57875783
}
57885784
else
57895785
{
5790-
char llbuff[22];
57915786
enum enum_duplicates handle_dup;
57925787
bool ignore= 0;
57935788
char query_buffer[1024];
@@ -5888,10 +5883,9 @@ int Load_log_event::do_apply_event(NET* net, rpl_group_info *rgi,
58885883
{
58895884
/* log_pos is the position of the LOAD event in the master log */
58905885
sql_print_warning("Slave: load data infile on table '%s' at "
5891-
"log position %s in log '%s' produced %ld "
5886+
"log position %llu in log '%s' produced %ld "
58925887
"warning(s). Default database: '%s'",
5893-
(char*) table_name,
5894-
llstr(log_pos,llbuff), RPL_LOG_NAME,
5888+
(char*) table_name, log_pos, RPL_LOG_NAME,
58955889
(ulong) thd->cuted_fields,
58965890
print_slave_db_safe(thd->db));
58975891
}
@@ -5999,12 +5993,11 @@ Error '%s' running LOAD DATA INFILE on table '%s'. Default database: '%s'",
59995993
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
60005994
void Rotate_log_event::pack_info(THD *thd, Protocol *protocol)
60015995
{
6002-
char buf1[256], buf[22];
6003-
String tmp(buf1, sizeof(buf1), log_cs);
5996+
StringBuffer<256> tmp(log_cs);
60045997
tmp.length(0);
60055998
tmp.append(new_log_ident, ident_len);
60065999
tmp.append(STRING_WITH_LEN(";pos="));
6007-
tmp.append(llstr(pos,buf));
6000+
tmp.append_ulonglong(pos);
60086001
protocol->store(tmp.ptr(), tmp.length(), &my_charset_bin);
60096002
}
60106003
#endif

‎sql/rpl_rli.cc

Lines changed: 20 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -395,24 +395,16 @@ Failed to open the existing relay log info file '%s' (errno %d)",
395395
0 /* no data lock*/,
396396
&msg, 0))
397397
{
398-
char llbuf[22];
399-
sql_print_error("Failed to open the relay log '%s' (relay_log_pos %s)",
400-
rli->group_relay_log_name,
401-
llstr(rli->group_relay_log_pos, llbuf));
398+
sql_print_error("Failed to open the relay log '%s' (relay_log_pos %llu)",
399+
rli->group_relay_log_name, rli->group_relay_log_pos);
402400
goto err;
403401
}
404402
}
405403

406-
#ifndef DBUG_OFF
407-
{
408-
char llbuf1[22], llbuf2[22];
409-
DBUG_PRINT("info", ("my_b_tell(rli->cur_log)=%s rli->event_relay_log_pos=%s",
410-
llstr(my_b_tell(rli->cur_log),llbuf1),
411-
llstr(rli->event_relay_log_pos,llbuf2)));
412-
DBUG_ASSERT(rli->event_relay_log_pos >= BIN_LOG_HEADER_SIZE);
413-
DBUG_ASSERT(my_b_tell(rli->cur_log) == rli->event_relay_log_pos);
414-
}
415-
#endif
404+
DBUG_PRINT("info", ("my_b_tell(rli->cur_log)=%llu rli->event_relay_log_pos=%llu",
405+
my_b_tell(rli->cur_log), rli->event_relay_log_pos));
406+
DBUG_ASSERT(rli->event_relay_log_pos >= BIN_LOG_HEADER_SIZE);
407+
DBUG_ASSERT(my_b_tell(rli->cur_log) == rli->event_relay_log_pos);
416408

417409
/*
418410
Now change the cache from READ to WRITE - must do this
@@ -457,10 +449,7 @@ static inline int add_relay_log(Relay_log_info* rli,LOG_INFO* linfo)
457449
DBUG_RETURN(1);
458450
}
459451
rli->log_space_total += s.st_size;
460-
#ifndef DBUG_OFF
461-
char buf[22];
462-
DBUG_PRINT("info",("log_space_total: %s", llstr(rli->log_space_total,buf)));
463-
#endif
452+
DBUG_PRINT("info",("log_space_total: %llu", rli->log_space_total));
464453
DBUG_RETURN(0);
465454
}
466455

@@ -725,14 +714,8 @@ int init_relay_log_pos(Relay_log_info* rli,const char* log,
725714
rli->relay_log.description_event_for_exec= fdev;
726715
}
727716
my_b_seek(rli->cur_log,(off_t)pos);
728-
#ifndef DBUG_OFF
729-
{
730-
char llbuf1[22], llbuf2[22];
731-
DBUG_PRINT("info", ("my_b_tell(rli->cur_log)=%s rli->event_relay_log_pos=%s",
732-
llstr(my_b_tell(rli->cur_log),llbuf1),
733-
llstr(rli->event_relay_log_pos,llbuf2)));
734-
}
735-
#endif
717+
DBUG_PRINT("info", ("my_b_tell(rli->cur_log)=%llu rli->event_relay_log_pos=%llu",
718+
my_b_tell(rli->cur_log), rli->event_relay_log_pos));
736719

737720
}
738721

@@ -1165,10 +1148,7 @@ int purge_relay_logs(Relay_log_info* rli, THD *thd, bool just_reset,
11651148
}
11661149

11671150
err:
1168-
#ifndef DBUG_OFF
1169-
char buf[22];
1170-
#endif
1171-
DBUG_PRINT("info",("log_space_total: %s",llstr(rli->log_space_total,buf)));
1151+
DBUG_PRINT("info",("log_space_total: %llu",rli->log_space_total));
11721152
mysql_mutex_unlock(&rli->data_lock);
11731153
DBUG_RETURN(error);
11741154
}
@@ -1225,21 +1205,16 @@ bool Relay_log_info::is_until_satisfied(my_off_t master_beg_pos)
12251205
log_pos= group_relay_log_pos;
12261206
}
12271207

1228-
#ifndef DBUG_OFF
1229-
{
1230-
char buf[32];
1231-
DBUG_PRINT("info", ("group_master_log_name='%s', group_master_log_pos=%s",
1232-
group_master_log_name, llstr(group_master_log_pos, buf)));
1233-
DBUG_PRINT("info", ("group_relay_log_name='%s', group_relay_log_pos=%s",
1234-
group_relay_log_name, llstr(group_relay_log_pos, buf)));
1235-
DBUG_PRINT("info", ("(%s) log_name='%s', log_pos=%s",
1236-
until_condition == UNTIL_MASTER_POS ? "master" : "relay",
1237-
log_name, llstr(log_pos, buf)));
1238-
DBUG_PRINT("info", ("(%s) until_log_name='%s', until_log_pos=%s",
1239-
until_condition == UNTIL_MASTER_POS ? "master" : "relay",
1240-
until_log_name, llstr(until_log_pos, buf)));
1241-
}
1242-
#endif
1208+
DBUG_PRINT("info", ("group_master_log_name='%s', group_master_log_pos=%llu",
1209+
group_master_log_name, group_master_log_pos));
1210+
DBUG_PRINT("info", ("group_relay_log_name='%s', group_relay_log_pos=%llu",
1211+
group_relay_log_name, group_relay_log_pos));
1212+
DBUG_PRINT("info", ("(%s) log_name='%s', log_pos=%llu",
1213+
until_condition == UNTIL_MASTER_POS ? "master" : "relay",
1214+
log_name, log_pos));
1215+
DBUG_PRINT("info", ("(%s) until_log_name='%s', until_log_pos=%llu",
1216+
until_condition == UNTIL_MASTER_POS ? "master" : "relay",
1217+
until_log_name, until_log_pos));
12431218

12441219
if (until_log_names_cmp_result == UNTIL_LOG_NAMES_CMP_UNKNOWN)
12451220
{

0 commit comments

Comments
 (0)