Merge branch 'main' into v2

.github/workflows/build.yml

@@ -10,36 +10,36 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           sudo apt-get update
-          sudo apt-get install -y qtbase5-dev libgtest-dev libgrpc++-dev protobuf-compiler-grpc protobuf-compiler libsqlite3-dev
+          sudo apt-get install -y qt6-base-dev libgtest-dev libgrpc++-dev protobuf-compiler-grpc protobuf-compiler libsqlite3-dev
       - run: cmake -DCMAKE_BUILD_TYPE=Release .
       - run: make
       - run: make check
       - run: make package
 
       - name: Log in to the Container registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

CMakeLists.txt

@@ -17,7 +17,7 @@ set(CMAKE_AUTORCC ON)
 find_package(Threads REQUIRED)
 find_package(GTest)
 find_package(SQLite3 REQUIRED)
-find_package(Qt5 COMPONENTS Core Network Concurrent REQUIRED)
+find_package(Qt6 COMPONENTS Core Network Concurrent REQUIRED)
 
 find_package(PkgConfig REQUIRED)
 pkg_search_module(PROTOBUF REQUIRED IMPORTED_TARGET protobuf)
@@ -98,10 +98,11 @@ set(fpindexlib_SOURCES
 	src/store/sqlite/statement.h
 	src/util/crc.c
 	src/util/options.cpp
+	src/util/tracing.cpp
 )
 
 add_library(fpindexlib ${fpindexlib_SOURCES})
