Update RocksDB usage for 8.0 release

Summary:
- Deleted references to removed compressed block cache APIs
- Migrated header includes to fix the build

Reviewed By: anirbanr-fb

Differential Revision: D44207824

fbshipit-source-id: fea5acf

mysql-test/suite/rocksdb/r/rocksdb.result

@@ -1627,8 +1627,6 @@ rocksdb_block_cache_index_bytes_insert #
 rocksdb_block_cache_index_hit #
 rocksdb_block_cache_index_miss #
 rocksdb_block_cache_miss #
-rocksdb_block_cachecompressed_hit #
-rocksdb_block_cachecompressed_miss #
 rocksdb_bloom_filter_full_positive #
 rocksdb_bloom_filter_full_true_positive #
 rocksdb_bloom_filter_prefix_checked #
@@ -1712,8 +1710,6 @@ select UPPER(VARIABLE_NAME) from performance_schema.global_status where VARIABLE
 UPPER(VARIABLE_NAME)
 ROCKSDB_ADDITIONAL_COMPACTION_TRIGGERS
 ROCKSDB_BINLOG_TTL_COMPACTION_TIMESTAMP
-ROCKSDB_BLOCK_CACHECOMPRESSED_HIT
-ROCKSDB_BLOCK_CACHECOMPRESSED_MISS
 ROCKSDB_BLOCK_CACHE_ADD
 ROCKSDB_BLOCK_CACHE_ADD_FAILURES
 ROCKSDB_BLOCK_CACHE_BYTES_READ
@@ -1840,8 +1836,6 @@ select UPPER(VARIABLE_NAME) from performance_schema.session_status where VARIABL
 UPPER(VARIABLE_NAME)
 ROCKSDB_ADDITIONAL_COMPACTION_TRIGGERS
 ROCKSDB_BINLOG_TTL_COMPACTION_TIMESTAMP
-ROCKSDB_BLOCK_CACHECOMPRESSED_HIT
-ROCKSDB_BLOCK_CACHECOMPRESSED_MISS
 ROCKSDB_BLOCK_CACHE_ADD
 ROCKSDB_BLOCK_CACHE_ADD_FAILURES
 ROCKSDB_BLOCK_CACHE_BYTES_READ

storage/rocksdb/ha_rocksdb.cc

@@ -6659,7 +6659,6 @@ static bool rocksdb_show_status(handlerton *const hton, THD *const thd,
  } else {
  internal_cache_count++;
  }
- cache_set.insert(bbt_opt->block_cache_compressed.get());
  }
  }
  }
@@ -16121,8 +16120,6 @@ struct rocksdb_status_counters_t {
  uint64_t bloom_filter_prefix_useful;
  uint64_t number_reseeks_iteration;
  uint64_t getupdatessince_calls;
- uint64_t block_cachecompressed_miss;
- uint64_t block_cachecompressed_hit;
  uint64_t wal_synced;
  uint64_t wal_bytes;
  uint64_t write_self;
@@ -16191,8 +16188,6 @@ DEF_SHOW_FUNC(bloom_filter_prefix_checked, BLOOM_FILTER_PREFIX_CHECKED)
 DEF_SHOW_FUNC(bloom_filter_prefix_useful, BLOOM_FILTER_PREFIX_USEFUL)
 DEF_SHOW_FUNC(number_reseeks_iteration, NUMBER_OF_RESEEKS_IN_ITERATION)
 DEF_SHOW_FUNC(getupdatessince_calls, GET_UPDATES_SINCE_CALLS)
-DEF_SHOW_FUNC(block_cachecompressed_miss, BLOCK_CACHE_COMPRESSED_MISS)
-DEF_SHOW_FUNC(block_cachecompressed_hit, BLOCK_CACHE_COMPRESSED_HIT)
 DEF_SHOW_FUNC(wal_synced, WAL_FILE_SYNCED)
 DEF_SHOW_FUNC(wal_bytes, WAL_FILE_BYTES)
 DEF_SHOW_FUNC(write_self, WRITE_DONE_BY_SELF)
@@ -16451,8 +16446,6 @@ static SHOW_VAR rocksdb_status_vars[] = {
  DEF_STATUS_VAR(bloom_filter_prefix_useful),
  DEF_STATUS_VAR(number_reseeks_iteration),
  DEF_STATUS_VAR(getupdatessince_calls),
- DEF_STATUS_VAR(block_cachecompressed_miss),
- DEF_STATUS_VAR(block_cachecompressed_hit),
  DEF_STATUS_VAR(wal_synced),
  DEF_STATUS_VAR(wal_bytes),
  DEF_STATUS_VAR(write_self),

storage/rocksdb/rdb_i_s.cc

@@ -29,6 +29,10 @@
 #include "sql/sql_show.h"
 
 /* RocksDB header files */
+#include "rocksdb/version.h"
+#if ROCKSDB_MAJOR >= 8
+#include "rocksdb/advanced_cache.h"
+#endif // ROCKSDB_MAJOR >= 8
 #include "rocksdb/compaction_filter.h"
 #include "rocksdb/convenience.h"
 #include "rocksdb/filter_policy.h"