Fix the bug of some test scenarios being put after kEnd

Summary:
DBTestBase::OptionConfig includes the scenarios that unit tests could iterate over them by calling ChangeOptions(). Some of the options have  been mistakenly put after kEnd which makes them essentially invisible to ChangeOptions() caller. This patch fixes it except for kUniversalSubcompactions which is left as TODO since it would break some unit tests.
Closes https://github.com/facebook/rocksdb/pull/3935

Differential Revision: D8230748

Pulled By: maysamyabandeh

fbshipit-source-id: edddb8fffcd161af1809fef24798ce118f8593db

db/db_test_util.h

@@ -694,13 +694,17 @@ class DBTestBase : public testing::Test {
     kConcurrentSkipList = 29,
     kPipelinedWrite = 30,
     kConcurrentWALWrites = 31,
-    kEnd = 32,
+    kDirectIO,
-    kDirectIO = 33,
+    kLevelSubcompactions,
-    kLevelSubcompactions = 34,
+    kBlockBasedTableWithIndexRestartInterval,
-    kUniversalSubcompactions = 35,
+    kBlockBasedTableWithPartitionedIndex,
-    kBlockBasedTableWithIndexRestartInterval = 36,
+    kPartitionedFilterWithNewTableReaderForCompactions,
-    kBlockBasedTableWithPartitionedIndex = 37,
+    kEnd,
-    kPartitionedFilterWithNewTableReaderForCompactions = 38,
+
+    // TODO: This option although been there for a while was disable due to a
+    // mistake. Enabling it makes somem tests to fail. We should enable it and
+    // fix the unit tests.
+    kUniversalSubcompactions,
   };
 
  public:

table/block_based_table_reader.cc

@@ -1575,10 +1575,11 @@ BlockIter* BlockBasedTable::NewDataBlockIterator(
     {
       StopWatch sw(rep->ioptions.env, rep->ioptions.statistics,
                    READ_BLOCK_GET_MICROS);
-      s = ReadBlockFromFile(rep->file.get(), nullptr /* prefetch_buffer */,
+      s = ReadBlockFromFile(
-                            rep->footer, ro, handle, &block_value, rep->ioptions,
+          rep->file.get(), nullptr /* prefetch_buffer */, rep->footer, ro,
-                            rep->blocks_maybe_compressed, compression_dict,
+          handle, &block_value, rep->ioptions, rep->blocks_maybe_compressed,
-                            rep->persistent_cache_options, rep->global_seqno,
+          compression_dict, rep->persistent_cache_options,
+          is_index ? kDisableGlobalSequenceNumber : rep->global_seqno,
           rep->table_options.read_amp_bytes_per_bit);
     }
     if (s.ok()) {
@@ -1678,7 +1679,8 @@ Status BlockBasedTable::MaybeLoadDataBlockToCache(
             rep->file.get(), prefetch_buffer, rep->footer, ro, handle,
             &raw_block, rep->ioptions,
             block_cache_compressed == nullptr && rep->blocks_maybe_compressed,
-            compression_dict, rep->persistent_cache_options, rep->global_seqno,
+            compression_dict, rep->persistent_cache_options,
+            is_index ? kDisableGlobalSequenceNumber : rep->global_seqno,
             rep->table_options.read_amp_bytes_per_bit);
       }