diff options
author | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-04-25 13:36:55 +0500 |
---|---|---|
committer | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-04-25 13:36:55 +0500 |
commit | 139a73cade4827ca2a41d6cfc9db379b2c696fa3 (patch) | |
tree | 5b8a058772659a40e41e2025e66f79531e604613 /heap/hp_block.c | |
parent | 0e4445850dd29493d61e06650a7b2a430ca42ec8 (diff) | |
download | mariadb-git-139a73cade4827ca2a41d6cfc9db379b2c696fa3.tar.gz |
RB-Tree indexes support in HEAP tables
Renamed _hp_func -> hp_func
mi_key_cmp moved to /mysys/my_handler.c
New tests for HEAP tables
heap/_check.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/_rectest.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/heapdef.h:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_block.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_clear.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_close.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_create.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_delete.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_hash.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_open.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_panic.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_rename.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_rfirst.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_rkey.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_rlast.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_rnext.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_rprev.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_rrnd.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_rsame.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_scan.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_test1.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_test2.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_update.c:
RB-tree index
Renamed _hp_func -> hp_func
heap/hp_write.c:
RB-tree index
Renamed _hp_func -> hp_func
include/Makefile.am:
New include
include/heap.h:
RB-Tree index
include/my_tree.h:
new search functions
new custom_arg argument
include/myisam.h:
Removed MI_KEYSEG
isam/isamlog.c:
Add custom_arg
isam/pack_isam.c:
Add custom_arg
myisam/ft_nlq_search.c:
Add custom_arg
myisam/ft_parser.c:
Add custom_arg
myisam/ft_stopwords.c:
Add custom_arg
myisam/mi_search.c:
Remove mi_key_cmp
myisam/mi_write.c:
Add custom_arg
myisam/myisamdef.h:
Remove mi_key_cmp
myisam/myisamlog.c:
Add custom_arg
myisam/myisampack.c:
Add custom_arg
mysys/Makefile.am:
New file my_handler.c
mysys/tree.c:
custom_arg
new search functions
sql/ha_heap.cc:
RBTree
sql/ha_myisam.cc:
RBTree
sql/item_sum.cc:
custom_arg
sql/sql_analyse.cc:
custom_arg
sql/sql_class.h:
custom_arg
sql/sql_table.cc:
Remove duplicate code
sql/sql_yacc.yy:
UNDEF by default
sql/table.cc:
Remove dirty hack
Diffstat (limited to 'heap/hp_block.c')
-rw-r--r-- | heap/hp_block.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/heap/hp_block.c b/heap/hp_block.c index 5c052218e58..6a022fb3084 100644 --- a/heap/hp_block.c +++ b/heap/hp_block.c @@ -20,7 +20,7 @@ /* Find record according to record-position */ -byte *_hp_find_block(HP_BLOCK *block, ulong pos) +byte *hp_find_block(HP_BLOCK *block, ulong pos) { reg1 int i; reg3 HP_PTRS *ptr; @@ -37,7 +37,7 @@ byte *_hp_find_block(HP_BLOCK *block, ulong pos) /* get one new block-of-records. Alloc ptr to block if neaded */ /* Interrupts are stopped to allow ha_panic in interrupts */ -int _hp_get_new_block(HP_BLOCK *block, ulong *alloc_length) +int hp_get_new_block(HP_BLOCK *block, ulong *alloc_length) { reg1 uint i,j; HP_PTRS *root; @@ -84,7 +84,7 @@ int _hp_get_new_block(HP_BLOCK *block, ulong *alloc_length) /* free all blocks under level */ -byte *_hp_free_level(HP_BLOCK *block, uint level, HP_PTRS *pos, byte *last_pos) +byte *hp_free_level(HP_BLOCK *block, uint level, HP_PTRS *pos, byte *last_pos) { int i,max_pos; byte *next_ptr; @@ -99,7 +99,7 @@ byte *_hp_free_level(HP_BLOCK *block, uint level, HP_PTRS *pos, byte *last_pos) next_ptr=(byte*) (pos+1); for (i=0 ; i < max_pos ; i++) - next_ptr=_hp_free_level(block,level-1, + next_ptr=hp_free_level(block,level-1, (HP_PTRS*) pos->blocks[i],next_ptr); } if ((byte*) pos != last_pos) |