← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/hp_rkey.cc

  • Committer: Brian Aker
  • Date: 2010-01-22 00:53:13 UTC
  • Revision ID: brian@gaz-20100122005313-jmizcbcdi1lt4tcx
Revert db patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/hp_rkey.cc
11
11
 
12
12
   You should have received a copy of the GNU General Public License
13
13
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
#include "heap_priv.h"
17
17
 
18
18
#include <string.h>
19
19
 
20
 
using namespace drizzled;
21
 
 
22
20
int heap_rkey(HP_INFO *info, unsigned char *record, int inx, const unsigned char *key,
23
 
              key_part_map , enum ha_rkey_function )
 
21
              key_part_map keypart_map, enum ha_rkey_function find_flag)
24
22
{
25
23
  unsigned char *pos;
26
 
  HP_SHARE *share= info->getShare();
 
24
  HP_SHARE *share= info->s;
27
25
  HP_KEYDEF *keyinfo= share->keydef + inx;
28
26
 
29
27
  if ((uint) inx >= share->keys)
32
30
  }
33
31
  info->lastinx= inx;
34
32
  info->current_record= UINT32_MAX;             /* For heap_rrnd() */
 
33
 
 
34
  if (keyinfo->algorithm == HA_KEY_ALG_BTREE)
 
35
  {
 
36
    heap_rb_param custom_arg;
 
37
 
 
38
    custom_arg.keyseg= info->s->keydef[inx].seg;
 
39
    custom_arg.key_length= info->lastkey_len=
 
40
      hp_rb_pack_key(keyinfo, (unsigned char*) info->lastkey,
 
41
                     (unsigned char*) key, keypart_map);
 
42
    custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME;
 
43
    /* for next rkey() after deletion */
 
44
    if (find_flag == HA_READ_AFTER_KEY)
 
45
      info->last_find_flag= HA_READ_KEY_OR_NEXT;
 
46
    else if (find_flag == HA_READ_BEFORE_KEY)
 
47
      info->last_find_flag= HA_READ_KEY_OR_PREV;
 
48
    else
 
49
      info->last_find_flag= find_flag;
 
50
    if (!(pos= (unsigned char *)tree_search_key(&keyinfo->rb_tree,
 
51
                                                info->lastkey, info->parents,
 
52
                                                &info->last_pos,
 
53
                                                find_flag, &custom_arg)))
 
54
    {
 
55
      info->update= 0;
 
56
      return(errno= HA_ERR_KEY_NOT_FOUND);
 
57
    }
 
58
    memcpy(&pos, pos + (*keyinfo->get_key_length)(keyinfo, pos), sizeof(unsigned char*));
 
59
    info->current_ptr= pos;
 
60
  }
 
61
  else
35
62
  {
36
63
    if (!(pos= hp_search(info, share->keydef + inx, key, 0)))
37
64
    {
39
66
      return(errno);
40
67
    }
41
68
    if (!(keyinfo->flag & HA_NOSAME))
42
 
      memcpy(&info->lastkey[0], key, (size_t) keyinfo->length);
 
69
      memcpy(info->lastkey, key, (size_t) keyinfo->length);
43
70
  }
44
71
  hp_extract_record(share, record, pos);
45
72
  info->update= HA_STATE_AKTIV;
51
78
 
52
79
unsigned char* heap_find(HP_INFO *info, int inx, const unsigned char *key)
53
80
{
54
 
  return hp_search(info, info->getShare()->keydef + inx, key, 0);
 
81
  return hp_search(info, info->s->keydef + inx, key, 0);
55
82
}