From cf5f3bbb0cb58430ed68ad3ebfcefc009e553d71 Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Thu, 25 Sep 2025 14:42:44 -0400 Subject: Code reformatting --- include/query/irs.h | 10 ++++------ include/query/pointlookup.h | 14 ++++++-------- include/query/rangecount.h | 12 +++++------- include/query/wss.h | 14 +++++++------- 4 files changed, 22 insertions(+), 28 deletions(-) (limited to 'include/query') diff --git a/include/query/irs.h b/include/query/irs.h index ec6fa29..eb584ae 100644 --- a/include/query/irs.h +++ b/include/query/irs.h @@ -64,7 +64,7 @@ public: if (query->lower_idx == shard->get_record_count()) { query->total_weight = 0; } else { - query->total_weight = query->upper_idx - query->lower_idx; + query->total_weight = query->upper_idx - query->lower_idx; } query->sample_size = 0; @@ -192,8 +192,7 @@ public: return result_set; } - static LocalResultType - local_query_buffer(LocalQueryBuffer *query) { + static LocalResultType local_query_buffer(LocalQueryBuffer *query) { LocalResultType result; result.reserve(query->sample_size); @@ -221,9 +220,8 @@ public: return result; } - static void - combine(std::vector const &local_results, - Parameters *parms, ResultType &output) { + static void combine(std::vector const &local_results, + Parameters *parms, ResultType &output) { for (size_t i = 0; i < local_results.size(); i++) { for (size_t j = 0; j < local_results[i].size(); j++) { output.emplace_back(local_results[i][j]); diff --git a/include/query/pointlookup.h b/include/query/pointlookup.h index b42ec85..ab3d93f 100644 --- a/include/query/pointlookup.h +++ b/include/query/pointlookup.h @@ -40,7 +40,7 @@ public: typedef std::vector> LocalResultType; typedef std::vector ResultType; - + constexpr static bool EARLY_ABORT = false; constexpr static bool SKIP_DELETE_FILTER = true; @@ -58,7 +58,7 @@ public: return query; } - + static void distribute_query(Parameters *parms, std::vector const &local_queries, LocalQueryBuffer *buffer_query) { @@ -76,7 +76,7 @@ public: return result; } - + static LocalResultType local_query_buffer(LocalQueryBuffer *query) { LocalResultType result; @@ -91,11 +91,9 @@ public: return result; } - - static void - combine(std::vector const &local_results, - Parameters *parms, ResultType &output) { + static void combine(std::vector const &local_results, + Parameters *parms, ResultType &output) { for (auto r : local_results) { if (r.size() > 0) { if (r[0].is_deleted() || r[0].is_tombstone()) { @@ -107,7 +105,7 @@ public: } } } - + static bool repeat(Parameters *parms, ResultType &output, std::vector const &local_queries, LocalQueryBuffer *buffer_query) { diff --git a/include/query/rangecount.h b/include/query/rangecount.h index 0743ee6..89774a8 100644 --- a/include/query/rangecount.h +++ b/include/query/rangecount.h @@ -40,8 +40,8 @@ public: size_t record_count; size_t tombstone_count; - bool is_deleted() {return false;} - bool is_tombstone() {return false;} + bool is_deleted() { return false; } + bool is_tombstone() { return false; } }; typedef size_t ResultType; @@ -116,8 +116,7 @@ public: return result; } - static LocalResultType - local_query_buffer(LocalQueryBuffer *query) { + static LocalResultType local_query_buffer(LocalQueryBuffer *query) { LocalResultType result = {0, 0}; for (size_t i = 0; i < query->buffer->get_record_count(); i++) { @@ -137,9 +136,8 @@ public: return result; } - static void - combine(std::vector const &local_results, - Parameters *parms, ResultType &output) { + static void combine(std::vector const &local_results, + Parameters *parms, ResultType &output) { size_t reccnt = 0; size_t tscnt = 0; diff --git a/include/query/wss.h b/include/query/wss.h index d4e75f3..311de78 100644 --- a/include/query/wss.h +++ b/include/query/wss.h @@ -139,7 +139,8 @@ public: for (size_t i = 0; i < query->sample_size; i++) { size_t idx = shard->get_weighted_sample(query->global_parms.rng); - if (!shard->get_record_at(idx)->is_deleted() && !shard->get_record_at(idx)->is_tombstone()) { + if (!shard->get_record_at(idx)->is_deleted() && + !shard->get_record_at(idx)->is_tombstone()) { result.emplace_back(shard->get_record_at(idx)->rec); } } @@ -147,8 +148,7 @@ public: return result; } - static LocalResultType - local_query_buffer(LocalQueryBuffer *query) { + static LocalResultType local_query_buffer(LocalQueryBuffer *query) { LocalResultType result; for (size_t i = 0; i < query->sample_size; i++) { @@ -156,7 +156,8 @@ public: auto rec = query->buffer->get(idx); auto test = gsl_rng_uniform(query->global_parms.rng) * query->max_weight; - if (test <= rec->rec.weight && !rec->is_deleted() && !rec->is_tombstone()) { + if (test <= rec->rec.weight && !rec->is_deleted() && + !rec->is_tombstone()) { result.emplace_back(rec->rec); } } @@ -164,9 +165,8 @@ public: return result; } - static void - combine(std::vector const &local_results, - Parameters *parms, ResultType &output) { + static void combine(std::vector const &local_results, + Parameters *parms, ResultType &output) { for (size_t i = 0; i < local_results.size(); i++) { for (size_t j = 0; j < local_results[i].size(); j++) { output.emplace_back(local_results[i][j]); -- cgit v1.2.3