diff options
| author | gvit <gvit@ydb.tech> | 2023-07-09 16:29:39 +0300 |
|---|---|---|
| committer | gvit <gvit@ydb.tech> | 2023-07-09 16:29:39 +0300 |
| commit | 4a70cac038307954f8a2e77476a4019380ded6e9 (patch) | |
| tree | 0c5c5ebfa3b5217294de333e17fc0624667090df | |
| parent | 56a6b68c827568ce70a8ac08de2a9cee2e3b71ca (diff) | |
| download | ydb-4a70cac038307954f8a2e77476a4019380ded6e9.tar.gz | |
cut yql embedded from ydb/core/protos KIKIMR-18667
340 files changed, 1153 insertions, 614 deletions
diff --git a/ydb/apps/pgwire/log_impl.h b/ydb/apps/pgwire/log_impl.h index 6f568d1fd77..56c07d90268 100644 --- a/ydb/apps/pgwire/log_impl.h +++ b/ydb/apps/pgwire/log_impl.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actorsystem.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #define BLOG_D(stream) LOG_DEBUG_S(*NActors::TlsActivationContext, NKikimrServices::PGYDB, stream) #define BLOG_I(stream) LOG_INFO_S(*NActors::TlsActivationContext, NKikimrServices::PGYDB, stream) diff --git a/ydb/apps/pgwire/pgwire.cpp b/ydb/apps/pgwire/pgwire.cpp index 19550017366..15c88588da2 100644 --- a/ydb/apps/pgwire/pgwire.cpp +++ b/ydb/apps/pgwire/pgwire.cpp @@ -1,6 +1,6 @@ #include <ydb/core/pgproxy/pg_listener.h> #include <ydb/core/pgproxy/pg_log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <util/system/mlock.h> #include <util/stream/file.h> #include <library/cpp/getopt/last_getopt.h> diff --git a/ydb/core/actorlib_impl/actor_activity_ut.cpp b/ydb/core/actorlib_impl/actor_activity_ut.cpp index bb9fad3bb83..d6716db40b7 100644 --- a/ydb/core/actorlib_impl/actor_activity_ut.cpp +++ b/ydb/core/actorlib_impl/actor_activity_ut.cpp @@ -7,7 +7,7 @@ #include <library/cpp/actors/core/actor.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> namespace NActors { diff --git a/ydb/core/actorlib_impl/async_destroyer.h b/ydb/core/actorlib_impl/async_destroyer.h index 9d0d6f4c4ca..72dbe832267 100644 --- a/ydb/core/actorlib_impl/async_destroyer.h +++ b/ydb/core/actorlib_impl/async_destroyer.h @@ -1,5 +1,5 @@ #pragma once -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <util/generic/ptr.h> diff --git a/ydb/core/actorlib_impl/destruct_actor.h b/ydb/core/actorlib_impl/destruct_actor.h index adc236911d5..38e311493b9 100644 --- a/ydb/core/actorlib_impl/destruct_actor.h +++ b/ydb/core/actorlib_impl/destruct_actor.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor.h> #include <library/cpp/actors/protos/services_common.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/events.h> namespace NActors { diff --git a/ydb/core/actorlib_impl/long_timer.cpp b/ydb/core/actorlib_impl/long_timer.cpp index 3a374ab8e71..5fcf3c67919 100644 --- a/ydb/core/actorlib_impl/long_timer.cpp +++ b/ydb/core/actorlib_impl/long_timer.cpp @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actorsystem.h> #include <library/cpp/actors/core/hfunc.h> #include <library/cpp/actors/core/events.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> namespace NActors { diff --git a/ydb/core/actorlib_impl/node_identifier.cpp b/ydb/core/actorlib_impl/node_identifier.cpp index 6a0266241bb..44885dd90cf 100644 --- a/ydb/core/actorlib_impl/node_identifier.cpp +++ b/ydb/core/actorlib_impl/node_identifier.cpp @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/log.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/json/json_reader.h> #include <library/cpp/http/io/stream.h> #include <library/cpp/openssl/init/init.h> diff --git a/ydb/core/base/CMakeLists.darwin-x86_64.txt b/ydb/core/base/CMakeLists.darwin-x86_64.txt index e1ec8ea2f29..b26c3a19a17 100644 --- a/ydb/core/base/CMakeLists.darwin-x86_64.txt +++ b/ydb/core/base/CMakeLists.darwin-x86_64.txt @@ -15,12 +15,6 @@ get_built_tool_path( tools/enum_parser/enum_parser enum_parser ) -get_built_tool_path( - TOOL_rescompiler_bin - TOOL_rescompiler_dependency - tools/rescompiler/bin - rescompiler -) add_library(ydb-core-base) target_link_libraries(ydb-core-base PUBLIC @@ -46,10 +40,10 @@ target_link_libraries(ydb-core-base PUBLIC ydb-library-login ydb-library-pdisk_io library-pretty_types_print-protobuf + ydb-library-ydb_issue api-protos-out library-yql-minikql cpp-deprecated-atomic - library-cpp-resource tools-enum_parser-enum_serialization_runtime ) target_sources(ydb-core-base PRIVATE @@ -63,7 +57,6 @@ target_sources(ydb-core-base PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/base/domain.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/event_filter.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/group_stat.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/base/kikimr_issue.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/localdb.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/path.cpp @@ -95,44 +88,3 @@ generate_enum_serilization(ydb-core-base INCLUDE_HEADERS ydb/core/base/quoter.h ) - -add_global_library_for(ydb-core-base.global ydb-core-base) -target_link_libraries(ydb-core-base.global PUBLIC - contrib-libs-cxxsupp - yutil - cpp-actors-core - cpp-actors-helpers - cpp-actors-interconnect - cpp-actors-protos - cpp-actors-wilson - cpp-deprecated-enum_codegen - library-cpp-logger - library-cpp-lwtrace - cpp-lwtrace-mon - library-cpp-random_provider - library-cpp-time_provider - core-base-services - ydb-core-debug - ydb-core-erasure - ydb-core-protos - core-protos-out - ydb-library-aclib - ydb-library-login - ydb-library-pdisk_io - library-pretty_types_print-protobuf - api-protos-out - library-yql-minikql - cpp-deprecated-atomic - library-cpp-resource - tools-enum_parser-enum_serialization_runtime -) -target_sources(ydb-core-base.global PRIVATE - ${CMAKE_BINARY_DIR}/ydb/core/base/f531e5f3938fdb7748ac5883aae02753.cpp -) -resources(ydb-core-base.global - ${CMAKE_BINARY_DIR}/ydb/core/base/f531e5f3938fdb7748ac5883aae02753.cpp - INPUTS - ${CMAKE_SOURCE_DIR}/ydb/core/base/kikimr_issue.txt - KEYS - kikimr_issue.txt -) diff --git a/ydb/core/base/CMakeLists.linux-aarch64.txt b/ydb/core/base/CMakeLists.linux-aarch64.txt index 240041762fa..247b95949a1 100644 --- a/ydb/core/base/CMakeLists.linux-aarch64.txt +++ b/ydb/core/base/CMakeLists.linux-aarch64.txt @@ -15,12 +15,6 @@ get_built_tool_path( tools/enum_parser/enum_parser enum_parser ) -get_built_tool_path( - TOOL_rescompiler_bin - TOOL_rescompiler_dependency - tools/rescompiler/bin - rescompiler -) add_library(ydb-core-base) target_link_libraries(ydb-core-base PUBLIC @@ -47,10 +41,10 @@ target_link_libraries(ydb-core-base PUBLIC ydb-library-login ydb-library-pdisk_io library-pretty_types_print-protobuf + ydb-library-ydb_issue api-protos-out library-yql-minikql cpp-deprecated-atomic - library-cpp-resource tools-enum_parser-enum_serialization_runtime ) target_sources(ydb-core-base PRIVATE @@ -64,7 +58,6 @@ target_sources(ydb-core-base PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/base/domain.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/event_filter.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/group_stat.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/base/kikimr_issue.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/localdb.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/path.cpp @@ -96,45 +89,3 @@ generate_enum_serilization(ydb-core-base INCLUDE_HEADERS ydb/core/base/quoter.h ) - -add_global_library_for(ydb-core-base.global ydb-core-base) -target_link_libraries(ydb-core-base.global PUBLIC - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil - cpp-actors-core - cpp-actors-helpers - cpp-actors-interconnect - cpp-actors-protos - cpp-actors-wilson - cpp-deprecated-enum_codegen - library-cpp-logger - library-cpp-lwtrace - cpp-lwtrace-mon - library-cpp-random_provider - library-cpp-time_provider - core-base-services - ydb-core-debug - ydb-core-erasure - ydb-core-protos - core-protos-out - ydb-library-aclib - ydb-library-login - ydb-library-pdisk_io - library-pretty_types_print-protobuf - api-protos-out - library-yql-minikql - cpp-deprecated-atomic - library-cpp-resource - tools-enum_parser-enum_serialization_runtime -) -target_sources(ydb-core-base.global PRIVATE - ${CMAKE_BINARY_DIR}/ydb/core/base/f531e5f3938fdb7748ac5883aae02753.cpp -) -resources(ydb-core-base.global - ${CMAKE_BINARY_DIR}/ydb/core/base/f531e5f3938fdb7748ac5883aae02753.cpp - INPUTS - ${CMAKE_SOURCE_DIR}/ydb/core/base/kikimr_issue.txt - KEYS - kikimr_issue.txt -) diff --git a/ydb/core/base/CMakeLists.linux-x86_64.txt b/ydb/core/base/CMakeLists.linux-x86_64.txt index 240041762fa..247b95949a1 100644 --- a/ydb/core/base/CMakeLists.linux-x86_64.txt +++ b/ydb/core/base/CMakeLists.linux-x86_64.txt @@ -15,12 +15,6 @@ get_built_tool_path( tools/enum_parser/enum_parser enum_parser ) -get_built_tool_path( - TOOL_rescompiler_bin - TOOL_rescompiler_dependency - tools/rescompiler/bin - rescompiler -) add_library(ydb-core-base) target_link_libraries(ydb-core-base PUBLIC @@ -47,10 +41,10 @@ target_link_libraries(ydb-core-base PUBLIC ydb-library-login ydb-library-pdisk_io library-pretty_types_print-protobuf + ydb-library-ydb_issue api-protos-out library-yql-minikql cpp-deprecated-atomic - library-cpp-resource tools-enum_parser-enum_serialization_runtime ) target_sources(ydb-core-base PRIVATE @@ -64,7 +58,6 @@ target_sources(ydb-core-base PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/base/domain.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/event_filter.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/group_stat.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/base/kikimr_issue.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/localdb.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/path.cpp @@ -96,45 +89,3 @@ generate_enum_serilization(ydb-core-base INCLUDE_HEADERS ydb/core/base/quoter.h ) - -add_global_library_for(ydb-core-base.global ydb-core-base) -target_link_libraries(ydb-core-base.global PUBLIC - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil - cpp-actors-core - cpp-actors-helpers - cpp-actors-interconnect - cpp-actors-protos - cpp-actors-wilson - cpp-deprecated-enum_codegen - library-cpp-logger - library-cpp-lwtrace - cpp-lwtrace-mon - library-cpp-random_provider - library-cpp-time_provider - core-base-services - ydb-core-debug - ydb-core-erasure - ydb-core-protos - core-protos-out - ydb-library-aclib - ydb-library-login - ydb-library-pdisk_io - library-pretty_types_print-protobuf - api-protos-out - library-yql-minikql - cpp-deprecated-atomic - library-cpp-resource - tools-enum_parser-enum_serialization_runtime -) -target_sources(ydb-core-base.global PRIVATE - ${CMAKE_BINARY_DIR}/ydb/core/base/f531e5f3938fdb7748ac5883aae02753.cpp -) -resources(ydb-core-base.global - ${CMAKE_BINARY_DIR}/ydb/core/base/f531e5f3938fdb7748ac5883aae02753.cpp - INPUTS - ${CMAKE_SOURCE_DIR}/ydb/core/base/kikimr_issue.txt - KEYS - kikimr_issue.txt -) diff --git a/ydb/core/base/CMakeLists.windows-x86_64.txt b/ydb/core/base/CMakeLists.windows-x86_64.txt index e1ec8ea2f29..b26c3a19a17 100644 --- a/ydb/core/base/CMakeLists.windows-x86_64.txt +++ b/ydb/core/base/CMakeLists.windows-x86_64.txt @@ -15,12 +15,6 @@ get_built_tool_path( tools/enum_parser/enum_parser enum_parser ) -get_built_tool_path( - TOOL_rescompiler_bin - TOOL_rescompiler_dependency - tools/rescompiler/bin - rescompiler -) add_library(ydb-core-base) target_link_libraries(ydb-core-base PUBLIC @@ -46,10 +40,10 @@ target_link_libraries(ydb-core-base PUBLIC ydb-library-login ydb-library-pdisk_io library-pretty_types_print-protobuf + ydb-library-ydb_issue api-protos-out library-yql-minikql cpp-deprecated-atomic - library-cpp-resource tools-enum_parser-enum_serialization_runtime ) target_sources(ydb-core-base PRIVATE @@ -63,7 +57,6 @@ target_sources(ydb-core-base PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/base/domain.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/event_filter.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/group_stat.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/base/kikimr_issue.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/localdb.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob.cpp ${CMAKE_SOURCE_DIR}/ydb/core/base/path.cpp @@ -95,44 +88,3 @@ generate_enum_serilization(ydb-core-base INCLUDE_HEADERS ydb/core/base/quoter.h ) - -add_global_library_for(ydb-core-base.global ydb-core-base) -target_link_libraries(ydb-core-base.global PUBLIC - contrib-libs-cxxsupp - yutil - cpp-actors-core - cpp-actors-helpers - cpp-actors-interconnect - cpp-actors-protos - cpp-actors-wilson - cpp-deprecated-enum_codegen - library-cpp-logger - library-cpp-lwtrace - cpp-lwtrace-mon - library-cpp-random_provider - library-cpp-time_provider - core-base-services - ydb-core-debug - ydb-core-erasure - ydb-core-protos - core-protos-out - ydb-library-aclib - ydb-library-login - ydb-library-pdisk_io - library-pretty_types_print-protobuf - api-protos-out - library-yql-minikql - cpp-deprecated-atomic - library-cpp-resource - tools-enum_parser-enum_serialization_runtime -) -target_sources(ydb-core-base.global PRIVATE - ${CMAKE_BINARY_DIR}/ydb/core/base/f531e5f3938fdb7748ac5883aae02753.cpp -) -resources(ydb-core-base.global - ${CMAKE_BINARY_DIR}/ydb/core/base/f531e5f3938fdb7748ac5883aae02753.cpp - INPUTS - ${CMAKE_SOURCE_DIR}/ydb/core/base/kikimr_issue.txt - KEYS - kikimr_issue.txt -) diff --git a/ydb/core/base/actor_activity_names.cpp b/ydb/core/base/actor_activity_names.cpp index d713a6ddd83..1c9b4ea1a2c 100644 --- a/ydb/core/base/actor_activity_names.cpp +++ b/ydb/core/base/actor_activity_names.cpp @@ -1,6 +1,6 @@ #include <util/generic/serialized_enum.h> #include <util/generic/singleton.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> namespace NEnumSerializationRuntime { diff --git a/ydb/core/base/blobstorage.h b/ydb/core/base/blobstorage.h index a2695190636..b9ccac76867 100644 --- a/ydb/core/base/blobstorage.h +++ b/ydb/core/base/blobstorage.h @@ -12,7 +12,7 @@ #include <ydb/core/protos/base.pb.h> #include <ydb/core/protos/blobstorage_base.pb.h> #include <ydb/core/protos/blobstorage_base3.pb.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/actors/wilson/wilson_trace.h> #include <library/cpp/lwtrace/shuttle.h> diff --git a/ydb/core/base/board_lookup.cpp b/ydb/core/base/board_lookup.cpp index 8e95d9fb6c3..fc1e0f5fb28 100644 --- a/ydb/core/base/board_lookup.cpp +++ b/ydb/core/base/board_lookup.cpp @@ -2,7 +2,7 @@ #include "tabletid.h" #include <ydb/core/base/appdata.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/actor_bootstrapped.h> diff --git a/ydb/core/base/board_publish.cpp b/ydb/core/base/board_publish.cpp index bebbabce3c4..8b73b4ad407 100644 --- a/ydb/core/base/board_publish.cpp +++ b/ydb/core/base/board_publish.cpp @@ -1,7 +1,7 @@ #include "statestorage_impl.h" #include "tabletid.h" #include <ydb/core/base/appdata.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/actor_bootstrapped.h> diff --git a/ydb/core/base/board_replica.cpp b/ydb/core/base/board_replica.cpp index a01260debca..e0cfebcf325 100644 --- a/ydb/core/base/board_replica.cpp +++ b/ydb/core/base/board_replica.cpp @@ -1,5 +1,5 @@ #include "statestorage_impl.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/interconnect.h> #include <util/generic/set.h> diff --git a/ydb/core/base/defs.h b/ydb/core/base/defs.h index e089d844a84..6b2394e4c43 100644 --- a/ydb/core/base/defs.h +++ b/ydb/core/base/defs.h @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/actor.h> #include <library/cpp/actors/core/event.h> #include <library/cpp/actors/core/actorid.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/debug/valgrind_check.h> #include <util/generic/array_ref.h> #include <util/generic/string.h> diff --git a/ydb/core/base/localdb.h b/ydb/core/base/localdb.h index 8679cb286fc..89299c0ce3d 100644 --- a/ydb/core/base/localdb.h +++ b/ydb/core/base/localdb.h @@ -4,7 +4,7 @@ #include <util/generic/hash_set.h> #include <util/generic/list.h> #include <ydb/core/protos/flat_scheme_op.pb.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <google/protobuf/util/message_differencer.h> namespace NKikimr { diff --git a/ydb/core/base/services_assert.cpp b/ydb/core/base/services_assert.cpp index 97fa3b82221..397374a7b15 100644 --- a/ydb/core/base/services_assert.cpp +++ b/ydb/core/base/services_assert.cpp @@ -1,5 +1,5 @@ #include <library/cpp/actors/protos/services_common.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> static_assert(static_cast<ui32>(NKikimrServices::EServiceKikimr_MIN) > static_cast<ui32>(NActorsServices::EServiceCommon_MAX), "KIKIMR SERVICES IDs SHOULD BE GREATER THAN COMMON ONES"); static_assert(NKikimrServices::TActivity::EType_ARRAYSIZE < 640, "ACTOR ACTIVITY TYPES MUST BE NOT VERY BIG TO BE ARRAY INDICES"); // If we would have many different actor activities, it is OK to increase this value. diff --git a/ydb/core/base/statestorage_guardian.cpp b/ydb/core/base/statestorage_guardian.cpp index cb06cb39b97..7d46d35e2ed 100644 --- a/ydb/core/base/statestorage_guardian.cpp +++ b/ydb/core/base/statestorage_guardian.cpp @@ -5,7 +5,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/base/compile_time_flags.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/base/statestorage_monitoring.cpp b/ydb/core/base/statestorage_monitoring.cpp index bce0345fa91..34b3c3fa0d0 100644 --- a/ydb/core/base/statestorage_monitoring.cpp +++ b/ydb/core/base/statestorage_monitoring.cpp @@ -1,6 +1,6 @@ #include "statestorage_impl.h" #include "tabletid.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/monlib/service/pages/templates.h> #include <library/cpp/actors/core/mon.h> diff --git a/ydb/core/base/statestorage_proxy.cpp b/ydb/core/base/statestorage_proxy.cpp index 3a2c0b94b0a..64705db7765 100644 --- a/ydb/core/base/statestorage_proxy.cpp +++ b/ydb/core/base/statestorage_proxy.cpp @@ -2,7 +2,7 @@ #include "tabletid.h" #include <ydb/core/base/compile_time_flags.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/base/statestorage_replica.cpp b/ydb/core/base/statestorage_replica.cpp index 7ea4275373a..cca4d5eb2c4 100644 --- a/ydb/core/base/statestorage_replica.cpp +++ b/ydb/core/base/statestorage_replica.cpp @@ -3,7 +3,7 @@ #include "appdata.h" #include "tablet.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/hfunc.h> #include <library/cpp/actors/core/log.h> diff --git a/ydb/core/base/statestorage_replica_probe.cpp b/ydb/core/base/statestorage_replica_probe.cpp index 959c5a77ace..d55c3d29933 100644 --- a/ydb/core/base/statestorage_replica_probe.cpp +++ b/ydb/core/base/statestorage_replica_probe.cpp @@ -2,7 +2,7 @@ #include "tabletid.h" #include "appdata.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/hfunc.h> #include <library/cpp/actors/core/log.h> diff --git a/ydb/core/base/statestorage_warden.cpp b/ydb/core/base/statestorage_warden.cpp index 972a74e1fb4..ea0aa550e93 100644 --- a/ydb/core/base/statestorage_warden.cpp +++ b/ydb/core/base/statestorage_warden.cpp @@ -3,7 +3,7 @@ #include "appdata.h" #include "tablet.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/cms/cms.h> #include <ydb/core/cms/console/console.h> #include <ydb/core/cms/console/configs_dispatcher.h> diff --git a/ydb/core/base/ya.make b/ydb/core/base/ya.make index 8a61d7ebc25..e6e2fe75a00 100644 --- a/ydb/core/base/ya.make +++ b/ydb/core/base/ya.make @@ -29,8 +29,6 @@ SRCS( group_stat.h hive.h interconnect_channels.h - kikimr_issue.cpp - kikimr_issue.h localdb.cpp localdb.h location.h @@ -104,15 +102,12 @@ PEERDIR( ydb/library/login ydb/library/pdisk_io ydb/library/pretty_types_print/protobuf + ydb/library/ydb_issue ydb/public/api/protos/out ydb/library/yql/minikql library/cpp/deprecated/atomic ) -RESOURCE( - ydb/core/base/kikimr_issue.txt kikimr_issue.txt -) - GENERATE_ENUM_SERIALIZATION(quoter.h) END() diff --git a/ydb/core/blobstorage/base/bufferwithgaps.h b/ydb/core/blobstorage/base/bufferwithgaps.h index fb7fedb400d..c74a8ce9db9 100644 --- a/ydb/core/blobstorage/base/bufferwithgaps.h +++ b/ydb/core/blobstorage/base/bufferwithgaps.h @@ -6,7 +6,7 @@ #include <util/generic/map.h> #include <util/generic/vector.h> #include <util/generic/algorithm.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/defs.h b/ydb/core/blobstorage/defs.h index 7d7caf57ce6..32cf890dae8 100644 --- a/ydb/core/blobstorage/defs.h +++ b/ydb/core/blobstorage/defs.h @@ -5,7 +5,7 @@ #include <library/cpp/actors/core/event_local.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp b/ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp index c9d39941087..a7ae711ba71 100644 --- a/ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp +++ b/ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp @@ -19,7 +19,7 @@ #include <ydb/core/protos/blobstorage_pdisk_config.pb.h> #include <ydb/core/protos/blobstorage_vdisk_config.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/event_local.h> diff --git a/ydb/core/blobstorage/nodewarden/defs.h b/ydb/core/blobstorage/nodewarden/defs.h index 4977537493e..d0e2dea33aa 100644 --- a/ydb/core/blobstorage/nodewarden/defs.h +++ b/ydb/core/blobstorage/nodewarden/defs.h @@ -8,7 +8,7 @@ #include <library/cpp/actors/core/mailbox_queue_revolving.h> #include <library/cpp/actors/core/invoke.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/protos/config.pb.h> #include <ydb/core/blobstorage/nodewarden/group_stat_aggregator.h> diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp index ec48d98fccf..a39afe830de 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp @@ -21,7 +21,7 @@ #include <ydb/core/blobstorage/lwtrace_probes/blobstorage_probes.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include <ydb/core/protos/base.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/schlab/mon/mon.h> #include <library/cpp/actors/core/actor_bootstrapped.h> diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h index 4f1ad545863..7bf0a8d44e7 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h @@ -2,7 +2,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/base/counters.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/pdisk_io/aio.h> #include <library/cpp/actors/core/actorsystem.h> diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp index 6a53d162b12..e8e39762067 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp @@ -12,8 +12,8 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/blobstorage/lwtrace_probes/blobstorage_probes.h> -#include <ydb/core/protos/services.pb.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/services/services.pb.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <ydb/library/pdisk_io/aio.h> #include <ydb/library/pdisk_io/spdk_state.h> #include <ydb/library/pdisk_io/wcache.h> diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.h index 6bf5c0695d9..5c77be7c267 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.h @@ -19,7 +19,7 @@ #include <ydb/core/mon/mon.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include <ydb/core/protos/blobstorage_vdisk_config.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/event_local.h> diff --git a/ydb/core/blobstorage/pdisk/defs.h b/ydb/core/blobstorage/pdisk/defs.h index 2e3ea7932a1..539ffaf72d9 100644 --- a/ydb/core/blobstorage/pdisk/defs.h +++ b/ydb/core/blobstorage/pdisk/defs.h @@ -1,10 +1,10 @@ #pragma once // unique tag to fix pragma once gcc glueing: ./ydb/core/blobstorage/pdisk/defs.h #include <ydb/core/base/defs.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/actors/core/event_local.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <util/system/sanitizers.h> diff --git a/ydb/core/blobstorage/vdisk/anubis_osiris/defs.h b/ydb/core/blobstorage/vdisk/anubis_osiris/defs.h index 294f96e9111..def26d560ec 100644 --- a/ydb/core/blobstorage/vdisk/anubis_osiris/defs.h +++ b/ydb/core/blobstorage/vdisk/anubis_osiris/defs.h @@ -6,5 +6,5 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/log.h> #include <library/cpp/actors/helpers/activeactors.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> diff --git a/ydb/core/blobstorage/vdisk/ingress/defs.h b/ydb/core/blobstorage/vdisk/ingress/defs.h index ed5b11c6f64..9deed462e4f 100644 --- a/ydb/core/blobstorage/vdisk/ingress/defs.h +++ b/ydb/core/blobstorage/vdisk/ingress/defs.h @@ -5,5 +5,5 @@ #include <library/cpp/actors/core/event_local.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> diff --git a/ydb/core/blobstorage/vdisk/syncer/defs.h b/ydb/core/blobstorage/vdisk/syncer/defs.h index 49e51073af9..c704f2a0614 100644 --- a/ydb/core/blobstorage/vdisk/syncer/defs.h +++ b/ydb/core/blobstorage/vdisk/syncer/defs.h @@ -6,5 +6,5 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/log.h> #include <library/cpp/actors/helpers/activeactors.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> diff --git a/ydb/core/blobstorage/vdisk/synclog/defs.h b/ydb/core/blobstorage/vdisk/synclog/defs.h index 392283b5095..369d4c2b889 100644 --- a/ydb/core/blobstorage/vdisk/synclog/defs.h +++ b/ydb/core/blobstorage/vdisk/synclog/defs.h @@ -5,5 +5,5 @@ #include <library/cpp/actors/core/event_local.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> diff --git a/ydb/core/client/client_ut.cpp b/ydb/core/client/client_ut.cpp index 3c4bf38832c..781dbf09840 100644 --- a/ydb/core/client/client_ut.cpp +++ b/ydb/core/client/client_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/base/compile_time_flags.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tablet/tablet_impl.h> #include <ydb/core/testlib/test_client.h> #include <ydb/core/tx/tx_proxy/proxy.h> diff --git a/ydb/core/client/minikql_compile/mkql_compile_service.cpp b/ydb/core/client/minikql_compile/mkql_compile_service.cpp index 8179bc4a042..123cc256f52 100644 --- a/ydb/core/client/minikql_compile/mkql_compile_service.cpp +++ b/ydb/core/client/minikql_compile/mkql_compile_service.cpp @@ -5,7 +5,7 @@ #include <library/cpp/actors/core/hfunc.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <ydb/core/client/scheme_cache_lib/yql_db_scheme_resolver.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/scheme_board/cache.h> #include <ydb/core/tx/scheme_cache/scheme_cache.h> #include <ydb/core/base/appdata.h> diff --git a/ydb/core/client/minikql_compile/yql_expr_minikql.cpp b/ydb/core/client/minikql_compile/yql_expr_minikql.cpp index 9224f16eab6..fff28f70b6c 100644 --- a/ydb/core/client/minikql_compile/yql_expr_minikql.cpp +++ b/ydb/core/client/minikql_compile/yql_expr_minikql.cpp @@ -9,7 +9,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/base/domain.h> #include <ydb/core/kqp/provider/yql_kikimr_provider_impl.h> -#include <ydb/core/protos/issue_id.pb.h> +#include <ydb/library/ydb_issue/proto/issue_id.pb.h> #include <ydb/public/lib/scheme_types/scheme_type_id.h> #include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h> diff --git a/ydb/core/client/server/msgbus_server_proxy.cpp b/ydb/core/client/server/msgbus_server_proxy.cpp index 5531f3e9d7d..c2d84baaad1 100644 --- a/ydb/core/client/server/msgbus_server_proxy.cpp +++ b/ydb/core/client/server/msgbus_server_proxy.cpp @@ -6,7 +6,7 @@ #include <library/cpp/actors/core/hfunc.h> #include <ydb/core/base/appdata.h> #include <ydb/core/base/counters.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/base/ticket_parser.h> #include <ydb/core/client/server/msgbus_server_persqueue.h> #include <ydb/core/tx/scheme_board/cache.h> diff --git a/ydb/core/client/server/msgbus_server_whoami.cpp b/ydb/core/client/server/msgbus_server_whoami.cpp index d0011548187..c75bc8ff498 100644 --- a/ydb/core/client/server/msgbus_server_whoami.cpp +++ b/ydb/core/client/server/msgbus_server_whoami.cpp @@ -1,5 +1,5 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/base/ticket_parser.h> #include "msgbus_server.h" #include "msgbus_server_request.h" diff --git a/ydb/core/client/server/msgbus_tabletreq.h b/ydb/core/client/server/msgbus_tabletreq.h index f173ae90976..7fad4c4db89 100644 --- a/ydb/core/client/server/msgbus_tabletreq.h +++ b/ydb/core/client/server/msgbus_tabletreq.h @@ -6,7 +6,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/log.h> #include <library/cpp/actors/core/hfunc.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <util/generic/hash_set.h> #include <util/generic/vector.h> diff --git a/ydb/core/cms/api_adapters.cpp b/ydb/core/cms/api_adapters.cpp index 3b08f7174f3..b9aa6b65273 100644 --- a/ydb/core/cms/api_adapters.cpp +++ b/ydb/core/cms/api_adapters.cpp @@ -1,6 +1,6 @@ #include "cms_impl.h" -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <ydb/public/api/protos/draft/ydb_maintenance.pb.h> #include <ydb/library/yql/public/issue/protos/issue_severity.pb.h> diff --git a/ydb/core/cms/cluster_info.cpp b/ydb/core/cms/cluster_info.cpp index 28e6baeddbf..f9f078f1f82 100644 --- a/ydb/core/cms/cluster_info.cpp +++ b/ydb/core/cms/cluster_info.cpp @@ -2,7 +2,7 @@ #include "cms_state.h" #include "node_checkers.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor.h> #include <library/cpp/actors/core/log.h> diff --git a/ydb/core/cms/console/defs.h b/ydb/core/cms/console/defs.h index c5a708c5606..a9fd6078d94 100644 --- a/ydb/core/cms/console/defs.h +++ b/ydb/core/cms/console/defs.h @@ -2,4 +2,4 @@ // unique tag: ./ydb/core/cms/console/defs.h #include <ydb/core/base/defs.h> #include <ydb/core/base/events.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> diff --git a/ydb/core/cms/console/util/defs.h b/ydb/core/cms/console/util/defs.h index 9e2937dac77..27f3716b1f8 100644 --- a/ydb/core/cms/console/util/defs.h +++ b/ydb/core/cms/console/util/defs.h @@ -2,4 +2,4 @@ // unique tag: ./ydb/core/cms/console/util/defs.h #include <ydb/core/base/defs.h> #include <ydb/core/base/events.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> diff --git a/ydb/core/cms/sentinel.cpp b/ydb/core/cms/sentinel.cpp index 28e92421c2b..f4e779befdc 100644 --- a/ydb/core/cms/sentinel.cpp +++ b/ydb/core/cms/sentinel.cpp @@ -6,7 +6,7 @@ #include <ydb/core/base/counters.h> #include <ydb/core/blobstorage/base/blobstorage_events.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp index c6800c9508b..3b406b11afe 100644 --- a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp +++ b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp @@ -99,7 +99,7 @@ #include <ydb/core/persqueue/pq.h> #include <ydb/core/persqueue/pq_l2_service.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/protos/console_config.pb.h> #include <ydb/core/public_http/http_service.h> diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp index 7edebbaedc7..2e1f10e3801 100644 --- a/ydb/core/driver_lib/run/run.cpp +++ b/ydb/core/driver_lib/run/run.cpp @@ -46,7 +46,7 @@ #include <ydb/core/base/counters.h> #include <ydb/core/base/tabletid.h> #include <ydb/core/base/statestorage_impl.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/mind/local.h> #include <ydb/core/mind/tenant_pool.h> diff --git a/ydb/core/driver_lib/version/version.cpp b/ydb/core/driver_lib/version/version.cpp index bd9e31aab10..64132f69dcd 100644 --- a/ydb/core/driver_lib/version/version.cpp +++ b/ydb/core/driver_lib/version/version.cpp @@ -1,5 +1,5 @@ #include <library/cpp/svnversion/svnversion.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include "version.h" using TCurrent = NKikimrConfig::TCurrentCompatibilityInfo; diff --git a/ydb/core/engine/minikql/flat_local_tx_read_columns.h b/ydb/core/engine/minikql/flat_local_tx_read_columns.h index 53e08fd2869..3112d72a9a1 100644 --- a/ydb/core/engine/minikql/flat_local_tx_read_columns.h +++ b/ydb/core/engine/minikql/flat_local_tx_read_columns.h @@ -4,7 +4,7 @@ #include <ydb/core/tablet_flat/flat_database.h> #include <ydb/core/tablet_flat/tablet_flat_executed.h> #include <ydb/core/tablet/tablet_exception.h> -#include <ydb/core/protos/issue_id.pb.h> +#include <ydb/library/ydb_issue/proto/issue_id.pb.h> #include <ydb/core/formats/factory.h> #include <ydb/core/base/appdata.h> diff --git a/ydb/core/erasure/erasure.h b/ydb/core/erasure/erasure.h index 829603c0125..9adca27a8ff 100644 --- a/ydb/core/erasure/erasure.h +++ b/ydb/core/erasure/erasure.h @@ -4,7 +4,7 @@ #include <span> #include <ydb/core/debug/valgrind_check.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <util/stream/str.h> #include <util/generic/string.h> diff --git a/ydb/core/formats/arrow/arrow_filter.cpp b/ydb/core/formats/arrow/arrow_filter.cpp index 70fa1187b63..bb0e839ec88 100644 --- a/ydb/core/formats/arrow/arrow_filter.cpp +++ b/ydb/core/formats/arrow/arrow_filter.cpp @@ -4,7 +4,7 @@ #include <contrib/libs/apache/arrow/cpp/src/arrow/chunked_array.h> #include <contrib/libs/apache/arrow/cpp/src/arrow/compute/api_vector.h> #include <contrib/libs/apache/arrow/cpp/src/arrow/record_batch.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> namespace NKikimr::NArrow { diff --git a/ydb/core/formats/arrow/arrow_helpers.cpp b/ydb/core/formats/arrow/arrow_helpers.cpp index 9fade7d1087..d3d14e66437 100644 --- a/ydb/core/formats/arrow/arrow_helpers.cpp +++ b/ydb/core/formats/arrow/arrow_helpers.cpp @@ -7,7 +7,7 @@ #include "serializer/abstract.h" #include "serializer/stream.h" -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <util/system/yassert.h> #include <util/string/join.h> #include <contrib/libs/apache/arrow/cpp/src/arrow/io/memory.h> diff --git a/ydb/core/formats/arrow/program.cpp b/ydb/core/formats/arrow/program.cpp index e8db218f8fa..3d34cda429f 100644 --- a/ydb/core/formats/arrow/program.cpp +++ b/ydb/core/formats/arrow/program.cpp @@ -40,7 +40,7 @@ struct GroupByOptions : public arrow::compute::ScalarAggregateOptions { #include <contrib/libs/apache/arrow/cpp/src/arrow/array/builder_primitive.h> #include <contrib/libs/apache/arrow/cpp/src/arrow/datum.h> #include <contrib/libs/apache/arrow/cpp/src/arrow/result.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> namespace NKikimr::NSsa { diff --git a/ydb/core/formats/arrow/serializer/batch_only.cpp b/ydb/core/formats/arrow/serializer/batch_only.cpp index e1a48a065bc..e7fa3110430 100644 --- a/ydb/core/formats/arrow/serializer/batch_only.cpp +++ b/ydb/core/formats/arrow/serializer/batch_only.cpp @@ -1,7 +1,7 @@ #include "batch_only.h" #include "stream.h" #include <ydb/core/formats/arrow/common/validation.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <contrib/libs/apache/arrow/cpp/src/arrow/ipc/dictionary.h> #include <contrib/libs/apache/arrow/cpp/src/arrow/ipc/writer.h> #include <contrib/libs/apache/arrow/cpp/src/arrow/io/memory.h> diff --git a/ydb/core/fq/libs/actors/database_resolver.cpp b/ydb/core/fq/libs/actors/database_resolver.cpp index 091bc2221f1..41341eea4b7 100644 --- a/ydb/core/fq/libs/actors/database_resolver.cpp +++ b/ydb/core/fq/libs/actors/database_resolver.cpp @@ -8,7 +8,7 @@ #include <library/cpp/actors/http/http.h> #include <library/cpp/actors/http/http_proxy.h> #include <library/cpp/json/json_reader.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #define LOG_E(stream) LOG_ERROR_S(*TlsActivationContext, NKikimrServices::FQ_DATABASE_RESOLVER, "TraceId: " << TraceId << " " << stream) #define LOG_D(stream) LOG_DEBUG_S(*TlsActivationContext, NKikimrServices::FQ_DATABASE_RESOLVER, "TraceId: " << TraceId << " " << stream) diff --git a/ydb/core/fq/libs/actors/logging/log.h b/ydb/core/fq/libs/actors/logging/log.h index e5923ed150d..ec1edb72376 100644 --- a/ydb/core/fq/libs/actors/logging/log.h +++ b/ydb/core/fq/libs/actors/logging/log.h @@ -1,5 +1,5 @@ #pragma once -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/log.h> diff --git a/ydb/core/fq/libs/actors/nodes_health_check.cpp b/ydb/core/fq/libs/actors/nodes_health_check.cpp index 670b43a5c81..640063cb020 100644 --- a/ydb/core/fq/libs/actors/nodes_health_check.cpp +++ b/ydb/core/fq/libs/actors/nodes_health_check.cpp @@ -1,6 +1,6 @@ #include "proxy_private.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/public/issue/yql_issue_message.h> #include <library/cpp/yson/node/node_io.h> diff --git a/ydb/core/fq/libs/actors/nodes_manager.cpp b/ydb/core/fq/libs/actors/nodes_manager.cpp index 046b4b3153a..8373db16c20 100644 --- a/ydb/core/fq/libs/actors/nodes_manager.cpp +++ b/ydb/core/fq/libs/actors/nodes_manager.cpp @@ -14,7 +14,7 @@ #include <ydb/core/fq/libs/private_client/internal_service.h> #include <library/cpp/actors/core/log.h> #include <util/system/hostname.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #define LOG_E(stream) \ diff --git a/ydb/core/fq/libs/actors/pending_fetcher.cpp b/ydb/core/fq/libs/actors/pending_fetcher.cpp index 1b6b1e22f50..0183e09ed3e 100644 --- a/ydb/core/fq/libs/actors/pending_fetcher.cpp +++ b/ydb/core/fq/libs/actors/pending_fetcher.cpp @@ -9,7 +9,7 @@ #include <library/cpp/protobuf/interop/cast.h> #include <ydb/core/mon/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/ast/yql_expr.h> #include <ydb/library/yql/utils/actor_log/log.h> diff --git a/ydb/core/fq/libs/actors/proxy_private.cpp b/ydb/core/fq/libs/actors/proxy_private.cpp index 0c80621b9c4..5c054d68726 100644 --- a/ydb/core/fq/libs/actors/proxy_private.cpp +++ b/ydb/core/fq/libs/actors/proxy_private.cpp @@ -7,7 +7,7 @@ #include <library/cpp/actors/core/hfunc.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <ydb/core/fq/libs/config/yq_issue.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/log.h> diff --git a/ydb/core/fq/libs/actors/rate_limiter_resources.cpp b/ydb/core/fq/libs/actors/rate_limiter_resources.cpp index b0cb81b9a29..80d4558bb06 100644 --- a/ydb/core/fq/libs/actors/rate_limiter_resources.cpp +++ b/ydb/core/fq/libs/actors/rate_limiter_resources.cpp @@ -1,7 +1,7 @@ #include "proxy_private.h" #include <util/datetime/base.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/public/issue/yql_issue_message.h> #include <library/cpp/yson/node/node_io.h> diff --git a/ydb/core/fq/libs/actors/result_writer.cpp b/ydb/core/fq/libs/actors/result_writer.cpp index 1a52a7a10e5..846cb2bdf6e 100644 --- a/ydb/core/fq/libs/actors/result_writer.cpp +++ b/ydb/core/fq/libs/actors/result_writer.cpp @@ -1,7 +1,7 @@ #include <ydb/core/fq/libs/config/protos/fq_config.pb.h> #include "proxy.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/fq/libs/common/rows_proto_splitter.h> #include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h> diff --git a/ydb/core/fq/libs/actors/run_actor.cpp b/ydb/core/fq/libs/actors/run_actor.cpp index 637d226c741..3e6d6e29286 100644 --- a/ydb/core/fq/libs/actors/run_actor.cpp +++ b/ydb/core/fq/libs/actors/run_actor.cpp @@ -46,7 +46,7 @@ #include <ydb/library/yql/public/issue/protos/issue_message.pb.h> #include <ydb/library/mkql_proto/mkql_proto.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/fq/libs/actors/nodes_manager.h> #include <ydb/core/fq/libs/checkpoint_storage/storage_service.h> diff --git a/ydb/core/fq/libs/actors/task_get.cpp b/ydb/core/fq/libs/actors/task_get.cpp index 2df7ce3912d..a02c998c816 100644 --- a/ydb/core/fq/libs/actors/task_get.cpp +++ b/ydb/core/fq/libs/actors/task_get.cpp @@ -2,7 +2,7 @@ #include "proxy_private.h" #include "proxy.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/public/issue/yql_issue_message.h> #include <library/cpp/yson/node/node_io.h> diff --git a/ydb/core/fq/libs/actors/task_ping.cpp b/ydb/core/fq/libs/actors/task_ping.cpp index 67bda9da0c3..05027a1a791 100644 --- a/ydb/core/fq/libs/actors/task_ping.cpp +++ b/ydb/core/fq/libs/actors/task_ping.cpp @@ -1,7 +1,7 @@ #include "proxy_private.h" #include <util/datetime/base.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/public/issue/yql_issue_message.h> #include <library/cpp/yson/node/node_io.h> diff --git a/ydb/core/fq/libs/actors/task_result_write.cpp b/ydb/core/fq/libs/actors/task_result_write.cpp index d306caad43b..1009c418ed7 100644 --- a/ydb/core/fq/libs/actors/task_result_write.cpp +++ b/ydb/core/fq/libs/actors/task_result_write.cpp @@ -1,6 +1,6 @@ #include "proxy_private.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/public/issue/yql_issue_message.h> diff --git a/ydb/core/fq/libs/compute/ydb/control_plane/cms_grpc_client_actor.cpp b/ydb/core/fq/libs/compute/ydb/control_plane/cms_grpc_client_actor.cpp index 0d9233e7367..6b564e49a9c 100644 --- a/ydb/core/fq/libs/compute/ydb/control_plane/cms_grpc_client_actor.cpp +++ b/ydb/core/fq/libs/compute/ydb/control_plane/cms_grpc_client_actor.cpp @@ -1,7 +1,7 @@ #include <ydb/public/api/grpc/ydb_cms_v1.grpc.pb.h> #include <ydb/core/fq/libs/compute/ydb/events/events.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/security/ydb_credentials_provider_factory.h> #include <ydb/library/ycloud/api/events.h> diff --git a/ydb/core/fq/libs/compute/ydb/control_plane/ydbcp_grpc_client_actor.cpp b/ydb/core/fq/libs/compute/ydb/control_plane/ydbcp_grpc_client_actor.cpp index 22acd0a55ff..bb6974d4fe7 100644 --- a/ydb/core/fq/libs/compute/ydb/control_plane/ydbcp_grpc_client_actor.cpp +++ b/ydb/core/fq/libs/compute/ydb/control_plane/ydbcp_grpc_client_actor.cpp @@ -1,6 +1,6 @@ #include <ydb/core/fq/libs/compute/ydb/events/events.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/security/ydb_credentials_provider_factory.h> #include <ydb/library/ycloud/api/events.h> diff --git a/ydb/core/fq/libs/compute/ydb/executer_actor.cpp b/ydb/core/fq/libs/compute/ydb/executer_actor.cpp index feed9c68d5a..45e44024819 100644 --- a/ydb/core/fq/libs/compute/ydb/executer_actor.cpp +++ b/ydb/core/fq/libs/compute/ydb/executer_actor.cpp @@ -6,7 +6,7 @@ #include <ydb/core/fq/libs/compute/common/run_actor_params.h> #include <ydb/core/fq/libs/compute/ydb/events/events.h> #include <ydb/core/fq/libs/ydb/ydb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/public/sdk/cpp/client/draft/ydb_query/client.h> #include <ydb/public/sdk/cpp/client/ydb_operation/operation.h> diff --git a/ydb/core/fq/libs/compute/ydb/finalizer_actor.cpp b/ydb/core/fq/libs/compute/ydb/finalizer_actor.cpp index 41563e65e90..3a03460c8ae 100644 --- a/ydb/core/fq/libs/compute/ydb/finalizer_actor.cpp +++ b/ydb/core/fq/libs/compute/ydb/finalizer_actor.cpp @@ -5,7 +5,7 @@ #include <ydb/core/fq/libs/compute/common/run_actor_params.h> #include <ydb/core/fq/libs/compute/ydb/events/events.h> #include <ydb/core/fq/libs/ydb/ydb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/providers/common/metrics/service_counters.h> diff --git a/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp b/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp index 4a7884cb314..afad919456c 100644 --- a/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp +++ b/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp @@ -7,7 +7,7 @@ #include <ydb/core/fq/libs/compute/common/run_actor_params.h> #include <ydb/core/fq/libs/compute/ydb/events/events.h> #include <ydb/core/fq/libs/ydb/ydb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/public/sdk/cpp/client/draft/ydb_query/client.h> #include <ydb/public/sdk/cpp/client/ydb_operation/operation.h> diff --git a/ydb/core/fq/libs/compute/ydb/result_writer_actor.cpp b/ydb/core/fq/libs/compute/ydb/result_writer_actor.cpp index 599fa1b5024..54643cf7ad5 100644 --- a/ydb/core/fq/libs/compute/ydb/result_writer_actor.cpp +++ b/ydb/core/fq/libs/compute/ydb/result_writer_actor.cpp @@ -7,7 +7,7 @@ #include <ydb/core/fq/libs/compute/ydb/events/events.h> #include <ydb/core/fq/libs/private_client/events.h> #include <ydb/core/fq/libs/ydb/ydb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/providers/common/metrics/service_counters.h> diff --git a/ydb/core/fq/libs/compute/ydb/status_tracker_actor.cpp b/ydb/core/fq/libs/compute/ydb/status_tracker_actor.cpp index f062d0671a4..2b436c0e6f1 100644 --- a/ydb/core/fq/libs/compute/ydb/status_tracker_actor.cpp +++ b/ydb/core/fq/libs/compute/ydb/status_tracker_actor.cpp @@ -6,7 +6,7 @@ #include <ydb/core/fq/libs/compute/common/run_actor_params.h> #include <ydb/core/fq/libs/compute/ydb/events/events.h> #include <ydb/core/fq/libs/ydb/ydb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/providers/common/metrics/service_counters.h> #include <ydb/library/yql/public/issue/yql_issue_message.h> diff --git a/ydb/core/fq/libs/compute/ydb/stopper_actor.cpp b/ydb/core/fq/libs/compute/ydb/stopper_actor.cpp index b7d0596e7ef..bd712a58132 100644 --- a/ydb/core/fq/libs/compute/ydb/stopper_actor.cpp +++ b/ydb/core/fq/libs/compute/ydb/stopper_actor.cpp @@ -7,7 +7,7 @@ #include <ydb/core/fq/libs/compute/common/run_actor_params.h> #include <ydb/core/fq/libs/compute/ydb/events/events.h> #include <ydb/core/fq/libs/ydb/ydb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/public/sdk/cpp/client/draft/ydb_query/client.h> #include <ydb/public/sdk/cpp/client/ydb_operation/operation.h> diff --git a/ydb/core/fq/libs/compute/ydb/ydb_run_actor.cpp b/ydb/core/fq/libs/compute/ydb/ydb_run_actor.cpp index c00b1b0669e..040cdca1264 100644 --- a/ydb/core/fq/libs/compute/ydb/ydb_run_actor.cpp +++ b/ydb/core/fq/libs/compute/ydb/ydb_run_actor.cpp @@ -18,7 +18,7 @@ #include <ydb/core/fq/libs/control_plane_storage/util.h> #include <ydb/core/fq/libs/private_client/events.h> #include <ydb/core/fq/libs/ydb/ydb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/public/issue/yql_issue_message.h> #include <ydb/public/sdk/cpp/client/draft/ydb_query/client.h> #include <ydb/public/sdk/cpp/client/ydb_operation/operation.h> diff --git a/ydb/core/fq/libs/control_plane_config/control_plane_config.cpp b/ydb/core/fq/libs/control_plane_config/control_plane_config.cpp index b841aa9c160..549744794f7 100644 --- a/ydb/core/fq/libs/control_plane_config/control_plane_config.cpp +++ b/ydb/core/fq/libs/control_plane_config/control_plane_config.cpp @@ -19,7 +19,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/actor.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/library/db_pool/db_pool.h> #include <ydb/library/yql/public/issue/yql_issue_message.h> #include <ydb/library/security/util.h> diff --git a/ydb/core/fq/libs/control_plane_proxy/control_plane_proxy.cpp b/ydb/core/fq/libs/control_plane_proxy/control_plane_proxy.cpp index c01bf40ac2f..0c34379a7d1 100644 --- a/ydb/core/fq/libs/control_plane_proxy/control_plane_proxy.cpp +++ b/ydb/core/fq/libs/control_plane_proxy/control_plane_proxy.cpp @@ -25,7 +25,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/actor.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/public/sdk/cpp/client/ydb_scheme/scheme.h> #include <ydb/library/ycloud/api/access_service.h> diff --git a/ydb/core/fq/libs/private_client/internal_service.cpp b/ydb/core/fq/libs/private_client/internal_service.cpp index bdf946e2527..303c41c5dff 100644 --- a/ydb/core/fq/libs/private_client/internal_service.cpp +++ b/ydb/core/fq/libs/private_client/internal_service.cpp @@ -5,7 +5,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #define LOG_E(stream) \ LOG_ERROR_S(*NActors::TlsActivationContext, NKikimrServices::FQ_INTERNAL_SERVICE, stream) diff --git a/ydb/core/fq/libs/private_client/loopback_service.cpp b/ydb/core/fq/libs/private_client/loopback_service.cpp index 08f2193b90e..91f38403cc2 100644 --- a/ydb/core/fq/libs/private_client/loopback_service.cpp +++ b/ydb/core/fq/libs/private_client/loopback_service.cpp @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/fq/libs/control_plane_config/control_plane_config.h> #include <ydb/core/fq/libs/control_plane_config/events/events.h> diff --git a/ydb/core/fq/libs/quota_manager/quota_manager.cpp b/ydb/core/fq/libs/quota_manager/quota_manager.cpp index a9efa261147..9f06dc01bcc 100644 --- a/ydb/core/fq/libs/quota_manager/quota_manager.cpp +++ b/ydb/core/fq/libs/quota_manager/quota_manager.cpp @@ -14,7 +14,7 @@ #include <ydb/core/fq/libs/ydb/ydb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #define LOG_E(stream) \ LOG_ERROR_S(*NActors::TlsActivationContext, NKikimrServices::FQ_QUOTA_SERVICE, stream) diff --git a/ydb/core/fq/libs/quota_manager/quota_proxy.cpp b/ydb/core/fq/libs/quota_manager/quota_proxy.cpp index ad99aeaf85b..d7bef9903fb 100644 --- a/ydb/core/fq/libs/quota_manager/quota_proxy.cpp +++ b/ydb/core/fq/libs/quota_manager/quota_proxy.cpp @@ -9,7 +9,7 @@ #include <ydb/core/fq/libs/control_plane_storage/util.h> #include <ydb/core/fq/libs/shared_resources/shared_resources.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #define LOG_E(stream) \ LOG_ERROR_S(*NActors::TlsActivationContext, NKikimrServices::FQ_QUOTA_PROXY, stream) diff --git a/ydb/core/fq/libs/rate_limiter/control_plane_service/rate_limiter_control_plane_service.cpp b/ydb/core/fq/libs/rate_limiter/control_plane_service/rate_limiter_control_plane_service.cpp index d2054089724..f74bf76a914 100644 --- a/ydb/core/fq/libs/rate_limiter/control_plane_service/rate_limiter_control_plane_service.cpp +++ b/ydb/core/fq/libs/rate_limiter/control_plane_service/rate_limiter_control_plane_service.cpp @@ -1,7 +1,7 @@ #include "rate_limiter_control_plane_service.h" #include "update_limit_actor.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/fq/libs/events/events.h> #include <ydb/core/fq/libs/quota_manager/events/events.h> #include <ydb/core/fq/libs/rate_limiter/events/control_plane_events.h> diff --git a/ydb/core/fq/libs/rate_limiter/control_plane_service/update_limit_actor.cpp b/ydb/core/fq/libs/rate_limiter/control_plane_service/update_limit_actor.cpp index 69dd2546f2f..c6ce2b1757e 100644 --- a/ydb/core/fq/libs/rate_limiter/control_plane_service/update_limit_actor.cpp +++ b/ydb/core/fq/libs/rate_limiter/control_plane_service/update_limit_actor.cpp @@ -1,6 +1,6 @@ #include "update_limit_actor.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/fq/libs/events/events.h> #include <ydb/core/fq/libs/rate_limiter/utils/path.h> diff --git a/ydb/core/fq/libs/rate_limiter/quoter_service/quoter_service.cpp b/ydb/core/fq/libs/rate_limiter/quoter_service/quoter_service.cpp index ebcf0940cac..fbf4eef012a 100644 --- a/ydb/core/fq/libs/rate_limiter/quoter_service/quoter_service.cpp +++ b/ydb/core/fq/libs/rate_limiter/quoter_service/quoter_service.cpp @@ -4,7 +4,7 @@ #include <ydb/core/base/path.h> #include <ydb/core/fq/libs/ydb/util.h> #include <ydb/core/fq/libs/ydb/ydb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/events.h> diff --git a/ydb/core/fq/libs/read_rule/read_rule_creator.cpp b/ydb/core/fq/libs/read_rule/read_rule_creator.cpp index 6bbb7836ca0..5af0f2c20a3 100644 --- a/ydb/core/fq/libs/read_rule/read_rule_creator.cpp +++ b/ydb/core/fq/libs/read_rule/read_rule_creator.cpp @@ -3,7 +3,7 @@ #include <ydb/core/fq/libs/common/util.h> #include <ydb/core/fq/libs/events/events.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/public/sdk/cpp/client/ydb_persqueue_public/persqueue.h> #include <ydb/library/yql/providers/dq/api/protos/service.pb.h> diff --git a/ydb/core/fq/libs/read_rule/read_rule_deleter.cpp b/ydb/core/fq/libs/read_rule/read_rule_deleter.cpp index 3f86d15d830..4d9c96d2314 100644 --- a/ydb/core/fq/libs/read_rule/read_rule_deleter.cpp +++ b/ydb/core/fq/libs/read_rule/read_rule_deleter.cpp @@ -3,7 +3,7 @@ #include <ydb/core/fq/libs/common/util.h> #include <ydb/core/fq/libs/events/events.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/public/sdk/cpp/client/ydb_persqueue_public/persqueue.h> #include <library/cpp/actors/core/actor_bootstrapped.h> diff --git a/ydb/core/fq/libs/shared_resources/shared_resources.cpp b/ydb/core/fq/libs/shared_resources/shared_resources.cpp index aca02e5468c..d9d9b4f5771 100644 --- a/ydb/core/fq/libs/shared_resources/shared_resources.cpp +++ b/ydb/core/fq/libs/shared_resources/shared_resources.cpp @@ -1,6 +1,6 @@ #include "shared_resources.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/fq/libs/events/events.h> #include <ydb/library/logger/actor.h> diff --git a/ydb/core/grpc_services/grpc_request_check_actor.h b/ydb/core/grpc_services/grpc_request_check_actor.h index 4f5fb755940..b1226204bf4 100644 --- a/ydb/core/grpc_services/grpc_request_check_actor.h +++ b/ydb/core/grpc_services/grpc_request_check_actor.h @@ -11,7 +11,7 @@ #include <ydb/core/base/path.h> #include <ydb/core/base/subdomain.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/grpc_services/counters/proxy_counters.h> #include <ydb/core/security/secure_request.h> #include <ydb/core/tx/scheme_cache/scheme_cache.h> diff --git a/ydb/core/grpc_services/operation_helpers.cpp b/ydb/core/grpc_services/operation_helpers.cpp index 32d7224f7ec..85ee5d5fc3e 100644 --- a/ydb/core/grpc_services/operation_helpers.cpp +++ b/ydb/core/grpc_services/operation_helpers.cpp @@ -5,7 +5,7 @@ #include "rpc_import_base.h" #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/tx/scheme_cache/scheme_cache.h> #include <ydb/core/tx/schemeshard/schemeshard.h> diff --git a/ydb/core/grpc_services/query/rpc_execute_query.cpp b/ydb/core/grpc_services/query/rpc_execute_query.cpp index 08b7f86f493..668be3c7f40 100644 --- a/ydb/core/grpc_services/query/rpc_execute_query.cpp +++ b/ydb/core/grpc_services/query/rpc_execute_query.cpp @@ -2,7 +2,7 @@ #include <ydb/core/actorlib_impl/long_timer.h> #include <ydb/core/base/appdata.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/grpc_services/base/base.h> #include <ydb/core/grpc_services/rpc_kqp_base.h> #include <ydb/core/kqp/executer_actor/kqp_executer.h> diff --git a/ydb/core/grpc_services/query/rpc_execute_script.cpp b/ydb/core/grpc_services/query/rpc_execute_script.cpp index a4919ad913f..559ccb1963b 100644 --- a/ydb/core/grpc_services/query/rpc_execute_script.cpp +++ b/ydb/core/grpc_services/query/rpc_execute_script.cpp @@ -1,7 +1,7 @@ #include "service_query.h" #include <ydb/core/base/appdata.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/grpc_services/base/base.h> #include <ydb/core/grpc_services/rpc_kqp_base.h> #include <ydb/core/kqp/common/kqp.h> diff --git a/ydb/core/grpc_services/query/rpc_fetch_script_results.cpp b/ydb/core/grpc_services/query/rpc_fetch_script_results.cpp index 4151aa9eef7..44f3881d7cd 100644 --- a/ydb/core/grpc_services/query/rpc_fetch_script_results.cpp +++ b/ydb/core/grpc_services/query/rpc_fetch_script_results.cpp @@ -1,7 +1,7 @@ #include "service_query.h" #include <ydb/core/base/appdata.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/grpc_services/base/base.h> #include <ydb/core/grpc_services/rpc_request_base.h> #include <ydb/core/kqp/common/kqp.h> diff --git a/ydb/core/grpc_services/rpc_calls.h b/ydb/core/grpc_services/rpc_calls.h index 661e8098ac0..cb2fcc48894 100644 --- a/ydb/core/grpc_services/rpc_calls.h +++ b/ydb/core/grpc_services/rpc_calls.h @@ -3,7 +3,7 @@ #include "local_rate_limiter.h" -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/grpc_services/base/base.h> #include <ydb/public/api/protos/ydb_auth.pb.h> diff --git a/ydb/core/grpc_services/rpc_deferrable.h b/ydb/core/grpc_services/rpc_deferrable.h index a65d7153966..6de98b36c31 100644 --- a/ydb/core/grpc_services/rpc_deferrable.h +++ b/ydb/core/grpc_services/rpc_deferrable.h @@ -7,7 +7,7 @@ #include "rpc_common/rpc_common.h" #include <ydb/core/tx/tx_proxy/proxy.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/base/tablet_pipe.h> #include <ydb/core/protos/flat_tx_scheme.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> diff --git a/ydb/core/grpc_services/rpc_kqp_base.h b/ydb/core/grpc_services/rpc_kqp_base.h index c1451f4af55..159dd8e61d7 100644 --- a/ydb/core/grpc_services/rpc_kqp_base.h +++ b/ydb/core/grpc_services/rpc_kqp_base.h @@ -3,7 +3,7 @@ #include "rpc_deferrable.h" -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/cms/console/configs_dispatcher.h> #include <ydb/core/kqp/common/kqp.h> #include <ydb/core/ydb_convert/ydb_convert.h> diff --git a/ydb/core/grpc_services/rpc_read_columns.cpp b/ydb/core/grpc_services/rpc_read_columns.cpp index 46c3ede0af2..9bed9622254 100644 --- a/ydb/core/grpc_services/rpc_read_columns.cpp +++ b/ydb/core/grpc_services/rpc_read_columns.cpp @@ -6,7 +6,7 @@ #include "resolve_local_db_table.h" #include <ydb/core/tx/scheme_cache/scheme_cache.h> #include <ydb/core/tx/datashard/datashard.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/base/tablet_pipecache.h> #include <ydb/core/actorlib_impl/long_timer.h> #include <ydb/core/kqp/compute_actor/kqp_compute_events.h> diff --git a/ydb/core/grpc_services/rpc_request_base.h b/ydb/core/grpc_services/rpc_request_base.h index cae948e947c..df18d0f87d9 100644 --- a/ydb/core/grpc_services/rpc_request_base.h +++ b/ydb/core/grpc_services/rpc_request_base.h @@ -3,8 +3,8 @@ #include "grpc_request_proxy.h" #include <ydb/core/grpc_services/base/base.h> #include <ydb/core/base/appdata.h> -#include <ydb/core/base/kikimr_issue.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/ydb_issue/issue_helpers.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/scheme/scheme_tabledefs.h> #include <ydb/library/aclib/aclib.h> #include <ydb/public/api/protos/ydb_operation.pb.h> diff --git a/ydb/core/grpc_services/rpc_stream_execute_scan_query.cpp b/ydb/core/grpc_services/rpc_stream_execute_scan_query.cpp index 1f81cb8b5ce..1b6893df7a0 100644 --- a/ydb/core/grpc_services/rpc_stream_execute_scan_query.cpp +++ b/ydb/core/grpc_services/rpc_stream_execute_scan_query.cpp @@ -7,11 +7,11 @@ #include <ydb/core/actorlib_impl/long_timer.h> #include <ydb/core/base/appdata.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/kqp/executer_actor/kqp_executer.h> #include <ydb/core/kqp/opt/kqp_query_plan.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/protos/ydb_table_impl.pb.h> #include <ydb/core/ydb_convert/ydb_convert.h> diff --git a/ydb/core/grpc_services/rpc_stream_execute_yql_script.cpp b/ydb/core/grpc_services/rpc_stream_execute_yql_script.cpp index f1ac5f666fb..b93232ac307 100644 --- a/ydb/core/grpc_services/rpc_stream_execute_yql_script.cpp +++ b/ydb/core/grpc_services/rpc_stream_execute_yql_script.cpp @@ -5,10 +5,10 @@ #include <ydb/core/actorlib_impl/long_timer.h> #include <ydb/core/base/appdata.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/kqp/executer_actor/kqp_executer.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/ydb_convert/ydb_convert.h> diff --git a/ydb/core/kafka_proxy/kafka_log.h b/ydb/core/kafka_proxy/kafka_log.h index 8547259b360..69e331c4506 100644 --- a/ydb/core/kafka_proxy/kafka_log.h +++ b/ydb/core/kafka_proxy/kafka_log.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actorsystem.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> namespace NKafka { diff --git a/ydb/core/keyvalue/keyvalue_flat_impl.h b/ydb/core/keyvalue/keyvalue_flat_impl.h index e84026b9a27..7b3eaca03bb 100644 --- a/ydb/core/keyvalue/keyvalue_flat_impl.h +++ b/ydb/core/keyvalue/keyvalue_flat_impl.h @@ -20,7 +20,7 @@ #include <ydb/core/base/blobstorage.h> #include <ydb/core/base/tablet_resolver.h> #include <ydb/public/lib/base/msgbus.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/protos/counters_keyvalue.pb.h> #include <util/string/escape.h> diff --git a/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp b/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp index 591ccfa91a5..33eee8139af 100644 --- a/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp +++ b/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp @@ -7,7 +7,7 @@ #include <ydb/core/kqp/runtime/kqp_compute.h> #include <ydb/core/kqp/runtime/kqp_scan_data.h> #include <ydb/core/sys_view/scan.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h> diff --git a/ydb/core/kqp/counters/kqp_counters.cpp b/ydb/core/kqp/counters/kqp_counters.cpp index f85e56d91b5..26d1b4a2668 100644 --- a/ydb/core/kqp/counters/kqp_counters.cpp +++ b/ydb/core/kqp/counters/kqp_counters.cpp @@ -2,7 +2,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/base/counters.h> -#include <ydb/core/protos/issue_id.pb.h> +#include <ydb/library/ydb_issue/proto/issue_id.pb.h> #include <ydb/core/sys_view/service/db_counters.h> #include <ydb/core/sys_view/service/sysview_service.h> diff --git a/ydb/core/kqp/executer_actor/kqp_executer_impl.h b/ydb/core/kqp/executer_actor/kqp_executer_impl.h index 1c3f178c1cc..0bccd8485d0 100644 --- a/ydb/core/kqp/executer_actor/kqp_executer_impl.h +++ b/ydb/core/kqp/executer_actor/kqp_executer_impl.h @@ -15,7 +15,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/base/tablet_pipecache.h> #include <ydb/core/base/wilson.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/protos/tx_datashard.pb.h> #include <ydb/core/protos/pqconfig.pb.h> #include <ydb/core/kqp/executer_actor/kqp_tasks_graph.h> diff --git a/ydb/core/kqp/gateway/kqp_ic_gateway.cpp b/ydb/core/kqp/gateway/kqp_ic_gateway.cpp index 237fa63f8a9..7a762c7036f 100644 --- a/ydb/core/kqp/gateway/kqp_ic_gateway.cpp +++ b/ydb/core/kqp/gateway/kqp_ic_gateway.cpp @@ -6,7 +6,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/base/path.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/cms/console/configs_dispatcher.h> #include <ydb/core/engine/mkql_proto.h> #include <ydb/core/kqp/common/kqp.h> diff --git a/ydb/core/kqp/proxy_service/kqp_proxy_ut.cpp b/ydb/core/kqp/proxy_service/kqp_proxy_ut.cpp index 15a8961b8ec..a848d996168 100644 --- a/ydb/core/kqp/proxy_service/kqp_proxy_ut.cpp +++ b/ydb/core/kqp/proxy_service/kqp_proxy_ut.cpp @@ -1,5 +1,5 @@ #include <ydb/core/base/tablet.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/kqp/ut/common/kqp_ut_common.h> #include <ydb/core/kqp/proxy_service/kqp_proxy_service.h> #include <ydb/core/kqp/common/kqp.h> diff --git a/ydb/core/kqp/proxy_service/kqp_script_executions.cpp b/ydb/core/kqp/proxy_service/kqp_script_executions.cpp index 8f256f91b1f..56c39cf7d42 100644 --- a/ydb/core/kqp/proxy_service/kqp_script_executions.cpp +++ b/ydb/core/kqp/proxy_service/kqp_script_executions.cpp @@ -7,7 +7,7 @@ #include <ydb/core/kqp/common/events/events.h> #include <ydb/core/kqp/common/kqp_script_executions.h> #include <ydb/core/kqp/run_script_actor/kqp_run_script_actor.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/scheme_cache/scheme_cache.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> diff --git a/ydb/core/kqp/query_data/kqp_prepared_query.cpp b/ydb/core/kqp/query_data/kqp_prepared_query.cpp index 08b0b58438b..93d71412999 100644 --- a/ydb/core/kqp/query_data/kqp_prepared_query.cpp +++ b/ydb/core/kqp/query_data/kqp_prepared_query.cpp @@ -7,7 +7,7 @@ #include <ydb/library/mkql_proto/mkql_proto.h> #include <ydb/core/kqp/common/simple/helpers.h> #include <ydb/core/protos/kqp_physical.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/log.h> diff --git a/ydb/core/kqp/query_data/kqp_query_data.cpp b/ydb/core/kqp/query_data/kqp_query_data.cpp index 0206887418b..8a7a94adcfc 100644 --- a/ydb/core/kqp/query_data/kqp_query_data.cpp +++ b/ydb/core/kqp/query_data/kqp_query_data.cpp @@ -7,7 +7,7 @@ #include <ydb/library/yql/minikql/mkql_string_util.h> #include <ydb/library/yql/public/udf/udf_data_type.h> #include <ydb/library/yql/utils/yql_panic.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> namespace NKikimr::NKqp { diff --git a/ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp b/ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp index 507e7771b7f..4e5d9a57bd6 100644 --- a/ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp +++ b/ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp @@ -1,11 +1,11 @@ #include "kqp_run_script_actor.h" -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/kqp/common/events/events.h> #include <ydb/core/kqp/common/kqp.h> #include <ydb/core/kqp/executer_actor/kqp_executer.h> #include <ydb/core/kqp/proxy_service/kqp_script_executions.h> -#include <ydb/core/protos/issue_id.pb.h> +#include <ydb/library/ydb_issue/proto/issue_id.pb.h> #include <ydb/public/api/protos/ydb_status_codes.pb.h> #include <library/cpp/actors/core/actor_bootstrapped.h> diff --git a/ydb/core/kqp/runtime/kqp_scan_data.h b/ydb/core/kqp/runtime/kqp_scan_data.h index e530b3d51ca..dbf3c283e62 100644 --- a/ydb/core/kqp/runtime/kqp_scan_data.h +++ b/ydb/core/kqp/runtime/kqp_scan_data.h @@ -3,7 +3,7 @@ #include "kqp_compute.h" #include "kqp_scan_data_meta.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/engine/minikql/minikql_engine_host.h> #include <ydb/core/formats/arrow/arrow_helpers.h> diff --git a/ydb/core/load_test/defs.h b/ydb/core/load_test/defs.h index 1cded7724f0..c598de14999 100644 --- a/ydb/core/load_test/defs.h +++ b/ydb/core/load_test/defs.h @@ -6,6 +6,6 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/log.h> #include <ydb/core/protos/load_test.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/load_test/events.h> diff --git a/ydb/core/load_test/group_write.cpp b/ydb/core/load_test/group_write.cpp index d03cbdd876a..f448c0afdeb 100644 --- a/ydb/core/load_test/group_write.cpp +++ b/ydb/core/load_test/group_write.cpp @@ -4,7 +4,7 @@ #include "quantile.h" #include "speed.h" -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <ydb/core/util/lz4_data_generator.h> #include <google/protobuf/text_format.h> diff --git a/ydb/core/load_test/ycsb/defs.h b/ydb/core/load_test/ycsb/defs.h index fc4889ec7c9..07e2d2e4f14 100644 --- a/ydb/core/load_test/ycsb/defs.h +++ b/ydb/core/load_test/ycsb/defs.h @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/event_local.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> namespace NKikimr::NDataShardLoad { diff --git a/ydb/core/local_pgwire/log_impl.h b/ydb/core/local_pgwire/log_impl.h index a754936b3f8..b4c5c36bff9 100644 --- a/ydb/core/local_pgwire/log_impl.h +++ b/ydb/core/local_pgwire/log_impl.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actorsystem.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #define BLOG_D(stream) LOG_DEBUG_S(*NActors::TlsActivationContext, NKikimrServices::LOCAL_PGWIRE, stream) #define BLOG_I(stream) LOG_INFO_S(*NActors::TlsActivationContext, NKikimrServices::LOCAL_PGWIRE, stream) diff --git a/ydb/core/mind/bscontroller/defs.h b/ydb/core/mind/bscontroller/defs.h index 38912f492d6..5ad4450915d 100644 --- a/ydb/core/mind/bscontroller/defs.h +++ b/ydb/core/mind/bscontroller/defs.h @@ -21,7 +21,7 @@ #include <ydb/core/protos/blobstorage_config.pb.h> #include <ydb/core/protos/blobstorage.pb.h> #include <ydb/core/protos/counters_bs_controller.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/scheme/scheme_types_defs.h> #include <ydb/core/sys_view/common/events.h> #include <ydb/core/tablet_flat/flat_cxx_database.h> diff --git a/ydb/core/mind/bscontroller/storage_stats_calculator.cpp b/ydb/core/mind/bscontroller/storage_stats_calculator.cpp index 786bb9a32b2..225231c32c8 100644 --- a/ydb/core/mind/bscontroller/storage_stats_calculator.cpp +++ b/ydb/core/mind/bscontroller/storage_stats_calculator.cpp @@ -6,7 +6,7 @@ #include "sys_view.h" #include <ydb/core/blobstorage/base/utility.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor.h> #include <library/cpp/actors/core/actor_coroutine.h> diff --git a/ydb/core/mind/dynamic_nameserver.cpp b/ydb/core/mind/dynamic_nameserver.cpp index 6f4f147982a..5abcd2f7edb 100644 --- a/ydb/core/mind/dynamic_nameserver.cpp +++ b/ydb/core/mind/dynamic_nameserver.cpp @@ -2,7 +2,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/mon/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> namespace NKikimr { namespace NNodeBroker { diff --git a/ydb/core/mind/dynamic_nameserver_impl.h b/ydb/core/mind/dynamic_nameserver_impl.h index 2a26301a6fc..438fd76d2ea 100644 --- a/ydb/core/mind/dynamic_nameserver_impl.h +++ b/ydb/core/mind/dynamic_nameserver_impl.h @@ -9,7 +9,7 @@ #include <library/cpp/actors/interconnect/interconnect_address.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/hfunc.h> #include <util/generic/bitmap.h> diff --git a/ydb/core/mind/hive/hive_impl.cpp b/ydb/core/mind/hive/hive_impl.cpp index 68e6b3b3c64..682a54888c9 100644 --- a/ydb/core/mind/hive/hive_impl.cpp +++ b/ydb/core/mind/hive/hive_impl.cpp @@ -4,7 +4,7 @@ #include <ydb/core/cms/console/configs_dispatcher.h> #include <ydb/core/protos/counters_hive.pb.h> #include <ydb/core/util/tuples.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/actors/interconnect/interconnect.h> #include <util/generic/array_ref.h> diff --git a/ydb/core/mind/local.cpp b/ydb/core/mind/local.cpp index 4e003784d06..961d73701a2 100644 --- a/ydb/core/mind/local.cpp +++ b/ydb/core/mind/local.cpp @@ -5,7 +5,7 @@ #include <ydb/core/base/hive.h> #include <ydb/core/base/tablet_pipe.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/scheme_board/scheme_board.h> #include <ydb/core/util/tuples.h> diff --git a/ydb/core/mon/mon_impl.h b/ydb/core/mon/mon_impl.h index dc54b7c35ff..1e98f2aa715 100644 --- a/ydb/core/mon/mon_impl.h +++ b/ydb/core/mon/mon_impl.h @@ -1,7 +1,7 @@ #pragma once #include "mon.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/monlib/dynamic_counters/counters.h> #include <library/cpp/monlib/dynamic_counters/page.h> diff --git a/ydb/core/node_whiteboard/defs.h b/ydb/core/node_whiteboard/defs.h index 99e490cf974..4c391086c96 100644 --- a/ydb/core/node_whiteboard/defs.h +++ b/ydb/core/node_whiteboard/defs.h @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/actor.h> #include <library/cpp/actors/core/event.h> #include <library/cpp/actors/core/actorid.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/debug/valgrind_check.h> #include <util/generic/array_ref.h> #include <util/generic/string.h> diff --git a/ydb/core/persqueue/event_helpers.h b/ydb/core/persqueue/event_helpers.h index 51bb814c928..53c42e7a244 100644 --- a/ydb/core/persqueue/event_helpers.h +++ b/ydb/core/persqueue/event_helpers.h @@ -1,7 +1,7 @@ #pragma once #include <ydb/core/tablet/tablet_counters.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/public/api/protos/draft/persqueue_error_codes.pb.h> #include <library/cpp/actors/core/actor.h> diff --git a/ydb/core/persqueue/mirrorer.cpp b/ydb/core/persqueue/mirrorer.cpp index fa4c8d34064..a5e4d3d81d5 100644 --- a/ydb/core/persqueue/mirrorer.cpp +++ b/ydb/core/persqueue/mirrorer.cpp @@ -6,7 +6,7 @@ #include <ydb/library/persqueue/topic_parser/topic_parser.h> #include <ydb/library/persqueue/topic_parser/counters.h> #include <ydb/core/base/counters.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/time_provider/time_provider.h> diff --git a/ydb/core/pgproxy/pg_log.h b/ydb/core/pgproxy/pg_log.h index 976f60a7a41..fe5c9e70dba 100644 --- a/ydb/core/pgproxy/pg_log.h +++ b/ydb/core/pgproxy/pg_log.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actorsystem.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> namespace NPG { diff --git a/ydb/core/pgproxy/pg_proxy_ut.cpp b/ydb/core/pgproxy/pg_proxy_ut.cpp index 5d92b948d28..2ff8853ad65 100644 --- a/ydb/core/pgproxy/pg_proxy_ut.cpp +++ b/ydb/core/pgproxy/pg_proxy_ut.cpp @@ -7,7 +7,7 @@ #include <ydb/core/pgproxy/pg_proxy.h> #include <ydb/core/pgproxy/pg_log.h> #include <ydb/core/pgproxy/pg_proxy_events.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <util/network/socket.h> #include <util/string/hex.h> diff --git a/ydb/core/protos/CMakeLists.darwin-x86_64.txt b/ydb/core/protos/CMakeLists.darwin-x86_64.txt index 467f7222977..21afc82480c 100644 --- a/ydb/core/protos/CMakeLists.darwin-x86_64.txt +++ b/ydb/core/protos/CMakeLists.darwin-x86_64.txt @@ -1502,30 +1502,6 @@ get_built_tool_path( cpp_styleguide ) get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) -get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) -get_built_tool_path( TOOL_enum_parser_bin TOOL_enum_parser_dependency tools/enum_parser/enum_parser @@ -1557,6 +1533,8 @@ target_link_libraries(ydb-core-protos PUBLIC yql-dq-proto public-issue-protos yql-public-types + ydb-library-services + library-ydb_issue-proto contrib-libs-protobuf ) target_proto_messages(ydb-core-protos PRIVATE @@ -1617,7 +1595,6 @@ target_proto_messages(ydb-core-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/protos/http_config.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/import.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/index_builder.proto - ${CMAKE_SOURCE_DIR}/ydb/core/protos/issue_id.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/kesus.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/kqp_physical.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/kqp_stats.proto @@ -1645,7 +1622,6 @@ target_proto_messages(ydb-core-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/protos/scheme_type_metadata.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/scheme_type_operation.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/serverless_proxy_config.proto - ${CMAKE_SOURCE_DIR}/ydb/core/protos/services.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/shared_cache.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/sqs.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/follower_group.proto diff --git a/ydb/core/protos/CMakeLists.linux-aarch64.txt b/ydb/core/protos/CMakeLists.linux-aarch64.txt index 6e65dcb88c2..dd7c1ba8700 100644 --- a/ydb/core/protos/CMakeLists.linux-aarch64.txt +++ b/ydb/core/protos/CMakeLists.linux-aarch64.txt @@ -1502,30 +1502,6 @@ get_built_tool_path( cpp_styleguide ) get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) -get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) -get_built_tool_path( TOOL_enum_parser_bin TOOL_enum_parser_dependency tools/enum_parser/enum_parser @@ -1558,6 +1534,8 @@ target_link_libraries(ydb-core-protos PUBLIC yql-dq-proto public-issue-protos yql-public-types + ydb-library-services + library-ydb_issue-proto contrib-libs-protobuf ) target_proto_messages(ydb-core-protos PRIVATE @@ -1618,7 +1596,6 @@ target_proto_messages(ydb-core-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/protos/http_config.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/import.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/index_builder.proto - ${CMAKE_SOURCE_DIR}/ydb/core/protos/issue_id.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/kesus.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/kqp_physical.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/kqp_stats.proto @@ -1646,7 +1623,6 @@ target_proto_messages(ydb-core-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/protos/scheme_type_metadata.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/scheme_type_operation.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/serverless_proxy_config.proto - ${CMAKE_SOURCE_DIR}/ydb/core/protos/services.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/shared_cache.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/sqs.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/follower_group.proto diff --git a/ydb/core/protos/CMakeLists.linux-x86_64.txt b/ydb/core/protos/CMakeLists.linux-x86_64.txt index 6e65dcb88c2..dd7c1ba8700 100644 --- a/ydb/core/protos/CMakeLists.linux-x86_64.txt +++ b/ydb/core/protos/CMakeLists.linux-x86_64.txt @@ -1502,30 +1502,6 @@ get_built_tool_path( cpp_styleguide ) get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) -get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) -get_built_tool_path( TOOL_enum_parser_bin TOOL_enum_parser_dependency tools/enum_parser/enum_parser @@ -1558,6 +1534,8 @@ target_link_libraries(ydb-core-protos PUBLIC yql-dq-proto public-issue-protos yql-public-types + ydb-library-services + library-ydb_issue-proto contrib-libs-protobuf ) target_proto_messages(ydb-core-protos PRIVATE @@ -1618,7 +1596,6 @@ target_proto_messages(ydb-core-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/protos/http_config.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/import.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/index_builder.proto - ${CMAKE_SOURCE_DIR}/ydb/core/protos/issue_id.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/kesus.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/kqp_physical.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/kqp_stats.proto @@ -1646,7 +1623,6 @@ target_proto_messages(ydb-core-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/protos/scheme_type_metadata.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/scheme_type_operation.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/serverless_proxy_config.proto - ${CMAKE_SOURCE_DIR}/ydb/core/protos/services.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/shared_cache.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/sqs.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/follower_group.proto diff --git a/ydb/core/protos/CMakeLists.windows-x86_64.txt b/ydb/core/protos/CMakeLists.windows-x86_64.txt index 467f7222977..21afc82480c 100644 --- a/ydb/core/protos/CMakeLists.windows-x86_64.txt +++ b/ydb/core/protos/CMakeLists.windows-x86_64.txt @@ -1502,30 +1502,6 @@ get_built_tool_path( cpp_styleguide ) get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) -get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) -get_built_tool_path( TOOL_enum_parser_bin TOOL_enum_parser_dependency tools/enum_parser/enum_parser @@ -1557,6 +1533,8 @@ target_link_libraries(ydb-core-protos PUBLIC yql-dq-proto public-issue-protos yql-public-types + ydb-library-services + library-ydb_issue-proto contrib-libs-protobuf ) target_proto_messages(ydb-core-protos PRIVATE @@ -1617,7 +1595,6 @@ target_proto_messages(ydb-core-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/protos/http_config.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/import.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/index_builder.proto - ${CMAKE_SOURCE_DIR}/ydb/core/protos/issue_id.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/kesus.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/kqp_physical.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/kqp_stats.proto @@ -1645,7 +1622,6 @@ target_proto_messages(ydb-core-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/protos/scheme_type_metadata.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/scheme_type_operation.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/serverless_proxy_config.proto - ${CMAKE_SOURCE_DIR}/ydb/core/protos/services.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/shared_cache.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/sqs.proto ${CMAKE_SOURCE_DIR}/ydb/core/protos/follower_group.proto diff --git a/ydb/core/protos/msgbus.proto b/ydb/core/protos/msgbus.proto index 5fb2d8eb838..0eb42e61cd3 100644 --- a/ydb/core/protos/msgbus.proto +++ b/ydb/core/protos/msgbus.proto @@ -19,7 +19,6 @@ import "ydb/core/protos/blobstorage_config.proto"; import "ydb/core/protos/node_broker.proto"; import "ydb/core/protos/cms.proto"; import "ydb/core/protos/sqs.proto"; -import "ydb/core/protos/issue_id.proto"; import "ydb/core/protos/query_stats.proto"; import "ydb/core/protos/subdomains.proto"; import "ydb/core/protos/load_test.proto"; @@ -27,6 +26,7 @@ import "ydb/public/api/protos/ydb_operation.proto"; import "ydb/public/api/protos/draft/persqueue_error_codes.proto"; import "ydb/public/api/protos/ydb_issue_message.proto"; import "ydb/library/mkql_proto/protos/minikql.proto"; +import "ydb/library/ydb_issue/proto/issue_id.proto"; import "google/protobuf/descriptor.proto"; diff --git a/ydb/core/protos/pqconfig.proto b/ydb/core/protos/pqconfig.proto index 6680a924a3f..a8edbae082b 100644 --- a/ydb/core/protos/pqconfig.proto +++ b/ydb/core/protos/pqconfig.proto @@ -5,7 +5,7 @@ import "ydb/core/protos/base.proto"; import "ydb/core/protos/msgbus_kv.proto"; import "ydb/core/protos/node_limits.proto"; import "ydb/core/protos/netclassifier.proto"; -import "ydb/core/protos/services.proto"; +import "ydb/library/services/services.proto"; import "ydb/core/protos/type_info.proto"; import "library/cpp/actors/protos/actors.proto"; diff --git a/ydb/core/protos/tx_proxy.proto b/ydb/core/protos/tx_proxy.proto index a12e51e5fcc..5eac2fede50 100644 --- a/ydb/core/protos/tx_proxy.proto +++ b/ydb/core/protos/tx_proxy.proto @@ -1,8 +1,8 @@ import "ydb/core/protos/export.proto"; import "ydb/core/protos/flat_scheme_op.proto"; -import "ydb/core/protos/issue_id.proto"; import "ydb/core/protos/query_stats.proto"; import "ydb/library/mkql_proto/protos/minikql.proto"; +import "ydb/library/ydb_issue/proto/issue_id.proto"; import "ydb/public/api/protos/ydb_issue_message.proto"; diff --git a/ydb/core/protos/ya.make b/ydb/core/protos/ya.make index f4268c8c930..b2eddfbb88a 100644 --- a/ydb/core/protos/ya.make +++ b/ydb/core/protos/ya.make @@ -64,7 +64,6 @@ SRCS( http_config.proto import.proto index_builder.proto - issue_id.proto kesus.proto kqp_physical.proto kqp_stats.proto @@ -92,7 +91,6 @@ SRCS( scheme_type_metadata.proto scheme_type_operation.proto serverless_proxy_config.proto - services.proto shared_cache.proto sqs.proto follower_group.proto @@ -149,6 +147,8 @@ PEERDIR( ydb/library/yql/dq/proto ydb/library/yql/public/issue/protos ydb/library/yql/public/types + ydb/library/services + ydb/library/ydb_issue/proto ) EXCLUDE_TAGS(GO_PROTO) diff --git a/ydb/core/public_http/fq_handlers.h b/ydb/core/public_http/fq_handlers.h index c87bb935f60..737e1d025ea 100644 --- a/ydb/core/public_http/fq_handlers.h +++ b/ydb/core/public_http/fq_handlers.h @@ -7,7 +7,7 @@ #include <ydb/core/fq/libs/result_formatter/result_formatter.h> #include <ydb/core/grpc_services/grpc_request_proxy.h> #include <ydb/core/grpc_services/service_fq.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/public_http/protos/fq.pb.h> namespace NKikimr::NPublicHttp { diff --git a/ydb/core/raw_socket/sock_listener.cpp b/ydb/core/raw_socket/sock_listener.cpp index 9a443ce0210..2354c9f33d2 100644 --- a/ydb/core/raw_socket/sock_listener.cpp +++ b/ydb/core/raw_socket/sock_listener.cpp @@ -3,7 +3,7 @@ #include <library/cpp/actors/core/log.h> #include <library/cpp/actors/interconnect/poller_actor.h> #include <util/network/sock.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include "sock_listener.h" #include "sock_config.h" diff --git a/ydb/core/raw_socket/sock_listener.h b/ydb/core/raw_socket/sock_listener.h index 7f8d5b464b0..584f0568d12 100644 --- a/ydb/core/raw_socket/sock_listener.h +++ b/ydb/core/raw_socket/sock_listener.h @@ -1,7 +1,7 @@ #pragma once #include <library/cpp/actors/core/actor.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include "sock_impl.h" #include "sock_config.h" diff --git a/ydb/core/tablet/tablet_pipe_client.cpp b/ydb/core/tablet/tablet_pipe_client.cpp index 225abef7853..84d12678d2b 100644 --- a/ydb/core/tablet/tablet_pipe_client.cpp +++ b/ydb/core/tablet/tablet_pipe_client.cpp @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/hfunc.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/base/tablet_resolver.h> #include <ydb/core/base/hive.h> #include <ydb/core/base/appdata.h> diff --git a/ydb/core/tablet/tablet_req_rebuildhistory.cpp b/ydb/core/tablet/tablet_req_rebuildhistory.cpp index eef15c15be1..dde4209eca8 100644 --- a/ydb/core/tablet/tablet_req_rebuildhistory.cpp +++ b/ydb/core/tablet/tablet_req_rebuildhistory.cpp @@ -7,7 +7,7 @@ #include <util/string/builder.h> #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <google/protobuf/text_format.h> #include "tablet_tracing_signals.h" diff --git a/ydb/core/tablet/tablet_resolver.cpp b/ydb/core/tablet/tablet_resolver.cpp index a19a331f776..df631264894 100644 --- a/ydb/core/tablet/tablet_resolver.cpp +++ b/ydb/core/tablet/tablet_resolver.cpp @@ -1,5 +1,5 @@ #include <ydb/core/base/tablet_resolver.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/base/counters.h> #include <ydb/core/base/statestorage.h> #include <ydb/core/base/tabletid.h> diff --git a/ydb/core/tablet/tablet_sys.cpp b/ydb/core/tablet/tablet_sys.cpp index 1bb0e5c5e57..715143e4929 100644 --- a/ydb/core/tablet/tablet_sys.cpp +++ b/ydb/core/tablet/tablet_sys.cpp @@ -4,7 +4,7 @@ #include <ydb/core/base/compile_time_flags.h> #include <ydb/core/base/hive.h> #include <ydb/core/base/tablet_pipecache.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/log.h> diff --git a/ydb/core/tablet_flat/flat_executor.cpp b/ydb/core/tablet_flat/flat_executor.cpp index 786d2beab8d..449908f81e4 100644 --- a/ydb/core/tablet_flat/flat_executor.cpp +++ b/ydb/core/tablet_flat/flat_executor.cpp @@ -32,7 +32,7 @@ #include <ydb/core/control/immediate_control_board_impl.h> #include <ydb/core/scheme/scheme_type_registry.h> #include <ydb/core/tablet/tablet_counters_aggregator.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/monlib/service/pages/templates.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/tablet_flat/flat_executor_ut_common.h b/ydb/core/tablet_flat/flat_executor_ut_common.h index ca88e903d08..e95a8987e27 100644 --- a/ydb/core/tablet_flat/flat_executor_ut_common.h +++ b/ydb/core/tablet_flat/flat_executor_ut_common.h @@ -6,7 +6,7 @@ #include <ydb/core/tablet_flat/ut/flat_database_ut_common.h> #include <ydb/core/tablet_flat/flat_executor_compaction_logic.h> #include <ydb/core/tablet/tablet_impl.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/testing/unittest/registar.h> #include "tablet_flat_executed.h" #include "flat_executor.h" diff --git a/ydb/core/tablet_flat/flat_mem_warm.h b/ydb/core/tablet_flat/flat_mem_warm.h index 10ceb217d73..4b74fc77b23 100644 --- a/ydb/core/tablet_flat/flat_mem_warm.h +++ b/ydb/core/tablet_flat/flat_mem_warm.h @@ -13,7 +13,7 @@ #include <ydb/core/scheme/scheme_tablecell.h> #include <ydb/core/scheme/scheme_type_id.h> #include <ydb/core/util/btree_cow.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/containers/absl_flat_hash/flat_hash_map.h> #include <library/cpp/containers/absl_flat_hash/flat_hash_set.h> diff --git a/ydb/core/tablet_flat/flat_part_slice.cpp b/ydb/core/tablet_flat/flat_part_slice.cpp index 473d07e099a..adf0e76d46b 100644 --- a/ydb/core/tablet_flat/flat_part_slice.cpp +++ b/ydb/core/tablet_flat/flat_part_slice.cpp @@ -1,7 +1,7 @@ #include "flat_part_slice.h" #include "util_fmt_desc.h" -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/flat_table.cpp b/ydb/core/tablet_flat/flat_table.cpp index c88b6fd2071..62684025b99 100644 --- a/ydb/core/tablet_flat/flat_table.cpp +++ b/ydb/core/tablet_flat/flat_table.cpp @@ -11,7 +11,7 @@ #include "flat_util_misc.h" #include "util_fmt_abort.h" -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/test/libs/exec/runner.h b/ydb/core/tablet_flat/test/libs/exec/runner.h index 847e7f80429..5196950aa38 100644 --- a/ydb/core/tablet_flat/test/libs/exec/runner.h +++ b/ydb/core/tablet_flat/test/libs/exec/runner.h @@ -12,7 +12,7 @@ #include <ydb/core/base/tablet_resolver.h> #include <ydb/core/tablet/resource_broker.h> #include <ydb/core/tablet_flat/shared_sausagecache.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/time_provider/time_provider.h> #include <ydb/core/tablet_flat/test/libs/rows/tool.h> diff --git a/ydb/core/tablet_flat/test/libs/exec/warden.h b/ydb/core/tablet_flat/test/libs/exec/warden.h index c7d60ff059e..badadb2ff7c 100644 --- a/ydb/core/tablet_flat/test/libs/exec/warden.h +++ b/ydb/core/tablet_flat/test/libs/exec/warden.h @@ -4,7 +4,7 @@ #include "storage.h" #include <library/cpp/actors/core/actor.h> #include <ydb/core/base/blobstorage.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tablet_flat/util_fmt_logger.h> #include <util/system/type_name.h> diff --git a/ydb/core/testlib/test_client.cpp b/ydb/core/testlib/test_client.cpp index ff445695098..d4315db9215 100644 --- a/ydb/core/testlib/test_client.cpp +++ b/ydb/core/testlib/test_client.cpp @@ -49,7 +49,7 @@ #include <ydb/core/kqp/rm_service/kqp_rm_service.h> #include <ydb/core/kqp/proxy_service/kqp_proxy_service.h> #include <ydb/core/metering/metering.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tablet_flat/tablet_flat_executed.h> #include <ydb/core/tx/columnshard/columnshard.h> #include <ydb/core/tx/coordinator/coordinator.h> diff --git a/ydb/core/tx/columnshard/counters/common/object_counter.h b/ydb/core/tx/columnshard/counters/common/object_counter.h index f5f7758d76c..9d453c660d8 100644 --- a/ydb/core/tx/columnshard/counters/common/object_counter.h +++ b/ydb/core/tx/columnshard/counters/common/object_counter.h @@ -1,6 +1,6 @@ #pragma once #include "owner.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/log.h> namespace NKikimr::NColumnShard { diff --git a/ydb/core/tx/columnshard/defs.h b/ydb/core/tx/columnshard/defs.h index c9274a1f10b..64908749ab7 100644 --- a/ydb/core/tx/columnshard/defs.h +++ b/ydb/core/tx/columnshard/defs.h @@ -2,7 +2,7 @@ #include <ydb/core/base/defs.h> #include <ydb/core/base/events.h> #include <ydb/core/base/blobstorage.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <ydb/core/tx/ctor_logger.h> #include <ydb/core/control/immediate_control_board_impl.h> #include <ydb/core/tx/columnshard/engines/column_engine.h> diff --git a/ydb/core/tx/columnshard/engines/scalars.cpp b/ydb/core/tx/columnshard/engines/scalars.cpp index d886b930d3f..9cc69938087 100644 --- a/ydb/core/tx/columnshard/engines/scalars.cpp +++ b/ydb/core/tx/columnshard/engines/scalars.cpp @@ -1,7 +1,7 @@ #include "scalars.h" #include <ydb/core/formats/arrow/switch_type.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> namespace NKikimr::NOlap { diff --git a/ydb/core/tx/columnshard/resources/memory.h b/ydb/core/tx/columnshard/resources/memory.h index 9e60ea9b2f4..bac2711fba5 100644 --- a/ydb/core/tx/columnshard/resources/memory.h +++ b/ydb/core/tx/columnshard/resources/memory.h @@ -1,7 +1,7 @@ #pragma once #include <ydb/core/tx/columnshard/counters/common/object_counter.h> #include <ydb/core/tx/columnshard/counters/common/owner.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/log.h> #include <util/system/mutex.h> diff --git a/ydb/core/tx/columnshard/ut_rw/ut_columnshard_read_write.cpp b/ydb/core/tx/columnshard/ut_rw/ut_columnshard_read_write.cpp index 8a5d17a5695..7f71a927525 100644 --- a/ydb/core/tx/columnshard/ut_rw/ut_columnshard_read_write.cpp +++ b/ydb/core/tx/columnshard/ut_rw/ut_columnshard_read_write.cpp @@ -4,7 +4,7 @@ #include <util/string/printf.h> #include <arrow/api.h> #include <arrow/ipc/reader.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> namespace NKikimr { diff --git a/ydb/core/tx/conveyor/service/worker.h b/ydb/core/tx/conveyor/service/worker.h index 53eda8cb4cf..741a4556c05 100644 --- a/ydb/core/tx/conveyor/service/worker.h +++ b/ydb/core/tx/conveyor/service/worker.h @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <ydb/library/accessor/accessor.h> #include <ydb/core/tx/conveyor/usage/abstract.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/conclusion/result.h> #include <library/cpp/actors/core/log.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/tx/coordinator/coordinator_impl.cpp b/ydb/core/tx/coordinator/coordinator_impl.cpp index d63e941306f..8af35f31237 100644 --- a/ydb/core/tx/coordinator/coordinator_impl.cpp +++ b/ydb/core/tx/coordinator/coordinator_impl.cpp @@ -5,7 +5,7 @@ #include <library/cpp/actors/core/log.h> #include <ydb/core/base/appdata.h> #include <ydb/core/base/counters.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/tx.h> #include <library/cpp/actors/interconnect/interconnect.h> diff --git a/ydb/core/tx/ctor_logger.h b/ydb/core/tx/ctor_logger.h index 1126b4d3213..e0678ecf37d 100644 --- a/ydb/core/tx/ctor_logger.h +++ b/ydb/core/tx/ctor_logger.h @@ -1,7 +1,7 @@ #pragma once #include <library/cpp/actors/core/log.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> // You have to define TLogThis in local namespace to use these macros #define LOG_S_EMERG(stream) { TLogThis(*TlsActivationContext, NActors::NLog::PRI_EMERG, [&](TStringBuilder& ss){ ss << stream; }); } diff --git a/ydb/core/tx/datashard/backup_restore_traits.cpp b/ydb/core/tx/datashard/backup_restore_traits.cpp index 40e29adfc71..a3534ba8a68 100644 --- a/ydb/core/tx/datashard/backup_restore_traits.cpp +++ b/ydb/core/tx/datashard/backup_restore_traits.cpp @@ -1,7 +1,7 @@ #include "backup_restore_traits.h" #include <ydb/core/protos/flat_scheme_op.pb.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <util/generic/hash.h> #include <util/string/cast.h> diff --git a/ydb/core/tx/datashard/change_collector_base.cpp b/ydb/core/tx/datashard/change_collector_base.cpp index e96369533f9..7e94b21c431 100644 --- a/ydb/core/tx/datashard/change_collector_base.cpp +++ b/ydb/core/tx/datashard/change_collector_base.cpp @@ -3,7 +3,7 @@ #include "datashard_user_db.h" #include <ydb/core/tablet_flat/flat_cxx_database.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> namespace NKikimr { namespace NDataShard { diff --git a/ydb/core/tx/datashard/change_record.cpp b/ydb/core/tx/datashard/change_record.cpp index 3aa7306c7dc..37f969d238c 100644 --- a/ydb/core/tx/datashard/change_record.cpp +++ b/ydb/core/tx/datashard/change_record.cpp @@ -8,7 +8,7 @@ #include <library/cpp/string_utils/base64/base64.h> #include <ydb/core/protos/change_exchange.pb.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <ydb/library/binary_json/read.h> #include <util/stream/str.h> diff --git a/ydb/core/tx/datashard/change_record_body_serializer.cpp b/ydb/core/tx/datashard/change_record_body_serializer.cpp index b1227992b0d..ccd196d5036 100644 --- a/ydb/core/tx/datashard/change_record_body_serializer.cpp +++ b/ydb/core/tx/datashard/change_record_body_serializer.cpp @@ -1,6 +1,6 @@ #include "change_record_body_serializer.h" -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> namespace NKikimr::NDataShard { diff --git a/ydb/core/tx/datashard/change_sender.cpp b/ydb/core/tx/datashard/change_sender.cpp index fee83a3dc28..eddd17f47bf 100644 --- a/ydb/core/tx/datashard/change_sender.cpp +++ b/ydb/core/tx/datashard/change_sender.cpp @@ -3,7 +3,7 @@ #include "change_sender_monitoring.h" #include "datashard_impl.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/tx/datashard/change_sender_async_index.cpp b/ydb/core/tx/datashard/change_sender_async_index.cpp index 50649c21882..534de7cbea2 100644 --- a/ydb/core/tx/datashard/change_sender_async_index.cpp +++ b/ydb/core/tx/datashard/change_sender_async_index.cpp @@ -4,7 +4,7 @@ #include "change_sender_monitoring.h" #include <ydb/core/base/tablet_pipecache.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tablet_flat/flat_row_eggs.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include <ydb/library/yql/public/udf/udf_data_type.h> diff --git a/ydb/core/tx/datashard/datashard_distributed_erase.cpp b/ydb/core/tx/datashard/datashard_distributed_erase.cpp index ad3fe66c1df..2f7b1c2bb4e 100644 --- a/ydb/core/tx/datashard/datashard_distributed_erase.cpp +++ b/ydb/core/tx/datashard/datashard_distributed_erase.cpp @@ -3,7 +3,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/base/tablet_pipecache.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/scheme_cache/scheme_cache.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include <ydb/core/tx/tx.h> diff --git a/ydb/core/tx/datashard/datashard_impl.h b/ydb/core/tx/datashard/datashard_impl.h index 2fdf4b38e43..b96f6ba8b10 100644 --- a/ydb/core/tx/datashard/datashard_impl.h +++ b/ydb/core/tx/datashard/datashard_impl.h @@ -29,7 +29,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/engine/mkql_engine_flat_host.h> #include <ydb/core/tablet/pipe_tracker.h> #include <ydb/core/tablet/tablet_exception.h> diff --git a/ydb/core/tx/datashard/datashard_kqp_read_table.cpp b/ydb/core/tx/datashard/datashard_kqp_read_table.cpp index fb687b8c5b6..1b66f536cdc 100644 --- a/ydb/core/tx/datashard/datashard_kqp_read_table.cpp +++ b/ydb/core/tx/datashard/datashard_kqp_read_table.cpp @@ -4,7 +4,7 @@ #include <ydb/core/kqp/runtime/kqp_read_table.h> #include <ydb/core/scheme/scheme_tabledefs.h> #include <ydb/core/tablet_flat/flat_database.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h> diff --git a/ydb/core/tx/datashard/defs.h b/ydb/core/tx/datashard/defs.h index 5d005e7918b..6ff129bb7da 100644 --- a/ydb/core/tx/datashard/defs.h +++ b/ydb/core/tx/datashard/defs.h @@ -2,7 +2,7 @@ // unique tag to fix pragma once gcc glueing: ./ydb/core/tx/defs.h #include <ydb/core/base/defs.h> #include <ydb/core/base/events.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> namespace NKikimr { diff --git a/ydb/core/tx/datashard/export_s3_base_uploader.h b/ydb/core/tx/datashard/export_s3_base_uploader.h index 66461a39253..3e551321dca 100644 --- a/ydb/core/tx/datashard/export_s3_base_uploader.h +++ b/ydb/core/tx/datashard/export_s3_base_uploader.h @@ -8,7 +8,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/protos/flat_scheme_op.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/wrappers/s3_storage_config.h> #include <ydb/core/wrappers/s3_wrapper.h> #include <ydb/core/wrappers/events/common.h> diff --git a/ydb/core/tx/datashard/import_s3.cpp b/ydb/core/tx/datashard/import_s3.cpp index 99f209d5912..1b996ddabc6 100644 --- a/ydb/core/tx/datashard/import_s3.cpp +++ b/ydb/core/tx/datashard/import_s3.cpp @@ -8,7 +8,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/protos/flat_scheme_op.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/scheme/scheme_types_proto.h> #include <ydb/core/tablet/resource_broker.h> #include <ydb/core/wrappers/s3_wrapper.h> diff --git a/ydb/core/tx/mediator/tablet_queue.cpp b/ydb/core/tx/mediator/tablet_queue.cpp index fa05f7acd22..7463a24e627 100644 --- a/ydb/core/tx/mediator/tablet_queue.cpp +++ b/ydb/core/tx/mediator/tablet_queue.cpp @@ -6,7 +6,7 @@ #include <ydb/core/base/counters.h> #include <ydb/core/base/statestorage.h> #include <ydb/core/base/appdata.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/coordinator/coordinator.h> #include <ydb/core/tx/tx_processing.h> #include <ydb/core/tx/time_cast/time_cast.h> diff --git a/ydb/core/tx/replication/controller/controller_impl.h b/ydb/core/tx/replication/controller/controller_impl.h index 784b06d17ed..9e1d15d78b6 100644 --- a/ydb/core/tx/replication/controller/controller_impl.h +++ b/ydb/core/tx/replication/controller/controller_impl.h @@ -12,7 +12,7 @@ #include <ydb/core/base/defs.h> #include <ydb/core/protos/counters_replication.pb.h> #include <ydb/core/tablet_flat/tablet_flat_executed.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <util/generic/hash.h> diff --git a/ydb/core/tx/replication/controller/replication.cpp b/ydb/core/tx/replication/controller/replication.cpp index d1847dd1d10..2080a0afd7a 100644 --- a/ydb/core/tx/replication/controller/replication.cpp +++ b/ydb/core/tx/replication/controller/replication.cpp @@ -7,7 +7,7 @@ #include <ydb/core/protos/replication.pb.h> #include <ydb/core/tx/replication/ydb_proxy/ydb_proxy.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/actors/core/events.h> diff --git a/ydb/core/tx/replication/controller/util.h b/ydb/core/tx/replication/controller/util.h index 4f62d9606e0..e9b6d706126 100644 --- a/ydb/core/tx/replication/controller/util.h +++ b/ydb/core/tx/replication/controller/util.h @@ -5,7 +5,7 @@ #include <ydb/public/sdk/cpp/client/ydb_scheme/scheme.h> #include <ydb/public/sdk/cpp/client/ydb_types/status/status.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <util/generic/algorithm.h> #include <util/generic/maybe.h> diff --git a/ydb/core/tx/scheme_board/cache.cpp b/ydb/core/tx/scheme_board/cache.cpp index 9bd7d3b9b4a..a049d65a45d 100644 --- a/ydb/core/tx/scheme_board/cache.cpp +++ b/ydb/core/tx/scheme_board/cache.cpp @@ -12,12 +12,12 @@ #include <ydb/core/base/path.h> #include <ydb/core/base/tabletid.h> #include <ydb/core/protos/flat_tx_scheme.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/scheme/scheme_tabledefs.h> #include <ydb/core/scheme/scheme_types_proto.h> #include <ydb/core/sys_view/common/schema.h> #include <ydb/core/tx/schemeshard/schemeshard_types.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/tx/scheme_board/mon_events.h b/ydb/core/tx/scheme_board/mon_events.h index 1e449dc2687..7e02c2d58fe 100644 --- a/ydb/core/tx/scheme_board/mon_events.h +++ b/ydb/core/tx/scheme_board/mon_events.h @@ -4,7 +4,7 @@ #include <ydb/core/base/pathid.h> #include <ydb/core/protos/scheme_board_mon.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/json/json_value.h> diff --git a/ydb/core/tx/scheme_board/monitoring.cpp b/ydb/core/tx/scheme_board/monitoring.cpp index 7173826b9ef..923cf75f90f 100644 --- a/ydb/core/tx/scheme_board/monitoring.cpp +++ b/ydb/core/tx/scheme_board/monitoring.cpp @@ -5,7 +5,7 @@ #include <ydb/core/base/pathid.h> #include <ydb/core/base/statestorage_impl.h> #include <ydb/core/mon/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/tx/scheme_board/populator.cpp b/ydb/core/tx/scheme_board/populator.cpp index a002989612a..44521cf6ec1 100644 --- a/ydb/core/tx/scheme_board/populator.cpp +++ b/ydb/core/tx/scheme_board/populator.cpp @@ -7,9 +7,9 @@ #include <ydb/core/base/statestorage_impl.h> #include <ydb/core/base/tabletid.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/tx/scheme_board/populator_ut.cpp b/ydb/core/tx/scheme_board/populator_ut.cpp index c0eb1cb62fa..50394d74c79 100644 --- a/ydb/core/tx/scheme_board/populator_ut.cpp +++ b/ydb/core/tx/scheme_board/populator_ut.cpp @@ -3,7 +3,7 @@ #include <ydb/core/base/pathid.h> #include <ydb/core/base/tablet_types.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h> #include <library/cpp/actors/core/log.h> diff --git a/ydb/core/tx/scheme_board/replica.cpp b/ydb/core/tx/scheme_board/replica.cpp index e104ead92ff..1f081c713be 100644 --- a/ydb/core/tx/scheme_board/replica.cpp +++ b/ydb/core/tx/scheme_board/replica.cpp @@ -7,8 +7,8 @@ #include <contrib/libs/protobuf/src/google/protobuf/util/json_util.h> #include <ydb/core/protos/flat_tx_scheme.pb.h> -#include <ydb/core/protos/services.pb.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/services/services.pb.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/actors/core/hfunc.h> #include <library/cpp/actors/core/interconnect.h> diff --git a/ydb/core/tx/scheme_board/replica_ut.cpp b/ydb/core/tx/scheme_board/replica_ut.cpp index b74672959bb..90799649a53 100644 --- a/ydb/core/tx/scheme_board/replica_ut.cpp +++ b/ydb/core/tx/scheme_board/replica_ut.cpp @@ -3,7 +3,7 @@ #include "ut_helpers.h" #include <ydb/core/base/pathid.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/testlib/basics/appdata.h> #include <library/cpp/actors/core/log.h> diff --git a/ydb/core/tx/scheme_board/subscriber.cpp b/ydb/core/tx/scheme_board/subscriber.cpp index 840a842796b..b96bb08776a 100644 --- a/ydb/core/tx/scheme_board/subscriber.cpp +++ b/ydb/core/tx/scheme_board/subscriber.cpp @@ -6,8 +6,8 @@ #include <ydb/core/base/statestorage_impl.h> #include <ydb/core/base/tabletid.h> #include <ydb/core/protos/scheme_board.pb.h> -#include <ydb/core/protos/services.pb.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/services/services.pb.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/tx/scheme_board/subscriber_ut.cpp b/ydb/core/tx/scheme_board/subscriber_ut.cpp index 7e1d580305f..9db9833d22c 100644 --- a/ydb/core/tx/scheme_board/subscriber_ut.cpp +++ b/ydb/core/tx/scheme_board/subscriber_ut.cpp @@ -4,7 +4,7 @@ #include <ydb/core/base/pathid.h> #include <ydb/core/base/statestorage_impl.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/testlib/basics/appdata.h> #include <ydb/core/testlib/basics/helpers.h> diff --git a/ydb/core/tx/sequenceproxy/sequenceproxy_allocate.cpp b/ydb/core/tx/sequenceproxy/sequenceproxy_allocate.cpp index af22fd85317..4f3a8f645ac 100644 --- a/ydb/core/tx/sequenceproxy/sequenceproxy_allocate.cpp +++ b/ydb/core/tx/sequenceproxy/sequenceproxy_allocate.cpp @@ -1,6 +1,6 @@ #include "sequenceproxy_impl.h" -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/base/tablet_pipecache.h> #include <ydb/core/tx/sequenceshard/public/events.h> #include <ydb/library/yql/public/issue/yql_issue_manager.h> diff --git a/ydb/core/tx/sequenceproxy/sequenceproxy_impl.cpp b/ydb/core/tx/sequenceproxy/sequenceproxy_impl.cpp index e155f3925b5..f421ecf8dd7 100644 --- a/ydb/core/tx/sequenceproxy/sequenceproxy_impl.cpp +++ b/ydb/core/tx/sequenceproxy/sequenceproxy_impl.cpp @@ -1,6 +1,6 @@ #include "sequenceproxy_impl.h" -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/library/yql/public/issue/yql_issue_manager.h> #include <library/cpp/actors/core/log.h> diff --git a/ydb/core/tx/sequenceproxy/sequenceproxy_resolve.cpp b/ydb/core/tx/sequenceproxy/sequenceproxy_resolve.cpp index 08d52bea1cf..3f18cc08061 100644 --- a/ydb/core/tx/sequenceproxy/sequenceproxy_resolve.cpp +++ b/ydb/core/tx/sequenceproxy/sequenceproxy_resolve.cpp @@ -1,7 +1,7 @@ #include "sequenceproxy_impl.h" #include <ydb/core/base/path.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/tx/scheme_cache/scheme_cache.h> #include <ydb/library/yql/public/issue/yql_issue_manager.h> diff --git a/ydb/core/tx/tiering/rule/ss_checker.cpp b/ydb/core/tx/tiering/rule/ss_checker.cpp index 523ce607f22..7626a13a309 100644 --- a/ydb/core/tx/tiering/rule/ss_checker.cpp +++ b/ydb/core/tx/tiering/rule/ss_checker.cpp @@ -1,7 +1,7 @@ #include "ss_checker.h" #include <ydb/core/tx/scheme_cache/scheme_cache.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> namespace NKikimr::NColumnShard::NTiers { diff --git a/ydb/core/tx/time_cast/time_cast.cpp b/ydb/core/tx/time_cast/time_cast.cpp index 7dc3a464204..f6e33985462 100644 --- a/ydb/core/tx/time_cast/time_cast.cpp +++ b/ydb/core/tx/time_cast/time_cast.cpp @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/log.h> #include <ydb/core/base/tx_processing.h> #include <ydb/core/protos/subdomains.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/tx.h> #include <ydb/core/tablet/tablet_pipe_client_cache.h> diff --git a/ydb/core/tx/tx_allocator/txallocator_impl.h b/ydb/core/tx/tx_allocator/txallocator_impl.h index 69cfc052e4d..b04a495824b 100644 --- a/ydb/core/tx/tx_allocator/txallocator_impl.h +++ b/ydb/core/tx/tx_allocator/txallocator_impl.h @@ -5,7 +5,7 @@ #include <ydb/core/base/tablet_pipe.h> #include <ydb/core/base/appdata.h> #include <ydb/core/protos/counters_tx_allocator.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> namespace NKikimr { diff --git a/ydb/core/tx/tx_allocator_client/client.h b/ydb/core/tx/tx_allocator_client/client.h index f957d8ba46f..89eeeab0de5 100644 --- a/ydb/core/tx/tx_allocator_client/client.h +++ b/ydb/core/tx/tx_allocator_client/client.h @@ -2,7 +2,7 @@ #include "defs.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tablet/tablet_pipe_client_cache.h> #include <ydb/core/tx/tx_allocator/txallocator.h> diff --git a/ydb/core/tx/tx_proxy/datareq.cpp b/ydb/core/tx/tx_proxy/datareq.cpp index 0f8fd2b2081..81de0aba605 100644 --- a/ydb/core/tx/tx_proxy/datareq.cpp +++ b/ydb/core/tx/tx_proxy/datareq.cpp @@ -13,7 +13,7 @@ #include <ydb/core/base/tablet_pipecache.h> #include <ydb/core/base/tx_processing.h> #include <ydb/core/base/path.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/base/tx_processing.h> #include <ydb/library/mkql_proto/protos/minikql.pb.h> #include <ydb/core/engine/mkql_engine_flat.h> diff --git a/ydb/core/tx/tx_proxy/proxy.h b/ydb/core/tx/tx_proxy/proxy.h index 86d4f1ac79e..9364b5df421 100644 --- a/ydb/core/tx/tx_proxy/proxy.h +++ b/ydb/core/tx/tx_proxy/proxy.h @@ -4,7 +4,7 @@ #include <ydb/public/lib/base/defs.h> #include <ydb/public/api/protos/ydb_status_codes.pb.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/tx/tx.h> #include <ydb/core/tx/datashard/sys_tables.h> #include <ydb/core/tx/scheme_cache/scheme_cache.h> diff --git a/ydb/core/tx/tx_proxy/schemereq.cpp b/ydb/core/tx/tx_proxy/schemereq.cpp index 47779a8382b..175e29ebdbb 100644 --- a/ydb/core/tx/tx_proxy/schemereq.cpp +++ b/ydb/core/tx/tx_proxy/schemereq.cpp @@ -6,7 +6,7 @@ #include <ydb/core/base/tablet_pipe.h> #include <ydb/core/base/appdata.h> #include <ydb/core/base/tx_processing.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/base/path.h> #include <ydb/library/aclib/aclib.h> diff --git a/ydb/core/tx/tx_proxy/upload_rows_common_impl.h b/ydb/core/tx/tx_proxy/upload_rows_common_impl.h index 2cd59aa10d7..55eccdba199 100644 --- a/ydb/core/tx/tx_proxy/upload_rows_common_impl.h +++ b/ydb/core/tx/tx_proxy/upload_rows_common_impl.h @@ -9,7 +9,7 @@ #include <ydb/core/formats/arrow/converter.h> #include <ydb/core/io_formats/csv.h> #include <ydb/core/base/tablet_pipecache.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/base/path.h> #include <ydb/core/scheme/scheme_tablecell.h> #include <ydb/core/scheme/scheme_type_info.h> diff --git a/ydb/core/util/CMakeLists.darwin-x86_64.txt b/ydb/core/util/CMakeLists.darwin-x86_64.txt index 231a6222ba4..d3a86230442 100644 --- a/ydb/core/util/CMakeLists.darwin-x86_64.txt +++ b/ydb/core/util/CMakeLists.darwin-x86_64.txt @@ -26,6 +26,7 @@ target_link_libraries(ydb-core-util PUBLIC ydb-core-base ydb-core-protos cpp-deprecated-atomic + ydb-library-yverify_stream ) target_sources(ydb-core-util PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/util/address_classifier.cpp diff --git a/ydb/core/util/CMakeLists.linux-aarch64.txt b/ydb/core/util/CMakeLists.linux-aarch64.txt index 8cf634be3a6..5ce8b72be13 100644 --- a/ydb/core/util/CMakeLists.linux-aarch64.txt +++ b/ydb/core/util/CMakeLists.linux-aarch64.txt @@ -27,6 +27,7 @@ target_link_libraries(ydb-core-util PUBLIC ydb-core-base ydb-core-protos cpp-deprecated-atomic + ydb-library-yverify_stream ) target_sources(ydb-core-util PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/util/address_classifier.cpp diff --git a/ydb/core/util/CMakeLists.linux-x86_64.txt b/ydb/core/util/CMakeLists.linux-x86_64.txt index 8cf634be3a6..5ce8b72be13 100644 --- a/ydb/core/util/CMakeLists.linux-x86_64.txt +++ b/ydb/core/util/CMakeLists.linux-x86_64.txt @@ -27,6 +27,7 @@ target_link_libraries(ydb-core-util PUBLIC ydb-core-base ydb-core-protos cpp-deprecated-atomic + ydb-library-yverify_stream ) target_sources(ydb-core-util PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/util/address_classifier.cpp diff --git a/ydb/core/util/CMakeLists.windows-x86_64.txt b/ydb/core/util/CMakeLists.windows-x86_64.txt index 231a6222ba4..d3a86230442 100644 --- a/ydb/core/util/CMakeLists.windows-x86_64.txt +++ b/ydb/core/util/CMakeLists.windows-x86_64.txt @@ -26,6 +26,7 @@ target_link_libraries(ydb-core-util PUBLIC ydb-core-base ydb-core-protos cpp-deprecated-atomic + ydb-library-yverify_stream ) target_sources(ydb-core-util PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/util/address_classifier.cpp diff --git a/ydb/core/util/failure_injection.cpp b/ydb/core/util/failure_injection.cpp index 4dcc7e598b1..91ce2d7b9ea 100644 --- a/ydb/core/util/failure_injection.cpp +++ b/ydb/core/util/failure_injection.cpp @@ -2,7 +2,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/protos/config.pb.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/monlib/service/pages/templates.h> #include <library/cpp/lwtrace/all.h> diff --git a/ydb/core/util/interval_set.h b/ydb/core/util/interval_set.h index 68f6ea66589..11fdf254c64 100644 --- a/ydb/core/util/interval_set.h +++ b/ydb/core/util/interval_set.h @@ -6,7 +6,7 @@ #include <util/generic/map.h> #include <util/stream/str.h> #include <util/system/yassert.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/containers/stack_vector/stack_vec.h> namespace NKikimr { diff --git a/ydb/core/util/stlog.h b/ydb/core/util/stlog.h index 284c52a89b7..37fce9c0d80 100644 --- a/ydb/core/util/stlog.h +++ b/ydb/core/util/stlog.h @@ -1,6 +1,6 @@ #pragma once -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/log.h> #include <library/cpp/json/json_writer.h> #include <google/protobuf/text_format.h> diff --git a/ydb/core/util/ya.make b/ydb/core/util/ya.make index 9cc9ec248e9..d16ffb40ab5 100644 --- a/ydb/core/util/ya.make +++ b/ydb/core/util/ya.make @@ -55,7 +55,6 @@ SRCS( ulid.cpp ulid.h wildcard.h - yverify_stream.h ) PEERDIR( @@ -72,6 +71,7 @@ PEERDIR( ydb/core/base ydb/core/protos library/cpp/deprecated/atomic + ydb/library/yverify_stream ) END() diff --git a/ydb/core/viewer/browse.h b/ydb/core/viewer/browse.h index 417419f57c1..5d77e64326c 100644 --- a/ydb/core/viewer/browse.h +++ b/ydb/core/viewer/browse.h @@ -5,7 +5,7 @@ #include <ydb/core/base/hive.h> #include <ydb/core/base/tablet.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include <ydb/core/viewer/protos/viewer.pb.h> diff --git a/ydb/core/viewer/browse_db.h b/ydb/core/viewer/browse_db.h index fe7b5d31408..39098ca62e6 100644 --- a/ydb/core/viewer/browse_db.h +++ b/ydb/core/viewer/browse_db.h @@ -3,7 +3,7 @@ #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include <ydb/core/viewer/protos/viewer.pb.h> diff --git a/ydb/core/viewer/browse_pq.h b/ydb/core/viewer/browse_pq.h index 3e3b32a21e3..32dc7983e04 100644 --- a/ydb/core/viewer/browse_pq.h +++ b/ydb/core/viewer/browse_pq.h @@ -4,7 +4,7 @@ #include <ydb/core/base/tablet.h> #include <ydb/core/base/tablet_pipe.h> #include <ydb/core/persqueue/events/global.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include <ydb/core/viewer/protos/viewer.pb.h> diff --git a/ydb/core/viewer/counters_hosts.h b/ydb/core/viewer/counters_hosts.h index 6a7bdcfb3de..916352094a1 100644 --- a/ydb/core/viewer/counters_hosts.h +++ b/ydb/core/viewer/counters_hosts.h @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/mon.h> #include <library/cpp/actors/interconnect/interconnect.h> #include <library/cpp/json/json_writer.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include "viewer.h" diff --git a/ydb/core/viewer/json_acl.h b/ydb/core/viewer/json_acl.h index fd79ea2e23a..2f65445618f 100644 --- a/ydb/core/viewer/json_acl.h +++ b/ydb/core/viewer/json_acl.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include "viewer.h" diff --git a/ydb/core/viewer/json_blobindexstat.h b/ydb/core/viewer/json_blobindexstat.h index ae916700b87..83d212189b6 100644 --- a/ydb/core/viewer/json_blobindexstat.h +++ b/ydb/core/viewer/json_blobindexstat.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include <ydb/core/util/tuples.h> #include "json_vdisk_req.h" diff --git a/ydb/core/viewer/json_browse.h b/ydb/core/viewer/json_browse.h index 64d423e8537..2540630fbcf 100644 --- a/ydb/core/viewer/json_browse.h +++ b/ydb/core/viewer/json_browse.h @@ -3,7 +3,7 @@ #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include <ydb/core/viewer/protos/viewer.pb.h> diff --git a/ydb/core/viewer/json_bscontrollerinfo.h b/ydb/core/viewer/json_bscontrollerinfo.h index 17ce4e6feac..1e67c99e47f 100644 --- a/ydb/core/viewer/json_bscontrollerinfo.h +++ b/ydb/core/viewer/json_bscontrollerinfo.h @@ -3,7 +3,7 @@ #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include "viewer.h" #include "json_pipe_req.h" #include <ydb/core/viewer/json/json.h> diff --git a/ydb/core/viewer/json_bsgroupinfo.h b/ydb/core/viewer/json_bsgroupinfo.h index 7c8fef22169..50d7e4b3289 100644 --- a/ydb/core/viewer/json_bsgroupinfo.h +++ b/ydb/core/viewer/json_bsgroupinfo.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include "wb_merge.h" #include "json_wb_req.h" diff --git a/ydb/core/viewer/json_compute.h b/ydb/core/viewer/json_compute.h index 50bb45df70c..6d8a8aecb08 100644 --- a/ydb/core/viewer/json_compute.h +++ b/ydb/core/viewer/json_compute.h @@ -5,7 +5,7 @@ #include <ydb/core/base/tablet.h> #include <ydb/core/base/tablet_pipe.h> #include <ydb/core/base/subdomain.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/cms/console/console.h> #include <ydb/core/base/hive.h> #include <ydb/core/tx/schemeshard/schemeshard.h> diff --git a/ydb/core/viewer/json_config.h b/ydb/core/viewer/json_config.h index d9c3348a590..ec7157f4a89 100644 --- a/ydb/core/viewer/json_config.h +++ b/ydb/core/viewer/json_config.h @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/hive.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include "viewer.h" namespace NKikimr { diff --git a/ydb/core/viewer/json_describe.h b/ydb/core/viewer/json_describe.h index 2521edab600..28a0bde833b 100644 --- a/ydb/core/viewer/json_describe.h +++ b/ydb/core/viewer/json_describe.h @@ -3,7 +3,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include "viewer.h" diff --git a/ydb/core/viewer/json_getblob.h b/ydb/core/viewer/json_getblob.h index 9f7951c89ad..e46a42872d0 100644 --- a/ydb/core/viewer/json_getblob.h +++ b/ydb/core/viewer/json_getblob.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include <ydb/core/util/tuples.h> #include "json_vdisk_req.h" diff --git a/ydb/core/viewer/json_healthcheck.h b/ydb/core/viewer/json_healthcheck.h index e241fce91b9..ea3b9f54864 100644 --- a/ydb/core/viewer/json_healthcheck.h +++ b/ydb/core/viewer/json_healthcheck.h @@ -3,7 +3,7 @@ #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include "viewer.h" #include <ydb/core/viewer/json/json.h> #include <ydb/core/health_check/health_check.h> diff --git a/ydb/core/viewer/json_hiveinfo.h b/ydb/core/viewer/json_hiveinfo.h index 0747d047faf..07025d106b7 100644 --- a/ydb/core/viewer/json_hiveinfo.h +++ b/ydb/core/viewer/json_hiveinfo.h @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/hive.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include "viewer.h" #include "json_pipe_req.h" #include <ydb/core/viewer/json/json.h> diff --git a/ydb/core/viewer/json_hivestats.h b/ydb/core/viewer/json_hivestats.h index b5dcd126e89..482a3c74b6c 100644 --- a/ydb/core/viewer/json_hivestats.h +++ b/ydb/core/viewer/json_hivestats.h @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/hive.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include "viewer.h" #include "json_pipe_req.h" #include <ydb/core/viewer/json/json.h> diff --git a/ydb/core/viewer/json_hotkeys.h b/ydb/core/viewer/json_hotkeys.h index b9c0839c6f9..971ef7464df 100644 --- a/ydb/core/viewer/json_hotkeys.h +++ b/ydb/core/viewer/json_hotkeys.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/datashard/datashard.h> #include <ydb/core/tx/tx_proxy/proxy.h> diff --git a/ydb/core/viewer/json_labeledcounters.h b/ydb/core/viewer/json_labeledcounters.h index 065ea88da5e..76a27cdcdcf 100644 --- a/ydb/core/viewer/json_labeledcounters.h +++ b/ydb/core/viewer/json_labeledcounters.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tablet/tablet_counters_aggregator.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include <ydb/core/util/wildcard.h> diff --git a/ydb/core/viewer/json_local_rpc.h b/ydb/core/viewer/json_local_rpc.h index 5ccee817a3a..c6db260d655 100644 --- a/ydb/core/viewer/json_local_rpc.h +++ b/ydb/core/viewer/json_local_rpc.h @@ -3,7 +3,7 @@ #include <library/cpp/actors/core/mon.h> #include <library/cpp/protobuf/json/json2proto.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include "viewer.h" diff --git a/ydb/core/viewer/json_metainfo.h b/ydb/core/viewer/json_metainfo.h index afaf711390b..35cb0371365 100644 --- a/ydb/core/viewer/json_metainfo.h +++ b/ydb/core/viewer/json_metainfo.h @@ -8,7 +8,7 @@ #include <ydb/core/base/hive.h> #include <ydb/core/base/tablet.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tablet/tablet_counters_aggregator.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> diff --git a/ydb/core/viewer/json_netinfo.h b/ydb/core/viewer/json_netinfo.h index 6acc16e415a..3b72793f69d 100644 --- a/ydb/core/viewer/json_netinfo.h +++ b/ydb/core/viewer/json_netinfo.h @@ -5,7 +5,7 @@ #include <ydb/core/base/tablet.h> #include <ydb/core/base/tablet_pipe.h> #include <ydb/core/base/subdomain.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/cms/console/console.h> #include <ydb/core/base/hive.h> #include <ydb/core/tx/schemeshard/schemeshard.h> diff --git a/ydb/core/viewer/json_nodeinfo.h b/ydb/core/viewer/json_nodeinfo.h index d32cf3179b3..37575dce00e 100644 --- a/ydb/core/viewer/json_nodeinfo.h +++ b/ydb/core/viewer/json_nodeinfo.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include "wb_merge.h" #include "json_wb_req.h" diff --git a/ydb/core/viewer/json_nodelist.h b/ydb/core/viewer/json_nodelist.h index 75122941515..40b71a72381 100644 --- a/ydb/core/viewer/json_nodelist.h +++ b/ydb/core/viewer/json_nodelist.h @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/mon.h> #include <library/cpp/actors/interconnect/interconnect.h> #include <library/cpp/json/json_writer.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include "viewer.h" namespace NKikimr { diff --git a/ydb/core/viewer/json_pdiskinfo.h b/ydb/core/viewer/json_pdiskinfo.h index 1682f204ec9..03db2ed3852 100644 --- a/ydb/core/viewer/json_pdiskinfo.h +++ b/ydb/core/viewer/json_pdiskinfo.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include "json_wb_req.h" diff --git a/ydb/core/viewer/json_pqconsumerinfo.h b/ydb/core/viewer/json_pqconsumerinfo.h index 6f6d420e42d..a4d316d4d6b 100644 --- a/ydb/core/viewer/json_pqconsumerinfo.h +++ b/ydb/core/viewer/json_pqconsumerinfo.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/persqueue/events/global.h> #include <ydb/core/client/server/msgbus_server_persqueue.h> #include <ydb/core/tx/tx_proxy/proxy.h> diff --git a/ydb/core/viewer/json_sysinfo.h b/ydb/core/viewer/json_sysinfo.h index c2c9873350a..284c2274eea 100644 --- a/ydb/core/viewer/json_sysinfo.h +++ b/ydb/core/viewer/json_sysinfo.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include "json_wb_req.h" diff --git a/ydb/core/viewer/json_tabletcounters.h b/ydb/core/viewer/json_tabletcounters.h index 86ccdd42cc0..e2517a2cec7 100644 --- a/ydb/core/viewer/json_tabletcounters.h +++ b/ydb/core/viewer/json_tabletcounters.h @@ -3,7 +3,7 @@ #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include <ydb/core/viewer/json/json.h> diff --git a/ydb/core/viewer/json_tabletinfo.h b/ydb/core/viewer/json_tabletinfo.h index a5c86a9469a..d3922f60d9b 100644 --- a/ydb/core/viewer/json_tabletinfo.h +++ b/ydb/core/viewer/json_tabletinfo.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/protos/node_whiteboard.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> diff --git a/ydb/core/viewer/json_tenantinfo.h b/ydb/core/viewer/json_tenantinfo.h index 5950b3d0385..975b2209263 100644 --- a/ydb/core/viewer/json_tenantinfo.h +++ b/ydb/core/viewer/json_tenantinfo.h @@ -4,7 +4,7 @@ #include <ydb/core/base/tablet.h> #include <ydb/core/base/tablet_pipe.h> #include <ydb/core/base/subdomain.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/cms/console/console.h> #include <ydb/core/base/hive.h> #include <ydb/core/tx/schemeshard/schemeshard.h> diff --git a/ydb/core/viewer/json_tenants.h b/ydb/core/viewer/json_tenants.h index 94c020096ce..01abb72e7a2 100644 --- a/ydb/core/viewer/json_tenants.h +++ b/ydb/core/viewer/json_tenants.h @@ -3,7 +3,7 @@ #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/cms/console/console.h> #include <ydb/core/viewer/json/json.h> #include "viewer.h" diff --git a/ydb/core/viewer/json_topicinfo.h b/ydb/core/viewer/json_topicinfo.h index c0614b756fa..18b094051ca 100644 --- a/ydb/core/viewer/json_topicinfo.h +++ b/ydb/core/viewer/json_topicinfo.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tablet/tablet_counters_aggregator.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include "viewer.h" diff --git a/ydb/core/viewer/json_vdisk_req.h b/ydb/core/viewer/json_vdisk_req.h index 13d7fb3c3f6..e65cdf032e3 100644 --- a/ydb/core/viewer/json_vdisk_req.h +++ b/ydb/core/viewer/json_vdisk_req.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/viewer/json/json.h> #include "viewer.h" #include "json_pipe_req.h" diff --git a/ydb/core/viewer/json_vdiskinfo.h b/ydb/core/viewer/json_vdiskinfo.h index bbab8a78e40..bacdd1d7506 100644 --- a/ydb/core/viewer/json_vdiskinfo.h +++ b/ydb/core/viewer/json_vdiskinfo.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include <ydb/core/util/tuples.h> #include "json_wb_req.h" diff --git a/ydb/core/viewer/json_vdiskstat.h b/ydb/core/viewer/json_vdiskstat.h index be0e0d6e212..2f1f43dd714 100644 --- a/ydb/core/viewer/json_vdiskstat.h +++ b/ydb/core/viewer/json_vdiskstat.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include <ydb/core/util/tuples.h> #include "json_vdisk_req.h" diff --git a/ydb/core/viewer/json_wb_req.h b/ydb/core/viewer/json_wb_req.h index cebf02a31e5..6bf2a9511b7 100644 --- a/ydb/core/viewer/json_wb_req.h +++ b/ydb/core/viewer/json_wb_req.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include <ydb/core/viewer/json/json.h> #include <library/cpp/actors/interconnect/interconnect.h> diff --git a/ydb/core/viewer/json_whoami.h b/ydb/core/viewer/json_whoami.h index 9b4468a1b1a..c1670aa55b3 100644 --- a/ydb/core/viewer/json_whoami.h +++ b/ydb/core/viewer/json_whoami.h @@ -2,7 +2,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/mon.h> #include <ydb/core/base/tablet_pipe.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> #include "viewer.h" diff --git a/ydb/core/viewer/log.h b/ydb/core/viewer/log.h index 8dce2ce5729..28646ba9902 100644 --- a/ydb/core/viewer/log.h +++ b/ydb/core/viewer/log.h @@ -1,6 +1,6 @@ #pragma once -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/log.h> namespace NKikimr { diff --git a/ydb/core/viewer/wb_req.h b/ydb/core/viewer/wb_req.h index b46fd735af4..64445b0d93c 100644 --- a/ydb/core/viewer/wb_req.h +++ b/ydb/core/viewer/wb_req.h @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/core/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> #include <ydb/core/viewer/json/json.h> #include <library/cpp/actors/interconnect/interconnect.h> diff --git a/ydb/core/wrappers/s3_wrapper_ut.cpp b/ydb/core/wrappers/s3_wrapper_ut.cpp index b864e183010..117729c2651 100644 --- a/ydb/core/wrappers/s3_wrapper_ut.cpp +++ b/ydb/core/wrappers/s3_wrapper_ut.cpp @@ -1,6 +1,6 @@ #include "s3_storage_config.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/testlib/basics/appdata.h> #include <ydb/core/testlib/basics/runtime.h> #include <ydb/core/wrappers/ut_helpers/s3_mock.h> diff --git a/ydb/core/ydb_convert/compression.cpp b/ydb/core/ydb_convert/compression.cpp index 7cbfb3ec35b..f4368d4668e 100644 --- a/ydb/core/ydb_convert/compression.cpp +++ b/ydb/core/ydb_convert/compression.cpp @@ -1,6 +1,6 @@ #include "compression.h" -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <util/string/builder.h> #include <util/string/cast.h> diff --git a/ydb/core/ydb_convert/table_description.cpp b/ydb/core/ydb_convert/table_description.cpp index e59c11f10f1..a631832d55a 100644 --- a/ydb/core/ydb_convert/table_description.cpp +++ b/ydb/core/ydb_convert/table_description.cpp @@ -5,7 +5,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/engine/mkql_proto.h> -#include <ydb/core/protos/issue_id.pb.h> +#include <ydb/library/ydb_issue/proto/issue_id.pb.h> #include <ydb/library/yql/public/issue/yql_issue.h> #include <util/generic/hash.h> diff --git a/ydb/core/ydb_convert/ydb_convert.cpp b/ydb/core/ydb_convert/ydb_convert.cpp index f6e8615dbb7..deafdbf7416 100644 --- a/ydb/core/ydb_convert/ydb_convert.cpp +++ b/ydb/core/ydb_convert/ydb_convert.cpp @@ -2,7 +2,7 @@ #include <ydb/core/engine/mkql_proto.h> #include <ydb/core/scheme/scheme_tabledefs.h> -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/public/sdk/cpp/client/ydb_value/value.h> diff --git a/ydb/core/ymq/actor/fifo_cleanup.h b/ydb/core/ymq/actor/fifo_cleanup.h index d296510daf9..b7e02e2bbb3 100644 --- a/ydb/core/ymq/actor/fifo_cleanup.h +++ b/ydb/core/ymq/actor/fifo_cleanup.h @@ -1,7 +1,7 @@ #pragma once #include "defs.h" #include <ydb/core/ymq/actor/events.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor.h> diff --git a/ydb/core/ymq/actor/garbage_collector.cpp b/ydb/core/ymq/actor/garbage_collector.cpp index 3da3ec77423..eaf566b7076 100644 --- a/ydb/core/ymq/actor/garbage_collector.cpp +++ b/ydb/core/ymq/actor/garbage_collector.cpp @@ -9,7 +9,7 @@ #include <ydb/core/base/path.h> #include <ydb/core/mon/mon.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/ymq/actor/list_users.cpp b/ydb/core/ymq/actor/list_users.cpp index 3f3f82412c9..60326448ed2 100644 --- a/ydb/core/ymq/actor/list_users.cpp +++ b/ydb/core/ymq/actor/list_users.cpp @@ -2,7 +2,7 @@ #include <ydb/core/base/tablet_pipe.h> #include <ydb/core/tx/tx_proxy/proxy.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <util/string/ascii.h> #include <util/string/vector.h> diff --git a/ydb/core/ymq/actor/queue_leader.h b/ydb/core/ymq/actor/queue_leader.h index e5f54ff3c88..2bda1d763ae 100644 --- a/ydb/core/ymq/actor/queue_leader.h +++ b/ydb/core/ymq/actor/queue_leader.h @@ -4,7 +4,7 @@ #include "events.h" #include "local_rate_limiter_allocator.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/public/lib/value/value.h> #include <ydb/core/ymq/actor/infly.h> #include <ydb/core/ymq/actor/message_delay_stats.h> diff --git a/ydb/core/ymq/actor/retention.h b/ydb/core/ymq/actor/retention.h index 7e5370ac9b0..1aaaf5313f4 100644 --- a/ydb/core/ymq/actor/retention.h +++ b/ydb/core/ymq/actor/retention.h @@ -1,7 +1,7 @@ #pragma once #include "defs.h" #include <ydb/core/ymq/actor/events.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actor.h> diff --git a/ydb/core/ymq/http/http.cpp b/ydb/core/ymq/http/http.cpp index d9c220f9aa3..dad18982294 100644 --- a/ydb/core/ymq/http/http.cpp +++ b/ydb/core/ymq/http/http.cpp @@ -1,7 +1,7 @@ #include "http.h" #include "xml.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/http_proxy/authorization/auth_helpers.h> #include <ydb/core/ymq/actor/actor.h> #include <ydb/core/ymq/actor/auth_factory.h> diff --git a/ydb/core/ymq/queues/common/db_queries_maker.h b/ydb/core/ymq/queues/common/db_queries_maker.h index 1176e0c86a5..686e87eb6a4 100644 --- a/ydb/core/ymq/queues/common/db_queries_maker.h +++ b/ydb/core/ymq/queues/common/db_queries_maker.h @@ -5,7 +5,7 @@ #include <ydb/core/ymq/queues/fifo/queries.h>
#include <ydb/core/ymq/queues/std/queries.h>
-#include <ydb/core/util/yverify_stream.h>
+#include <ydb/library/yverify_stream/yverify_stream.h>
#include <util/string/builder.h>
#include <util/string/printf.h>
diff --git a/ydb/core/yql_testlib/yql_testlib.cpp b/ydb/core/yql_testlib/yql_testlib.cpp index 35838c40f6a..0136bc76a1a 100644 --- a/ydb/core/yql_testlib/yql_testlib.cpp +++ b/ydb/core/yql_testlib/yql_testlib.cpp @@ -4,7 +4,7 @@ #include <ydb/core/base/hive.h> #include <ydb/public/lib/base/msgbus.h> #include <ydb/core/client/minikql_compile/mkql_compile_service.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/mind/local.h> #include <ydb/core/engine/mkql_engine_flat.h> #include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h> diff --git a/ydb/library/CMakeLists.txt b/ydb/library/CMakeLists.txt index eb206b8ab1c..3db3204702a 100644 --- a/ydb/library/CMakeLists.txt +++ b/ydb/library/CMakeLists.txt @@ -31,9 +31,12 @@ add_subdirectory(query_actor) add_subdirectory(rewrapper) add_subdirectory(schlab) add_subdirectory(security) +add_subdirectory(services) add_subdirectory(testlib) add_subdirectory(uuid) add_subdirectory(workload) add_subdirectory(yaml_config) add_subdirectory(ycloud) +add_subdirectory(ydb_issue) add_subdirectory(yql) +add_subdirectory(yverify_stream) diff --git a/ydb/library/db_pool/log.h b/ydb/library/db_pool/log.h index ce60d7df51a..075669fe596 100644 --- a/ydb/library/db_pool/log.h +++ b/ydb/library/db_pool/log.h @@ -1,6 +1,6 @@ #pragma once -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/log.h> diff --git a/ydb/library/pdisk_io/aio_linux.cpp b/ydb/library/pdisk_io/aio_linux.cpp index 07cb1c1ac81..f46be6a1f05 100644 --- a/ydb/library/pdisk_io/aio_linux.cpp +++ b/ydb/library/pdisk_io/aio_linux.cpp @@ -3,7 +3,7 @@ //#include <ydb/core/blobstorage/base/wilson_events.h> #include <ydb/core/debug/valgrind_check.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <ydb/library/pdisk_io/spdk_state.h> #include <library/cpp/actors/util/intrinsics.h> diff --git a/ydb/library/pdisk_io/sector_map.h b/ydb/library/pdisk_io/sector_map.h index ea30ed23b79..f1143211a3c 100644 --- a/ydb/library/pdisk_io/sector_map.h +++ b/ydb/library/pdisk_io/sector_map.h @@ -1,6 +1,6 @@ #pragma once -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <library/cpp/actors/util/ticket_lock.h> #include <util/datetime/base.h> diff --git a/ydb/library/pdisk_io/wcache.cpp b/ydb/library/pdisk_io/wcache.cpp index 134d07970eb..0fc52e79af6 100644 --- a/ydb/library/pdisk_io/wcache.cpp +++ b/ydb/library/pdisk_io/wcache.cpp @@ -1,6 +1,6 @@ #include "wcache.h" //#include <library/cpp/actors/core/log.h> -//#include <ydb/core/protos/services.pb.h> +//#include <ydb/library/services/services.pb.h> #include <util/generic/yexception.h> #include <util/stream/file.h> diff --git a/ydb/library/services/CMakeLists.darwin-x86_64.txt b/ydb/library/services/CMakeLists.darwin-x86_64.txt new file mode 100644 index 00000000000..bd9c4cc13df --- /dev/null +++ b/ydb/library/services/CMakeLists.darwin-x86_64.txt @@ -0,0 +1,57 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +get_built_tool_path( + TOOL_grpc_cpp_bin + TOOL_grpc_cpp_dependency + contrib/tools/protoc/plugins/grpc_cpp + grpc_cpp +) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) + +add_library(ydb-library-services) +set_property(TARGET ydb-library-services PROPERTY + PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h +) +target_link_libraries(ydb-library-services PUBLIC + contrib-libs-cxxsupp + yutil + contrib-libs-grpc + contrib-libs-protobuf +) +target_proto_messages(ydb-library-services PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/services/services.proto +) +target_proto_addincls(ydb-library-services + ./ + ${CMAKE_SOURCE_DIR}/ + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src +) +target_proto_outs(ydb-library-services + --cpp_out=${CMAKE_BINARY_DIR}/ + --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ +) +target_proto_plugin(ydb-library-services + grpc_cpp + grpc_cpp +) diff --git a/ydb/library/services/CMakeLists.linux-aarch64.txt b/ydb/library/services/CMakeLists.linux-aarch64.txt new file mode 100644 index 00000000000..3b4686c0b4a --- /dev/null +++ b/ydb/library/services/CMakeLists.linux-aarch64.txt @@ -0,0 +1,58 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +get_built_tool_path( + TOOL_grpc_cpp_bin + TOOL_grpc_cpp_dependency + contrib/tools/protoc/plugins/grpc_cpp + grpc_cpp +) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) + +add_library(ydb-library-services) +set_property(TARGET ydb-library-services PROPERTY + PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h +) +target_link_libraries(ydb-library-services PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil + contrib-libs-grpc + contrib-libs-protobuf +) +target_proto_messages(ydb-library-services PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/services/services.proto +) +target_proto_addincls(ydb-library-services + ./ + ${CMAKE_SOURCE_DIR}/ + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src +) +target_proto_outs(ydb-library-services + --cpp_out=${CMAKE_BINARY_DIR}/ + --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ +) +target_proto_plugin(ydb-library-services + grpc_cpp + grpc_cpp +) diff --git a/ydb/library/services/CMakeLists.linux-x86_64.txt b/ydb/library/services/CMakeLists.linux-x86_64.txt new file mode 100644 index 00000000000..3b4686c0b4a --- /dev/null +++ b/ydb/library/services/CMakeLists.linux-x86_64.txt @@ -0,0 +1,58 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +get_built_tool_path( + TOOL_grpc_cpp_bin + TOOL_grpc_cpp_dependency + contrib/tools/protoc/plugins/grpc_cpp + grpc_cpp +) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) + +add_library(ydb-library-services) +set_property(TARGET ydb-library-services PROPERTY + PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h +) +target_link_libraries(ydb-library-services PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil + contrib-libs-grpc + contrib-libs-protobuf +) +target_proto_messages(ydb-library-services PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/services/services.proto +) +target_proto_addincls(ydb-library-services + ./ + ${CMAKE_SOURCE_DIR}/ + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src +) +target_proto_outs(ydb-library-services + --cpp_out=${CMAKE_BINARY_DIR}/ + --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ +) +target_proto_plugin(ydb-library-services + grpc_cpp + grpc_cpp +) diff --git a/ydb/library/services/CMakeLists.txt b/ydb/library/services/CMakeLists.txt new file mode 100644 index 00000000000..f8b31df0c11 --- /dev/null +++ b/ydb/library/services/CMakeLists.txt @@ -0,0 +1,17 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-aarch64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + include(CMakeLists.darwin-x86_64.txt) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) + include(CMakeLists.windows-x86_64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-x86_64.txt) +endif() diff --git a/ydb/library/services/CMakeLists.windows-x86_64.txt b/ydb/library/services/CMakeLists.windows-x86_64.txt new file mode 100644 index 00000000000..bd9c4cc13df --- /dev/null +++ b/ydb/library/services/CMakeLists.windows-x86_64.txt @@ -0,0 +1,57 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +get_built_tool_path( + TOOL_grpc_cpp_bin + TOOL_grpc_cpp_dependency + contrib/tools/protoc/plugins/grpc_cpp + grpc_cpp +) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) + +add_library(ydb-library-services) +set_property(TARGET ydb-library-services PROPERTY + PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h +) +target_link_libraries(ydb-library-services PUBLIC + contrib-libs-cxxsupp + yutil + contrib-libs-grpc + contrib-libs-protobuf +) +target_proto_messages(ydb-library-services PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/services/services.proto +) +target_proto_addincls(ydb-library-services + ./ + ${CMAKE_SOURCE_DIR}/ + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src +) +target_proto_outs(ydb-library-services + --cpp_out=${CMAKE_BINARY_DIR}/ + --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ +) +target_proto_plugin(ydb-library-services + grpc_cpp + grpc_cpp +) diff --git a/ydb/core/protos/services.proto b/ydb/library/services/services.proto index db1b977b166..db1b977b166 100644 --- a/ydb/core/protos/services.proto +++ b/ydb/library/services/services.proto diff --git a/ydb/library/services/ya.make b/ydb/library/services/ya.make new file mode 100644 index 00000000000..7eb474702a0 --- /dev/null +++ b/ydb/library/services/ya.make @@ -0,0 +1,15 @@ +PROTO_LIBRARY() + +GRPC() + +IF (OS_WINDOWS) + NO_OPTIMIZE_PY_PROTOS() +ENDIF() + +SRCS( + services.proto +) + +EXCLUDE_TAGS(GO_PROTO) + +END() diff --git a/ydb/library/ycloud/impl/grpc_service_client.h b/ydb/library/ycloud/impl/grpc_service_client.h index b4c51936abf..921c4fc5ac7 100644 --- a/ydb/library/ycloud/impl/grpc_service_client.h +++ b/ydb/library/ycloud/impl/grpc_service_client.h @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/log.h> #include <library/cpp/digest/crc32c/crc32c.h> #include <library/cpp/grpc/client/grpc_client_low.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <util/string/ascii.h> #include "grpc_service_settings.h" diff --git a/ydb/library/ydb_issue/CMakeLists.darwin-x86_64.txt b/ydb/library/ydb_issue/CMakeLists.darwin-x86_64.txt new file mode 100644 index 00000000000..69d90656e37 --- /dev/null +++ b/ydb/library/ydb_issue/CMakeLists.darwin-x86_64.txt @@ -0,0 +1,44 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(proto) +get_built_tool_path( + TOOL_rescompiler_bin + TOOL_rescompiler_dependency + tools/rescompiler/bin + rescompiler +) + +add_library(ydb-library-ydb_issue) +target_link_libraries(ydb-library-ydb_issue PUBLIC + contrib-libs-cxxsupp + yutil + library-ydb_issue-proto + library-cpp-resource +) +target_sources(ydb-library-ydb_issue PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/ydb_issue/issue_helpers.cpp +) + +add_global_library_for(ydb-library-ydb_issue.global ydb-library-ydb_issue) +target_link_libraries(ydb-library-ydb_issue.global PUBLIC + contrib-libs-cxxsupp + yutil + library-ydb_issue-proto + library-cpp-resource +) +target_sources(ydb-library-ydb_issue.global PRIVATE + ${CMAKE_BINARY_DIR}/ydb/library/ydb_issue/11a2a83241c8a9ca7a1ce00f99de45d7.cpp +) +resources(ydb-library-ydb_issue.global + ${CMAKE_BINARY_DIR}/ydb/library/ydb_issue/11a2a83241c8a9ca7a1ce00f99de45d7.cpp + INPUTS + ${CMAKE_SOURCE_DIR}/ydb/library/ydb_issue/ydb_issue.txt + KEYS + ydb_issue.txt +) diff --git a/ydb/library/ydb_issue/CMakeLists.linux-aarch64.txt b/ydb/library/ydb_issue/CMakeLists.linux-aarch64.txt new file mode 100644 index 00000000000..0184ab7c31c --- /dev/null +++ b/ydb/library/ydb_issue/CMakeLists.linux-aarch64.txt @@ -0,0 +1,46 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(proto) +get_built_tool_path( + TOOL_rescompiler_bin + TOOL_rescompiler_dependency + tools/rescompiler/bin + rescompiler +) + +add_library(ydb-library-ydb_issue) +target_link_libraries(ydb-library-ydb_issue PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil + library-ydb_issue-proto + library-cpp-resource +) +target_sources(ydb-library-ydb_issue PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/ydb_issue/issue_helpers.cpp +) + +add_global_library_for(ydb-library-ydb_issue.global ydb-library-ydb_issue) +target_link_libraries(ydb-library-ydb_issue.global PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil + library-ydb_issue-proto + library-cpp-resource +) +target_sources(ydb-library-ydb_issue.global PRIVATE + ${CMAKE_BINARY_DIR}/ydb/library/ydb_issue/11a2a83241c8a9ca7a1ce00f99de45d7.cpp +) +resources(ydb-library-ydb_issue.global + ${CMAKE_BINARY_DIR}/ydb/library/ydb_issue/11a2a83241c8a9ca7a1ce00f99de45d7.cpp + INPUTS + ${CMAKE_SOURCE_DIR}/ydb/library/ydb_issue/ydb_issue.txt + KEYS + ydb_issue.txt +) diff --git a/ydb/library/ydb_issue/CMakeLists.linux-x86_64.txt b/ydb/library/ydb_issue/CMakeLists.linux-x86_64.txt new file mode 100644 index 00000000000..0184ab7c31c --- /dev/null +++ b/ydb/library/ydb_issue/CMakeLists.linux-x86_64.txt @@ -0,0 +1,46 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(proto) +get_built_tool_path( + TOOL_rescompiler_bin + TOOL_rescompiler_dependency + tools/rescompiler/bin + rescompiler +) + +add_library(ydb-library-ydb_issue) +target_link_libraries(ydb-library-ydb_issue PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil + library-ydb_issue-proto + library-cpp-resource +) +target_sources(ydb-library-ydb_issue PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/ydb_issue/issue_helpers.cpp +) + +add_global_library_for(ydb-library-ydb_issue.global ydb-library-ydb_issue) +target_link_libraries(ydb-library-ydb_issue.global PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil + library-ydb_issue-proto + library-cpp-resource +) +target_sources(ydb-library-ydb_issue.global PRIVATE + ${CMAKE_BINARY_DIR}/ydb/library/ydb_issue/11a2a83241c8a9ca7a1ce00f99de45d7.cpp +) +resources(ydb-library-ydb_issue.global + ${CMAKE_BINARY_DIR}/ydb/library/ydb_issue/11a2a83241c8a9ca7a1ce00f99de45d7.cpp + INPUTS + ${CMAKE_SOURCE_DIR}/ydb/library/ydb_issue/ydb_issue.txt + KEYS + ydb_issue.txt +) diff --git a/ydb/library/ydb_issue/CMakeLists.txt b/ydb/library/ydb_issue/CMakeLists.txt new file mode 100644 index 00000000000..f8b31df0c11 --- /dev/null +++ b/ydb/library/ydb_issue/CMakeLists.txt @@ -0,0 +1,17 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-aarch64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + include(CMakeLists.darwin-x86_64.txt) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) + include(CMakeLists.windows-x86_64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-x86_64.txt) +endif() diff --git a/ydb/library/ydb_issue/CMakeLists.windows-x86_64.txt b/ydb/library/ydb_issue/CMakeLists.windows-x86_64.txt new file mode 100644 index 00000000000..69d90656e37 --- /dev/null +++ b/ydb/library/ydb_issue/CMakeLists.windows-x86_64.txt @@ -0,0 +1,44 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(proto) +get_built_tool_path( + TOOL_rescompiler_bin + TOOL_rescompiler_dependency + tools/rescompiler/bin + rescompiler +) + +add_library(ydb-library-ydb_issue) +target_link_libraries(ydb-library-ydb_issue PUBLIC + contrib-libs-cxxsupp + yutil + library-ydb_issue-proto + library-cpp-resource +) +target_sources(ydb-library-ydb_issue PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/ydb_issue/issue_helpers.cpp +) + +add_global_library_for(ydb-library-ydb_issue.global ydb-library-ydb_issue) +target_link_libraries(ydb-library-ydb_issue.global PUBLIC + contrib-libs-cxxsupp + yutil + library-ydb_issue-proto + library-cpp-resource +) +target_sources(ydb-library-ydb_issue.global PRIVATE + ${CMAKE_BINARY_DIR}/ydb/library/ydb_issue/11a2a83241c8a9ca7a1ce00f99de45d7.cpp +) +resources(ydb-library-ydb_issue.global + ${CMAKE_BINARY_DIR}/ydb/library/ydb_issue/11a2a83241c8a9ca7a1ce00f99de45d7.cpp + INPUTS + ${CMAKE_SOURCE_DIR}/ydb/library/ydb_issue/ydb_issue.txt + KEYS + ydb_issue.txt +) diff --git a/ydb/core/base/kikimr_issue.cpp b/ydb/library/ydb_issue/issue_helpers.cpp index 80b4ed82034..90fa540cc20 100644 --- a/ydb/core/base/kikimr_issue.cpp +++ b/ydb/library/ydb_issue/issue_helpers.cpp @@ -1,8 +1,8 @@ -#include "kikimr_issue.h" +#include "issue_helpers.h" namespace NKikimr { -const char IssueMapResource[] = "kikimr_issue.txt"; +const char IssueMapResource[] = "ydb_issue.txt"; static_assert(NYql::DEFAULT_ERROR == NKikimrIssues::TIssuesIds::DEFAULT_ERROR, "value of particular and common error mismatched for \"DEFAULT_ERROR\""); diff --git a/ydb/core/base/kikimr_issue.h b/ydb/library/ydb_issue/issue_helpers.h index 843f2a65a18..034bb13d558 100644 --- a/ydb/core/base/kikimr_issue.h +++ b/ydb/library/ydb_issue/issue_helpers.h @@ -1,6 +1,6 @@ #pragma once -#include <ydb/core/protos/issue_id.pb.h> +#include <ydb/library/ydb_issue/proto/issue_id.pb.h> #include <ydb/library/yql/public/issue/yql_issue.h> #include <ydb/library/yql/public/issue/yql_issue_id.h> #include <ydb/library/yql/public/issue/yql_issue_message.h> diff --git a/ydb/library/ydb_issue/proto/CMakeLists.darwin-x86_64.txt b/ydb/library/ydb_issue/proto/CMakeLists.darwin-x86_64.txt new file mode 100644 index 00000000000..d4c186028bc --- /dev/null +++ b/ydb/library/ydb_issue/proto/CMakeLists.darwin-x86_64.txt @@ -0,0 +1,58 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +get_built_tool_path( + TOOL_grpc_cpp_bin + TOOL_grpc_cpp_dependency + contrib/tools/protoc/plugins/grpc_cpp + grpc_cpp +) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) + +add_library(library-ydb_issue-proto) +set_property(TARGET library-ydb_issue-proto PROPERTY + PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h +) +target_link_libraries(library-ydb_issue-proto PUBLIC + contrib-libs-cxxsupp + yutil + contrib-libs-grpc + public-issue-protos + contrib-libs-protobuf +) +target_proto_messages(library-ydb_issue-proto PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/ydb_issue/proto/issue_id.proto +) +target_proto_addincls(library-ydb_issue-proto + ./ + ${CMAKE_SOURCE_DIR}/ + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src +) +target_proto_outs(library-ydb_issue-proto + --cpp_out=${CMAKE_BINARY_DIR}/ + --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ +) +target_proto_plugin(library-ydb_issue-proto + grpc_cpp + grpc_cpp +) diff --git a/ydb/library/ydb_issue/proto/CMakeLists.linux-aarch64.txt b/ydb/library/ydb_issue/proto/CMakeLists.linux-aarch64.txt new file mode 100644 index 00000000000..d5020cdff45 --- /dev/null +++ b/ydb/library/ydb_issue/proto/CMakeLists.linux-aarch64.txt @@ -0,0 +1,59 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +get_built_tool_path( + TOOL_grpc_cpp_bin + TOOL_grpc_cpp_dependency + contrib/tools/protoc/plugins/grpc_cpp + grpc_cpp +) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) + +add_library(library-ydb_issue-proto) +set_property(TARGET library-ydb_issue-proto PROPERTY + PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h +) +target_link_libraries(library-ydb_issue-proto PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil + contrib-libs-grpc + public-issue-protos + contrib-libs-protobuf +) +target_proto_messages(library-ydb_issue-proto PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/ydb_issue/proto/issue_id.proto +) +target_proto_addincls(library-ydb_issue-proto + ./ + ${CMAKE_SOURCE_DIR}/ + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src +) +target_proto_outs(library-ydb_issue-proto + --cpp_out=${CMAKE_BINARY_DIR}/ + --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ +) +target_proto_plugin(library-ydb_issue-proto + grpc_cpp + grpc_cpp +) diff --git a/ydb/library/ydb_issue/proto/CMakeLists.linux-x86_64.txt b/ydb/library/ydb_issue/proto/CMakeLists.linux-x86_64.txt new file mode 100644 index 00000000000..d5020cdff45 --- /dev/null +++ b/ydb/library/ydb_issue/proto/CMakeLists.linux-x86_64.txt @@ -0,0 +1,59 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +get_built_tool_path( + TOOL_grpc_cpp_bin + TOOL_grpc_cpp_dependency + contrib/tools/protoc/plugins/grpc_cpp + grpc_cpp +) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) + +add_library(library-ydb_issue-proto) +set_property(TARGET library-ydb_issue-proto PROPERTY + PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h +) +target_link_libraries(library-ydb_issue-proto PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil + contrib-libs-grpc + public-issue-protos + contrib-libs-protobuf +) +target_proto_messages(library-ydb_issue-proto PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/ydb_issue/proto/issue_id.proto +) +target_proto_addincls(library-ydb_issue-proto + ./ + ${CMAKE_SOURCE_DIR}/ + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src +) +target_proto_outs(library-ydb_issue-proto + --cpp_out=${CMAKE_BINARY_DIR}/ + --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ +) +target_proto_plugin(library-ydb_issue-proto + grpc_cpp + grpc_cpp +) diff --git a/ydb/library/ydb_issue/proto/CMakeLists.txt b/ydb/library/ydb_issue/proto/CMakeLists.txt new file mode 100644 index 00000000000..f8b31df0c11 --- /dev/null +++ b/ydb/library/ydb_issue/proto/CMakeLists.txt @@ -0,0 +1,17 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-aarch64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + include(CMakeLists.darwin-x86_64.txt) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) + include(CMakeLists.windows-x86_64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-x86_64.txt) +endif() diff --git a/ydb/library/ydb_issue/proto/CMakeLists.windows-x86_64.txt b/ydb/library/ydb_issue/proto/CMakeLists.windows-x86_64.txt new file mode 100644 index 00000000000..d4c186028bc --- /dev/null +++ b/ydb/library/ydb_issue/proto/CMakeLists.windows-x86_64.txt @@ -0,0 +1,58 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +get_built_tool_path( + TOOL_grpc_cpp_bin + TOOL_grpc_cpp_dependency + contrib/tools/protoc/plugins/grpc_cpp + grpc_cpp +) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) + +add_library(library-ydb_issue-proto) +set_property(TARGET library-ydb_issue-proto PROPERTY + PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h +) +target_link_libraries(library-ydb_issue-proto PUBLIC + contrib-libs-cxxsupp + yutil + contrib-libs-grpc + public-issue-protos + contrib-libs-protobuf +) +target_proto_messages(library-ydb_issue-proto PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/ydb_issue/proto/issue_id.proto +) +target_proto_addincls(library-ydb_issue-proto + ./ + ${CMAKE_SOURCE_DIR}/ + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src +) +target_proto_outs(library-ydb_issue-proto + --cpp_out=${CMAKE_BINARY_DIR}/ + --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ +) +target_proto_plugin(library-ydb_issue-proto + grpc_cpp + grpc_cpp +) diff --git a/ydb/core/protos/issue_id.proto b/ydb/library/ydb_issue/proto/issue_id.proto index 1c82c0d95e8..1c82c0d95e8 100644 --- a/ydb/core/protos/issue_id.proto +++ b/ydb/library/ydb_issue/proto/issue_id.proto diff --git a/ydb/library/ydb_issue/proto/ya.make b/ydb/library/ydb_issue/proto/ya.make new file mode 100644 index 00000000000..a3788ff3343 --- /dev/null +++ b/ydb/library/ydb_issue/proto/ya.make @@ -0,0 +1,19 @@ +PROTO_LIBRARY() + +GRPC() + +IF (OS_WINDOWS) + NO_OPTIMIZE_PY_PROTOS() +ENDIF() + +SRCS( + issue_id.proto +) + +PEERDIR( + ydb/library/yql/public/issue/protos +) + +EXCLUDE_TAGS(GO_PROTO) + +END() diff --git a/ydb/library/ydb_issue/ya.make b/ydb/library/ydb_issue/ya.make new file mode 100644 index 00000000000..74209a95890 --- /dev/null +++ b/ydb/library/ydb_issue/ya.make @@ -0,0 +1,16 @@ +LIBRARY() + +SRCS( + issue_helpers.h + issue_helpers.cpp +) + +PEERDIR( + ydb/library/ydb_issue/proto +) + +RESOURCE( + ydb/library/ydb_issue/ydb_issue.txt ydb_issue.txt +) + +END() diff --git a/ydb/core/base/kikimr_issue.txt b/ydb/library/ydb_issue/ydb_issue.txt index 56c375080be..56c375080be 100644 --- a/ydb/core/base/kikimr_issue.txt +++ b/ydb/library/ydb_issue/ydb_issue.txt diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.cpp b/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.cpp index fc5238ee3ad..fe2f05af3c6 100644 --- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.cpp +++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.cpp @@ -1,7 +1,7 @@ #include "dq_compute_actor_channels.h" #include <util/string/join.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/dq/actors/dq.h> diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_checkpoints.cpp b/ydb/library/yql/dq/actors/compute/dq_compute_actor_checkpoints.cpp index dce6669ae21..cb47fc699e0 100644 --- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_checkpoints.cpp +++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_checkpoints.cpp @@ -1,7 +1,7 @@ #include "dq_compute_actor_checkpoints.h" #include "dq_checkpoints.h" #include "dq_compute_actor_impl.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/minikql/comp_nodes/mkql_saveload.h> diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h b/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h index 85e7f2b1143..7b6eb24acdb 100644 --- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h +++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h @@ -9,9 +9,9 @@ #include "dq_compute_issues_buffer.h" #include "dq_compute_memory_quota.h" -#include <ydb/core/base/kikimr_issue.h> +#include <ydb/library/ydb_issue/issue_helpers.h> #include <ydb/core/base/wilson.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/providers/dq/counters/counters.h> #include <ydb/library/yql/dq/actors/protos/dq_events.pb.h> diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_watermarks.cpp b/ydb/library/yql/dq/actors/compute/dq_compute_actor_watermarks.cpp index d99efbdffe4..324569e97c4 100644 --- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_watermarks.cpp +++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_watermarks.cpp @@ -1,6 +1,6 @@ #include "dq_compute_actor_watermarks.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/minikql/comp_nodes/mkql_saveload.h> diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_memory_quota.h b/ydb/library/yql/dq/actors/compute/dq_compute_memory_quota.h index b7604b2b2ef..71a1cbff661 100644 --- a/ydb/library/yql/dq/actors/compute/dq_compute_memory_quota.h +++ b/ydb/library/yql/dq/actors/compute/dq_compute_memory_quota.h @@ -1,7 +1,7 @@ #pragma once -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h> #include <ydb/library/yql/minikql/mkql_alloc.h> #include <ydb/library/yql/minikql/aligned_page_pool.h> diff --git a/ydb/library/yql/dq/actors/task_runner/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/dq/actors/task_runner/CMakeLists.darwin-x86_64.txt index ea065b90b39..662c32c018f 100644 --- a/ydb/library/yql/dq/actors/task_runner/CMakeLists.darwin-x86_64.txt +++ b/ydb/library/yql/dq/actors/task_runner/CMakeLists.darwin-x86_64.txt @@ -20,7 +20,7 @@ target_link_libraries(dq-actors-task_runner PUBLIC yql-dq-proto minikql-computation-llvm yql-utils-actors - ydb-core-protos + ydb-library-services ) target_sources(dq-actors-task_runner PRIVATE ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/actors/task_runner/events.cpp diff --git a/ydb/library/yql/dq/actors/task_runner/CMakeLists.linux-aarch64.txt b/ydb/library/yql/dq/actors/task_runner/CMakeLists.linux-aarch64.txt index 6fe8bb2ee7a..542972f75f1 100644 --- a/ydb/library/yql/dq/actors/task_runner/CMakeLists.linux-aarch64.txt +++ b/ydb/library/yql/dq/actors/task_runner/CMakeLists.linux-aarch64.txt @@ -21,7 +21,7 @@ target_link_libraries(dq-actors-task_runner PUBLIC yql-dq-proto minikql-computation-llvm yql-utils-actors - ydb-core-protos + ydb-library-services ) target_sources(dq-actors-task_runner PRIVATE ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/actors/task_runner/events.cpp diff --git a/ydb/library/yql/dq/actors/task_runner/CMakeLists.linux-x86_64.txt b/ydb/library/yql/dq/actors/task_runner/CMakeLists.linux-x86_64.txt index 6fe8bb2ee7a..542972f75f1 100644 --- a/ydb/library/yql/dq/actors/task_runner/CMakeLists.linux-x86_64.txt +++ b/ydb/library/yql/dq/actors/task_runner/CMakeLists.linux-x86_64.txt @@ -21,7 +21,7 @@ target_link_libraries(dq-actors-task_runner PUBLIC yql-dq-proto minikql-computation-llvm yql-utils-actors - ydb-core-protos + ydb-library-services ) target_sources(dq-actors-task_runner PRIVATE ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/actors/task_runner/events.cpp diff --git a/ydb/library/yql/dq/actors/task_runner/CMakeLists.windows-x86_64.txt b/ydb/library/yql/dq/actors/task_runner/CMakeLists.windows-x86_64.txt index ea065b90b39..662c32c018f 100644 --- a/ydb/library/yql/dq/actors/task_runner/CMakeLists.windows-x86_64.txt +++ b/ydb/library/yql/dq/actors/task_runner/CMakeLists.windows-x86_64.txt @@ -20,7 +20,7 @@ target_link_libraries(dq-actors-task_runner PUBLIC yql-dq-proto minikql-computation-llvm yql-utils-actors - ydb-core-protos + ydb-library-services ) target_sources(dq-actors-task_runner PRIVATE ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/actors/task_runner/events.cpp diff --git a/ydb/library/yql/dq/actors/task_runner/task_runner_actor_local.cpp b/ydb/library/yql/dq/actors/task_runner/task_runner_actor_local.cpp index 53cd7823f6e..00ae518853c 100644 --- a/ydb/library/yql/dq/actors/task_runner/task_runner_actor_local.cpp +++ b/ydb/library/yql/dq/actors/task_runner/task_runner_actor_local.cpp @@ -1,6 +1,6 @@ #include "task_runner_actor.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/core/issue/yql_issue.h> #include <ydb/library/yql/core/issue/protos/issue_id.pb.h> diff --git a/ydb/library/yql/dq/actors/task_runner/ya.make b/ydb/library/yql/dq/actors/task_runner/ya.make index 17edba64fec..80de631b957 100644 --- a/ydb/library/yql/dq/actors/task_runner/ya.make +++ b/ydb/library/yql/dq/actors/task_runner/ya.make @@ -12,7 +12,7 @@ PEERDIR( ydb/library/yql/dq/proto ydb/library/yql/minikql/computation/llvm ydb/library/yql/utils/actors - ydb/core/protos + ydb/library/services ) YQL_LAST_ABI_VERSION() diff --git a/ydb/library/yql/dq/runtime/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/dq/runtime/CMakeLists.darwin-x86_64.txt index a40fc8447e7..ee09e6cf146 100644 --- a/ydb/library/yql/dq/runtime/CMakeLists.darwin-x86_64.txt +++ b/ydb/library/yql/dq/runtime/CMakeLists.darwin-x86_64.txt @@ -22,7 +22,7 @@ target_link_libraries(yql-dq-runtime PUBLIC contrib-libs-cxxsupp yutil libs-apache-arrow - ydb-core-util + ydb-library-yverify_stream ydb-library-mkql_proto minikql-comp_nodes-llvm parser-pg_wrapper-interface diff --git a/ydb/library/yql/dq/runtime/CMakeLists.linux-aarch64.txt b/ydb/library/yql/dq/runtime/CMakeLists.linux-aarch64.txt index e22f6500b16..6f24fe6c02f 100644 --- a/ydb/library/yql/dq/runtime/CMakeLists.linux-aarch64.txt +++ b/ydb/library/yql/dq/runtime/CMakeLists.linux-aarch64.txt @@ -23,7 +23,7 @@ target_link_libraries(yql-dq-runtime PUBLIC contrib-libs-cxxsupp yutil libs-apache-arrow - ydb-core-util + ydb-library-yverify_stream ydb-library-mkql_proto minikql-comp_nodes-llvm parser-pg_wrapper-interface diff --git a/ydb/library/yql/dq/runtime/CMakeLists.linux-x86_64.txt b/ydb/library/yql/dq/runtime/CMakeLists.linux-x86_64.txt index e22f6500b16..6f24fe6c02f 100644 --- a/ydb/library/yql/dq/runtime/CMakeLists.linux-x86_64.txt +++ b/ydb/library/yql/dq/runtime/CMakeLists.linux-x86_64.txt @@ -23,7 +23,7 @@ target_link_libraries(yql-dq-runtime PUBLIC contrib-libs-cxxsupp yutil libs-apache-arrow - ydb-core-util + ydb-library-yverify_stream ydb-library-mkql_proto minikql-comp_nodes-llvm parser-pg_wrapper-interface diff --git a/ydb/library/yql/dq/runtime/CMakeLists.windows-x86_64.txt b/ydb/library/yql/dq/runtime/CMakeLists.windows-x86_64.txt index a40fc8447e7..ee09e6cf146 100644 --- a/ydb/library/yql/dq/runtime/CMakeLists.windows-x86_64.txt +++ b/ydb/library/yql/dq/runtime/CMakeLists.windows-x86_64.txt @@ -22,7 +22,7 @@ target_link_libraries(yql-dq-runtime PUBLIC contrib-libs-cxxsupp yutil libs-apache-arrow - ydb-core-util + ydb-library-yverify_stream ydb-library-mkql_proto minikql-comp_nodes-llvm parser-pg_wrapper-interface diff --git a/ydb/library/yql/dq/runtime/dq_arrow_helpers.cpp b/ydb/library/yql/dq/runtime/dq_arrow_helpers.cpp index 09449f9cbee..ed5ae07c57c 100644 --- a/ydb/library/yql/dq/runtime/dq_arrow_helpers.cpp +++ b/ydb/library/yql/dq/runtime/dq_arrow_helpers.cpp @@ -6,7 +6,7 @@ #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h> #include <ydb/library/yql/minikql/mkql_node.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <ydb/public/lib/scheme_types/scheme_type_id.h> #include <contrib/libs/apache/arrow/cpp/src/arrow/array/builder_base.h> diff --git a/ydb/library/yql/dq/runtime/dq_arrow_helpers_ut.cpp b/ydb/library/yql/dq/runtime/dq_arrow_helpers_ut.cpp index 11f3ac860ed..416640a7080 100644 --- a/ydb/library/yql/dq/runtime/dq_arrow_helpers_ut.cpp +++ b/ydb/library/yql/dq/runtime/dq_arrow_helpers_ut.cpp @@ -1,6 +1,6 @@ #include "dq_arrow_helpers.h" -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <memory> #include <ydb/library/yql/public/udf/udf_data_type.h> diff --git a/ydb/library/yql/dq/runtime/ya.make b/ydb/library/yql/dq/runtime/ya.make index e49ac0c2916..c062d8743f8 100644 --- a/ydb/library/yql/dq/runtime/ya.make +++ b/ydb/library/yql/dq/runtime/ya.make @@ -2,7 +2,7 @@ LIBRARY() PEERDIR( contrib/libs/apache/arrow - ydb/core/util + ydb/library/yverify_stream ydb/library/mkql_proto ydb/library/yql/minikql/comp_nodes/llvm ydb/library/yql/parser/pg_wrapper/interface diff --git a/ydb/library/yql/providers/dq/actors/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/providers/dq/actors/CMakeLists.darwin-x86_64.txt index 1812c2a1855..06b0b443aef 100644 --- a/ydb/library/yql/providers/dq/actors/CMakeLists.darwin-x86_64.txt +++ b/ydb/library/yql/providers/dq/actors/CMakeLists.darwin-x86_64.txt @@ -17,7 +17,6 @@ target_link_libraries(providers-dq-actors PUBLIC yutil cpp-actors-core library-cpp-yson - ydb-core-base ydb-library-mkql_proto yql-core-services core-services-mounts diff --git a/ydb/library/yql/providers/dq/actors/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/dq/actors/CMakeLists.linux-aarch64.txt index 7139fa2fbf9..a0e19378dca 100644 --- a/ydb/library/yql/providers/dq/actors/CMakeLists.linux-aarch64.txt +++ b/ydb/library/yql/providers/dq/actors/CMakeLists.linux-aarch64.txt @@ -18,7 +18,6 @@ target_link_libraries(providers-dq-actors PUBLIC yutil cpp-actors-core library-cpp-yson - ydb-core-base ydb-library-mkql_proto yql-core-services core-services-mounts diff --git a/ydb/library/yql/providers/dq/actors/CMakeLists.linux-x86_64.txt b/ydb/library/yql/providers/dq/actors/CMakeLists.linux-x86_64.txt index 7139fa2fbf9..a0e19378dca 100644 --- a/ydb/library/yql/providers/dq/actors/CMakeLists.linux-x86_64.txt +++ b/ydb/library/yql/providers/dq/actors/CMakeLists.linux-x86_64.txt @@ -18,7 +18,6 @@ target_link_libraries(providers-dq-actors PUBLIC yutil cpp-actors-core library-cpp-yson - ydb-core-base ydb-library-mkql_proto yql-core-services core-services-mounts diff --git a/ydb/library/yql/providers/dq/actors/CMakeLists.windows-x86_64.txt b/ydb/library/yql/providers/dq/actors/CMakeLists.windows-x86_64.txt index 1812c2a1855..06b0b443aef 100644 --- a/ydb/library/yql/providers/dq/actors/CMakeLists.windows-x86_64.txt +++ b/ydb/library/yql/providers/dq/actors/CMakeLists.windows-x86_64.txt @@ -17,7 +17,6 @@ target_link_libraries(providers-dq-actors PUBLIC yutil cpp-actors-core library-cpp-yson - ydb-core-base ydb-library-mkql_proto yql-core-services core-services-mounts diff --git a/ydb/library/yql/providers/dq/actors/ya.make b/ydb/library/yql/providers/dq/actors/ya.make index 7dc1895cf2e..8a3c7d8b650 100644 --- a/ydb/library/yql/providers/dq/actors/ya.make +++ b/ydb/library/yql/providers/dq/actors/ya.make @@ -19,7 +19,6 @@ SRCS( PEERDIR( library/cpp/actors/core library/cpp/yson - ydb/core/base ydb/library/mkql_proto ydb/library/yql/core/services ydb/library/yql/core/services/mounts diff --git a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.darwin-x86_64.txt index 3980bbc31ce..77a1aa8bef8 100644 --- a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.darwin-x86_64.txt +++ b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.darwin-x86_64.txt @@ -16,6 +16,7 @@ target_link_libraries(providers-dq-worker_manager PUBLIC contrib-libs-cxxsupp yutil cpp-actors-core + ydb-library-ydb_issue yql-utils-failure_injector providers-common-config providers-common-gateway diff --git a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.linux-aarch64.txt index c6e00e73739..7a81bfb4238 100644 --- a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.linux-aarch64.txt +++ b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.linux-aarch64.txt @@ -17,6 +17,7 @@ target_link_libraries(providers-dq-worker_manager PUBLIC contrib-libs-cxxsupp yutil cpp-actors-core + ydb-library-ydb_issue yql-utils-failure_injector providers-common-config providers-common-gateway diff --git a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.linux-x86_64.txt b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.linux-x86_64.txt index c6e00e73739..7a81bfb4238 100644 --- a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.linux-x86_64.txt +++ b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.linux-x86_64.txt @@ -17,6 +17,7 @@ target_link_libraries(providers-dq-worker_manager PUBLIC contrib-libs-cxxsupp yutil cpp-actors-core + ydb-library-ydb_issue yql-utils-failure_injector providers-common-config providers-common-gateway diff --git a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.windows-x86_64.txt b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.windows-x86_64.txt index 3980bbc31ce..77a1aa8bef8 100644 --- a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.windows-x86_64.txt +++ b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.windows-x86_64.txt @@ -16,6 +16,7 @@ target_link_libraries(providers-dq-worker_manager PUBLIC contrib-libs-cxxsupp yutil cpp-actors-core + ydb-library-ydb_issue yql-utils-failure_injector providers-common-config providers-common-gateway diff --git a/ydb/library/yql/providers/dq/worker_manager/ya.make b/ydb/library/yql/providers/dq/worker_manager/ya.make index 5e7fbb27f0d..63c61eabd8d 100644 --- a/ydb/library/yql/providers/dq/worker_manager/ya.make +++ b/ydb/library/yql/providers/dq/worker_manager/ya.make @@ -2,6 +2,7 @@ LIBRARY() PEERDIR( library/cpp/actors/core + ydb/library/ydb_issue ydb/library/yql/utils/failure_injector ydb/library/yql/providers/common/config ydb/library/yql/providers/common/gateway diff --git a/ydb/library/yql/providers/s3/actors/yql_s3_applicator_actor.cpp b/ydb/library/yql/providers/s3/actors/yql_s3_applicator_actor.cpp index bf1dfaeccb5..24df57da39d 100644 --- a/ydb/library/yql/providers/s3/actors/yql_s3_applicator_actor.cpp +++ b/ydb/library/yql/providers/s3/actors/yql_s3_applicator_actor.cpp @@ -2,7 +2,7 @@ #include "yql_s3_applicator_actor.h" #include <ydb/core/fq/libs/events/events.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/providers/common/http_gateway/yql_http_default_retry_policy.h> #include <ydb/library/yql/providers/s3/proto/sink.pb.h> diff --git a/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp b/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp index dcda43cca01..40a1d4f494e 100644 --- a/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp +++ b/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp @@ -37,7 +37,7 @@ #include "yql_s3_source_factory.h" #include "yql_s3_actors_util.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/core/yql_expr_type_annotation.h> #include <ydb/library/yql/minikql/mkql_string_util.h> diff --git a/ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp b/ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp index 0493626a1ae..1478d110155 100644 --- a/ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp +++ b/ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp @@ -1,7 +1,7 @@ #include "yql_s3_write_actor.h" #include "yql_s3_actors_util.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/yql/providers/common/http_gateway/yql_http_default_retry_policy.h> #include <ydb/library/yql/providers/common/provider/yql_provider_names.h> diff --git a/ydb/library/yql/utils/actor_log/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/utils/actor_log/CMakeLists.darwin-x86_64.txt index fdbde6130a2..66a0c659e7c 100644 --- a/ydb/library/yql/utils/actor_log/CMakeLists.darwin-x86_64.txt +++ b/ydb/library/yql/utils/actor_log/CMakeLists.darwin-x86_64.txt @@ -13,7 +13,7 @@ target_link_libraries(yql-utils-actor_log PUBLIC yutil cpp-actors-core cpp-actors-protos - ydb-core-protos + ydb-library-services ) target_sources(yql-utils-actor_log PRIVATE ${CMAKE_SOURCE_DIR}/ydb/library/yql/utils/actor_log/log.cpp diff --git a/ydb/library/yql/utils/actor_log/CMakeLists.linux-aarch64.txt b/ydb/library/yql/utils/actor_log/CMakeLists.linux-aarch64.txt index 6716245e74a..656ffc43e7f 100644 --- a/ydb/library/yql/utils/actor_log/CMakeLists.linux-aarch64.txt +++ b/ydb/library/yql/utils/actor_log/CMakeLists.linux-aarch64.txt @@ -14,7 +14,7 @@ target_link_libraries(yql-utils-actor_log PUBLIC yutil cpp-actors-core cpp-actors-protos - ydb-core-protos + ydb-library-services ) target_sources(yql-utils-actor_log PRIVATE ${CMAKE_SOURCE_DIR}/ydb/library/yql/utils/actor_log/log.cpp diff --git a/ydb/library/yql/utils/actor_log/CMakeLists.linux-x86_64.txt b/ydb/library/yql/utils/actor_log/CMakeLists.linux-x86_64.txt index 6716245e74a..656ffc43e7f 100644 --- a/ydb/library/yql/utils/actor_log/CMakeLists.linux-x86_64.txt +++ b/ydb/library/yql/utils/actor_log/CMakeLists.linux-x86_64.txt @@ -14,7 +14,7 @@ target_link_libraries(yql-utils-actor_log PUBLIC yutil cpp-actors-core cpp-actors-protos - ydb-core-protos + ydb-library-services ) target_sources(yql-utils-actor_log PRIVATE ${CMAKE_SOURCE_DIR}/ydb/library/yql/utils/actor_log/log.cpp diff --git a/ydb/library/yql/utils/actor_log/CMakeLists.windows-x86_64.txt b/ydb/library/yql/utils/actor_log/CMakeLists.windows-x86_64.txt index fdbde6130a2..66a0c659e7c 100644 --- a/ydb/library/yql/utils/actor_log/CMakeLists.windows-x86_64.txt +++ b/ydb/library/yql/utils/actor_log/CMakeLists.windows-x86_64.txt @@ -13,7 +13,7 @@ target_link_libraries(yql-utils-actor_log PUBLIC yutil cpp-actors-core cpp-actors-protos - ydb-core-protos + ydb-library-services ) target_sources(yql-utils-actor_log PRIVATE ${CMAKE_SOURCE_DIR}/ydb/library/yql/utils/actor_log/log.cpp diff --git a/ydb/library/yql/utils/actor_log/log.h b/ydb/library/yql/utils/actor_log/log.h index cd5d5f8ae8f..650c6aebcc3 100644 --- a/ydb/library/yql/utils/actor_log/log.h +++ b/ydb/library/yql/utils/actor_log/log.h @@ -2,7 +2,7 @@ #include <ydb/library/yql/utils/log/log.h> #include <ydb/library/yql/utils/log/tls_backend.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/actorsystem.h> #include <library/cpp/actors/core/actor.h> diff --git a/ydb/library/yql/utils/actor_log/ya.make b/ydb/library/yql/utils/actor_log/ya.make index 2d449bc0f7b..bc9e9889ac5 100644 --- a/ydb/library/yql/utils/actor_log/ya.make +++ b/ydb/library/yql/utils/actor_log/ya.make @@ -7,7 +7,7 @@ SRCS( PEERDIR( library/cpp/actors/core library/cpp/actors/protos - ydb/core/protos + ydb/library/services ) END() diff --git a/ydb/library/yverify_stream/CMakeLists.darwin-x86_64.txt b/ydb/library/yverify_stream/CMakeLists.darwin-x86_64.txt new file mode 100644 index 00000000000..32f3123873b --- /dev/null +++ b/ydb/library/yverify_stream/CMakeLists.darwin-x86_64.txt @@ -0,0 +1,14 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_library(ydb-library-yverify_stream INTERFACE) +target_link_libraries(ydb-library-yverify_stream INTERFACE + contrib-libs-cxxsupp + yutil +) diff --git a/ydb/library/yverify_stream/CMakeLists.linux-aarch64.txt b/ydb/library/yverify_stream/CMakeLists.linux-aarch64.txt new file mode 100644 index 00000000000..1fe4c0e9c0a --- /dev/null +++ b/ydb/library/yverify_stream/CMakeLists.linux-aarch64.txt @@ -0,0 +1,15 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_library(ydb-library-yverify_stream INTERFACE) +target_link_libraries(ydb-library-yverify_stream INTERFACE + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil +) diff --git a/ydb/library/yverify_stream/CMakeLists.linux-x86_64.txt b/ydb/library/yverify_stream/CMakeLists.linux-x86_64.txt new file mode 100644 index 00000000000..1fe4c0e9c0a --- /dev/null +++ b/ydb/library/yverify_stream/CMakeLists.linux-x86_64.txt @@ -0,0 +1,15 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_library(ydb-library-yverify_stream INTERFACE) +target_link_libraries(ydb-library-yverify_stream INTERFACE + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil +) diff --git a/ydb/library/yverify_stream/CMakeLists.txt b/ydb/library/yverify_stream/CMakeLists.txt new file mode 100644 index 00000000000..f8b31df0c11 --- /dev/null +++ b/ydb/library/yverify_stream/CMakeLists.txt @@ -0,0 +1,17 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-aarch64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + include(CMakeLists.darwin-x86_64.txt) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) + include(CMakeLists.windows-x86_64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-x86_64.txt) +endif() diff --git a/ydb/library/yverify_stream/CMakeLists.windows-x86_64.txt b/ydb/library/yverify_stream/CMakeLists.windows-x86_64.txt new file mode 100644 index 00000000000..32f3123873b --- /dev/null +++ b/ydb/library/yverify_stream/CMakeLists.windows-x86_64.txt @@ -0,0 +1,14 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_library(ydb-library-yverify_stream INTERFACE) +target_link_libraries(ydb-library-yverify_stream INTERFACE + contrib-libs-cxxsupp + yutil +) diff --git a/ydb/library/yverify_stream/ya.make b/ydb/library/yverify_stream/ya.make new file mode 100644 index 00000000000..2455b6e521b --- /dev/null +++ b/ydb/library/yverify_stream/ya.make @@ -0,0 +1,7 @@ +LIBRARY() + +SRCS( + yverify_stream.h +) + +END() diff --git a/ydb/core/util/yverify_stream.h b/ydb/library/yverify_stream/yverify_stream.h index fcbf57f5659..fcbf57f5659 100644 --- a/ydb/core/util/yverify_stream.h +++ b/ydb/library/yverify_stream/yverify_stream.h diff --git a/ydb/public/lib/validation/main.cpp b/ydb/public/lib/validation/main.cpp index ffecf3e99ae..c161d39aa95 100644 --- a/ydb/public/lib/validation/main.cpp +++ b/ydb/public/lib/validation/main.cpp @@ -1,7 +1,7 @@ #include "helpers.h" #include <ydb/public/api//protos/annotations/validation.pb.h> -#include <ydb/core/util/yverify_stream.h> +#include <ydb/library/yverify_stream/yverify_stream.h> #include <google/protobuf/compiler/code_generator.h> #include <google/protobuf/compiler/plugin.h> diff --git a/ydb/services/ext_index/metadata/extractor/hash_by_columns.cpp b/ydb/services/ext_index/metadata/extractor/hash_by_columns.cpp index d26aa85f7b3..e870e428810 100644 --- a/ydb/services/ext_index/metadata/extractor/hash_by_columns.cpp +++ b/ydb/services/ext_index/metadata/extractor/hash_by_columns.cpp @@ -1,5 +1,5 @@ #include "hash_by_columns.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/sharding/sharding.h> #include <ydb/library/yql/utils/yql_panic.h> #include <ydb/library/yql/minikql/jsonpath/jsonpath.h> diff --git a/ydb/services/metadata/common/ss_dialog.cpp b/ydb/services/metadata/common/ss_dialog.cpp index ebe2851c3e0..81e61ed15a8 100644 --- a/ydb/services/metadata/common/ss_dialog.cpp +++ b/ydb/services/metadata/common/ss_dialog.cpp @@ -2,7 +2,7 @@ #include <ydb/core/base/path.h> #include <ydb/core/base/tablet_pipecache.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/tx/scheme_cache/scheme_cache.h> namespace NKikimr::NMetadata::NInternal { diff --git a/ydb/services/metadata/ds_table/scheme_describe.cpp b/ydb/services/metadata/ds_table/scheme_describe.cpp index 2d518435d55..35d8f121f79 100644 --- a/ydb/services/metadata/ds_table/scheme_describe.cpp +++ b/ydb/services/metadata/ds_table/scheme_describe.cpp @@ -2,7 +2,7 @@ #include <ydb/core/tx/scheme_cache/scheme_cache.h> #include <ydb/core/tx/schemeshard/schemeshard.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/ydb_convert/ydb_convert.h> #include <ydb/core/ydb_convert/table_description.h> diff --git a/ydb/services/metadata/ds_table/table_exists.cpp b/ydb/services/metadata/ds_table/table_exists.cpp index 760c5f02e5e..ee4b44e8ca7 100644 --- a/ydb/services/metadata/ds_table/table_exists.cpp +++ b/ydb/services/metadata/ds_table/table_exists.cpp @@ -2,7 +2,7 @@ #include <ydb/core/tx/scheme_cache/scheme_cache.h> #include <ydb/core/tx/schemeshard/schemeshard.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/core/ydb_convert/ydb_convert.h> namespace NKikimr::NMetadata::NProvider { diff --git a/ydb/services/metadata/manager/table_record.cpp b/ydb/services/metadata/manager/table_record.cpp index 5d843540968..9ff6e5827db 100644 --- a/ydb/services/metadata/manager/table_record.cpp +++ b/ydb/services/metadata/manager/table_record.cpp @@ -1,7 +1,7 @@ #include "table_record.h" #include "ydb_value_operator.h" -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <library/cpp/actors/core/log.h> #include <util/string/builder.h> diff --git a/ydb/services/persqueue_v1/actors/partition_actor.h b/ydb/services/persqueue_v1/actors/partition_actor.h index e82ae258666..ef1f00c2e4b 100644 --- a/ydb/services/persqueue_v1/actors/partition_actor.h +++ b/ydb/services/persqueue_v1/actors/partition_actor.h @@ -10,7 +10,7 @@ #include <ydb/core/base/tablet_pipe.h> #include <ydb/core/persqueue/events/global.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/library/persqueue/topic_parser/topic_parser.h> diff --git a/ydb/services/persqueue_v1/actors/write_session_actor.ipp b/ydb/services/persqueue_v1/actors/write_session_actor.ipp index 3054d7cb3b2..0f6933c4d67 100644 --- a/ydb/services/persqueue_v1/actors/write_session_actor.ipp +++ b/ydb/services/persqueue_v1/actors/write_session_actor.ipp @@ -11,7 +11,7 @@ #include <ydb/library/persqueue/topic_parser/counters.h> #include <ydb/core/persqueue/pq_database.h> #include <ydb/core/persqueue/write_meta.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <ydb/public/lib/deprecated/kicli/kicli.h> #include <ydb/library/persqueue/topic_parser/topic_parser.h> #include <ydb/services/lib/sharding/sharding.h> diff --git a/ydb/services/persqueue_v1/ut/demo_tx.cpp b/ydb/services/persqueue_v1/ut/demo_tx.cpp index 18ca69792af..c66f409b25f 100644 --- a/ydb/services/persqueue_v1/ut/demo_tx.cpp +++ b/ydb/services/persqueue_v1/ut/demo_tx.cpp @@ -6,7 +6,7 @@ #include <ydb/public/sdk/cpp/client/ydb_table/table.h> #include <ydb/public/sdk/cpp/client/ydb_types/status_codes.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <util/stream/output.h> #include <util/string/builder.h> diff --git a/ydb/services/persqueue_v1/ut/topic_service_ut.cpp b/ydb/services/persqueue_v1/ut/topic_service_ut.cpp index 16882a8c62f..a0c9a0e0b70 100644 --- a/ydb/services/persqueue_v1/ut/topic_service_ut.cpp +++ b/ydb/services/persqueue_v1/ut/topic_service_ut.cpp @@ -5,7 +5,7 @@ #include <ydb/public/sdk/cpp/client/ydb_table/table.h> #include <ydb/public/sdk/cpp/client/ydb_types/status_codes.h> -#include <ydb/core/protos/services.pb.h> +#include <ydb/library/services/services.pb.h> #include <util/stream/output.h> #include <util/string/builder.h> |