← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_conv.cc

  • Committer: Olaf van der Spek
  • Date: 2011-07-05 13:16:34 UTC
  • mto: This revision was merged to the branch mainline in revision 2384.
  • Revision ID: olafvdspek@gmail.com-20110705131634-f7g1fjro5slibmdj
Add data_ref.h
Use str_ref for append_identifier

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_conv.cc
24
24
    gives much more speed.
25
25
*/
26
26
 
27
 
#include "config.h"
 
27
#include <config.h>
28
28
 
29
29
#include <drizzled/error.h>
30
30
#include <drizzled/table.h>
31
31
#include <drizzled/session.h>
 
32
#include <drizzled/current_session.h>
32
33
 
33
34
#include <drizzled/copy_field.h>
34
35
#include <drizzled/field/blob.h>
46
47
#include <drizzled/field/real.h>
47
48
#include <drizzled/field/str.h>
48
49
#include <drizzled/field/varstring.h>
 
50
#include <drizzled/util/test.h>
 
51
#include <drizzled/system_variables.h>
49
52
 
50
 
namespace drizzled
51
 
{
 
53
namespace drizzled {
52
54
 
53
55
static void do_field_eq(CopyField *copy)
54
56
{
343
345
  char buff[MAX_FIELD_WIDTH];
344
346
  copy->tmp.set_quick(buff,sizeof(buff),copy->tmp.charset());
345
347
  copy->from_field->val_str_internal(&copy->tmp);
346
 
  copy->to_field->store(copy->tmp.c_ptr_quick(),copy->tmp.length(),
347
 
                        copy->tmp.charset());
 
348
  copy->to_field->store(copy->tmp.data(),copy->tmp.length(), copy->tmp.charset());
348
349
}
349
350
 
350
351
 
385
386
 
386
387
static void do_cut_string(CopyField *copy)
387
388
{
388
 
  const CHARSET_INFO * const cs= copy->from_field->charset();
 
389
  const charset_info_st * const cs= copy->from_field->charset();
389
390
  memcpy(copy->to_ptr, copy->from_ptr, copy->to_length);
390
391
 
391
392
  /* Check if we loosed any important characters */
408
409
static void do_cut_string_complex(CopyField *copy)
409
410
{                                               // Shorter string field
410
411
  int well_formed_error;
411
 
  const CHARSET_INFO * const cs= copy->from_field->charset();
 
412
  const charset_info_st * const cs= copy->from_field->charset();
412
413
  const unsigned char *from_end= copy->from_ptr + copy->from_length;
413
414
  uint32_t copy_length= cs->cset->well_formed_len(cs,
414
415
                                              (char*) copy->from_ptr,
439
440
 
440
441
static void do_expand_binary(CopyField *copy)
441
442
{
442
 
  const CHARSET_INFO * const cs= copy->from_field->charset();
 
443
  const charset_info_st * const cs= copy->from_field->charset();
443
444
  memcpy(copy->to_ptr, copy->from_ptr, copy->from_length);
444
445
  cs->cset->fill(cs, (char*) copy->to_ptr+copy->from_length,
445
446
                 copy->to_length-copy->from_length, '\0');
449
450
 
450
451
static void do_expand_string(CopyField *copy)
451
452
{
452
 
  const CHARSET_INFO * const cs= copy->from_field->charset();
 
453
  const charset_info_st * const cs= copy->from_field->charset();
453
454
  memcpy(copy->to_ptr,copy->from_ptr,copy->from_length);
454
455
  cs->cset->fill(cs, (char*) copy->to_ptr+copy->from_length,
455
456
                 copy->to_length-copy->from_length, ' ');
476
477
static void do_varstring1_mb(CopyField *copy)
477
478
{
478
479
  int well_formed_error;
479
 
  const CHARSET_INFO * const cs= copy->from_field->charset();
 
480
  const charset_info_st * const cs= copy->from_field->charset();
480
481
  uint32_t from_length= (uint32_t) *(unsigned char*) copy->from_ptr;
481
482
  const unsigned char *from_ptr= copy->from_ptr + 1;
482
483
  uint32_t to_char_length= (copy->to_length - 1) / cs->mbmaxlen;
517
518
static void do_varstring2_mb(CopyField *copy)
518
519
{
519
520
  int well_formed_error;
520
 
  const CHARSET_INFO * const cs= copy->from_field->charset();
 
521
  const charset_info_st * const cs= copy->from_field->charset();
521
522
  uint32_t char_length= (copy->to_length - HA_KEY_BLOB_LENGTH) / cs->mbmaxlen;
522
523
  uint32_t from_length= uint2korr(copy->from_ptr);
523
524
  const unsigned char *from_beg= copy->from_ptr + HA_KEY_BLOB_LENGTH;
855
856
      end with \0. Can be replaced with .ptr() when we have our own
856
857
      string->double conversion.
857
858
    */
858
 
    return to->store(result.c_ptr_quick(),result.length(),from->charset());
 
859
    return to->store(result.c_str(),result.length(),from->charset());
859
860
  }
860
861
  else if (from->result_type() == REAL_RESULT)
861
862
  {