diff --git a/configure.py b/configure.py index 5625b22fc5..0540b4d9e3 100755 --- a/configure.py +++ b/configure.py @@ -772,7 +772,6 @@ scylla_core = (['message/messaging_service.cc', 'cdc/generation.cc', 'cdc/metadata.cc', 'cql3/type_json.cc', - 'cql3/abstract_marker.cc', 'cql3/attributes.cc', 'cql3/cf_name.cc', 'cql3/cql3_type.cc', diff --git a/cql3/CMakeLists.txt b/cql3/CMakeLists.txt index 261efc1f5c..3a455dead6 100644 --- a/cql3/CMakeLists.txt +++ b/cql3/CMakeLists.txt @@ -13,7 +13,6 @@ add_library(cql3 STATIC) target_sources(cql3 PRIVATE type_json.cc - abstract_marker.cc attributes.cc cf_name.cc cql3_type.cc diff --git a/cql3/abstract_marker.cc b/cql3/abstract_marker.cc deleted file mode 100644 index 610d64116c..0000000000 --- a/cql3/abstract_marker.cc +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2015-present ScyllaDB - * - * Modified by ScyllaDB - */ - -/* - * SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0) - */ - -#include "cql3/abstract_marker.hh" - -#include "cql3/constants.hh" -#include "cql3/lists.hh" -#include "cql3/maps.hh" -#include "cql3/sets.hh" -#include "cql3/user_types.hh" -#include "cql3/prepare_context.hh" -#include "types/list.hh" - -namespace cql3 { -} diff --git a/cql3/abstract_marker.hh b/cql3/abstract_marker.hh deleted file mode 100644 index 1ed339c28f..0000000000 --- a/cql3/abstract_marker.hh +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2015-present ScyllaDB - * - * Modified by ScyllaDB - */ - -/* - * SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0) - */ - -#pragma once - -namespace cql3 { - -class column_specification; -class prepare_context; - -} diff --git a/cql3/constants.hh b/cql3/constants.hh index 59753a5f0e..1f79e872fe 100644 --- a/cql3/constants.hh +++ b/cql3/constants.hh @@ -10,7 +10,6 @@ #pragma once -#include "cql3/abstract_marker.hh" #include "cql3/query_options.hh" #include "cql3/update_parameters.hh" #include "cql3/operation.hh" diff --git a/cql3/expr/prepare_expr.cc b/cql3/expr/prepare_expr.cc index 7386cefc71..c131c66d05 100644 --- a/cql3/expr/prepare_expr.cc +++ b/cql3/expr/prepare_expr.cc @@ -10,7 +10,6 @@ #include "cql3/functions/functions.hh" #include "cql3/column_identifier.hh" #include "cql3/constants.hh" -#include "cql3/abstract_marker.hh" #include "cql3/lists.hh" #include "cql3/sets.hh" #include "cql3/user_types.hh" diff --git a/cql3/lists.hh b/cql3/lists.hh index d4400b8d00..fc3cc1873e 100644 --- a/cql3/lists.hh +++ b/cql3/lists.hh @@ -10,7 +10,6 @@ #pragma once -#include "cql3/abstract_marker.hh" #include "utils/to_string.hh" #include "operation.hh" #include "utils/chunked_vector.hh" diff --git a/cql3/maps.cc b/cql3/maps.cc index 34f9967ee0..61e83ba1f5 100644 --- a/cql3/maps.cc +++ b/cql3/maps.cc @@ -9,7 +9,6 @@ */ #include "maps.hh" -#include "cql3/abstract_marker.hh" #include "operation.hh" #include "update_parameters.hh" #include "exceptions/exceptions.hh" diff --git a/cql3/maps.hh b/cql3/maps.hh index 5f3825186a..bcdbc4de4f 100644 --- a/cql3/maps.hh +++ b/cql3/maps.hh @@ -10,7 +10,6 @@ #pragma once -#include "cql3/abstract_marker.hh" #include "operation.hh" #include "update_parameters.hh" #include "constants.hh" diff --git a/cql3/sets.hh b/cql3/sets.hh index e1d0e6afcd..5ad67cc50e 100644 --- a/cql3/sets.hh +++ b/cql3/sets.hh @@ -10,7 +10,6 @@ #pragma once -#include "cql3/abstract_marker.hh" #include "maps.hh" #include "column_specification.hh" #include "column_identifier.hh" diff --git a/cql3/user_types.hh b/cql3/user_types.hh index 2e4ecb0738..8660b3e826 100644 --- a/cql3/user_types.hh +++ b/cql3/user_types.hh @@ -10,7 +10,6 @@ #pragma once -#include "cql3/abstract_marker.hh" #include "column_specification.hh" #include "column_identifier.hh" #include "operation.hh"