Skip to content

Tidy fixes 2026 02 #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elshize merged 3 commits into from
Feb 16, 2026
Merged

Tidy fixes 2026 02 #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c402a25
refactor: Use range loop for query types
elshize Feb 16, 2026
95033ac
bugfix: Make AggregationType::Value constructor explicit
elshize Feb 16, 2026
31ddc11
bugfix: Define default virtual StatsInterface destructor
elshize Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/pisa/util/json_stats.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ namespace pisa {
namespace detail {
class StatsInterface {
public:
virtual ~StatsInterface() = default;
virtual void add(std::string const& key, bool value) = 0;
virtual void add(std::string const& key, std::int64_t value) = 0;
virtual void add(std::string const& key, std::uint64_t value) = 0;
Expand Down
18 changes: 8 additions & 10 deletions tools/queries.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
#include "topk_queue.hpp"
#include "type_alias.hpp"
#include "util/do_not_optimize_away.hpp"
#include "util/util.hpp"
#include "wand_data.hpp"
#include "wand_data_compressed.hpp"
#include "wand_data_raw.hpp"
Expand All @@ -63,7 +62,7 @@ class AggregationType {
enum Value { None = 0, Min = 1, Mean = 2, Median = 3, Max = 4 };

explicit constexpr AggregationType(Value value) : m_value(value) {}
constexpr operator Value() const { return m_value; }
constexpr explicit operator Value() const { return m_value; }

[[nodiscard]] auto to_string() const -> std::string {
switch (m_value) {
Expand Down Expand Up @@ -157,12 +156,12 @@ struct QueryTimes {
}

auto aggregate(AggregationType aggregation_type) const -> std::vector<std::size_t> {
switch (aggregation_type) {
case AggregationType::None: return aggregate_none();
case AggregationType::Min: return aggregate_min();
case AggregationType::Mean: return aggregate_mean();
case AggregationType::Median: return aggregate_median();
case AggregationType::Max: return aggregate_max();
switch (AggregationType::Value(aggregation_type)) {
case AggregationType::Value::None: return aggregate_none();
case AggregationType::Value::Min: return aggregate_min();
case AggregationType::Value::Mean: return aggregate_mean();
case AggregationType::Value::Median: return aggregate_median();
case AggregationType::Value::Max: return aggregate_max();
}
throw std::logic_error("Unknown AggregationType");
}
Expand Down Expand Up @@ -328,8 +327,7 @@ void perftest(

auto scorer = scorer::from_params(scorer_params, wdata);

for (std::size_t query_type_idx = 0; query_type_idx < query_types.size(); ++query_type_idx) {
auto const& t = query_types[query_type_idx];
for (const auto& t: query_types) {
spdlog::info("Performing {} runs for '{}' queries...", runs, t);

std::function<uint64_t(Query, Score)> query_fun;
Expand Down