Release v1.5.3 (#232)

Maintenance release. No significant groundbreaking changes, most notably this bumps the base image to a supported linux distribution

Author: msm-cert

.github/workflows/build_deb.yml

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.9)
 project(
     ursadb
-    VERSION 1.5.2
+    VERSION 1.5.3
     LANGUAGES CXX C
 )
 

CMakeLists.txt

@@ -1,21 +1,20 @@
-FROM debian:buster AS build
+FROM debian:bookworm AS build
 
-RUN apt update \
-    && apt install -y gcc-7 g++-7 libzmq3-dev cmake build-essential git
+RUN apt update && apt install -y gcc g++ libzmq3-dev cmake build-essential git
 
 RUN mkdir src && mkdir src/build
 COPY . src/
 WORKDIR /src/build
-RUN cmake -D CMAKE_CXX_COMPILER=/usr/bin/g++-7 -D CMAKE_BUILD_TYPE=Release .. && make -j$(nproc)
+RUN cmake -D CMAKE_BUILD_TYPE=Release .. && make -j$(nproc)
 
-FROM debian:buster
+FROM debian:bullseye
 
 COPY --from=build /src/build/ursadb /usr/bin/ursadb
 COPY --from=build /src/build/ursadb_new /usr/bin/ursadb_new
 COPY --from=build /src/build/ursadb_bench /usr/bin/ursadb_bench
 COPY --from=build /src/build/ursadb_test /usr/bin/ursadb_test
 COPY --from=build /src/build/ursacli /usr/bin/ursacli
-
+COPY --from=build /src/build/ursadb_trim /usr/bin/ursadb_trim
 COPY entrypoint.sh /entrypoint.sh
 
 RUN mkdir /var/lib/ursadb \

Dockerfile

@@ -27,14 +27,14 @@ git clone --recurse-submodules https://github.com/CERT-Polska/ursadb.git
 2. Install necessary dependencies:
 ```
 sudo apt update
-sudo apt install -y gcc-7 g++-7 libzmq3-dev cmake build-essential clang-format git
+sudo apt install -y gcc g++ libzmq3-dev cmake build-essential clang-format git
 ```
 
 3. Build project:
 ```
 mkdir build
 cd build
-cmake -D CMAKE_C_COMPILER=gcc-7 -D CMAKE_CXX_COMPILER=g++-7 -D CMAKE_BUILD_TYPE=Release ..
+cmake -D CMAKE_BUILD_TYPE=Release ..
 make -j$(nproc)
 ```
 

docs/install.md

@@ -77,7 +77,7 @@ Multiple paths can be specified at once:
 index "/opt/something" "/opt/foobar";
 ```
 
-By default, `gram3` index will be used (this is probably [not what you want](./indextypes.md). Index types may be specified manually:
+By default, `gram3` index will be used (this is probably [not what you want](./indextypes.md)). Index types may be specified manually:
 
 ```
 index "/opt/something" with [gram3, text4, hash4, wide8];

docs/syntax.md

@@ -235,6 +235,10 @@ Response dispatch_command_safe(const std::string &cmd_str, Task *task,
     } catch (const std::bad_alloc &e) {
         spdlog::error("Task {} failed: out of memory!", task->spec().id());
         return Response::error("out of memory");
+    } catch (...) {
+        spdlog::error("Task {} failed: unexpected fatal error.",
+                      task->spec().id());
+        return Response::error("unexpected error");
     }
 }
 

extern/spdlog

@@ -40,8 +40,8 @@ class Database {
 
     const fs::path &get_name() const { return db_name; };
     const fs::path &get_base() const { return db_base; };
-    const std::unordered_map<uint64_t, std::unique_ptr<TaskSpec>>
-        &current_tasks() {
+    const std::unordered_map<uint64_t, std::unique_ptr<TaskSpec>> &
+    current_tasks() {
         return tasks;
     }
     void commit_task(const TaskSpec &spec,

libursa/Daemon.cpp

@@ -9,7 +9,6 @@
 #include "Json.h"
 #include "Query.h"
 #include "QueryOptimizer.h"
-#include "spdlog/fmt/ostr.h"
 #include "spdlog/spdlog.h"
 
 void OnDiskDataset::save() {
@@ -101,7 +100,6 @@ void OnDiskDataset::execute(const Query &query, ResultWriter *out,
     }
     Query plan = query.plan(types_to_query);
     plan = q_optimize(std::move(plan));
-    spdlog::debug("PLAN: {}", plan);
 
     QueryResult result = this->query(plan, counters);
     if (result.is_everything()) {

libursa/Database.h

@@ -234,7 +234,7 @@ void Query::prefetch(int from_index, int howmany, bool only_last,
 QueryResult Query::run(const QueryPrimitive &primitive,
                        const PrefetchFunc &prefetcher,
                        QueryCounters *counters) const {
-    // Case: primitive query - reduces to AND with tokens from query plan.
+    // Case: primitive query - just return results for a given ngram.
     if (type == QueryType::PRIMITIVE) {
         return primitive(ngram, counters);
     }