From e3eba52a5d9e9acbef4037ce288fb972b1498d22 Mon Sep 17 00:00:00 2001
From: Anand Ananthabhotla <anand76@devvm1373.frc2.facebook.com>
Date: Fri, 13 Jul 2018 11:08:57 -0700
Subject: [PATCH] Re-enable kUniversalSubcompactions option_config (#4125)

Summary:
1. Move kUniversalSubcompactions up before kEnd in db_test_util.h, so
tests that cycle through all the option_configs include this
2. Skip kUniversalSubcompactions wherever kUniversalCompaction and
kUniversalCompactionMultilevel are skipped

Related to #3935
Pull Request resolved: https://github.com/facebook/rocksdb/pull/4125

Differential Revision: D8828637

Pulled By: anand1976

fbshipit-source-id: 650dee15fd27d85281cf9bb4ca8ab460e04cac6f
---
 db/db_test_util.cc           | 3 ++-
 db/db_test_util.h            | 7 +------
 db/external_sst_file_test.cc | 3 ++-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/db/db_test_util.cc b/db/db_test_util.cc
index 724a217bb..d3a87cb0c 100644
--- a/db/db_test_util.cc
+++ b/db/db_test_util.cc
@@ -118,7 +118,8 @@ bool DBTestBase::ShouldSkipOptions(int option_config, int skip_mask) {
 
     if ((skip_mask & kSkipUniversalCompaction) &&
         (option_config == kUniversalCompaction ||
-         option_config == kUniversalCompactionMultiLevel)) {
+         option_config == kUniversalCompactionMultiLevel ||
+         option_config == kUniversalSubcompactions)) {
       return true;
     }
     if ((skip_mask & kSkipMergePut) && option_config == kMergePut) {
diff --git a/db/db_test_util.h b/db/db_test_util.h
index 0bfbcbd12..0e62fe1cf 100644
--- a/db/db_test_util.h
+++ b/db/db_test_util.h
@@ -700,14 +700,9 @@ class DBTestBase : public testing::Test {
     kBlockBasedTableWithPartitionedIndex,
     kBlockBasedTableWithPartitionedIndexFormat3,
     kPartitionedFilterWithNewTableReaderForCompactions,
-
+    kUniversalSubcompactions,
     // This must be the last line
     kEnd,
-
-    // 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:
diff --git a/db/external_sst_file_test.cc b/db/external_sst_file_test.cc
index b895c625e..d0c961a3c 100644
--- a/db/external_sst_file_test.cc
+++ b/db/external_sst_file_test.cc
@@ -971,7 +971,8 @@ TEST_F(ExternalSSTFileTest, OverlappingRanges) {
         s = DeprecatedAddFile({file_name});
         auto it = true_data.lower_bound(Key(range_start));
         if (option_config_ != kUniversalCompaction &&
-            option_config_ != kUniversalCompactionMultiLevel) {
+            option_config_ != kUniversalCompactionMultiLevel &&
+            option_config_ != kUniversalSubcompactions) {
           if (it != true_data.end() && it->first <= Key(range_end)) {
             // This range overlap with data already exist in DB
             ASSERT_NOK(s);