From 7e0e4b00c971b81b5ffd18db4f1ea977233e98be Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 23 Feb 2011 18:43:29 +0100 Subject: we don't support longlong less than 8 bytes --- include/my_global.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/my_global.h b/include/my_global.h index ec22a57329b..5b70ba47b74 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -830,10 +830,10 @@ typedef SOCKET_SIZE_TYPE size_socket; #define strtok_r(A,B,C) strtok((A),(B)) #endif -/* This is from the old m-machine.h file */ - -#if SIZEOF_LONG_LONG > 4 +#if SIZEOF_LONG_LONG >= 8 #define HAVE_LONG_LONG 1 +#else +#error WHAT? sizeof(long long) < 8 ??? #endif /* -- cgit v1.2.1 From a8a757c6bb32bbf291afdf33df861127489889ab Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 1 Mar 2011 13:24:36 +0100 Subject: wl#173 - temporal types with sub-second resolution and collateral changes. * introduce my_hrtime_t, my_timediff_t, and conversion macros * inroduce TIME_RESULT, but it can only be returned from Item::cmp_type(), never from Item::result_type() * pack_time/unpack_time function for "packed" representation of MYSQL_TIME in a longlong that can be compared * ADDTIME()/SUBTIME()/+- INTERVAL now work with TIME values * numbers aren't quoted in EXPLAIN EXTENDED * new column I_S.COLUMNS.DATETIME_PRECISION * date/time values are compares to anything as date/time, not as strings or numbers. * old timestamp(X) is no longer supported * MYSQL_TIME to string conversion functions take precision as an argument * unified the warnings from Field_timestamp/datetime/time/date/newdate store methods * Field_timestamp_hires, Field_datetime_hires, Field_time_hires * Field_temporal * Lazy_string class to pass a value (string, number, time) polymorphically down the stack * make_truncated_value_warning and Field::set_datetime_warning use Lazy_string as an argument, removed char*/int/double variants * removed Field::can_be_compared_as_longlong(). Use Field::cmp_type() == INT_RESULT instead * introduced Item::cmp_result() instead of Item::is_datetime() and Item::result_as_longlong() * in many cases date/time types are treated like other types, not as special cases * greatly simplified Arg_comparator (regarding date/time/year code) * SEC_TO_TIME is real function, not integer. * microsecond precision in NOW, CURTIME, etc * Item_temporal. All items derived from it only provide get_date, but no val* methods * replication of NOW(6) * Protocol::store(time) now takes the precision as an argument * @@TIMESTAMP is a double client/mysqlbinlog.cc: remove unneded casts include/my_sys.h: introduce my_hrtime_t, my_timediff_t, and conversion macros include/my_time.h: pack_time/unpack_time, etc. convenience functions to work with MYSQL_TIME::second_part libmysql/libmysql.c: str_to_time() is gone. str_to_datetime() does it now. my_TIME_to_str() takes the precision as an argument mysql-test/include/ps_conv.inc: time is not equal to datetime anymore mysql-test/r/distinct.result: a test for an old MySQL bug mysql-test/r/explain.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/func_default.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/func_sapdb.result: when decimals=NOT_FIXED_DEC it means "not fixed" indeed mysql-test/r/func_test.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/func_time.result: ADDTIME()/SUBTIME()/+- INTERVAL now work with TIME values mysql-test/r/having.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/information_schema.result: new column I_S.COLUMNS.DATETIME_PRECISION mysql-test/r/join_outer.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/metadata.result: TIMESTAMP no longer has zerofill flag mysql-test/r/range.result: invalid datetime is not compared with as a string mysql-test/r/select.result: NO_ZERO_IN_DATE, etc only affect storage - according to the manual numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/subselect.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/sysdate_is_now.result: when decimals=NOT_FIXED_DEC it means "not fixed" indeed mysql-test/r/type_blob.result: TIMESTAMP(N) is not deprecated mysql-test/r/type_timestamp.result: old TIMESTAMP(X) semantics is not supported anymore mysql-test/r/union.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/varbinary.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/t/distinct.test: test for an old MySQL bug mysql-test/t/func_time.test: +- INTERVAL now works with TIME values mysql-test/t/select.test: typo mysql-test/t/subselect.test: only one error per statement, please mysql-test/t/system_mysql_db_fix40123.test: old timestamp(X) is no longer supported mysql-test/t/system_mysql_db_fix50030.test: old timestamp(X) is no longer supported mysql-test/t/system_mysql_db_fix50117.test: old timestamp(X) is no longer supported mysql-test/t/type_blob.test: old timestamp(X) is no longer supported mysql-test/t/type_timestamp.test: old timestamp(X) is no longer supported mysys/my_getsystime.c: functions to get the time with microsecond precision mysys/my_init.c: move the my_getsystime.c initialization code to my_getsystime.c mysys/my_static.c: no need to make these variables extern mysys/my_static.h: no need to make these variables extern scripts/mysql_system_tables.sql: old timestamp(X) is no longer supported scripts/mysql_system_tables_fix.sql: old timestamp(X) is no longer supported scripts/mysqlhotcopy.sh: old timestamp(X) is no longer supported sql-common/my_time.c: * call str_to_time from str_to_datetime, as appropriate * date/time to string conversions take precision as an argument * number_to_time() * TIME_to_double() * pack_time() and unpack_time() sql/event_data_objects.cc: cast is not needed my_datetime_to_str() takes precision as an argument sql/event_db_repository.cc: avoid dangerous downcast (because the pointer is not always Field_timestamp, see events_1.test) sql/event_queue.cc: avoid silly double-work for cond_wait (having an endpoint of wait, subtract the current time to get the timeout, and use set_timespec() macro to fill in struct timespec, by adding the current time to the timeout) sql/field.cc: * remove virtual Field::get_time(), everyone should use only Field::get_date() * remove lots of #ifdef WORDS_BIGENDIAN * unified the warnings from Field_timestamp/datetime/time/date/newdate store methods * Field_timestamp_hires, Field_datetime_hires, Field_time_hires * Field_temporal * make_truncated_value_warning and Field::set_datetime_warning use Lazy_string as an argument, removed char*/int/double variants sql/field.h: * remove virtual Field::get_time(), everyone should use only Field::get_date() * remove lots of #ifdef WORDS_BIGENDIAN * unified the warnings from Field_timestamp/datetime/time/date/newdate store methods * Field_timestamp_hires, Field_datetime_hires, Field_time_hires * Field_temporal * make_truncated_value_warning and Field::set_datetime_warning use Lazy_string as an argument, removed char*/int/double variants * removed Field::can_be_compared_as_longlong(). Use Field::cmp_type() == INT_RESULT instead sql/filesort.cc: TIME_RESULT, cmp_time() sql/item.cc: * numbers aren't quoted in EXPLAIN EXTENDED * Item::cmp_result() instead of Item::is_datetime() and Item::result_as_longlong() * virtual Item::get_time() is gone * Item_param::field_type() is set correctly * Item_datetime, for a datetime constant * time to anything is compared as a time * Item_cache::print() prints the value is available * bug fixed in Item_cache_int::val_str() sql/item.h: * Item::print_value(), to be used from Item_xxx::print() when needed * Item::cmp_result() instead of Item::is_datetime() and Item::result_as_longlong() * virtual Item::get_time() is gone * Item_datetime, for a datetime constant * better default for cast_to_int_type() * Item_cache objects now *always* have the field_type() set sql/item_cmpfunc.cc: * get_year_value, get_time_value are gone. get_datetime_value does it all * get_value_a_func, get_value_b_func are gone * can_compare_as_dates() is gone too, TIME_RESULT is used instead * cmp_type() instead or result_type() when doing a comparison * compare_datetime and compate_e_datetime in the comparator_matrix, is_nulls_eq is gone * Item::cmp_result() instead of Item::is_datetime() and Item::result_as_longlong() sql/item_cmpfunc.h: greatly simplified Arg_comparator sql/item_create.cc: * fix a bug in error messages in CAST sql/item_func.cc: Item::cmp_result() instead of Item::is_datetime() and Item::result_as_longlong() mention all possibitiles in switch over Item_result values, or use default: sql/item_row.h: overwrite the default cmp_type() for Item_row, as no MYSQL_TYPE_xxx value corresponds to ROW_RESULT sql/item_timefunc.cc: rewrite make_datetime to support precision argument SEC_TO_TIME is real function, not integer. many functions that returned temporal values had duplicate code in val_* methods, some of them did not have get_date() which resulted in unnecessary date->str->date conversions. Now they all are derived from Item_temporal_func and *only* provide get_date, not val* methods. many fixes to set decimals (datetime precision) correctly. sql/item_timefunc.h: SEC_TO_TIME is real function, not integer. many functions that returned temporal values had duplicate code in val_* methods, some of them did not have get_date() which resulted in unnecessary date->str->date conversions. Now they all are derived from Item_temporal_func and *only* provide get_date, not val* methods. many fixes to set decimals (datetime precision) correctly. sql/log_event.cc: replication of NOW(6) sql/log_event.h: replication of NOW(6) sql/mysql_priv.h: Lazy_string class to pass a value (string, number, time) polymorphically down the stack. make_truncated_value_warning() that uses it. sql/mysqld.cc: datetime in Arg_comparator::comparator_matrix sql/opt_range.cc: cleanup: don't disable warnings before calling save_in_field_no_warnings() sql/protocol.cc: Protocol::store(time) now takes the precision as an argument sql/protocol.h: Protocol::store(time) now takes the precision as an argument sql/rpl_rli.cc: small cleanup sql/set_var.cc: SET TIMESTAMP=double sql/set_var.h: @@TIMESTAMP is a double sql/share/errmsg.txt: precision and scale are unsigned sql/slave.cc: replication of NOW(6) sql/sp_head.cc: cleanup sql/sql_class.cc: support for NOW(6) sql/sql_class.h: support for NOW(6) sql/sql_insert.cc: support for NOW(6) sql/sql_select.cc: use item->cmp_type(). move a comment where it belongs sql/sql_show.cc: new column I_S.COLUMNS.DATETIME_PRECISION sql/sql_yacc.yy: TIME(X), DATETIME(X), cast, NOW(X), CURTIME(X), etc sql/time.cc: fix date_add_interval() to support MYSQL_TIMESTAMP_TIME argument storage/myisam/ha_myisam.cc: TIMESTAMP no longer carries ZEROFIELD flag, still we keep MYI file compatible. strings/my_vsnprintf.c: warnings tests/mysql_client_test.c: old timestamp(X) does not work anymore datetime is no longer equal to time --- include/my_sys.h | 18 ++++++++++++++---- include/my_time.h | 33 ++++++++++++++++++++++++++------- include/mysql.h.pp | 2 +- include/mysql_com.h | 2 +- 4 files changed, 42 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/my_sys.h b/include/my_sys.h index 3a240cfc118..f86b7839baf 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -894,11 +894,21 @@ extern ulong crc32(ulong crc, const uchar *buf, uint len); extern uint my_set_max_open_files(uint files); void my_free_open_file_info(void); -extern time_t my_time(myf flags); +typedef struct {ulonglong val;} my_hrtime_t; +typedef struct {ulonglong val;} my_timediff_t; +void my_time_init(); +extern my_hrtime_t my_hrtime(); +void my_diff_and_hrtime(my_timediff_t *interval, my_hrtime_t *timestamp); extern ulonglong my_getsystime(void); -extern ulonglong my_micro_time(); -extern ulonglong my_micro_time_and_time(time_t *time_arg); -time_t my_time_possible_from_micro(ulonglong microtime); + +#define my_micro_time() (my_getsystime()/10) +#define hrtime_to_time(X) ((time_t)((X).val/1000000)) +#define hrtime_from_time(X) ((ulonglong)((X)*1000000ULL)) +#define hrtime_to_double(X) ((X).val/1e6) +#define hrtime_sec_part(X) ((X).val%1000000) +#define my_time(X) hrtime_to_time(my_hrtime()) +#define my_micro_and_hrtime(X,Y) my_diff_and_hrtime(X,Y) + extern my_bool my_gethwaddr(uchar *to); extern int my_getncpus(); diff --git a/include/my_time.h b/include/my_time.h index 58995f1bf62..7d059a03710 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -55,6 +55,7 @@ typedef long my_time_t; /* Flags to str_to_datetime */ #define TIME_FUZZY_DATE 1 #define TIME_DATETIME_ONLY 2 +#define TIME_TIME_ONLY 4 /* Must be same as MODE_NO_ZERO_IN_DATE */ #define TIME_NO_ZERO_IN_DATE (65536L*2*2*2*2*2*2*2) /* Must be same as MODE_NO_ZERO_DATE */ @@ -68,8 +69,9 @@ typedef long my_time_t; #define TIME_MAX_HOUR 838 #define TIME_MAX_MINUTE 59 #define TIME_MAX_SECOND 59 +#define TIME_MAX_SECOND_PART 999999 #define TIME_MAX_VALUE (TIME_MAX_HOUR*10000 + TIME_MAX_MINUTE*100 + \ - TIME_MAX_SECOND) + TIME_MAX_SECOND + TIME_MAX_SECOND_PART/1e6) #define TIME_MAX_VALUE_SECONDS (TIME_MAX_HOUR * 3600L + \ TIME_MAX_MINUTE * 60L + TIME_MAX_SECOND) @@ -80,14 +82,15 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, uint flags, int *was_cut); longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res, uint flags, int *was_cut); +int number_to_time(double nr, MYSQL_TIME *ltime, int *was_cut); ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *); ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *); ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *); ulonglong TIME_to_ulonglong(const MYSQL_TIME *); +double TIME_to_double(const MYSQL_TIME *my_time); - -my_bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time, - int *warning); +longlong pack_time(MYSQL_TIME *my_time); +MYSQL_TIME *unpack_time(longlong packed, MYSQL_TIME *my_time); int check_time_range(struct st_mysql_time *, int *warning); @@ -136,11 +139,27 @@ void set_zero_time(MYSQL_TIME *tm, enum enum_mysql_timestamp_type time_type); sent using binary protocol fit in this buffer. */ #define MAX_DATE_STRING_REP_LENGTH 30 +#define MAX_SEC_PART_VALUE 999999 +#define MAX_SEC_PART_DIGITS 6 +#define AUTO_SEC_PART_DIGITS 31 /* same as NOT_FIXED_DEC */ -int my_time_to_str(const MYSQL_TIME *l_time, char *to); +int my_time_to_str(const MYSQL_TIME *l_time, char *to, int digits); int my_date_to_str(const MYSQL_TIME *l_time, char *to); -int my_datetime_to_str(const MYSQL_TIME *l_time, char *to); -int my_TIME_to_str(const MYSQL_TIME *l_time, char *to); +int my_datetime_to_str(const MYSQL_TIME *l_time, char *to, int digits); +int my_TIME_to_str(const MYSQL_TIME *l_time, char *to, int digits); + +static inline longlong sec_part_shift(longlong second_part, int digits) +{ + return second_part / log_10_int[MAX_SEC_PART_DIGITS - digits]; +} +static inline longlong sec_part_unshift(longlong second_part, int digits) +{ + return second_part * log_10_int[MAX_SEC_PART_DIGITS - digits]; +} +static inline ulong sec_part_truncate(ulong second_part, int digits) +{ + return second_part - second_part % log_10_int[MAX_SEC_PART_DIGITS - digits]; +} /* Available interval types used in any statement. diff --git a/include/mysql.h.pp b/include/mysql.h.pp index ceb4b2d591c..408800f55f2 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -102,7 +102,7 @@ struct rand_struct { double max_value_dbl; }; enum Item_result {STRING_RESULT=0, REAL_RESULT, INT_RESULT, ROW_RESULT, - DECIMAL_RESULT}; + DECIMAL_RESULT, TIME_RESULT}; typedef struct st_udf_args { unsigned int arg_count; diff --git a/include/mysql_com.h b/include/mysql_com.h index 7d3dd3d4f34..61a50ae558c 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -439,7 +439,7 @@ struct rand_struct { /* The following is for user defined functions */ enum Item_result {STRING_RESULT=0, REAL_RESULT, INT_RESULT, ROW_RESULT, - DECIMAL_RESULT}; + DECIMAL_RESULT, TIME_RESULT}; typedef struct st_udf_args { -- cgit v1.2.1 From 1cda2654578b82da52c29a829d463955f8795cc9 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 17 Mar 2011 14:13:03 +0100 Subject: * fix for ALTER TABLE ... MODIFY timestamp->timestamp. Use dedicated do_field_temporal() for Copy_field. * check_time_range() needs to know TIME's precision to use the correct max value. --- include/my_time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/my_time.h b/include/my_time.h index 7d059a03710..db1795eeb6e 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -92,7 +92,7 @@ double TIME_to_double(const MYSQL_TIME *my_time); longlong pack_time(MYSQL_TIME *my_time); MYSQL_TIME *unpack_time(longlong packed, MYSQL_TIME *my_time); -int check_time_range(struct st_mysql_time *, int *warning); +int check_time_range(struct st_mysql_time *my_time, uint dec, int *warning); long calc_daynr(uint year,uint month,uint day); uint calc_days_in_year(uint year); -- cgit v1.2.1 From 8250ceced6aab95347e00e2ff1c02730da0be4fe Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Thu, 24 Mar 2011 12:30:03 +0100 Subject: Fix compilation on Windows: - Fixes for type-conversion (time_t is not interchangeable with my_time_t on Windows as time_t s 64 bit while my_time_t is long) - BIGENDIAN-> ARCH_BIGENDIAN . BIGENDIAN constant is defined in winsock2.h (as 0) - added explicit cast for longlong->double conversion in sql/item.h (fixed many warnings) Also, HAVE_SNPRINTF is now defined and snprintf is defined to _snprintf in config-win.h --- include/config-win.h | 7 +++---- include/my_sys.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/config-win.h b/include/config-win.h index da9b1fc00c3..84bc4ece959 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -293,10 +293,9 @@ inline ulonglong double2ulonglong(double d) #define FILE_SHARE_DELETE 0 /* Not implemented on Win 98/ME */ #endif -#ifdef NOT_USED -#define HAVE_SNPRINTF /* Gave link error */ -#define _snprintf snprintf -#endif + +#define HAVE_SNPRINTF +#define snprintf _snprintf #ifdef _MSC_VER #define HAVE_LDIV /* The optimizer breaks in zortech for ldiv */ diff --git a/include/my_sys.h b/include/my_sys.h index f86b7839baf..0d57566d6e4 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -902,7 +902,7 @@ void my_diff_and_hrtime(my_timediff_t *interval, my_hrtime_t *timestamp); extern ulonglong my_getsystime(void); #define my_micro_time() (my_getsystime()/10) -#define hrtime_to_time(X) ((time_t)((X).val/1000000)) +#define hrtime_to_time(X) ((my_time_t)((X).val/1000000)) #define hrtime_from_time(X) ((ulonglong)((X)*1000000ULL)) #define hrtime_to_double(X) ((X).val/1e6) #define hrtime_sec_part(X) ((X).val%1000000) -- cgit v1.2.1 From e016a2f5f00774f8126974fa26c7550bf0e60c84 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 26 Mar 2011 11:59:34 +0100 Subject: lp:705210 Compiling with BUILD/compile-pentium64-debug fails --- include/my_sys.h | 4 ++-- include/my_time.h | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/my_sys.h b/include/my_sys.h index 0d57566d6e4..ff4083b9fda 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -902,10 +902,10 @@ void my_diff_and_hrtime(my_timediff_t *interval, my_hrtime_t *timestamp); extern ulonglong my_getsystime(void); #define my_micro_time() (my_getsystime()/10) -#define hrtime_to_time(X) ((my_time_t)((X).val/1000000)) +#define hrtime_to_time(X) ((X).val/1000000) #define hrtime_from_time(X) ((ulonglong)((X)*1000000ULL)) #define hrtime_to_double(X) ((X).val/1e6) -#define hrtime_sec_part(X) ((X).val%1000000) +#define hrtime_sec_part(X) ((ulong)((X).val%1000000)) #define my_time(X) hrtime_to_time(my_hrtime()) #define my_micro_and_hrtime(X,Y) my_diff_and_hrtime(X,Y) diff --git a/include/my_time.h b/include/my_time.h index db1795eeb6e..5ec51685489 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -158,9 +158,12 @@ static inline longlong sec_part_unshift(longlong second_part, int digits) } static inline ulong sec_part_truncate(ulong second_part, int digits) { - return second_part - second_part % log_10_int[MAX_SEC_PART_DIGITS - digits]; + /* the cast here should be unnecessary! */ + return second_part - second_part % (ulong)log_10_int[MAX_SEC_PART_DIGITS - digits]; } +#define hrtime_to_my_time(X) ((my_time_t)hrtime_to_time(X)) + /* Available interval types used in any statement. -- cgit v1.2.1 From 8ddcd0cda8e6e90a58e9ea64f0f3773ea0037f0b Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 19 May 2011 19:01:46 +0200 Subject: post-review changes 1 include/my_time.h: remove duplicate defines. cast to ulonglong to avoid overflow sql/field.cc: perform sign extension when reading packed TIME values sql/item_cmpfunc.cc: when converting a string to a date for the purpose of comparing it with another date, we should ignore strict sql mode. sql/item_timefunc.cc: better error message sql/item_timefunc.h: limit decimals appropriately sql/share/errmsg.txt: don't refer to an object as a "column" in error messages that are used not only for columns. --- include/my_sys.h | 3 ++- include/my_time.h | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/my_sys.h b/include/my_sys.h index ff4083b9fda..96754d2e85d 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -894,6 +894,7 @@ extern ulong crc32(ulong crc, const uchar *buf, uint len); extern uint my_set_max_open_files(uint files); void my_free_open_file_info(void); +#define HRTIME_RESOLUTION 1000000 typedef struct {ulonglong val;} my_hrtime_t; typedef struct {ulonglong val;} my_timediff_t; void my_time_init(); @@ -904,7 +905,7 @@ extern ulonglong my_getsystime(void); #define my_micro_time() (my_getsystime()/10) #define hrtime_to_time(X) ((X).val/1000000) #define hrtime_from_time(X) ((ulonglong)((X)*1000000ULL)) -#define hrtime_to_double(X) ((X).val/1e6) +#define hrtime_to_double(X) ((X).val/(double)HRTIME_RESOLUTION) #define hrtime_sec_part(X) ((ulong)((X).val%1000000)) #define my_time(X) hrtime_to_time(my_hrtime()) #define my_micro_and_hrtime(X,Y) my_diff_and_hrtime(X,Y) diff --git a/include/my_time.h b/include/my_time.h index 5ec51685489..9fcff24918b 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -70,8 +70,10 @@ typedef long my_time_t; #define TIME_MAX_MINUTE 59 #define TIME_MAX_SECOND 59 #define TIME_MAX_SECOND_PART 999999 +#define TIME_SECOND_PART_FACTOR (TIME_MAX_SECOND_PART+1) +#define TIME_SECOND_PART_DIGITS 6 #define TIME_MAX_VALUE (TIME_MAX_HOUR*10000 + TIME_MAX_MINUTE*100 + \ - TIME_MAX_SECOND + TIME_MAX_SECOND_PART/1e6) + TIME_MAX_SECOND + TIME_MAX_SECOND_PART/(double)TIME_SECOND_PART_FACTOR) #define TIME_MAX_VALUE_SECONDS (TIME_MAX_HOUR * 3600L + \ TIME_MAX_MINUTE * 60L + TIME_MAX_SECOND) @@ -139,8 +141,6 @@ void set_zero_time(MYSQL_TIME *tm, enum enum_mysql_timestamp_type time_type); sent using binary protocol fit in this buffer. */ #define MAX_DATE_STRING_REP_LENGTH 30 -#define MAX_SEC_PART_VALUE 999999 -#define MAX_SEC_PART_DIGITS 6 #define AUTO_SEC_PART_DIGITS 31 /* same as NOT_FIXED_DEC */ int my_time_to_str(const MYSQL_TIME *l_time, char *to, int digits); @@ -150,16 +150,16 @@ int my_TIME_to_str(const MYSQL_TIME *l_time, char *to, int digits); static inline longlong sec_part_shift(longlong second_part, int digits) { - return second_part / log_10_int[MAX_SEC_PART_DIGITS - digits]; + return second_part / (longlong)log_10_int[TIME_SECOND_PART_DIGITS - digits]; } static inline longlong sec_part_unshift(longlong second_part, int digits) { - return second_part * log_10_int[MAX_SEC_PART_DIGITS - digits]; + return second_part * (longlong)log_10_int[TIME_SECOND_PART_DIGITS - digits]; } static inline ulong sec_part_truncate(ulong second_part, int digits) { /* the cast here should be unnecessary! */ - return second_part - second_part % (ulong)log_10_int[MAX_SEC_PART_DIGITS - digits]; + return second_part - second_part % (ulong)log_10_int[TIME_SECOND_PART_DIGITS - digits]; } #define hrtime_to_my_time(X) ((my_time_t)hrtime_to_time(X)) -- cgit v1.2.1 From 03b33425e5a3de3fad070aa21e7fc7baf8104c81 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 19 May 2011 19:05:35 +0200 Subject: many changes to my_getsystime.c: * my_getsystime() is only an interval timer. Its value can beused for calculating time intervals. * renamed my_getsystime() to my_interval_timer(), to make the semantics clearer and let the compiler catch wrong usages of my_getsystime() (also future ones, that may come in merges). * increased its granularity from 100ns to 1ns, old value was for UUID, but as UUID can no longer use it directly there is no need to downgrade the OS provided value * fixed the UUID code to anchor the my_interval_timer() on the epoch, as required by the UUID standard. That is, this was only needed by UUID, and now I've moved it to UUID code from my_getsystime(). * fixed other wrong usages of my_getsystime() - e.g. in calculating times for pthread_cond_timedwait. It was buggy and could've caused long waits if OS clock would be changed. --- include/my_pthread.h | 12 ++++++------ include/my_sys.h | 9 +++------ 2 files changed, 9 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/my_pthread.h b/include/my_pthread.h index a7e4ea25064..a2476d4265c 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -426,9 +426,9 @@ int my_pthread_mutex_trylock(pthread_mutex_t *mutex); #ifndef set_timespec_nsec #define set_timespec_nsec(ABSTIME,NSEC) \ { \ - ulonglong now= my_getsystime() + (NSEC/100); \ - (ABSTIME).ts_sec= (now / ULL(10000000)); \ - (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \ + ulonglong now= my_hrtime().val*1000 + (NSEC); \ + (ABSTIME).ts_sec= now / 1000000000ULL; \ + (ABSTIME).ts_nsec= now % 1000000000ULL; \ } #endif /* !set_timespec_nsec */ #else @@ -444,9 +444,9 @@ int my_pthread_mutex_trylock(pthread_mutex_t *mutex); #ifndef set_timespec_nsec #define set_timespec_nsec(ABSTIME,NSEC) \ {\ - ulonglong now= my_getsystime() + (NSEC/100); \ - (ABSTIME).tv_sec= (time_t) (now / ULL(10000000)); \ - (ABSTIME).tv_nsec= (long) (now % ULL(10000000) * 100 + ((NSEC) % 100)); \ + ulonglong now= my_hrtime().val*1000 + (NSEC); \ + (ABSTIME).tv_sec= (time_t) (now / 1000000000ULL); \ + (ABSTIME).tv_nsec= (long) (now % 1000000000ULL); \ } #endif /* !set_timespec_nsec */ #endif /* HAVE_TIMESPEC_TS_SEC */ diff --git a/include/my_sys.h b/include/my_sys.h index 96754d2e85d..48370ea7c38 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -894,21 +894,18 @@ extern ulong crc32(ulong crc, const uchar *buf, uint len); extern uint my_set_max_open_files(uint files); void my_free_open_file_info(void); -#define HRTIME_RESOLUTION 1000000 +#define HRTIME_RESOLUTION 1000000 /* microseconds */ typedef struct {ulonglong val;} my_hrtime_t; -typedef struct {ulonglong val;} my_timediff_t; void my_time_init(); extern my_hrtime_t my_hrtime(); -void my_diff_and_hrtime(my_timediff_t *interval, my_hrtime_t *timestamp); -extern ulonglong my_getsystime(void); +extern ulonglong my_interval_timer(void); -#define my_micro_time() (my_getsystime()/10) +#define microsecond_interval_timer() (my_interval_timer()/1000) #define hrtime_to_time(X) ((X).val/1000000) #define hrtime_from_time(X) ((ulonglong)((X)*1000000ULL)) #define hrtime_to_double(X) ((X).val/(double)HRTIME_RESOLUTION) #define hrtime_sec_part(X) ((ulong)((X).val%1000000)) #define my_time(X) hrtime_to_time(my_hrtime()) -#define my_micro_and_hrtime(X,Y) my_diff_and_hrtime(X,Y) extern my_bool my_gethwaddr(uchar *to); extern int my_getncpus(); -- cgit v1.2.1 From f06cac336ba7a27493fc753d2bf37e87137a1cdc Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 19 May 2011 19:16:17 +0200 Subject: post review changes 2 sql/event_parse_data.cc: don't use "not_used" variable sql/item_timefunc.cc: Item_temporal_func::fix_length_and_dec() and other changes sql/item_timefunc.h: introducing Item_timefunc::fix_length_and_dec() sql/share/errmsg.txt: don't say "column X" in the error message that used not only for columns --- include/my_time.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/my_time.h b/include/my_time.h index 9fcff24918b..8ebca27e88d 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -80,6 +80,8 @@ typedef long my_time_t; my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date, ulong flags, int *was_cut); enum enum_mysql_timestamp_type +str_to_time(const char *str, uint length, MYSQL_TIME *l_time, int *warning); +enum enum_mysql_timestamp_type str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, uint flags, int *was_cut); longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res, -- cgit v1.2.1 From 8767540a43b28c977714e2f35aadcfd1bcefef5f Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 19 May 2011 19:19:44 +0200 Subject: microseconds in log tables: TIMESTAMP -> TIMESTAMP(6) TIME -> TIME(6) in general_log and slow_log tables. include/my_sys.h: use constants --- include/my_sys.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/my_sys.h b/include/my_sys.h index 48370ea7c38..1b8da17006f 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -894,17 +894,17 @@ extern ulong crc32(ulong crc, const uchar *buf, uint len); extern uint my_set_max_open_files(uint files); void my_free_open_file_info(void); -#define HRTIME_RESOLUTION 1000000 /* microseconds */ +#define HRTIME_RESOLUTION 1000000ULL /* microseconds */ typedef struct {ulonglong val;} my_hrtime_t; void my_time_init(); extern my_hrtime_t my_hrtime(); extern ulonglong my_interval_timer(void); #define microsecond_interval_timer() (my_interval_timer()/1000) -#define hrtime_to_time(X) ((X).val/1000000) -#define hrtime_from_time(X) ((ulonglong)((X)*1000000ULL)) +#define hrtime_to_time(X) ((X).val/HRTIME_RESOLUTION) +#define hrtime_from_time(X) ((ulonglong)((X)*HRTIME_RESOLUTION)) #define hrtime_to_double(X) ((X).val/(double)HRTIME_RESOLUTION) -#define hrtime_sec_part(X) ((ulong)((X).val%1000000)) +#define hrtime_sec_part(X) ((ulong)((X).val % HRTIME_RESOLUTION)) #define my_time(X) hrtime_to_time(my_hrtime()) extern my_bool my_gethwaddr(uchar *to); -- cgit v1.2.1