mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
MDEV-29269 Spider: remove #ifdef ITEM_FUNC_TIMESTAMPDIFF_ARE_PUBLIC
Produced using the following command unifdef -UITEM_FUNC_TIMESTAMPDIFF_ARE_PUBLIC -m storage/spider/spd_* Signed-off-by: Yuchen Pei <yuchen.pei@mariadb.com> Reviewed-by: nayuta.yanagisawa@mariadb.com
This commit is contained in:
@@ -5839,88 +5839,7 @@ int spider_db_mbase_util::open_item_func(
|
|||||||
alias, alias_length, dbton_id, use_fields, fields));
|
alias, alias_length, dbton_id, use_fields, fields));
|
||||||
} else if (!strncasecmp("timestampdiff", func_name, func_name_length))
|
} else if (!strncasecmp("timestampdiff", func_name, func_name_length))
|
||||||
{
|
{
|
||||||
#ifdef ITEM_FUNC_TIMESTAMPDIFF_ARE_PUBLIC
|
|
||||||
Item_func_timestamp_diff *item_func_timestamp_diff =
|
|
||||||
(Item_func_timestamp_diff *) item_func;
|
|
||||||
if (str)
|
|
||||||
{
|
|
||||||
const char *interval_str;
|
|
||||||
uint interval_len;
|
|
||||||
switch (item_func_timestamp_diff->int_type)
|
|
||||||
{
|
|
||||||
case INTERVAL_YEAR:
|
|
||||||
interval_str = SPIDER_SQL_YEAR_STR;
|
|
||||||
interval_len = SPIDER_SQL_YEAR_LEN;
|
|
||||||
break;
|
|
||||||
case INTERVAL_QUARTER:
|
|
||||||
interval_str = SPIDER_SQL_QUARTER_STR;
|
|
||||||
interval_len = SPIDER_SQL_QUARTER_LEN;
|
|
||||||
break;
|
|
||||||
case INTERVAL_MONTH:
|
|
||||||
interval_str = SPIDER_SQL_MONTH_STR;
|
|
||||||
interval_len = SPIDER_SQL_MONTH_LEN;
|
|
||||||
break;
|
|
||||||
case INTERVAL_WEEK:
|
|
||||||
interval_str = SPIDER_SQL_WEEK_STR;
|
|
||||||
interval_len = SPIDER_SQL_WEEK_LEN;
|
|
||||||
break;
|
|
||||||
case INTERVAL_DAY:
|
|
||||||
interval_str = SPIDER_SQL_DAY_STR;
|
|
||||||
interval_len = SPIDER_SQL_DAY_LEN;
|
|
||||||
break;
|
|
||||||
case INTERVAL_HOUR:
|
|
||||||
interval_str = SPIDER_SQL_HOUR_STR;
|
|
||||||
interval_len = SPIDER_SQL_HOUR_LEN;
|
|
||||||
break;
|
|
||||||
case INTERVAL_MINUTE:
|
|
||||||
interval_str = SPIDER_SQL_MINUTE_STR;
|
|
||||||
interval_len = SPIDER_SQL_MINUTE_LEN;
|
|
||||||
break;
|
|
||||||
case INTERVAL_SECOND:
|
|
||||||
interval_str = SPIDER_SQL_SECOND_STR;
|
|
||||||
interval_len = SPIDER_SQL_SECOND_LEN;
|
|
||||||
break;
|
|
||||||
case INTERVAL_MICROSECOND:
|
|
||||||
interval_str = SPIDER_SQL_MICROSECOND_STR;
|
|
||||||
interval_len = SPIDER_SQL_MICROSECOND_LEN;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
interval_str = "";
|
|
||||||
interval_len = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
|
|
||||||
if (str->reserve(func_name_length + SPIDER_SQL_OPEN_PAREN_LEN +
|
|
||||||
interval_len + SPIDER_SQL_COMMA_LEN))
|
|
||||||
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
|
|
||||||
str->q_append(func_name, func_name_length);
|
|
||||||
str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
|
|
||||||
str->q_append(interval_str, interval_len);
|
|
||||||
str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
|
|
||||||
}
|
|
||||||
if ((error_num = spider_db_print_item_type(item_list[0], NULL, spider,
|
|
||||||
str, alias, alias_length, dbton_id, use_fields, fields)))
|
|
||||||
DBUG_RETURN(error_num);
|
|
||||||
if (str)
|
|
||||||
{
|
|
||||||
if (str->reserve(SPIDER_SQL_COMMA_LEN))
|
|
||||||
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
|
|
||||||
str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
|
|
||||||
}
|
|
||||||
if ((error_num = spider_db_print_item_type(item_list[1], NULL, spider,
|
|
||||||
str, alias, alias_length, dbton_id, use_fields, fields)))
|
|
||||||
DBUG_RETURN(error_num);
|
|
||||||
if (str)
|
|
||||||
{
|
|
||||||
if (str->reserve(SPIDER_SQL_CLOSE_PAREN_LEN))
|
|
||||||
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
|
|
||||||
str->q_append(SPIDER_SQL_CLOSE_PAREN_STR,
|
|
||||||
SPIDER_SQL_CLOSE_PAREN_LEN);
|
|
||||||
}
|
|
||||||
DBUG_RETURN(0);
|
|
||||||
#else
|
|
||||||
DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
|
DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
} else if (func_name_length == 14)
|
} else if (func_name_length == 14)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user