fix proximal level

Author: Josh Kang

db/compaction/compaction.cc

@@ -281,15 +281,15 @@ Compaction::Compaction(
     std::vector<CompactionInputFiles> _inputs, int _output_level,
     uint64_t _target_file_size, uint64_t _max_compaction_bytes,
     uint32_t _output_path_id, CompressionType _compression,
-    CompressionOptions _compression_opts,
-    Temperature _output_temperature_override, uint32_t _max_subcompactions,
-    std::vector<FileMetaData*> _grandparents,
+    CompressionOptions _compression_opts, Temperature _output_temperature,
+    uint32_t _max_subcompactions, std::vector<FileMetaData*> _grandparents,
     std::optional<SequenceNumber> _earliest_snapshot,
     const SnapshotChecker* _snapshot_checker,
     CompactionReason _compaction_reason, const std::string& _trim_ts,
     double _score, bool l0_files_might_overlap,
     BlobGarbageCollectionPolicy _blob_garbage_collection_policy,
-    double _blob_garbage_collection_age_cutoff)
+    double _blob_garbage_collection_age_cutoff,
+    bool _can_temperature_be_overriden)
     : input_vstorage_(vstorage),
       start_level_(_inputs[0].level),
       output_level_(_output_level),
@@ -304,12 +304,8 @@ Compaction::Compaction(
       output_path_id_(_output_path_id),
       output_compression_(_compression),
       output_compression_opts_(_compression_opts),
-      output_temperature_(
-          _output_temperature_override == Temperature::kUnknown
-              ? (is_last_level()
-                     ? mutable_cf_options().last_level_temperature
-                     : mutable_cf_options().default_write_temperature)
-              : _output_temperature_override),
+      output_temperature_(_output_temperature),
+      can_temperature_be_overriden_(_can_temperature_be_overriden),
       deletion_compaction_(_compaction_reason == CompactionReason::kFIFOTtl ||
                            _compaction_reason ==
                                CompactionReason::kFIFOMaxSize),

db/compaction/compaction.h

@@ -90,8 +90,7 @@ class Compaction {
              uint64_t target_file_size, uint64_t max_compaction_bytes,
              uint32_t output_path_id, CompressionType compression,
              CompressionOptions compression_opts,
-             Temperature output_temperature_override,
-             uint32_t max_subcompactions,
+             Temperature output_temperature, uint32_t max_subcompactions,
              std::vector<FileMetaData*> grandparents,
              std::optional<SequenceNumber> earliest_snapshot,
              const SnapshotChecker* snapshot_checker,
@@ -100,7 +99,8 @@ class Compaction {
              bool l0_files_might_overlap = true,
              BlobGarbageCollectionPolicy blob_garbage_collection_policy =
                  BlobGarbageCollectionPolicy::kUseDefault,
-             double blob_garbage_collection_age_cutoff = -1);
+             double blob_garbage_collection_age_cutoff = -1,
+             bool can_temperature_be_overriden = true);
 
   // The type of the proximal level output range
   enum class ProximalOutputRangeType : int {
@@ -411,6 +411,9 @@ class Compaction {
   uint64_t max_compaction_bytes() const { return max_compaction_bytes_; }
 
   Temperature output_temperature() const { return output_temperature_; }
+  bool can_temperature_be_overriden() const {
+    return can_temperature_be_overriden_;
+  }
 
   uint32_t max_subcompactions() const { return max_subcompactions_; }
 
@@ -543,6 +546,7 @@ class Compaction {
   CompressionType output_compression_;
   CompressionOptions output_compression_opts_;
   Temperature output_temperature_;
+  bool can_temperature_be_overriden_;
   // If true, then the compaction can be done by simply deleting input files.
   const bool deletion_compaction_;
   // should it split the output file using the compact cursor?

db/compaction/compaction_job.cc

@@ -2119,9 +2119,21 @@ Status CompactionJob::OpenCompactionOutputFile(SubcompactionState* sub_compact,
                            &syncpoint_arg);
 #endif
 
-  // Pass temperature of the last level files to FileSystem.
   FileOptions fo_copy = file_options_;
-  auto temperature = sub_compact->compaction->output_temperature();
+  Temperature temperature = sub_compact->compaction->output_temperature();
+  Temperature last_level_temp =
+      sub_compact->compaction->mutable_cf_options().last_level_temperature;
+  // Order of precedence for temperature:
+  // 1. Manually set output temperature in compaction options
+  // 2. Temperature of the last level files if applicable
+  // 3. Default write temperature
+  if (last_level_temp != Temperature::kUnknown &&
+      sub_compact->compaction->is_last_level() &&
+      sub_compact->compaction->can_temperature_be_overriden() &&
+      !outputs.IsProximalLevel()) {
+    temperature = last_level_temp;
+  }
+
   fo_copy.temperature = temperature;
   fo_copy.write_hint = write_hint_;
 

db/compaction/compaction_picker.cc

@@ -376,12 +376,19 @@ Compaction* CompactionPicker::PickCompactionForCompactFiles(
     compression_type = compact_options.compression;
   }
 
+  bool can_temperature_be_overriden =
+      compact_options.output_temperature == Temperature::kUnknown;
+  Temperature output_temperature =
+      can_temperature_be_overriden
+          ? mutable_cf_options.default_write_temperature
+          : compact_options.output_temperature;
+
   auto c = new Compaction(
       vstorage, ioptions_, mutable_cf_options, mutable_db_options, input_files,
       output_level, compact_options.output_file_size_limit,
       mutable_cf_options.max_compaction_bytes, output_path_id, compression_type,
       GetCompressionOptions(mutable_cf_options, vstorage, output_level),
-      compact_options.output_temperature, compact_options.max_subcompactions,
+      output_temperature, compact_options.max_subcompactions,
       /* grandparents */ {}, earliest_snapshot, snapshot_checker,
       CompactionReason::kManualCompaction);
   RegisterCompaction(c);