From c136b2e64055c5a4e659e5b901a729a64611cd6f Mon Sep 17 00:00:00 2001 From: Marcin Maliszkiewicz Date: Mon, 20 Apr 2026 15:06:57 +0200 Subject: [PATCH] audit: drop sstring temporaries on the will_log() fast path audit::will_log() is called for every CQL/Alternator request. With non-empty keyspace it does: _audited_keyspaces.find(sstring(keyspace)) should_log_table(sstring(keyspace), sstring(table)) constructing three temporary sstrings from the std::string_view arguments on every call. Now that the underlying associative containers use std::less<> as comparator (previous commit), find() accepts the string_view directly. Switch should_log_table() to take string_view as well so the temporaries disappear entirely. For short keyspace names the temporaries stay in SSO so allocs/op is unchanged at 58.1, but each construction still costs ~60 instructions. perf-simple-query --smp 1 --duration 15 --audit "table" --audit-keyspaces "ks-non-existing" --audit-categories "DCL,DDL,AUTH,DML,QUERY" build: --mode=release --use-profile="" (no PGO) Before (regression introduced in 9646ee05bd): instructions_per_op: 36952 After: instructions_per_op: 36768 Brings insns/op back to the pre-regression baseline 3d0582d51e (insns/op ~36777) within the per-run noise of ~15 insns standard deviation, eliminating the ~180 insns/op regression. Fixes https://scylladb.atlassian.net/browse/SCYLLADB-1616 --- audit/audit.cc | 6 +++--- audit/audit.hh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audit/audit.cc b/audit/audit.cc index 5d3744781c..9b014a810e 100644 --- a/audit/audit.cc +++ b/audit/audit.cc @@ -304,7 +304,7 @@ future<> inspect_login(const sstring& username, socket_address client_ip, bool e return audit::local_audit_instance().log_login(username, client_ip, error); } -bool audit::should_log_table(const sstring& keyspace, const sstring& name) const { +bool audit::should_log_table(std::string_view keyspace, std::string_view name) const { auto keyspace_it = _audited_tables.find(keyspace); return keyspace_it != _audited_tables.cend() && keyspace_it->second.find(name) != keyspace_it->second.cend(); } @@ -319,8 +319,8 @@ bool audit::will_log(statement_category cat, std::string_view keyspace, std::str // so it is logged whenever the category matches. return _audited_categories.contains(cat) && (keyspace.empty() - || _audited_keyspaces.find(sstring(keyspace)) != _audited_keyspaces.cend() - || should_log_table(sstring(keyspace), sstring(table)) + || _audited_keyspaces.find(keyspace) != _audited_keyspaces.cend() + || should_log_table(keyspace, table) || cat == statement_category::AUTH || cat == statement_category::ADMIN || cat == statement_category::DCL); diff --git a/audit/audit.hh b/audit/audit.hh index bf81cdd607..2b482d2047 100644 --- a/audit/audit.hh +++ b/audit/audit.hh @@ -150,7 +150,7 @@ private: template void update_config(const sstring & new_value, std::function parse_func, T& cfg_parameter); - bool should_log_table(const sstring& keyspace, const sstring& name) const; + bool should_log_table(std::string_view keyspace, std::string_view name) const; public: static seastar::sharded& audit_instance() { // FIXME: leaked intentionally to avoid shutdown problems, see #293