From 6822e3b88a80e51d46aaaa7b653b4f839944403a Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 28 Feb 2023 22:11:53 +0200 Subject: [PATCH] query_id: extract into new header query_id currently lives query-request.hh, a busy place with lots of dependencies. In turn it gets pulled by uuid.idl.hh, which is also very central. This makes test/raft/randomized_nemesis_test.cc which is nominally only dependent on Raft rebuild on random header file changes. Fix by extracting into a new header. Closes #13042 --- idl/uuid.idl.hh | 2 +- query-request.hh | 3 +-- query_id.hh | 8 ++++++++ 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 query_id.hh diff --git a/idl/uuid.idl.hh b/idl/uuid.idl.hh index 567a30c610..65db413038 100644 --- a/idl/uuid.idl.hh +++ b/idl/uuid.idl.hh @@ -8,7 +8,7 @@ #include "utils/UUID.hh" #include "schema/schema_fwd.hh" -#include "query-request.hh" +#include "query_id.hh" #include "locator/host_id.hh" #include "tasks/types.hh" diff --git a/query-request.hh b/query-request.hh index 58cacc3672..e8b510c8e3 100644 --- a/query-request.hh +++ b/query-request.hh @@ -23,6 +23,7 @@ #include "utils/small_vector.hh" #include "query_class_config.hh" #include "db/per_partition_rate_limit_info.hh" +#include "query_id.hh" #include "utils/UUID.hh" #include "bytes.hh" #include "cql_serialization_format.hh" @@ -31,8 +32,6 @@ class position_in_partition_view; class position_in_partition; class partition_slice_builder; -using query_id = utils::tagged_uuid; - namespace query { using column_id_vector = utils::small_vector; diff --git a/query_id.hh b/query_id.hh new file mode 100644 index 0000000000..6f3b12fd35 --- /dev/null +++ b/query_id.hh @@ -0,0 +1,8 @@ +// Copyright (C) 2023-present ScyllaDB +// SPDX-License-Identifier: AGPL-3.0-or-later + +#pragma once + +#include "utils/UUID.hh" + +using query_id = utils::tagged_uuid;