← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/time_functions.cc

  • Committer: Lee Bieber
  • Date: 2010-12-23 23:11:00 UTC
  • mfrom: (2024.1.1 clean)
  • Revision ID: kalebral@gmail.com-20101223231100-0rqirgz7ugkl10yp
Merge Brian - session list cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/time_functions.cc
39
39
}
40
40
 
41
41
 
42
 
uint32_t calc_week(type::Time *l_time, uint32_t week_behaviour, uint32_t *year)
 
42
uint32_t calc_week(DRIZZLE_TIME *l_time, uint32_t week_behaviour, uint32_t *year)
43
43
{
44
44
  uint32_t days;
45
45
  uint32_t daynr= calc_daynr(l_time->year,l_time->month,l_time->day);
107
107
    {
108
108
      if (day_of_year > 31+28)
109
109
      {
110
 
        day_of_year--;
111
 
        if (day_of_year == 31+28)
112
 
          leap_day=1;           /* Handle leapyears leapday */
 
110
        day_of_year--;
 
111
        if (day_of_year == 31+28)
 
112
          leap_day=1;           /* Handle leapyears leapday */
113
113
      }
114
114
    }
115
115
    *ret_month=1;
116
116
    for (month_pos= days_in_month ;
117
 
         day_of_year > (uint32_t) *month_pos ;
118
 
         day_of_year-= *(month_pos++), (*ret_month)++)
 
117
         day_of_year > (uint32_t) *month_pos ;
 
118
         day_of_year-= *(month_pos++), (*ret_month)++)
119
119
      ;
120
120
    *ret_year=year;
121
121
    *ret_day=day_of_year+leap_day;
124
124
}
125
125
 
126
126
 
127
 
type::timestamp_t str_to_datetime_with_warn(Session *session,
128
 
                                            const char *str, 
129
 
                                            uint32_t length, 
130
 
                                            type::Time *l_time,
131
 
                                            uint32_t flags)
 
127
enum enum_drizzle_timestamp_type
 
128
str_to_datetime_with_warn(const char *str, 
 
129
                          uint32_t length, 
 
130
                          DRIZZLE_TIME *l_time,
 
131
                          uint32_t flags)
132
132
{
133
 
  type::cut_t was_cut= type::VALID;
134
 
  type::timestamp_t ts_type;
 
133
  int was_cut;
 
134
  enum enum_drizzle_timestamp_type ts_type;
 
135
  Session *session= current_session;
135
136
 
136
 
  ts_type= l_time->store(str, length,
137
 
                         (flags | (session->variables.sql_mode &
138
 
                                   (MODE_INVALID_DATES |
139
 
                                    MODE_NO_ZERO_DATE))),
140
 
                         was_cut);
141
 
  if (was_cut || ts_type <= type::DRIZZLE_TIMESTAMP_ERROR)
 
137
  ts_type= str_to_datetime(str, length, l_time,
 
138
                           (flags | (session->variables.sql_mode &
 
139
                                     (MODE_INVALID_DATES |
 
140
                                      MODE_NO_ZERO_DATE))),
 
141
                           &was_cut);
 
142
  if (was_cut || ts_type <= DRIZZLE_TIMESTAMP_ERROR)
142
143
    make_truncated_value_warning(session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
143
144
                                 str, length, ts_type,  NULL);
144
 
 
145
145
  return ts_type;
146
146
}
147
147
 
148
148
 
149
149
bool
150
 
str_to_time_with_warn(Session *session, const char *str, uint32_t length, type::Time *l_time)
 
150
str_to_time_with_warn(const char *str, uint32_t length, DRIZZLE_TIME *l_time)
151
151
{
152
152
  int warning;
153
 
  bool ret_val= l_time->store(str, length, warning, type::DRIZZLE_TIMESTAMP_TIME);
 
153
  bool ret_val= str_to_time(str, length, l_time, &warning);
154
154
  if (ret_val || warning)
155
 
    make_truncated_value_warning(session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
156
 
                                 str, length, type::DRIZZLE_TIMESTAMP_TIME, NULL);
 
155
    make_truncated_value_warning(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
156
                                 str, length, DRIZZLE_TIMESTAMP_TIME, NULL);
157
157
  return ret_val;
158
158
}
159
159
 
160
160
 
 
161
void localtime_to_TIME(DRIZZLE_TIME *to, struct tm *from)
 
162
{
 
163
  to->neg=0;
 
164
  to->second_part=0;
 
165
  to->year=     (int) ((from->tm_year+1900) % 10000);
 
166
  to->month=    (int) from->tm_mon+1;
 
167
  to->day=      (int) from->tm_mday;
 
168
  to->hour=     (int) from->tm_hour;
 
169
  to->minute=   (int) from->tm_min;
 
170
  to->second=   (int) from->tm_sec;
 
171
}
 
172
 
 
173
void make_time(const DRIZZLE_TIME *l_time, String *str)
 
174
{
 
175
  str->alloc(MAX_DATE_STRING_REP_LENGTH);
 
176
  uint32_t length= (uint32_t) my_time_to_str(l_time, str->c_ptr());
 
177
  str->length(length);
 
178
  str->set_charset(&my_charset_bin);
 
179
}
 
180
 
 
181
void make_date(const DRIZZLE_TIME *l_time, String *str)
 
182
{
 
183
  str->alloc(MAX_DATE_STRING_REP_LENGTH);
 
184
  uint32_t length= (uint32_t) my_date_to_str(l_time, str->c_ptr());
 
185
  str->length(length);
 
186
  str->set_charset(&my_charset_bin);
 
187
}
 
