From 34cc5ed9c669d46acc201b8c3aad3d029fcd6a10 Mon Sep 17 00:00:00 2001 From: Zardosht Kasheff <zardosht@tokutek.com> Date: Tue, 7 Apr 2009 15:08:03 +0000 Subject: [PATCH] addresses #1655 rename some more functions, remove extraneous commented out code git-svn-id: file:///svn/mysql/tokudb-engine/src@11087 c7de825b-a66e-492c-adef-691d508d4ae1 --- storage/tokudb/ha_tokudb.cc | 11 +++-------- storage/tokudb/hatoku_cmp.cc | 8 ++++---- storage/tokudb/hatoku_cmp.h | 6 +++--- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 07b25e7c6d..931b6af440 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -1227,7 +1227,7 @@ u_int32_t ha_tokudb::place_key_into_mysql_buff(KEY* key_info, uchar * record, uc // HOPEFULLY TEMPORARY // assert(table->s->db_low_byte_first); - pos = unpack_toku_field( + pos = unpack_toku_key_field( record + field_offset(key_part->field, table), pos, key_part->field, @@ -1282,11 +1282,6 @@ u_int32_t ha_tokudb::place_key_into_dbt_buff(KEY* key_info, uchar * buff, const if (record[null_offset] & key_part->field->null_bit) { *curr_buff++ = NULL_COL_VAL; *has_null = true; - // - // fractal tree does not handle this falg at the moment - // so commenting out for now - // - //key->flags |= DB_DBT_DUPOK; continue; } *curr_buff++ = NONNULL_COL_VAL; // Store NOT NULL marker @@ -1300,7 +1295,7 @@ u_int32_t ha_tokudb::place_key_into_dbt_buff(KEY* key_info, uchar * buff, const // because key_part->offset is SET INCORRECTLY in add_index // filed ticket 862 to look into this // - curr_buff = pack_toku_field( + curr_buff = pack_toku_key_field( curr_buff, (uchar *) (record + field_offset(key_part->field, table)), key_part->field, @@ -1437,7 +1432,7 @@ DBT *ha_tokudb::pack_key(DBT * key, uint keynr, uchar * buff, const uchar * key_ } assert(table->s->db_low_byte_first); - buff = pack_key_toku_field( + buff = pack_key_toku_key_field( buff, (uchar *) key_ptr + offset, key_part->field, diff --git a/storage/tokudb/hatoku_cmp.cc b/storage/tokudb/hatoku_cmp.cc index 0308172902..0f102e141f 100755 --- a/storage/tokudb/hatoku_cmp.cc +++ b/storage/tokudb/hatoku_cmp.cc @@ -1055,7 +1055,7 @@ inline int compare_toku_field( // // at the moment, this returns new position in buffer // -uchar* pack_toku_field( +uchar* pack_toku_key_field( uchar* to_tokudb, uchar* from_mysql, Field* field, @@ -1142,7 +1142,7 @@ exit: return new_pos; } -uchar* pack_key_toku_field( +uchar* pack_key_toku_key_field( uchar* to_tokudb, uchar* from_mysql, Field* field, @@ -1157,7 +1157,7 @@ uchar* pack_key_toku_field( case (toku_type_float): case (toku_type_fixbinary): case (toku_type_fixstring): - new_pos = pack_toku_field(to_tokudb, from_mysql, field, key_part_length); + new_pos = pack_toku_key_field(to_tokudb, from_mysql, field, key_part_length); goto exit; case (toku_type_varbinary): new_pos = pack_toku_varbinary( @@ -1189,7 +1189,7 @@ exit: } -uchar* unpack_toku_field( +uchar* unpack_toku_key_field( uchar* to_mysql, uchar* from_tokudb, Field* field, diff --git a/storage/tokudb/hatoku_cmp.h b/storage/tokudb/hatoku_cmp.h index ce8a32a9ea..35e8fe7c04 100755 --- a/storage/tokudb/hatoku_cmp.h +++ b/storage/tokudb/hatoku_cmp.h @@ -30,21 +30,21 @@ typedef enum { inline TOKU_TYPE mysql_to_toku_type (enum_field_types mysql_type); -uchar* pack_toku_field( +uchar* pack_toku_key_field( uchar* to_tokudb, uchar* from_mysql, Field* field, u_int32_t key_part_length //I really hope this is temporary as I phase out the pack_cmp stuff ); -uchar* pack_key_toku_field( +uchar* pack_key_toku_key_field( uchar* to_tokudb, uchar* from_mysql, Field* field, u_int32_t key_part_length //I really hope this is temporary as I phase out the pack_cmp stuff ); -uchar* unpack_toku_field( +uchar* unpack_toku_key_field( uchar* to_mysql, uchar* from_tokudb, Field* field, -- 2.30.9