← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/temporal_interval.cc

  • Committer: Brian Aker
  • Date: 2009-10-16 10:27:33 UTC
  • mfrom: (1183.1.4 merge)
  • Revision ID: brian@gaz-20091016102733-b10po5oup0hjlilh
Merge Engine changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/temporal_interval.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
#include "drizzled/internal/m_string.h"
22
 
#include "drizzled/error.h"
23
 
#include "drizzled/session.h"
24
 
#include "config.h"
25
 
#include "drizzled/function/time/date.h"
26
 
#include "drizzled/temporal_interval.h"
27
 
#include "drizzled/time_functions.h"
28
 
 
29
 
namespace drizzled
30
 
{
31
 
 
32
 
bool TemporalInterval::initFromItem(Item *args,
33
 
                                    interval_type int_type,
34
 
                                    String *str_value)
 
20
#include <drizzled/global.h>
 
21
#include <drizzled/error.h>
 
22
#include <drizzled/session.h>
 
23
#include <drizzled/server_includes.h>
 
24
#include <drizzled/function/time/date.h>
 
25
#include <drizzled/temporal_interval.h>
 
26
 
 
27
bool drizzled::TemporalInterval::initFromItem(Item *args, interval_type int_type, String *str_value)
35
28
{
36
29
  uint64_t array[MAX_STRING_ELEMENTS];
37
30
  int64_t value= 0;
186
179
  return false;
187
180
}
188
181
 
189
 
bool TemporalInterval::addDate(type::Time *ltime, interval_type int_type)
 
182
bool drizzled::TemporalInterval::addDate(DRIZZLE_TIME *ltime, interval_type int_type)
190
183
{
191
184
  long period, sign;
192
185
 
211
204
  case INTERVAL_DAY_MINUTE:
212
205
  case INTERVAL_DAY_HOUR:
213
206
    int64_t sec, days, daynr, microseconds, extra_sec;
214
 
    ltime->time_type= type::DRIZZLE_TIMESTAMP_DATETIME; // Return full date
 
207
    ltime->time_type= DRIZZLE_TIMESTAMP_DATETIME; // Return full date
215
208
    microseconds= ltime->second_part + sign*second_part;
216
209
    extra_sec= microseconds/1000000L;
217
210
    microseconds= microseconds%1000000L;
241
234
    /* Day number from year 0 to 9999-12-31 */
242
235
    if ((uint64_t) daynr > MAX_DAY_NUMBER)
243
236
      goto invalid_date;
244
 
    get_date_from_daynr((long) daynr, &ltime->year, &ltime->month, &ltime->day);
 
237
    get_date_from_daynr((long) daynr, &ltime->year, &ltime->month,
 
238
        &ltime->day);
245
239
    break;
246
240
  case INTERVAL_DAY:
247
241
  case INTERVAL_WEEK:
292
286
  return 1;
293
287
}
294
288
 
295
 
bool TemporalInterval::getIntervalFromString(const char *str,
296
 
                                             uint32_t length,
297
 
                                             const CHARSET_INFO * const cs,
298
 
                                             uint32_t count, uint64_t *values,
299
 
                                             bool transform_msec)
 
289
bool drizzled::TemporalInterval::getIntervalFromString(const char *str,uint32_t length, const CHARSET_INFO * const cs,
 
290
    uint32_t count, uint64_t *values,
 
291
    bool transform_msec)
300
292
{
301
293
  const char *end= str+length;
302
294
  uint32_t x;
310
302
    const char *start= str;
311
303
    for (value= 0 ; str != end && my_isdigit(cs,*str) ; str++)
312
304
      value= value * 10L + (int64_t) (*str - '0');
313
 
    if (transform_msec && (x == count - 1 || str == end)) // microseconds always last
 
305
    if (transform_msec && x == count - 1) // microseconds always last
314
306
    {
315
307
      long msec_length= 6 - (str - start);
316
308
      if (msec_length > 0)
322
314
    if (str == end && x != count-1)
323
315
    {
324
316
      x++;
325
 
      /* Change values[0...x-1] -> values[count-x...count-1] */
326
 
      internal::bmove_upp((unsigned char*) (values+count),
327
 
                          (unsigned char*) (values+x),
328
 
                          sizeof(*values)*x);
 
317
      /* Change values[0...x-1] -> values[0...count-1] */
 
318
      bmove_upp((unsigned char*) (values+count), (unsigned char*) (values+x),
 
319
          sizeof(*values)*x);
329
320
      memset(values, 0, sizeof(*values)*(count-x));
330
321
      break;
331
322
    }
332
323
  }
333
324
  return (str != end);
334
325
}
335
 
 
336
 
} /* namespace drizzled */