diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-17 08:42:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-17 08:42:53 +0300 |
| commit | 4c7608aeb187383f2629e96e085b5b50fc81337f (patch) | |
| tree | fc8dce68b02a63ca204203034dae81a7162a4b9f /storage/rocksdb/ha_rocksdb.h | |
| parent | c2352c45fbd670f50b73415eeeb676aa67fb4a29 (diff) | |
| parent | a4e7800701d0764fe4cbb85b81d7c7cb54677334 (diff) | |
| download | mariadb-git-4c7608aeb187383f2629e96e085b5b50fc81337f.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/rocksdb/ha_rocksdb.h')
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/storage/rocksdb/ha_rocksdb.h b/storage/rocksdb/ha_rocksdb.h index 0f922c22bc7..171c303ac4a 100644 --- a/storage/rocksdb/ha_rocksdb.h +++ b/storage/rocksdb/ha_rocksdb.h @@ -653,13 +653,21 @@ class ha_rocksdb : public my_core::handler { enum ha_rkey_function find_flag) const MY_ATTRIBUTE((__nonnull__, __warn_unused_result__)); void setup_iterator_bounds(const Rdb_key_def &kd, - const rocksdb::Slice &eq_cond); + const rocksdb::Slice &eq_cond, + uchar *lower_bound_buf, + uchar *upper_bound_buf, + rocksdb::Slice *out_lower_bound, + rocksdb::Slice *out_upper_bound); bool can_use_bloom_filter(THD *thd, const Rdb_key_def &kd, const rocksdb::Slice &eq_cond, const bool use_all_keys); bool check_bloom_and_set_bounds(THD *thd, const Rdb_key_def &kd, const rocksdb::Slice &eq_cond, - const bool use_all_keys); + const bool use_all_keys, + uchar *lower_bound_buf, + uchar *upper_bound_buf, + rocksdb::Slice *out_lower_bound, + rocksdb::Slice *out_upper_bound); void setup_scan_iterator(const Rdb_key_def &kd, rocksdb::Slice *slice, const bool use_all_keys, const uint eq_cond_len) MY_ATTRIBUTE((__nonnull__)); |