From fc2aecea6923cd612785f1ca368b830c84decf19 Mon Sep 17 00:00:00 2001 From: Wojciech Mitros Date: Tue, 9 Dec 2025 05:34:44 +0100 Subject: [PATCH] idl: don't redefine bound_weight and partition_region in paging_state.idl.hh Bound_weight and partition_region are defined in both paging_state.idl.hh and position_in_partition.idl.hh. This isn't currently causing any issues, but if a future RPC uses both the paging_state and position_in_partition, after including both files we'll get a duplicate error. In this patch we prevent this by removing the definitions from paging_state.idl.hh and including position_in_partition.idl.hh in their place. Closes scylladb/scylladb#28228 --- idl/paging_state.idl.hh | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/idl/paging_state.idl.hh b/idl/paging_state.idl.hh index 0566e0605b..7d8b717268 100644 --- a/idl/paging_state.idl.hh +++ b/idl/paging_state.idl.hh @@ -13,6 +13,7 @@ #include "idl/token.idl.hh" #include "idl/keys.idl.hh" #include "idl/uuid.idl.hh" +#include "idl/position_in_partition.idl.hh" namespace db { enum class read_repair_decision : uint8_t { @@ -22,19 +23,6 @@ enum class read_repair_decision : uint8_t { }; } -enum class bound_weight : int8_t { - before_all_prefixed = -1, - equal = 0, - after_all_prefixed = 1, -} - -enum class partition_region : uint8_t { - partition_start, - static_row, - clustered, - partition_end, -}; - namespace service { namespace pager { class paging_state {