mirror of
https://github.com/MariaDB/server.git
synced 2025-02-16 10:25:34 +01:00
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-bug18558-pnd sql/opt_range.cc: Auto merged
This commit is contained in:
commit
c992a1f7bb
6 changed files with 208 additions and 48 deletions
|
@ -597,3 +597,65 @@ NULL
|
||||||
explain partitions select * from t1 where f_int1 is null;
|
explain partitions select * from t1 where f_int1 is null;
|
||||||
id select_type table partitions type possible_keys key key_len ref rows Extra
|
id select_type table partitions type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 part4_p2sp0 system NULL NULL NULL NULL 1
|
1 SIMPLE t1 part4_p2sp0 system NULL NULL NULL NULL 1
|
||||||
|
drop table t1;
|
||||||
|
create table t1 (a int not null, b int not null)
|
||||||
|
partition by list(a)
|
||||||
|
subpartition by hash(b) subpartitions 4
|
||||||
|
(
|
||||||
|
partition p0 values in (1),
|
||||||
|
partition p1 values in (2),
|
||||||
|
partition p2 values in (3)
|
||||||
|
);
|
||||||
|
insert into t1 values (1,1),(1,2),(1,3),(1,4),
|
||||||
|
(2,1),(2,2),(2,3),(2,4);
|
||||||
|
explain partitions select * from t1 where a=1 AND (b=1 OR b=2);
|
||||||
|
id select_type table partitions type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t1 p0_p0sp1,p0_p0sp2 ALL NULL NULL NULL NULL 2 Using where
|
||||||
|
drop table t1;
|
||||||
|
create table t1 (a int, b int not null)
|
||||||
|
partition by list(a)
|
||||||
|
subpartition by hash(b) subpartitions 2
|
||||||
|
(
|
||||||
|
partition p0 values in (1),
|
||||||
|
partition p1 values in (2),
|
||||||
|
partition p2 values in (3),
|
||||||
|
partition pn values in (NULL)
|
||||||
|
);
|
||||||
|
insert into t1 values (1,1),(1,2),(1,3),(1,4),
|
||||||
|
(2,1),(2,2),(2,3),(2,4), (NULL,1);
|
||||||
|
explain partitions select * from t1 where a IS NULL AND (b=1 OR b=2);
|
||||||
|
id select_type table partitions type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t1 pn_p3sp0,pn_p3sp1 system NULL NULL NULL NULL 1
|
||||||
|
explain partitions select * from t1 where (a IS NULL or a < 1) AND (b=1 OR b=2);
|
||||||
|
id select_type table partitions type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t1 pn_p3sp0,pn_p3sp1 system NULL NULL NULL NULL 1
|
||||||
|
explain partitions select * from t1 where (a IS NULL or a < 2) AND (b=1 OR b=2);
|
||||||
|
id select_type table partitions type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t1 p0_p0sp0,p0_p0sp1,pn_p3sp0,pn_p3sp1 ALL NULL NULL NULL NULL 5 Using where
|
||||||
|
explain partitions select * from t1 where (a IS NULL or a <= 1) AND (b=1 OR b=2);
|
||||||
|
id select_type table partitions type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t1 p0_p0sp0,p0_p0sp1,pn_p3sp0,pn_p3sp1 ALL NULL NULL NULL NULL 5 Using where
|
||||||
|
drop table t1;
|
||||||
|
create table t1 ( a int) partition by list (MOD(a, 10))
|
||||||
|
( partition p0 values in (0), partition p1 values in (1),
|
||||||
|
partition p2 values in (2), partition p3 values in (3),
|
||||||
|
partition p4 values in (4), partition p5 values in (5),
|
||||||
|
partition p6 values in (6), partition pn values in (NULL)
|
||||||
|
);
|
||||||
|
insert into t1 values (NULL), (0),(1),(2),(3),(4),(5),(6);
|
||||||
|
explain partitions select * from t1 where a is null or a < 2;
|
||||||
|
id select_type table partitions type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t1 p0,p1,p2,p3,p4,p5,p6,pn ALL NULL NULL NULL NULL 8 Using where
|
||||||
|
drop table t1;
|
||||||
|
create table t1 (s1 int) partition by list (s1)
|
||||||
|
(partition p1 values in (0),
|
||||||
|
partition p2 values in (1),
|
||||||
|
partition p3 values in (null));
|
||||||
|
insert into t1 values (0),(1),(null);
|
||||||
|
select count(*) from t1 where s1 < 0 or s1 is null;
|
||||||
|
count(*)
|
||||||
|
1
|
||||||
|
explain partitions select count(*) from t1 where s1 < 0 or s1 is null;
|
||||||
|
id select_type table partitions type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t1 p3 system NULL NULL NULL NULL 1
|
||||||
|
drop table t1;
|
||||||
|
|
|
@ -492,6 +492,65 @@ insert into t1 set f_int1 = null;
|
||||||
|
|
||||||
select * from t1 where f_int1 is null;
|
select * from t1 where f_int1 is null;
|
||||||
explain partitions select * from t1 where f_int1 is null;
|
explain partitions select * from t1 where f_int1 is null;
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
|
#
|
||||||
|
# BUG#18558
|
||||||
|
#
|
||||||
|
create table t1 (a int not null, b int not null)
|
||||||
|
partition by list(a)
|
||||||
|
subpartition by hash(b) subpartitions 4
|
||||||
|
(
|
||||||
|
partition p0 values in (1),
|
||||||
|
partition p1 values in (2),
|
||||||
|
partition p2 values in (3)
|
||||||
|
);
|
||||||
|
insert into t1 values (1,1),(1,2),(1,3),(1,4),
|
||||||
|
(2,1),(2,2),(2,3),(2,4);
|
||||||
|
explain partitions select * from t1 where a=1 AND (b=1 OR b=2);
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
|
create table t1 (a int, b int not null)
|
||||||
|
partition by list(a)
|
||||||
|
subpartition by hash(b) subpartitions 2
|
||||||
|
(
|
||||||
|
partition p0 values in (1),
|
||||||
|
partition p1 values in (2),
|
||||||
|
partition p2 values in (3),
|
||||||
|
partition pn values in (NULL)
|
||||||
|
);
|
||||||
|
insert into t1 values (1,1),(1,2),(1,3),(1,4),
|
||||||
|
(2,1),(2,2),(2,3),(2,4), (NULL,1);
|
||||||
|
|
||||||
|
explain partitions select * from t1 where a IS NULL AND (b=1 OR b=2);
|
||||||
|
|
||||||
|
explain partitions select * from t1 where (a IS NULL or a < 1) AND (b=1 OR b=2);
|
||||||
|
explain partitions select * from t1 where (a IS NULL or a < 2) AND (b=1 OR b=2);
|
||||||
|
explain partitions select * from t1 where (a IS NULL or a <= 1) AND (b=1 OR b=2);
|
||||||
|
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
|
create table t1 ( a int) partition by list (MOD(a, 10))
|
||||||
|
( partition p0 values in (0), partition p1 values in (1),
|
||||||
|
partition p2 values in (2), partition p3 values in (3),
|
||||||
|
partition p4 values in (4), partition p5 values in (5),
|
||||||
|
partition p6 values in (6), partition pn values in (NULL)
|
||||||
|
);
|
||||||
|
insert into t1 values (NULL), (0),(1),(2),(3),(4),(5),(6);
|
||||||
|
explain partitions select * from t1 where a is null or a < 2;
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
|
# Testcase from BUG#18751
|
||||||
|
create table t1 (s1 int) partition by list (s1)
|
||||||
|
(partition p1 values in (0),
|
||||||
|
partition p2 values in (1),
|
||||||
|
partition p3 values in (null));
|
||||||
|
|
||||||
|
insert into t1 values (0),(1),(null);
|
||||||
|
|
||||||
|
select count(*) from t1 where s1 < 0 or s1 is null;
|
||||||
|
explain partitions select count(*) from t1 where s1 < 0 or s1 is null;
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
# No tests for NULLs in RANGE(monotonic_expr()) - they depend on BUG#15447
|
# No tests for NULLs in RANGE(monotonic_expr()) - they depend on BUG#15447
|
||||||
# being fixed.
|
# being fixed.
|
||||||
|
|
|
@ -2296,8 +2296,6 @@ bool prune_partitions(THD *thd, TABLE *table, Item *pprune_cond)
|
||||||
RANGE_OPT_PARAM *range_par= &prune_param.range_param;
|
RANGE_OPT_PARAM *range_par= &prune_param.range_param;
|
||||||
|
|
||||||
prune_param.part_info= part_info;
|
prune_param.part_info= part_info;
|
||||||
prune_param.part_iter.has_null_value= FALSE;
|
|
||||||
|
|
||||||
init_sql_alloc(&alloc, thd->variables.range_alloc_block_size, 0);
|
init_sql_alloc(&alloc, thd->variables.range_alloc_block_size, 0);
|
||||||
range_par->mem_root= &alloc;
|
range_par->mem_root= &alloc;
|
||||||
range_par->old_root= thd->mem_root;
|
range_par->old_root= thd->mem_root;
|
||||||
|
@ -2730,7 +2728,7 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
|
||||||
key_tree->min_flag | key_tree->max_flag,
|
key_tree->min_flag | key_tree->max_flag,
|
||||||
&ppar->part_iter);
|
&ppar->part_iter);
|
||||||
if (!res)
|
if (!res)
|
||||||
goto go_right; /* res=0 --> no satisfying partitions */
|
goto go_right; /* res==0 --> no satisfying partitions */
|
||||||
if (res == -1)
|
if (res == -1)
|
||||||
{
|
{
|
||||||
//get a full range iterator
|
//get a full range iterator
|
||||||
|
|
|
@ -267,7 +267,7 @@ uint32 get_next_partition_id_range(struct st_partition_iter* part_iter);
|
||||||
static inline void init_single_partition_iterator(uint32 part_id,
|
static inline void init_single_partition_iterator(uint32 part_id,
|
||||||
PARTITION_ITERATOR *part_iter)
|
PARTITION_ITERATOR *part_iter)
|
||||||
{
|
{
|
||||||
part_iter->part_nums.start= part_id;
|
part_iter->part_nums.start= part_iter->part_nums.cur= part_id;
|
||||||
part_iter->part_nums.end= part_id+1;
|
part_iter->part_nums.end= part_id+1;
|
||||||
part_iter->get_next= get_next_partition_id_range;
|
part_iter->get_next= get_next_partition_id_range;
|
||||||
}
|
}
|
||||||
|
@ -277,7 +277,7 @@ static inline
|
||||||
void init_all_partitions_iterator(partition_info *part_info,
|
void init_all_partitions_iterator(partition_info *part_info,
|
||||||
PARTITION_ITERATOR *part_iter)
|
PARTITION_ITERATOR *part_iter)
|
||||||
{
|
{
|
||||||
part_iter->part_nums.start= 0;
|
part_iter->part_nums.start= part_iter->part_nums.cur= 0;
|
||||||
part_iter->part_nums.end= part_info->no_parts;
|
part_iter->part_nums.end= part_info->no_parts;
|
||||||
part_iter->get_next= get_next_partition_id_range;
|
part_iter->get_next= get_next_partition_id_range;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5269,7 +5269,7 @@ static void set_up_range_analysis_info(partition_info *part_info)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Check get_part_iter_for_interval_via_walking() can be used for
|
Check if get_part_iter_for_interval_via_walking() can be used for
|
||||||
partitioning
|
partitioning
|
||||||
*/
|
*/
|
||||||
if (part_info->no_part_fields == 1)
|
if (part_info->no_part_fields == 1)
|
||||||
|
@ -5291,7 +5291,7 @@ static void set_up_range_analysis_info(partition_info *part_info)
|
||||||
|
|
||||||
setup_subparts:
|
setup_subparts:
|
||||||
/*
|
/*
|
||||||
Check get_part_iter_for_interval_via_walking() can be used for
|
Check if get_part_iter_for_interval_via_walking() can be used for
|
||||||
subpartitioning
|
subpartitioning
|
||||||
*/
|
*/
|
||||||
if (part_info->no_subpart_fields == 1)
|
if (part_info->no_subpart_fields == 1)
|
||||||
|
@ -5374,40 +5374,47 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info,
|
||||||
max_endpoint_val= part_info->no_list_values;
|
max_endpoint_val= part_info->no_list_values;
|
||||||
part_iter->get_next= get_next_partition_id_list;
|
part_iter->get_next= get_next_partition_id_list;
|
||||||
part_iter->part_info= part_info;
|
part_iter->part_info= part_info;
|
||||||
|
part_iter->ret_null_part= part_iter->ret_null_part_orig= FALSE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
DBUG_ASSERT(0);
|
DBUG_ASSERT(0);
|
||||||
|
|
||||||
if (field->real_maybe_null() && part_info->has_null_value)
|
/*
|
||||||
|
Find minimum: Do special handling if the interval has left bound in form
|
||||||
|
" NULL <= X ":
|
||||||
|
*/
|
||||||
|
if (field->real_maybe_null() && part_info->has_null_value &&
|
||||||
|
!(flags & (NO_MIN_RANGE | NEAR_MIN)) && *min_value)
|
||||||
{
|
{
|
||||||
if (*min_value)
|
part_iter->ret_null_part= part_iter->ret_null_part_orig= TRUE;
|
||||||
|
part_iter->part_nums.start= part_iter->part_nums.cur= 0;
|
||||||
|
if (*max_value && !(flags & NO_MAX_RANGE))
|
||||||
{
|
{
|
||||||
if (*max_value && !(flags & (NO_MIN_RANGE | NO_MAX_RANGE)))
|
/* The right bound is X <= NULL, i.e. it is a "X IS NULL" interval */
|
||||||
{
|
part_iter->part_nums.end= 0;
|
||||||
init_single_partition_iterator(part_info->has_null_part_id, part_iter);
|
return 1;
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (!(flags & NEAR_MIN))
|
|
||||||
part_iter->has_null_value= TRUE;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* Find minimum */
|
|
||||||
if (flags & NO_MIN_RANGE)
|
|
||||||
part_iter->part_nums.start= 0;
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/*
|
if (flags & NO_MIN_RANGE)
|
||||||
Store the interval edge in the record buffer, and call the
|
part_iter->part_nums.start= part_iter->part_nums.cur= 0;
|
||||||
function that maps the edge in table-field space to an edge
|
else
|
||||||
in ordered-set-of-partitions (for RANGE partitioning) or
|
{
|
||||||
index-in-ordered-array-of-list-constants (for LIST) space.
|
/*
|
||||||
*/
|
Store the interval edge in the record buffer, and call the
|
||||||
store_key_image_to_rec(field, min_value, field_len);
|
function that maps the edge in table-field space to an edge
|
||||||
bool include_endp= part_info->range_analysis_include_bounds ||
|
in ordered-set-of-partitions (for RANGE partitioning) or
|
||||||
!test(flags & NEAR_MIN);
|
index-in-ordered-array-of-list-constants (for LIST) space.
|
||||||
part_iter->part_nums.start= get_endpoint(part_info, 1, include_endp);
|
*/
|
||||||
if (part_iter->part_nums.start == max_endpoint_val)
|
store_key_image_to_rec(field, min_value, field_len);
|
||||||
return 0; /* No partitions */
|
bool include_endp= part_info->range_analysis_include_bounds ||
|
||||||
|
!test(flags & NEAR_MIN);
|
||||||
|
part_iter->part_nums.start= get_endpoint(part_info, 1, include_endp);
|
||||||
|
part_iter->part_nums.cur= part_iter->part_nums.start;
|
||||||
|
if (part_iter->part_nums.start == max_endpoint_val)
|
||||||
|
return 0; /* No partitions */
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Find maximum, do the same as above but for right interval bound */
|
/* Find maximum, do the same as above but for right interval bound */
|
||||||
|
@ -5419,7 +5426,8 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info,
|
||||||
bool include_endp= part_info->range_analysis_include_bounds ||
|
bool include_endp= part_info->range_analysis_include_bounds ||
|
||||||
!test(flags & NEAR_MAX);
|
!test(flags & NEAR_MAX);
|
||||||
part_iter->part_nums.end= get_endpoint(part_info, 0, include_endp);
|
part_iter->part_nums.end= get_endpoint(part_info, 0, include_endp);
|
||||||
if (part_iter->part_nums.start== part_iter->part_nums.end)
|
if (part_iter->part_nums.start == part_iter->part_nums.end &&
|
||||||
|
!part_iter->ret_null_part)
|
||||||
return 0; /* No partitions */
|
return 0; /* No partitions */
|
||||||
}
|
}
|
||||||
return 1; /* Ok, iterator initialized */
|
return 1; /* Ok, iterator initialized */
|
||||||
|
@ -5534,8 +5542,13 @@ int get_part_iter_for_interval_via_walking(partition_info *part_info,
|
||||||
return 0; /* No partitions match */
|
return 0; /* No partitions match */
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags & (NO_MIN_RANGE | NO_MAX_RANGE))
|
if ((field->real_maybe_null() &&
|
||||||
|
((!(flags & NO_MIN_RANGE) && *min_value) || // NULL <? X
|
||||||
|
(!(flags & NO_MAX_RANGE) && *max_value))) || // X <? NULL
|
||||||
|
(flags & (NO_MIN_RANGE | NO_MAX_RANGE))) // -inf at any bound
|
||||||
|
{
|
||||||
return -1; /* Can't handle this interval, have to use all partitions */
|
return -1; /* Can't handle this interval, have to use all partitions */
|
||||||
|
}
|
||||||
|
|
||||||
/* Get integers for left and right interval bound */
|
/* Get integers for left and right interval bound */
|
||||||
longlong a, b;
|
longlong a, b;
|
||||||
|
@ -5553,7 +5566,7 @@ int get_part_iter_for_interval_via_walking(partition_info *part_info,
|
||||||
if (n_values > total_parts || n_values > MAX_RANGE_TO_WALK)
|
if (n_values > total_parts || n_values > MAX_RANGE_TO_WALK)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
part_iter->field_vals.start= a;
|
part_iter->field_vals.start= part_iter->field_vals.cur= a;
|
||||||
part_iter->field_vals.end= b;
|
part_iter->field_vals.end= b;
|
||||||
part_iter->part_info= part_info;
|
part_iter->part_info= part_info;
|
||||||
part_iter->get_next= get_next_func;
|
part_iter->get_next= get_next_func;
|
||||||
|
@ -5565,12 +5578,13 @@ int get_part_iter_for_interval_via_walking(partition_info *part_info,
|
||||||
PARTITION_ITERATOR::get_next implementation: enumerate partitions in range
|
PARTITION_ITERATOR::get_next implementation: enumerate partitions in range
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
get_next_partition_id_list()
|
get_next_partition_id_range()
|
||||||
part_iter Partition set iterator structure
|
part_iter Partition set iterator structure
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
This is implementation of PARTITION_ITERATOR::get_next() that returns
|
This is implementation of PARTITION_ITERATOR::get_next() that returns
|
||||||
[sub]partition ids in [min_partition_id, max_partition_id] range.
|
[sub]partition ids in [min_partition_id, max_partition_id] range.
|
||||||
|
The function conforms to partition_iter_func type.
|
||||||
|
|
||||||
RETURN
|
RETURN
|
||||||
partition id
|
partition id
|
||||||
|
@ -5579,10 +5593,13 @@ int get_part_iter_for_interval_via_walking(partition_info *part_info,
|
||||||
|
|
||||||
uint32 get_next_partition_id_range(PARTITION_ITERATOR* part_iter)
|
uint32 get_next_partition_id_range(PARTITION_ITERATOR* part_iter)
|
||||||
{
|
{
|
||||||
if (part_iter->part_nums.start== part_iter->part_nums.end)
|
if (part_iter->part_nums.cur == part_iter->part_nums.end)
|
||||||
|
{
|
||||||
|
part_iter->part_nums.cur= part_iter->part_nums.start;
|
||||||
return NOT_A_PARTITION_ID;
|
return NOT_A_PARTITION_ID;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
return part_iter->part_nums.start++;
|
return part_iter->part_nums.cur++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -5597,6 +5614,7 @@ uint32 get_next_partition_id_range(PARTITION_ITERATOR* part_iter)
|
||||||
This implementation of PARTITION_ITERATOR::get_next() is special for
|
This implementation of PARTITION_ITERATOR::get_next() is special for
|
||||||
LIST partitioning: it enumerates partition ids in
|
LIST partitioning: it enumerates partition ids in
|
||||||
part_info->list_array[i] where i runs over [min_idx, max_idx] interval.
|
part_info->list_array[i] where i runs over [min_idx, max_idx] interval.
|
||||||
|
The function conforms to partition_iter_func type.
|
||||||
|
|
||||||
RETURN
|
RETURN
|
||||||
partition id
|
partition id
|
||||||
|
@ -5605,18 +5623,20 @@ uint32 get_next_partition_id_range(PARTITION_ITERATOR* part_iter)
|
||||||
|
|
||||||
uint32 get_next_partition_id_list(PARTITION_ITERATOR *part_iter)
|
uint32 get_next_partition_id_list(PARTITION_ITERATOR *part_iter)
|
||||||
{
|
{
|
||||||
if (part_iter->part_nums.start == part_iter->part_nums.end)
|
if (part_iter->part_nums.cur == part_iter->part_nums.end)
|
||||||
{
|
{
|
||||||
if (part_iter->has_null_value)
|
if (part_iter->ret_null_part)
|
||||||
{
|
{
|
||||||
part_iter->has_null_value= FALSE;
|
part_iter->ret_null_part= FALSE;
|
||||||
return part_iter->part_info->has_null_part_id;
|
return part_iter->part_info->has_null_part_id;
|
||||||
}
|
}
|
||||||
|
part_iter->part_nums.cur= part_iter->part_nums.start;
|
||||||
|
part_iter->ret_null_part= part_iter->ret_null_part_orig;
|
||||||
return NOT_A_PARTITION_ID;
|
return NOT_A_PARTITION_ID;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
return part_iter->part_info->list_array[part_iter->
|
return part_iter->part_info->list_array[part_iter->
|
||||||
part_nums.start++].partition_id;
|
part_nums.cur++].partition_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -5631,6 +5651,7 @@ uint32 get_next_partition_id_list(PARTITION_ITERATOR *part_iter)
|
||||||
This implementation of PARTITION_ITERATOR::get_next() returns ids of
|
This implementation of PARTITION_ITERATOR::get_next() returns ids of
|
||||||
partitions that contain records with partitioning field value within
|
partitions that contain records with partitioning field value within
|
||||||
[start_val, end_val] interval.
|
[start_val, end_val] interval.
|
||||||
|
The function conforms to partition_iter_func type.
|
||||||
|
|
||||||
RETURN
|
RETURN
|
||||||
partition id
|
partition id
|
||||||
|
@ -5641,11 +5662,10 @@ static uint32 get_next_partition_via_walking(PARTITION_ITERATOR *part_iter)
|
||||||
{
|
{
|
||||||
uint32 part_id;
|
uint32 part_id;
|
||||||
Field *field= part_iter->part_info->part_field_array[0];
|
Field *field= part_iter->part_info->part_field_array[0];
|
||||||
while (part_iter->field_vals.start != part_iter->field_vals.end)
|
while (part_iter->field_vals.cur != part_iter->field_vals.end)
|
||||||
{
|
{
|
||||||
field->store(part_iter->field_vals.start, FALSE);
|
|
||||||
part_iter->field_vals.start++;
|
|
||||||
longlong dummy;
|
longlong dummy;
|
||||||
|
field->store(part_iter->field_vals.cur++, FALSE);
|
||||||
if (part_iter->part_info->is_sub_partitioned() &&
|
if (part_iter->part_info->is_sub_partitioned() &&
|
||||||
!part_iter->part_info->get_part_partition_id(part_iter->part_info,
|
!part_iter->part_info->get_part_partition_id(part_iter->part_info,
|
||||||
&part_id, &dummy) ||
|
&part_id, &dummy) ||
|
||||||
|
@ -5653,6 +5673,9 @@ static uint32 get_next_partition_via_walking(PARTITION_ITERATOR *part_iter)
|
||||||
&part_id, &dummy))
|
&part_id, &dummy))
|
||||||
return part_id;
|
return part_id;
|
||||||
}
|
}
|
||||||
|
//psergey-todo: return partition(part_func(NULL)) here...
|
||||||
|
|
||||||
|
part_iter->field_vals.cur= part_iter->field_vals.start;
|
||||||
return NOT_A_PARTITION_ID;
|
return NOT_A_PARTITION_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5663,10 +5686,12 @@ static uint32 get_next_subpartition_via_walking(PARTITION_ITERATOR *part_iter)
|
||||||
{
|
{
|
||||||
uint32 part_id;
|
uint32 part_id;
|
||||||
Field *field= part_iter->part_info->subpart_field_array[0];
|
Field *field= part_iter->part_info->subpart_field_array[0];
|
||||||
if (part_iter->field_vals.start == part_iter->field_vals.end)
|
if (part_iter->field_vals.cur == part_iter->field_vals.end)
|
||||||
|
{
|
||||||
|
part_iter->field_vals.cur= part_iter->field_vals.start;
|
||||||
return NOT_A_PARTITION_ID;
|
return NOT_A_PARTITION_ID;
|
||||||
field->store(part_iter->field_vals.start, FALSE);
|
}
|
||||||
part_iter->field_vals.start++;
|
field->store(part_iter->field_vals.cur++, FALSE);
|
||||||
return part_iter->part_info->get_subpartition_id(part_iter->part_info);
|
return part_iter->part_info->get_subpartition_id(part_iter->part_info);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -94,10 +94,20 @@ uint32 get_partition_id_range_for_endpoint(partition_info *part_info,
|
||||||
|
|
||||||
/*
|
/*
|
||||||
A "Get next" function for partition iterator.
|
A "Get next" function for partition iterator.
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
partition_iter_func()
|
partition_iter_func()
|
||||||
part_iter Partition iterator, you call only "iter.get_next(&iter)"
|
part_iter Partition iterator, you call only "iter.get_next(&iter)"
|
||||||
|
|
||||||
|
DESCRIPTION
|
||||||
|
Depending on whether partitions or sub-partitions are iterated, the
|
||||||
|
function returns next subpartition id/partition number. The sequence of
|
||||||
|
returned numbers is not ordered and may contain duplicates.
|
||||||
|
|
||||||
|
When the end of sequence is reached, NOT_A_PARTITION_ID is returned, and
|
||||||
|
the iterator resets itself (so next get_next() call will start to
|
||||||
|
enumerate the set all over again).
|
||||||
|
|
||||||
RETURN
|
RETURN
|
||||||
NOT_A_PARTITION_ID if there are no more partitions.
|
NOT_A_PARTITION_ID if there are no more partitions.
|
||||||
[sub]partition_id of the next partition
|
[sub]partition_id of the next partition
|
||||||
|
@ -124,16 +134,22 @@ typedef uint32 (*partition_iter_func)(st_partition_iter* part_iter);
|
||||||
typedef struct st_partition_iter
|
typedef struct st_partition_iter
|
||||||
{
|
{
|
||||||
partition_iter_func get_next;
|
partition_iter_func get_next;
|
||||||
bool has_null_value;
|
/*
|
||||||
|
Valid for "Interval mapping" in LIST partitioning: if true, let the
|
||||||
|
iterator also produce id of the partition that contains NULL value.
|
||||||
|
*/
|
||||||
|
bool ret_null_part, ret_null_part_orig;
|
||||||
struct st_part_num_range
|
struct st_part_num_range
|
||||||
{
|
{
|
||||||
uint32 start;
|
uint32 start;
|
||||||
|
uint32 cur;
|
||||||
uint32 end;
|
uint32 end;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct st_field_value_range
|
struct st_field_value_range
|
||||||
{
|
{
|
||||||
longlong start;
|
longlong start;
|
||||||
|
longlong cur;
|
||||||
longlong end;
|
longlong end;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue