← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/hp_update.cc

  • Committer: lbieber
  • Date: 2010-09-10 05:19:01 UTC
  • mfrom: (1753.1.1 build)
  • Revision ID: lbieber@orisndriz03-20100910051901-lyq4bh4vdegvzyo4
Merge Brian - clean up Heap code

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/hp_update.cc
25
25
  unsigned char *pos;
26
26
  bool auto_key_changed= 0;
27
27
  HP_SHARE *share= info->getShare();
28
 
  uint32_t old_length, new_length;
29
 
  uint32_t old_chunk_count, new_chunk_count;
30
28
 
31
29
  test_active(info);
32
30
  pos=info->current_ptr;
34
32
  if (info->opt_flag & READ_CHECK_USED && hp_rectest(info,old_record))
35
33
    return(errno);                              /* Record changed */
36
34
 
37
 
  old_length = hp_get_encoded_data_length(share, old_record, &old_chunk_count);
38
 
  new_length = hp_get_encoded_data_length(share, new_record, &new_chunk_count);
39
 
 
40
 
  if (new_chunk_count > old_chunk_count) {
41
 
    /* extend the old chunkset size as necessary, but do not shrink yet */
42
 
    if (hp_reallocate_chunkset(&share->recordspace, new_chunk_count, pos)) {
43
 
      return(errno);                          /* Out of memory or table space */
44
 
    }
45
 
  }
46
 
 
47
35
  if (--(share->records) < share->blength >> 1) share->blength>>= 1;
48
36
  share->changed=1;
49
37
 
52
40
  {
53
41
    if (hp_rec_key_cmp(keydef, old_record, new_record, 0))
54
42
    {
55
 
      if ((*keydef->delete_key)(info, keydef, old_record, pos, keydef == p_lastinx) ||
56
 
          (*keydef->write_key)(info, keydef, new_record, pos))
 
43
      if (hp_delete_key(info, keydef, old_record, pos, keydef == p_lastinx) ||
 
44
          hp_write_key(info, keydef, new_record, pos))
 
45
      {
57
46
        goto err;
 
47
      }
58
48
      if (share->auto_key == (uint) (keydef - share->keydef + 1))
59
49
        auto_key_changed= 1;
60
50
    }
62
52
  hp_copy_record_data_to_chunkset(share, new_record, pos);
63
53
  if (++(share->records) == share->blength) share->blength+= share->blength;
64
54
 
65
 
  if (new_chunk_count < old_chunk_count) {
66
 
    /* Shrink the chunkset to its new size */
67
 
    hp_reallocate_chunkset(&share->recordspace, new_chunk_count, pos);
68
 
  }
69
 
 
70
55
  if (auto_key_changed)
71
56
    heap_update_auto_increment(info, new_record);
72
57
  return(0);
75
60
  if (errno == HA_ERR_FOUND_DUPP_KEY)
76
61
  {
77
62
    info->errkey = (int) (keydef - share->keydef);
78
 
    if (keydef->algorithm == HA_KEY_ALG_BTREE)
79
 
    {
80
 
      /* we don't need to delete non-inserted key from rb-tree */
81
 
      if ((*keydef->write_key)(info, keydef, old_record, pos))
82
 
      {
83
 
        if (++(share->records) == share->blength)
84
 
          share->blength+= share->blength;
85
 
        return(errno);
86
 
      }
87
 
      keydef--;
88
 
    }
89
63
    while (keydef >= share->keydef)
90
64
    {
91
65
      if (hp_rec_key_cmp(keydef, old_record, new_record, 0))
92
66
      {
93
 
        if ((*keydef->delete_key)(info, keydef, new_record, pos, 0) ||
94
 
            (*keydef->write_key)(info, keydef, old_record, pos))
 
67
        if (hp_delete_key(info, keydef, new_record, pos, 0) ||
 
68
            hp_write_key(info, keydef, old_record, pos))
95
69
          break;
96
70
      }
97
71
      keydef--;
101
75
  if (++(share->records) == share->blength)
102
76
    share->blength+= share->blength;
103
77
 
104
 
  if (new_chunk_count > old_chunk_count) {
105
 
    /* Shrink the chunkset to its original size */
106
 
    hp_reallocate_chunkset(&share->recordspace, old_chunk_count, pos);
107
 
  }
108
 
 
109
78
  return(errno);
110
79
} /* heap_update */