mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
b6ff139aa3
Changes: - To detect automatic strlen() I removed the methods in String that uses 'const char *' without a length: - String::append(const char*) - Binary_string(const char *str) - String(const char *str, CHARSET_INFO *cs) - append_for_single_quote(const char *) All usage of append(const char*) is changed to either use String::append(char), String::append(const char*, size_t length) or String::append(LEX_CSTRING) - Added STRING_WITH_LEN() around constant string arguments to String::append() - Added overflow argument to escape_string_for_mysql() and escape_quotes_for_mysql() instead of returning (size_t) -1 on overflow. This was needed as most usage of the above functions never tested the result for -1 and would have given wrong results or crashes in case of overflows. - Added Item_func_or_sum::func_name_cstring(), which returns LEX_CSTRING. Changed all Item_func::func_name()'s to func_name_cstring()'s. The old Item_func_or_sum::func_name() is now an inline function that returns func_name_cstring().str. - Changed Item::mode_name() and Item::func_name_ext() to return LEX_CSTRING. - Changed for some functions the name argument from const char * to to const LEX_CSTRING &: - Item::Item_func_fix_attributes() - Item::check_type_...() - Type_std_attributes::agg_item_collations() - Type_std_attributes::agg_item_set_converter() - Type_std_attributes::agg_arg_charsets...() - Type_handler_hybrid_field_type::aggregate_for_result() - Type_handler_geometry::check_type_geom_or_binary() - Type_handler::Item_func_or_sum_illegal_param() - Predicant_to_list_comparator::add_value_skip_null() - Predicant_to_list_comparator::add_value() - cmp_item_row::prepare_comparators() - cmp_item_row::aggregate_row_elements_for_comparison() - Cursor_ref::print_func() - Removes String_space() as it was only used in one cases and that could be simplified to not use String_space(), thanks to the fixed my_vsnprintf(). - Added some const LEX_CSTRING's for common strings: - NULL_clex_str, DATA_clex_str, INDEX_clex_str. - Changed primary_key_name to a LEX_CSTRING - Renamed String::set_quick() to String::set_buffer_if_not_allocated() to clarify what the function really does. - Rename of protocol function: bool store(const char *from, CHARSET_INFO *cs) to bool store_string_or_null(const char *from, CHARSET_INFO *cs). This was done to both clarify the difference between this 'store' function and also to make it easier to find unoptimal usage of store() calls. - Added Protocol::store(const LEX_CSTRING*, CHARSET_INFO*) - Changed some 'const char*' arrays to instead be of type LEX_CSTRING. - class Item_func_units now used LEX_CSTRING for name. Other things: - Fixed a bug in mysql.cc:construct_prompt() where a wrong escape character in the prompt would cause some part of the prompt to be duplicated. - Fixed a lot of instances where the length of the argument to append is known or easily obtain but was not used. - Removed some not needed 'virtual' definition for functions that was inherited from the parent. I added override to these. - Fixed Ordered_key::print() to preallocate needed buffer. Old code could case memory overruns. - Simplified some loops when adding char * to a String with delimiters.
122 lines
3.3 KiB
C++
122 lines
3.3 KiB
C++
/*
|
|
Copyright (c) 2015 MariaDB Corporation Ab
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
|
|
|
|
#ifdef USE_PRAGMA_IMPLEMENTATION
|
|
#pragma implementation // gcc: Class implementation
|
|
#endif
|
|
|
|
#include "mariadb.h"
|
|
#include "sql_priv.h"
|
|
#include "sql_select.h"
|
|
#include "my_json_writer.h"
|
|
|
|
void Filesort_tracker::print_json_members(Json_writer *writer)
|
|
{
|
|
const char *varied_str= "(varied across executions)";
|
|
String str;
|
|
|
|
if (!get_r_loops())
|
|
writer->add_member("r_loops").add_null();
|
|
else
|
|
writer->add_member("r_loops").add_ll(get_r_loops());
|
|
|
|
if (get_r_loops() && time_tracker.timed)
|
|
{
|
|
writer->add_member("r_total_time_ms").
|
|
add_double(time_tracker.get_time_ms());
|
|
}
|
|
if (r_limit != HA_POS_ERROR)
|
|
{
|
|
writer->add_member("r_limit");
|
|
if (!get_r_loops())
|
|
writer->add_null();
|
|
else if (r_limit == 0)
|
|
writer->add_str(varied_str);
|
|
else
|
|
writer->add_ll(r_limit);
|
|
}
|
|
|
|
writer->add_member("r_used_priority_queue");
|
|
if (!get_r_loops())
|
|
writer->add_null();
|
|
else if (r_used_pq == get_r_loops())
|
|
writer->add_bool(true);
|
|
else if (r_used_pq == 0)
|
|
writer->add_bool(false);
|
|
else
|
|
writer->add_str(varied_str);
|
|
|
|
if (!get_r_loops())
|
|
writer->add_member("r_output_rows").add_null();
|
|
else
|
|
writer->add_member("r_output_rows").add_ll(
|
|
(longlong) rint((double)r_output_rows / get_r_loops()));
|
|
|
|
if (sort_passes)
|
|
{
|
|
writer->add_member("r_sort_passes").add_ll(
|
|
(longlong) rint((double)sort_passes / get_r_loops()));
|
|
}
|
|
|
|
if (sort_buffer_size != 0)
|
|
{
|
|
writer->add_member("r_buffer_size");
|
|
if (sort_buffer_size == ulonglong(-1))
|
|
writer->add_str(varied_str);
|
|
else
|
|
writer->add_size(sort_buffer_size);
|
|
}
|
|
|
|
get_data_format(&str);
|
|
writer->add_member("r_sort_mode").add_str(str.ptr(), str.length());
|
|
}
|
|
|
|
void Filesort_tracker::get_data_format(String *str)
|
|
{
|
|
if (r_sort_keys_packed)
|
|
str->append(STRING_WITH_LEN("packed_sort_key"));
|
|
else
|
|
str->append(STRING_WITH_LEN("sort_key"));
|
|
str->append(',');
|
|
|
|
if (r_using_addons)
|
|
{
|
|
if (r_packed_addon_fields)
|
|
str->append(STRING_WITH_LEN("packed_addon_fields"));
|
|
else
|
|
str->append(STRING_WITH_LEN("addon_fields"));
|
|
}
|
|
else
|
|
str->append(STRING_WITH_LEN("rowid"));
|
|
}
|
|
|
|
void attach_gap_time_tracker(THD *thd, Gap_time_tracker *gap_tracker,
|
|
ulonglong timeval)
|
|
{
|
|
thd->gap_tracker_data.bill_to= gap_tracker;
|
|
thd->gap_tracker_data.start_time= timeval;
|
|
}
|
|
|
|
void process_gap_time_tracker(THD *thd, ulonglong timeval)
|
|
{
|
|
if (thd->gap_tracker_data.bill_to)
|
|
{
|
|
thd->gap_tracker_data.bill_to->log_time(thd->gap_tracker_data.start_time,
|
|
timeval);
|
|
thd->gap_tracker_data.bill_to= NULL;
|
|
}
|
|
}
|
|
|