188
 
 
189
 
 
190
void make_datetime(const DRIZZLE_TIME *l_time, String *str)
 
191
{
 
192
  str->alloc(MAX_DATE_STRING_REP_LENGTH);
 
193
  uint32_t length= (uint32_t) my_datetime_to_str(l_time, str->c_ptr());
 
194
  str->length(length);
 
195
  str->set_charset(&my_charset_bin);
 
196
}
 
197
 
 
198
 
161
199
void make_truncated_value_warning(Session *session, 
162
200
                                  DRIZZLE_ERROR::enum_warning_level level,
163
201
                                  const char *str_val,
164
202
                                                          uint32_t str_length,
165
 
                                  type::timestamp_t time_type,
 
203
                                  enum enum_drizzle_timestamp_type time_type,
166
204
                                  const char *field_name)
167
205
{
168
206
  char warn_buff[DRIZZLE_ERRMSG_SIZE];
174
212
  str[str_length]= 0;               // Ensure we have end 0 for snprintf
175
213
 
176
214
  switch (time_type) {
177
 
  case type::DRIZZLE_TIMESTAMP_DATE:
178
 
    type_str= "date";
179
 
    break;
180
 
 
181
 
  case type::DRIZZLE_TIMESTAMP_TIME:
182
 
    type_str= "time";
183
 
    break;
184
 
 
185
 
  case type::DRIZZLE_TIMESTAMP_DATETIME:  // FALLTHROUGH
186
 
  default:
187
 
    type_str= "datetime";
188
 
    break;
 
215
    case DRIZZLE_TIMESTAMP_DATE:
 
216
      type_str= "date";
 
217
      break;
 
218
    case DRIZZLE_TIMESTAMP_TIME:
 
219
      type_str= "time";
 
220
      break;
 
221
    case DRIZZLE_TIMESTAMP_DATETIME:  // FALLTHROUGH
 
222
    default:
 
223
      type_str= "datetime";
 
224
      break;
189
225
  }
190
 
 
191
226
  if (field_name)
192
227
  {
193
228
    cs->cset->snprintf(cs, warn_buff, sizeof(warn_buff),
197
232
  }
198
233
  else
199
234
  {
200
 
    if (time_type > type::DRIZZLE_TIMESTAMP_ERROR)
201
 
    {
 
235
    if (time_type > DRIZZLE_TIMESTAMP_ERROR)
202
236
      cs->cset->snprintf(cs, warn_buff, sizeof(warn_buff),
203
237
                         ER(ER_TRUNCATED_WRONG_VALUE),
204
238
                         type_str, str.c_ptr());
205
 
    }
206
239
    else
207
 
    {
208
240
      cs->cset->snprintf(cs, warn_buff, sizeof(warn_buff),
209
241
                         ER(ER_WRONG_VALUE), type_str, str.c_ptr());
210
 
    }
211
242
  }
212
243
  push_warning(session, level,
213
244
               ER_TRUNCATED_WRONG_VALUE, warn_buff);
215
246
 
216
247
 
217
248
bool
218
 
calc_time_diff(type::Time *l_time1, type::Time *l_time2, int l_sign, int64_t *seconds_out,
 
249
calc_time_diff(DRIZZLE_TIME *l_time1, DRIZZLE_TIME *l_time2, int l_sign, int64_t *seconds_out,
219
250
               long *microseconds_out)
220
251
{
221
252
  long days;
227
258
    the second argument should be TIMESTAMP_TIME also.
228
259
    We should check it before calc_time_diff call.
229
260
  */
230
 
  if (l_time1->time_type == type::DRIZZLE_TIMESTAMP_TIME)  // Time value
 
261
  if (l_time1->time_type == DRIZZLE_TIMESTAMP_TIME)  // Time value
231
262
    days= (long)l_time1->day - l_sign * (long)l_time2->day;
232
263
  else
233
264
  {
234
265
    days= calc_daynr((uint32_t) l_time1->year,
235
 
                     (uint32_t) l_time1->month,
236
 
                     (uint32_t) l_time1->day);
237
 
    if (l_time2->time_type == type::DRIZZLE_TIMESTAMP_TIME)
 
266
                     (uint32_t) l_time1->month,
 
267
                     (uint32_t) l_time1->day);
 
268
    if (l_time2->time_type == DRIZZLE_TIMESTAMP_TIME)
238
269
      days-= l_sign * (long)l_time2->day;
239
270
    else
240
271
      days-= l_sign*calc_daynr((uint32_t) l_time2->year,
241
 
                               (uint32_t) l_time2->month,
242
 
                               (uint32_t) l_time2->day);
 
272
                               (uint32_t) l_time2->month,
 
273
                               (uint32_t) l_time2->day);
243
274
  }
244
275
 
245
276
  microseconds= ((int64_t)days*86400L +
246
277
                 (int64_t)(l_time1->hour*3600L +
247
 
                           l_time1->minute*60L +
248
 
                           l_time1->second) -
 
278
                            l_time1->minute*60L +
 
279
                            l_time1->second) -
249
280
                 l_sign*(int64_t)(l_time2->hour*3600L +
250
 
                                  l_time2->minute*60L +
251
 
                                  l_time2->second)) * 1000000L +
252
 
    (int64_t)l_time1->second_part -
253
 
    l_sign*(int64_t)l_time2->second_part;
 
281
                                   l_time2->minute*60L +
 
282
                                   l_time2->second)) * 1000000L +
 
283
                (int64_t)l_time1->second_part -
 
284
                l_sign*(int64_t)l_time2->second_part;
254
285
 
255
286
  neg= 0;
256
287
  if (microseconds < 0)