Details
-
Task
-
Status: Closed (View Workflow)
-
Major
-
Resolution: Fixed
-
None
Description
The following methods:
- Field_timestamp::store_time_dec()
- Field_temporal_with_date::store_time_dec()
- Field_time::store_time_dec()
have pieces of code responsible for MYSQL_TIME initialization and verification.
We'll move this code to new constructors for Time() and Datetime().
For example, for Field_time the relevant code looks like this:
int Field_temporal_with_date::store_time_dec(const MYSQL_TIME *ltime, uint dec) |
{
|
int error= 0, have_smth_to_conv= 1; |
ErrConvTime str(ltime);
|
MYSQL_TIME l_time;
|
|
|
if (copy_or_convert_to_datetime(get_thd(), ltime, &l_time)) |
{
|
/* |
Set have_smth_to_conv and error in a way to have
|
store_TIME_with_warning do bzero().
|
*/
|
have_smth_to_conv= false; |
error= MYSQL_TIME_WARN_OUT_OF_RANGE;
|
}
|
else |
{
|
/* |
We don't perform range checking here since values stored in TIME
|
structure always fit into DATETIME range.
|
*/
|
have_smth_to_conv= !check_date(&l_time, pack_time(&l_time) != 0,
|
sql_mode_for_dates(get_thd()), &error);
|
}
|
return store_TIME_with_warning(&l_time, &str, error, have_smth_to_conv); |
}
|
|
After this change, the code will look about like this:
int Field_temporal_with_date::store_time_dec(const MYSQL_TIME *ltime, uint dec) |
{
|
int error; |
ErrConvTime str(ltime);
|
THD *thd= get_thd();
|
Datetime dt(thd, &error, ltime, sql_mode_for_dates(thd));
|
ltime= dt.is_valid_datetime() ? dt.get_mysql_time() : NULL;
|
return store_TIME_with_warning(const_cast<MYSQL_TIME*>(ltime), &str, error); |
}
|
Notice, in the new reduction (instead of MYSQL_TIME initialization), there will be a Datetime() instantiation.
The new code in Field_xxx will look much simpler.
Note, the "bool have_smth_to_conv" will be removed. It's not needed. We'll pass NULL to store_TIME_with_warning() instead of a MYSQL_TIME pointer in all cases when false was passed as a actual parameter for have_smth_to_conv.
This change is needed for MDEV-8894.
The idea is to have these methods:
- Datetime Datetime::round(uint scale)
- Time Time::round(uint scale)
Therefore, the relevant code should be ready to work in terms of Time and Datetime rather than MYSQL_TIME.
Attachments
Issue Links
- blocks
-
MDEV-8894 Inserting fractional seconds into MySQL 5.6 master breaks consistency on MariaDB 10 slave
-
- Closed
-
Activity
| Description |
The following methods:
- Field_timestamp::store_time_dec() - Field_temporal_with_date::store_time_dec() - Field_time::store_time_dec() have pieces of code responsible for MYSQL_TIME initialization and verification. We'll move this code to new constructors for Time() and Datetime(). For example, for {{Field_time}} the relevant code looks like this: {code:cpp} int Field_temporal_with_date::store_time_dec(const MYSQL_TIME *ltime, uint dec) { int error= 0, have_smth_to_conv= 1; ErrConvTime str(ltime); MYSQL_TIME l_time; if (copy_or_convert_to_datetime(get_thd(), ltime, &l_time)) { /* Set have_smth_to_conv and error in a way to have store_TIME_with_warning do bzero(). */ have_smth_to_conv= false; error= MYSQL_TIME_WARN_OUT_OF_RANGE; } else { /* We don't perform range checking here since values stored in TIME structure always fit into DATETIME range. */ have_smth_to_conv= !check_date(&l_time, pack_time(&l_time) != 0, sql_mode_for_dates(get_thd()), &error); } return store_TIME_with_warning(&l_time, &str, error, have_smth_to_conv); } {code} After this change, the code will look about like this: {code:cpp} int Field_temporal_with_date::store_time_dec(const MYSQL_TIME *ltime, uint dec) { int error; ErrConvTime str(ltime); THD *thd= get_thd(); Datetime dt(thd, &error, ltime, sql_mode_for_dates(thd)); ltime= dt.is_valid_datetime() ? dt.get_mysql_time() : NULL; return store_TIME_with_warning(const_cast<MYSQL_TIME*>(ltime), &str, error); } {code} Notice, in the new reduction (instead of MYSQL_TIME initialization), there will be a Datetime() instantiation. The new code in Field_xxx will look much simpler. This change is needed for The idea is to have these methods: - Datetime Datetime::round(uint scale) - Time Time::round(uint scale) Therefore, the relevant code should be ready to work in terms of Time and Datetime rather than MYSQL_TIME. |
The following methods:
- Field_timestamp::store_time_dec() - Field_temporal_with_date::store_time_dec() - Field_time::store_time_dec() have pieces of code responsible for MYSQL_TIME initialization and verification. We'll move this code to new constructors for Time() and Datetime(). For example, for {{Field_time}} the relevant code looks like this: {code:cpp} int Field_temporal_with_date::store_time_dec(const MYSQL_TIME *ltime, uint dec) { int error= 0, have_smth_to_conv= 1; ErrConvTime str(ltime); MYSQL_TIME l_time; if (copy_or_convert_to_datetime(get_thd(), ltime, &l_time)) { /* Set have_smth_to_conv and error in a way to have store_TIME_with_warning do bzero(). */ have_smth_to_conv= false; error= MYSQL_TIME_WARN_OUT_OF_RANGE; } else { /* We don't perform range checking here since values stored in TIME structure always fit into DATETIME range. */ have_smth_to_conv= !check_date(&l_time, pack_time(&l_time) != 0, sql_mode_for_dates(get_thd()), &error); } return store_TIME_with_warning(&l_time, &str, error, have_smth_to_conv); } {code} After this change, the code will look about like this: {code:cpp} int Field_temporal_with_date::store_time_dec(const MYSQL_TIME *ltime, uint dec) { int error; ErrConvTime str(ltime); THD *thd= get_thd(); Datetime dt(thd, &error, ltime, sql_mode_for_dates(thd)); ltime= dt.is_valid_datetime() ? dt.get_mysql_time() : NULL; return store_TIME_with_warning(const_cast<MYSQL_TIME*>(ltime), &str, error); } {code} Notice, in the new reduction (instead of MYSQL_TIME initialization), there will be a Datetime() instantiation. The new code in Field_xxx will look much simpler. Note, the "bool have_smth_to_conv" will be removed. It's not needed. We'll pass NULL to store_TIME_with_warning() instead of a MYSQL_TIME pointer in all cases when false was passed as a actual parameter for have_smth_to_conv. This change is needed for The idea is to have these methods: - Datetime Datetime::round(uint scale) - Time Time::round(uint scale) Therefore, the relevant code should be ready to work in terms of Time and Datetime rather than MYSQL_TIME. |
| Fix Version/s | 10.4.0 [ 23115 ] | |
| Fix Version/s | 10.4 [ 22408 ] | |
| Resolution | Fixed [ 1 ] | |
| Status | Open [ 1 ] | Closed [ 6 ] |
| Workflow | MariaDB v3 [ 88814 ] | MariaDB v4 [ 133652 ] |