diff --git a/autotests/benchmarks/positioncodecbenchmark.cpp b/autotests/benchmarks/positioncodecbenchmark.cpp index 07440d74..cc031c71 100644 --- a/autotests/benchmarks/positioncodecbenchmark.cpp +++ b/autotests/benchmarks/positioncodecbenchmark.cpp @@ -1,99 +1,131 @@ /* This file is part of the KDE Baloo project. * Copyright (C) 2015 Vishesh Handa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ #include "positioncodec.h" #include "positioninfo.h" #include #include using namespace Baloo; class PositionCodecBenchmark : public QObject { Q_OBJECT private Q_SLOTS: void initTestCase(); - // data 1 - a lot of positions, small amount of PositionInfo + // data 1 - small number of documents, each with many positions void benchEncodeData1(); void benchDecodeData1(); - // data 2 - few positions, large amount of PositionInfo + // data 2 - large number of documents, few positions (10) each void benchEncodeData2(); void benchDecodeData2(); + // data 3 - small number of documents, many positions with large increment + void benchEncodeData3(); + void benchDecodeData3(); private: QVector m_benchmarkData1; QVector m_benchmarkData2; + QVector m_benchmarkData3; }; void PositionCodecBenchmark::initTestCase() { + /* + * Same dataset as in autotests/unit/codecs/positioncodectest.cpp + * Correctness of encoding/decoding is checked there. + */ m_benchmarkData1.clear(); m_benchmarkData1.reserve(100); for(int i = 0; i < 100; ++i) { PositionInfo info; info.docId = (i + 1) * 4711; info.positions.reserve(3000); for (int j = 0; j < 3000; j++) - info.positions.append(((j + 1) * 42) / info.docId); + info.positions.append(((j + 1) * (i + 2))); m_benchmarkData1.append(info); } m_benchmarkData2.clear(); m_benchmarkData2.reserve(5000); for (int i = 0; i < 5000; i++) { PositionInfo info; info.docId = i; info.positions = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; m_benchmarkData2.append(info); } + m_benchmarkData3.clear(); + m_benchmarkData3.reserve(200); + for (int i = 0; i < 200; i++) { + PositionInfo info; + info.docId = i; + info.positions.reserve(30000); // > 2^14 -> 3 byte VarInt32 + for (int j = 0; j < 30000; j++) + info.positions.append((j + 1) * 200); // increment 200 -> 2 byte DiffVarInt32 + + m_benchmarkData3.append(info); + } } void PositionCodecBenchmark::benchEncodeData1() { PositionCodec pc; QBENCHMARK { pc.encode(m_benchmarkData1); } } void PositionCodecBenchmark::benchDecodeData1() { PositionCodec pc; const QByteArray ba = pc.encode(m_benchmarkData1); QBENCHMARK { pc.decode(ba); } } void PositionCodecBenchmark::benchEncodeData2() { PositionCodec pc; QBENCHMARK { pc.encode(m_benchmarkData2); } } void PositionCodecBenchmark::benchDecodeData2() { PositionCodec pc; const QByteArray ba = pc.encode(m_benchmarkData2); QBENCHMARK { pc.decode(ba); } } +void PositionCodecBenchmark::benchEncodeData3() +{ + PositionCodec pc; + QBENCHMARK { pc.encode(m_benchmarkData3); } +} + +void PositionCodecBenchmark::benchDecodeData3() +{ + PositionCodec pc; + const QByteArray ba = pc.encode(m_benchmarkData3); + QBENCHMARK { pc.decode(ba); } +} + QTEST_MAIN(PositionCodecBenchmark) #include "positioncodecbenchmark.moc" diff --git a/autotests/unit/codecs/positioncodectest.cpp b/autotests/unit/codecs/positioncodectest.cpp index 5c0a5e1e..aab908aa 100644 --- a/autotests/unit/codecs/positioncodectest.cpp +++ b/autotests/unit/codecs/positioncodectest.cpp @@ -1,71 +1,121 @@ /* This file is part of the KDE Baloo project. Copyright (C) 2016 Christian Ehrlicher This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #include #include #include "positioncodec.h" #include "positioninfo.h" using namespace Baloo; class PositionCodecTest : public QObject { Q_OBJECT public: PositionCodecTest() = default; ~PositionCodecTest() = default; private Q_SLOTS: void initTestCase(); void checkEncodeOutput(); + void checkEncodeOutput2(); + void checkEncodeOutput3(); private: QVector m_data; + QVector m_data2; + QVector m_data3; }; QTEST_MAIN ( PositionCodecTest ) void PositionCodecTest::initTestCase() { m_data.clear(); m_data.reserve(100); for(int i = 0; i < 100; ++i) { PositionInfo info; info.docId = (i + 1) * 4711; info.positions.reserve(3000); for (int j = 0; j < 3000; j++) - info.positions.append(((j + 1) * 42) / info.docId); + info.positions.append((j + 1) * (i * 2)); m_data.append(info); } + + m_data2.clear(); + m_data2.reserve(5000); + for (int i = 0; i < 5000; i++) { + PositionInfo info; + info.docId = i; + info.positions = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; + + m_data2.append(info); + } + + m_data3.clear(); + m_data3.reserve(200); + for (int i = 0; i < 200; i++) { + PositionInfo info; + info.docId = i; + info.positions.reserve(30000); // > 2^14 -> 3 byte VarInt32 + for (int j = 0; j < 30000; j++) + info.positions.append((j + 1) * 200); // increment 200 -> 2 byte DiffVarInt32 + + m_data3.append(info); + } } void PositionCodecTest::checkEncodeOutput() { PositionCodec pc; const QByteArray ba = pc.encode(m_data); - QCOMPARE(ba.size(), 301000); + QCOMPARE(ba.size(), 409000); const QByteArray md5 = QCryptographicHash::hash(ba, QCryptographicHash::Md5).toHex(); - QCOMPARE(md5, QByteArray("d44a606d301937bef105411c0ee77a88")); + QCOMPARE(md5, QByteArray("ae49eb3279bdda36ef91d29ce3c94c2c")); // and now decode the whole stuff QVector decodedData = pc.decode(ba); QCOMPARE(m_data, decodedData); } +void PositionCodecTest::checkEncodeOutput2() +{ + PositionCodec pc; + const QByteArray ba = pc.encode(m_data2); + QCOMPARE(ba.size(), (8 + 1 + 10) * 5000); // DocId, VarInt32 len, DiffVarInt position + const QByteArray md5 = QCryptographicHash::hash(ba, QCryptographicHash::Md5).toHex(); + QCOMPARE(md5, QByteArray("2f3710246331002e2332dce560ccd783")); + // and now decode the whole stuff + QVector decodedData = pc.decode(ba); + QCOMPARE(m_data2, decodedData); +} + +void PositionCodecTest::checkEncodeOutput3() +{ + PositionCodec pc; + const QByteArray ba = pc.encode(m_data3); + QCOMPARE(ba.size(), (8 + 3 + (2 * 30000)) * 200); // DocId, VarInt32 len, DiffVarInt position + const QByteArray md5 = QCryptographicHash::hash(ba, QCryptographicHash::Md5).toHex(); + QCOMPARE(md5, QByteArray("79e942003c082073b4cee8e376fffdaa")); + // and now decode the whole stuff + QVector decodedData = pc.decode(ba); + QCOMPARE(m_data3, decodedData); +} + #include "positioncodectest.moc"