database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '11.0' into 11.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-08 18:03:08 +01:00
parent 855356ca6d 48af85db21
commit 0f5613a25f
598 changed files with 15367 additions and 9121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
sql/opt_range.cc
View File

@@ -2705,18 +2705,26 @@ static int fill_used_fields_bitmap(PARAM *param)
force_quick_range is really needed.
RETURN
-1 if error or impossible select (i.e. certainly no rows will be selected)
0 if can't use quick_select
1 if found usable ranges and quick select has been successfully created.
SQL_SELECT::
IMPOSSIBLE_RANGE,
impossible select (i.e. certainly no rows will be selected)
ERROR,
an error occurred, either memory or in evaluating conditions
OK = 1,
either
found usable ranges and quick select has been successfully created.
or can't use quick_select
*/
int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
table_map prev_tables,
ha_rows limit, bool force_quick_range,
bool ordered_output,
bool remove_false_parts_of_where,
bool only_single_index_range_scan,
bool suppress_unusable_key_notes)
quick_select_return
SQL_SELECT::test_quick_select(THD *thd,
key_map keys_to_use,
table_map prev_tables,
ha_rows limit, bool force_quick_range,
bool ordered_output,
bool remove_false_parts_of_where,
bool only_single_index_range_scan,
bool suppress_unusable_key_notes)
{
uint idx;
Item *notnull_cond= NULL;
@@ -2724,7 +2732,8 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
SEL_ARG **backup_keys= 0;
ha_rows table_records= head->stat_records();
handler *file= head->file;
bool impossible_range= 0;
quick_select_return returnval= OK;
DBUG_ENTER("SQL_SELECT::test_quick_select");
DBUG_PRINT("enter",("keys_to_use: %lu prev_tables: %lu const_tables: %lu",
(ulong) keys_to_use.to_ulonglong(), (ulong) prev_tables,
@@ -2739,7 +2748,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
head->with_impossible_ranges.clear_all();
DBUG_ASSERT(!head->is_filled_at_execution());
if (keys_to_use.is_clear_all() || head->is_filled_at_execution())
DBUG_RETURN(0);
DBUG_RETURN(OK);
records= table_records;
notnull_cond= head->notnull_cond;
if (file->ha_table_flags() & HA_NON_COMPARABLE_ROWID)
@@ -2781,7 +2790,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
bool force_group_by= false, group_by_optimization_used= false;
if (check_stack_overrun(thd, 2*STACK_MIN_SIZE + sizeof(PARAM), buff))
DBUG_RETURN(0); // Fatal error flag is set
DBUG_RETURN(ERROR); // Fatal error flag is set
/* set up parameter that is passed to all functions */
bzero((void*) &param, sizeof(param));
@@ -2818,7 +2827,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
{
thd->no_errors=0;
free_root(&alloc,MYF(0)); // Return memory & allocator
DBUG_RETURN(-1); // Error
DBUG_RETURN(ERROR);
}
key_parts= param.key_parts;
@@ -2888,7 +2897,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
{
thd->no_errors=0;
free_root(&alloc,MYF(0)); // Return memory & allocator
DBUG_RETURN(-1); // Error
DBUG_RETURN(ERROR);
}
thd->mem_root= &alloc;
@@ -2947,8 +2956,8 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
{
if (tree->type == SEL_TREE::IMPOSSIBLE)
{
records= 0;
impossible_range= 1; /* Return -1 from this function. */
records=0L;
returnval= IMPOSSIBLE_RANGE;
read_time= (double) HA_POS_ERROR;
trace_range.add("impossible_range", true);
goto free_mem;
@@ -2968,7 +2977,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
thd->no_errors=0;
thd->mem_root= param.old_root;
free_root(&alloc, MYF(0));
DBUG_RETURN(-1);
DBUG_RETURN(ERROR);
}
}
@@ -3144,7 +3153,8 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
if (best_trp)
{
records= best_trp->records;
impossible_range= records == 0; // No matching rows
if (records == 0)
returnval= IMPOSSIBLE_RANGE;
if (!(quick= best_trp->make_quick(&param, TRUE)) || quick->init())
{
delete quick;
@@ -3182,7 +3192,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
limit rows if we are using a key
*/
set_if_smaller(records, table_records);
DBUG_RETURN(impossible_range ? -1 : MY_TEST(quick));
DBUG_RETURN(returnval);
}
/****************************************************************************
@@ -3651,6 +3661,7 @@ end_of_range_loop:
init_sql_alloc(key_memory_quick_range_select_root, &alloc,
thd->variables.range_alloc_block_size, 0,
MYF(MY_THREAD_SPECIFIC));
bzero((void*) &param, sizeof(param));
param.thd= thd;
param.mem_root= &alloc;
param.old_root= thd->mem_root;
@@ -9284,11 +9295,28 @@ SEL_ARG *Field_str::get_mm_leaf(RANGE_OPT_PARAM *prm, KEY_PART *key_part,
const Item_bool_func *cond,
scalar_comparison_op op, Item *value)
{
int err;
DBUG_ENTER("Field_str::get_mm_leaf");
if (can_optimize_scalar_range(prm, key_part, cond, op, value) !=
Data_type_compatibility::OK)
DBUG_RETURN(0);
int err= value->save_in_field_no_warnings(this, 1);
{
/*
Do CharsetNarrowing if necessary
This means that we are temporary changing the character set of the
current key field to make key lookups possible.
This is needed when comparing an utf8mb3 key field with an utf8mb4 value.
See cset_narrowing.h for more details.
*/
bool do_narrowing=
Utf8_narrow::should_do_narrowing(this, value->collation.collation);
Utf8_narrow narrow(this, do_narrowing);
err= value->save_in_field_no_warnings(this, 1);
narrow.stop();
}
if ((op != SCALAR_CMP_EQUAL && is_real_null()) || err < 0)
DBUG_RETURN(&null_element);
if (err > 0)