Rename compression to compactCompression.

2 files changed, 6 insertions, 6 deletions

diff --git a/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp b/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
index 9b423543d87..ad8920582a9 100644
--- a/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
@@ -445,7 +445,7 @@ void LogDataStore::compactFile(FileId fileId)
             setNewFileChunk(guard, createWritableFile(destinationFileId, fc->getLastPersistedSerialNum(), fc->getNameId().next()));
         }
 
-        compacter.reset(new docstore::BucketCompacter(_config.compression(), *this, *_bucketizer, fc->getFileId(), destinationFileId));
+        compacter.reset(new docstore::BucketCompacter(_config.compactCompression(), *this, *_bucketizer, fc->getFileId(), destinationFileId));
     } else {
         compacter.reset(new docstore::Compacter(*this));
     }
diff --git a/searchlib/src/vespa/searchlib/docstore/logdatastore.h b/searchlib/src/vespa/searchlib/docstore/logdatastore.h
index f356a3708ec..2702d4060c2 100644
--- a/searchlib/src/vespa/searchlib/docstore/logdatastore.h
+++ b/searchlib/src/vespa/searchlib/docstore/logdatastore.h
@@ -48,7 +48,7 @@ public:
               _numThreads(8),
               _skipCrcOnRead(false),
               _compactToActiveFile(true),
-              _compression(CompressionConfig::LZ4)
+              _compactCompression(CompressionConfig::LZ4)
         { }
 
         Config(size_t maxFileSize,
@@ -57,7 +57,7 @@ public:
                double minFileSizeFactor,
                size_t numThreads,
                bool compactToActiveFile,
-               const CompressionConfig & compression,
+               const CompressionConfig & compactCompression,
                const WriteableFileChunk::Config & fileConfig)
             : _maxFileSize(maxFileSize),
               _maxDiskBloatFactor(maxDiskBloatFactor),
@@ -66,7 +66,7 @@ public:
               _numThreads(numThreads),
               _skipCrcOnRead(false),
               _compactToActiveFile(compactToActiveFile),
-              _compression(compression),
+              _compactCompression(compactCompression),
               _fileConfig(fileConfig)
         { }
 
@@ -79,7 +79,7 @@ public:
         bool crcOnReadDisabled() const { return _skipCrcOnRead; }
         void disableCrcOnRead(bool v) { _skipCrcOnRead = v; }
         bool compact2ActiveFile() const { return _compactToActiveFile; }
-        const CompressionConfig & compression() const { return _compression; }
+        const CompressionConfig & compactCompression() const { return _compactCompression; }
 
         const WriteableFileChunk::Config & getFileConfig() const { return _fileConfig; }
     private:
@@ -90,7 +90,7 @@ public:
         size_t                      _numThreads;
         bool                        _skipCrcOnRead;
         bool                        _compactToActiveFile;
-        CompressionConfig           _compression;
+        CompressionConfig           _compactCompression;
         WriteableFileChunk::Config  _fileConfig;
     };
 public: