Fix TerarkZipTable IsBuilderNeedSecondPass issue when disabled tzt

Author: mm304321141

table/terark_zip_internal.h

@@ -27,18 +27,6 @@
 
 //#define DEBUG_TWO_PASS_ITER
 
-#if ROCKSDB_MAJOR * 1000 + ROCKSDB_MINOR >= 5008
-#define TERARK_ROCKSDB_5008(...) __VA_ARGS__
-#else
-#define TERARK_ROCKSDB_5008(...)
-#endif
-
-#if ROCKSDB_MAJOR * 1000 + ROCKSDB_MINOR >= 5007
-#define TERARK_ROCKSDB_5007(...) __VA_ARGS__
-#else
-#define TERARK_ROCKSDB_5007(...)
-#endif
-
 void PrintVersion(TERARKDB_NAMESPACE::Logger* info_log);
 
 namespace TERARKDB_NAMESPACE {
@@ -187,15 +175,26 @@ class TerarkZipTableFactory : public TableFactory, boost::noncopyable {
 
   void* GetOptions() override { return &table_options_; }
 
-  bool IsDeleteRangeSupported() const override { return true; }
+  bool IsDeleteRangeSupported() const override {
+    if (table_options_.terarkZipMinLevel != kTerarkZipMinLevelForDisabled) {
+      return true;
+    }
+    assert(fallback_factory_ != nullptr);
+    return fallback_factory_->IsDeleteRangeSupported();
+  }
 
-  bool IsBuilderNeedSecondPass() const override { return true; }
+  bool IsBuilderNeedSecondPass() const override {
+    if (table_options_.terarkZipMinLevel != kTerarkZipMinLevelForDisabled) {
+      return true;
+    }
+    assert(fallback_factory_ != nullptr);
+    return fallback_factory_->IsBuilderNeedSecondPass();
+  }
 
   LruReadonlyCache* cache() const { return cache_.get(); }
 
   Status GetOptionString(std::string* opt_string,
-                         const std::string& delimiter) const
-      TERARK_ROCKSDB_5008(override);
+                         const std::string& delimiter) const override;
 
  private:
   TerarkZipTableOptions table_options_;

table/terark_zip_table.cc

@@ -253,8 +253,7 @@ Status TerarkZipTableFactory::NewTableReader(
         "user comparator must be 'leveldb.BytewiseComparator'");
   }
   Footer footer;
-  Status s = ReadFooterFromFile(
-      file.get(), TERARK_ROCKSDB_5007(nullptr, ) file_size, &footer);
+  Status s = ReadFooterFromFile(file.get(), nullptr, file_size, &footer);
   if (!s.ok()) {
     return s;
   }
@@ -347,15 +346,15 @@ TableBuilder* TerarkZipTableFactory::NewTableBuilder(
               "TerarkZipTableFactory::NewTableBuilder(): "
               "user comparator must be 'leveldb.BytewiseComparator'");
   }
-  if (table_options_.terarkZipMinLevel == -2) {
+  if (table_options_.terarkZipMinLevel == kTerarkZipMinLevelForDisabled) {
     if (!fallback_factory_) {
       THROW_STD(invalid_argument,
                 "TerarkZipTableFactory::NewTableBuilder(): "
                 "set terarkZipMinLevel = -2 but fallback_factory is null");
     }
     return fallback_factory_->NewTableBuilder(table_builder_options,
                                               column_family_id, file);
-  } else if (table_options_.terarkZipMinLevel < -2) {
+  } else if (table_options_.terarkZipMinLevel < kTerarkZipMinLevelForDisabled) {
     THROW_STD(invalid_argument,
               "TerarkZipTableFactory::NewTableBuilder(): "
               "bad terarkZipMinLevel");
@@ -488,7 +487,7 @@ Status TerarkZipTableFactory::SanitizeOptions(
   auto& tzto = *reinterpret_cast<const TerarkZipTableOptions*>(
       table_factory->GetOptions());
   try {
-    if (tzto.terarkZipMinLevel != -2) {
+    if (tzto.terarkZipMinLevel != kTerarkZipMinLevelForDisabled) {
       terark::TempFileDeleteOnClose test;
       test.path = tzto.localTempDir + "/Terark-XXXXXX";
       test.open_temp();

table/terark_zip_table.h

@@ -16,6 +16,8 @@
 
 namespace TERARKDB_NAMESPACE {
 
+static const int kTerarkZipMinLevelForDisabled = -2;
+
 struct TerarkZipTableOptions {
   // copy of DictZipBlobStore::Options::EntropyAlgo
   enum EntropyAlgo : uint32_t {

table/terark_zip_table_reader.cc

@@ -215,8 +215,8 @@ Status ReadMetaBlockAdapte(RandomAccessFileReader* file, uint64_t file_size,
                            const ImmutableCFOptions& ioptions,
                            const std::string& meta_block_name,
                            BlockContents* contents) {
-  return ReadMetaBlock(file, TERARK_ROCKSDB_5007(nullptr, ) file_size,
-                       table_magic_number, ioptions, meta_block_name, contents);
+  return ReadMetaBlock(file, nullptr, file_size, table_magic_number, ioptions,
+                       meta_block_name, contents);
 }
 
 using terark::AbstractBlobStore;