Merge pull request #9088 from vespa-engine/toregge/remove-unused-code-in-searchlib

Remove unused methods from ComprFileReadContext and DocIdAndFeatures.

3 files changed, 0 insertions, 106 deletions

diff --git a/searchlib/src/vespa/searchlib/index/docidandfeatures.h b/searchlib/src/vespa/searchlib/index/docidandfeatures.h
index 91a500495cc..a9329c9fa01 100644
--- a/searchlib/src/vespa/searchlib/index/docidandfeatures.h
+++ b/searchlib/src/vespa/searchlib/index/docidandfeatures.h
@@ -183,14 +183,6 @@ public:
 
     void setRaw(bool raw) { _raw = raw; }
     bool getRaw() const { return _raw; }
-
-    /**
-     * Append features from a single field to a field collection.
-     *
-     * @param rhs       features for a single field
-     * @param localFieldId  local field id for the field
-     */
-    void append(const DocIdAndFeatures &rhs, uint32_t localFieldId);
 };
 
 }
diff --git a/searchlib/src/vespa/searchlib/util/comprfile.cpp b/searchlib/src/vespa/searchlib/util/comprfile.cpp
index 26c66f43993..155bb194f97 100644
--- a/searchlib/src/vespa/searchlib/util/comprfile.cpp
+++ b/searchlib/src/vespa/searchlib/util/comprfile.cpp
@@ -409,88 +409,6 @@ ComprFileReadContext::referenceWriteContext(const ComprFileWriteContext &rhs)
 }
 
 
-void
-ComprFileReadContext::copyWriteContext(const ComprFileWriteContext &rhs)
-{
-    ComprFileEncodeContext *e = rhs.getEncodeContext();
-    ComprFileDecodeContext *d = getDecodeContext();
-
-    assert(e != NULL);
-    int usedUnits = e->getUsedUnits(rhs._comprBuf);
-    assert(usedUnits >= 0);
-
-    dropComprBuf();
-    allocComprBuf(usedUnits, 32768);
-    assert(_comprBufSize >= static_cast<unsigned int>(usedUnits));
-    memcpy(_comprBuf, rhs._comprBuf,
-           static_cast<size_t>(usedUnits) * _unitSize);
-    setBufferEndFilePos(static_cast<uint64_t>(usedUnits) * _unitSize);
-    setFileSize(static_cast<uint64_t>(usedUnits) * _unitSize);
-    if (d != NULL) {
-        d->afterRead(_comprBuf,
-                     usedUnits,
-                     static_cast<uint64_t>(usedUnits) * _unitSize,
-                     false);
-        d->setupBits(0);
-        setBitOffset(-1);
-        assert(d->getBitPosV() == 0);
-    }
-}
-
-
-void
-ComprFileReadContext::referenceReadContext(const ComprFileReadContext &rhs)
-{
-    ComprFileDecodeContext *d = getDecodeContext();
-
-    int usedUnits = rhs.getBufferEndFilePos() / _unitSize;
-    assert(usedUnits >= 0);
-    assert(static_cast<uint64_t>(usedUnits) * _unitSize ==
-           rhs.getBufferEndFilePos());
-
-    referenceComprBuf(rhs);
-    setBufferEndFilePos(static_cast<uint64_t>(usedUnits) * _unitSize);
-    setFileSize(static_cast<uint64_t>(usedUnits) * _unitSize);
-    if (d != NULL) {
-        d->afterRead(_comprBuf,
-                     usedUnits,
-                     static_cast<uint64_t>(usedUnits) * _unitSize,
-                     false);
-        d->setupBits(0);
-        setBitOffset(-1);
-        assert(d->getBitPosV() == 0);
-    }
-}
-
-
-void
-ComprFileReadContext::copyReadContext(const ComprFileReadContext &rhs)
-{
-    ComprFileDecodeContext *d = getDecodeContext();
-
-    int usedUnits = rhs.getBufferEndFilePos() / _unitSize;
-    assert(usedUnits >= 0);
-    assert(static_cast<uint64_t>(usedUnits) * _unitSize ==
-           rhs.getBufferEndFilePos());
-
-    dropComprBuf();
-    allocComprBuf(usedUnits, 32768);
-    assert(_comprBufSize >= static_cast<unsigned int>(usedUnits));
-    memcpy(_comprBuf, rhs._comprBuf,
-           static_cast<size_t>(usedUnits) * _unitSize);
-    setBufferEndFilePos(static_cast<uint64_t>(usedUnits) * _unitSize);
-    setFileSize(static_cast<uint64_t>(usedUnits) * _unitSize);
-    if (d != NULL) {
-        d->afterRead(_comprBuf,
-                     usedUnits,
-                     static_cast<uint64_t>(usedUnits) * _unitSize,
-                     false);
-        d->setupBits(0);
-        setBitOffset(-1);
-        assert(d->getBitPosV() == 0);
-    }
-}
-
 ComprFileWriteContext::
 ComprFileWriteContext(ComprFileEncodeContext &encodeContext)
     : ComprBuffer(encodeContext.getUnitByteSize()),
diff --git a/searchlib/src/vespa/searchlib/util/comprfile.h b/searchlib/src/vespa/searchlib/util/comprfile.h
index 3d44f088c74..d4de1d305fa 100644
--- a/searchlib/src/vespa/searchlib/util/comprfile.h
+++ b/searchlib/src/vespa/searchlib/util/comprfile.h
@@ -136,23 +136,7 @@ public:
      * For unit testing only. Reference data owned by rhs, only works as
      * long as rhs is live and unchanged.
      */
-    void referenceReadContext(const ComprFileReadContext &rhs);
-
-    /*
-     * For unit testing only. Copy data owned by rhs.
-     */
-    void copyReadContext(const ComprFileReadContext &rhs);
-
-    /*
-     * For unit testing only. Reference data owned by rhs, only works as
-     * long as rhs is live and unchanged.
-     */
     void referenceWriteContext(const ComprFileWriteContext &rhs);
-
-    /*
-     * For unit testing only. Copy data owned by rhs.
-     */
-    void copyWriteContext(const ComprFileWriteContext &rhs);
 };