Post-merge fixes, unused includes

Author: pdillinger

util/auto_skip_compressor.cc

@@ -8,6 +8,7 @@
 
 #include "options/options_helper.h"
 #include "rocksdb/advanced_compression.h"
+#include "test_util/sync_point.h"
 #include "util/random.h"
 namespace ROCKSDB_NAMESPACE {
 
@@ -52,6 +53,10 @@ AutoSkipCompressorWrapper::AutoSkipCompressorWrapper(
   (void)opts_;
 }
 
+const char* AutoSkipCompressorWrapper::Name() const {
+  return "AutoSkipCompressorWrapper";
+}
+
 Status AutoSkipCompressorWrapper::CompressBlock(
     Slice uncompressed_data, std::string* compressed_output,
     CompressionType* out_compression_type, ManagedWorkingArea* wa) {

util/auto_skip_compressor.h

@@ -10,7 +10,6 @@
 #include <memory>
 
 #include "rocksdb/advanced_compression.h"
-#include "util/compression.h"
 
 namespace ROCKSDB_NAMESPACE {
 // Predict rejection probability using a moving window approach
@@ -36,6 +35,7 @@ class CompressionRejectionProbabilityPredictor {
 
 class AutoSkipCompressorWrapper : public CompressorWrapper {
  public:
+  const char* Name() const override;
   explicit AutoSkipCompressorWrapper(std::unique_ptr<Compressor> compressor,
                                      const CompressionOptions& opts,
                                      const CompressionType type);

util/simple_mixed_compressor.h

@@ -8,7 +8,6 @@
 
 #pragma once
 #include <memory>
-#include <mutex>
 #include <vector>
 
 #include "compression.h"