diff options
| author | Dan Goodliffe <dan.goodliffe@octal.co.uk> | 2026-07-09 13:09:34 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan.goodliffe@octal.co.uk> | 2026-07-09 13:09:34 +0100 |
| commit | fa277f69b14446b47a3dfa63ed7fc1a8a16ef7f8 (patch) | |
| tree | a740ad434e192676ccab12f6a3ab2821902b58c1 /test/test-ingest.cpp | |
| parent | f8d326a7d6f49a6b6009a7869ce61d782ad9c7b6 (diff) | |
| download | webstat-fa277f69b14446b47a3dfa63ed7fc1a8a16ef7f8.tar.bz2 webstat-fa277f69b14446b47a3dfa63ed7fc1a8a16ef7f8.tar.xz webstat-fa277f69b14446b47a3dfa63ed7fc1a8a16ef7f8.zip | |
Include type in existingEntities cacheHEADwebstat-0.7.1main
Fixes the issues of entities having the same value (hash) but occurring
in different places. This is most often when the client states the
virtual host name as the referrer.
Diffstat (limited to 'test/test-ingest.cpp')
| -rw-r--r-- | test/test-ingest.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/test/test-ingest.cpp b/test/test-ingest.cpp index a9966a5..aba6a66 100644 --- a/test/test-ingest.cpp +++ b/test/test-ingest.cpp @@ -248,6 +248,8 @@ constexpr std::string_view LOGLINE1 = R"LOG(git.randomdan.homeip.net 98.82.40.168 1755561576768318 GET "/repo/gentoobrowse-api/commit/gentoobrowse-api/unittests/fixtures/756569aa764177340726dd3d40b41d89b11b20c7/app-crypt/pdfcrack/Manifest" "?h=gentoobrowse-api-0.9.1&id=a2ed3fd30333721accd4b697bfcb6cc4165c7714" HTTP/1.1 200 1884 107791 "-" "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; Amazonbot/0.1; +https://developer.amazon.com/support/amazonbot) Chrome/119.0.6045.214 Safari/537.36" "test/plain")LOG"; constexpr std::string_view LOGLINE2 = R"LOG(www.randomdan.homeip.net 43.128.84.166 1755561575973204 GET "/app-dicts/myspell-et/Manifest" "" HTTP/1.1 200 312 10369 "https://google.com" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36" "image/png")LOG"; +constexpr std::string_view LOGLINE_DUPES + = R"LOG(www.randomdan.homeip.net 43.128.84.166 1755561575973204 GET "/app-dicts/myspell-et/Manifest" "" HTTP/1.1 200 312 10369 "www.randomdan.homeip.net" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36" "image/png")LOG"; BOOST_TEST_DECORATOR(*boost::unit_test::depends_on("QuotedStringsGood")) BOOST_TEST_DECORATOR(*boost::unit_test::depends_on("QueryStringsGood")) @@ -379,6 +381,18 @@ BOOST_DATA_TEST_CASE(StoreLogLine, BOOST_CHECK_EQUAL(existingEntities->size(), 5); } +BOOST_AUTO_TEST_CASE(StoreLogLines_WithDuplicateOfDifferentType, *boost::unit_test::depends_on("I/StoreLogLine")) +{ + const std::vector lines {std::string {LOGLINE1}, std::string {LOGLINE2}, std::string {LOGLINE_DUPES}}; + ingestLogLines(DB::MockDatabase::openConnectionTo("webstat").get(), lines); + BOOST_CHECK_EQUAL(stats.linesRead, 0); + BOOST_CHECK_EQUAL(stats.linesParsed, 3); + BOOST_CHECK_EQUAL(stats.linesParseFailed, 0); + BOOST_CHECK_EQUAL(stats.logsInserted, 3); + BOOST_CHECK_EQUAL(stats.entitiesInserted, 11); + BOOST_CHECK_EQUAL(existingEntities->size(), 11); +} + BOOST_AUTO_TEST_CASE(StoreLog, *boost::unit_test::depends_on("I/StoreLogLine")) { WebStat::LogFile log {"/tmp/store-log-fixture.log", 10}; |