mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refs #6195, make proper fix

Browse source 
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@54177 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2013-04-17 00:02:18 -04:00 committed by Yoni Fogel
parent 822f9c0ed3
commit d22280144e
2 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
storage/tokudb/ha_tokudb.cc
View file

@ -334,6 +334,7 @@ typedef struct smart_dbt_bf_info {
int direction;
THD* thd;
uchar* buf;
DBT* key_to_compare;
} *SMART_DBT_BF_INFO;
typedef struct index_read_info {
@ -4765,14 +4766,16 @@ int ha_tokudb::index_next_same(uchar * buf, const uchar * key, uint keylen) {
DBT found_key;
bool has_null;
int cmp;
int error = get_next(buf, 1);
// create the key that will be used to compare with what is found
// in order to figure out if we should return an error
pack_key(&curr_key, tokudb_active_index, key_buff2, key, keylen, COL_ZERO);
int error = get_next(buf, 1, &curr_key);
if (error) {
goto cleanup;
}
//
// now do the comparison
//
pack_key(&curr_key, tokudb_active_index, key_buff2, key, keylen, COL_ZERO);
create_dbt_key_from_table(&found_key,tokudb_active_index,key_buff3,buf,&has_null);
cmp = tokudb_prefix_cmp_dbt_key(share->key_file[tokudb_active_index], &curr_key, &found_key);
if (cmp) {
@ -5015,7 +5018,7 @@ exit:
static int
smart_dbt_bf_callback(DBT const *key, DBT const *row, void *context) {
SMART_DBT_BF_INFO info = (SMART_DBT_BF_INFO)context;
return info->ha->fill_range_query_buf(info->need_val, key, row, info->direction, info->thd, info->buf);
return info->ha->fill_range_query_buf(info->need_val, key, row, info->direction, info->thd, info->buf, info->key_to_compare);
}
#if defined(MARIADB_BASE_VERSION) || (50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699)
@ -5045,7 +5048,8 @@ int ha_tokudb::fill_range_query_buf(
DBT const *row,
int direction,
THD* thd,
uchar* buf
uchar* buf,
DBT* key_to_compare
) {
int error;
//
@ -5056,6 +5060,19 @@ int ha_tokudb::fill_range_query_buf(
uint32_t user_defined_size = get_tokudb_read_buf_size(thd);
uchar* curr_pos = NULL;
if (key_to_compare) {
int cmp = tokudb_prefix_cmp_dbt_key(
share->key_file[tokudb_active_index],
key_to_compare,
key
);
if (cmp) {
icp_went_out_of_range = true;
error = 0;
goto cleanup;
}
}
#if defined(MARIADB_BASE_VERSION) || (50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699)
// if we have an index condition pushed down, we check it
if (toku_pushed_idx_cond && (tokudb_active_index == toku_pushed_idx_cond_keyno)) {
@ -5265,7 +5282,7 @@ cleanup:
return error;
}
int ha_tokudb::get_next(uchar* buf, int direction) {
int ha_tokudb::get_next(uchar* buf, int direction, DBT* key_to_compare) {
int error = 0;
uint32_t flags = SET_PRELOCK_FLAG(0);
THD* thd = ha_thd();
@ -5298,6 +5315,7 @@ int ha_tokudb::get_next(uchar* buf, int direction) {
bf_info.thd = ha_thd();
bf_info.need_val = need_val;
bf_info.buf = buf;
bf_info.key_to_compare = key_to_compare;
//
// call c_getf_next with purpose of filling in range_query_buff
//
@ -5379,7 +5397,7 @@ cleanup:
int ha_tokudb::index_next(uchar * buf) {
TOKUDB_DBUG_ENTER("ha_tokudb::index_next");
ha_statistic_increment(&SSV::ha_read_next_count);
int error = get_next(buf, 1);
int error = get_next(buf, 1, NULL);
TOKUDB_DBUG_RETURN(error);
}
@ -5401,7 +5419,7 @@ int ha_tokudb::index_read_last(uchar * buf, const uchar * key, uint key_len) {
int ha_tokudb::index_prev(uchar * buf) {
TOKUDB_DBUG_ENTER("ha_tokudb::index_prev");
ha_statistic_increment(&SSV::ha_read_prev_count);
int error = get_next(buf, -1);
int error = get_next(buf, -1, NULL);
TOKUDB_DBUG_RETURN(error);
}
@ -5549,7 +5567,7 @@ int ha_tokudb::rnd_end() {
int ha_tokudb::rnd_next(uchar * buf) {
TOKUDB_DBUG_ENTER("ha_tokudb::ha_tokudb::rnd_next");
ha_statistic_increment(&SSV::ha_read_rnd_next_count);
int error = get_next(buf, 1);
int error = get_next(buf, 1, NULL);
TOKUDB_DBUG_RETURN(error);
}

5
storage/tokudb/ha_tokudb.h
View file

@ -693,7 +693,8 @@ public:
DBT const *row,
int direction,
THD* thd,
uchar* buf
uchar* buf,
DBT* key_to_compare
);
#if MYSQL_VERSION_ID >= 50521
@ -705,7 +706,7 @@ public:
private:
int read_full_row(uchar * buf);
int __close(int mutex_is_locked);
int get_next(uchar* buf, int direction);
int get_next(uchar* buf, int direction, DBT* key_to_compare);
int read_data_from_range_query_buff(uchar* buf, bool need_val);
// for ICP, only in MariaDB and MySQL 5.6
#if defined(MARIADB_BASE_VERSION) || (50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699)