Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
ae3e0941
Commit
ae3e0941
authored
Jan 17, 2010
by
Mattias Jonsson
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
377d7102
28e64daf
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
793 additions
and
26 deletions
+793
-26
mysql-test/r/partition_pruning.result
mysql-test/r/partition_pruning.result
+611
-1
mysql-test/t/partition_pruning.test
mysql-test/t/partition_pruning.test
+160
-0
sql/sql_partition.cc
sql/sql_partition.cc
+22
-25
No files found.
mysql-test/r/partition_pruning.result
View file @
ae3e0941
This diff is collapsed.
Click to expand it.
mysql-test/t/partition_pruning.test
View file @
ae3e0941
...
@@ -8,6 +8,166 @@
...
@@ -8,6 +8,166 @@
drop
table
if
exists
t1
,
t2
,
t3
,
t4
,
t5
,
t6
,
t7
,
t8
,
t9
;
drop
table
if
exists
t1
,
t2
,
t3
,
t4
,
t5
,
t6
,
t7
,
t8
,
t9
;
--
enable_warnings
--
enable_warnings
--
echo
#
--
echo
# Bug#49742: Partition Pruning not working correctly for RANGE
--
echo
#
CREATE
TABLE
t1
(
a
INT
PRIMARY
KEY
)
PARTITION
BY
RANGE
(
a
)
(
PARTITION
p0
VALUES
LESS
THAN
(
1
),
PARTITION
p1
VALUES
LESS
THAN
(
2
),
PARTITION
p2
VALUES
LESS
THAN
(
3
),
PARTITION
p3
VALUES
LESS
THAN
(
4
),
PARTITION
p4
VALUES
LESS
THAN
(
5
),
PARTITION
p5
VALUES
LESS
THAN
(
6
),
PARTITION
max
VALUES
LESS
THAN
MAXVALUE
);
INSERT
INTO
t1
VALUES
(
-
1
),(
0
),(
1
),(
2
),(
3
),(
4
),(
5
),(
6
),(
7
),(
8
);
SELECT
*
FROM
t1
WHERE
a
<
1
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
1
;
SELECT
*
FROM
t1
WHERE
a
<
2
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
2
;
SELECT
*
FROM
t1
WHERE
a
<
3
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
3
;
SELECT
*
FROM
t1
WHERE
a
<
4
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
4
;
SELECT
*
FROM
t1
WHERE
a
<
5
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
5
;
SELECT
*
FROM
t1
WHERE
a
<
6
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
6
;
SELECT
*
FROM
t1
WHERE
a
<
7
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
7
;
SELECT
*
FROM
t1
WHERE
a
<=
1
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
1
;
SELECT
*
FROM
t1
WHERE
a
<=
2
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
2
;
SELECT
*
FROM
t1
WHERE
a
<=
3
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
3
;
SELECT
*
FROM
t1
WHERE
a
<=
4
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
4
;
SELECT
*
FROM
t1
WHERE
a
<=
5
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
5
;
SELECT
*
FROM
t1
WHERE
a
<=
6
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
6
;
SELECT
*
FROM
t1
WHERE
a
<=
7
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
7
;
SELECT
*
FROM
t1
WHERE
a
=
1
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
1
;
SELECT
*
FROM
t1
WHERE
a
=
2
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
2
;
SELECT
*
FROM
t1
WHERE
a
=
3
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
3
;
SELECT
*
FROM
t1
WHERE
a
=
4
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
4
;
SELECT
*
FROM
t1
WHERE
a
=
5
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
5
;
SELECT
*
FROM
t1
WHERE
a
=
6
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
6
;
SELECT
*
FROM
t1
WHERE
a
=
7
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
7
;
SELECT
*
FROM
t1
WHERE
a
>=
1
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
1
;
SELECT
*
FROM
t1
WHERE
a
>=
2
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
2
;
SELECT
*
FROM
t1
WHERE
a
>=
3
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
3
;
SELECT
*
FROM
t1
WHERE
a
>=
4
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
4
;
SELECT
*
FROM
t1
WHERE
a
>=
5
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
5
;
SELECT
*
FROM
t1
WHERE
a
>=
6
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
6
;
SELECT
*
FROM
t1
WHERE
a
>=
7
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
7
;
SELECT
*
FROM
t1
WHERE
a
>
1
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
1
;
SELECT
*
FROM
t1
WHERE
a
>
2
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
2
;
SELECT
*
FROM
t1
WHERE
a
>
3
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
3
;
SELECT
*
FROM
t1
WHERE
a
>
4
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
4
;
SELECT
*
FROM
t1
WHERE
a
>
5
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
5
;
SELECT
*
FROM
t1
WHERE
a
>
6
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
6
;
SELECT
*
FROM
t1
WHERE
a
>
7
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
7
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
a
INT
PRIMARY
KEY
)
PARTITION
BY
RANGE
(
a
)
(
PARTITION
p0
VALUES
LESS
THAN
(
1
),
PARTITION
p1
VALUES
LESS
THAN
(
2
),
PARTITION
p2
VALUES
LESS
THAN
(
3
),
PARTITION
p3
VALUES
LESS
THAN
(
4
),
PARTITION
p4
VALUES
LESS
THAN
(
5
),
PARTITION
max
VALUES
LESS
THAN
MAXVALUE
);
INSERT
INTO
t1
VALUES
(
-
1
),(
0
),(
1
),(
2
),(
3
),(
4
),(
5
),(
6
),(
7
);
SELECT
*
FROM
t1
WHERE
a
<
1
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
1
;
SELECT
*
FROM
t1
WHERE
a
<
2
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
2
;
SELECT
*
FROM
t1
WHERE
a
<
3
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
3
;
SELECT
*
FROM
t1
WHERE
a
<
4
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
4
;
SELECT
*
FROM
t1
WHERE
a
<
5
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
5
;
SELECT
*
FROM
t1
WHERE
a
<
6
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<
6
;
SELECT
*
FROM
t1
WHERE
a
<=
1
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
1
;
SELECT
*
FROM
t1
WHERE
a
<=
2
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
2
;
SELECT
*
FROM
t1
WHERE
a
<=
3
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
3
;
SELECT
*
FROM
t1
WHERE
a
<=
4
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
4
;
SELECT
*
FROM
t1
WHERE
a
<=
5
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
5
;
SELECT
*
FROM
t1
WHERE
a
<=
6
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
<=
6
;
SELECT
*
FROM
t1
WHERE
a
=
1
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
1
;
SELECT
*
FROM
t1
WHERE
a
=
2
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
2
;
SELECT
*
FROM
t1
WHERE
a
=
3
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
3
;
SELECT
*
FROM
t1
WHERE
a
=
4
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
4
;
SELECT
*
FROM
t1
WHERE
a
=
5
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
5
;
SELECT
*
FROM
t1
WHERE
a
=
6
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
=
6
;
SELECT
*
FROM
t1
WHERE
a
>=
1
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
1
;
SELECT
*
FROM
t1
WHERE
a
>=
2
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
2
;
SELECT
*
FROM
t1
WHERE
a
>=
3
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
3
;
SELECT
*
FROM
t1
WHERE
a
>=
4
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
4
;
SELECT
*
FROM
t1
WHERE
a
>=
5
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
5
;
SELECT
*
FROM
t1
WHERE
a
>=
6
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>=
6
;
SELECT
*
FROM
t1
WHERE
a
>
1
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
1
;
SELECT
*
FROM
t1
WHERE
a
>
2
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
2
;
SELECT
*
FROM
t1
WHERE
a
>
3
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
3
;
SELECT
*
FROM
t1
WHERE
a
>
4
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
4
;
SELECT
*
FROM
t1
WHERE
a
>
5
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
5
;
SELECT
*
FROM
t1
WHERE
a
>
6
;
EXPLAIN
PARTITIONS
SELECT
*
FROM
t1
WHERE
a
>
6
;
DROP
TABLE
t1
;
#
#
# Bug#20577: Partitions: use of to_days() function leads to selection failures
# Bug#20577: Partitions: use of to_days() function leads to selection failures
#
#
...
...
sql/sql_partition.cc
View file @
ae3e0941
...
@@ -2878,16 +2878,13 @@ int get_partition_id_range(partition_info *part_info,
...
@@ -2878,16 +2878,13 @@ int get_partition_id_range(partition_info *part_info,
part_func_value
-=
0x8000000000000000ULL
;
part_func_value
-=
0x8000000000000000ULL
;
while
(
max_part_id
>
min_part_id
)
while
(
max_part_id
>
min_part_id
)
{
{
loc_part_id
=
(
max_part_id
+
min_part_id
+
1
)
>>
1
;
loc_part_id
=
(
max_part_id
+
min_part_id
)
/
2
;
if
(
range_array
[
loc_part_id
]
<=
part_func_value
)
if
(
range_array
[
loc_part_id
]
<=
part_func_value
)
min_part_id
=
loc_part_id
+
1
;
min_part_id
=
loc_part_id
+
1
;
else
else
max_part_id
=
loc_part_id
-
1
;
max_part_id
=
loc_part_id
;
}
}
loc_part_id
=
max_part_id
;
loc_part_id
=
max_part_id
;
if
(
part_func_value
>=
range_array
[
loc_part_id
])
if
(
loc_part_id
!=
max_partition
)
loc_part_id
++
;
*
part_id
=
(
uint32
)
loc_part_id
;
*
part_id
=
(
uint32
)
loc_part_id
;
if
(
loc_part_id
==
max_partition
&&
if
(
loc_part_id
==
max_partition
&&
part_func_value
>=
range_array
[
loc_part_id
]
&&
part_func_value
>=
range_array
[
loc_part_id
]
&&
...
@@ -2961,6 +2958,7 @@ uint32 get_partition_id_range_for_endpoint(partition_info *part_info,
...
@@ -2961,6 +2958,7 @@ uint32 get_partition_id_range_for_endpoint(partition_info *part_info,
bool
include_endpoint
)
bool
include_endpoint
)
{
{
longlong
*
range_array
=
part_info
->
range_int_array
;
longlong
*
range_array
=
part_info
->
range_int_array
;
longlong
part_end_val
;
uint
max_partition
=
part_info
->
no_parts
-
1
;
uint
max_partition
=
part_info
->
no_parts
-
1
;
uint
min_part_id
=
0
,
max_part_id
=
max_partition
,
loc_part_id
;
uint
min_part_id
=
0
,
max_part_id
=
max_partition
,
loc_part_id
;
/* Get the partitioning function value for the endpoint */
/* Get the partitioning function value for the endpoint */
...
@@ -2994,46 +2992,45 @@ uint32 get_partition_id_range_for_endpoint(partition_info *part_info,
...
@@ -2994,46 +2992,45 @@ uint32 get_partition_id_range_for_endpoint(partition_info *part_info,
}
}
}
}
if
(
unsigned_flag
)
if
(
unsigned_flag
)
part_func_value
-=
0x8000000000000000ULL
;
part_func_value
-=
0x8000000000000000ULL
;
if
(
left_endpoint
&&
!
include_endpoint
)
if
(
left_endpoint
&&
!
include_endpoint
)
part_func_value
++
;
part_func_value
++
;
/*
Search for the partition containing part_func_value
(including the right endpoint).
*/
while
(
max_part_id
>
min_part_id
)
while
(
max_part_id
>
min_part_id
)
{
{
loc_part_id
=
(
max_part_id
+
min_part_id
+
1
)
>>
1
;
loc_part_id
=
(
max_part_id
+
min_part_id
)
/
2
;
if
(
range_array
[
loc_part_id
]
<
=
part_func_value
)
if
(
range_array
[
loc_part_id
]
<
part_func_value
)
min_part_id
=
loc_part_id
+
1
;
min_part_id
=
loc_part_id
+
1
;
else
else
max_part_id
=
loc_part_id
-
1
;
max_part_id
=
loc_part_id
;
}
}
loc_part_id
=
max_part_id
;
loc_part_id
=
max_part_id
;
if
(
loc_part_id
<
max_partition
&&
part_func_value
>=
range_array
[
loc_part_id
+
1
])
/* Adjust for endpoints */
{
part_end_val
=
range_array
[
loc_part_id
];
loc_part_id
++
;
}
if
(
left_endpoint
)
if
(
left_endpoint
)
{
{
longlong
bound
=
range_array
[
loc_part_id
];
/*
/*
In case of PARTITION p VALUES LESS THAN MAXVALUE
In case of PARTITION p VALUES LESS THAN MAXVALUE
the maximum value is in the current partition.
the maximum value is in the current partition.
*/
*/
if
(
part_func_value
>
bound
||
if
(
part_func_value
==
part_end_val
&&
(
part_func_value
==
bound
&&
(
loc_part_id
<
max_partition
||
!
part_info
->
defined_max_value
))
(
!
part_info
->
defined_max_value
||
loc_part_id
<
max_partition
)))
loc_part_id
++
;
loc_part_id
++
;
}
}
else
else
{
{
if
(
loc_part_id
<
max_partition
)
/* if 'WHERE <= X' and partition is LESS THAN (X) include next partition */
{
if
(
include_endpoint
&&
loc_part_id
<
max_partition
&&
if
(
part_func_value
==
range_array
[
loc_part_id
])
part_func_value
==
part_end_val
)
loc_part_id
+=
test
(
include_endpoint
);
loc_part_id
++
;
else
if
(
part_func_value
>
range_array
[
loc_part_id
])
loc_part_id
++
;
/* Right endpoint, set end after correct partition */
}
loc_part_id
++
;
loc_part_id
++
;
}
}
DBUG_RETURN
(
loc_part_id
);
DBUG_RETURN
(
loc_part_id
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