-target_link_libraries(fpindexlib Qt5::Core Qt5::Network Qt5::Concurrent SQLite::SQLite3)
+target_link_libraries(fpindexlib Qt6::Core Qt6::Network Qt6::Concurrent SQLite::SQLite3)
 
 set(qhttp_SOURCES
     ./src/3rdparty/qhttp/src/qhttpserverconnection.cpp
@@ -116,7 +117,7 @@ set(qhttp_SOURCES
 )
 add_library(qhttp ${qhttp_SOURCES})
 target_include_directories(qhttp PRIVATE ./src/3rdparty/)
-target_link_libraries(qhttp Qt5::Core Qt5::Network Qt5::Concurrent)
+target_link_libraries(qhttp Qt6::Core Qt6::Network Qt6::Concurrent)
 
 set(fpserver_SOURCES
     src/server/listener.cpp

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN useradd -m -s /bin/bash -u 1000 acoustid
 

README.md

@@ -29,11 +29,17 @@ Starting server locally:
 
  - C/C++ compiler supporting at least C++17
  - CMake
- - Qt5, at least the QtCore, QtNetwork and QtConcurrent components
+ - Qt6, at least the QtCore, QtNetwork and QtConcurrent components
+ - SQLite3
  - GoogleTest (optional)
 
+#### For Ubuntu/Debian
+
+    apt install gcc g++ cmake qt6-base-dev libgtest-dev libsqlite3-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
+
 ### Building the code
 
+    cmake .
     cmake --build .
 
 ## Usage

src/index/index.cpp

@@ -30,7 +30,7 @@ void setLastOpId(Idx &idx, int64_t id) {
 }
 
 Index::Index(DirectorySharedPtr dir, bool create)
-    : m_lock(QReadWriteLock::Recursive), m_dir(dir), m_deleter(new IndexFileDeleter(dir)) {
+    : m_lock(), m_dir(dir), m_deleter(new IndexFileDeleter(dir)) {
     open(create);
 }
 
@@ -182,21 +182,24 @@ QSharedPointer<IndexReader> Index::openReader() {
     if (!m_open) {
         throw IndexIsNotOpen("index is not open");
     }
-    return openReaderPrivate();
+    locker.unlock();
+    return QSharedPointer<IndexReader>::create(sharedFromThis());
 }
 
-QSharedPointer<IndexWriter> Index::openWriter(bool wait, int64_t timeoutInMSecs) {
-    QReadLocker locker(&m_lock);
+QSharedPointer<IndexReader> Index::openReaderPrivate() {
     if (!m_open) {
         throw IndexIsNotOpen("index is not open");
     }
-    return openWriterPrivate(wait, QDeadlineTimer(timeoutInMSecs));
+    return QSharedPointer<IndexReader>::create(sharedFromThis());
 }
 
-QSharedPointer<IndexReader> Index::openReaderPrivate() { return QSharedPointer<IndexReader>::create(sharedFromThis()); }
-
-QSharedPointer<IndexWriter> Index::openWriterPrivate(bool wait, QDeadlineTimer deadline) {
-    acquireWriterLockPrivate(wait, deadline);
+QSharedPointer<IndexWriter> Index::openWriter(bool wait, int64_t timeoutInMSecs) {
+    QReadLocker locker(&m_lock);
+    if (!m_open) {
+        throw IndexIsNotOpen("index is not open");
+    }
+    acquireWriterLockPrivate(wait, QDeadlineTimer(timeoutInMSecs));
+    locker.unlock();
     return QSharedPointer<IndexWriter>::create(sharedFromThis(), true);
 }
 
@@ -362,7 +365,7 @@ void Index::flush() {
     if (m_threadPool) {
         if (!m_writerFuture.isRunning()) {
             auto self = sharedFromThis();
-            m_writerFuture = QtConcurrent::run(m_threadPool, [=]() {
+            m_writerFuture = QtConcurrent::run(m_threadPool.get(), [=]() {
                 self->persistUpdates();
             });
         }

src/index/index.h

@@ -75,6 +75,7 @@ class Index : public BaseIndex, public QEnableSharedFromThis<Index> {
     friend class IndexWriter;
 
     QSharedPointer<IndexReader> openReader();
+    QSharedPointer<IndexReader> openReaderPrivate();
     QSharedPointer<IndexWriter> openWriter(bool wait = false, int64_t timeoutInMSecs = -1);
 
     void acquireWriterLock(bool wait = false, int64_t timeoutInMSecs = -1);
@@ -84,9 +85,6 @@ class Index : public BaseIndex, public QEnableSharedFromThis<Index> {
     void releaseInfo(const IndexInfo &info);
     void updateInfo(const IndexInfo &oldInfo, const IndexInfo &newInfo, bool updateIndex = false);
 
-    QSharedPointer<IndexReader> openReaderPrivate();
-    QSharedPointer<IndexWriter> openWriterPrivate(bool wait = true,
-                                                  QDeadlineTimer deadline = QDeadlineTimer(QDeadlineTimer::Forever));
     void acquireWriterLockPrivate(bool wait, QDeadlineTimer deadline);
 
     void persistUpdates(const std::shared_ptr<InMemoryIndex> &index);

src/index/index_writer.cpp

@@ -102,7 +102,7 @@ void IndexWriter::merge(const QList<int>& merge) {
 
     qDebug() << "New segment" << segment.id() << "with checksum" << segment.checksum() << "(merge)";
 
-    QSet<int> merged = merge.toSet();
+    QSet<int> merged(merge.begin(), merge.end());
     info.clearSegments();
     for (int i = 0; i < segments.size(); i++) {
         const SegmentInfo& s = segments.at(i);

src/index/search_result.h

@@ -4,6 +4,8 @@
 #ifndef ACOUSTID_INDEX_SEARCH_RESULT_H_
 #define ACOUSTID_INDEX_SEARCH_RESULT_H_
 
+#include <iostream>
+
 namespace Acoustid {
 
 class SearchResult {

src/index/search_result_test.cpp

@@ -6,10 +6,14 @@
 
 using namespace Acoustid;
 
-std::ostream& operator<<(std::ostream& stream, const SearchResult& result) {
+namespace Acoustid {
+
+std::ostream& operator<<(std::ostream& stream, const SearchResult & result) {
   return stream << "SearchResult(docId=" << result.docId() << ", score=" << result.score() << ", version=" << result.version() <<")";
 } 
 
+}
+
 TEST(SearchResultTest, SortSearchResults) {
     std::vector<SearchResult> results = {
         { 100, 1, 0 },

src/index/segment_merge_policy.cpp

@@ -48,7 +48,7 @@ QList<int> SegmentMergePolicy::findMerges(const SegmentInfoList& infos)
 	for (int i = 0; i < infos.size(); i++) {
 		segments.append(i);
 	}
-	qStableSort(segments.begin(), segments.end(), SegmentSizeLessThan(&infos));
+	std::stable_sort(segments.begin(), segments.end(), SegmentSizeLessThan(&infos));
 	//qDebug() << "Order after sorting is " << segments;
 
 	size_t minSegmentSize = infos.at(segments.last()).blockCount();

src/server/connection.cpp

@@ -10,6 +10,7 @@
 #include "errors.h"
 #include "protocol.h"
 #include "metrics.h"
+#include "util/tracing.h"
 
 using namespace Acoustid;
 using namespace Acoustid::Server;
@@ -133,6 +134,7 @@ void Connection::readIncomingData()
     }
 
     auto futureResult = QtConcurrent::run([=]() {
+	setTraceId(m_session->getTraceId());
         QString response;
         try {
             response = renderResponse(handler());