diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2020-03-16 08:39:49 +0900 |
|---|---|---|
| committer | Kentoku SHIBA <kentokushiba@gmail.com> | 2020-03-16 08:39:49 +0900 |
| commit | 5929e222e4d917d96b78c5937dcc89735a1cc13e (patch) | |
| tree | b79f959fa10758f52446aad6cac7cd6e61e258d9 | |
| parent | 8e5ae4e4df635fb4bf0655a8172a225eb2612414 (diff) | |
| download | mariadb-git-5929e222e4d917d96b78c5937dcc89735a1cc13e.tar.gz | |
fix evaluating bitmap issue in spider
| -rw-r--r-- | storage/spider/spd_db_handlersocket.cc | 4 | ||||
| -rw-r--r-- | storage/spider/spd_db_mysql.cc | 6 | ||||
| -rw-r--r-- | storage/spider/spd_db_oracle.cc | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/storage/spider/spd_db_handlersocket.cc b/storage/spider/spd_db_handlersocket.cc index 7408ec33cee..c5e663b42e9 100644 --- a/storage/spider/spd_db_handlersocket.cc +++ b/storage/spider/spd_db_handlersocket.cc @@ -6167,8 +6167,8 @@ void spider_handlersocket_handler::minimum_select_bitmap_create() { uint field_index = (*field_p)->field_index; if ( - spider_bit_is_set(spider->searched_bitmap, field_index) | - bitmap_is_set(table->read_set, field_index) | + spider_bit_is_set(spider->searched_bitmap, field_index) || + bitmap_is_set(table->read_set, field_index) || bitmap_is_set(table->write_set, field_index) ) { spider_set_bit(minimum_select_bitmap, field_index); diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc index 10f3cbd09b9..97c635b15f5 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/storage/spider/spd_db_mysql.cc @@ -15027,10 +15027,10 @@ void spider_mbase_handler::minimum_select_bitmap_create() bitmap_is_set(table->write_set, field_index) ? "TRUE" : "FALSE")); if ( - spider_bit_is_set(spider->ft_discard_bitmap, field_index) & + spider_bit_is_set(spider->ft_discard_bitmap, field_index) && ( - spider_bit_is_set(spider->searched_bitmap, field_index) | - bitmap_is_set(table->read_set, field_index) | + spider_bit_is_set(spider->searched_bitmap, field_index) || + bitmap_is_set(table->read_set, field_index) || bitmap_is_set(table->write_set, field_index) ) ) { diff --git a/storage/spider/spd_db_oracle.cc b/storage/spider/spd_db_oracle.cc index 74b1cae3c03..beaac6e8e24 100644 --- a/storage/spider/spd_db_oracle.cc +++ b/storage/spider/spd_db_oracle.cc @@ -12567,8 +12567,8 @@ void spider_oracle_handler::minimum_select_bitmap_create() { uint field_index = (*field_p)->field_index; if ( - spider_bit_is_set(spider->searched_bitmap, field_index) | - bitmap_is_set(table->read_set, field_index) | + spider_bit_is_set(spider->searched_bitmap, field_index) || + bitmap_is_set(table->read_set, field_index) || bitmap_is_set(table->write_set, field_index) ) { spider_set_bit(minimum_select_bitmap, field_index); |