summaryrefslogtreecommitdiff
path: root/sql/group_by_handler.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-04-04 12:16:12 +0300
committerMonty <monty@mariadb.org>2018-05-07 00:07:32 +0300
commit30ebc3ee9efcab635b1f3e14b9198a58ae93c233 (patch)
tree81e3ad66cd4ec8693964317cbf23515d0e9ecf35 /sql/group_by_handler.cc
parenta22a339f8e044a1e8df011beb0b4c8f43792ac96 (diff)
downloadmariadb-git-30ebc3ee9efcab635b1f3e14b9198a58ae93c233.tar.gz
Add likely/unlikely to speed up execution
Added to: - if (error) - Lex - sql_yacc.yy and sql_yacc_ora.yy - In header files to alloc() calls - Added thd argument to thd_net_is_killed()
Diffstat (limited to 'sql/group_by_handler.cc')
-rw-r--r--sql/group_by_handler.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/group_by_handler.cc b/sql/group_by_handler.cc
index e75800d8986..c92df8922ce 100644
--- a/sql/group_by_handler.cc
+++ b/sql/group_by_handler.cc
@@ -63,7 +63,7 @@ int Pushdown_query::execute(JOIN *join)
while (!(err= handler->next_row()))
{
- if (thd->check_killed())
+ if (unlikely(thd->check_killed()))
{
thd->send_kill_message();
handler->end_scan();
@@ -78,7 +78,7 @@ int Pushdown_query::execute(JOIN *join)
if ((err= table->file->ha_write_tmp_row(table->record[0])))
{
bool is_duplicate;
- if (!table->file->is_fatal_error(err, HA_CHECK_DUP))
+ if (likely(!table->file->is_fatal_error(err, HA_CHECK_DUP)))
continue; // Distinct elimination
if (create_internal_tmp_table_from_heap(thd, table,
@@ -98,7 +98,7 @@ int Pushdown_query::execute(JOIN *join)
{
int error;
/* result < 0 if row was not accepted and should not be counted */
- if ((error= join->result->send_data(*join->fields)))
+ if (unlikely((error= join->result->send_data(*join->fields))))
{
handler->end_scan();
DBUG_RETURN(error < 0 ? 0 : -1);