From ed2145fb777e34f5798671ca8b623d775773f984 Mon Sep 17 00:00:00 2001 From: Bulat Date: Fri, 12 Apr 2024 18:27:12 +0300 Subject: [PATCH] Moved SDK code to src (#149) --- .gitignore | 28 +- CMakeLists.txt | 13 +- .../db_driver_state/CMakeLists.txt | 23 -- .../ydb_federated_topic/impl/CMakeLists.txt | 28 -- client/ydb_persqueue_core/impl/CMakeLists.txt | 32 -- client/ydb_persqueue_public/persqueue.h | 2 - client/ydb_topic/impl/CMakeLists.txt | 33 -- client/ydb_topic/ut/CMakeLists.txt | 19 -- client/ydb_topic/ut/ut_utils/CMakeLists.txt | 19 -- cmake/global_vars.cmake | 6 +- cmake/testing.cmake | 2 +- contrib/libs/libc_compat/CMakeLists.txt | 6 +- contrib/libs/libc_compat/ya.make | 2 +- contrib/libs/lzmasdk/CMakeLists.txt | 6 +- contrib/libs/nayuki_md5/CMakeLists.txt | 6 +- examples/basic_example/basic_example.cpp | 2 +- examples/basic_example/basic_example.h | 4 +- examples/basic_example/main.cpp | 4 +- examples/bulk_upsert_simple/main.cpp | 6 +- examples/pagination/main.cpp | 2 +- examples/pagination/pagination.cpp | 2 +- examples/pagination/pagination.h | 4 +- examples/secondary_index/secondary_index.cpp | 2 +- examples/secondary_index/secondary_index.h | 6 +- .../secondary_index_generate.cpp | 4 +- .../secondary_index/secondary_index_list.cpp | 2 +- .../secondary_index.cpp | 2 +- .../secondary_index_builtin/secondary_index.h | 12 +- .../secondary_index_fill.cpp | 2 +- examples/topic_reader/eventloop/main.cpp | 4 +- examples/topic_reader/simple/main.cpp | 4 +- .../topic_reader/transaction/application.h | 6 +- examples/topic_reader/transaction/main.cpp | 2 +- examples/topic_reader/transaction/options.cpp | 2 +- examples/topic_reader/transaction/options.h | 2 +- examples/ttl/main.cpp | 2 +- examples/ttl/ttl.h | 4 +- examples/ttl/util.h | 6 +- library/CMakeLists.txt | 9 - library/cpp/blockcodecs/codecs.h | 3 - library/cpp/blockcodecs/stream.h | 3 - library/cpp/build_info/CMakeLists.txt | 48 --- library/cpp/charset/lite/CMakeLists.txt | 15 - .../disjoint_interval_tree/ut/ya.make | 7 - .../containers/intrusive_rb_tree/ut/ya.make | 7 - library/cpp/coroutine/engine/CMakeLists.txt | 39 --- library/cpp/coroutine/engine/ut/ya.make | 7 - library/cpp/deprecated/atomic/ut/ya.make | 5 - .../internal/proxies/avx2/proxy_avx2.cpp | 18 - .../internal/proxies/avx2/proxy_avx2.h | 11 - .../internal/proxies/ref/proxy_ref.cpp | 20 -- .../argonish/internal/proxies/ref/proxy_ref.h | 11 - .../internal/proxies/sse2/proxy_sse2.cpp | 18 - .../internal/proxies/sse2/proxy_sse2.h | 11 - .../internal/proxies/sse41/proxy_sse41.cpp | 18 - .../internal/proxies/sse41/proxy_sse41.h | 11 - .../internal/proxies/ssse3/proxy_ssse3.cpp | 18 - .../internal/proxies/ssse3/proxy_ssse3.h | 11 - library/cpp/digest/argonish/ut/ya.make | 11 - library/cpp/digest/lower_case/CMakeLists.txt | 11 - library/cpp/digest/md5/ut/ya.make | 7 - library/cpp/digest/murmur/ut/ya.make | 13 - library/cpp/getopt/last_getopt.h | 3 - library/cpp/getopt/last_getopt_support.h | 3 - library/cpp/getopt/modchooser.h | 3 - library/cpp/getopt/opt.h | 3 - library/cpp/getopt/opt2.h | 3 - library/cpp/getopt/posix_getopt.h | 3 - library/cpp/getopt/small/CMakeLists.txt | 29 -- library/cpp/getopt/ygetopt.h | 3 - library/cpp/http/fetch/CMakeLists.txt | 33 -- library/cpp/http/server/CMakeLists.txt | 19 -- library/cpp/http/simple/ut/ya.make | 21 -- library/cpp/iterator/CMakeLists.txt | 17 - library/cpp/json/json_value.h | 3 - library/cpp/logger/CMakeLists.txt | 57 ---- .../dynamic_counters/percentile/ut/ya.make | 7 - .../cpp/monlib/dynamic_counters/ut/ya.make | 14 - library/cpp/monlib/encode/buffered/ut/ya.make | 7 - library/cpp/monlib/encode/fuzz/ya.make | 5 - library/cpp/monlib/encode/json/fuzz/ya.make | 14 - .../cpp/monlib/encode/prometheus/fuzz/ya.make | 14 - .../cpp/monlib/encode/prometheus/ut/ya.make | 12 - library/cpp/monlib/encode/spack/ut/ya.make | 11 - library/cpp/monlib/encode/text/ut/ya.make | 7 - library/cpp/monlib/encode/ut/ya.make | 7 - library/cpp/monlib/metrics/CMakeLists.txt | 34 -- .../cpp/monlib/service/pages/CMakeLists.txt | 30 -- library/cpp/openssl/io/ut/ya.make | 7 - library/cpp/openssl/method/ut/ya.make | 7 - library/cpp/resource/ut/ya.make | 7 - library/cpp/streams/brotli/ut/ya.make | 7 - library/cpp/streams/bzip2/ut/ya.make | 7 - library/cpp/streams/lzma/ut/ya.make | 7 - library/cpp/streams/zstd/ut/ya.make | 7 - library/cpp/string_utils/quote/ut/ya.make | 7 - .../string_utils/relaxed_escaper/ut/ya.make | 7 - library/cpp/string_utils/url/ut/ya.make | 7 - library/cpp/testing/common/CMakeLists.txt | 17 - library/cpp/testing/gmock_in_unittest/gmock.h | 5 - library/cpp/testing/gtest/ut/ya.make | 15 - .../testing/gtest_extensions/CMakeLists.txt | 16 - library/cpp/testing/unittest/CMakeLists.txt | 24 -- library/cpp/testing/unittest/env.h | 3 - .../cpp/testing/unittest_main/CMakeLists.txt | 19 -- library/cpp/testing/unittest_main/ya.make | 12 - library/cpp/threading/atomic/ut/ya.make | 7 - library/cpp/threading/chunk_queue/ut/ya.make | 7 - library/cpp/threading/equeue/ut/ya.make | 14 - library/cpp/threading/future/CMakeLists.txt | 17 - .../cpp/threading/light_rw_lock/ut/ya.make | 11 - .../cpp/threading/poor_man_openmp/ut/ya.make | 7 - library/cpp/uri/CMakeLists.txt | 42 --- library/cpp/yson/CMakeLists.txt | 22 -- library/cpp/yson/node/CMakeLists.txt | 24 -- library/cpp/yt/coding/unittests/ya.make | 15 - library/cpp/yt/memory/CMakeLists.txt | 28 -- library/cpp/yt/yson_string/unittests/ya.make | 16 - scripts/c_templates/README.md | 2 +- scripts/c_templates/svn_interface.c | 2 +- scripts/c_templates/svnversion.h | 2 +- src/CMakeLists.txt | 6 + {ydb/public => src}/api/CMakeLists.txt | 0 {ydb/public => src}/api/README.md | 0 {ydb/public => src}/api/client/CMakeLists.txt | 0 .../api/client/yc_private/CMakeLists.txt | 0 .../client/yc_private/compute/CMakeLists.txt | 0 .../yc_private/compute/inner/CMakeLists.txt | 4 +- .../compute/inner/disk_service.proto | 2 +- src/api/client/yc_private/iam/CMakeLists.txt | 38 +++ .../api/client/yc_private/iam/iam_token.proto | 0 .../yc_private/iam/iam_token_service.proto | 6 +- .../iam/iam_token_service_subject.proto | 0 .../client/yc_private/iam/oauth_request.proto | 0 .../api/client/yc_private/iam/reference.proto | 0 .../yc_private/iam/service_account.proto | 0 .../iam/service_account_service.proto | 10 +- .../client/yc_private/iam/user_account.proto | 0 .../yc_private/iam/user_account_service.proto | 4 +- .../iam/yandex_passport_cookie.proto | 0 .../api/client/yc_private/kms/CMakeLists.txt | 6 +- .../kms/asymmetricencryption/CMakeLists.txt | 4 +- .../asymmetric_encryption_key.proto | 2 +- .../kms/asymmetricsignature/CMakeLists.txt | 4 +- .../asymmetric_signature_key.proto | 2 +- .../kms/symmetric_crypto_service.proto | 8 +- .../client/yc_private/kms/symmetric_key.proto | 2 +- .../yc_private/operation/CMakeLists.txt | 6 +- .../yc_private/operation/operation.proto | 0 .../yc_private/resourcemanager/CMakeLists.txt | 6 +- .../yc_private/resourcemanager/folder.proto | 2 +- .../resourcemanager/folder_service.proto | 2 +- .../transitional/folder_service.proto | 4 +- .../yc_private/servicecontrol/CMakeLists.txt | 4 +- .../servicecontrol/access_service.proto | 2 +- .../yc_private/servicecontrol/resource.proto | 0 .../api/client/yc_public/CMakeLists.txt | 0 .../api/client/yc_public/README.md | 0 .../client/yc_public/common/CMakeLists.txt | 2 +- .../client/yc_public/common/validation.proto | 0 .../client/yc_public/events/CMakeLists.txt | 6 +- .../api/client/yc_public/events/common.proto | 4 +- .../api/client/yc_public/events/options.proto | 0 .../api/client/yc_public/events/yq.proto | 6 +- .../api/client/yc_public/iam/CMakeLists.txt | 2 +- .../yc_public/iam/iam_token_service.proto | 2 +- .../client/yc_public/logging/CMakeLists.txt | 6 +- .../client/yc_public/logging/log_entry.proto | 4 +- .../logging/log_ingestion_service.proto | 6 +- .../yc_public/logging/log_resource.proto | 2 +- src/api/grpc/CMakeLists.txt | 44 +++ src/api/grpc/draft/CMakeLists.txt | 35 ++ .../public => src}/api/grpc/draft/dummy.proto | 2 +- .../public => src}/api/grpc/draft/fq_v1.proto | 2 +- .../draft/ydb_clickhouse_internal_v1.proto | 2 +- .../api/grpc/draft/ydb_datastreams_v1.proto | 2 +- .../grpc/draft/ydb_dynamic_config_v1.proto | 2 +- .../api/grpc/draft/ydb_logstore_v1.proto | 2 +- .../api/grpc/draft/ydb_long_tx_v1.proto | 2 +- .../api/grpc/draft/ydb_maintenance_v1.proto | 2 +- .../api/grpc/draft/ydb_persqueue_v1.proto | 4 +- .../public => src}/api/grpc/ydb_auth_v1.proto | 2 +- {ydb/public => src}/api/grpc/ydb_cms_v1.proto | 2 +- .../api/grpc/ydb_coordination_v1.proto | 2 +- .../api/grpc/ydb_discovery_v1.proto | 2 +- .../api/grpc/ydb_export_v1.proto | 2 +- .../grpc/ydb_federation_discovery_v1.proto | 2 +- .../api/grpc/ydb_import_v1.proto | 2 +- .../api/grpc/ydb_keyvalue_v1.proto | 2 +- .../api/grpc/ydb_monitoring_v1.proto | 2 +- .../api/grpc/ydb_operation_v1.proto | 2 +- .../api/grpc/ydb_query_v1.proto | 4 +- .../api/grpc/ydb_rate_limiter_v1.proto | 2 +- .../api/grpc/ydb_scheme_v1.proto | 2 +- .../api/grpc/ydb_scripting_v1.proto | 2 +- .../api/grpc/ydb_table_v1.proto | 2 +- .../api/grpc/ydb_topic_v1.proto | 2 +- src/api/proto_output/CMakeLists.txt | 12 + .../api/proto_output/proto_output.cpp | 6 +- src/api/protos/CMakeLists.txt | 79 +++++ .../api/protos/annotations/CMakeLists.txt | 6 +- .../api/protos/annotations/sensitive.proto | 0 .../api/protos/annotations/validation.proto | 0 .../api/protos/draft/datastreams.proto | 2 +- {ydb/public => src}/api/protos/draft/fq.proto | 10 +- .../api/protos/draft/persqueue_common.proto | 2 +- .../protos/draft/persqueue_error_codes.proto | 0 .../api/protos/draft/ydb_dynamic_config.proto | 2 +- .../api/protos/draft/ydb_logstore.proto | 8 +- .../api/protos/draft/ydb_long_tx.proto | 2 +- .../api/protos/draft/ydb_maintenance.proto | 8 +- .../api/protos/persqueue_error_codes_v1.proto | 0 {ydb/public => src}/api/protos/ydb_auth.proto | 2 +- .../api/protos/ydb_clickhouse_internal.proto | 4 +- {ydb/public => src}/api/protos/ydb_cms.proto | 2 +- .../api/protos/ydb_common.proto | 0 .../api/protos/ydb_coordination.proto | 8 +- .../api/protos/ydb_discovery.proto | 2 +- .../api/protos/ydb_export.proto | 4 +- .../api/protos/ydb_federation_discovery.proto | 2 +- .../api/protos/ydb_formats.proto | 0 .../api/protos/ydb_import.proto | 4 +- .../api/protos/ydb_issue_message.proto | 4 +- .../api/protos/ydb_keyvalue.proto | 2 +- .../api/protos/ydb_monitoring.proto | 2 +- .../api/protos/ydb_operation.proto | 8 +- .../ydb_persqueue_cluster_discovery.proto | 2 +- .../api/protos/ydb_persqueue_v1.proto | 10 +- .../public => src}/api/protos/ydb_query.proto | 12 +- .../api/protos/ydb_query_stats.proto | 0 .../api/protos/ydb_rate_limiter.proto | 4 +- .../api/protos/ydb_scheme.proto | 4 +- .../api/protos/ydb_scripting.proto | 14 +- .../api/protos/ydb_status_codes.proto | 0 .../public => src}/api/protos/ydb_table.proto | 20 +- .../public => src}/api/protos/ydb_topic.proto | 10 +- .../public => src}/api/protos/ydb_value.proto | 0 {client => src/client}/CMakeLists.txt | 0 {client => src/client}/draft/CMakeLists.txt | 6 +- .../client}/draft/ydb_dynamic_config.cpp | 4 +- .../client}/draft/ydb_dynamic_config.h | 18 +- {client => src/client}/draft/ydb_long_tx.cpp | 4 +- {client => src/client}/draft/ydb_long_tx.h | 6 +- .../client}/draft/ydb_scripting.cpp | 10 +- {client => src/client}/draft/ydb_scripting.h | 6 +- .../client}/extensions/CMakeLists.txt | 0 .../discovery_mutator/CMakeLists.txt | 2 +- .../discovery_mutator/discovery_mutator.cpp | 0 .../discovery_mutator/discovery_mutator.h | 2 +- .../extensions/solomon_stats/CMakeLists.txt | 4 +- .../extensions/solomon_stats/README.md | 6 +- .../extensions/solomon_stats/pull_client.cpp | 0 .../extensions/solomon_stats/pull_client.h | 16 +- .../solomon_stats/pull_connector.cpp | 0 .../extensions/solomon_stats/pull_connector.h | 6 +- {client => src/client}/helpers/CMakeLists.txt | 2 +- {client => src/client}/helpers/helpers.cpp | 10 +- {client => src/client}/helpers/helpers.h | 2 +- {client => src/client}/iam/CMakeLists.txt | 2 +- .../client}/iam/common/CMakeLists.txt | 4 +- {client => src/client}/iam/common/iam.cpp | 4 +- {client => src/client}/iam/common/iam.h | 20 +- {client => src/client}/iam/iam.cpp | 6 +- {client => src/client}/iam/iam.h | 0 .../client}/iam_private/CMakeLists.txt | 2 +- {client => src/client}/iam_private/iam.cpp | 6 +- {client => src/client}/iam_private/iam.h | 2 +- {client => src/client}/impl/CMakeLists.txt | 0 .../client}/impl/ydb_endpoints/CMakeLists.txt | 2 +- .../client}/impl/ydb_endpoints/endpoints.cpp | 6 +- .../client}/impl/ydb_endpoints/endpoints.h | 2 +- .../client}/impl/ydb_internal/CMakeLists.txt | 0 .../impl/ydb_internal/common/CMakeLists.txt | 4 +- .../impl/ydb_internal/common/getenv.cpp | 0 .../client}/impl/ydb_internal/common/getenv.h | 0 .../impl/ydb_internal/common/parser.cpp | 2 +- .../client}/impl/ydb_internal/common/parser.h | 0 .../ydb_internal/common/ssl_credentials.h | 0 .../client}/impl/ydb_internal/common/types.h | 10 +- .../db_driver_state/CMakeLists.txt | 17 + .../db_driver_state/authenticator.cpp | 2 +- .../db_driver_state/authenticator.h | 6 +- .../db_driver_state/endpoint_pool.cpp | 0 .../db_driver_state/endpoint_pool.h | 12 +- .../ydb_internal/db_driver_state/state.cpp | 8 +- .../impl/ydb_internal/db_driver_state/state.h | 8 +- .../impl/ydb_internal/driver/constants.h | 4 +- .../grpc_connections/CMakeLists.txt | 6 +- .../ydb_internal/grpc_connections/actions.cpp | 2 +- .../ydb_internal/grpc_connections/actions.h | 14 +- .../grpc_connections/grpc_connections.cpp | 2 +- .../grpc_connections/grpc_connections.h | 18 +- .../ydb_internal/grpc_connections/params.h | 10 +- .../ydb_internal/internal_client/client.h | 12 +- .../impl/ydb_internal/internal_header.h | 2 +- .../kqp_session_common/CMakeLists.txt | 2 +- .../kqp_session_common/kqp_session_common.cpp | 2 +- .../kqp_session_common/kqp_session_common.h | 8 +- .../impl/ydb_internal/logger/CMakeLists.txt | 2 +- .../client}/impl/ydb_internal/logger/log.cpp | 6 +- .../client}/impl/ydb_internal/logger/log.h | 4 +- .../ydb_internal/make_request/CMakeLists.txt | 4 +- .../impl/ydb_internal/make_request/make.cpp | 0 .../impl/ydb_internal/make_request/make.h | 6 +- .../ydb_internal/plain_status/CMakeLists.txt | 4 +- .../impl/ydb_internal/plain_status/status.cpp | 2 +- .../impl/ydb_internal/plain_status/status.h | 10 +- .../impl/ydb_internal/retry/CMakeLists.txt | 4 +- .../client}/impl/ydb_internal/retry/retry.cpp | 6 +- .../client}/impl/ydb_internal/retry/retry.h | 18 +- .../impl/ydb_internal/retry/retry_async.h | 4 +- .../impl/ydb_internal/retry/retry_sync.h | 6 +- .../rpc_request_settings/settings.h | 4 +- .../ydb_internal/scheme_helpers/helpers.h | 2 +- .../session_client/session_client.h | 2 +- .../ydb_internal/session_pool/CMakeLists.txt | 5 +- .../session_pool/session_pool.cpp | 8 +- .../ydb_internal/session_pool/session_pool.h | 4 +- .../ydb_internal/stats_extractor/extractor.h | 8 +- .../impl/ydb_internal/table_helpers/helpers.h | 6 +- .../ydb_internal/thread_pool/CMakeLists.txt | 4 +- .../impl/ydb_internal/thread_pool/pool.cpp | 0 .../impl/ydb_internal/thread_pool/pool.h | 4 +- .../ydb_internal/value_helpers/CMakeLists.txt | 4 +- .../ydb_internal/value_helpers/helpers.cpp | 6 +- .../impl/ydb_internal/value_helpers/helpers.h | 4 +- .../client}/impl/ydb_stats/CMakeLists.txt | 2 +- .../client}/impl/ydb_stats/stats.cpp | 0 {client => src/client}/impl/ydb_stats/stats.h | 8 +- .../client}/resources/CMakeLists.txt | 12 +- {client => src/client}/resources/ydb_ca.cpp | 2 +- {client => src/client}/resources/ydb_ca.h | 0 .../client}/resources/ydb_resources.cpp | 2 +- .../client}/resources/ydb_resources.h | 0 .../client}/resources/ydb_root_ca.pem | 0 .../client}/resources/ydb_sdk_version.txt | 0 .../client}/ydb_common_client/CMakeLists.txt | 2 +- .../ydb_common_client/impl/CMakeLists.txt | 2 +- .../client}/ydb_common_client/impl/client.cpp | 0 .../client}/ydb_common_client/impl/client.h | 6 +- .../client}/ydb_common_client/impl/iface.h | 2 +- .../client}/ydb_common_client/settings.cpp | 2 +- .../client}/ydb_common_client/settings.h | 8 +- .../client}/ydb_coordination/CMakeLists.txt | 8 +- .../client}/ydb_coordination/coordination.cpp | 10 +- .../client}/ydb_coordination/coordination.h | 2 +- .../ydb_coordination/proto_accessor.cpp | 2 +- .../client}/ydb_datastreams/CMakeLists.txt | 5 +- .../client}/ydb_datastreams/datastreams.cpp | 8 +- .../client}/ydb_datastreams/datastreams.h | 4 +- .../client}/ydb_discovery/CMakeLists.txt | 2 +- .../client}/ydb_discovery/discovery.cpp | 2 +- .../client}/ydb_discovery/discovery.h | 2 +- .../client}/ydb_driver/CMakeLists.txt | 3 +- {client => src/client}/ydb_driver/driver.cpp | 18 +- {client => src/client}/ydb_driver/driver.h | 16 +- .../client}/ydb_export/CMakeLists.txt | 6 +- {client => src/client}/ydb_export/export.cpp | 14 +- {client => src/client}/ydb_export/export.h | 6 +- .../client}/ydb_extension/CMakeLists.txt | 2 +- .../client}/ydb_extension/extension.cpp | 4 +- .../client}/ydb_extension/extension.h | 4 +- .../ydb_federated_topic/CMakeLists.txt | 4 +- .../ydb_federated_topic/federated_topic.h | 4 +- .../ydb_federated_topic/impl/CMakeLists.txt | 28 ++ .../impl/federated_read_session.cpp | 8 +- .../impl/federated_read_session.h | 8 +- .../impl/federated_read_session_event.cpp | 4 +- .../impl/federated_topic.cpp | 4 +- .../impl/federated_topic_impl.cpp | 4 +- .../impl/federated_topic_impl.h | 14 +- .../impl/federated_write_session.cpp | 6 +- .../impl/federated_write_session.h | 6 +- .../impl/federation_observer.cpp | 4 +- .../impl/federation_observer.h | 16 +- .../ut/CMakeLists.darwin-arm64.txt | 0 .../ut/CMakeLists.darwin-x86_64.txt | 0 .../ut/CMakeLists.linux-aarch64.txt | 0 .../ut/CMakeLists.linux-x86_64.txt | 0 .../ydb_federated_topic/ut/CMakeLists.txt | 6 +- .../ut/CMakeLists.windows-x86_64.txt | 0 .../ydb_federated_topic/ut/basic_usage_ut.cpp | 22 +- .../client}/ydb_federated_topic/ut/fds_mock.h | 4 +- .../client}/ydb_federated_topic/ut/ya.make | 2 +- .../client}/ydb_import/CMakeLists.txt | 7 +- {client => src/client}/ydb_import/import.cpp | 12 +- {client => src/client}/ydb_import/import.h | 6 +- .../client}/ydb_monitoring/CMakeLists.txt | 6 +- .../client}/ydb_monitoring/monitoring.cpp | 10 +- .../client}/ydb_monitoring/monitoring.h | 2 +- .../client}/ydb_operation/CMakeLists.txt | 4 +- .../client}/ydb_operation/operation.cpp | 18 +- .../client}/ydb_operation/operation.h | 6 +- .../client}/ydb_params/CMakeLists.txt | 4 +- {client => src/client}/ydb_params/impl.cpp | 4 +- {client => src/client}/ydb_params/impl.h | 0 {client => src/client}/ydb_params/params.cpp | 6 +- {client => src/client}/ydb_params/params.h | 2 +- .../client}/ydb_persqueue_core/CMakeLists.txt | 10 +- .../ydb_persqueue_core/impl/CMakeLists.txt | 26 ++ .../impl/callback_context.h | 6 +- .../ydb_persqueue_core/impl/common.cpp | 2 +- .../client}/ydb_persqueue_core/impl/common.h | 6 +- .../ydb_persqueue_core/impl/counters_logger.h | 14 +- .../ydb_persqueue_core/impl/log_lazy.h | 0 .../ydb_persqueue_core/impl/persqueue.cpp | 14 +- .../impl/persqueue_impl.cpp | 0 .../ydb_persqueue_core/impl/persqueue_impl.h | 6 +- .../ydb_persqueue_core/impl/read_session.cpp | 16 +- .../ydb_persqueue_core/impl/read_session.h | 18 +- .../ydb_persqueue_core/impl/read_session.ipp | 16 +- .../impl/read_session_messages.cpp | 2 +- .../ydb_persqueue_core/impl/write_session.cpp | 12 +- .../ydb_persqueue_core/impl/write_session.h | 6 +- .../impl/write_session_impl.cpp | 12 +- .../impl/write_session_impl.h | 6 +- .../client}/ydb_persqueue_core/persqueue.h | 30 +- .../ut/CMakeLists.darwin-arm64.txt | 0 .../ut/CMakeLists.darwin-x86_64.txt | 0 .../ut/CMakeLists.linux-aarch64.txt | 0 .../ut/CMakeLists.linux-x86_64.txt | 0 .../ydb_persqueue_core/ut/CMakeLists.txt | 6 +- .../ut/CMakeLists.windows-x86_64.txt | 0 .../ydb_persqueue_core/ut/basic_usage_ut.cpp | 18 +- .../ydb_persqueue_core/ut/common_ut.cpp | 4 +- .../ut/compress_executor_ut.cpp | 2 +- .../ydb_persqueue_core/ut/compression_ut.cpp | 2 +- .../ydb_persqueue_core/ut/read_session_ut.cpp | 16 +- .../ydb_persqueue_core/ut/retry_policy_ut.cpp | 6 +- .../ut/ut_utils/CMakeLists.darwin-arm64.txt | 0 .../ut/ut_utils/CMakeLists.darwin-x86_64.txt | 0 .../ut/ut_utils/CMakeLists.linux-aarch64.txt | 0 .../ut/ut_utils/CMakeLists.linux-x86_64.txt | 0 .../ut/ut_utils}/CMakeLists.txt | 6 +- .../ut/ut_utils/CMakeLists.windows-x86_64.txt | 0 .../ut/ut_utils/data_plane_helpers.cpp | 0 .../ut/ut_utils/data_plane_helpers.h | 6 +- .../ut/ut_utils/sdk_test_setup.h | 6 +- .../ut/ut_utils/test_server.cpp | 0 .../ut/ut_utils/test_server.h | 10 +- .../ut/ut_utils/test_utils.h | 10 +- .../ut/ut_utils/ut_utils.cpp | 0 .../ydb_persqueue_core/ut/ut_utils/ut_utils.h | 8 +- .../ydb_persqueue_core/ut/ut_utils/ya.make | 8 +- .../CMakeLists.darwin-arm64.txt | 0 .../CMakeLists.darwin-x86_64.txt | 0 .../CMakeLists.linux-aarch64.txt | 0 .../CMakeLists.linux-x86_64.txt | 0 .../CMakeLists.txt | 6 +- .../CMakeLists.windows-x86_64.txt | 0 .../ut/with_offset_ranges_mode_ut/ya.make | 2 +- .../client}/ydb_persqueue_core/ut/ya.make | 2 +- .../ydb_persqueue_public/CMakeLists.txt | 6 - .../codecs/CMakeLists.txt | 5 +- .../ydb_persqueue_public/codecs/codecs.cpp | 8 +- .../ydb_persqueue_public/codecs/codecs.h | 8 +- src/client/ydb_persqueue_public/persqueue.h | 2 + .../client}/ydb_proto/CMakeLists.txt | 2 +- {client => src/client}/ydb_proto/accessor.cpp | 2 +- {client => src/client}/ydb_proto/accessor.h | 30 +- .../client}/ydb_query/CMakeLists.txt | 8 +- {client => src/client}/ydb_query/client.cpp | 22 +- {client => src/client}/ydb_query/client.h | 10 +- .../client}/ydb_query/impl/CMakeLists.txt | 4 +- .../client}/ydb_query/impl/client_session.cpp | 4 +- .../client}/ydb_query/impl/client_session.h | 4 +- .../client}/ydb_query/impl/exec_query.cpp | 10 +- .../client}/ydb_query/impl/exec_query.h | 10 +- {client => src/client}/ydb_query/query.cpp | 0 {client => src/client}/ydb_query/query.h | 16 +- {client => src/client}/ydb_query/stats.cpp | 4 +- {client => src/client}/ydb_query/stats.h | 2 +- {client => src/client}/ydb_query/tx.cpp | 0 {client => src/client}/ydb_query/tx.h | 6 +- .../client}/ydb_rate_limiter/CMakeLists.txt | 2 +- .../client}/ydb_rate_limiter/rate_limiter.cpp | 6 +- .../client}/ydb_rate_limiter/rate_limiter.h | 2 +- .../client}/ydb_result/CMakeLists.txt | 4 +- .../client}/ydb_result/proto_accessor.cpp | 2 +- {client => src/client}/ydb_result/result.cpp | 10 +- {client => src/client}/ydb_result/result.h | 2 +- {client => src/client}/ydb_retry/retry.h | 4 +- .../client}/ydb_scheme/CMakeLists.txt | 8 +- {client => src/client}/ydb_scheme/scheme.cpp | 10 +- {client => src/client}/ydb_scheme/scheme.h | 2 +- .../client}/ydb_table/CMakeLists.txt | 10 +- .../client}/ydb_table/impl/CMakeLists.txt | 10 +- .../client}/ydb_table/impl/client_session.cpp | 2 +- .../client}/ydb_table/impl/client_session.h | 14 +- .../client}/ydb_table/impl/data_query.cpp | 0 .../client}/ydb_table/impl/data_query.h | 4 +- .../client}/ydb_table/impl/readers.cpp | 2 +- .../client}/ydb_table/impl/readers.h | 8 +- .../ydb_table/impl/request_migrator.cpp | 0 .../client}/ydb_table/impl/request_migrator.h | 4 +- .../client}/ydb_table/impl/table_client.cpp | 0 .../client}/ydb_table/impl/table_client.h | 18 +- .../client}/ydb_table/proto_accessor.cpp | 2 +- .../ydb_table/query_stats/CMakeLists.txt | 2 +- .../client}/ydb_table/query_stats/stats.cpp | 0 .../client}/ydb_table/query_stats/stats.h | 2 +- {client => src/client}/ydb_table/table.cpp | 40 +-- {client => src/client}/ydb_table/table.h | 20 +- {client => src/client}/ydb_table/table_enum.h | 0 .../client}/ydb_topic/CMakeLists.txt | 6 +- .../client}/ydb_topic/codecs/CMakeLists.txt | 3 +- .../client}/ydb_topic/codecs/codecs.cpp | 8 +- .../client}/ydb_topic/codecs/codecs.h | 6 +- src/client/ydb_topic/impl/CMakeLists.txt | 33 ++ .../client}/ydb_topic/impl/counters.cpp | 2 +- .../ydb_topic/impl/deferred_commit.cpp | 6 +- .../client}/ydb_topic/impl/event_handlers.cpp | 4 +- .../client}/ydb_topic/impl/executor.cpp | 0 .../client}/ydb_topic/impl/executor.h | 6 +- .../client}/ydb_topic/impl/read_session.cpp | 6 +- .../client}/ydb_topic/impl/read_session.h | 6 +- .../ydb_topic/impl/read_session_event.cpp | 4 +- .../client}/ydb_topic/impl/topic.cpp | 18 +- .../client}/ydb_topic/impl/topic_impl.cpp | 4 +- .../client}/ydb_topic/impl/topic_impl.h | 14 +- .../client}/ydb_topic/impl/write_session.cpp | 2 +- .../client}/ydb_topic/impl/write_session.h | 8 +- .../ydb_topic/impl/write_session_impl.cpp | 14 +- .../ydb_topic/impl/write_session_impl.h | 8 +- .../client}/ydb_topic/proto_accessor.cpp | 2 +- {client => src/client}/ydb_topic/topic.h | 30 +- .../ydb_topic/ut/CMakeLists.darwin-arm64.txt | 0 .../ydb_topic/ut/CMakeLists.darwin-x86_64.txt | 0 .../ydb_topic/ut/CMakeLists.linux-aarch64.txt | 0 .../ydb_topic/ut/CMakeLists.linux-x86_64.txt | 0 src/client/ydb_topic/ut/CMakeLists.txt | 19 ++ .../ut/CMakeLists.windows-x86_64.txt | 0 .../client}/ydb_topic/ut/basic_usage_ut.cpp | 20 +- .../ydb_topic/ut/describe_topic_ut.cpp | 18 +- .../ydb_topic/ut/local_partition_ut.cpp | 14 +- .../ydb_topic/ut/topic_to_table_ut.cpp | 10 +- .../ut/ut_utils/CMakeLists.darwin-arm64.txt | 0 .../ut/ut_utils/CMakeLists.darwin-x86_64.txt | 0 .../ut/ut_utils/CMakeLists.linux-aarch64.txt | 0 .../ut/ut_utils/CMakeLists.linux-x86_64.txt | 0 .../ydb_topic/ut/ut_utils/CMakeLists.txt | 19 ++ .../ut/ut_utils/CMakeLists.windows-x86_64.txt | 0 .../ut/ut_utils/managed_executor.cpp | 0 .../ydb_topic/ut/ut_utils/managed_executor.h | 4 +- .../ut/ut_utils/topic_sdk_test_setup.cpp | 0 .../ut/ut_utils/topic_sdk_test_setup.h | 4 +- .../client}/ydb_topic/ut/ut_utils/ya.make | 8 +- {client => src/client}/ydb_topic/ut/ya.make | 2 +- .../client}/ydb_types/CMakeLists.txt | 10 +- .../ydb_types/core_facility/core_facility.h | 4 +- .../ydb_types/credentials/CMakeLists.txt | 4 +- .../ydb_types/credentials/credentials.cpp | 2 +- .../ydb_types/credentials/credentials.h | 2 +- .../credentials/login/CMakeLists.txt | 6 +- .../ydb_types/credentials/login/login.cpp | 18 +- .../ydb_types/exceptions/CMakeLists.txt | 3 +- .../ydb_types/exceptions/exceptions.cpp | 0 .../client}/ydb_types/exceptions/exceptions.h | 2 +- .../fatal_error_handlers/CMakeLists.txt | 2 +- .../fatal_error_handlers/handlers.cpp | 2 +- .../ydb_types/fatal_error_handlers/handlers.h | 0 .../ydb_types/fluent_settings_helpers.h | 0 .../ydb_types/operation/CMakeLists.txt | 6 +- .../client}/ydb_types/operation/operation.cpp | 4 +- .../client}/ydb_types/operation/operation.h | 4 +- .../client}/ydb_types/request_settings.h | 2 +- .../client}/ydb_types/s3_settings.h | 0 .../client}/ydb_types/status/CMakeLists.txt | 2 +- .../client}/ydb_types/status/status.cpp | 4 +- .../client}/ydb_types/status/status.h | 8 +- .../client}/ydb_types/status_codes.h | 2 +- {client => src/client}/ydb_types/ydb.h | 0 .../client}/ydb_value/CMakeLists.txt | 8 +- {client => src/client}/ydb_value/value.cpp | 22 +- {client => src/client}/ydb_value/value.h | 2 +- .../lib => src}/json_value/CMakeLists.txt | 6 +- .../lib => src}/json_value/ydb_json_value.cpp | 8 +- .../lib => src}/json_value/ydb_json_value.h | 8 +- {library/cpp => src/library}/CMakeLists.txt | 10 +- .../library}/blockcodecs/CMakeLists.txt | 4 +- .../cpp => src/library}/blockcodecs/README.md | 6 +- .../library}/blockcodecs/codecs.cpp | 0 src/library/blockcodecs/codecs.h | 3 + .../blockcodecs/codecs/CMakeLists.txt | 0 .../blockcodecs/codecs/brotli/CMakeLists.txt | 2 +- .../blockcodecs/codecs/brotli/brotli.cpp | 8 +- .../blockcodecs/codecs/bzip/CMakeLists.txt | 4 +- .../library}/blockcodecs/codecs/bzip/bzip.cpp | 6 +- .../blockcodecs/codecs/fastlz/CMakeLists.txt | 4 +- .../blockcodecs/codecs/fastlz/fastlz.cpp | 6 +- .../blockcodecs/codecs/lz4/CMakeLists.txt | 4 +- .../library}/blockcodecs/codecs/lz4/lz4.cpp | 8 +- .../blockcodecs/codecs/lzma/CMakeLists.txt | 4 +- .../library}/blockcodecs/codecs/lzma/lzma.cpp | 6 +- .../blockcodecs/codecs/snappy/CMakeLists.txt | 4 +- .../blockcodecs/codecs/snappy/snappy.cpp | 6 +- .../blockcodecs/codecs/zlib/CMakeLists.txt | 4 +- .../library}/blockcodecs/codecs/zlib/zlib.cpp | 6 +- .../blockcodecs/codecs/zstd/CMakeLists.txt | 4 +- .../library}/blockcodecs/codecs/zstd/zstd.cpp | 8 +- .../library}/blockcodecs/codecs_ut.cpp | 8 +- .../library}/blockcodecs/core/CMakeLists.txt | 4 +- .../library}/blockcodecs/core/codecs.cpp | 26 +- .../library}/blockcodecs/core/codecs.h | 6 +- .../library}/blockcodecs/core/common.h | 26 +- .../library}/blockcodecs/core/register.h | 0 .../library}/blockcodecs/core/stream.cpp | 14 +- .../library}/blockcodecs/core/stream.h | 10 +- .../library}/blockcodecs/stream.cpp | 0 src/library/blockcodecs/stream.h | 3 + .../library}/blockcodecs/ut/ya.make | 2 +- src/library/build_info/CMakeLists.txt | 40 +++ .../library}/build_info/build_info.cpp.in | 2 +- .../library}/build_info/build_info.h | 0 .../library}/build_info/build_info_static.cpp | 2 +- .../library}/build_info/build_info_static.h | 0 .../library}/build_info/sandbox.cpp.in | 8 +- .../cpp => src/library}/build_info/sandbox.h | 0 .../cpp => src/library}/cache/CMakeLists.txt | 4 +- {library/cpp => src/library}/cache/cache.cpp | 0 {library/cpp => src/library}/cache/cache.h | 8 +- .../library}/cache/thread_safe_cache.cpp | 0 .../library}/cache/thread_safe_cache.h | 6 +- .../cpp => src/library}/cache/ut/cache_ut.cpp | 6 +- {library/cpp => src/library}/cache/ut/ya.make | 2 +- .../case_insensitive_string/CMakeLists.txt | 4 +- .../case_insensitive_char_traits.cpp | 2 +- .../case_insensitive_char_traits.h | 0 .../case_insensitive_string.cpp | 2 +- .../case_insensitive_string.h | 4 +- .../case_insensitive_string_ut.cpp | 2 +- .../case_insensitive_string/ut/ya.make | 2 +- .../library}/cgiparam/CMakeLists.txt | 2 +- .../cpp => src/library}/cgiparam/cgiparam.cpp | 6 +- .../cpp => src/library}/cgiparam/cgiparam.h | 4 +- .../library}/cgiparam/cgiparam_ut.cpp | 2 +- .../cpp => src/library}/cgiparam/ut/ya.make | 2 +- .../library}/charset/CMakeLists.txt | 6 +- .../cpp => src/library}/charset/README.md | 12 +- .../cpp => src/library}/charset/ci_string.cpp | 0 .../cpp => src/library}/charset/ci_string.h | 2 +- .../library}/charset/ci_string_ut.cpp | 4 +- .../cpp => src/library}/charset/codepage.cpp | 18 +- .../cpp => src/library}/charset/codepage.h | 16 +- .../library}/charset/codepage_ut.cpp | 6 +- .../cpp => src/library}/charset/cp_encrec.cpp | 2 +- .../library}/charset/decodeunknownplane.cpp | 2 +- .../cpp => src/library}/charset/doccodes.cpp | 0 .../cpp => src/library}/charset/doccodes.h | 0 .../library}/charset/generated/cp_data.cpp | 2 +- .../charset/generated/encrec_data.cpp | 2 +- .../cpp => src/library}/charset/iconv.cpp | 0 {library/cpp => src/library}/charset/iconv.h | 2 +- .../cpp => src/library}/charset/iconv_ut.cpp | 2 +- src/library/charset/lite/CMakeLists.txt | 15 + .../library}/charset/lite/ut/ya.make | 4 +- {library/cpp => src/library}/charset/recyr.hh | 6 +- .../cpp => src/library}/charset/recyr_int.hh | 8 +- .../library}/charset/recyr_int_ut.cpp | 6 +- .../cpp => src/library}/charset/ut/ya.make | 2 +- {library/cpp => src/library}/charset/wide.cpp | 0 {library/cpp => src/library}/charset/wide.h | 2 +- .../cpp => src/library}/charset/wide_ut.cpp | 6 +- .../library}/colorizer/CMakeLists.txt | 4 +- .../cpp => src/library}/colorizer/colors.cpp | 4 +- .../cpp => src/library}/colorizer/colors.h | 2 +- {library/cpp => src/library}/colorizer/fwd.h | 0 .../cpp => src/library}/colorizer/output.cpp | 2 +- .../cpp => src/library}/colorizer/output.h | 0 .../library}/colorizer/ut/colorizer_ut.cpp | 8 +- .../cpp => src/library}/colorizer/ut/ya.make | 2 +- .../library}/containers/CMakeLists.txt | 0 .../disjoint_interval_tree/CMakeLists.txt | 2 +- .../disjoint_interval_tree.cpp | 0 .../disjoint_interval_tree.h | 2 +- .../ut/disjoint_interval_tree_ut.cpp | 4 +- .../disjoint_interval_tree/ut/ya.make | 7 + .../intrusive_rb_tree/CMakeLists.txt | 2 +- .../containers/intrusive_rb_tree/rb_tree.cpp | 0 .../containers/intrusive_rb_tree/rb_tree.h | 4 +- .../intrusive_rb_tree/rb_tree_ut.cpp | 8 +- .../containers/intrusive_rb_tree/ut/ya.make | 7 + .../containers/paged_vector/CMakeLists.txt | 2 +- .../containers/paged_vector/paged_vector.cpp | 0 .../containers/paged_vector/paged_vector.h | 6 +- .../paged_vector/ut/paged_vector_ut.cpp | 4 +- .../containers/paged_vector/ut/ya.make | 2 +- .../containers/stack_vector/CMakeLists.txt | 2 +- .../containers/stack_vector/stack_vec.cpp | 0 .../containers/stack_vector/stack_vec.h | 4 +- .../containers/stack_vector/stack_vec_ut.cpp | 2 +- .../containers/stack_vector/ut/ya.make | 2 +- .../library}/coroutine/CMakeLists.txt | 0 src/library/coroutine/engine/CMakeLists.txt | 39 +++ .../library}/coroutine/engine/callbacks.h | 0 .../library}/coroutine/engine/condvar.h | 0 .../library}/coroutine/engine/cont_poller.cpp | 0 .../library}/coroutine/engine/cont_poller.h | 10 +- .../coroutine/engine/coroutine_ut.cpp | 20 +- .../library}/coroutine/engine/custom_time.h | 2 +- .../library}/coroutine/engine/events.h | 2 +- .../library}/coroutine/engine/helper.cpp | 0 .../library}/coroutine/engine/helper.h | 2 +- .../library}/coroutine/engine/impl.cpp | 10 +- .../library}/coroutine/engine/impl.h | 12 +- .../library}/coroutine/engine/iostatus.cpp | 0 .../library}/coroutine/engine/iostatus.h | 2 +- .../library}/coroutine/engine/mutex.h | 0 .../library}/coroutine/engine/network.cpp | 4 +- .../library}/coroutine/engine/network.h | 10 +- .../library}/coroutine/engine/poller.cpp | 8 +- .../library}/coroutine/engine/poller.h | 8 +- .../library}/coroutine/engine/sockmap.h | 2 +- .../library}/coroutine/engine/sockpool.cpp | 0 .../library}/coroutine/engine/sockpool.h | 4 +- .../engine/stack/benchmark/alloc_bm.cpp | 10 +- .../coroutine/engine/stack/benchmark/ya.make | 2 +- .../library}/coroutine/engine/stack/stack.cpp | 0 .../library}/coroutine/engine/stack/stack.h | 4 +- .../engine/stack/stack_allocator.cpp | 0 .../coroutine/engine/stack/stack_allocator.h | 4 +- .../engine/stack/stack_allocator.inl | 2 +- .../coroutine/engine/stack/stack_common.h | 0 .../coroutine/engine/stack/stack_guards.cpp | 0 .../coroutine/engine/stack/stack_guards.h | 4 +- .../coroutine/engine/stack/stack_pool.h | 4 +- .../coroutine/engine/stack/stack_pool.inl | 0 .../coroutine/engine/stack/stack_storage.cpp | 2 +- .../coroutine/engine/stack/stack_storage.h | 2 +- .../coroutine/engine/stack/stack_utils.cpp | 4 +- .../coroutine/engine/stack/stack_utils.h | 0 .../engine/stack/ut/stack_allocator_ut.cpp | 6 +- .../engine/stack/ut/stack_guards_ut.cpp | 8 +- .../engine/stack/ut/stack_pool_ut.cpp | 8 +- .../coroutine/engine/stack/ut/stack_ut.cpp | 10 +- .../engine/stack/ut/stack_utils_ut.cpp | 6 +- .../coroutine/engine/stack/ut/ya.make | 2 +- .../library}/coroutine/engine/trampoline.cpp | 10 +- .../library}/coroutine/engine/trampoline.h | 8 +- src/library/coroutine/engine/ut/ya.make | 7 + .../coroutine/listener/CMakeLists.txt | 2 +- .../library}/coroutine/listener/listen.cpp | 12 +- .../library}/coroutine/listener/listen.h | 4 +- .../library}/cppparser/CMakeLists.txt | 2 +- .../cpp => src/library}/cppparser/README.md | 0 .../cpp => src/library}/cppparser/parser.cpp | 6 +- .../cpp => src/library}/cppparser/parser.h | 4 +- .../library}/cpuid_check/CMakeLists.txt | 4 +- .../cpp => src/library}/cpuid_check/README.md | 0 .../library}/cpuid_check/cpu_id_check.cpp | 8 +- .../library}/dbg_output/CMakeLists.txt | 6 +- .../cpp => src/library}/dbg_output/auto.h | 2 +- .../library}/dbg_output/colorscheme.h | 4 +- .../cpp => src/library}/dbg_output/dump.cpp | 0 .../cpp => src/library}/dbg_output/dump.h | 4 +- .../library}/dbg_output/dumpers.cpp | 0 .../cpp => src/library}/dbg_output/dumpers.h | 2 +- .../cpp => src/library}/dbg_output/engine.cpp | 4 +- .../cpp => src/library}/dbg_output/engine.h | 2 +- .../library}/dbg_output/ut/dbg_output_ut.cpp | 12 +- .../cpp => src/library}/dbg_output/ut/ya.make | 2 +- .../library}/deprecated/CMakeLists.txt | 0 .../library}/deprecated/atomic/CMakeLists.txt | 2 +- .../library}/deprecated/atomic/Readme.md | 0 .../library}/deprecated/atomic/atomic.h | 2 +- .../library}/deprecated/atomic/atomic_gcc.h | 0 .../library}/deprecated/atomic/atomic_ops.h | 2 +- .../library}/deprecated/atomic/atomic_ut.cpp | 4 +- .../library}/deprecated/atomic/atomic_win.h | 0 src/library/deprecated/atomic/ut/ya.make | 5 + .../cpp => src/library}/diff/CMakeLists.txt | 2 +- {library/cpp => src/library}/diff/README.md | 2 +- {library/cpp => src/library}/diff/diff.cpp | 4 +- {library/cpp => src/library}/diff/diff.h | 8 +- {library/cpp => src/library}/diff/diff_ut.cpp | 2 +- {library/cpp => src/library}/diff/ut/ya.make | 4 +- .../cpp => src/library}/digest/CMakeLists.txt | 0 .../library}/digest/argonish/AUTHORS.md | 0 .../library}/digest/argonish/CMakeLists.txt | 2 +- .../library}/digest/argonish/CONTRIBUTING.md | 0 .../library}/digest/argonish/LICENSE.md | 0 .../library}/digest/argonish/README.md | 4 +- .../library}/digest/argonish/argon2.h | 4 +- .../library}/digest/argonish/blake2b.h | 2 +- .../library}/digest/argonish/common.h | 2 +- .../digest/argonish/factory/factory.cpp | 18 +- .../digest/argonish/internal/CMakeLists.txt | 0 .../argonish/internal/argon2/CMakeLists.txt | 0 .../argonish/internal/argon2/argon2_avx2.h | 2 +- .../argonish/internal/argon2/argon2_base.h | 8 +- .../argonish/internal/argon2/argon2_ref.h | 2 +- .../argonish/internal/argon2/argon2_sse2.h | 2 +- .../argonish/internal/argon2/argon2_sse41.h | 2 +- .../argonish/internal/argon2/argon2_ssse3.h | 2 +- .../argonish/internal/blake2b/CMakeLists.txt | 0 .../argonish/internal/blake2b/blake2b.h | 6 +- .../argonish/internal/blake2b/blake2b_avx2.h | 2 +- .../argonish/internal/blake2b/blake2b_ref.h | 2 +- .../argonish/internal/blake2b/blake2b_sse2.h | 2 +- .../argonish/internal/blake2b/blake2b_sse41.h | 2 +- .../argonish/internal/blake2b/blake2b_ssse3.h | 2 +- .../argonish/internal/blake2b/load_sse41.h | 0 .../argonish/internal/blamka/CMakeLists.txt | 0 .../argonish/internal/blamka/blamka_avx2.h | 2 +- .../argonish/internal/blamka/blamka_sse2.h | 2 +- .../argonish/internal/blamka/blamka_ssse3.h | 2 +- .../argonish/internal/proxies/CMakeLists.txt | 0 .../internal/proxies/avx2/CMakeLists.txt | 2 +- .../internal/proxies/avx2/proxy_avx2.cpp | 18 + .../internal/proxies/avx2/proxy_avx2.h | 11 + .../internal/proxies/macro/CMakeLists.txt | 0 .../internal/proxies/macro/proxy_macros.h | 0 .../internal/proxies/ref/CMakeLists.txt | 2 +- .../internal/proxies/ref/proxy_ref.cpp | 20 ++ .../argonish/internal/proxies/ref/proxy_ref.h | 11 + .../internal/proxies/sse2/CMakeLists.txt | 2 +- .../internal/proxies/sse2/proxy_sse2.cpp | 18 + .../internal/proxies/sse2/proxy_sse2.h | 11 + .../internal/proxies/sse41/CMakeLists.txt | 2 +- .../internal/proxies/sse41/proxy_sse41.cpp | 18 + .../internal/proxies/sse41/proxy_sse41.h | 11 + .../internal/proxies/ssse3/CMakeLists.txt | 2 +- .../internal/proxies/ssse3/proxy_ssse3.cpp | 18 + .../internal/proxies/ssse3/proxy_ssse3.h | 11 + .../internal/rotations/CMakeLists.txt | 0 .../internal/rotations/rotations_avx2.h | 0 .../internal/rotations/rotations_ref.h | 0 .../internal/rotations/rotations_sse2.h | 0 .../internal/rotations/rotations_ssse3.h | 0 .../library}/digest/argonish/ut/ut.cpp | 6 +- src/library/digest/argonish/ut/ya.make | 11 + .../library}/digest/argonish/ut_fat/ut.cpp | 6 +- .../library}/digest/argonish/ut_fat/ya.make | 4 +- src/library/digest/lower_case/CMakeLists.txt | 11 + .../library}/digest/lower_case/hash_ops.cpp | 2 +- .../library}/digest/lower_case/hash_ops.h | 0 .../digest/lower_case/hash_ops_ut.cpp | 2 +- .../library}/digest/lower_case/lchash.cpp | 0 .../library}/digest/lower_case/lchash.h | 2 +- .../library}/digest/lower_case/lchash_ut.cpp | 2 +- .../library}/digest/lower_case/lciter.cpp | 0 .../library}/digest/lower_case/lciter.h | 4 +- .../library}/digest/lower_case/ut/ya.make | 2 +- .../library}/digest/md5/CMakeLists.txt | 2 +- .../cpp => src/library}/digest/md5/md5.cpp | 8 +- {library/cpp => src/library}/digest/md5/md5.h | 2 +- .../library}/digest/md5/md5_medium_ut.cpp | 2 +- .../cpp => src/library}/digest/md5/md5_ut.cpp | 6 +- .../library}/digest/md5/medium_ut/ya.make | 2 +- src/library/digest/md5/ut/ya.make | 7 + .../library}/digest/murmur/CMakeLists.txt | 2 +- .../library}/digest/murmur/murmur.cpp | 0 .../library}/digest/murmur/murmur.h | 4 +- .../library}/digest/murmur/murmur_ut.cpp | 2 +- src/library/digest/murmur/ut/ya.make | 13 + .../cpp => src/library}/getopt/CMakeLists.txt | 4 +- src/library/getopt/last_getopt.h | 3 + .../library}/getopt/last_getopt_demo/demo.cpp | 8 +- src/library/getopt/last_getopt_support.h | 3 + src/library/getopt/modchooser.h | 3 + src/library/getopt/opt.h | 3 + src/library/getopt/opt2.h | 3 + src/library/getopt/posix_getopt.h | 3 + {library/cpp => src/library}/getopt/print.cpp | 4 +- src/library/getopt/small/CMakeLists.txt | 29 ++ .../library}/getopt/small/completer.cpp | 4 +- .../library}/getopt/small/completer.h | 2 +- .../getopt/small/completer_command.cpp | 4 +- .../library}/getopt/small/completer_command.h | 0 .../getopt/small/completion_generator.cpp | 2 +- .../getopt/small/completion_generator.h | 0 .../getopt/small/formatted_output.cpp | 4 +- .../library}/getopt/small/formatted_output.h | 2 +- .../library}/getopt/small/last_getopt.cpp | 0 .../library}/getopt/small/last_getopt.h | 10 +- .../getopt/small/last_getopt_easy_setup.cpp | 0 .../getopt/small/last_getopt_easy_setup.h | 0 .../getopt/small/last_getopt_handlers.h | 0 .../library}/getopt/small/last_getopt_opt.cpp | 0 .../library}/getopt/small/last_getopt_opt.h | 6 +- .../getopt/small/last_getopt_opts.cpp | 12 +- .../library}/getopt/small/last_getopt_opts.h | 2 +- .../getopt/small/last_getopt_parse_result.cpp | 0 .../getopt/small/last_getopt_parse_result.h | 0 .../getopt/small/last_getopt_parser.cpp | 6 +- .../getopt/small/last_getopt_parser.h | 2 +- .../getopt/small/last_getopt_support.h | 10 +- .../library}/getopt/small/modchooser.cpp | 6 +- .../library}/getopt/small/modchooser.h | 0 .../cpp => src/library}/getopt/small/opt.cpp | 2 +- .../cpp => src/library}/getopt/small/opt.h | 4 +- .../cpp => src/library}/getopt/small/opt2.cpp | 2 +- .../cpp => src/library}/getopt/small/opt2.h | 2 +- .../library}/getopt/small/posix_getopt.cpp | 0 .../library}/getopt/small/posix_getopt.h | 0 .../cpp => src/library}/getopt/small/wrap.cpp | 6 +- .../cpp => src/library}/getopt/small/wrap.h | 2 +- .../library}/getopt/small/ygetopt.cpp | 0 .../library}/getopt/small/ygetopt.h | 4 +- .../library}/getopt/ut/last_getopt_ut.cpp | 14 +- .../library}/getopt/ut/modchooser_ut.cpp | 6 +- .../cpp => src/library}/getopt/ut/opt2_ut.cpp | 4 +- .../cpp => src/library}/getopt/ut/opt_ut.cpp | 6 +- .../library}/getopt/ut/posix_getopt_ut.cpp | 4 +- .../cpp => src/library}/getopt/ut/wrap.cpp | 4 +- .../cpp => src/library}/getopt/ut/ya.make | 2 +- .../library}/getopt/ut/ygetopt_ut.cpp | 4 +- src/library/getopt/ygetopt.h | 3 + {ydb => src}/library/grpc/CMakeLists.txt | 0 .../library/grpc/client/CMakeLists.txt | 2 +- .../library/grpc/client/grpc_client_low.cpp | 6 +- .../library/grpc/client/grpc_client_low.h | 8 +- .../library/grpc/client/grpc_common.h | 4 +- .../library/grpc/common/CMakeLists.txt | 0 {ydb => src}/library/grpc/common/constants.h | 2 +- .../cpp => src/library}/http/CMakeLists.txt | 0 src/library/http/fetch/CMakeLists.txt | 33 ++ .../library}/http/fetch/exthttpcodes.cpp | 0 .../library}/http/fetch/exthttpcodes.h | 4 +- .../library}/http/fetch/http_digest.cpp | 6 +- .../library}/http/fetch/http_digest.h | 4 +- .../library}/http/fetch/http_socket.cpp | 4 +- .../library}/http/fetch/httpagent.h | 14 +- .../library}/http/fetch/httpfetcher.h | 2 +- .../cpp => src/library}/http/fetch/httpfsm.h | 4 +- .../library}/http/fetch/httpfsm.rl6 | 16 +- .../library}/http/fetch/httpfsm_ut.cpp | 6 +- .../library}/http/fetch/httpheader.cpp | 0 .../library}/http/fetch/httpheader.h | 10 +- .../library}/http/fetch/httpload.cpp | 0 .../cpp => src/library}/http/fetch/httpload.h | 8 +- .../library}/http/fetch/httpparser.h | 6 +- .../library}/http/fetch/httpparser_ut.cpp | 2 +- .../library}/http/fetch/httpzreader.h | 4 +- .../fetch/library-htfetch_ut_hreflang_in.h | 0 .../fetch/library-htfetch_ut_hreflang_out.h | 0 .../library}/http/fetch/sockhandler.h | 14 +- .../cpp => src/library}/http/fetch/ut/ya.make | 2 +- .../library}/http/io/CMakeLists.txt | 8 +- .../library}/http/io/benchmark/main.cpp | 4 +- .../library}/http/io/benchmark/ya.make | 2 +- .../cpp => src/library}/http/io/chunk.cpp | 0 {library/cpp => src/library}/http/io/chunk.h | 8 +- .../cpp => src/library}/http/io/chunk_ut.cpp | 8 +- .../library}/http/io/compression.cpp | 18 +- .../cpp => src/library}/http/io/compression.h | 2 +- .../library}/http/io/compression_ut.cpp | 6 +- .../cpp => src/library}/http/io/fuzz/main.cpp | 4 +- .../cpp => src/library}/http/io/fuzz/ya.make | 2 +- .../cpp => src/library}/http/io/headers.cpp | 6 +- .../cpp => src/library}/http/io/headers.h | 4 +- .../library}/http/io/headers_ut.cpp | 6 +- .../library}/http/io/list_codings/main.cpp | 4 +- .../library}/http/io/list_codings/ya.make | 2 +- .../cpp => src/library}/http/io/stream.cpp | 20 +- {library/cpp => src/library}/http/io/stream.h | 6 +- .../cpp => src/library}/http/io/stream_ut.cpp | 18 +- .../library}/http/io/stream_ut_medium.cpp | 4 +- .../cpp => src/library}/http/io/ut/ya.make | 4 +- .../library}/http/misc/CMakeLists.txt | 12 +- .../library}/http/misc/httpcodes.cpp | 0 .../cpp => src/library}/http/misc/httpcodes.h | 0 .../library}/http/misc/httpdate.cpp | 8 +- .../cpp => src/library}/http/misc/httpdate.h | 2 +- .../library}/http/misc/httpdate_ut.cpp | 2 +- .../library}/http/misc/httpreqdata.cpp | 10 +- .../library}/http/misc/httpreqdata.h | 18 +- .../library}/http/misc/httpreqdata_ut.cpp | 2 +- .../library}/http/misc/parsed_request.cpp | 10 +- .../library}/http/misc/parsed_request.h | 0 .../library}/http/misc/parsed_request_ut.cpp | 2 +- .../cpp => src/library}/http/misc/ut/ya.make | 2 +- src/library/http/server/CMakeLists.txt | 19 ++ .../cpp => src/library}/http/server/conn.cpp | 4 +- .../cpp => src/library}/http/server/conn.h | 4 +- .../cpp => src/library}/http/server/http.cpp | 30 +- .../cpp => src/library}/http/server/http.h | 10 +- .../library}/http/server/http_ex.cpp | 6 +- .../cpp => src/library}/http/server/http_ex.h | 2 +- .../library}/http/server/http_ut.cpp | 16 +- .../library}/http/server/options.cpp | 10 +- .../cpp => src/library}/http/server/options.h | 10 +- .../library}/http/server/response.cpp | 2 +- .../library}/http/server/response.h | 4 +- .../library}/http/server/response_ut.cpp | 4 +- .../library}/http/server/ut/ya.make | 2 +- .../library}/http/simple/CMakeLists.txt | 2 +- .../library}/http/simple/http_client.cpp | 8 +- .../library}/http/simple/http_client.h | 16 +- .../http/simple/http_client_options.h | 4 +- .../library}/http/simple/ut/http_ut.cpp | 14 +- .../simple/ut/https_server/http_server.crt | 0 .../simple/ut/https_server/http_server.key | 0 .../http/simple/ut/https_server/main.go | 0 .../http/simple/ut/https_server/ya.make | 0 .../library}/http/simple/ut/https_ut.cpp | 14 +- src/library/http/simple/ut/ya.make | 21 ++ src/library/iterator/CMakeLists.txt | 17 + .../cpp => src/library}/iterator/README.md | 0 .../library}/iterator/cartesian_product.cpp | 0 .../library}/iterator/cartesian_product.h | 2 +- .../library}/iterator/concatenate.cpp | 0 .../library}/iterator/concatenate.h | 2 +- .../library}/iterator/enumerate.cpp | 0 .../cpp => src/library}/iterator/enumerate.h | 2 +- .../library}/iterator/filtering.cpp | 0 .../cpp => src/library}/iterator/filtering.h | 4 +- .../library}/iterator/functools.cpp | 0 .../cpp => src/library}/iterator/functools.h | 4 +- .../library}/iterator/iterate_keys.cpp | 0 .../library}/iterator/iterate_keys.h | 0 .../library}/iterator/iterate_values.cpp | 0 .../library}/iterator/iterate_values.h | 0 .../cpp => src/library}/iterator/mapped.cpp | 0 .../cpp => src/library}/iterator/mapped.h | 4 +- .../library}/iterator/ut/filtering_ut.cpp | 4 +- .../library}/iterator/ut/functools_ut.cpp | 8 +- .../library}/iterator/ut/iterate_keys_ut.cpp | 4 +- .../iterator/ut/iterate_values_ut.cpp | 6 +- .../library}/iterator/ut/mapped_ut.cpp | 4 +- .../cpp => src/library}/iterator/ut/ya.make | 2 +- .../library}/iterator/ut/zip_ut.cpp | 4 +- {library/cpp => src/library}/iterator/zip.cpp | 0 {library/cpp => src/library}/iterator/zip.h | 2 +- .../cpp => src/library}/json/CMakeLists.txt | 8 +- .../library}/json/common/CMakeLists.txt | 2 +- .../cpp => src/library}/json/common/defs.cpp | 0 .../cpp => src/library}/json/common/defs.h | 2 +- .../library}/json/fast_sax/CMakeLists.txt | 6 +- .../library}/json/fast_sax/parser.h | 2 +- .../library}/json/fast_sax/parser.rl6 | 12 +- .../library}/json/fast_sax/unescape.cpp | 2 +- .../library}/json/fast_sax/unescape.h | 0 .../library}/json/fuzzy_test/main.cpp | 6 +- .../library}/json/fuzzy_test/ya.make | 2 +- .../library}/json/json_prettifier.cpp | 10 +- .../library}/json/json_prettifier.h | 2 +- .../cpp => src/library}/json/json_reader.cpp | 6 +- .../cpp => src/library}/json/json_reader.h | 8 +- src/library/json/json_value.h | 3 + .../cpp => src/library}/json/json_writer.cpp | 4 +- .../cpp => src/library}/json/json_writer.h | 8 +- .../library}/json/rapidjson_helpers.cpp | 0 .../library}/json/rapidjson_helpers.h | 4 +- .../library}/json/ut/json_prettifier_ut.cpp | 4 +- .../library}/json/ut/json_reader_fast_ut.cpp | 10 +- .../library}/json/ut/json_reader_ut.cpp | 8 +- .../library}/json/ut/json_saveload_ut.cpp | 10 +- .../library}/json/ut/json_writer_ut.cpp | 6 +- {library/cpp => src/library}/json/ut/ya.make | 4 +- .../library}/json/writer/CMakeLists.txt | 8 +- .../cpp => src/library}/json/writer/README.md | 2 +- .../cpp => src/library}/json/writer/json.cpp | 10 +- .../cpp => src/library}/json/writer/json.h | 4 +- .../library}/json/writer/json_ut.cpp | 6 +- .../library}/json/writer/json_value.cpp | 28 +- .../library}/json/writer/json_value.h | 12 +- .../library}/json/writer/json_value_ut.cpp | 4 +- .../library}/json/writer/ut/ya.make | 4 +- src/library/jwt/CMakeLists.txt | 12 + {ydb/public/lib => src/library}/jwt/jwt.cpp | 4 +- {ydb/public/lib => src/library}/jwt/jwt.h | 2 +- .../cpp => src/library}/lcs/CMakeLists.txt | 2 +- {library/cpp => src/library}/lcs/README.md | 0 .../cpp => src/library}/lcs/lcs_via_lis.cpp | 0 .../cpp => src/library}/lcs/lcs_via_lis.h | 10 +- .../library}/lcs/lcs_via_lis_ut.cpp | 6 +- {library/cpp => src/library}/lcs/ut/ya.make | 4 +- src/library/logger/CMakeLists.txt | 57 ++++ {library/cpp => src/library}/logger/all.h | 0 .../cpp => src/library}/logger/backend.cpp | 4 +- {library/cpp => src/library}/logger/backend.h | 2 +- .../library}/logger/backend_creator.cpp | 6 +- .../library}/logger/backend_creator.h | 8 +- .../cpp => src/library}/logger/composite.cpp | 0 .../cpp => src/library}/logger/composite.h | 2 +- .../library}/logger/composite_creator.cpp | 0 .../library}/logger/composite_creator.h | 0 .../library}/logger/composite_ut.cpp | 12 +- .../cpp => src/library}/logger/element.cpp | 0 {library/cpp => src/library}/logger/element.h | 4 +- .../cpp => src/library}/logger/element_ut.cpp | 6 +- {library/cpp => src/library}/logger/file.cpp | 4 +- {library/cpp => src/library}/logger/file.h | 4 +- .../library}/logger/file_creator.cpp | 0 .../cpp => src/library}/logger/file_creator.h | 0 .../cpp => src/library}/logger/filter.cpp | 0 {library/cpp => src/library}/logger/filter.h | 2 +- .../library}/logger/filter_creator.cpp | 0 .../library}/logger/filter_creator.h | 0 .../library}/logger/init_context/README.md | 4 +- .../library}/logger/init_context/config.cpp | 0 .../library}/logger/init_context/config.h | 4 +- .../library}/logger/init_context/yconf.cpp | 0 .../library}/logger/init_context/yconf.h | 4 +- {library/cpp => src/library}/logger/log.cpp | 4 +- {library/cpp => src/library}/logger/log.h | 4 +- .../cpp => src/library}/logger/log_ut.cpp | 12 +- {library/cpp => src/library}/logger/null.cpp | 0 {library/cpp => src/library}/logger/null.h | 0 .../library}/logger/null_creator.cpp | 0 .../cpp => src/library}/logger/null_creator.h | 0 .../cpp => src/library}/logger/priority.h | 0 {library/cpp => src/library}/logger/record.h | 2 +- {library/cpp => src/library}/logger/reopen.h | 6 +- .../cpp => src/library}/logger/reopen_ut.cpp | 4 +- .../library}/logger/rotating_file.cpp | 12 +- .../library}/logger/rotating_file.h | 4 +- .../library}/logger/rotating_file_creator.cpp | 0 .../library}/logger/rotating_file_creator.h | 0 .../library}/logger/rotating_file_ut.cpp | 8 +- .../cpp => src/library}/logger/stream.cpp | 4 +- {library/cpp => src/library}/logger/stream.h | 0 .../library}/logger/stream_creator.cpp | 0 .../library}/logger/stream_creator.h | 0 .../library}/logger/sync_page_cache_file.cpp | 10 +- .../library}/logger/sync_page_cache_file.h | 4 +- .../logger/sync_page_cache_file_creator.cpp | 0 .../logger/sync_page_cache_file_creator.h | 0 .../cpp => src/library}/logger/system.cpp | 12 +- {library/cpp => src/library}/logger/system.h | 0 .../library}/logger/system_creator.cpp | 0 .../library}/logger/system_creator.h | 0 .../cpp => src/library}/logger/thread.cpp | 10 +- {library/cpp => src/library}/logger/thread.h | 2 +- .../library}/logger/thread_creator.cpp | 0 .../library}/logger/thread_creator.h | 0 .../library}/logger/uninitialized_creator.cpp | 2 +- .../library}/logger/uninitialized_creator.h | 0 .../cpp => src/library}/logger/ut/ya.make | 8 +- src/library/login/CMakeLists.txt | 18 + {ydb => src}/library/login/login.cpp | 20 +- {ydb => src}/library/login/login.h | 2 +- .../library/login/protos/CMakeLists.txt | 4 +- {ydb => src}/library/login/protos/login.proto | 0 .../cpp => src/library}/mime/CMakeLists.txt | 0 .../library}/mime/types/CMakeLists.txt | 6 +- .../cpp => src/library}/mime/types/mime.cpp | 4 +- .../cpp => src/library}/mime/types/mime.h | 2 +- .../cpp => src/library}/monlib/CMakeLists.txt | 0 .../library}/monlib/counters/counters.h | 28 +- .../monlib/dynamic_counters/CMakeLists.txt | 8 +- .../monlib/dynamic_counters/contention_ut.cpp | 6 +- .../monlib/dynamic_counters/counters.cpp | 6 +- .../monlib/dynamic_counters/counters.h | 16 +- .../monlib/dynamic_counters/counters_ut.cpp | 2 +- .../monlib/dynamic_counters/encode.cpp | 10 +- .../library}/monlib/dynamic_counters/encode.h | 4 +- .../monlib/dynamic_counters/encode_ut.cpp | 14 +- .../monlib/dynamic_counters/golovan_page.cpp | 6 +- .../monlib/dynamic_counters/golovan_page.h | 4 +- .../library}/monlib/dynamic_counters/page.cpp | 8 +- .../library}/monlib/dynamic_counters/page.h | 4 +- .../percentile/CMakeLists.txt | 2 +- .../dynamic_counters/percentile/percentile.h | 0 .../percentile/percentile_base.h | 2 +- .../percentile/percentile_lg.h | 2 +- .../percentile/percentile_ut.cpp | 4 +- .../dynamic_counters/percentile/ut/ya.make | 7 + .../monlib/dynamic_counters/ut/ya.make | 14 + .../library}/monlib/encode/CMakeLists.txt | 12 +- .../monlib/encode/buffered/CMakeLists.txt | 4 +- .../encode/buffered/buffered_encoder_base.cpp | 6 +- .../encode/buffered/buffered_encoder_base.h | 12 +- .../monlib/encode/buffered/string_pool.cpp | 2 +- .../monlib/encode/buffered/string_pool.h | 2 +- .../monlib/encode/buffered/string_pool_ut.cpp | 2 +- src/library/monlib/encode/buffered/ut/ya.make | 7 + .../library}/monlib/encode/encoder.cpp | 0 .../library}/monlib/encode/encoder.h | 4 +- .../library}/monlib/encode/encoder_state.cpp | 0 .../library}/monlib/encode/encoder_state.h | 2 +- .../monlib/encode/encoder_state_enum.h | 0 .../library}/monlib/encode/format.cpp | 12 +- .../library}/monlib/encode/format.h | 0 .../library}/monlib/encode/format_ut.cpp | 4 +- src/library/monlib/encode/fuzz/ya.make | 5 + .../monlib/encode/json/CMakeLists.txt | 4 +- .../library}/monlib/encode/json/fuzz/main.cpp | 4 +- src/library/monlib/encode/json/fuzz/ya.make | 14 + .../library}/monlib/encode/json/json.h | 4 +- .../monlib/encode/json/json_decoder.cpp | 14 +- .../monlib/encode/json/json_decoder_ut.cpp | 4 +- .../monlib/encode/json/json_encoder.cpp | 16 +- .../library}/monlib/encode/json/json_ut.cpp | 14 +- .../library}/monlib/encode/json/typed_point.h | 2 +- .../monlib/encode/json/ut/buffered_test.json | 0 .../encode/json/ut/buffered_ts_merge.json | 0 .../library}/monlib/encode/json/ut/crash.json | Bin .../monlib/encode/json/ut/empty_series.json | 0 .../monlib/encode/json/ut/expected.json | 0 .../encode/json/ut/expected_buffered.json | 0 .../monlib/encode/json/ut/expected_cloud.json | 0 .../json/ut/expected_cloud_buffered.json | 0 .../monlib/encode/json/ut/hist_crash.json | Bin .../encode/json/ut/histogram_timeseries.json | 0 .../encode/json/ut/histogram_value.json | 0 .../ut/histogram_value_inf_before_bounds.json | 0 .../monlib/encode/json/ut/int_gauge.json | 0 .../json/ut/log_histogram_timeseries.json | 0 .../encode/json/ut/log_histogram_value.json | 0 .../monlib/encode/json/ut/merged.json | 0 .../monlib/encode/json/ut/metrics.json | 0 .../monlib/encode/json/ut/named_metrics.json | 0 .../monlib/encode/json/ut/sensors.json | 0 .../monlib/encode/json/ut/summary_inf.json | 0 .../encode/json/ut/summary_timeseries.json | 0 .../monlib/encode/json/ut/summary_value.json | 0 .../encode/json/ut/test_decode_to_encode.json | 0 .../library}/monlib/encode/json/ut/ya.make | 10 +- .../encode/legacy_protobuf/CMakeLists.txt | 0 .../legacy_protobuf/protos/CMakeLists.txt | 2 +- .../legacy_protobuf/protos/metric_meta.proto | 0 .../monlib/encode/prometheus/CMakeLists.txt | 4 +- .../monlib/encode/prometheus/fuzz/main.cpp | 6 +- .../monlib/encode/prometheus/fuzz/ya.make | 14 + .../monlib/encode/prometheus/prometheus.h | 6 +- .../encode/prometheus/prometheus_decoder.cpp | 14 +- .../prometheus/prometheus_decoder_ut.cpp | 4 +- .../encode/prometheus/prometheus_encoder.cpp | 10 +- .../prometheus/prometheus_encoder_ut.cpp | 10 +- .../encode/prometheus/prometheus_model.h | 0 .../monlib/encode/prometheus/ut/ya.make | 12 + .../monlib/encode/spack/CMakeLists.txt | 8 +- .../monlib/encode/spack/compression.cpp | 16 +- .../monlib/encode/spack/compression.h | 4 +- .../monlib/encode/spack/fuzz/main.cpp | 6 +- .../library}/monlib/encode/spack/fuzz/ya.make | 4 +- .../library}/monlib/encode/spack/spack_v1.h | 8 +- .../monlib/encode/spack/spack_v1_decoder.cpp | 18 +- .../monlib/encode/spack/spack_v1_encoder.cpp | 8 +- .../monlib/encode/spack/spack_v1_ut.cpp | 14 +- src/library/monlib/encode/spack/ut/ya.make | 11 + .../library}/monlib/encode/spack/varint.cpp | 6 +- .../library}/monlib/encode/spack/varint.h | 2 +- .../monlib/encode/text/CMakeLists.txt | 2 +- .../library}/monlib/encode/text/text.h | 2 +- .../monlib/encode/text/text_encoder.cpp | 10 +- .../monlib/encode/text/text_encoder_ut.cpp | 4 +- src/library/monlib/encode/text/ut/ya.make | 7 + src/library/monlib/encode/ut/ya.make | 7 + .../library}/monlib/exception/CMakeLists.txt | 2 +- .../library}/monlib/exception/exception.cpp | 0 .../library}/monlib/exception/exception.h | 0 src/library/monlib/metrics/CMakeLists.txt | 34 ++ .../library}/monlib/metrics/atomics_array.h | 2 +- .../library}/monlib/metrics/ewma.cpp | 0 .../cpp => src/library}/monlib/metrics/ewma.h | 4 +- .../library}/monlib/metrics/ewma_ut.cpp | 2 +- .../library}/monlib/metrics/fake.cpp | 0 .../cpp => src/library}/monlib/metrics/fake.h | 0 .../library}/monlib/metrics/fake_ut.cpp | 4 +- .../monlib/metrics/histogram_collector.h | 0 .../metrics/histogram_collector_explicit.cpp | 6 +- .../histogram_collector_exponential.cpp | 6 +- .../metrics/histogram_collector_linear.cpp | 6 +- .../monlib/metrics/histogram_collector_ut.cpp | 2 +- .../monlib/metrics/histogram_snapshot.cpp | 2 +- .../monlib/metrics/histogram_snapshot.h | 6 +- .../monlib/metrics/histogram_snapshot_ut.cpp | 2 +- .../library}/monlib/metrics/labels.cpp | 4 +- .../library}/monlib/metrics/labels.h | 14 +- .../library}/monlib/metrics/labels_ut.cpp | 2 +- .../monlib/metrics/log_histogram_collector.h | 6 +- .../metrics/log_histogram_collector_ut.cpp | 2 +- .../monlib/metrics/log_histogram_snapshot.cpp | 2 +- .../monlib/metrics/log_histogram_snapshot.h | 2 +- .../library}/monlib/metrics/metric.h | 4 +- .../monlib/metrics/metric_consumer.cpp | 2 +- .../library}/monlib/metrics/metric_consumer.h | 0 .../monlib/metrics/metric_registry.cpp | 0 .../library}/monlib/metrics/metric_registry.h | 4 +- .../monlib/metrics/metric_registry_ut.cpp | 10 +- .../monlib/metrics/metric_sub_registry.h | 0 .../monlib/metrics/metric_sub_registry_ut.cpp | 2 +- .../library}/monlib/metrics/metric_type.cpp | 4 +- .../library}/monlib/metrics/metric_type.h | 2 +- .../library}/monlib/metrics/metric_value.cpp | 0 .../library}/monlib/metrics/metric_value.h | 8 +- .../monlib/metrics/metric_value_type.h | 0 .../monlib/metrics/metric_value_ut.cpp | 2 +- .../monlib/metrics/summary_collector.cpp | 0 .../monlib/metrics/summary_collector.h | 0 .../monlib/metrics/summary_collector_ut.cpp | 4 +- .../monlib/metrics/summary_snapshot.cpp | 2 +- .../monlib/metrics/summary_snapshot.h | 2 +- .../library}/monlib/metrics/timer.h | 2 +- .../library}/monlib/metrics/timer_ut.cpp | 6 +- .../monlib/metrics/ut/histograms.json | 0 .../library}/monlib/metrics/ut/ya.make | 10 +- .../library}/monlib/service/CMakeLists.txt | 10 +- .../library}/monlib/service/auth.cpp | 0 .../cpp => src/library}/monlib/service/auth.h | 0 .../library}/monlib/service/format.cpp | 0 .../library}/monlib/service/format.h | 8 +- .../service/mon_service_http_request.cpp | 0 .../monlib/service/mon_service_http_request.h | 2 +- .../library}/monlib/service/monservice.cpp | 8 +- .../library}/monlib/service/monservice.h | 6 +- .../monlib/service/pages/CMakeLists.txt | 30 ++ .../monlib/service/pages/diag_mon_page.cpp | 0 .../monlib/service/pages/diag_mon_page.h | 0 .../monlib/service/pages/html_mon_page.cpp | 2 +- .../monlib/service/pages/html_mon_page.h | 0 .../monlib/service/pages/index_mon_page.cpp | 4 +- .../monlib/service/pages/index_mon_page.h | 0 .../monlib/service/pages/mon_page.cpp | 0 .../library}/monlib/service/pages/mon_page.h | 6 +- .../monlib/service/pages/pre_mon_page.cpp | 0 .../monlib/service/pages/pre_mon_page.h | 0 .../service/pages/registry_mon_page.cpp | 12 +- .../monlib/service/pages/registry_mon_page.h | 2 +- .../service/pages/resource_mon_page.cpp | 0 .../monlib/service/pages/resource_mon_page.h | 2 +- .../service/pages/resources/CMakeLists.txt | 20 +- .../service/pages/resources/css_mon_page.h | 2 +- .../service/pages/resources/fonts_mon_page.h | 2 +- .../service/pages/resources/js_mon_page.h | 2 +- .../resources/static/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../resources/static/js/bootstrap.min.js | 0 .../pages/resources/static/js/jquery.min.js | 0 .../service/pages/tablesorter/CMakeLists.txt | 10 +- .../service/pages/tablesorter/css_mon_page.h | 2 +- .../service/pages/tablesorter/js_mon_page.h | 2 +- .../resources/jquery.tablesorter.css | 0 .../resources/jquery.tablesorter.js | 0 .../monlib/service/pages/templates.cpp | 0 .../library}/monlib/service/pages/templates.h | 4 +- .../monlib/service/pages/version_mon_page.cpp | 4 +- .../monlib/service/pages/version_mon_page.h | 0 .../library}/monlib/service/service.cpp | 22 +- .../library}/monlib/service/service.h | 16 +- .../library}/object_factory/object_factory.h | 10 +- .../library}/openssl/CMakeLists.txt | 0 .../library}/openssl/holders/CMakeLists.txt | 4 +- .../library}/openssl/holders/bio.cpp | 0 .../cpp => src/library}/openssl/holders/bio.h | 2 +- .../cpp => src/library}/openssl/holders/evp.h | 0 .../library}/openssl/holders/hmac.h | 0 .../library}/openssl/holders/holder.h | 2 +- .../library}/openssl/holders/ut/evp_ut.cpp | 2 +- .../library}/openssl/holders/ut/hmac_ut.cpp | 2 +- .../library}/openssl/holders/ut/ya.make | 2 +- .../library}/openssl/holders/x509_vfy.cpp | 0 .../library}/openssl/holders/x509_vfy.h | 2 +- .../library}/openssl/init/CMakeLists.txt | 2 +- .../cpp => src/library}/openssl/init/init.cpp | 14 +- .../cpp => src/library}/openssl/init/init.h | 0 .../library}/openssl/io/CMakeLists.txt | 2 +- .../cpp => src/library}/openssl/io/stream.cpp | 10 +- .../cpp => src/library}/openssl/io/stream.h | 6 +- .../library}/openssl/io/ut/builtin_ut.cpp | 4 +- src/library/openssl/io/ut/ya.make | 7 + .../library}/openssl/method/CMakeLists.txt | 2 +- .../cpp => src/library}/openssl/method/io.cpp | 8 +- .../cpp => src/library}/openssl/method/io.h | 2 +- .../library}/openssl/method/ut/io_ut.cpp | 4 +- src/library/openssl/method/ut/ya.make | 7 + src/library/operation_id/CMakeLists.txt | 15 + .../library}/operation_id/operation_id.cpp | 8 +- .../library}/operation_id/operation_id.h | 4 +- .../operation_id/protos/CMakeLists.txt | 5 +- .../operation_id/protos/operation_id.proto | 0 {ydb => src}/library/persqueue/CMakeLists.txt | 0 .../persqueue/obfuscate/CMakeLists.txt | 2 +- .../library/persqueue/obfuscate/obfuscate.cpp | 2 +- .../library/persqueue/obfuscate/obfuscate.h | 0 .../topic_parser_public/CMakeLists.txt | 2 +- .../topic_parser_public/topic_parser.cpp | 4 +- .../topic_parser_public/topic_parser.h | 0 .../library}/resource/CMakeLists.txt | 4 +- .../cpp => src/library}/resource/README.md | 2 +- .../cpp => src/library}/resource/registry.cpp | 12 +- .../cpp => src/library}/resource/registry.h | 0 .../cpp => src/library}/resource/resource.cpp | 4 +- .../cpp => src/library}/resource/resource.h | 0 .../cpp => src/library}/resource/ut/lib/data | 0 .../library}/resource/ut/lib/ya.make | 0 .../library}/resource/ut/resource_ut.cpp | 4 +- src/library/resource/ut/ya.make | 7 + .../cpp => src/library}/retry/CMakeLists.txt | 4 +- .../library}/retry/protos/CMakeLists.txt | 2 +- .../library}/retry/protos/retry_options.proto | 0 {library/cpp => src/library}/retry/retry.cpp | 2 +- {library/cpp => src/library}/retry/retry.h | 8 +- .../cpp => src/library}/retry/retry_policy.h | 6 +- .../library}/retry/retry_policy_ut.cpp | 2 +- .../cpp => src/library}/retry/retry_ut.cpp | 2 +- {library/cpp => src/library}/retry/ut/ya.make | 2 +- {library/cpp => src/library}/retry/utils.cpp | 2 +- {library/cpp => src/library}/retry/utils.h | 2 +- src/library/security/CMakeLists.txt | 5 + {ydb => src}/library/security/util.h | 4 +- .../library}/streams/CMakeLists.txt | 0 .../library}/streams/brotli/CMakeLists.txt | 2 +- .../library}/streams/brotli/brotli.cpp | 4 +- .../library}/streams/brotli/brotli.h | 6 +- .../library}/streams/brotli/brotli_ut.cpp | 4 +- src/library/streams/brotli/ut/ya.make | 7 + .../library}/streams/bzip2/CMakeLists.txt | 2 +- .../library}/streams/bzip2/bzip2.cpp | 4 +- .../cpp => src/library}/streams/bzip2/bzip2.h | 8 +- .../library}/streams/bzip2/bzip2_ut.cpp | 6 +- src/library/streams/bzip2/ut/ya.make | 7 + .../library}/streams/lz/common/error.h | 2 +- {library/cpp => src/library}/streams/lz/lz.h | 14 +- .../cpp => src/library}/streams/lz/lz4/lz4.h | 6 +- .../library}/streams/lz/snappy/snappy.h | 6 +- .../library}/streams/lzma/CMakeLists.txt | 2 +- .../cpp => src/library}/streams/lzma/lzma.cpp | 14 +- .../cpp => src/library}/streams/lzma/lzma.h | 8 +- .../library}/streams/lzma/lzma_ut.cpp | 8 +- src/library/streams/lzma/ut/ya.make | 7 + .../library}/streams/zstd/CMakeLists.txt | 2 +- src/library/streams/zstd/ut/ya.make | 7 + .../cpp => src/library}/streams/zstd/zstd.cpp | 4 +- .../cpp => src/library}/streams/zstd/zstd.h | 6 +- .../library}/streams/zstd/zstd_ut.cpp | 8 +- .../library}/string_utils/CMakeLists.txt | 0 .../string_utils/base64/CMakeLists.txt | 2 +- .../library}/string_utils/base64/base64.cpp | 6 +- .../library}/string_utils/base64/base64.h | 0 .../base64/base64_decode_uneven_ut.cpp | 4 +- .../string_utils/base64/base64_ut.cpp | 8 +- .../library}/string_utils/base64/ut/ya.make | 2 +- .../string_utils/helpers/CMakeLists.txt | 2 +- .../library}/string_utils/helpers/helpers.cpp | 0 .../library}/string_utils/helpers/helpers.h | 0 .../library}/string_utils/misc/CMakeLists.txt | 2 +- .../library}/string_utils/misc/misc.h | 6 +- .../string_utils/quote/CMakeLists.txt | 2 +- .../library}/string_utils/quote/quote.cpp | 6 +- .../library}/string_utils/quote/quote.h | 0 .../library}/string_utils/quote/quote_ut.cpp | 2 +- src/library/string_utils/quote/ut/ya.make | 7 + .../relaxed_escaper/CMakeLists.txt | 2 +- .../relaxed_escaper/relaxed_escaper.cpp | 0 .../relaxed_escaper/relaxed_escaper.h | 8 +- .../relaxed_escaper/relaxed_escaper_ut.cpp | 2 +- .../string_utils/relaxed_escaper/ut/ya.make | 7 + .../library}/string_utils/scan/CMakeLists.txt | 2 +- .../library}/string_utils/scan/scan.cpp | 0 .../library}/string_utils/scan/scan.h | 2 +- .../string_utils/stream/CMakeLists.txt | 2 +- .../library}/string_utils/stream/stream.cpp | 0 .../library}/string_utils/stream/stream.h | 2 +- .../library}/string_utils/url/CMakeLists.txt | 2 +- .../library}/string_utils/url/url.cpp | 28 +- .../library}/string_utils/url/url.h | 2 +- .../library}/string_utils/url/url_ut.cpp | 4 +- src/library/string_utils/url/ut/ya.make | 7 + .../library}/svnversion/CMakeLists.txt | 4 +- .../library}/svnversion/svn_interface.c | 0 .../library}/svnversion/svnversion.cpp | 2 +- .../library}/svnversion/svnversion.h | 2 +- .../library}/terminate_handler/CMakeLists.txt | 4 +- .../sample/exception/main.cpp | 2 +- .../sample/exception/ya.make | 2 +- .../sample/pure-virtual/main.cpp | 0 .../sample/pure-virtual/ya.make | 2 +- .../terminate_handler/sample/rethrow/main.cpp | 2 +- .../terminate_handler/sample/rethrow/ya.make | 2 +- .../terminate_handler/sample/segv/main.cpp | 0 .../terminate_handler/sample/segv/ya.make | 2 +- .../terminate_handler/segv_handler.cpp | 8 +- .../library}/terminate_handler/segv_handler.h | 0 .../terminate_handler/terminate_handler.cpp | 6 +- .../library}/testing/CMakeLists.txt | 0 .../cpp => src/library}/testing/README.md | 0 src/library/testing/common/CMakeLists.txt | 17 + .../library}/testing/common/env.cpp | 26 +- .../cpp => src/library}/testing/common/env.h | 4 +- .../library}/testing/common/env_var.cpp | 6 +- .../library}/testing/common/env_var.h | 0 .../library}/testing/common/network.cpp | 28 +- .../library}/testing/common/network.h | 2 +- .../library}/testing/common/probe.cpp | 0 .../library}/testing/common/probe.h | 2 +- .../library}/testing/common/scope.cpp | 0 .../library}/testing/common/scope.h | 0 .../library}/testing/common/ut/CMakeLists.txt | 0 .../library}/testing/common/ut/env_ut.cpp | 16 +- .../library}/testing/common/ut/network_ut.cpp | 16 +- .../library}/testing/common/ut/scope_ut.cpp | 6 +- .../library}/testing/common/ut/ya.make | 2 +- .../library}/testing/common/ya.make | 2 +- .../testing/gmock_in_unittest/CMakeLists.txt | 4 +- .../testing/gmock_in_unittest/events.cpp | 4 +- .../testing/gmock_in_unittest/events.h | 0 .../example_ut/CMakeLists.txt | 0 .../example_ut/example_ut.cpp | 4 +- .../gmock_in_unittest/example_ut/ya.make | 2 +- src/library/testing/gmock_in_unittest/gmock.h | 5 + .../gmock_in_unittest/registration.cpp | 2 +- .../testing/gmock_in_unittest/ya.make | 4 +- .../library}/testing/gtest/CMakeLists.txt | 0 .../library}/testing/gtest/README.md | 0 .../library}/testing/gtest/gtest.cpp | 2 +- .../cpp => src/library}/testing/gtest/gtest.h | 4 +- .../library}/testing/gtest/main.cpp | 12 +- .../cpp => src/library}/testing/gtest/main.h | 4 +- .../library}/testing/gtest/matchers.cpp | 10 +- .../library}/testing/gtest/matchers.h | 0 .../library}/testing/gtest/ut/CMakeLists.txt | 0 .../library}/testing/gtest/ut/README.md | 0 .../library}/testing/gtest/ut/golden/data.txt | 0 .../library}/testing/gtest/ut/matchers_ut.cpp | 4 +- .../library}/testing/gtest/ut/ut.cpp | 4 +- src/library/testing/gtest/ut/ya.make | 15 + .../cpp => src/library}/testing/gtest/ya.make | 8 +- .../testing/gtest_extensions/CMakeLists.txt | 16 + .../testing/gtest_extensions/README.md | 2 +- .../testing/gtest_extensions/assertions.cpp | 8 +- .../testing/gtest_extensions/assertions.h | 0 .../gtest_extensions/gtest_extensions.cpp | 0 .../gtest_extensions/gtest_extensions.h | 0 .../testing/gtest_extensions/matchers.cpp | 0 .../testing/gtest_extensions/matchers.h | 0 .../gtest_extensions/pretty_printers.cpp | 0 .../gtest_extensions/pretty_printers.h | 10 +- .../testing/gtest_extensions/probe.cpp | 0 .../library}/testing/gtest_extensions/probe.h | 4 +- .../gtest_extensions/ut/CMakeLists.txt | 0 .../testing/gtest_extensions/ut/README.md | 0 .../ut/gtest_extensions_ut.cpp | 6 +- .../testing/gtest_extensions/ut/probe_ut.cpp | 2 +- .../testing/gtest_extensions/ut/ya.make | 2 +- .../library}/testing/gtest_extensions/ya.make | 0 .../library}/testing/hook/CMakeLists.txt | 2 +- .../library}/testing/hook/README.md | 0 .../cpp => src/library}/testing/hook/hook.cpp | 0 .../cpp => src/library}/testing/hook/hook.h | 0 .../cpp => src/library}/testing/hook/ya.make | 0 src/library/testing/unittest/CMakeLists.txt | 24 ++ .../library}/testing/unittest/checks.cpp | 2 +- src/library/testing/unittest/env.h | 3 + .../testing/unittest/fat/CMakeLists.txt | 0 .../unittest/fat/test_port_manager.cpp | 4 +- .../library}/testing/unittest/fat/ya.make | 0 .../library}/testing/unittest/gtest.cpp | 2 +- .../library}/testing/unittest/gtest.h | 8 +- .../library}/testing/unittest/junit.cpp | 34 +- .../library}/testing/unittest/junit.h | 4 +- .../library}/testing/unittest/plugin.cpp | 4 +- .../library}/testing/unittest/plugin.h | 4 +- .../unittest/pytests/test_subject/tests.cpp | 2 +- .../unittest/pytests/test_subject/ya.make | 2 +- .../unittest/pytests/test_tear_down.py | 2 +- .../library}/testing/unittest/pytests/ya.make | 2 +- .../library}/testing/unittest/registar.cpp | 20 +- .../library}/testing/unittest/registar.h | 34 +- .../library}/testing/unittest/registar_ut.cpp | 2 +- .../library}/testing/unittest/simple.h | 0 .../library}/testing/unittest/tests_data.cpp | 4 +- .../library}/testing/unittest/tests_data.h | 8 +- .../testing/unittest/ut/CMakeLists.txt | 0 .../library}/testing/unittest/ut/main.cpp | 12 +- .../library}/testing/unittest/ut/ya.make | 2 +- .../library}/testing/unittest/utmain.cpp | 38 +-- .../library}/testing/unittest/utmain.h | 0 .../library}/testing/unittest/ya.make | 14 +- .../unittest_main/CMakeLists.darwin-arm64.txt | 2 +- .../CMakeLists.darwin-x86_64.txt | 2 +- .../CMakeLists.linux-aarch64.txt | 2 +- .../unittest_main/CMakeLists.linux-x86_64.txt | 2 +- .../testing/unittest_main/CMakeLists.txt | 19 ++ .../CMakeLists.windows-x86_64.txt | 2 +- .../library}/testing/unittest_main/main.cpp | 2 +- src/library/testing/unittest_main/ya.make | 12 + .../library}/threading/CMakeLists.txt | 0 .../library}/threading/atomic/CMakeLists.txt | 2 +- .../library}/threading/atomic/bool.cpp | 0 .../library}/threading/atomic/bool.h | 2 +- .../library}/threading/atomic/bool_ut.cpp | 2 +- src/library/threading/atomic/ut/ya.make | 7 + .../operation_cancelled_exception.h | 2 +- .../threading/chunk_queue/CMakeLists.txt | 2 +- .../library}/threading/chunk_queue/queue.cpp | 0 .../library}/threading/chunk_queue/queue.h | 20 +- .../threading/chunk_queue/queue_ut.cpp | 4 +- .../library}/threading/chunk_queue/readme.txt | 0 src/library/threading/chunk_queue/ut/ya.make | 7 + .../library}/threading/equeue/CMakeLists.txt | 2 +- .../library}/threading/equeue/equeue.cpp | 0 .../library}/threading/equeue/equeue.h | 6 +- .../library}/threading/equeue/equeue_ut.cpp | 8 +- src/library/threading/equeue/ut/ya.make | 14 + src/library/threading/future/CMakeLists.txt | 17 + .../library}/threading/future/async.cpp | 0 .../library}/threading/future/async.h | 4 +- .../threading/future/async_semaphore.cpp | 6 +- .../threading/future/async_semaphore.h | 6 +- .../threading/future/async_semaphore_ut.cpp | 8 +- .../library}/threading/future/async_ut.cpp | 4 +- .../threading/future/core/future-inl.h | 0 .../library}/threading/future/core/future.cpp | 0 .../library}/threading/future/core/future.h | 14 +- .../library}/threading/future/core/fwd.cpp | 0 .../library}/threading/future/core/fwd.h | 0 .../library}/threading/future/future.h | 0 .../threading/future/future_mt_ut.cpp | 8 +- .../library}/threading/future/future_ut.cpp | 2 +- .../library}/threading/future/fwd.cpp | 0 .../library}/threading/future/fwd.h | 0 .../library}/threading/future/legacy_future.h | 2 +- .../threading/future/legacy_future_ut.cpp | 2 +- .../library}/threading/future/mt_ut/ya.make | 2 +- .../library}/threading/future/perf/main.cpp | 6 +- .../library}/threading/future/perf/ya.make | 2 +- .../library}/threading/future/ut/ya.make | 2 +- .../library}/threading/future/wait/fwd.cpp | 0 .../library}/threading/future/wait/fwd.h | 0 .../library}/threading/future/wait/wait-inl.h | 0 .../library}/threading/future/wait/wait.cpp | 0 .../library}/threading/future/wait/wait.h | 4 +- .../threading/future/wait/wait_group-inl.h | 6 +- .../threading/future/wait/wait_group.cpp | 0 .../threading/future/wait/wait_group.h | 4 +- .../threading/future/wait/wait_policy.cpp | 0 .../threading/future/wait/wait_policy.h | 0 .../threading/light_rw_lock/CMakeLists.txt | 2 +- .../light_rw_lock/bench/lightrwlock_test.cpp | 6 +- .../threading/light_rw_lock/bench/ya.make | 2 +- .../threading/light_rw_lock/lightrwlock.cpp | 2 +- .../threading/light_rw_lock/lightrwlock.h | 4 +- .../threading/light_rw_lock/ut/rwlock_ut.cpp | 10 +- .../threading/light_rw_lock/ut/ya.make | 11 + .../threading/poor_man_openmp/CMakeLists.txt | 2 +- .../poor_man_openmp/thread_helper.cpp | 2 +- .../threading/poor_man_openmp/thread_helper.h | 12 +- .../poor_man_openmp/thread_helper_ut.cpp | 4 +- .../threading/poor_man_openmp/ut/ya.make | 7 + .../unicode_normalization/CMakeLists.txt | 0 .../decomposition_table.h | 2 +- .../generated/composition.cpp | 2 +- .../generated/decomposition.cpp | 2 +- .../unicode_normalization/normalization.cpp | 0 .../unicode_normalization/normalization.h | 14 +- .../ut/normalization_ut.cpp | 6 +- src/library/uri/CMakeLists.txt | 42 +++ {library/cpp => src/library}/uri/assign.cpp | 12 +- .../library}/uri/benchmark/main.cpp | 4 +- .../cpp => src/library}/uri/benchmark/ya.make | 4 +- {library/cpp => src/library}/uri/common.cpp | 2 +- {library/cpp => src/library}/uri/common.h | 4 +- {library/cpp => src/library}/uri/encode.cpp | 2 +- {library/cpp => src/library}/uri/encode.h | 2 +- .../cpp => src/library}/uri/encodefsm.rl6 | 2 +- {library/cpp => src/library}/uri/http_url.h | 0 {library/cpp => src/library}/uri/location.cpp | 0 {library/cpp => src/library}/uri/location.h | 0 .../cpp => src/library}/uri/location_ut.cpp | 2 +- {library/cpp => src/library}/uri/other.cpp | 6 +- {library/cpp => src/library}/uri/other.h | 0 {library/cpp => src/library}/uri/parse.cpp | 0 {library/cpp => src/library}/uri/parse.h | 8 +- {library/cpp => src/library}/uri/parsefsm.rl6 | 2 +- {library/cpp => src/library}/uri/qargs.cpp | 0 {library/cpp => src/library}/uri/qargs.h | 0 .../cpp => src/library}/uri/uri-ru_ut.cpp | 6 +- {library/cpp => src/library}/uri/uri.cpp | 6 +- {library/cpp => src/library}/uri/uri.h | 12 +- {library/cpp => src/library}/uri/uri_ut.cpp | 4 +- {library/cpp => src/library}/uri/uri_ut.h | 2 +- {library/cpp => src/library}/uri/ut/ya.make | 4 +- src/library/uuid/CMakeLists.txt | 9 + {ydb => src}/library/uuid/uuid.cpp | 2 +- {ydb => src}/library/uuid/uuid.h | 4 +- {ydb => src}/library/yql/CMakeLists.txt | 0 .../library/yql/public/CMakeLists.txt | 0 .../library/yql/public/decimal/CMakeLists.txt | 4 +- .../yql/public/decimal/ut/CMakeLists.txt | 11 + .../yql/public/decimal/ut/yql_decimal_ut.cpp | 6 +- .../yql/public/decimal/ut/yql_wide_int_ut.cpp | 4 +- .../yql/public/decimal/yql_decimal.cpp | 0 .../library/yql/public/decimal/yql_decimal.h | 0 .../public/decimal/yql_decimal_serialize.cpp | 0 .../public/decimal/yql_decimal_serialize.h | 2 +- .../library/yql/public/decimal/yql_wide_int.h | 2 +- .../library/yql/public/issue/CMakeLists.txt | 5 +- .../yql/public/issue/protos/CMakeLists.txt | 6 +- .../public/issue/protos/issue_message.proto | 0 .../public/issue/protos/issue_severity.proto | 0 .../library/yql/public/issue/yql_issue.cpp | 24 +- .../library/yql/public/issue/yql_issue.h | 6 +- .../library/yql/public/issue/yql_issue_id.h | 14 +- .../yql/public/issue/yql_issue_message.cpp | 10 +- .../yql/public/issue/yql_issue_message.h | 2 +- {ydb => src}/library/yql/utils/CMakeLists.txt | 4 +- {ydb => src}/library/yql/utils/utf8.cpp | 2 +- {ydb => src}/library/yql/utils/utf8.h | 0 src/library/yson/CMakeLists.txt | 22 ++ .../cpp => src/library}/yson/consumer.cpp | 0 {library/cpp => src/library}/yson/consumer.h | 4 +- {library/cpp => src/library}/yson/detail.h | 8 +- {library/cpp => src/library}/yson/format.h | 0 .../library}/yson/json/CMakeLists.txt | 4 +- .../library}/yson/json/json_writer.cpp | 4 +- .../library}/yson/json/json_writer.h | 6 +- .../library}/yson/json/yson2json_adapter.cpp | 0 .../library}/yson/json/yson2json_adapter.h | 6 +- {library/cpp => src/library}/yson/lexer.cpp | 2 +- {library/cpp => src/library}/yson/lexer.h | 2 +- .../cpp => src/library}/yson/lexer_detail.h | 0 src/library/yson/node/CMakeLists.txt | 24 ++ .../library}/yson/node/benchmark/reserve.cpp | 2 +- .../library}/yson/node/benchmark/ya.make | 2 +- .../cpp => src/library}/yson/node/node.cpp | 6 +- {library/cpp => src/library}/yson/node/node.h | 16 +- .../library}/yson/node/node_builder.cpp | 0 .../library}/yson/node/node_builder.h | 6 +- .../cpp => src/library}/yson/node/node_io.cpp | 24 +- .../cpp => src/library}/yson/node/node_io.h | 2 +- .../library}/yson/node/node_io_ut.cpp | 4 +- .../cpp => src/library}/yson/node/node_ut.cpp | 4 +- .../library}/yson/node/node_visitor.cpp | 2 +- .../library}/yson/node/node_visitor.h | 2 +- .../library}/yson/node/serialize.cpp | 2 +- .../cpp => src/library}/yson/node/serialize.h | 0 .../cpp => src/library}/yson/node/ut/ya.make | 2 +- {library/cpp => src/library}/yson/parser.cpp | 4 +- {library/cpp => src/library}/yson/parser.h | 2 +- .../cpp => src/library}/yson/parser_detail.h | 0 {library/cpp => src/library}/yson/public.h | 8 +- {library/cpp => src/library}/yson/token.cpp | 2 +- {library/cpp => src/library}/yson/token.h | 0 .../cpp => src/library}/yson/tokenizer.cpp | 0 {library/cpp => src/library}/yson/tokenizer.h | 0 {library/cpp => src/library}/yson/ut/ya.make | 2 +- .../cpp => src/library}/yson/ut/yson_ut.cpp | 8 +- {library/cpp => src/library}/yson/varint.cpp | 4 +- {library/cpp => src/library}/yson/varint.h | 6 +- {library/cpp => src/library}/yson/writer.cpp | 4 +- {library/cpp => src/library}/yson/writer.h | 2 +- {library/cpp => src/library}/yson/zigzag.h | 2 +- .../cpp => src/library}/yt/CMakeLists.txt | 0 .../library}/yt/assert/CMakeLists.txt | 2 +- .../cpp => src/library}/yt/assert/assert.cpp | 4 +- .../cpp => src/library}/yt/assert/assert.h | 4 +- .../library}/yt/coding/CMakeLists.txt | 2 +- .../yt/coding/unittests/varint_ut.cpp | 8 +- src/library/yt/coding/unittests/ya.make | 15 + .../yt/coding/unittests/zig_zag_ut.cpp | 4 +- .../library}/yt/coding/varint-inl.h | 2 +- .../cpp => src/library}/yt/coding/varint.h | 6 +- .../library}/yt/coding/zig_zag-inl.h | 0 .../cpp => src/library}/yt/coding/zig_zag.h | 2 +- .../library}/yt/exception/CMakeLists.txt | 2 +- .../library}/yt/exception/exception.cpp | 0 .../library}/yt/exception/exception.h | 0 .../library}/yt/malloc/CMakeLists.txt | 2 +- .../cpp => src/library}/yt/malloc/malloc.cpp | 4 +- .../cpp => src/library}/yt/malloc/malloc.h | 0 src/library/yt/memory/CMakeLists.txt | 28 ++ .../yt/memory/atomic_intrusive_ptr-inl.h | 2 +- .../library}/yt/memory/atomic_intrusive_ptr.h | 0 .../cpp => src/library}/yt/memory/blob.cpp | 2 +- {library/cpp => src/library}/yt/memory/blob.h | 0 .../yt/memory/chunked_input_stream.cpp | 0 .../library}/yt/memory/chunked_input_stream.h | 2 +- .../yt/memory/chunked_memory_allocator-inl.h | 2 +- .../yt/memory/chunked_memory_allocator.cpp | 0 .../yt/memory/chunked_memory_allocator.h | 0 .../yt/memory/chunked_memory_pool-inl.h | 4 +- .../yt/memory/chunked_memory_pool.cpp | 0 .../library}/yt/memory/chunked_memory_pool.h | 2 +- .../chunked_memory_pool_allocator-inl.h | 2 +- .../yt/memory/chunked_memory_pool_allocator.h | 0 .../yt/memory/chunked_memory_pool_output.cpp | 2 +- .../yt/memory/chunked_memory_pool_output.h | 4 +- .../yt/memory/chunked_output_stream.cpp | 2 +- .../yt/memory/chunked_output_stream.h | 6 +- .../library}/yt/memory/free_list-inl.h | 0 .../cpp => src/library}/yt/memory/free_list.h | 0 .../library}/yt/memory/intrusive_ptr.h | 4 +- .../memory/leaky_ref_counted_singleton-inl.h | 4 +- .../yt/memory/leaky_ref_counted_singleton.h | 0 .../library}/yt/memory/leaky_singleton-inl.h | 0 .../library}/yt/memory/leaky_singleton.h | 0 .../library}/yt/memory/memory_tag-inl.h | 2 +- .../library}/yt/memory/memory_tag.cpp | 4 +- .../library}/yt/memory/memory_tag.h | 0 .../cpp => src/library}/yt/memory/new-inl.h | 2 +- {library/cpp => src/library}/yt/memory/new.h | 4 +- .../cpp => src/library}/yt/memory/public.h | 0 .../cpp => src/library}/yt/memory/range.h | 4 +- .../cpp => src/library}/yt/memory/ref-inl.h | 0 .../cpp => src/library}/yt/memory/ref.cpp | 6 +- {library/cpp => src/library}/yt/memory/ref.h | 2 +- .../library}/yt/memory/ref_counted-inl.h | 2 +- .../library}/yt/memory/ref_counted.h | 4 +- .../library}/yt/memory/ref_tracked-inl.h | 0 .../library}/yt/memory/ref_tracked.cpp | 0 .../library}/yt/memory/ref_tracked.h | 8 +- .../yt/memory/safe_memory_reader-inl.h | 0 .../library}/yt/memory/safe_memory_reader.cpp | 2 +- .../library}/yt/memory/safe_memory_reader.h | 0 .../library}/yt/memory/serialize-inl.h | 0 .../cpp => src/library}/yt/memory/serialize.h | 2 +- .../library}/yt/memory/shared_range.cpp | 0 .../library}/yt/memory/shared_range.h | 4 +- .../library}/yt/memory/tagged_ptr-inl.h | 4 +- .../library}/yt/memory/tagged_ptr.h | 2 +- .../unittests/atomic_intrusive_ptr_ut.cpp | 8 +- .../chunked_memory_pool_allocator_ut.cpp | 6 +- .../chunked_memory_pool_output_ut.cpp | 6 +- .../unittests/chunked_memory_pool_ut.cpp | 6 +- .../yt/memory/unittests/free_list_ut.cpp | 6 +- .../yt/memory/unittests/intrusive_ptr_ut.cpp | 14 +- .../library}/yt/memory/unittests/ref_ut.cpp | 6 +- .../unittests/safe_memory_reader_ut.cpp | 4 +- .../yt/memory/unittests/shared_range_ut.cpp | 6 +- .../yt/memory/unittests/weak_ptr_ut.cpp | 6 +- .../library}/yt/memory/unittests/ya.make | 6 +- .../cpp => src/library}/yt/memory/weak_ptr.h | 2 +- .../library}/yt/misc/CMakeLists.txt | 8 +- .../library}/yt/misc/arcadia_enum-inl.h | 2 +- .../library}/yt/misc/arcadia_enum.h | 0 .../cpp => src/library}/yt/misc/cast-inl.h | 4 +- {library/cpp => src/library}/yt/misc/cast.h | 2 +- .../cpp => src/library}/yt/misc/enum-inl.h | 6 +- {library/cpp => src/library}/yt/misc/enum.h | 2 +- .../cpp => src/library}/yt/misc/guid-inl.h | 0 {library/cpp => src/library}/yt/misc/guid.cpp | 4 +- {library/cpp => src/library}/yt/misc/guid.h | 6 +- .../cpp => src/library}/yt/misc/hash-inl.h | 0 {library/cpp => src/library}/yt/misc/hash.h | 4 +- {library/cpp => src/library}/yt/misc/port.h | 2 +- .../library}/yt/misc/preprocessor-gen.h | 0 .../library}/yt/misc/preprocessor.h | 0 .../cpp => src/library}/yt/misc/property.h | 2 +- .../library}/yt/misc/source_location.cpp | 0 .../library}/yt/misc/source_location.h | 0 .../library}/yt/misc/strong_typedef-inl.h | 4 +- .../library}/yt/misc/strong_typedef.h | 0 .../library}/yt/misc/thread_name.cpp | 4 +- .../cpp => src/library}/yt/misc/thread_name.h | 0 .../cpp => src/library}/yt/misc/tls-inl.h | 0 {library/cpp => src/library}/yt/misc/tls.h | 2 +- .../library}/yt/misc/unittests/enum_ut.cpp | 6 +- .../library}/yt/misc/unittests/guid_ut.cpp | 6 +- .../yt/misc/unittests/preprocessor_ut.cpp | 4 +- .../library}/yt/misc/unittests/ya.make | 4 +- .../cpp => src/library}/yt/misc/variant-inl.h | 0 .../cpp => src/library}/yt/misc/variant.cpp | 2 +- .../cpp => src/library}/yt/misc/variant.h | 2 +- .../library}/yt/misc/wrapper_traits-inl.h | 2 +- .../library}/yt/misc/wrapper_traits.h | 0 .../yt/small_containers/CMakeLists.txt | 0 .../small_containers/compact_flat_map-inl.h | 0 .../yt/small_containers/compact_flat_map.h | 0 .../yt/small_containers/compact_heap-inl.h | 2 +- .../yt/small_containers/compact_heap.h | 0 .../yt/small_containers/compact_queue-inl.h | 0 .../yt/small_containers/compact_queue.h | 0 .../yt/small_containers/compact_set-inl.h | 2 +- .../yt/small_containers/compact_set.h | 0 .../yt/small_containers/compact_vector-inl.h | 8 +- .../yt/small_containers/compact_vector.h | 2 +- .../unittests/compact_flat_map_ut.cpp | 4 +- .../unittests/compact_heap_ut.cpp | 4 +- .../unittests/compact_queue_ut.cpp | 4 +- .../unittests/compact_set_ut.cpp | 4 +- .../unittests/compact_vector_ut.cpp | 6 +- .../yt/small_containers/unittests/ya.make | 6 +- .../library}/yt/string/CMakeLists.txt | 8 +- .../cpp => src/library}/yt/string/enum-inl.h | 4 +- .../cpp => src/library}/yt/string/enum.cpp | 0 {library/cpp => src/library}/yt/string/enum.h | 2 +- .../library}/yt/string/format-inl.h | 8 +- .../cpp => src/library}/yt/string/format.cpp | 0 .../cpp => src/library}/yt/string/format.h | 0 .../cpp => src/library}/yt/string/guid.cpp | 0 {library/cpp => src/library}/yt/string/guid.h | 4 +- .../library}/yt/string/raw_formatter.h | 0 .../cpp => src/library}/yt/string/string.cpp | 6 +- .../cpp => src/library}/yt/string/string.h | 6 +- .../library}/yt/string/string_builder-inl.h | 2 +- .../library}/yt/string/string_builder.h | 2 +- .../library}/yt/string/unittests/enum_ut.cpp | 6 +- .../yt/string/unittests/format_ut.cpp | 6 +- .../library}/yt/string/unittests/guid_ut.cpp | 8 +- .../yt/string/unittests/string_ut.cpp | 4 +- .../library}/yt/string/unittests/ya.make | 6 +- .../library}/yt/yson/CMakeLists.txt | 2 +- .../cpp => src/library}/yt/yson/consumer.cpp | 2 +- .../cpp => src/library}/yt/yson/consumer.h | 4 +- {library/cpp => src/library}/yt/yson/public.h | 0 .../library}/yt/yson_string/CMakeLists.txt | 4 +- .../library}/yt/yson_string/convert.cpp | 10 +- .../library}/yt/yson_string/convert.h | 6 +- .../library}/yt/yson_string/format.h | 0 .../library}/yt/yson_string/public.h | 2 +- .../library}/yt/yson_string/string-inl.h | 0 .../library}/yt/yson_string/string.cpp | 6 +- .../library}/yt/yson_string/string.h | 4 +- .../yt/yson_string/unittests/convert_ut.cpp | 6 +- .../yt/yson_string/unittests/saveload_ut.cpp | 6 +- src/library/yt/yson_string/unittests/ya.make | 16 + src/util/CMakeLists.txt | 314 ++++++++++++++++++ {util => src/util}/README.md | 0 src/util/charset/CMakeLists.txt | 33 ++ .../util}/charset/generated/unidata.cpp | 2 +- {util => src/util}/charset/recode_result.cpp | 0 {util => src/util}/charset/recode_result.h | 0 {util => src/util}/charset/unicode_table.cpp | 0 {util => src/util}/charset/unicode_table.h | 6 +- {util => src/util}/charset/unidata.cpp | 0 {util => src/util}/charset/unidata.h | 2 +- .../util}/charset/ut/utf8/invalid_UTF8.bin | Bin {util => src/util}/charset/ut/utf8/test1.txt | 0 src/util/charset/ut/ya.make | 16 + {util => src/util}/charset/utf8.cpp | 0 {util => src/util}/charset/utf8.h | 8 +- {util => src/util}/charset/utf8_ut.cpp | 14 +- {util => src/util}/charset/wide.cpp | 4 +- {util => src/util}/charset/wide.h | 14 +- {util => src/util}/charset/wide_specific.h | 4 +- {util => src/util}/charset/wide_sse41.cpp | 6 +- {util => src/util}/charset/wide_ut.cpp | 4 +- {util => src/util}/datetime/base.cpp | 12 +- {util => src/util}/datetime/base.h | 14 +- {util => src/util}/datetime/base_ut.cpp | 18 +- .../datetime/benchmark/gmtime_r/main.cpp | 4 +- .../util}/datetime/benchmark/gmtime_r/ya.make | 2 +- {util => src/util}/datetime/benchmark/ya.make | 0 {util => src/util}/datetime/constants.cpp | 0 {util => src/util}/datetime/constants.h | 0 {util => src/util}/datetime/cputimer.cpp | 8 +- {util => src/util}/datetime/cputimer.h | 0 {util => src/util}/datetime/cputimer_ut.cpp | 2 +- {util => src/util}/datetime/parser.h | 2 +- {util => src/util}/datetime/parser.rl6 | 4 +- .../util}/datetime/parser_deprecated_ut.cpp | 4 +- {util => src/util}/datetime/parser_ut.cpp | 4 +- {util => src/util}/datetime/strptime.cpp | 2 +- {util => src/util}/datetime/systime.cpp | 4 +- {util => src/util}/datetime/systime.h | 4 +- {util => src/util}/datetime/uptime.cpp | 6 +- {util => src/util}/datetime/uptime.h | 0 {util => src/util}/datetime/uptime_ut.cpp | 2 +- {util => src/util}/datetime/ut/ya.make | 2 +- .../util}/digest/benchmark/murmur/main.cpp | 6 +- .../util}/digest/benchmark/murmur/ya.make | 0 {util => src/util}/digest/benchmark/ya.make | 0 {util => src/util}/digest/city.cpp | 4 +- {util => src/util}/digest/city.h | 2 +- {util => src/util}/digest/city_ut.cpp | 2 +- {util => src/util}/digest/fnv.cpp | 0 {util => src/util}/digest/fnv.h | 2 +- {util => src/util}/digest/fnv_ut.cpp | 2 +- {util => src/util}/digest/multi.cpp | 0 {util => src/util}/digest/multi.h | 2 +- src/util/digest/multi.pxd | 2 + {util => src/util}/digest/multi_ut.cpp | 4 +- {util => src/util}/digest/multi_ut.pyx | 0 {util => src/util}/digest/murmur.cpp | 2 +- {util => src/util}/digest/murmur.h | 2 +- {util => src/util}/digest/murmur_ut.cpp | 2 +- {util => src/util}/digest/numeric.cpp | 0 {util => src/util}/digest/numeric.h | 4 +- {util => src/util}/digest/sequence.cpp | 0 {util => src/util}/digest/sequence.h | 2 +- {util => src/util}/digest/sequence_ut.cpp | 4 +- {util => src/util}/digest/ut/ya.make | 2 +- .../util}/digest/ut_cython/test_digest.py | 0 {util => src/util}/digest/ut_cython/ya.make | 2 +- {util => src/util}/folder/dirent_win.c | 2 +- {util => src/util}/folder/dirent_win.h | 4 +- {util => src/util}/folder/dirut.cpp | 10 +- {util => src/util}/folder/dirut.h | 10 +- {util => src/util}/folder/dirut_ut.cpp | 6 +- {util => src/util}/folder/filelist.cpp | 2 +- {util => src/util}/folder/filelist.h | 4 +- {util => src/util}/folder/filelist_ut.cpp | 4 +- {util => src/util}/folder/fts.cpp | 10 +- {util => src/util}/folder/fts.h | 4 +- {util => src/util}/folder/fts_ut.cpp | 8 +- {util => src/util}/folder/fwd.cpp | 0 {util => src/util}/folder/fwd.h | 0 {util => src/util}/folder/iterator.cpp | 0 {util => src/util}/folder/iterator.h | 10 +- {util => src/util}/folder/iterator_ut.cpp | 12 +- {util => src/util}/folder/lstat_win.c | 4 +- {util => src/util}/folder/lstat_win.h | 2 +- {util => src/util}/folder/path.cpp | 14 +- {util => src/util}/folder/path.h | 12 +- {util => src/util}/folder/path.pxd | 2 +- {util => src/util}/folder/path_ut.cpp | 16 +- {util => src/util}/folder/path_ut.pyx | 0 {util => src/util}/folder/pathsplit.cpp | 6 +- {util => src/util}/folder/pathsplit.h | 2 +- {util => src/util}/folder/pathsplit_ut.cpp | 8 +- {util => src/util}/folder/tempdir.cpp | 4 +- {util => src/util}/folder/tempdir.h | 0 {util => src/util}/folder/ut/ya.make | 4 +- .../util}/folder/ut_cython/test_folder.py | 0 {util => src/util}/folder/ut_cython/ya.make | 2 +- {util => src/util}/generic/adaptor.cpp | 0 {util => src/util}/generic/adaptor.h | 0 {util => src/util}/generic/adaptor_ut.cpp | 2 +- {util => src/util}/generic/algorithm.cpp | 0 {util => src/util}/generic/algorithm.h | 4 +- {util => src/util}/generic/algorithm_ut.cpp | 2 +- {util => src/util}/generic/array_size.cpp | 0 {util => src/util}/generic/array_size.h | 0 {util => src/util}/generic/array_size_ut.cpp | 2 +- {util => src/util}/generic/bitmap.cpp | 0 {util => src/util}/generic/bitmap.h | 8 +- {util => src/util}/generic/bitmap_ut.cpp | 2 +- {util => src/util}/generic/bitops.cpp | 0 {util => src/util}/generic/bitops.h | 4 +- {util => src/util}/generic/bitops_ut.cpp | 4 +- {util => src/util}/generic/bt_exception.cpp | 0 {util => src/util}/generic/bt_exception.h | 2 +- {util => src/util}/generic/buffer.cpp | 4 +- {util => src/util}/generic/buffer.h | 8 +- {util => src/util}/generic/buffer_ut.cpp | 4 +- {util => src/util}/generic/cast.cpp | 0 {util => src/util}/generic/cast.h | 8 +- {util => src/util}/generic/cast_ut.cpp | 2 +- {util => src/util}/generic/explicit_type.cpp | 0 {util => src/util}/generic/explicit_type.h | 0 .../util}/generic/explicit_type_ut.cpp | 2 +- {util => src/util}/generic/fastqueue.cpp | 0 {util => src/util}/generic/fastqueue.h | 2 +- {util => src/util}/generic/flags.cpp | 4 +- {util => src/util}/generic/flags.h | 6 +- {util => src/util}/generic/flags_ut.cpp | 2 +- {util => src/util}/generic/function.cpp | 0 {util => src/util}/generic/function.h | 0 {util => src/util}/generic/function_ref.cpp | 0 {util => src/util}/generic/function_ref.h | 4 +- .../util}/generic/function_ref_ut.cpp | 2 +- {util => src/util}/generic/function_ut.cpp | 2 +- {util => src/util}/generic/fwd.cpp | 0 {util => src/util}/generic/fwd.h | 2 +- {util => src/util}/generic/guid.cpp | 10 +- {util => src/util}/generic/guid.h | 2 +- {util => src/util}/generic/guid_ut.cpp | 2 +- {util => src/util}/generic/hash.cpp | 0 {util => src/util}/generic/hash.h | 0 {util => src/util}/generic/hash.pxd | 2 +- {util => src/util}/generic/hash_multi_map.cpp | 0 {util => src/util}/generic/hash_multi_map.h | 0 {util => src/util}/generic/hash_primes.cpp | 0 {util => src/util}/generic/hash_primes.h | 4 +- {util => src/util}/generic/hash_primes_ut.cpp | 8 +- {util => src/util}/generic/hash_table.cpp | 4 +- {util => src/util}/generic/hash_table.h | 10 +- {util => src/util}/generic/hash_ut.cpp | 8 +- {util => src/util}/generic/hash_ut.pyx | 0 {util => src/util}/generic/hide_ptr.cpp | 0 {util => src/util}/generic/hide_ptr.h | 0 {util => src/util}/generic/intrlist.cpp | 0 {util => src/util}/generic/intrlist.h | 2 +- {util => src/util}/generic/intrlist_ut.cpp | 4 +- {util => src/util}/generic/is_in.cpp | 0 {util => src/util}/generic/is_in.h | 0 {util => src/util}/generic/is_in_ut.cpp | 2 +- {util => src/util}/generic/iterator.cpp | 0 {util => src/util}/generic/iterator.h | 0 {util => src/util}/generic/iterator_range.cpp | 0 {util => src/util}/generic/iterator_range.h | 2 +- .../util}/generic/iterator_range_ut.cpp | 6 +- {util => src/util}/generic/iterator_ut.cpp | 2 +- {util => src/util}/generic/join.h | 0 {util => src/util}/generic/lazy_value.cpp | 0 {util => src/util}/generic/lazy_value.h | 0 {util => src/util}/generic/lazy_value_ut.cpp | 2 +- {util => src/util}/generic/mapfindptr.cpp | 0 {util => src/util}/generic/mapfindptr.h | 2 +- {util => src/util}/generic/mapfindptr_ut.cpp | 2 +- {util => src/util}/generic/mem_copy.cpp | 0 {util => src/util}/generic/mem_copy.h | 2 +- {util => src/util}/generic/mem_copy_ut.cpp | 2 +- {util => src/util}/generic/noncopyable.cpp | 0 {util => src/util}/generic/noncopyable.h | 0 {util => src/util}/generic/object_counter.cpp | 0 {util => src/util}/generic/object_counter.h | 0 .../util}/generic/objects_counter_ut.cpp | 2 +- {util => src/util}/generic/overloaded.cpp | 0 {util => src/util}/generic/overloaded.h | 0 {util => src/util}/generic/overloaded_ut.cpp | 8 +- {util => src/util}/generic/ptr.cpp | 4 +- {util => src/util}/generic/ptr.h | 6 +- {util => src/util}/generic/ptr.pxd | 2 +- {util => src/util}/generic/ptr_ut.cpp | 8 +- {util => src/util}/generic/ptr_ut.pyx | 0 {util => src/util}/generic/refcount.cpp | 0 {util => src/util}/generic/refcount.h | 8 +- {util => src/util}/generic/reserve.h | 0 {util => src/util}/generic/scope.cpp | 0 {util => src/util}/generic/scope.h | 4 +- {util => src/util}/generic/scope_ut.cpp | 4 +- {util => src/util}/generic/set.cpp | 0 {util => src/util}/generic/set.h | 4 +- {util => src/util}/generic/set_ut.cpp | 2 +- {util => src/util}/generic/singleton.cpp | 6 +- {util => src/util}/generic/singleton.h | 4 +- {util => src/util}/generic/singleton_ut.cpp | 2 +- {util => src/util}/generic/size_literals.cpp | 0 {util => src/util}/generic/size_literals.h | 2 +- .../util}/generic/size_literals_ut.cpp | 0 {util => src/util}/generic/stack.cpp | 0 {util => src/util}/generic/stack.h | 0 {util => src/util}/generic/stack_ut.cpp | 2 +- {util => src/util}/generic/store_policy.cpp | 0 {util => src/util}/generic/store_policy.h | 0 .../util}/generic/store_policy_ut.cpp | 4 +- {util => src/util}/generic/strfcpy.cpp | 0 {util => src/util}/generic/strfcpy.h | 0 {util => src/util}/generic/string_hash.h | 0 .../generic/string_transparent_hash_ut.cpp | 6 +- {util => src/util}/generic/typelist.cpp | 0 {util => src/util}/generic/typelist.h | 4 +- {util => src/util}/generic/typelist_ut.cpp | 4 +- {util => src/util}/generic/typetraits.cpp | 0 {util => src/util}/generic/typetraits.h | 2 +- {util => src/util}/generic/typetraits_ut.cpp | 2 +- {util => src/util}/generic/ut/ya.make | 4 +- .../util}/generic/ut_cython/test_generic.py | 0 {util => src/util}/generic/ut_cython/ya.make | 2 +- {util => src/util}/generic/utility.cpp | 0 {util => src/util}/generic/utility.h | 2 +- {util => src/util}/generic/utility_ut.cpp | 2 +- {util => src/util}/generic/va_args.cpp | 0 {util => src/util}/generic/va_args.h | 2 +- {util => src/util}/generic/va_args_ut.cpp | 2 +- {util => src/util}/generic/variant.cpp | 0 {util => src/util}/generic/variant.h | 0 {util => src/util}/generic/xrange.cpp | 0 {util => src/util}/generic/xrange.h | 2 +- {util => src/util}/generic/xrange_ut.cpp | 4 +- {util => src/util}/generic/yexception.cpp | 8 +- {util => src/util}/generic/yexception.h | 14 +- {util => src/util}/generic/yexception_ut.c | 0 {util => src/util}/generic/yexception_ut.cpp | 18 +- {util => src/util}/generic/yexception_ut.h | 0 {util => src/util}/generic/ylimits.cpp | 0 {util => src/util}/generic/ylimits.h | 0 {util => src/util}/generic/ylimits_ut.cpp | 4 +- {util => src/util}/generic/ymath.cpp | 0 {util => src/util}/generic/ymath.h | 4 +- {util => src/util}/generic/ymath_ut.cpp | 6 +- {util => src/util}/memory/addstorage.cpp | 0 {util => src/util}/memory/addstorage.h | 4 +- {util => src/util}/memory/addstorage_ut.cpp | 2 +- {util => src/util}/memory/alloc.cpp | 4 +- {util => src/util}/memory/alloc.h | 0 {util => src/util}/memory/blob.cpp | 18 +- {util => src/util}/memory/blob.h | 6 +- {util => src/util}/memory/blob.pxd | 2 +- {util => src/util}/memory/blob_ut.cpp | 12 +- {util => src/util}/memory/blob_ut.pyx | 0 {util => src/util}/memory/mmapalloc.cpp | 4 +- {util => src/util}/memory/mmapalloc.h | 0 {util => src/util}/memory/pool.cpp | 0 {util => src/util}/memory/pool.h | 12 +- {util => src/util}/memory/pool_ut.cpp | 4 +- .../util}/memory/segmented_string_pool.cpp | 0 .../util}/memory/segmented_string_pool.h | 8 +- {util => src/util}/memory/segpool_alloc.cpp | 0 {util => src/util}/memory/segpool_alloc.h | 0 {util => src/util}/memory/smallobj.cpp | 0 {util => src/util}/memory/smallobj.h | 4 +- {util => src/util}/memory/smallobj_ut.cpp | 2 +- {util => src/util}/memory/tempbuf.cpp | 14 +- {util => src/util}/memory/tempbuf.h | 4 +- {util => src/util}/memory/tempbuf_ut.cpp | 2 +- {util => src/util}/memory/ut/ya.make | 2 +- .../util}/memory/ut_cython/test_memory.py | 0 {util => src/util}/memory/ut_cython/ya.make | 2 +- {util => src/util}/network/address.cpp | 2 +- {util => src/util}/network/address.h | 4 +- {util => src/util}/network/address_ut.cpp | 2 +- {util => src/util}/network/endpoint.cpp | 0 {util => src/util}/network/endpoint.h | 2 +- {util => src/util}/network/endpoint_ut.cpp | 2 +- {util => src/util}/network/hostip.cpp | 4 +- {util => src/util}/network/hostip.h | 2 +- {util => src/util}/network/init.cpp | 4 +- {util => src/util}/network/init.h | 4 +- {util => src/util}/network/interface.cpp | 2 +- {util => src/util}/network/interface.h | 0 {util => src/util}/network/iovec.cpp | 0 {util => src/util}/network/iovec.h | 6 +- {util => src/util}/network/ip.cpp | 0 {util => src/util}/network/ip.h | 6 +- {util => src/util}/network/ip_ut.cpp | 4 +- {util => src/util}/network/nonblock.cpp | 4 +- {util => src/util}/network/nonblock.h | 0 {util => src/util}/network/pair.cpp | 0 {util => src/util}/network/pair.h | 0 {util => src/util}/network/poller.cpp | 2 +- {util => src/util}/network/poller.h | 4 +- {util => src/util}/network/poller_ut.cpp | 4 +- {util => src/util}/network/pollerimpl.cpp | 0 {util => src/util}/network/pollerimpl.h | 18 +- {util => src/util}/network/sock.cpp | 0 {util => src/util}/network/sock.h | 12 +- {util => src/util}/network/sock_ut.cpp | 8 +- {util => src/util}/network/socket.cpp | 20 +- {util => src/util}/network/socket.h | 18 +- {util => src/util}/network/socket_ut.cpp | 6 +- {util => src/util}/network/ut/ya.make | 4 +- {util => src/util}/random/common_ops.cpp | 0 {util => src/util}/random/common_ops.h | 4 +- {util => src/util}/random/common_ops_ut.cpp | 4 +- {util => src/util}/random/easy.cpp | 0 {util => src/util}/random/easy.h | 0 {util => src/util}/random/easy_ut.cpp | 2 +- {util => src/util}/random/entropy.cpp | 50 +-- {util => src/util}/random/entropy.h | 0 {util => src/util}/random/entropy_ut.cpp | 2 +- {util => src/util}/random/fast.cpp | 2 +- {util => src/util}/random/fast.h | 4 +- {util => src/util}/random/fast_ut.cpp | 2 +- {util => src/util}/random/init_atfork.cpp | 4 +- {util => src/util}/random/init_atfork.h | 0 {util => src/util}/random/lcg_engine.cpp | 0 {util => src/util}/random/lcg_engine.h | 2 +- {util => src/util}/random/mersenne.cpp | 0 {util => src/util}/random/mersenne.h | 0 {util => src/util}/random/mersenne32.cpp | 4 +- {util => src/util}/random/mersenne32.h | 2 +- {util => src/util}/random/mersenne64.cpp | 4 +- {util => src/util}/random/mersenne64.h | 2 +- {util => src/util}/random/mersenne_ut.cpp | 4 +- {util => src/util}/random/normal.cpp | 0 {util => src/util}/random/normal.h | 0 {util => src/util}/random/normal_ut.cpp | 4 +- {util => src/util}/random/random.cpp | 10 +- {util => src/util}/random/random.h | 0 {util => src/util}/random/random_ut.cpp | 4 +- {util => src/util}/random/shuffle.cpp | 0 {util => src/util}/random/shuffle.h | 4 +- {util => src/util}/random/shuffle_ut.cpp | 4 +- {util => src/util}/random/ut/ya.make | 2 +- {util => src/util}/str_stl.cpp | 0 {util => src/util}/str_stl.h | 10 +- {util => src/util}/stream/buffer.cpp | 2 +- {util => src/util}/stream/buffer.h | 2 +- {util => src/util}/stream/buffer_ut.cpp | 4 +- {util => src/util}/stream/buffered.cpp | 6 +- {util => src/util}/stream/buffered.h | 6 +- {util => src/util}/stream/buffered_ut.cpp | 4 +- {util => src/util}/stream/debug.cpp | 6 +- {util => src/util}/stream/debug.h | 0 {util => src/util}/stream/file.cpp | 4 +- {util => src/util}/stream/file.h | 2 +- {util => src/util}/stream/file_ut.cpp | 4 +- {util => src/util}/stream/format.cpp | 4 +- {util => src/util}/stream/format.h | 8 +- {util => src/util}/stream/format_std_ut.cpp | 2 +- {util => src/util}/stream/format_ut.cpp | 4 +- {util => src/util}/stream/fwd.cpp | 0 {util => src/util}/stream/fwd.h | 2 +- {util => src/util}/stream/hex.cpp | 2 +- {util => src/util}/stream/hex.h | 2 +- {util => src/util}/stream/hex_ut.cpp | 2 +- {util => src/util}/stream/input.cpp | 14 +- {util => src/util}/stream/input.h | 6 +- {util => src/util}/stream/input_ut.cpp | 6 +- {util => src/util}/stream/ios_ut.cpp | 8 +- {util => src/util}/stream/length.cpp | 0 {util => src/util}/stream/length.h | 2 +- {util => src/util}/stream/length_ut.cpp | 2 +- {util => src/util}/stream/mem.cpp | 2 +- {util => src/util}/stream/mem.h | 0 {util => src/util}/stream/mem_ut.cpp | 2 +- {util => src/util}/stream/multi.cpp | 0 {util => src/util}/stream/multi.h | 2 +- {util => src/util}/stream/multi_ut.cpp | 2 +- {util => src/util}/stream/null.cpp | 2 +- {util => src/util}/stream/null.h | 0 {util => src/util}/stream/output.cpp | 16 +- {util => src/util}/stream/output.h | 4 +- {util => src/util}/stream/output.pxd | 2 +- {util => src/util}/stream/str.cpp | 2 +- {util => src/util}/stream/str.h | 6 +- {util => src/util}/stream/str.pxd | 2 +- {util => src/util}/stream/str_ut.cpp | 4 +- {util => src/util}/stream/str_ut.pyx | 0 {util => src/util}/stream/tee.cpp | 0 {util => src/util}/stream/tee.h | 0 {util => src/util}/stream/tempbuf.cpp | 0 {util => src/util}/stream/tempbuf.h | 2 +- {util => src/util}/stream/ut/ya.make | 2 +- .../util}/stream/ut_cython/test_stream.py | 0 {util => src/util}/stream/ut_cython/ya.make | 2 +- {util => src/util}/stream/walk.cpp | 0 {util => src/util}/stream/walk.h | 0 {util => src/util}/stream/walk_ut.cpp | 2 +- {util => src/util}/stream/zerocopy.cpp | 0 {util => src/util}/stream/zerocopy.h | 6 +- {util => src/util}/stream/zerocopy_output.cpp | 2 +- {util => src/util}/stream/zerocopy_output.h | 2 +- .../util}/stream/zerocopy_output_ut.cpp | 2 +- {util => src/util}/stream/zlib.cpp | 6 +- {util => src/util}/stream/zlib.h | 6 +- {util => src/util}/stream/zlib_ut.cpp | 6 +- {util => src/util}/string/ascii.cpp | 4 +- {util => src/util}/string/ascii.h | 18 +- {util => src/util}/string/ascii_ut.cpp | 2 +- {util => src/util}/string/builder.cpp | 2 +- {util => src/util}/string/builder.h | 2 +- {util => src/util}/string/builder_ut.cpp | 2 +- {util => src/util}/string/cast.cpp | 20 +- {util => src/util}/string/cast.h | 10 +- {util => src/util}/string/cast.pxd | 2 +- {util => src/util}/string/cast_ut.cpp | 6 +- {util => src/util}/string/cast_ut.pyx | 0 {util => src/util}/string/cstriter.cpp | 0 {util => src/util}/string/cstriter.h | 0 {util => src/util}/string/escape.cpp | 6 +- {util => src/util}/string/escape.h | 2 +- {util => src/util}/string/escape_ut.cpp | 4 +- {util => src/util}/string/hex.cpp | 0 {util => src/util}/string/hex.h | 4 +- {util => src/util}/string/hex_ut.cpp | 2 +- {util => src/util}/string/join.cpp | 0 {util => src/util}/string/join.h | 4 +- {util => src/util}/string/join_ut.cpp | 6 +- {util => src/util}/string/reverse.cpp | 2 +- {util => src/util}/string/reverse.h | 2 +- {util => src/util}/string/split.cpp | 0 {util => src/util}/string/split.h | 22 +- {util => src/util}/string/split_ut.cpp | 8 +- {util => src/util}/string/strip.cpp | 2 +- {util => src/util}/string/strip.h | 2 +- {util => src/util}/string/strip_ut.cpp | 4 +- {util => src/util}/string/strspn.cpp | 0 {util => src/util}/string/strspn.h | 2 +- {util => src/util}/string/strspn_ut.cpp | 2 +- {util => src/util}/string/subst.cpp | 2 +- {util => src/util}/string/subst.h | 2 +- {util => src/util}/string/subst_ut.cpp | 2 +- {util => src/util}/string/type.cpp | 0 {util => src/util}/string/type.h | 2 +- {util => src/util}/string/type_ut.cpp | 4 +- {util => src/util}/string/ut/ya.make | 2 +- .../util}/string/ut_cython/test_string.py | 0 {util => src/util}/string/ut_cython/ya.make | 2 +- {util => src/util}/string/util.cpp | 2 +- {util => src/util}/string/util.h | 2 +- {util => src/util}/string/util_ut.cpp | 2 +- {util => src/util}/string/vector.cpp | 2 +- {util => src/util}/string/vector.h | 4 +- {util => src/util}/string/vector_ut.cpp | 2 +- {util => src/util}/system/align.cpp | 0 {util => src/util}/system/align.h | 2 +- {util => src/util}/system/align_ut.cpp | 2 +- {util => src/util}/system/atexit.cpp | 4 +- {util => src/util}/system/atexit.h | 0 {util => src/util}/system/atexit_ut.cpp | 4 +- {util => src/util}/system/backtrace.cpp | 8 +- {util => src/util}/system/backtrace.h | 4 +- {util => src/util}/system/backtrace_ut.cpp | 4 +- {util => src/util}/system/byteorder.cpp | 0 {util => src/util}/system/byteorder.h | 2 +- {util => src/util}/system/byteorder_ut.cpp | 2 +- {util => src/util}/system/compat.cpp | 0 {util => src/util}/system/compat.h | 0 {util => src/util}/system/compat_ut.cpp | 6 +- {util => src/util}/system/compiler.cpp | 0 {util => src/util}/system/compiler.h | 0 {util => src/util}/system/compiler_ut.cpp | 2 +- {util => src/util}/system/context.cpp | 4 +- {util => src/util}/system/context.h | 4 +- {util => src/util}/system/context_aarch64.S | 0 {util => src/util}/system/context_aarch64.h | 0 {util => src/util}/system/context_i686.asm | 0 {util => src/util}/system/context_i686.h | 0 {util => src/util}/system/context_ut.cpp | 4 +- {util => src/util}/system/context_x86.asm | 0 {util => src/util}/system/context_x86.h | 0 {util => src/util}/system/context_x86_64.asm | 0 {util => src/util}/system/context_x86_64.h | 0 {util => src/util}/system/cpu_id.cpp | 2 +- {util => src/util}/system/cpu_id.h | 2 +- {util => src/util}/system/cpu_id_ut.cpp | 2 +- {util => src/util}/system/daemon.cpp | 4 +- {util => src/util}/system/daemon.h | 0 {util => src/util}/system/daemon_ut.cpp | 8 +- {util => src/util}/system/datetime.cpp | 2 +- {util => src/util}/system/datetime.h | 4 +- {util => src/util}/system/datetime_ut.cpp | 0 {util => src/util}/system/defaults.c | 0 {util => src/util}/system/defaults.h | 2 +- {util => src/util}/system/demangle_impl.h | 2 +- {util => src/util}/system/direct_io.cpp | 10 +- {util => src/util}/system/direct_io.h | 2 +- {util => src/util}/system/direct_io_ut.cpp | 10 +- {util => src/util}/system/dynlib.cpp | 4 +- {util => src/util}/system/dynlib.h | 2 +- {util => src/util}/system/err.cpp | 4 +- {util => src/util}/system/error.cpp | 8 +- {util => src/util}/system/error.h | 0 {util => src/util}/system/error_ut.cpp | 4 +- {util => src/util}/system/event.cpp | 0 {util => src/util}/system/event.h | 4 +- {util => src/util}/system/event_ut.cpp | 4 +- {util => src/util}/system/execpath.cpp | 4 +- {util => src/util}/system/execpath.h | 2 +- {util => src/util}/system/execpath_ut.cpp | 4 +- {util => src/util}/system/fake_mutex.cpp | 0 {util => src/util}/system/fake_mutex.h | 2 +- {util => src/util}/system/fasttime.cpp | 12 +- {util => src/util}/system/fasttime.h | 0 {util => src/util}/system/fhandle.cpp | 0 {util => src/util}/system/fhandle.h | 0 {util => src/util}/system/file.cpp | 22 +- {util => src/util}/system/file.h | 8 +- {util => src/util}/system/file_lock.cpp | 2 +- {util => src/util}/system/file_lock.h | 6 +- {util => src/util}/system/file_ut.cpp | 6 +- {util => src/util}/system/filemap.cpp | 8 +- {util => src/util}/system/filemap.h | 12 +- {util => src/util}/system/filemap_ut.cpp | 4 +- {util => src/util}/system/flock.cpp | 2 +- {util => src/util}/system/flock.h | 0 {util => src/util}/system/flock_ut.cpp | 2 +- {util => src/util}/system/fs.cpp | 14 +- {util => src/util}/system/fs.h | 4 +- {util => src/util}/system/fs_ut.cpp | 4 +- {util => src/util}/system/fs_win.cpp | 4 +- {util => src/util}/system/fs_win.h | 0 {util => src/util}/system/fs_win_ut.cpp | 6 +- {util => src/util}/system/fstat.cpp | 2 +- {util => src/util}/system/fstat.h | 4 +- {util => src/util}/system/fstat_ut.cpp | 6 +- {util => src/util}/system/getpid.cpp | 0 {util => src/util}/system/getpid.h | 0 {util => src/util}/system/getpid_ut.cpp | 2 +- {util => src/util}/system/guard.cpp | 0 {util => src/util}/system/guard.h | 4 +- {util => src/util}/system/guard_ut.cpp | 4 +- {util => src/util}/system/hi_lo.cpp | 0 {util => src/util}/system/hi_lo.h | 0 {util => src/util}/system/hi_lo_ut.cpp | 4 +- {util => src/util}/system/hostname.cpp | 10 +- {util => src/util}/system/hostname.h | 2 +- {util => src/util}/system/hostname_ut.cpp | 2 +- {util => src/util}/system/hp_timer.cpp | 6 +- {util => src/util}/system/hp_timer.h | 0 {util => src/util}/system/info.cpp | 12 +- {util => src/util}/system/info.h | 0 {util => src/util}/system/info_ut.cpp | 2 +- .../util}/system/interrupt_signals.cpp | 2 +- {util => src/util}/system/interrupt_signals.h | 0 .../util}/system/interrupt_signals_ut.cpp | 4 +- {util => src/util}/system/madvise.cpp | 4 +- {util => src/util}/system/madvise.h | 0 {util => src/util}/system/maxlen.cpp | 0 {util => src/util}/system/maxlen.h | 0 {util => src/util}/system/mem_info.cpp | 10 +- {util => src/util}/system/mem_info.h | 0 {util => src/util}/system/mem_info_ut.cpp | 2 +- {util => src/util}/system/mincore.cpp | 2 +- {util => src/util}/system/mincore.h | 0 {util => src/util}/system/mincore_ut.cpp | 4 +- {util => src/util}/system/mktemp.cpp | 4 +- {util => src/util}/system/mktemp_system.cpp | 4 +- {util => src/util}/system/mlock.cpp | 2 +- {util => src/util}/system/mlock.h | 2 +- {util => src/util}/system/nice.cpp | 0 {util => src/util}/system/nice.h | 0 {util => src/util}/system/nice_ut.cpp | 2 +- {util => src/util}/system/pipe.cpp | 2 +- {util => src/util}/system/pipe.h | 6 +- {util => src/util}/system/pipe_ut.cpp | 2 +- {util => src/util}/system/platform.cpp | 0 {util => src/util}/system/platform.h | 0 {util => src/util}/system/platform_ut.cpp | 2 +- {util => src/util}/system/progname.cpp | 4 +- {util => src/util}/system/progname.h | 2 +- {util => src/util}/system/progname_ut.cpp | 2 +- {util => src/util}/system/protect.cpp | 2 +- {util => src/util}/system/protect.h | 2 +- {util => src/util}/system/rusage.cpp | 2 +- {util => src/util}/system/rusage.h | 4 +- {util => src/util}/system/rusage_ut.cpp | 2 +- {util => src/util}/system/rwlock.cpp | 2 +- {util => src/util}/system/rwlock.h | 2 +- {util => src/util}/system/rwlock_ut.cpp | 6 +- {util => src/util}/system/sanitizers.cpp | 0 {util => src/util}/system/sanitizers.h | 0 {util => src/util}/system/sanitizers_ut.cpp | 2 +- {util => src/util}/system/sem.cpp | 8 +- {util => src/util}/system/sem.h | 2 +- {util => src/util}/system/shellcommand.cpp | 24 +- {util => src/util}/system/shellcommand.h | 8 +- {util => src/util}/system/shellcommand_ut.cpp | 18 +- {util => src/util}/system/shmat.cpp | 2 +- {util => src/util}/system/shmat.h | 4 +- {util => src/util}/system/shmat_ut.cpp | 2 +- {util => src/util}/system/sigset.cpp | 0 {util => src/util}/system/sigset.h | 0 {util => src/util}/system/spin_wait.cpp | 4 +- {util => src/util}/system/spin_wait.h | 0 {util => src/util}/system/spinlock.cpp | 0 {util => src/util}/system/spinlock.h | 0 {util => src/util}/system/spinlock_ut.cpp | 2 +- {util => src/util}/system/src_location.cpp | 2 +- {util => src/util}/system/src_location.h | 0 {util => src/util}/system/src_location_ut.cpp | 6 +- {util => src/util}/system/src_root.h | 0 {util => src/util}/system/src_root_ut.cpp | 4 +- {util => src/util}/system/sys_alloc.cpp | 0 {util => src/util}/system/sys_alloc.h | 2 +- {util => src/util}/system/sysstat.cpp | 0 {util => src/util}/system/sysstat.h | 0 {util => src/util}/system/tempfile.cpp | 0 {util => src/util}/system/tempfile.h | 2 +- {util => src/util}/system/tempfile_ut.cpp | 8 +- {util => src/util}/system/thread.cpp | 12 +- {util => src/util}/system/thread.h | 4 +- {util => src/util}/system/thread.i | 2 +- {util => src/util}/system/thread_ut.cpp | 2 +- {util => src/util}/system/tls.cpp | 6 +- {util => src/util}/system/tls.h | 4 +- {util => src/util}/system/tls_ut.cpp | 2 +- {util => src/util}/system/type_name.cpp | 0 {util => src/util}/system/type_name.h | 2 +- {util => src/util}/system/type_name_ut.cpp | 6 +- {util => src/util}/system/types.cpp | 4 +- {util => src/util}/system/types.h | 0 {util => src/util}/system/types.pxd | 2 +- {util => src/util}/system/types_ut.cpp | 2 +- {util => src/util}/system/types_ut.pyx | 0 {util => src/util}/system/unaligned_mem.cpp | 0 {util => src/util}/system/unaligned_mem.h | 0 .../util}/system/unaligned_mem_ut.cpp | 6 +- {util => src/util}/system/user.cpp | 2 +- {util => src/util}/system/user.h | 2 +- {util => src/util}/system/user_ut.cpp | 2 +- .../util}/system/ut/stdin_osfhandle/main.cpp | 0 .../util}/system/ut/stdin_osfhandle/ya.make | 0 {util => src/util}/system/ut/ya.make | 4 +- .../util}/system/ut_cython/test_system.py | 0 {util => src/util}/system/ut_cython/ya.make | 2 +- {util => src/util}/system/utime.cpp | 0 {util => src/util}/system/utime.h | 0 {util => src/util}/system/valgrind.cpp | 0 {util => src/util}/system/valgrind.h | 0 {util => src/util}/system/win_undef.h | 2 +- {util => src/util}/system/winint.cpp | 0 {util => src/util}/system/winint.h | 6 +- {util => src/util}/system/yassert.cpp | 8 +- {util => src/util}/system/yassert.h | 0 {util => src/util}/system/yassert_ut.cpp | 2 +- {util => src/util}/system/yield.cpp | 0 {util => src/util}/system/yield.h | 0 {util => src/util}/thread/factory.cpp | 4 +- {util => src/util}/thread/factory.h | 2 +- {util => src/util}/thread/factory_ut.cpp | 2 +- {util => src/util}/thread/fwd.cpp | 0 {util => src/util}/thread/fwd.h | 0 {util => src/util}/thread/pool.cpp | 22 +- {util => src/util}/thread/pool.h | 10 +- {util => src/util}/thread/pool_ut.cpp | 8 +- {util => src/util}/thread/singleton.cpp | 0 {util => src/util}/thread/singleton.h | 6 +- {util => src/util}/thread/singleton_ut.cpp | 2 +- {util => src/util}/thread/ut/ya.make | 2 +- {util => src/util}/ysafeptr.cpp | 0 {util => src/util}/ysafeptr.h | 10 +- {util => src/util}/ysaveload.cpp | 2 +- {util => src/util}/ysaveload.h | 14 +- {util => src/util}/ysaveload_ut.cpp | 12 +- src/yson_value/CMakeLists.txt | 16 + .../lib => src}/yson_value/ydb_yson_value.cpp | 8 +- .../lib => src}/yson_value/ydb_yson_value.h | 10 +- tests/CMakeLists.txt | 1 + tests/client/CMakeLists.txt | 22 +- tests/client/coordination_ut.cpp | 10 +- tests/client/discovery_mutator_ut.cpp | 13 +- tests/client/driver_ut.cpp | 12 +- tests/client/endpoints_ut.cpp | 12 +- tests/client/params_ut.cpp | 9 +- tests/client/result_ut.cpp | 11 +- tests/client/value_ut.cpp | 12 +- .../ydb_scripting_response_headers_ut.cpp | 10 +- tests/json_value/CMakeLists.txt | 4 +- tests/json_value/ydb_json_value_ut.cpp | 12 +- tests/library/CMakeLists.txt | 3 + tests/library/login/CMakeLists.txt | 10 + {ydb => tests}/library/login/login_ut.cpp | 4 +- tests/library/operation_id/CMakeLists.txt | 11 + .../library}/operation_id/operation_id_ut.cpp | 4 +- tests/library/yql/CMakeLists.txt | 22 ++ .../utils => tests/library/yql}/utf8_ut.cpp | 2 +- .../library/yql}/yql_issue_ut.cpp | 16 +- tools/enum_parser/enum_parser/main.cpp | 46 +-- .../enum_serialization_runtime/README.md | 2 +- .../enum_runtime.cpp | 4 +- .../ordered_pairs.h | 6 +- .../serialized_enum.h | 2 +- .../serialized_enum_ut.cpp | 6 +- .../enum_parser/parse_enum/benchmark/main.cpp | 12 +- .../ut/huge_enums_fallback_ut.cpp | 6 +- tools/enum_parser/parse_enum/parse_enum.cpp | 8 +- tools/enum_parser/parse_enum/parse_enum.h | 4 +- .../enum_parser/parse_enum/parse_enum_ut.cpp | 4 +- tools/enum_parser/parse_enum/ut/enums.cpp | 8 +- tools/enum_parser/parse_enum/ut/enums.h | 6 +- .../parse_enum/ut/including_header.h | 2 +- tools/enum_parser/parse_enum/ut/ya.make | 2 +- tools/rescompiler/main.cpp | 18 +- util/CMakeLists.txt | 314 ------------------ util/charset/CMakeLists.txt | 33 -- util/charset/ut/ya.make | 16 - util/digest/multi.pxd | 2 - ydb/CMakeLists.txt | 2 - ydb/library/CMakeLists.txt | 15 - ydb/library/login/CMakeLists.txt | 19 -- ydb/library/login/ut/CMakeLists.txt | 10 - ydb/library/security/CMakeLists.txt | 5 - ydb/library/uuid/CMakeLists.txt | 9 - .../yql/public/decimal/ut/CMakeLists.txt | 11 - .../yql/public/issue/ut/CMakeLists.txt | 11 - ydb/library/yql/utils/ut/CMakeLists.txt | 10 - ydb/library/yverify_stream/CMakeLists.txt | 11 - ydb/library/yverify_stream/yverify_stream.h | 12 - ydb/public/CMakeLists.txt | 2 - .../api/client/yc_private/iam/CMakeLists.txt | 38 --- ydb/public/api/grpc/CMakeLists.txt | 46 --- ydb/public/api/grpc/draft/CMakeLists.txt | 37 --- ydb/public/api/proto_output/CMakeLists.txt | 12 - ydb/public/api/protos/CMakeLists.txt | 81 ----- ydb/public/api/protos/annotations/ya.make | 10 - ydb/public/lib/CMakeLists.txt | 4 - ydb/public/lib/README.md | 3 - ydb/public/lib/jwt/CMakeLists.txt | 18 - ydb/public/lib/operation_id/CMakeLists.txt | 18 - ydb/public/lib/operation_id/ut/CMakeLists.txt | 11 - ydb/public/lib/yson_value/CMakeLists.txt | 18 - 2642 files changed, 6568 insertions(+), 6714 deletions(-) delete mode 100644 client/impl/ydb_internal/db_driver_state/CMakeLists.txt delete mode 100644 client/ydb_federated_topic/impl/CMakeLists.txt delete mode 100644 client/ydb_persqueue_core/impl/CMakeLists.txt delete mode 100644 client/ydb_persqueue_public/persqueue.h delete mode 100644 client/ydb_topic/impl/CMakeLists.txt delete mode 100644 client/ydb_topic/ut/CMakeLists.txt delete mode 100644 client/ydb_topic/ut/ut_utils/CMakeLists.txt delete mode 100644 library/CMakeLists.txt delete mode 100644 library/cpp/blockcodecs/codecs.h delete mode 100644 library/cpp/blockcodecs/stream.h delete mode 100644 library/cpp/build_info/CMakeLists.txt delete mode 100644 library/cpp/charset/lite/CMakeLists.txt delete mode 100644 library/cpp/containers/disjoint_interval_tree/ut/ya.make delete mode 100644 library/cpp/containers/intrusive_rb_tree/ut/ya.make delete mode 100644 library/cpp/coroutine/engine/CMakeLists.txt delete mode 100644 library/cpp/coroutine/engine/ut/ya.make delete mode 100644 library/cpp/deprecated/atomic/ut/ya.make delete mode 100644 library/cpp/digest/argonish/internal/proxies/avx2/proxy_avx2.cpp delete mode 100644 library/cpp/digest/argonish/internal/proxies/avx2/proxy_avx2.h delete mode 100644 library/cpp/digest/argonish/internal/proxies/ref/proxy_ref.cpp delete mode 100644 library/cpp/digest/argonish/internal/proxies/ref/proxy_ref.h delete mode 100644 library/cpp/digest/argonish/internal/proxies/sse2/proxy_sse2.cpp delete mode 100644 library/cpp/digest/argonish/internal/proxies/sse2/proxy_sse2.h delete mode 100644 library/cpp/digest/argonish/internal/proxies/sse41/proxy_sse41.cpp delete mode 100644 library/cpp/digest/argonish/internal/proxies/sse41/proxy_sse41.h delete mode 100644 library/cpp/digest/argonish/internal/proxies/ssse3/proxy_ssse3.cpp delete mode 100644 library/cpp/digest/argonish/internal/proxies/ssse3/proxy_ssse3.h delete mode 100644 library/cpp/digest/argonish/ut/ya.make delete mode 100644 library/cpp/digest/lower_case/CMakeLists.txt delete mode 100644 library/cpp/digest/md5/ut/ya.make delete mode 100644 library/cpp/digest/murmur/ut/ya.make delete mode 100644 library/cpp/getopt/last_getopt.h delete mode 100644 library/cpp/getopt/last_getopt_support.h delete mode 100644 library/cpp/getopt/modchooser.h delete mode 100644 library/cpp/getopt/opt.h delete mode 100644 library/cpp/getopt/opt2.h delete mode 100644 library/cpp/getopt/posix_getopt.h delete mode 100644 library/cpp/getopt/small/CMakeLists.txt delete mode 100644 library/cpp/getopt/ygetopt.h delete mode 100644 library/cpp/http/fetch/CMakeLists.txt delete mode 100644 library/cpp/http/server/CMakeLists.txt delete mode 100644 library/cpp/http/simple/ut/ya.make delete mode 100644 library/cpp/iterator/CMakeLists.txt delete mode 100644 library/cpp/json/json_value.h delete mode 100644 library/cpp/logger/CMakeLists.txt delete mode 100644 library/cpp/monlib/dynamic_counters/percentile/ut/ya.make delete mode 100644 library/cpp/monlib/dynamic_counters/ut/ya.make delete mode 100644 library/cpp/monlib/encode/buffered/ut/ya.make delete mode 100644 library/cpp/monlib/encode/fuzz/ya.make delete mode 100644 library/cpp/monlib/encode/json/fuzz/ya.make delete mode 100644 library/cpp/monlib/encode/prometheus/fuzz/ya.make delete mode 100644 library/cpp/monlib/encode/prometheus/ut/ya.make delete mode 100644 library/cpp/monlib/encode/spack/ut/ya.make delete mode 100644 library/cpp/monlib/encode/text/ut/ya.make delete mode 100644 library/cpp/monlib/encode/ut/ya.make delete mode 100644 library/cpp/monlib/metrics/CMakeLists.txt delete mode 100644 library/cpp/monlib/service/pages/CMakeLists.txt delete mode 100644 library/cpp/openssl/io/ut/ya.make delete mode 100644 library/cpp/openssl/method/ut/ya.make delete mode 100644 library/cpp/resource/ut/ya.make delete mode 100644 library/cpp/streams/brotli/ut/ya.make delete mode 100644 library/cpp/streams/bzip2/ut/ya.make delete mode 100644 library/cpp/streams/lzma/ut/ya.make delete mode 100644 library/cpp/streams/zstd/ut/ya.make delete mode 100644 library/cpp/string_utils/quote/ut/ya.make delete mode 100644 library/cpp/string_utils/relaxed_escaper/ut/ya.make delete mode 100644 library/cpp/string_utils/url/ut/ya.make delete mode 100644 library/cpp/testing/common/CMakeLists.txt delete mode 100644 library/cpp/testing/gmock_in_unittest/gmock.h delete mode 100644 library/cpp/testing/gtest/ut/ya.make delete mode 100644 library/cpp/testing/gtest_extensions/CMakeLists.txt delete mode 100644 library/cpp/testing/unittest/CMakeLists.txt delete mode 100644 library/cpp/testing/unittest/env.h delete mode 100644 library/cpp/testing/unittest_main/CMakeLists.txt delete mode 100644 library/cpp/testing/unittest_main/ya.make delete mode 100644 library/cpp/threading/atomic/ut/ya.make delete mode 100644 library/cpp/threading/chunk_queue/ut/ya.make delete mode 100644 library/cpp/threading/equeue/ut/ya.make delete mode 100644 library/cpp/threading/future/CMakeLists.txt delete mode 100644 library/cpp/threading/light_rw_lock/ut/ya.make delete mode 100644 library/cpp/threading/poor_man_openmp/ut/ya.make delete mode 100644 library/cpp/uri/CMakeLists.txt delete mode 100644 library/cpp/yson/CMakeLists.txt delete mode 100644 library/cpp/yson/node/CMakeLists.txt delete mode 100644 library/cpp/yt/coding/unittests/ya.make delete mode 100644 library/cpp/yt/memory/CMakeLists.txt delete mode 100644 library/cpp/yt/yson_string/unittests/ya.make create mode 100644 src/CMakeLists.txt rename {ydb/public => src}/api/CMakeLists.txt (100%) rename {ydb/public => src}/api/README.md (100%) rename {ydb/public => src}/api/client/CMakeLists.txt (100%) rename {ydb/public => src}/api/client/yc_private/CMakeLists.txt (100%) rename {ydb/public => src}/api/client/yc_private/compute/CMakeLists.txt (100%) rename {ydb/public => src}/api/client/yc_private/compute/inner/CMakeLists.txt (80%) rename {ydb/public => src}/api/client/yc_private/compute/inner/disk_service.proto (75%) create mode 100644 src/api/client/yc_private/iam/CMakeLists.txt rename {ydb/public => src}/api/client/yc_private/iam/iam_token.proto (100%) rename {ydb/public => src}/api/client/yc_private/iam/iam_token_service.proto (88%) rename {ydb/public => src}/api/client/yc_private/iam/iam_token_service_subject.proto (100%) rename {ydb/public => src}/api/client/yc_private/iam/oauth_request.proto (100%) rename {ydb/public => src}/api/client/yc_private/iam/reference.proto (100%) rename {ydb/public => src}/api/client/yc_private/iam/service_account.proto (100%) rename {ydb/public => src}/api/client/yc_private/iam/service_account_service.proto (91%) rename {ydb/public => src}/api/client/yc_private/iam/user_account.proto (100%) rename {ydb/public => src}/api/client/yc_private/iam/user_account_service.proto (94%) rename {ydb/public => src}/api/client/yc_private/iam/yandex_passport_cookie.proto (100%) rename {ydb/public => src}/api/client/yc_private/kms/CMakeLists.txt (75%) rename {ydb/public => src}/api/client/yc_private/kms/asymmetricencryption/CMakeLists.txt (79%) rename {ydb/public => src}/api/client/yc_private/kms/asymmetricencryption/asymmetric_encryption_key.proto (89%) rename {ydb/public => src}/api/client/yc_private/kms/asymmetricsignature/CMakeLists.txt (79%) rename {ydb/public => src}/api/client/yc_private/kms/asymmetricsignature/asymmetric_signature_key.proto (93%) rename {ydb/public => src}/api/client/yc_private/kms/symmetric_crypto_service.proto (93%) rename {ydb/public => src}/api/client/yc_private/kms/symmetric_key.proto (93%) rename {ydb/public => src}/api/client/yc_private/operation/CMakeLists.txt (83%) rename {ydb/public => src}/api/client/yc_private/operation/operation.proto (100%) rename {ydb/public => src}/api/client/yc_private/resourcemanager/CMakeLists.txt (72%) rename {ydb/public => src}/api/client/yc_private/resourcemanager/folder.proto (89%) rename {ydb/public => src}/api/client/yc_private/resourcemanager/folder_service.proto (87%) rename {ydb/public => src}/api/client/yc_private/resourcemanager/transitional/folder_service.proto (90%) rename {ydb/public => src}/api/client/yc_private/servicecontrol/CMakeLists.txt (78%) rename {ydb/public => src}/api/client/yc_private/servicecontrol/access_service.proto (98%) rename {ydb/public => src}/api/client/yc_private/servicecontrol/resource.proto (100%) rename {ydb/public => src}/api/client/yc_public/CMakeLists.txt (100%) rename {ydb/public => src}/api/client/yc_public/README.md (100%) rename {ydb/public => src}/api/client/yc_public/common/CMakeLists.txt (88%) rename {ydb/public => src}/api/client/yc_public/common/validation.proto (100%) rename {ydb/public => src}/api/client/yc_public/events/CMakeLists.txt (74%) rename {ydb/public => src}/api/client/yc_public/events/common.proto (94%) rename {ydb/public => src}/api/client/yc_public/events/options.proto (100%) rename {ydb/public => src}/api/client/yc_public/events/yq.proto (97%) rename {ydb/public => src}/api/client/yc_public/iam/CMakeLists.txt (88%) rename {ydb/public => src}/api/client/yc_public/iam/iam_token_service.proto (96%) rename {ydb/public => src}/api/client/yc_public/logging/CMakeLists.txt (71%) rename {ydb/public => src}/api/client/yc_public/logging/log_entry.proto (96%) rename {ydb/public => src}/api/client/yc_public/logging/log_ingestion_service.proto (83%) rename {ydb/public => src}/api/client/yc_public/logging/log_resource.proto (91%) create mode 100644 src/api/grpc/CMakeLists.txt create mode 100644 src/api/grpc/draft/CMakeLists.txt rename {ydb/public => src}/api/grpc/draft/dummy.proto (91%) rename {ydb/public => src}/api/grpc/draft/fq_v1.proto (98%) rename {ydb/public => src}/api/grpc/draft/ydb_clickhouse_internal_v1.proto (95%) rename {ydb/public => src}/api/grpc/draft/ydb_datastreams_v1.proto (98%) rename {ydb/public => src}/api/grpc/draft/ydb_dynamic_config_v1.proto (97%) rename {ydb/public => src}/api/grpc/draft/ydb_logstore_v1.proto (93%) rename {ydb/public => src}/api/grpc/draft/ydb_long_tx_v1.proto (90%) rename {ydb/public => src}/api/grpc/draft/ydb_maintenance_v1.proto (94%) rename {ydb/public => src}/api/grpc/draft/ydb_persqueue_v1.proto (96%) rename {ydb/public => src}/api/grpc/ydb_auth_v1.proto (82%) rename {ydb/public => src}/api/grpc/ydb_cms_v1.proto (95%) rename {ydb/public => src}/api/grpc/ydb_coordination_v1.proto (96%) rename {ydb/public => src}/api/grpc/ydb_discovery_v1.proto (89%) rename {ydb/public => src}/api/grpc/ydb_export_v1.proto (91%) rename {ydb/public => src}/api/grpc/ydb_federation_discovery_v1.proto (84%) rename {ydb/public => src}/api/grpc/ydb_import_v1.proto (91%) rename {ydb/public => src}/api/grpc/ydb_keyvalue_v1.proto (97%) rename {ydb/public => src}/api/grpc/ydb_monitoring_v1.proto (87%) rename {ydb/public => src}/api/grpc/ydb_operation_v1.proto (97%) rename {ydb/public => src}/api/grpc/ydb_query_v1.proto (97%) rename {ydb/public => src}/api/grpc/ydb_rate_limiter_v1.proto (95%) rename {ydb/public => src}/api/grpc/ydb_scheme_v1.proto (95%) rename {ydb/public => src}/api/grpc/ydb_scripting_v1.proto (89%) rename {ydb/public => src}/api/grpc/ydb_table_v1.proto (98%) rename {ydb/public => src}/api/grpc/ydb_topic_v1.proto (99%) create mode 100644 src/api/proto_output/CMakeLists.txt rename {ydb/public => src}/api/proto_output/proto_output.cpp (88%) create mode 100644 src/api/protos/CMakeLists.txt rename {ydb/public => src}/api/protos/annotations/CMakeLists.txt (64%) rename {ydb/public => src}/api/protos/annotations/sensitive.proto (100%) rename {ydb/public => src}/api/protos/annotations/validation.proto (100%) rename {ydb/public => src}/api/protos/draft/datastreams.proto (99%) rename {ydb/public => src}/api/protos/draft/fq.proto (98%) rename {ydb/public => src}/api/protos/draft/persqueue_common.proto (94%) rename {ydb/public => src}/api/protos/draft/persqueue_error_codes.proto (100%) rename {ydb/public => src}/api/protos/draft/ydb_dynamic_config.proto (99%) rename {ydb/public => src}/api/protos/draft/ydb_logstore.proto (96%) rename {ydb/public => src}/api/protos/draft/ydb_long_tx.proto (97%) rename {ydb/public => src}/api/protos/draft/ydb_maintenance.proto (96%) rename {ydb/public => src}/api/protos/persqueue_error_codes_v1.proto (100%) rename {ydb/public => src}/api/protos/ydb_auth.proto (89%) rename {ydb/public => src}/api/protos/ydb_clickhouse_internal.proto (96%) rename {ydb/public => src}/api/protos/ydb_cms.proto (99%) rename {ydb/public => src}/api/protos/ydb_common.proto (100%) rename {ydb/public => src}/api/protos/ydb_coordination.proto (98%) rename {ydb/public => src}/api/protos/ydb_discovery.proto (98%) rename {ydb/public => src}/api/protos/ydb_export.proto (96%) rename {ydb/public => src}/api/protos/ydb_federation_discovery.proto (95%) rename {ydb/public => src}/api/protos/ydb_formats.proto (100%) rename {ydb/public => src}/api/protos/ydb_import.proto (96%) rename {ydb/public => src}/api/protos/ydb_issue_message.proto (80%) rename {ydb/public => src}/api/protos/ydb_keyvalue.proto (99%) rename {ydb/public => src}/api/protos/ydb_monitoring.proto (98%) rename {ydb/public => src}/api/protos/ydb_operation.proto (95%) rename {ydb/public => src}/api/protos/ydb_persqueue_cluster_discovery.proto (97%) rename {ydb/public => src}/api/protos/ydb_persqueue_v1.proto (99%) rename {ydb/public => src}/api/protos/ydb_query.proto (94%) rename {ydb/public => src}/api/protos/ydb_query_stats.proto (100%) rename {ydb/public => src}/api/protos/ydb_rate_limiter.proto (98%) rename {ydb/public => src}/api/protos/ydb_scheme.proto (96%) rename {ydb/public => src}/api/protos/ydb_scripting.proto (84%) rename {ydb/public => src}/api/protos/ydb_status_codes.proto (100%) rename {ydb/public => src}/api/protos/ydb_table.proto (98%) rename {ydb/public => src}/api/protos/ydb_topic.proto (99%) rename {ydb/public => src}/api/protos/ydb_value.proto (100%) rename {client => src/client}/CMakeLists.txt (100%) rename {client => src/client}/draft/CMakeLists.txt (62%) rename {client => src/client}/draft/ydb_dynamic_config.cpp (99%) rename {client => src/client}/draft/ydb_dynamic_config.h (95%) rename {client => src/client}/draft/ydb_long_tx.cpp (97%) rename {client => src/client}/draft/ydb_long_tx.h (96%) rename {client => src/client}/draft/ydb_scripting.cpp (98%) rename {client => src/client}/draft/ydb_scripting.h (97%) rename {client => src/client}/extensions/CMakeLists.txt (100%) rename {client => src/client}/extensions/discovery_mutator/CMakeLists.txt (78%) rename {client => src/client}/extensions/discovery_mutator/discovery_mutator.cpp (100%) rename {client => src/client}/extensions/discovery_mutator/discovery_mutator.h (92%) rename {client => src/client}/extensions/solomon_stats/CMakeLists.txt (71%) rename {client => src/client}/extensions/solomon_stats/README.md (95%) rename {client => src/client}/extensions/solomon_stats/pull_client.cpp (100%) rename {client => src/client}/extensions/solomon_stats/pull_client.h (78%) rename {client => src/client}/extensions/solomon_stats/pull_connector.cpp (100%) rename {client => src/client}/extensions/solomon_stats/pull_connector.h (93%) rename {client => src/client}/helpers/CMakeLists.txt (83%) rename {client => src/client}/helpers/helpers.cpp (91%) rename {client => src/client}/helpers/helpers.h (95%) rename {client => src/client}/iam/CMakeLists.txt (85%) rename {client => src/client}/iam/common/CMakeLists.txt (78%) rename {client => src/client}/iam/common/iam.cpp (96%) rename {client => src/client}/iam/common/iam.h (95%) rename {client => src/client}/iam/iam.cpp (88%) rename {client => src/client}/iam/iam.h (100%) rename {client => src/client}/iam_private/CMakeLists.txt (83%) rename {client => src/client}/iam_private/iam.cpp (84%) rename {client => src/client}/iam_private/iam.h (91%) rename {client => src/client}/impl/CMakeLists.txt (100%) rename {client => src/client}/impl/ydb_endpoints/CMakeLists.txt (74%) rename {client => src/client}/impl/ydb_endpoints/endpoints.cpp (98%) rename {client => src/client}/impl/ydb_endpoints/endpoints.h (98%) rename {client => src/client}/impl/ydb_internal/CMakeLists.txt (100%) rename {client => src/client}/impl/ydb_internal/common/CMakeLists.txt (59%) rename {client => src/client}/impl/ydb_internal/common/getenv.cpp (100%) rename {client => src/client}/impl/ydb_internal/common/getenv.h (100%) rename {client => src/client}/impl/ydb_internal/common/parser.cpp (96%) rename {client => src/client}/impl/ydb_internal/common/parser.h (100%) rename {client => src/client}/impl/ydb_internal/common/ssl_credentials.h (100%) rename {client => src/client}/impl/ydb_internal/common/types.h (52%) create mode 100644 src/client/impl/ydb_internal/db_driver_state/CMakeLists.txt rename {client => src/client}/impl/ydb_internal/db_driver_state/authenticator.cpp (94%) rename {client => src/client}/impl/ydb_internal/db_driver_state/authenticator.h (75%) rename {client => src/client}/impl/ydb_internal/db_driver_state/endpoint_pool.cpp (100%) rename {client => src/client}/impl/ydb_internal/db_driver_state/endpoint_pool.h (86%) rename {client => src/client}/impl/ydb_internal/db_driver_state/state.cpp (97%) rename {client => src/client}/impl/ydb_internal/db_driver_state/state.h (93%) rename {client => src/client}/impl/ydb_internal/driver/constants.h (84%) rename {client => src/client}/impl/ydb_internal/grpc_connections/CMakeLists.txt (69%) rename {client => src/client}/impl/ydb_internal/grpc_connections/actions.cpp (98%) rename {client => src/client}/impl/ydb_internal/grpc_connections/actions.h (93%) rename {client => src/client}/impl/ydb_internal/grpc_connections/grpc_connections.cpp (99%) rename {client => src/client}/impl/ydb_internal/grpc_connections/grpc_connections.h (98%) rename {client => src/client}/impl/ydb_internal/grpc_connections/params.h (82%) rename {client => src/client}/impl/ydb_internal/internal_client/client.h (72%) rename {client => src/client}/impl/ydb_internal/internal_header.h (93%) rename {client => src/client}/impl/ydb_internal/kqp_session_common/CMakeLists.txt (74%) rename {client => src/client}/impl/ydb_internal/kqp_session_common/kqp_session_common.cpp (98%) rename {client => src/client}/impl/ydb_internal/kqp_session_common/kqp_session_common.h (91%) rename {client => src/client}/impl/ydb_internal/logger/CMakeLists.txt (73%) rename {client => src/client}/impl/ydb_internal/logger/log.cpp (92%) rename {client => src/client}/impl/ydb_internal/logger/log.h (65%) rename {client => src/client}/impl/ydb_internal/make_request/CMakeLists.txt (74%) rename {client => src/client}/impl/ydb_internal/make_request/make.cpp (100%) rename {client => src/client}/impl/ydb_internal/make_request/make.h (91%) rename {client => src/client}/impl/ydb_internal/plain_status/CMakeLists.txt (75%) rename {client => src/client}/impl/ydb_internal/plain_status/status.cpp (98%) rename {client => src/client}/impl/ydb_internal/plain_status/status.h (87%) rename {client => src/client}/impl/ydb_internal/retry/CMakeLists.txt (73%) rename {client => src/client}/impl/ydb_internal/retry/retry.cpp (90%) rename {client => src/client}/impl/ydb_internal/retry/retry.h (90%) rename {client => src/client}/impl/ydb_internal/retry/retry_async.h (98%) rename {client => src/client}/impl/ydb_internal/retry/retry_sync.h (96%) rename {client => src/client}/impl/ydb_internal/rpc_request_settings/settings.h (92%) rename {client => src/client}/impl/ydb_internal/scheme_helpers/helpers.h (91%) rename {client => src/client}/impl/ydb_internal/session_client/session_client.h (90%) rename {client => src/client}/impl/ydb_internal/session_pool/CMakeLists.txt (77%) rename {client => src/client}/impl/ydb_internal/session_pool/session_pool.cpp (98%) rename {client => src/client}/impl/ydb_internal/session_pool/session_pool.h (97%) rename {client => src/client}/impl/ydb_internal/stats_extractor/extractor.h (81%) rename {client => src/client}/impl/ydb_internal/table_helpers/helpers.h (85%) rename {client => src/client}/impl/ydb_internal/thread_pool/CMakeLists.txt (70%) rename {client => src/client}/impl/ydb_internal/thread_pool/pool.cpp (100%) rename {client => src/client}/impl/ydb_internal/thread_pool/pool.h (80%) rename {client => src/client}/impl/ydb_internal/value_helpers/CMakeLists.txt (74%) rename {client => src/client}/impl/ydb_internal/value_helpers/helpers.cpp (97%) rename {client => src/client}/impl/ydb_internal/value_helpers/helpers.h (52%) rename {client => src/client}/impl/ydb_stats/CMakeLists.txt (77%) rename {client => src/client}/impl/ydb_stats/stats.cpp (100%) rename {client => src/client}/impl/ydb_stats/stats.h (98%) rename {client => src/client}/resources/CMakeLists.txt (58%) rename {client => src/client}/resources/ydb_ca.cpp (77%) rename {client => src/client}/resources/ydb_ca.h (100%) rename {client => src/client}/resources/ydb_resources.cpp (97%) rename {client => src/client}/resources/ydb_resources.h (100%) rename {client => src/client}/resources/ydb_root_ca.pem (100%) rename {client => src/client}/resources/ydb_sdk_version.txt (100%) rename {client => src/client}/ydb_common_client/CMakeLists.txt (83%) rename {client => src/client}/ydb_common_client/impl/CMakeLists.txt (76%) rename {client => src/client}/ydb_common_client/impl/client.cpp (100%) rename {client => src/client}/ydb_common_client/impl/client.h (95%) rename {client => src/client}/ydb_common_client/impl/iface.h (86%) rename {client => src/client}/ydb_common_client/settings.cpp (92%) rename {client => src/client}/ydb_common_client/settings.h (91%) rename {client => src/client}/ydb_coordination/CMakeLists.txt (70%) rename {client => src/client}/ydb_coordination/coordination.cpp (99%) rename {client => src/client}/ydb_coordination/coordination.h (99%) rename {client => src/client}/ydb_coordination/proto_accessor.cpp (83%) rename {client => src/client}/ydb_datastreams/CMakeLists.txt (79%) rename {client => src/client}/ydb_datastreams/datastreams.cpp (99%) rename {client => src/client}/ydb_datastreams/datastreams.h (99%) rename {client => src/client}/ydb_discovery/CMakeLists.txt (85%) rename {client => src/client}/ydb_discovery/discovery.cpp (99%) rename {client => src/client}/ydb_discovery/discovery.h (99%) rename {client => src/client}/ydb_driver/CMakeLists.txt (86%) rename {client => src/client}/ydb_driver/driver.cpp (94%) rename {client => src/client}/ydb_driver/driver.h (95%) rename {client => src/client}/ydb_export/CMakeLists.txt (77%) rename {client => src/client}/ydb_export/export.cpp (95%) rename {client => src/client}/ydb_export/export.h (95%) rename {client => src/client}/ydb_extension/CMakeLists.txt (81%) rename {client => src/client}/ydb_extension/extension.cpp (87%) rename {client => src/client}/ydb_extension/extension.h (93%) rename {client => src/client}/ydb_federated_topic/CMakeLists.txt (76%) rename {client => src/client}/ydb_federated_topic/federated_topic.h (99%) create mode 100644 src/client/ydb_federated_topic/impl/CMakeLists.txt rename {client => src/client}/ydb_federated_topic/impl/federated_read_session.cpp (97%) rename {client => src/client}/ydb_federated_topic/impl/federated_read_session.h (94%) rename {client => src/client}/ydb_federated_topic/impl/federated_read_session_event.cpp (98%) rename {client => src/client}/ydb_federated_topic/impl/federated_topic.cpp (89%) rename {client => src/client}/ydb_federated_topic/impl/federated_topic_impl.cpp (93%) rename {client => src/client}/ydb_federated_topic/impl/federated_topic_impl.h (77%) rename {client => src/client}/ydb_federated_topic/impl/federated_write_session.cpp (98%) rename {client => src/client}/ydb_federated_topic/impl/federated_write_session.h (95%) rename {client => src/client}/ydb_federated_topic/impl/federation_observer.cpp (97%) rename {client => src/client}/ydb_federated_topic/impl/federation_observer.h (87%) rename {client => src/client}/ydb_federated_topic/ut/CMakeLists.darwin-arm64.txt (100%) rename {client => src/client}/ydb_federated_topic/ut/CMakeLists.darwin-x86_64.txt (100%) rename {client => src/client}/ydb_federated_topic/ut/CMakeLists.linux-aarch64.txt (100%) rename {client => src/client}/ydb_federated_topic/ut/CMakeLists.linux-x86_64.txt (100%) rename {client => src/client}/ydb_federated_topic/ut/CMakeLists.txt (85%) rename {client => src/client}/ydb_federated_topic/ut/CMakeLists.windows-x86_64.txt (100%) rename {client => src/client}/ydb_federated_topic/ut/basic_usage_ut.cpp (97%) rename {client => src/client}/ydb_federated_topic/ut/fds_mock.h (96%) rename {client => src/client}/ydb_federated_topic/ut/ya.make (93%) rename {client => src/client}/ydb_import/CMakeLists.txt (77%) rename {client => src/client}/ydb_import/import.cpp (95%) rename {client => src/client}/ydb_import/import.h (94%) rename {client => src/client}/ydb_monitoring/CMakeLists.txt (74%) rename {client => src/client}/ydb_monitoring/monitoring.cpp (92%) rename {client => src/client}/ydb_monitoring/monitoring.h (96%) rename {client => src/client}/ydb_operation/CMakeLists.txt (82%) rename {client => src/client}/ydb_operation/operation.cpp (95%) rename {client => src/client}/ydb_operation/operation.h (93%) rename {client => src/client}/ydb_params/CMakeLists.txt (73%) rename {client => src/client}/ydb_params/impl.cpp (92%) rename {client => src/client}/ydb_params/impl.h (100%) rename {client => src/client}/ydb_params/params.cpp (97%) rename {client => src/client}/ydb_params/params.h (98%) rename {client => src/client}/ydb_persqueue_core/CMakeLists.txt (63%) create mode 100644 src/client/ydb_persqueue_core/impl/CMakeLists.txt rename {client => src/client}/ydb_persqueue_core/impl/callback_context.h (96%) rename {client => src/client}/ydb_persqueue_core/impl/common.cpp (99%) rename {client => src/client}/ydb_persqueue_core/impl/common.h (99%) rename {client => src/client}/ydb_persqueue_core/impl/counters_logger.h (92%) rename {client => src/client}/ydb_persqueue_core/impl/log_lazy.h (100%) rename {client => src/client}/ydb_persqueue_core/impl/persqueue.cpp (96%) rename {client => src/client}/ydb_persqueue_core/impl/persqueue_impl.cpp (100%) rename {client => src/client}/ydb_persqueue_core/impl/persqueue_impl.h (98%) rename {client => src/client}/ydb_persqueue_core/impl/read_session.cpp (99%) rename {client => src/client}/ydb_persqueue_core/impl/read_session.h (99%) rename {client => src/client}/ydb_persqueue_core/impl/read_session.ipp (99%) rename {client => src/client}/ydb_persqueue_core/impl/read_session_messages.cpp (99%) rename {client => src/client}/ydb_persqueue_core/impl/write_session.cpp (95%) rename {client => src/client}/ydb_persqueue_core/impl/write_session.h (95%) rename {client => src/client}/ydb_persqueue_core/impl/write_session_impl.cpp (99%) rename {client => src/client}/ydb_persqueue_core/impl/write_session_impl.h (99%) rename {client => src/client}/ydb_persqueue_core/persqueue.h (99%) rename {client => src/client}/ydb_persqueue_core/ut/CMakeLists.darwin-arm64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/CMakeLists.darwin-x86_64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/CMakeLists.linux-aarch64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/CMakeLists.linux-x86_64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/CMakeLists.txt (85%) rename {client => src/client}/ydb_persqueue_core/ut/CMakeLists.windows-x86_64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/basic_usage_ut.cpp (98%) rename {client => src/client}/ydb_persqueue_core/ut/common_ut.cpp (89%) rename {client => src/client}/ydb_persqueue_core/ut/compress_executor_ut.cpp (98%) rename {client => src/client}/ydb_persqueue_core/ut/compression_ut.cpp (99%) rename {client => src/client}/ydb_persqueue_core/ut/read_session_ut.cpp (99%) rename {client => src/client}/ydb_persqueue_core/ut/retry_policy_ut.cpp (99%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin-arm64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin-x86_64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux-aarch64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux-x86_64.txt (100%) rename {client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut => src/client/ydb_persqueue_core/ut/ut_utils}/CMakeLists.txt (85%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/CMakeLists.windows-x86_64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.cpp (100%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.h (92%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h (98%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/test_server.cpp (100%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/test_server.h (95%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/test_utils.h (86%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/ut_utils.cpp (100%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/ut_utils.h (98%) rename {client => src/client}/ydb_persqueue_core/ut/ut_utils/ya.make (69%) rename {client => src/client}/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin-arm64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin-x86_64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux-aarch64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux-x86_64.txt (100%) rename {client/ydb_persqueue_core/ut/ut_utils => src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut}/CMakeLists.txt (85%) rename {client => src/client}/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.windows-x86_64.txt (100%) rename {client => src/client}/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/ya.make (93%) rename {client => src/client}/ydb_persqueue_core/ut/ya.make (94%) rename {client => src/client}/ydb_persqueue_public/CMakeLists.txt (61%) rename {client => src/client}/ydb_persqueue_public/codecs/CMakeLists.txt (77%) rename {client => src/client}/ydb_persqueue_public/codecs/codecs.cpp (94%) rename {client => src/client}/ydb_persqueue_public/codecs/codecs.h (66%) create mode 100644 src/client/ydb_persqueue_public/persqueue.h rename {client => src/client}/ydb_proto/CMakeLists.txt (86%) rename {client => src/client}/ydb_proto/accessor.cpp (99%) rename {client => src/client}/ydb_proto/accessor.h (81%) rename {client => src/client}/ydb_query/CMakeLists.txt (70%) rename {client => src/client}/ydb_query/client.cpp (97%) rename {client => src/client}/ydb_query/client.h (97%) rename {client => src/client}/ydb_query/impl/CMakeLists.txt (64%) rename {client => src/client}/ydb_query/impl/client_session.cpp (93%) rename {client => src/client}/ydb_query/impl/client_session.h (90%) rename {client => src/client}/ydb_query/impl/exec_query.cpp (97%) rename {client => src/client}/ydb_query/impl/exec_query.h (75%) rename {client => src/client}/ydb_query/query.cpp (100%) rename {client => src/client}/ydb_query/query.h (92%) rename {client => src/client}/ydb_query/stats.cpp (94%) rename {client => src/client}/ydb_query/stats.h (95%) rename {client => src/client}/ydb_query/tx.cpp (100%) rename {client => src/client}/ydb_query/tx.h (94%) rename {client => src/client}/ydb_rate_limiter/CMakeLists.txt (82%) rename {client => src/client}/ydb_rate_limiter/rate_limiter.cpp (98%) rename {client => src/client}/ydb_rate_limiter/rate_limiter.h (99%) rename {client => src/client}/ydb_result/CMakeLists.txt (72%) rename {client => src/client}/ydb_result/proto_accessor.cpp (80%) rename {client => src/client}/ydb_result/result.cpp (96%) rename {client => src/client}/ydb_result/result.h (98%) rename {client => src/client}/ydb_retry/retry.h (93%) rename {client => src/client}/ydb_scheme/CMakeLists.txt (75%) rename {client => src/client}/ydb_scheme/scheme.cpp (97%) rename {client => src/client}/ydb_scheme/scheme.h (99%) rename {client => src/client}/ydb_table/CMakeLists.txt (78%) rename {client => src/client}/ydb_table/impl/CMakeLists.txt (50%) rename {client => src/client}/ydb_table/impl/client_session.cpp (98%) rename {client => src/client}/ydb_table/impl/client_session.h (83%) rename {client => src/client}/ydb_table/impl/data_query.cpp (100%) rename {client => src/client}/ydb_table/impl/data_query.h (92%) rename {client => src/client}/ydb_table/impl/readers.cpp (98%) rename {client => src/client}/ydb_table/impl/readers.h (90%) rename {client => src/client}/ydb_table/impl/request_migrator.cpp (100%) rename {client => src/client}/ydb_table/impl/request_migrator.h (95%) rename {client => src/client}/ydb_table/impl/table_client.cpp (100%) rename {client => src/client}/ydb_table/impl/table_client.h (96%) rename {client => src/client}/ydb_table/proto_accessor.cpp (98%) rename {client => src/client}/ydb_table/query_stats/CMakeLists.txt (78%) rename {client => src/client}/ydb_table/query_stats/stats.cpp (100%) rename {client => src/client}/ydb_table/query_stats/stats.h (95%) rename {client => src/client}/ydb_table/table.cpp (98%) rename {client => src/client}/ydb_table/table.h (99%) rename {client => src/client}/ydb_table/table_enum.h (100%) rename {client => src/client}/ydb_topic/CMakeLists.txt (80%) rename {client => src/client}/ydb_topic/codecs/CMakeLists.txt (79%) rename {client => src/client}/ydb_topic/codecs/codecs.cpp (94%) rename {client => src/client}/ydb_topic/codecs/codecs.h (74%) create mode 100644 src/client/ydb_topic/impl/CMakeLists.txt rename {client => src/client}/ydb_topic/impl/counters.cpp (97%) rename {client => src/client}/ydb_topic/impl/deferred_commit.cpp (96%) rename {client => src/client}/ydb_topic/impl/event_handlers.cpp (98%) rename {client => src/client}/ydb_topic/impl/executor.cpp (100%) rename {client => src/client}/ydb_topic/impl/executor.h (93%) rename {client => src/client}/ydb_topic/impl/read_session.cpp (98%) rename {client => src/client}/ydb_topic/impl/read_session.h (94%) rename {client => src/client}/ydb_topic/impl/read_session_event.cpp (99%) rename {client => src/client}/ydb_topic/impl/topic.cpp (97%) rename {client => src/client}/ydb_topic/impl/topic_impl.cpp (96%) rename {client => src/client}/ydb_topic/impl/topic_impl.h (97%) rename {client => src/client}/ydb_topic/impl/write_session.cpp (99%) rename {client => src/client}/ydb_topic/impl/write_session.h (94%) rename {client => src/client}/ydb_topic/impl/write_session_impl.cpp (99%) rename {client => src/client}/ydb_topic/impl/write_session_impl.h (98%) rename {client => src/client}/ydb_topic/proto_accessor.cpp (97%) rename {client => src/client}/ydb_topic/topic.h (99%) rename {client => src/client}/ydb_topic/ut/CMakeLists.darwin-arm64.txt (100%) rename {client => src/client}/ydb_topic/ut/CMakeLists.darwin-x86_64.txt (100%) rename {client => src/client}/ydb_topic/ut/CMakeLists.linux-aarch64.txt (100%) rename {client => src/client}/ydb_topic/ut/CMakeLists.linux-x86_64.txt (100%) create mode 100644 src/client/ydb_topic/ut/CMakeLists.txt rename {client => src/client}/ydb_topic/ut/CMakeLists.windows-x86_64.txt (100%) rename {client => src/client}/ydb_topic/ut/basic_usage_ut.cpp (98%) rename {client => src/client}/ydb_topic/ut/describe_topic_ut.cpp (97%) rename {client => src/client}/ydb_topic/ut/local_partition_ut.cpp (97%) rename {client => src/client}/ydb_topic/ut/topic_to_table_ut.cpp (96%) rename {client => src/client}/ydb_topic/ut/ut_utils/CMakeLists.darwin-arm64.txt (100%) rename {client => src/client}/ydb_topic/ut/ut_utils/CMakeLists.darwin-x86_64.txt (100%) rename {client => src/client}/ydb_topic/ut/ut_utils/CMakeLists.linux-aarch64.txt (100%) rename {client => src/client}/ydb_topic/ut/ut_utils/CMakeLists.linux-x86_64.txt (100%) create mode 100644 src/client/ydb_topic/ut/ut_utils/CMakeLists.txt rename {client => src/client}/ydb_topic/ut/ut_utils/CMakeLists.windows-x86_64.txt (100%) rename {client => src/client}/ydb_topic/ut/ut_utils/managed_executor.cpp (100%) rename {client => src/client}/ydb_topic/ut/ut_utils/managed_executor.h (91%) rename {client => src/client}/ydb_topic/ut/ut_utils/topic_sdk_test_setup.cpp (100%) rename {client => src/client}/ydb_topic/ut/ut_utils/topic_sdk_test_setup.h (91%) rename {client => src/client}/ydb_topic/ut/ut_utils/ya.make (64%) rename {client => src/client}/ydb_topic/ut/ya.make (94%) rename {client => src/client}/ydb_types/CMakeLists.txt (73%) rename {client => src/client}/ydb_types/core_facility/core_facility.h (81%) rename {client => src/client}/ydb_types/credentials/CMakeLists.txt (73%) rename {client => src/client}/ydb_types/credentials/credentials.cpp (98%) rename {client => src/client}/ydb_types/credentials/credentials.h (97%) rename {client => src/client}/ydb_types/credentials/login/CMakeLists.txt (69%) rename {client => src/client}/ydb_types/credentials/login/login.cpp (94%) rename {client => src/client}/ydb_types/exceptions/CMakeLists.txt (70%) rename {client => src/client}/ydb_types/exceptions/exceptions.cpp (100%) rename {client => src/client}/ydb_types/exceptions/exceptions.h (87%) rename {client => src/client}/ydb_types/fatal_error_handlers/CMakeLists.txt (75%) rename {client => src/client}/ydb_types/fatal_error_handlers/handlers.cpp (72%) rename {client => src/client}/ydb_types/fatal_error_handlers/handlers.h (100%) rename {client => src/client}/ydb_types/fluent_settings_helpers.h (100%) rename {client => src/client}/ydb_types/operation/CMakeLists.txt (70%) rename {client => src/client}/ydb_types/operation/operation.cpp (95%) rename {client => src/client}/ydb_types/operation/operation.h (90%) rename {client => src/client}/ydb_types/request_settings.h (98%) rename {client => src/client}/ydb_types/s3_settings.h (100%) rename {client => src/client}/ydb_types/status/CMakeLists.txt (83%) rename {client => src/client}/ydb_types/status/status.cpp (95%) rename {client => src/client}/ydb_types/status/status.h (83%) rename {client => src/client}/ydb_types/status_codes.h (98%) rename {client => src/client}/ydb_types/ydb.h (100%) rename {client => src/client}/ydb_value/CMakeLists.txt (76%) rename {client => src/client}/ydb_value/value.cpp (99%) rename {client => src/client}/ydb_value/value.h (99%) rename {ydb/public/lib => src}/json_value/CMakeLists.txt (70%) rename {ydb/public/lib => src}/json_value/ydb_json_value.cpp (99%) rename {ydb/public/lib => src}/json_value/ydb_json_value.h (87%) rename {library/cpp => src/library}/CMakeLists.txt (84%) rename {library/cpp => src/library}/blockcodecs/CMakeLists.txt (78%) rename {library/cpp => src/library}/blockcodecs/README.md (77%) rename {library/cpp => src/library}/blockcodecs/codecs.cpp (100%) create mode 100644 src/library/blockcodecs/codecs.h rename {library/cpp => src/library}/blockcodecs/codecs/CMakeLists.txt (100%) rename {library/cpp => src/library}/blockcodecs/codecs/brotli/CMakeLists.txt (87%) rename {library/cpp => src/library}/blockcodecs/codecs/brotli/brotli.cpp (92%) rename {library/cpp => src/library}/blockcodecs/codecs/bzip/CMakeLists.txt (81%) rename {library/cpp => src/library}/blockcodecs/codecs/bzip/bzip.cpp (91%) rename {library/cpp => src/library}/blockcodecs/codecs/fastlz/CMakeLists.txt (82%) rename {library/cpp => src/library}/blockcodecs/codecs/fastlz/fastlz.cpp (90%) rename {library/cpp => src/library}/blockcodecs/codecs/lz4/CMakeLists.txt (81%) rename {library/cpp => src/library}/blockcodecs/codecs/lz4/lz4.cpp (94%) rename {library/cpp => src/library}/blockcodecs/codecs/lzma/CMakeLists.txt (82%) rename {library/cpp => src/library}/blockcodecs/codecs/lzma/lzma.cpp (93%) rename {library/cpp => src/library}/blockcodecs/codecs/snappy/CMakeLists.txt (82%) rename {library/cpp => src/library}/blockcodecs/codecs/snappy/snappy.cpp (89%) rename {library/cpp => src/library}/blockcodecs/codecs/zlib/CMakeLists.txt (81%) rename {library/cpp => src/library}/blockcodecs/codecs/zlib/zlib.cpp (91%) rename {library/cpp => src/library}/blockcodecs/codecs/zstd/CMakeLists.txt (81%) rename {library/cpp => src/library}/blockcodecs/codecs/zstd/zstd.cpp (90%) rename {library/cpp => src/library}/blockcodecs/codecs_ut.cpp (98%) rename {library/cpp => src/library}/blockcodecs/core/CMakeLists.txt (52%) rename {library/cpp => src/library}/blockcodecs/core/codecs.cpp (88%) rename {library/cpp => src/library}/blockcodecs/core/codecs.h (95%) rename {library/cpp => src/library}/blockcodecs/core/common.h (84%) rename {library/cpp => src/library}/blockcodecs/core/register.h (100%) rename {library/cpp => src/library}/blockcodecs/core/stream.cpp (94%) rename {library/cpp => src/library}/blockcodecs/core/stream.h (82%) rename {library/cpp => src/library}/blockcodecs/stream.cpp (100%) create mode 100644 src/library/blockcodecs/stream.h rename {library/cpp => src/library}/blockcodecs/ut/ya.make (74%) create mode 100644 src/library/build_info/CMakeLists.txt rename {library/cpp => src/library}/build_info/build_info.cpp.in (59%) rename {library/cpp => src/library}/build_info/build_info.h (100%) rename {library/cpp => src/library}/build_info/build_info_static.cpp (89%) rename {library/cpp => src/library}/build_info/build_info_static.h (100%) rename {library/cpp => src/library}/build_info/sandbox.cpp.in (77%) rename {library/cpp => src/library}/build_info/sandbox.h (100%) rename {library/cpp => src/library}/cache/CMakeLists.txt (53%) rename {library/cpp => src/library}/cache/cache.cpp (100%) rename {library/cpp => src/library}/cache/cache.h (99%) rename {library/cpp => src/library}/cache/thread_safe_cache.cpp (100%) rename {library/cpp => src/library}/cache/thread_safe_cache.h (98%) rename {library/cpp => src/library}/cache/ut/cache_ut.cpp (99%) rename {library/cpp => src/library}/cache/ut/ya.make (71%) rename {library/cpp => src/library}/case_insensitive_string/CMakeLists.txt (69%) rename {library/cpp => src/library}/case_insensitive_string/case_insensitive_char_traits.cpp (95%) rename {library/cpp => src/library}/case_insensitive_string/case_insensitive_char_traits.h (100%) rename {library/cpp => src/library}/case_insensitive_string/case_insensitive_string.cpp (87%) rename {library/cpp => src/library}/case_insensitive_string/case_insensitive_string.h (93%) rename {library/cpp => src/library}/case_insensitive_string/case_insensitive_string_ut.cpp (98%) rename {library/cpp => src/library}/case_insensitive_string/ut/ya.make (50%) rename {library/cpp => src/library}/cgiparam/CMakeLists.txt (78%) rename {library/cpp => src/library}/cgiparam/cgiparam.cpp (98%) rename {library/cpp => src/library}/cgiparam/cgiparam.h (98%) rename {library/cpp => src/library}/cgiparam/cgiparam_ut.cpp (99%) rename {library/cpp => src/library}/cgiparam/ut/ya.make (50%) rename {library/cpp => src/library}/charset/CMakeLists.txt (53%) rename {library/cpp => src/library}/charset/README.md (71%) rename {library/cpp => src/library}/charset/ci_string.cpp (100%) rename {library/cpp => src/library}/charset/ci_string.h (99%) rename {library/cpp => src/library}/charset/ci_string_ut.cpp (87%) rename {library/cpp => src/library}/charset/codepage.cpp (96%) rename {library/cpp => src/library}/charset/codepage.h (96%) rename {library/cpp => src/library}/charset/codepage_ut.cpp (98%) rename {library/cpp => src/library}/charset/cp_encrec.cpp (97%) rename {library/cpp => src/library}/charset/decodeunknownplane.cpp (99%) rename {library/cpp => src/library}/charset/doccodes.cpp (100%) rename {library/cpp => src/library}/charset/doccodes.h (100%) rename {library/cpp => src/library}/charset/generated/cp_data.cpp (99%) rename {library/cpp => src/library}/charset/generated/encrec_data.cpp (99%) rename {library/cpp => src/library}/charset/iconv.cpp (100%) rename {library/cpp => src/library}/charset/iconv.h (99%) rename {library/cpp => src/library}/charset/iconv_ut.cpp (98%) create mode 100644 src/library/charset/lite/CMakeLists.txt rename {library/cpp => src/library}/charset/lite/ut/ya.make (61%) rename {library/cpp => src/library}/charset/recyr.hh (98%) rename {library/cpp => src/library}/charset/recyr_int.hh (98%) rename {library/cpp => src/library}/charset/recyr_int_ut.cpp (98%) rename {library/cpp => src/library}/charset/ut/ya.make (67%) rename {library/cpp => src/library}/charset/wide.cpp (100%) rename {library/cpp => src/library}/charset/wide.h (99%) rename {library/cpp => src/library}/charset/wide_ut.cpp (99%) rename {library/cpp => src/library}/colorizer/CMakeLists.txt (55%) rename {library/cpp => src/library}/colorizer/colors.cpp (99%) rename {library/cpp => src/library}/colorizer/colors.h (99%) rename {library/cpp => src/library}/colorizer/fwd.h (100%) rename {library/cpp => src/library}/colorizer/output.cpp (87%) rename {library/cpp => src/library}/colorizer/output.h (100%) rename {library/cpp => src/library}/colorizer/ut/colorizer_ut.cpp (94%) rename {library/cpp => src/library}/colorizer/ut/ya.make (50%) rename {library/cpp => src/library}/containers/CMakeLists.txt (100%) rename {library/cpp => src/library}/containers/disjoint_interval_tree/CMakeLists.txt (78%) rename {library/cpp => src/library}/containers/disjoint_interval_tree/disjoint_interval_tree.cpp (100%) rename {library/cpp => src/library}/containers/disjoint_interval_tree/disjoint_interval_tree.h (99%) rename {library/cpp => src/library}/containers/disjoint_interval_tree/ut/disjoint_interval_tree_ut.cpp (98%) create mode 100644 src/library/containers/disjoint_interval_tree/ut/ya.make rename {library/cpp => src/library}/containers/intrusive_rb_tree/CMakeLists.txt (75%) rename {library/cpp => src/library}/containers/intrusive_rb_tree/rb_tree.cpp (100%) rename {library/cpp => src/library}/containers/intrusive_rb_tree/rb_tree.h (99%) rename {library/cpp => src/library}/containers/intrusive_rb_tree/rb_tree_ut.cpp (98%) create mode 100644 src/library/containers/intrusive_rb_tree/ut/ya.make rename {library/cpp => src/library}/containers/paged_vector/CMakeLists.txt (73%) rename {library/cpp => src/library}/containers/paged_vector/paged_vector.cpp (100%) rename {library/cpp => src/library}/containers/paged_vector/paged_vector.h (99%) rename {library/cpp => src/library}/containers/paged_vector/ut/paged_vector_ut.cpp (99%) rename {library/cpp => src/library}/containers/paged_vector/ut/ya.make (61%) rename {library/cpp => src/library}/containers/stack_vector/CMakeLists.txt (73%) rename {library/cpp => src/library}/containers/stack_vector/stack_vec.cpp (100%) rename {library/cpp => src/library}/containers/stack_vector/stack_vec.h (99%) rename {library/cpp => src/library}/containers/stack_vector/stack_vec_ut.cpp (98%) rename {library/cpp => src/library}/containers/stack_vector/ut/ya.make (52%) rename {library/cpp => src/library}/coroutine/CMakeLists.txt (100%) create mode 100644 src/library/coroutine/engine/CMakeLists.txt rename {library/cpp => src/library}/coroutine/engine/callbacks.h (100%) rename {library/cpp => src/library}/coroutine/engine/condvar.h (100%) rename {library/cpp => src/library}/coroutine/engine/cont_poller.cpp (100%) rename {library/cpp => src/library}/coroutine/engine/cont_poller.h (96%) rename {library/cpp => src/library}/coroutine/engine/coroutine_ut.cpp (98%) rename {library/cpp => src/library}/coroutine/engine/custom_time.h (72%) rename {library/cpp => src/library}/coroutine/engine/events.h (98%) rename {library/cpp => src/library}/coroutine/engine/helper.cpp (100%) rename {library/cpp => src/library}/coroutine/engine/helper.h (92%) rename {library/cpp => src/library}/coroutine/engine/impl.cpp (98%) rename {library/cpp => src/library}/coroutine/engine/impl.h (97%) rename {library/cpp => src/library}/coroutine/engine/iostatus.cpp (100%) rename {library/cpp => src/library}/coroutine/engine/iostatus.h (97%) rename {library/cpp => src/library}/coroutine/engine/mutex.h (100%) rename {library/cpp => src/library}/coroutine/engine/network.cpp (99%) rename {library/cpp => src/library}/coroutine/engine/network.h (94%) rename {library/cpp => src/library}/coroutine/engine/poller.cpp (98%) rename {library/cpp => src/library}/coroutine/engine/poller.h (86%) rename {library/cpp => src/library}/coroutine/engine/sockmap.h (90%) rename {library/cpp => src/library}/coroutine/engine/sockpool.cpp (100%) rename {library/cpp => src/library}/coroutine/engine/sockpool.h (98%) rename {library/cpp => src/library}/coroutine/engine/stack/benchmark/alloc_bm.cpp (98%) rename {library/cpp => src/library}/coroutine/engine/stack/benchmark/ya.make (63%) rename {library/cpp => src/library}/coroutine/engine/stack/stack.cpp (100%) rename {library/cpp => src/library}/coroutine/engine/stack/stack.h (96%) rename {library/cpp => src/library}/coroutine/engine/stack/stack_allocator.cpp (100%) rename {library/cpp => src/library}/coroutine/engine/stack/stack_allocator.h (95%) rename {library/cpp => src/library}/coroutine/engine/stack/stack_allocator.inl (99%) rename {library/cpp => src/library}/coroutine/engine/stack/stack_common.h (100%) rename {library/cpp => src/library}/coroutine/engine/stack/stack_guards.cpp (100%) rename {library/cpp => src/library}/coroutine/engine/stack/stack_guards.h (98%) rename {library/cpp => src/library}/coroutine/engine/stack/stack_pool.h (95%) rename {library/cpp => src/library}/coroutine/engine/stack/stack_pool.inl (100%) rename {library/cpp => src/library}/coroutine/engine/stack/stack_storage.cpp (96%) rename {library/cpp => src/library}/coroutine/engine/stack/stack_storage.h (97%) rename {library/cpp => src/library}/coroutine/engine/stack/stack_utils.cpp (96%) rename {library/cpp => src/library}/coroutine/engine/stack/stack_utils.h (100%) rename {library/cpp => src/library}/coroutine/engine/stack/ut/stack_allocator_ut.cpp (95%) rename {library/cpp => src/library}/coroutine/engine/stack/ut/stack_guards_ut.cpp (96%) rename {library/cpp => src/library}/coroutine/engine/stack/ut/stack_pool_ut.cpp (90%) rename {library/cpp => src/library}/coroutine/engine/stack/ut/stack_ut.cpp (86%) rename {library/cpp => src/library}/coroutine/engine/stack/ut/stack_utils_ut.cpp (93%) rename {library/cpp => src/library}/coroutine/engine/stack/ut/ya.make (81%) rename {library/cpp => src/library}/coroutine/engine/trampoline.cpp (83%) rename {library/cpp => src/library}/coroutine/engine/trampoline.h (89%) create mode 100644 src/library/coroutine/engine/ut/ya.make rename {library/cpp => src/library}/coroutine/listener/CMakeLists.txt (72%) rename {library/cpp => src/library}/coroutine/listener/listen.cpp (97%) rename {library/cpp => src/library}/coroutine/listener/listen.h (97%) rename {library/cpp => src/library}/cppparser/CMakeLists.txt (72%) rename {library/cpp => src/library}/cppparser/README.md (100%) rename {library/cpp => src/library}/cppparser/parser.cpp (99%) rename {library/cpp => src/library}/cppparser/parser.h (97%) rename {library/cpp => src/library}/cpuid_check/CMakeLists.txt (79%) rename {library/cpp => src/library}/cpuid_check/README.md (100%) rename {library/cpp => src/library}/cpuid_check/cpu_id_check.cpp (91%) rename {library/cpp => src/library}/dbg_output/CMakeLists.txt (53%) rename {library/cpp => src/library}/dbg_output/auto.h (97%) rename {library/cpp => src/library}/dbg_output/colorscheme.h (96%) rename {library/cpp => src/library}/dbg_output/dump.cpp (100%) rename {library/cpp => src/library}/dbg_output/dump.h (97%) rename {library/cpp => src/library}/dbg_output/dumpers.cpp (100%) rename {library/cpp => src/library}/dbg_output/dumpers.h (99%) rename {library/cpp => src/library}/dbg_output/engine.cpp (91%) rename {library/cpp => src/library}/dbg_output/engine.h (99%) rename {library/cpp => src/library}/dbg_output/ut/dbg_output_ut.cpp (92%) rename {library/cpp => src/library}/dbg_output/ut/ya.make (50%) rename {library/cpp => src/library}/deprecated/CMakeLists.txt (100%) rename {library/cpp => src/library}/deprecated/atomic/CMakeLists.txt (76%) rename {library/cpp => src/library}/deprecated/atomic/Readme.md (100%) rename {library/cpp => src/library}/deprecated/atomic/atomic.h (96%) rename {library/cpp => src/library}/deprecated/atomic/atomic_gcc.h (100%) rename {library/cpp => src/library}/deprecated/atomic/atomic_ops.h (99%) rename {library/cpp => src/library}/deprecated/atomic/atomic_ut.cpp (98%) rename {library/cpp => src/library}/deprecated/atomic/atomic_win.h (100%) create mode 100644 src/library/deprecated/atomic/ut/ya.make rename {library/cpp => src/library}/diff/CMakeLists.txt (74%) rename {library/cpp => src/library}/diff/README.md (79%) rename {library/cpp => src/library}/diff/diff.cpp (97%) rename {library/cpp => src/library}/diff/diff.h (96%) rename {library/cpp => src/library}/diff/diff_ut.cpp (99%) rename {library/cpp => src/library}/diff/ut/ya.make (54%) rename {library/cpp => src/library}/digest/CMakeLists.txt (100%) rename {library/cpp => src/library}/digest/argonish/AUTHORS.md (100%) rename {library/cpp => src/library}/digest/argonish/CMakeLists.txt (83%) rename {library/cpp => src/library}/digest/argonish/CONTRIBUTING.md (100%) rename {library/cpp => src/library}/digest/argonish/LICENSE.md (100%) rename {library/cpp => src/library}/digest/argonish/README.md (95%) rename {library/cpp => src/library}/digest/argonish/argon2.h (98%) rename {library/cpp => src/library}/digest/argonish/blake2b.h (98%) rename {library/cpp => src/library}/digest/argonish/common.h (91%) rename {library/cpp => src/library}/digest/argonish/factory/factory.cpp (95%) rename {library/cpp => src/library}/digest/argonish/internal/CMakeLists.txt (100%) rename {library/cpp => src/library}/digest/argonish/internal/argon2/CMakeLists.txt (100%) rename {library/cpp => src/library}/digest/argonish/internal/argon2/argon2_avx2.h (98%) rename {library/cpp => src/library}/digest/argonish/internal/argon2/argon2_base.h (98%) rename {library/cpp => src/library}/digest/argonish/internal/argon2/argon2_ref.h (98%) rename {library/cpp => src/library}/digest/argonish/internal/argon2/argon2_sse2.h (98%) rename {library/cpp => src/library}/digest/argonish/internal/argon2/argon2_sse41.h (98%) rename {library/cpp => src/library}/digest/argonish/internal/argon2/argon2_ssse3.h (98%) rename {library/cpp => src/library}/digest/argonish/internal/blake2b/CMakeLists.txt (100%) rename {library/cpp => src/library}/digest/argonish/internal/blake2b/blake2b.h (97%) rename {library/cpp => src/library}/digest/argonish/internal/blake2b/blake2b_avx2.h (98%) rename {library/cpp => src/library}/digest/argonish/internal/blake2b/blake2b_ref.h (97%) rename {library/cpp => src/library}/digest/argonish/internal/blake2b/blake2b_sse2.h (99%) rename {library/cpp => src/library}/digest/argonish/internal/blake2b/blake2b_sse41.h (99%) rename {library/cpp => src/library}/digest/argonish/internal/blake2b/blake2b_ssse3.h (99%) rename {library/cpp => src/library}/digest/argonish/internal/blake2b/load_sse41.h (100%) rename {library/cpp => src/library}/digest/argonish/internal/blamka/CMakeLists.txt (100%) rename {library/cpp => src/library}/digest/argonish/internal/blamka/blamka_avx2.h (98%) rename {library/cpp => src/library}/digest/argonish/internal/blamka/blamka_sse2.h (97%) rename {library/cpp => src/library}/digest/argonish/internal/blamka/blamka_ssse3.h (97%) rename {library/cpp => src/library}/digest/argonish/internal/proxies/CMakeLists.txt (100%) rename {library/cpp => src/library}/digest/argonish/internal/proxies/avx2/CMakeLists.txt (82%) create mode 100644 src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.cpp create mode 100644 src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.h rename {library/cpp => src/library}/digest/argonish/internal/proxies/macro/CMakeLists.txt (100%) rename {library/cpp => src/library}/digest/argonish/internal/proxies/macro/proxy_macros.h (100%) rename {library/cpp => src/library}/digest/argonish/internal/proxies/ref/CMakeLists.txt (78%) create mode 100644 src/library/digest/argonish/internal/proxies/ref/proxy_ref.cpp create mode 100644 src/library/digest/argonish/internal/proxies/ref/proxy_ref.h rename {library/cpp => src/library}/digest/argonish/internal/proxies/sse2/CMakeLists.txt (81%) create mode 100644 src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.cpp create mode 100644 src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.h rename {library/cpp => src/library}/digest/argonish/internal/proxies/sse41/CMakeLists.txt (81%) create mode 100644 src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.cpp create mode 100644 src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.h rename {library/cpp => src/library}/digest/argonish/internal/proxies/ssse3/CMakeLists.txt (81%) create mode 100644 src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.cpp create mode 100644 src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.h rename {library/cpp => src/library}/digest/argonish/internal/rotations/CMakeLists.txt (100%) rename {library/cpp => src/library}/digest/argonish/internal/rotations/rotations_avx2.h (100%) rename {library/cpp => src/library}/digest/argonish/internal/rotations/rotations_ref.h (100%) rename {library/cpp => src/library}/digest/argonish/internal/rotations/rotations_sse2.h (100%) rename {library/cpp => src/library}/digest/argonish/internal/rotations/rotations_ssse3.h (100%) rename {library/cpp => src/library}/digest/argonish/ut/ut.cpp (99%) create mode 100644 src/library/digest/argonish/ut/ya.make rename {library/cpp => src/library}/digest/argonish/ut_fat/ut.cpp (99%) rename {library/cpp => src/library}/digest/argonish/ut_fat/ya.make (60%) create mode 100644 src/library/digest/lower_case/CMakeLists.txt rename {library/cpp => src/library}/digest/lower_case/hash_ops.cpp (94%) rename {library/cpp => src/library}/digest/lower_case/hash_ops.h (100%) rename {library/cpp => src/library}/digest/lower_case/hash_ops_ut.cpp (94%) rename {library/cpp => src/library}/digest/lower_case/lchash.cpp (100%) rename {library/cpp => src/library}/digest/lower_case/lchash.h (92%) rename {library/cpp => src/library}/digest/lower_case/lchash_ut.cpp (93%) rename {library/cpp => src/library}/digest/lower_case/lciter.cpp (100%) rename {library/cpp => src/library}/digest/lower_case/lciter.h (91%) rename {library/cpp => src/library}/digest/lower_case/ut/ya.make (55%) rename {library/cpp => src/library}/digest/md5/CMakeLists.txt (76%) rename {library/cpp => src/library}/digest/md5/md5.cpp (97%) rename {library/cpp => src/library}/digest/md5/md5.h (98%) rename {library/cpp => src/library}/digest/md5/md5_medium_ut.cpp (92%) rename {library/cpp => src/library}/digest/md5/md5_ut.cpp (95%) rename {library/cpp => src/library}/digest/md5/medium_ut/ya.make (70%) create mode 100644 src/library/digest/md5/ut/ya.make rename {library/cpp => src/library}/digest/murmur/CMakeLists.txt (68%) rename {library/cpp => src/library}/digest/murmur/murmur.cpp (100%) rename {library/cpp => src/library}/digest/murmur/murmur.h (96%) rename {library/cpp => src/library}/digest/murmur/murmur_ut.cpp (97%) create mode 100644 src/library/digest/murmur/ut/ya.make rename {library/cpp => src/library}/getopt/CMakeLists.txt (84%) create mode 100644 src/library/getopt/last_getopt.h rename {library/cpp => src/library}/getopt/last_getopt_demo/demo.cpp (98%) create mode 100644 src/library/getopt/last_getopt_support.h create mode 100644 src/library/getopt/modchooser.h create mode 100644 src/library/getopt/opt.h create mode 100644 src/library/getopt/opt2.h create mode 100644 src/library/getopt/posix_getopt.h rename {library/cpp => src/library}/getopt/print.cpp (90%) create mode 100644 src/library/getopt/small/CMakeLists.txt rename {library/cpp => src/library}/getopt/small/completer.cpp (99%) rename {library/cpp => src/library}/getopt/small/completer.h (99%) rename {library/cpp => src/library}/getopt/small/completer_command.cpp (98%) rename {library/cpp => src/library}/getopt/small/completer_command.h (100%) rename {library/cpp => src/library}/getopt/small/completion_generator.cpp (99%) rename {library/cpp => src/library}/getopt/small/completion_generator.h (100%) rename {library/cpp => src/library}/getopt/small/formatted_output.cpp (92%) rename {library/cpp => src/library}/getopt/small/formatted_output.h (95%) rename {library/cpp => src/library}/getopt/small/last_getopt.cpp (100%) rename {library/cpp => src/library}/getopt/small/last_getopt.h (95%) rename {library/cpp => src/library}/getopt/small/last_getopt_easy_setup.cpp (100%) rename {library/cpp => src/library}/getopt/small/last_getopt_easy_setup.h (100%) rename {library/cpp => src/library}/getopt/small/last_getopt_handlers.h (100%) rename {library/cpp => src/library}/getopt/small/last_getopt_opt.cpp (100%) rename {library/cpp => src/library}/getopt/small/last_getopt_opt.h (99%) rename {library/cpp => src/library}/getopt/small/last_getopt_opts.cpp (98%) rename {library/cpp => src/library}/getopt/small/last_getopt_opts.h (99%) rename {library/cpp => src/library}/getopt/small/last_getopt_parse_result.cpp (100%) rename {library/cpp => src/library}/getopt/small/last_getopt_parse_result.h (100%) rename {library/cpp => src/library}/getopt/small/last_getopt_parser.cpp (98%) rename {library/cpp => src/library}/getopt/small/last_getopt_parser.h (99%) rename {library/cpp => src/library}/getopt/small/last_getopt_support.h (96%) rename {library/cpp => src/library}/getopt/small/modchooser.cpp (99%) rename {library/cpp => src/library}/getopt/small/modchooser.h (100%) rename {library/cpp => src/library}/getopt/small/opt.cpp (98%) rename {library/cpp => src/library}/getopt/small/opt.h (98%) rename {library/cpp => src/library}/getopt/small/opt2.cpp (99%) rename {library/cpp => src/library}/getopt/small/opt2.h (99%) rename {library/cpp => src/library}/getopt/small/posix_getopt.cpp (100%) rename {library/cpp => src/library}/getopt/small/posix_getopt.h (100%) rename {library/cpp => src/library}/getopt/small/wrap.cpp (96%) rename {library/cpp => src/library}/getopt/small/wrap.h (94%) rename {library/cpp => src/library}/getopt/small/ygetopt.cpp (100%) rename {library/cpp => src/library}/getopt/small/ygetopt.h (95%) rename {library/cpp => src/library}/getopt/ut/last_getopt_ut.cpp (99%) rename {library/cpp => src/library}/getopt/ut/modchooser_ut.cpp (93%) rename {library/cpp => src/library}/getopt/ut/opt2_ut.cpp (95%) rename {library/cpp => src/library}/getopt/ut/opt_ut.cpp (93%) rename {library/cpp => src/library}/getopt/ut/posix_getopt_ut.cpp (98%) rename {library/cpp => src/library}/getopt/ut/wrap.cpp (97%) rename {library/cpp => src/library}/getopt/ut/ya.make (81%) rename {library/cpp => src/library}/getopt/ut/ygetopt_ut.cpp (90%) create mode 100644 src/library/getopt/ygetopt.h rename {ydb => src}/library/grpc/CMakeLists.txt (100%) rename {ydb => src}/library/grpc/client/CMakeLists.txt (72%) rename {ydb => src}/library/grpc/client/grpc_client_low.cpp (99%) rename {ydb => src}/library/grpc/client/grpc_client_low.h (99%) rename {ydb => src}/library/grpc/client/grpc_common.h (97%) rename {ydb => src}/library/grpc/common/CMakeLists.txt (100%) rename {ydb => src}/library/grpc/common/constants.h (73%) rename {library/cpp => src/library}/http/CMakeLists.txt (100%) create mode 100644 src/library/http/fetch/CMakeLists.txt rename {library/cpp => src/library}/http/fetch/exthttpcodes.cpp (100%) rename {library/cpp => src/library}/http/fetch/exthttpcodes.h (97%) rename {library/cpp => src/library}/http/fetch/http_digest.cpp (98%) rename {library/cpp => src/library}/http/fetch/http_digest.h (93%) rename {library/cpp => src/library}/http/fetch/http_socket.cpp (98%) rename {library/cpp => src/library}/http/fetch/httpagent.h (97%) rename {library/cpp => src/library}/http/fetch/httpfetcher.h (99%) rename {library/cpp => src/library}/http/fetch/httpfsm.h (96%) rename {library/cpp => src/library}/http/fetch/httpfsm.rl6 (98%) rename {library/cpp => src/library}/http/fetch/httpfsm_ut.cpp (99%) rename {library/cpp => src/library}/http/fetch/httpheader.cpp (100%) rename {library/cpp => src/library}/http/fetch/httpheader.h (97%) rename {library/cpp => src/library}/http/fetch/httpload.cpp (100%) rename {library/cpp => src/library}/http/fetch/httpload.h (98%) rename {library/cpp => src/library}/http/fetch/httpparser.h (99%) rename {library/cpp => src/library}/http/fetch/httpparser_ut.cpp (99%) rename {library/cpp => src/library}/http/fetch/httpzreader.h (99%) rename {library/cpp => src/library}/http/fetch/library-htfetch_ut_hreflang_in.h (100%) rename {library/cpp => src/library}/http/fetch/library-htfetch_ut_hreflang_out.h (100%) rename {library/cpp => src/library}/http/fetch/sockhandler.h (92%) rename {library/cpp => src/library}/http/fetch/ut/ya.make (60%) rename {library/cpp => src/library}/http/io/CMakeLists.txt (52%) rename {library/cpp => src/library}/http/io/benchmark/main.cpp (97%) rename {library/cpp => src/library}/http/io/benchmark/ya.make (69%) rename {library/cpp => src/library}/http/io/chunk.cpp (100%) rename {library/cpp => src/library}/http/io/chunk.h (91%) rename {library/cpp => src/library}/http/io/chunk_ut.cpp (94%) rename {library/cpp => src/library}/http/io/compression.cpp (85%) rename {library/cpp => src/library}/http/io/compression.h (98%) rename {library/cpp => src/library}/http/io/compression_ut.cpp (92%) rename {library/cpp => src/library}/http/io/fuzz/main.cpp (77%) rename {library/cpp => src/library}/http/io/fuzz/ya.make (72%) rename {library/cpp => src/library}/http/io/headers.cpp (96%) rename {library/cpp => src/library}/http/io/headers.h (98%) rename {library/cpp => src/library}/http/io/headers_ut.cpp (97%) rename {library/cpp => src/library}/http/io/list_codings/main.cpp (58%) rename {library/cpp => src/library}/http/io/list_codings/ya.make (68%) rename {library/cpp => src/library}/http/io/stream.cpp (98%) rename {library/cpp => src/library}/http/io/stream.h (98%) rename {library/cpp => src/library}/http/io/stream_ut.cpp (98%) rename {library/cpp => src/library}/http/io/stream_ut_medium.cpp (93%) rename {library/cpp => src/library}/http/io/ut/ya.make (67%) rename {library/cpp => src/library}/http/misc/CMakeLists.txt (50%) rename {library/cpp => src/library}/http/misc/httpcodes.cpp (100%) rename {library/cpp => src/library}/http/misc/httpcodes.h (100%) rename {library/cpp => src/library}/http/misc/httpdate.cpp (94%) rename {library/cpp => src/library}/http/misc/httpdate.h (92%) rename {library/cpp => src/library}/http/misc/httpdate_ut.cpp (88%) rename {library/cpp => src/library}/http/misc/httpreqdata.cpp (96%) rename {library/cpp => src/library}/http/misc/httpreqdata.h (89%) rename {library/cpp => src/library}/http/misc/httpreqdata_ut.cpp (99%) rename {library/cpp => src/library}/http/misc/parsed_request.cpp (80%) rename {library/cpp => src/library}/http/misc/parsed_request.h (100%) rename {library/cpp => src/library}/http/misc/parsed_request_ut.cpp (92%) rename {library/cpp => src/library}/http/misc/ut/ya.make (70%) create mode 100644 src/library/http/server/CMakeLists.txt rename {library/cpp => src/library}/http/server/conn.cpp (94%) rename {library/cpp => src/library}/http/server/conn.h (93%) rename {library/cpp => src/library}/http/server/http.cpp (97%) rename {library/cpp => src/library}/http/server/http.h (95%) rename {library/cpp => src/library}/http/server/http_ex.cpp (96%) rename {library/cpp => src/library}/http/server/http_ex.h (94%) rename {library/cpp => src/library}/http/server/http_ut.cpp (99%) rename {library/cpp => src/library}/http/server/options.cpp (84%) rename {library/cpp => src/library}/http/server/options.h (96%) rename {library/cpp => src/library}/http/server/response.cpp (98%) rename {library/cpp => src/library}/http/server/response.h (96%) rename {library/cpp => src/library}/http/server/response_ut.cpp (98%) rename {library/cpp => src/library}/http/server/ut/ya.make (63%) rename {library/cpp => src/library}/http/simple/CMakeLists.txt (75%) rename {library/cpp => src/library}/http/simple/http_client.cpp (98%) rename {library/cpp => src/library}/http/simple/http_client.h (97%) rename {library/cpp => src/library}/http/simple/http_client_options.h (93%) rename {library/cpp => src/library}/http/simple/ut/http_ut.cpp (98%) rename {library/cpp => src/library}/http/simple/ut/https_server/http_server.crt (100%) rename {library/cpp => src/library}/http/simple/ut/https_server/http_server.key (100%) rename {library/cpp => src/library}/http/simple/ut/https_server/main.go (100%) rename {library/cpp => src/library}/http/simple/ut/https_server/ya.make (100%) rename {library/cpp => src/library}/http/simple/ut/https_ut.cpp (86%) create mode 100644 src/library/http/simple/ut/ya.make create mode 100644 src/library/iterator/CMakeLists.txt rename {library/cpp => src/library}/iterator/README.md (100%) rename {library/cpp => src/library}/iterator/cartesian_product.cpp (100%) rename {library/cpp => src/library}/iterator/cartesian_product.h (99%) rename {library/cpp => src/library}/iterator/concatenate.cpp (100%) rename {library/cpp => src/library}/iterator/concatenate.h (99%) rename {library/cpp => src/library}/iterator/enumerate.cpp (100%) rename {library/cpp => src/library}/iterator/enumerate.h (98%) rename {library/cpp => src/library}/iterator/filtering.cpp (100%) rename {library/cpp => src/library}/iterator/filtering.h (97%) rename {library/cpp => src/library}/iterator/functools.cpp (100%) rename {library/cpp => src/library}/iterator/functools.h (95%) rename {library/cpp => src/library}/iterator/iterate_keys.cpp (100%) rename {library/cpp => src/library}/iterator/iterate_keys.h (100%) rename {library/cpp => src/library}/iterator/iterate_values.cpp (100%) rename {library/cpp => src/library}/iterator/iterate_values.h (100%) rename {library/cpp => src/library}/iterator/mapped.cpp (100%) rename {library/cpp => src/library}/iterator/mapped.h (98%) rename {library/cpp => src/library}/iterator/ut/filtering_ut.cpp (89%) rename {library/cpp => src/library}/iterator/ut/functools_ut.cpp (99%) rename {library/cpp => src/library}/iterator/ut/iterate_keys_ut.cpp (86%) rename {library/cpp => src/library}/iterator/ut/iterate_values_ut.cpp (94%) rename {library/cpp => src/library}/iterator/ut/mapped_ut.cpp (93%) rename {library/cpp => src/library}/iterator/ut/ya.make (86%) rename {library/cpp => src/library}/iterator/ut/zip_ut.cpp (86%) rename {library/cpp => src/library}/iterator/zip.cpp (100%) rename {library/cpp => src/library}/iterator/zip.h (99%) rename {library/cpp => src/library}/json/CMakeLists.txt (57%) rename {library/cpp => src/library}/json/common/CMakeLists.txt (69%) rename {library/cpp => src/library}/json/common/defs.cpp (100%) rename {library/cpp => src/library}/json/common/defs.h (96%) rename {library/cpp => src/library}/json/fast_sax/CMakeLists.txt (65%) rename {library/cpp => src/library}/json/fast_sax/parser.h (90%) rename {library/cpp => src/library}/json/fast_sax/parser.rl6 (96%) rename {library/cpp => src/library}/json/fast_sax/unescape.cpp (83%) rename {library/cpp => src/library}/json/fast_sax/unescape.h (100%) rename {library/cpp => src/library}/json/fuzzy_test/main.cpp (86%) rename {library/cpp => src/library}/json/fuzzy_test/ya.make (69%) rename {library/cpp => src/library}/json/json_prettifier.cpp (97%) rename {library/cpp => src/library}/json/json_prettifier.h (98%) rename {library/cpp => src/library}/json/json_reader.cpp (99%) rename {library/cpp => src/library}/json/json_reader.h (96%) create mode 100644 src/library/json/json_value.h rename {library/cpp => src/library}/json/json_writer.cpp (98%) rename {library/cpp => src/library}/json/json_writer.h (97%) rename {library/cpp => src/library}/json/rapidjson_helpers.cpp (100%) rename {library/cpp => src/library}/json/rapidjson_helpers.h (96%) rename {library/cpp => src/library}/json/ut/json_prettifier_ut.cpp (99%) rename {library/cpp => src/library}/json/ut/json_reader_fast_ut.cpp (98%) rename {library/cpp => src/library}/json/ut/json_reader_ut.cpp (99%) rename {library/cpp => src/library}/json/ut/json_saveload_ut.cpp (81%) rename {library/cpp => src/library}/json/ut/json_writer_ut.cpp (98%) rename {library/cpp => src/library}/json/ut/ya.make (66%) rename {library/cpp => src/library}/json/writer/CMakeLists.txt (56%) rename {library/cpp => src/library}/json/writer/README.md (93%) rename {library/cpp => src/library}/json/writer/json.cpp (98%) rename {library/cpp => src/library}/json/writer/json.h (99%) rename {library/cpp => src/library}/json/writer/json_ut.cpp (98%) rename {library/cpp => src/library}/json/writer/json_value.cpp (98%) rename {library/cpp => src/library}/json/writer/json_value.h (96%) rename {library/cpp => src/library}/json/writer/json_value_ut.cpp (99%) rename {library/cpp => src/library}/json/writer/ut/ya.make (53%) create mode 100644 src/library/jwt/CMakeLists.txt rename {ydb/public/lib => src/library}/jwt/jwt.cpp (96%) rename {ydb/public/lib => src/library}/jwt/jwt.h (90%) rename {library/cpp => src/library}/lcs/CMakeLists.txt (73%) rename {library/cpp => src/library}/lcs/README.md (100%) rename {library/cpp => src/library}/lcs/lcs_via_lis.cpp (100%) rename {library/cpp => src/library}/lcs/lcs_via_lis.h (96%) rename {library/cpp => src/library}/lcs/lcs_via_lis_ut.cpp (98%) rename {library/cpp => src/library}/lcs/ut/ya.make (54%) create mode 100644 src/library/logger/CMakeLists.txt rename {library/cpp => src/library}/logger/all.h (100%) rename {library/cpp => src/library}/logger/backend.cpp (95%) rename {library/cpp => src/library}/logger/backend.h (94%) rename {library/cpp => src/library}/logger/backend_creator.cpp (91%) rename {library/cpp => src/library}/logger/backend_creator.h (90%) rename {library/cpp => src/library}/logger/composite.cpp (100%) rename {library/cpp => src/library}/logger/composite.h (92%) rename {library/cpp => src/library}/logger/composite_creator.cpp (100%) rename {library/cpp => src/library}/logger/composite_creator.h (100%) rename {library/cpp => src/library}/logger/composite_ut.cpp (91%) rename {library/cpp => src/library}/logger/element.cpp (100%) rename {library/cpp => src/library}/logger/element.h (94%) rename {library/cpp => src/library}/logger/element_ut.cpp (91%) rename {library/cpp => src/library}/logger/file.cpp (93%) rename {library/cpp => src/library}/logger/file.h (82%) rename {library/cpp => src/library}/logger/file_creator.cpp (100%) rename {library/cpp => src/library}/logger/file_creator.h (100%) rename {library/cpp => src/library}/logger/filter.cpp (100%) rename {library/cpp => src/library}/logger/filter.h (95%) rename {library/cpp => src/library}/logger/filter_creator.cpp (100%) rename {library/cpp => src/library}/logger/filter_creator.h (100%) rename {library/cpp => src/library}/logger/init_context/README.md (81%) rename {library/cpp => src/library}/logger/init_context/config.cpp (100%) rename {library/cpp => src/library}/logger/init_context/config.h (82%) rename {library/cpp => src/library}/logger/init_context/yconf.cpp (100%) rename {library/cpp => src/library}/logger/init_context/yconf.h (83%) rename {library/cpp => src/library}/logger/log.cpp (98%) rename {library/cpp => src/library}/logger/log.h (98%) rename {library/cpp => src/library}/logger/log_ut.cpp (95%) rename {library/cpp => src/library}/logger/null.cpp (100%) rename {library/cpp => src/library}/logger/null.h (100%) rename {library/cpp => src/library}/logger/null_creator.cpp (100%) rename {library/cpp => src/library}/logger/null_creator.h (100%) rename {library/cpp => src/library}/logger/priority.h (100%) rename {library/cpp => src/library}/logger/record.h (93%) rename {library/cpp => src/library}/logger/reopen.h (89%) rename {library/cpp => src/library}/logger/reopen_ut.cpp (97%) rename {library/cpp => src/library}/logger/rotating_file.cpp (91%) rename {library/cpp => src/library}/logger/rotating_file.h (88%) rename {library/cpp => src/library}/logger/rotating_file_creator.cpp (100%) rename {library/cpp => src/library}/logger/rotating_file_creator.h (100%) rename {library/cpp => src/library}/logger/rotating_file_ut.cpp (94%) rename {library/cpp => src/library}/logger/stream.cpp (92%) rename {library/cpp => src/library}/logger/stream.h (100%) rename {library/cpp => src/library}/logger/stream_creator.cpp (100%) rename {library/cpp => src/library}/logger/stream_creator.h (100%) rename {library/cpp => src/library}/logger/sync_page_cache_file.cpp (95%) rename {library/cpp => src/library}/logger/sync_page_cache_file.h (85%) rename {library/cpp => src/library}/logger/sync_page_cache_file_creator.cpp (100%) rename {library/cpp => src/library}/logger/sync_page_cache_file_creator.h (100%) rename {library/cpp => src/library}/logger/system.cpp (87%) rename {library/cpp => src/library}/logger/system.h (100%) rename {library/cpp => src/library}/logger/system_creator.cpp (100%) rename {library/cpp => src/library}/logger/system_creator.h (100%) rename {library/cpp => src/library}/logger/thread.cpp (95%) rename {library/cpp => src/library}/logger/thread.h (96%) rename {library/cpp => src/library}/logger/thread_creator.cpp (100%) rename {library/cpp => src/library}/logger/thread_creator.h (100%) rename {library/cpp => src/library}/logger/uninitialized_creator.cpp (97%) rename {library/cpp => src/library}/logger/uninitialized_creator.h (100%) rename {library/cpp => src/library}/logger/ut/ya.make (52%) create mode 100644 src/library/login/CMakeLists.txt rename {ydb => src}/library/login/login.cpp (98%) rename {ydb => src}/library/login/login.h (99%) rename {ydb => src}/library/login/protos/CMakeLists.txt (76%) rename {ydb => src}/library/login/protos/login.proto (100%) rename {library/cpp => src/library}/mime/CMakeLists.txt (100%) rename {library/cpp => src/library}/mime/types/CMakeLists.txt (62%) rename {library/cpp => src/library}/mime/types/mime.cpp (99%) rename {library/cpp => src/library}/mime/types/mime.h (97%) rename {library/cpp => src/library}/monlib/CMakeLists.txt (100%) rename {library/cpp => src/library}/monlib/counters/counters.h (94%) rename {library/cpp => src/library}/monlib/dynamic_counters/CMakeLists.txt (61%) rename {library/cpp => src/library}/monlib/dynamic_counters/contention_ut.cpp (94%) rename {library/cpp => src/library}/monlib/dynamic_counters/counters.cpp (98%) rename {library/cpp => src/library}/monlib/dynamic_counters/counters.h (97%) rename {library/cpp => src/library}/monlib/dynamic_counters/counters_ut.cpp (99%) rename {library/cpp => src/library}/monlib/dynamic_counters/encode.cpp (95%) rename {library/cpp => src/library}/monlib/dynamic_counters/encode.h (87%) rename {library/cpp => src/library}/monlib/dynamic_counters/encode_ut.cpp (95%) rename {library/cpp => src/library}/monlib/dynamic_counters/golovan_page.cpp (93%) rename {library/cpp => src/library}/monlib/dynamic_counters/golovan_page.h (86%) rename {library/cpp => src/library}/monlib/dynamic_counters/page.cpp (96%) rename {library/cpp => src/library}/monlib/dynamic_counters/page.h (94%) rename {library/cpp => src/library}/monlib/dynamic_counters/percentile/CMakeLists.txt (82%) rename {library/cpp => src/library}/monlib/dynamic_counters/percentile/percentile.h (100%) rename {library/cpp => src/library}/monlib/dynamic_counters/percentile/percentile_base.h (96%) rename {library/cpp => src/library}/monlib/dynamic_counters/percentile/percentile_lg.h (99%) rename {library/cpp => src/library}/monlib/dynamic_counters/percentile/percentile_ut.cpp (98%) create mode 100644 src/library/monlib/dynamic_counters/percentile/ut/ya.make create mode 100644 src/library/monlib/dynamic_counters/ut/ya.make rename {library/cpp => src/library}/monlib/encode/CMakeLists.txt (57%) rename {library/cpp => src/library}/monlib/encode/buffered/CMakeLists.txt (63%) rename {library/cpp => src/library}/monlib/encode/buffered/buffered_encoder_base.cpp (98%) rename {library/cpp => src/library}/monlib/encode/buffered/buffered_encoder_base.h (90%) rename {library/cpp => src/library}/monlib/encode/buffered/string_pool.cpp (98%) rename {library/cpp => src/library}/monlib/encode/buffered/string_pool.h (98%) rename {library/cpp => src/library}/monlib/encode/buffered/string_pool_ut.cpp (98%) create mode 100644 src/library/monlib/encode/buffered/ut/ya.make rename {library/cpp => src/library}/monlib/encode/encoder.cpp (100%) rename {library/cpp => src/library}/monlib/encode/encoder.h (72%) rename {library/cpp => src/library}/monlib/encode/encoder_state.cpp (100%) rename {library/cpp => src/library}/monlib/encode/encoder_state.h (97%) rename {library/cpp => src/library}/monlib/encode/encoder_state_enum.h (100%) rename {library/cpp => src/library}/monlib/encode/format.cpp (96%) rename {library/cpp => src/library}/monlib/encode/format.h (100%) rename {library/cpp => src/library}/monlib/encode/format_ut.cpp (98%) create mode 100644 src/library/monlib/encode/fuzz/ya.make rename {library/cpp => src/library}/monlib/encode/json/CMakeLists.txt (66%) rename {library/cpp => src/library}/monlib/encode/json/fuzz/main.cpp (74%) create mode 100644 src/library/monlib/encode/json/fuzz/ya.make rename {library/cpp => src/library}/monlib/encode/json/json.h (90%) rename {library/cpp => src/library}/monlib/encode/json/json_decoder.cpp (99%) rename {library/cpp => src/library}/monlib/encode/json/json_decoder_ut.cpp (98%) rename {library/cpp => src/library}/monlib/encode/json/json_encoder.cpp (98%) rename {library/cpp => src/library}/monlib/encode/json/json_ut.cpp (99%) rename {library/cpp => src/library}/monlib/encode/json/typed_point.h (98%) rename {library/cpp => src/library}/monlib/encode/json/ut/buffered_test.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/buffered_ts_merge.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/crash.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/empty_series.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/expected.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/expected_buffered.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/expected_cloud.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/expected_cloud_buffered.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/hist_crash.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/histogram_timeseries.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/histogram_value.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/histogram_value_inf_before_bounds.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/int_gauge.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/log_histogram_timeseries.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/log_histogram_value.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/merged.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/metrics.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/named_metrics.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/sensors.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/summary_inf.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/summary_timeseries.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/summary_value.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/test_decode_to_encode.json (100%) rename {library/cpp => src/library}/monlib/encode/json/ut/ya.make (87%) rename {library/cpp => src/library}/monlib/encode/legacy_protobuf/CMakeLists.txt (100%) rename {library/cpp => src/library}/monlib/encode/legacy_protobuf/protos/CMakeLists.txt (86%) rename {library/cpp => src/library}/monlib/encode/legacy_protobuf/protos/metric_meta.proto (100%) rename {library/cpp => src/library}/monlib/encode/prometheus/CMakeLists.txt (65%) rename {library/cpp => src/library}/monlib/encode/prometheus/fuzz/main.cpp (68%) create mode 100644 src/library/monlib/encode/prometheus/fuzz/ya.make rename {library/cpp => src/library}/monlib/encode/prometheus/prometheus.h (71%) rename {library/cpp => src/library}/monlib/encode/prometheus/prometheus_decoder.cpp (98%) rename {library/cpp => src/library}/monlib/encode/prometheus/prometheus_decoder_ut.cpp (99%) rename {library/cpp => src/library}/monlib/encode/prometheus/prometheus_encoder.cpp (98%) rename {library/cpp => src/library}/monlib/encode/prometheus/prometheus_encoder_ut.cpp (98%) rename {library/cpp => src/library}/monlib/encode/prometheus/prometheus_model.h (100%) create mode 100644 src/library/monlib/encode/prometheus/ut/ya.make rename {library/cpp => src/library}/monlib/encode/spack/CMakeLists.txt (52%) rename {library/cpp => src/library}/monlib/encode/spack/compression.cpp (98%) rename {library/cpp => src/library}/monlib/encode/spack/compression.h (85%) rename {library/cpp => src/library}/monlib/encode/spack/fuzz/main.cpp (66%) rename {library/cpp => src/library}/monlib/encode/spack/fuzz/ya.make (56%) rename {library/cpp => src/library}/monlib/encode/spack/spack_v1.h (94%) rename {library/cpp => src/library}/monlib/encode/spack/spack_v1_decoder.cpp (97%) rename {library/cpp => src/library}/monlib/encode/spack/spack_v1_encoder.cpp (98%) rename {library/cpp => src/library}/monlib/encode/spack/spack_v1_ut.cpp (99%) create mode 100644 src/library/monlib/encode/spack/ut/ya.make rename {library/cpp => src/library}/monlib/encode/spack/varint.cpp (95%) rename {library/cpp => src/library}/monlib/encode/spack/varint.h (92%) rename {library/cpp => src/library}/monlib/encode/text/CMakeLists.txt (71%) rename {library/cpp => src/library}/monlib/encode/text/text.h (75%) rename {library/cpp => src/library}/monlib/encode/text/text_encoder.cpp (97%) rename {library/cpp => src/library}/monlib/encode/text/text_encoder_ut.cpp (99%) create mode 100644 src/library/monlib/encode/text/ut/ya.make create mode 100644 src/library/monlib/encode/ut/ya.make rename {library/cpp => src/library}/monlib/exception/CMakeLists.txt (69%) rename {library/cpp => src/library}/monlib/exception/exception.cpp (100%) rename {library/cpp => src/library}/monlib/exception/exception.h (100%) create mode 100644 src/library/monlib/metrics/CMakeLists.txt rename {library/cpp => src/library}/monlib/metrics/atomics_array.h (97%) rename {library/cpp => src/library}/monlib/metrics/ewma.cpp (100%) rename {library/cpp => src/library}/monlib/metrics/ewma.h (94%) rename {library/cpp => src/library}/monlib/metrics/ewma_ut.cpp (98%) rename {library/cpp => src/library}/monlib/metrics/fake.cpp (100%) rename {library/cpp => src/library}/monlib/metrics/fake.h (100%) rename {library/cpp => src/library}/monlib/metrics/fake_ut.cpp (90%) rename {library/cpp => src/library}/monlib/metrics/histogram_collector.h (100%) rename {library/cpp => src/library}/monlib/metrics/histogram_collector_explicit.cpp (93%) rename {library/cpp => src/library}/monlib/metrics/histogram_collector_exponential.cpp (94%) rename {library/cpp => src/library}/monlib/metrics/histogram_collector_linear.cpp (94%) rename {library/cpp => src/library}/monlib/metrics/histogram_collector_ut.cpp (98%) rename {library/cpp => src/library}/monlib/metrics/histogram_snapshot.cpp (98%) rename {library/cpp => src/library}/monlib/metrics/histogram_snapshot.h (98%) rename {library/cpp => src/library}/monlib/metrics/histogram_snapshot_ut.cpp (98%) rename {library/cpp => src/library}/monlib/metrics/labels.cpp (96%) rename {library/cpp => src/library}/monlib/metrics/labels.h (98%) rename {library/cpp => src/library}/monlib/metrics/labels_ut.cpp (99%) rename {library/cpp => src/library}/monlib/metrics/log_histogram_collector.h (97%) rename {library/cpp => src/library}/monlib/metrics/log_histogram_collector_ut.cpp (96%) rename {library/cpp => src/library}/monlib/metrics/log_histogram_snapshot.cpp (95%) rename {library/cpp => src/library}/monlib/metrics/log_histogram_snapshot.h (98%) rename {library/cpp => src/library}/monlib/metrics/metric.h (99%) rename {library/cpp => src/library}/monlib/metrics/metric_consumer.cpp (91%) rename {library/cpp => src/library}/monlib/metrics/metric_consumer.h (100%) rename {library/cpp => src/library}/monlib/metrics/metric_registry.cpp (100%) rename {library/cpp => src/library}/monlib/metrics/metric_registry.h (98%) rename {library/cpp => src/library}/monlib/metrics/metric_registry_ut.cpp (98%) rename {library/cpp => src/library}/monlib/metrics/metric_sub_registry.h (100%) rename {library/cpp => src/library}/monlib/metrics/metric_sub_registry_ut.cpp (97%) rename {library/cpp => src/library}/monlib/metrics/metric_type.cpp (96%) rename {library/cpp => src/library}/monlib/metrics/metric_type.h (93%) rename {library/cpp => src/library}/monlib/metrics/metric_value.cpp (100%) rename {library/cpp => src/library}/monlib/metrics/metric_value.h (99%) rename {library/cpp => src/library}/monlib/metrics/metric_value_type.h (100%) rename {library/cpp => src/library}/monlib/metrics/metric_value_ut.cpp (99%) rename {library/cpp => src/library}/monlib/metrics/summary_collector.cpp (100%) rename {library/cpp => src/library}/monlib/metrics/summary_collector.h (100%) rename {library/cpp => src/library}/monlib/metrics/summary_collector_ut.cpp (95%) rename {library/cpp => src/library}/monlib/metrics/summary_snapshot.cpp (96%) rename {library/cpp => src/library}/monlib/metrics/summary_snapshot.h (97%) rename {library/cpp => src/library}/monlib/metrics/timer.h (99%) rename {library/cpp => src/library}/monlib/metrics/timer_ut.cpp (96%) rename {library/cpp => src/library}/monlib/metrics/ut/histograms.json (100%) rename {library/cpp => src/library}/monlib/metrics/ut/ya.make (67%) rename {library/cpp => src/library}/monlib/service/CMakeLists.txt (57%) rename {library/cpp => src/library}/monlib/service/auth.cpp (100%) rename {library/cpp => src/library}/monlib/service/auth.h (100%) rename {library/cpp => src/library}/monlib/service/format.cpp (100%) rename {library/cpp => src/library}/monlib/service/format.h (94%) rename {library/cpp => src/library}/monlib/service/mon_service_http_request.cpp (100%) rename {library/cpp => src/library}/monlib/service/mon_service_http_request.h (98%) rename {library/cpp => src/library}/monlib/service/monservice.cpp (95%) rename {library/cpp => src/library}/monlib/service/monservice.h (94%) create mode 100644 src/library/monlib/service/pages/CMakeLists.txt rename {library/cpp => src/library}/monlib/service/pages/diag_mon_page.cpp (100%) rename {library/cpp => src/library}/monlib/service/pages/diag_mon_page.h (100%) rename {library/cpp => src/library}/monlib/service/pages/html_mon_page.cpp (97%) rename {library/cpp => src/library}/monlib/service/pages/html_mon_page.h (100%) rename {library/cpp => src/library}/monlib/service/pages/index_mon_page.cpp (98%) rename {library/cpp => src/library}/monlib/service/pages/index_mon_page.h (100%) rename {library/cpp => src/library}/monlib/service/pages/mon_page.cpp (100%) rename {library/cpp => src/library}/monlib/service/pages/mon_page.h (96%) rename {library/cpp => src/library}/monlib/service/pages/pre_mon_page.cpp (100%) rename {library/cpp => src/library}/monlib/service/pages/pre_mon_page.h (100%) rename {library/cpp => src/library}/monlib/service/pages/registry_mon_page.cpp (83%) rename {library/cpp => src/library}/monlib/service/pages/registry_mon_page.h (94%) rename {library/cpp => src/library}/monlib/service/pages/resource_mon_page.cpp (100%) rename {library/cpp => src/library}/monlib/service/pages/resource_mon_page.h (95%) rename {library/cpp => src/library}/monlib/service/pages/resources/CMakeLists.txt (66%) rename {library/cpp => src/library}/monlib/service/pages/resources/css_mon_page.h (80%) rename {library/cpp => src/library}/monlib/service/pages/resources/fonts_mon_page.h (94%) rename {library/cpp => src/library}/monlib/service/pages/resources/js_mon_page.h (88%) rename {library/cpp => src/library}/monlib/service/pages/resources/static/css/bootstrap.min.css (100%) rename {library/cpp => src/library}/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.eot (100%) rename {library/cpp => src/library}/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.svg (100%) rename {library/cpp => src/library}/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.ttf (100%) rename {library/cpp => src/library}/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.woff (100%) rename {library/cpp => src/library}/monlib/service/pages/resources/static/js/bootstrap.min.js (100%) rename {library/cpp => src/library}/monlib/service/pages/resources/static/js/jquery.min.js (100%) rename {library/cpp => src/library}/monlib/service/pages/tablesorter/CMakeLists.txt (73%) rename {library/cpp => src/library}/monlib/service/pages/tablesorter/css_mon_page.h (79%) rename {library/cpp => src/library}/monlib/service/pages/tablesorter/js_mon_page.h (79%) rename {library/cpp => src/library}/monlib/service/pages/tablesorter/resources/jquery.tablesorter.css (100%) rename {library/cpp => src/library}/monlib/service/pages/tablesorter/resources/jquery.tablesorter.js (100%) rename {library/cpp => src/library}/monlib/service/pages/templates.cpp (100%) rename {library/cpp => src/library}/monlib/service/pages/templates.h (99%) rename {library/cpp => src/library}/monlib/service/pages/version_mon_page.cpp (77%) rename {library/cpp => src/library}/monlib/service/pages/version_mon_page.h (100%) rename {library/cpp => src/library}/monlib/service/service.cpp (95%) rename {library/cpp => src/library}/monlib/service/service.h (91%) rename {library/cpp => src/library}/object_factory/object_factory.h (97%) rename {library/cpp => src/library}/openssl/CMakeLists.txt (100%) rename {library/cpp => src/library}/openssl/holders/CMakeLists.txt (55%) rename {library/cpp => src/library}/openssl/holders/bio.cpp (100%) rename {library/cpp => src/library}/openssl/holders/bio.h (92%) rename {library/cpp => src/library}/openssl/holders/evp.h (100%) rename {library/cpp => src/library}/openssl/holders/hmac.h (100%) rename {library/cpp => src/library}/openssl/holders/holder.h (92%) rename {library/cpp => src/library}/openssl/holders/ut/evp_ut.cpp (81%) rename {library/cpp => src/library}/openssl/holders/ut/hmac_ut.cpp (72%) rename {library/cpp => src/library}/openssl/holders/ut/ya.make (52%) rename {library/cpp => src/library}/openssl/holders/x509_vfy.cpp (100%) rename {library/cpp => src/library}/openssl/holders/x509_vfy.h (93%) rename {library/cpp => src/library}/openssl/init/CMakeLists.txt (71%) rename {library/cpp => src/library}/openssl/init/init.cpp (84%) rename {library/cpp => src/library}/openssl/init/init.h (100%) rename {library/cpp => src/library}/openssl/io/CMakeLists.txt (75%) rename {library/cpp => src/library}/openssl/io/stream.cpp (97%) rename {library/cpp => src/library}/openssl/io/stream.h (90%) rename {library/cpp => src/library}/openssl/io/ut/builtin_ut.cpp (66%) create mode 100644 src/library/openssl/io/ut/ya.make rename {library/cpp => src/library}/openssl/method/CMakeLists.txt (74%) rename {library/cpp => src/library}/openssl/method/io.cpp (94%) rename {library/cpp => src/library}/openssl/method/io.h (93%) rename {library/cpp => src/library}/openssl/method/ut/io_ut.cpp (91%) create mode 100644 src/library/openssl/method/ut/ya.make create mode 100644 src/library/operation_id/CMakeLists.txt rename {ydb/public/lib => src/library}/operation_id/operation_id.cpp (97%) rename {ydb/public/lib => src/library}/operation_id/operation_id.h (91%) rename {ydb/public/lib => src/library}/operation_id/protos/CMakeLists.txt (73%) rename {ydb/public/lib => src/library}/operation_id/protos/operation_id.proto (100%) rename {ydb => src}/library/persqueue/CMakeLists.txt (100%) rename {ydb => src}/library/persqueue/obfuscate/CMakeLists.txt (69%) rename {ydb => src}/library/persqueue/obfuscate/obfuscate.cpp (88%) rename {ydb => src}/library/persqueue/obfuscate/obfuscate.h (100%) rename {ydb => src}/library/persqueue/topic_parser_public/CMakeLists.txt (69%) rename {ydb => src}/library/persqueue/topic_parser_public/topic_parser.cpp (98%) rename {ydb => src}/library/persqueue/topic_parser_public/topic_parser.h (100%) rename {library/cpp => src/library}/resource/CMakeLists.txt (65%) rename {library/cpp => src/library}/resource/README.md (93%) rename {library/cpp => src/library}/resource/registry.cpp (94%) rename {library/cpp => src/library}/resource/registry.h (100%) rename {library/cpp => src/library}/resource/resource.cpp (94%) rename {library/cpp => src/library}/resource/resource.h (100%) rename {library/cpp => src/library}/resource/ut/lib/data (100%) rename {library/cpp => src/library}/resource/ut/lib/ya.make (100%) rename {library/cpp => src/library}/resource/ut/resource_ut.cpp (77%) create mode 100644 src/library/resource/ut/ya.make rename {library/cpp => src/library}/retry/CMakeLists.txt (62%) rename {library/cpp => src/library}/retry/protos/CMakeLists.txt (83%) rename {library/cpp => src/library}/retry/protos/retry_options.proto (100%) rename {library/cpp => src/library}/retry/retry.cpp (97%) rename {library/cpp => src/library}/retry/retry.h (97%) rename {library/cpp => src/library}/retry/retry_policy.h (99%) rename {library/cpp => src/library}/retry/retry_policy_ut.cpp (98%) rename {library/cpp => src/library}/retry/retry_ut.cpp (98%) rename {library/cpp => src/library}/retry/ut/ya.make (64%) rename {library/cpp => src/library}/retry/utils.cpp (94%) rename {library/cpp => src/library}/retry/utils.h (87%) create mode 100644 src/library/security/CMakeLists.txt rename {ydb => src}/library/security/util.h (88%) rename {library/cpp => src/library}/streams/CMakeLists.txt (100%) rename {library/cpp => src/library}/streams/brotli/CMakeLists.txt (72%) rename {library/cpp => src/library}/streams/brotli/brotli.cpp (98%) rename {library/cpp => src/library}/streams/brotli/brotli.h (91%) rename {library/cpp => src/library}/streams/brotli/brotli_ut.cpp (96%) create mode 100644 src/library/streams/brotli/ut/ya.make rename {library/cpp => src/library}/streams/bzip2/CMakeLists.txt (71%) rename {library/cpp => src/library}/streams/bzip2/bzip2.cpp (98%) rename {library/cpp => src/library}/streams/bzip2/bzip2.h (86%) rename {library/cpp => src/library}/streams/bzip2/bzip2_ut.cpp (86%) create mode 100644 src/library/streams/bzip2/ut/ya.make rename {library/cpp => src/library}/streams/lz/common/error.h (61%) rename {library/cpp => src/library}/streams/lz/lz.h (92%) rename {library/cpp => src/library}/streams/lz/lz4/lz4.h (88%) rename {library/cpp => src/library}/streams/lz/snappy/snappy.h (88%) rename {library/cpp => src/library}/streams/lzma/CMakeLists.txt (72%) rename {library/cpp => src/library}/streams/lzma/lzma.cpp (97%) rename {library/cpp => src/library}/streams/lzma/lzma.h (81%) rename {library/cpp => src/library}/streams/lzma/lzma_ut.cpp (94%) create mode 100644 src/library/streams/lzma/ut/ya.make rename {library/cpp => src/library}/streams/zstd/CMakeLists.txt (70%) create mode 100644 src/library/streams/zstd/ut/ya.make rename {library/cpp => src/library}/streams/zstd/zstd.cpp (98%) rename {library/cpp => src/library}/streams/zstd/zstd.h (92%) rename {library/cpp => src/library}/streams/zstd/zstd_ut.cpp (95%) rename {library/cpp => src/library}/string_utils/CMakeLists.txt (100%) rename {library/cpp => src/library}/string_utils/base64/CMakeLists.txt (72%) rename {library/cpp => src/library}/string_utils/base64/base64.cpp (98%) rename {library/cpp => src/library}/string_utils/base64/base64.h (100%) rename {library/cpp => src/library}/string_utils/base64/base64_decode_uneven_ut.cpp (96%) rename {library/cpp => src/library}/string_utils/base64/base64_ut.cpp (99%) rename {library/cpp => src/library}/string_utils/base64/ut/ya.make (85%) rename {library/cpp => src/library}/string_utils/helpers/CMakeLists.txt (59%) rename {library/cpp => src/library}/string_utils/helpers/helpers.cpp (100%) rename {library/cpp => src/library}/string_utils/helpers/helpers.h (100%) rename {library/cpp => src/library}/string_utils/misc/CMakeLists.txt (78%) rename {library/cpp => src/library}/string_utils/misc/misc.h (89%) rename {library/cpp => src/library}/string_utils/quote/CMakeLists.txt (70%) rename {library/cpp => src/library}/string_utils/quote/quote.cpp (98%) rename {library/cpp => src/library}/string_utils/quote/quote.h (100%) rename {library/cpp => src/library}/string_utils/quote/quote_ut.cpp (99%) create mode 100644 src/library/string_utils/quote/ut/ya.make rename {library/cpp => src/library}/string_utils/relaxed_escaper/CMakeLists.txt (76%) rename {library/cpp => src/library}/string_utils/relaxed_escaper/relaxed_escaper.cpp (100%) rename {library/cpp => src/library}/string_utils/relaxed_escaper/relaxed_escaper.h (97%) rename {library/cpp => src/library}/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp (98%) create mode 100644 src/library/string_utils/relaxed_escaper/ut/ya.make rename {library/cpp => src/library}/string_utils/scan/CMakeLists.txt (70%) rename {library/cpp => src/library}/string_utils/scan/scan.cpp (100%) rename {library/cpp => src/library}/string_utils/scan/scan.h (90%) rename {library/cpp => src/library}/string_utils/stream/CMakeLists.txt (70%) rename {library/cpp => src/library}/string_utils/stream/stream.cpp (100%) rename {library/cpp => src/library}/string_utils/stream/stream.h (68%) rename {library/cpp => src/library}/string_utils/url/CMakeLists.txt (73%) rename {library/cpp => src/library}/string_utils/url/url.cpp (96%) rename {library/cpp => src/library}/string_utils/url/url.h (99%) rename {library/cpp => src/library}/string_utils/url/url_ut.cpp (99%) create mode 100644 src/library/string_utils/url/ut/ya.make rename {library/cpp => src/library}/svnversion/CMakeLists.txt (58%) rename {library/cpp => src/library}/svnversion/svn_interface.c (100%) rename {library/cpp => src/library}/svnversion/svnversion.cpp (94%) rename {library/cpp => src/library}/svnversion/svnversion.h (90%) rename {library/cpp => src/library}/terminate_handler/CMakeLists.txt (76%) rename {library/cpp => src/library}/terminate_handler/sample/exception/main.cpp (81%) rename {library/cpp => src/library}/terminate_handler/sample/exception/ya.make (66%) rename {library/cpp => src/library}/terminate_handler/sample/pure-virtual/main.cpp (100%) rename {library/cpp => src/library}/terminate_handler/sample/pure-virtual/ya.make (60%) rename {library/cpp => src/library}/terminate_handler/sample/rethrow/main.cpp (85%) rename {library/cpp => src/library}/terminate_handler/sample/rethrow/ya.make (60%) rename {library/cpp => src/library}/terminate_handler/sample/segv/main.cpp (100%) rename {library/cpp => src/library}/terminate_handler/sample/segv/ya.make (60%) rename {library/cpp => src/library}/terminate_handler/segv_handler.cpp (81%) rename {library/cpp => src/library}/terminate_handler/segv_handler.h (100%) rename {library/cpp => src/library}/terminate_handler/terminate_handler.cpp (89%) rename {library/cpp => src/library}/testing/CMakeLists.txt (100%) rename {library/cpp => src/library}/testing/README.md (100%) create mode 100644 src/library/testing/common/CMakeLists.txt rename {library/cpp => src/library}/testing/common/env.cpp (94%) rename {library/cpp => src/library}/testing/common/env.h (97%) rename {library/cpp => src/library}/testing/common/env_var.cpp (88%) rename {library/cpp => src/library}/testing/common/env_var.h (100%) rename {library/cpp => src/library}/testing/common/network.cpp (94%) rename {library/cpp => src/library}/testing/common/network.h (97%) rename {library/cpp => src/library}/testing/common/probe.cpp (100%) rename {library/cpp => src/library}/testing/common/probe.h (98%) rename {library/cpp => src/library}/testing/common/scope.cpp (100%) rename {library/cpp => src/library}/testing/common/scope.h (100%) rename {library/cpp => src/library}/testing/common/ut/CMakeLists.txt (100%) rename {library/cpp => src/library}/testing/common/ut/env_ut.cpp (94%) rename {library/cpp => src/library}/testing/common/ut/network_ut.cpp (90%) rename {library/cpp => src/library}/testing/common/ut/scope_ut.cpp (87%) rename {library/cpp => src/library}/testing/common/ut/ya.make (73%) rename {library/cpp => src/library}/testing/common/ya.make (84%) rename {library/cpp => src/library}/testing/gmock_in_unittest/CMakeLists.txt (83%) rename {library/cpp => src/library}/testing/gmock_in_unittest/events.cpp (91%) rename {library/cpp => src/library}/testing/gmock_in_unittest/events.h (100%) rename {library/cpp => src/library}/testing/gmock_in_unittest/example_ut/CMakeLists.txt (100%) rename {library/cpp => src/library}/testing/gmock_in_unittest/example_ut/example_ut.cpp (96%) rename {library/cpp => src/library}/testing/gmock_in_unittest/example_ut/ya.make (58%) create mode 100644 src/library/testing/gmock_in_unittest/gmock.h rename {library/cpp => src/library}/testing/gmock_in_unittest/registration.cpp (92%) rename {library/cpp => src/library}/testing/gmock_in_unittest/ya.make (73%) rename {library/cpp => src/library}/testing/gtest/CMakeLists.txt (100%) rename {library/cpp => src/library}/testing/gtest/README.md (100%) rename {library/cpp => src/library}/testing/gtest/gtest.cpp (83%) rename {library/cpp => src/library}/testing/gtest/gtest.h (89%) rename {library/cpp => src/library}/testing/gtest/main.cpp (98%) rename {library/cpp => src/library}/testing/gtest/main.h (95%) rename {library/cpp => src/library}/testing/gtest/matchers.cpp (78%) rename {library/cpp => src/library}/testing/gtest/matchers.h (100%) rename {library/cpp => src/library}/testing/gtest/ut/CMakeLists.txt (100%) rename {library/cpp => src/library}/testing/gtest/ut/README.md (100%) rename {library/cpp => src/library}/testing/gtest/ut/golden/data.txt (100%) rename {library/cpp => src/library}/testing/gtest/ut/matchers_ut.cpp (85%) rename {library/cpp => src/library}/testing/gtest/ut/ut.cpp (92%) create mode 100644 src/library/testing/gtest/ut/ya.make rename {library/cpp => src/library}/testing/gtest/ya.make (60%) create mode 100644 src/library/testing/gtest_extensions/CMakeLists.txt rename {library/cpp => src/library}/testing/gtest_extensions/README.md (85%) rename {library/cpp => src/library}/testing/gtest_extensions/assertions.cpp (95%) rename {library/cpp => src/library}/testing/gtest_extensions/assertions.h (100%) rename {library/cpp => src/library}/testing/gtest_extensions/gtest_extensions.cpp (100%) rename {library/cpp => src/library}/testing/gtest_extensions/gtest_extensions.h (100%) rename {library/cpp => src/library}/testing/gtest_extensions/matchers.cpp (100%) rename {library/cpp => src/library}/testing/gtest_extensions/matchers.h (100%) rename {library/cpp => src/library}/testing/gtest_extensions/pretty_printers.cpp (100%) rename {library/cpp => src/library}/testing/gtest_extensions/pretty_printers.h (92%) rename {library/cpp => src/library}/testing/gtest_extensions/probe.cpp (100%) rename {library/cpp => src/library}/testing/gtest_extensions/probe.h (96%) rename {library/cpp => src/library}/testing/gtest_extensions/ut/CMakeLists.txt (100%) rename {library/cpp => src/library}/testing/gtest_extensions/ut/README.md (100%) rename {library/cpp => src/library}/testing/gtest_extensions/ut/gtest_extensions_ut.cpp (98%) rename {library/cpp => src/library}/testing/gtest_extensions/ut/probe_ut.cpp (96%) rename {library/cpp => src/library}/testing/gtest_extensions/ut/ya.make (66%) rename {library/cpp => src/library}/testing/gtest_extensions/ya.make (100%) rename {library/cpp => src/library}/testing/hook/CMakeLists.txt (68%) rename {library/cpp => src/library}/testing/hook/README.md (100%) rename {library/cpp => src/library}/testing/hook/hook.cpp (100%) rename {library/cpp => src/library}/testing/hook/hook.h (100%) rename {library/cpp => src/library}/testing/hook/ya.make (100%) create mode 100644 src/library/testing/unittest/CMakeLists.txt rename {library/cpp => src/library}/testing/unittest/checks.cpp (95%) create mode 100644 src/library/testing/unittest/env.h rename {library/cpp => src/library}/testing/unittest/fat/CMakeLists.txt (100%) rename {library/cpp => src/library}/testing/unittest/fat/test_port_manager.cpp (91%) rename {library/cpp => src/library}/testing/unittest/fat/ya.make (100%) rename {library/cpp => src/library}/testing/unittest/gtest.cpp (97%) rename {library/cpp => src/library}/testing/unittest/gtest.h (96%) rename {library/cpp => src/library}/testing/unittest/junit.cpp (97%) rename {library/cpp => src/library}/testing/unittest/junit.h (98%) rename {library/cpp => src/library}/testing/unittest/plugin.cpp (94%) rename {library/cpp => src/library}/testing/unittest/plugin.h (82%) rename {library/cpp => src/library}/testing/unittest/pytests/test_subject/tests.cpp (95%) rename {library/cpp => src/library}/testing/unittest/pytests/test_subject/ya.make (67%) rename {library/cpp => src/library}/testing/unittest/pytests/test_tear_down.py (88%) rename {library/cpp => src/library}/testing/unittest/pytests/ya.make (74%) rename {library/cpp => src/library}/testing/unittest/registar.cpp (97%) rename {library/cpp => src/library}/testing/unittest/registar.h (98%) rename {library/cpp => src/library}/testing/unittest/registar_ut.cpp (99%) rename {library/cpp => src/library}/testing/unittest/simple.h (100%) rename {library/cpp => src/library}/testing/unittest/tests_data.cpp (96%) rename {library/cpp => src/library}/testing/unittest/tests_data.h (89%) rename {library/cpp => src/library}/testing/unittest/ut/CMakeLists.txt (100%) rename {library/cpp => src/library}/testing/unittest/ut/main.cpp (86%) rename {library/cpp => src/library}/testing/unittest/ut/ya.make (53%) rename {library/cpp => src/library}/testing/unittest/utmain.cpp (97%) rename {library/cpp => src/library}/testing/unittest/utmain.h (100%) rename {library/cpp => src/library}/testing/unittest/ya.make (54%) rename {library/cpp => src/library}/testing/unittest_main/CMakeLists.darwin-arm64.txt (90%) rename {library/cpp => src/library}/testing/unittest_main/CMakeLists.darwin-x86_64.txt (90%) rename {library/cpp => src/library}/testing/unittest_main/CMakeLists.linux-aarch64.txt (90%) rename {library/cpp => src/library}/testing/unittest_main/CMakeLists.linux-x86_64.txt (90%) create mode 100644 src/library/testing/unittest_main/CMakeLists.txt rename {library/cpp => src/library}/testing/unittest_main/CMakeLists.windows-x86_64.txt (90%) rename {library/cpp => src/library}/testing/unittest_main/main.cpp (62%) create mode 100644 src/library/testing/unittest_main/ya.make rename {library/cpp => src/library}/threading/CMakeLists.txt (100%) rename {library/cpp => src/library}/threading/atomic/CMakeLists.txt (72%) rename {library/cpp => src/library}/threading/atomic/bool.cpp (100%) rename {library/cpp => src/library}/threading/atomic/bool.h (93%) rename {library/cpp => src/library}/threading/atomic/bool_ut.cpp (90%) create mode 100644 src/library/threading/atomic/ut/ya.make rename {library/cpp => src/library}/threading/cancellation/operation_cancelled_exception.h (80%) rename {library/cpp => src/library}/threading/chunk_queue/CMakeLists.txt (74%) rename {library/cpp => src/library}/threading/chunk_queue/queue.cpp (100%) rename {library/cpp => src/library}/threading/chunk_queue/queue.h (97%) rename {library/cpp => src/library}/threading/chunk_queue/queue_ut.cpp (98%) rename {library/cpp => src/library}/threading/chunk_queue/readme.txt (100%) create mode 100644 src/library/threading/chunk_queue/ut/ya.make rename {library/cpp => src/library}/threading/equeue/CMakeLists.txt (72%) rename {library/cpp => src/library}/threading/equeue/equeue.cpp (100%) rename {library/cpp => src/library}/threading/equeue/equeue.h (84%) rename {library/cpp => src/library}/threading/equeue/equeue_ut.cpp (95%) create mode 100644 src/library/threading/equeue/ut/ya.make create mode 100644 src/library/threading/future/CMakeLists.txt rename {library/cpp => src/library}/threading/future/async.cpp (100%) rename {library/cpp => src/library}/threading/future/async.h (92%) rename {library/cpp => src/library}/threading/future/async_semaphore.cpp (92%) rename {library/cpp => src/library}/threading/future/async_semaphore.h (88%) rename {library/cpp => src/library}/threading/future/async_semaphore_ut.cpp (96%) rename {library/cpp => src/library}/threading/future/async_ut.cpp (94%) rename {library/cpp => src/library}/threading/future/core/future-inl.h (100%) rename {library/cpp => src/library}/threading/future/core/future.cpp (100%) rename {library/cpp => src/library}/threading/future/core/future.h (96%) rename {library/cpp => src/library}/threading/future/core/fwd.cpp (100%) rename {library/cpp => src/library}/threading/future/core/fwd.h (100%) rename {library/cpp => src/library}/threading/future/future.h (100%) rename {library/cpp => src/library}/threading/future/future_mt_ut.cpp (97%) rename {library/cpp => src/library}/threading/future/future_ut.cpp (99%) rename {library/cpp => src/library}/threading/future/fwd.cpp (100%) rename {library/cpp => src/library}/threading/future/fwd.h (100%) rename {library/cpp => src/library}/threading/future/legacy_future.h (98%) rename {library/cpp => src/library}/threading/future/legacy_future_ut.cpp (97%) rename {library/cpp => src/library}/threading/future/mt_ut/ya.make (65%) rename {library/cpp => src/library}/threading/future/perf/main.cpp (88%) rename {library/cpp => src/library}/threading/future/perf/ya.make (71%) rename {library/cpp => src/library}/threading/future/ut/ya.make (70%) rename {library/cpp => src/library}/threading/future/wait/fwd.cpp (100%) rename {library/cpp => src/library}/threading/future/wait/fwd.h (100%) rename {library/cpp => src/library}/threading/future/wait/wait-inl.h (100%) rename {library/cpp => src/library}/threading/future/wait/wait.cpp (100%) rename {library/cpp => src/library}/threading/future/wait/wait.h (93%) rename {library/cpp => src/library}/threading/future/wait/wait_group-inl.h (98%) rename {library/cpp => src/library}/threading/future/wait/wait_group.cpp (100%) rename {library/cpp => src/library}/threading/future/wait/wait_group.h (95%) rename {library/cpp => src/library}/threading/future/wait/wait_policy.cpp (100%) rename {library/cpp => src/library}/threading/future/wait/wait_policy.h (100%) rename {library/cpp => src/library}/threading/light_rw_lock/CMakeLists.txt (73%) rename {library/cpp => src/library}/threading/light_rw_lock/bench/lightrwlock_test.cpp (96%) rename {library/cpp => src/library}/threading/light_rw_lock/bench/ya.make (66%) rename {library/cpp => src/library}/threading/light_rw_lock/lightrwlock.cpp (98%) rename {library/cpp => src/library}/threading/light_rw_lock/lightrwlock.h (98%) rename {library/cpp => src/library}/threading/light_rw_lock/ut/rwlock_ut.cpp (96%) create mode 100644 src/library/threading/light_rw_lock/ut/ya.make rename {library/cpp => src/library}/threading/poor_man_openmp/CMakeLists.txt (76%) rename {library/cpp => src/library}/threading/poor_man_openmp/thread_helper.cpp (75%) rename {library/cpp => src/library}/threading/poor_man_openmp/thread_helper.h (92%) rename {library/cpp => src/library}/threading/poor_man_openmp/thread_helper_ut.cpp (83%) create mode 100644 src/library/threading/poor_man_openmp/ut/ya.make rename {library/cpp => src/library}/unicode_normalization/CMakeLists.txt (100%) rename {library/cpp => src/library}/unicode_normalization/decomposition_table.h (94%) rename {library/cpp => src/library}/unicode_normalization/generated/composition.cpp (99%) rename {library/cpp => src/library}/unicode_normalization/generated/decomposition.cpp (99%) rename {library/cpp => src/library}/unicode_normalization/normalization.cpp (100%) rename {library/cpp => src/library}/unicode_normalization/normalization.h (97%) rename {library/cpp => src/library}/unicode_normalization/ut/normalization_ut.cpp (80%) create mode 100644 src/library/uri/CMakeLists.txt rename {library/cpp => src/library}/uri/assign.cpp (98%) rename {library/cpp => src/library}/uri/benchmark/main.cpp (98%) rename {library/cpp => src/library}/uri/benchmark/ya.make (50%) rename {library/cpp => src/library}/uri/common.cpp (99%) rename {library/cpp => src/library}/uri/common.h (99%) rename {library/cpp => src/library}/uri/encode.cpp (99%) rename {library/cpp => src/library}/uri/encode.h (99%) rename {library/cpp => src/library}/uri/encodefsm.rl6 (96%) rename {library/cpp => src/library}/uri/http_url.h (100%) rename {library/cpp => src/library}/uri/location.cpp (100%) rename {library/cpp => src/library}/uri/location.h (100%) rename {library/cpp => src/library}/uri/location_ut.cpp (97%) rename {library/cpp => src/library}/uri/other.cpp (94%) rename {library/cpp => src/library}/uri/other.h (100%) rename {library/cpp => src/library}/uri/parse.cpp (100%) rename {library/cpp => src/library}/uri/parse.h (98%) rename {library/cpp => src/library}/uri/parsefsm.rl6 (99%) rename {library/cpp => src/library}/uri/qargs.cpp (100%) rename {library/cpp => src/library}/uri/qargs.h (100%) rename {library/cpp => src/library}/uri/uri-ru_ut.cpp (98%) rename {library/cpp => src/library}/uri/uri.cpp (99%) rename {library/cpp => src/library}/uri/uri.h (98%) rename {library/cpp => src/library}/uri/uri_ut.cpp (99%) rename {library/cpp => src/library}/uri/uri_ut.h (99%) rename {library/cpp => src/library}/uri/ut/ya.make (65%) create mode 100644 src/library/uuid/CMakeLists.txt rename {ydb => src}/library/uuid/uuid.cpp (97%) rename {ydb => src}/library/uuid/uuid.h (97%) rename {ydb => src}/library/yql/CMakeLists.txt (100%) rename {ydb => src}/library/yql/public/CMakeLists.txt (100%) rename {ydb => src}/library/yql/public/decimal/CMakeLists.txt (51%) create mode 100644 src/library/yql/public/decimal/ut/CMakeLists.txt rename {ydb => src}/library/yql/public/decimal/ut/yql_decimal_ut.cpp (98%) rename {ydb => src}/library/yql/public/decimal/ut/yql_wide_int_ut.cpp (99%) rename {ydb => src}/library/yql/public/decimal/yql_decimal.cpp (100%) rename {ydb => src}/library/yql/public/decimal/yql_decimal.h (100%) rename {ydb => src}/library/yql/public/decimal/yql_decimal_serialize.cpp (100%) rename {ydb => src}/library/yql/public/decimal/yql_decimal_serialize.h (78%) rename {ydb => src}/library/yql/public/decimal/yql_wide_int.h (99%) rename {ydb => src}/library/yql/public/issue/CMakeLists.txt (68%) rename {ydb => src}/library/yql/public/issue/protos/CMakeLists.txt (68%) rename {ydb => src}/library/yql/public/issue/protos/issue_message.proto (100%) rename {ydb => src}/library/yql/public/issue/protos/issue_severity.proto (100%) rename {ydb => src}/library/yql/public/issue/yql_issue.cpp (96%) rename {ydb => src}/library/yql/public/issue/yql_issue.h (98%) rename {ydb => src}/library/yql/public/issue/yql_issue_id.h (93%) rename {ydb => src}/library/yql/public/issue/yql_issue_message.cpp (96%) rename {ydb => src}/library/yql/public/issue/yql_issue_message.h (96%) rename {ydb => src}/library/yql/utils/CMakeLists.txt (72%) rename {ydb => src}/library/yql/utils/utf8.cpp (99%) rename {ydb => src}/library/yql/utils/utf8.h (100%) create mode 100644 src/library/yson/CMakeLists.txt rename {library/cpp => src/library}/yson/consumer.cpp (100%) rename {library/cpp => src/library}/yson/consumer.h (73%) rename {library/cpp => src/library}/yson/detail.h (99%) rename {library/cpp => src/library}/yson/format.h (100%) rename {library/cpp => src/library}/yson/json/CMakeLists.txt (53%) rename {library/cpp => src/library}/yson/json/json_writer.cpp (98%) rename {library/cpp => src/library}/yson/json/json_writer.h (95%) rename {library/cpp => src/library}/yson/json/yson2json_adapter.cpp (100%) rename {library/cpp => src/library}/yson/json/yson2json_adapter.h (92%) rename {library/cpp => src/library}/yson/lexer.cpp (97%) rename {library/cpp => src/library}/yson/lexer.h (93%) rename {library/cpp => src/library}/yson/lexer_detail.h (100%) create mode 100644 src/library/yson/node/CMakeLists.txt rename {library/cpp => src/library}/yson/node/benchmark/reserve.cpp (98%) rename {library/cpp => src/library}/yson/node/benchmark/ya.make (73%) rename {library/cpp => src/library}/yson/node/node.cpp (99%) rename {library/cpp => src/library}/yson/node/node.h (98%) rename {library/cpp => src/library}/yson/node/node_builder.cpp (100%) rename {library/cpp => src/library}/yson/node/node_builder.h (90%) rename {library/cpp => src/library}/yson/node/node_io.cpp (92%) rename {library/cpp => src/library}/yson/node/node_io.h (98%) rename {library/cpp => src/library}/yson/node/node_io_ut.cpp (93%) rename {library/cpp => src/library}/yson/node/node_ut.cpp (99%) rename {library/cpp => src/library}/yson/node/node_visitor.cpp (99%) rename {library/cpp => src/library}/yson/node/node_visitor.h (95%) rename {library/cpp => src/library}/yson/node/serialize.cpp (98%) rename {library/cpp => src/library}/yson/node/serialize.h (100%) rename {library/cpp => src/library}/yson/node/ut/ya.make (58%) rename {library/cpp => src/library}/yson/parser.cpp (98%) rename {library/cpp => src/library}/yson/parser.h (98%) rename {library/cpp => src/library}/yson/parser_detail.h (100%) rename {library/cpp => src/library}/yson/public.h (75%) rename {library/cpp => src/library}/yson/token.cpp (99%) rename {library/cpp => src/library}/yson/token.h (100%) rename {library/cpp => src/library}/yson/tokenizer.cpp (100%) rename {library/cpp => src/library}/yson/tokenizer.h (100%) rename {library/cpp => src/library}/yson/ut/ya.make (71%) rename {library/cpp => src/library}/yson/ut/yson_ut.cpp (69%) rename {library/cpp => src/library}/yson/varint.cpp (96%) rename {library/cpp => src/library}/yson/varint.h (86%) rename {library/cpp => src/library}/yson/writer.cpp (99%) rename {library/cpp => src/library}/yson/writer.h (98%) rename {library/cpp => src/library}/yson/zigzag.h (95%) rename {library/cpp => src/library}/yt/CMakeLists.txt (100%) rename {library/cpp => src/library}/yt/assert/CMakeLists.txt (77%) rename {library/cpp => src/library}/yt/assert/assert.cpp (89%) rename {library/cpp => src/library}/yt/assert/assert.h (96%) rename {library/cpp => src/library}/yt/coding/CMakeLists.txt (75%) rename {library/cpp => src/library}/yt/coding/unittests/varint_ut.cpp (96%) create mode 100644 src/library/yt/coding/unittests/ya.make rename {library/cpp => src/library}/yt/coding/unittests/zig_zag_ut.cpp (95%) rename {library/cpp => src/library}/yt/coding/varint-inl.h (99%) rename {library/cpp => src/library}/yt/coding/varint.h (94%) rename {library/cpp => src/library}/yt/coding/zig_zag-inl.h (100%) rename {library/cpp => src/library}/yt/coding/zig_zag.h (93%) rename {library/cpp => src/library}/yt/exception/CMakeLists.txt (77%) rename {library/cpp => src/library}/yt/exception/exception.cpp (100%) rename {library/cpp => src/library}/yt/exception/exception.h (100%) rename {library/cpp => src/library}/yt/malloc/CMakeLists.txt (82%) rename {library/cpp => src/library}/yt/malloc/malloc.cpp (90%) rename {library/cpp => src/library}/yt/malloc/malloc.h (100%) create mode 100644 src/library/yt/memory/CMakeLists.txt rename {library/cpp => src/library}/yt/memory/atomic_intrusive_ptr-inl.h (99%) rename {library/cpp => src/library}/yt/memory/atomic_intrusive_ptr.h (100%) rename {library/cpp => src/library}/yt/memory/blob.cpp (99%) rename {library/cpp => src/library}/yt/memory/blob.h (100%) rename {library/cpp => src/library}/yt/memory/chunked_input_stream.cpp (100%) rename {library/cpp => src/library}/yt/memory/chunked_input_stream.h (93%) rename {library/cpp => src/library}/yt/memory/chunked_memory_allocator-inl.h (97%) rename {library/cpp => src/library}/yt/memory/chunked_memory_allocator.cpp (100%) rename {library/cpp => src/library}/yt/memory/chunked_memory_allocator.h (100%) rename {library/cpp => src/library}/yt/memory/chunked_memory_pool-inl.h (97%) rename {library/cpp => src/library}/yt/memory/chunked_memory_pool.cpp (100%) rename {library/cpp => src/library}/yt/memory/chunked_memory_pool.h (99%) rename {library/cpp => src/library}/yt/memory/chunked_memory_pool_allocator-inl.h (97%) rename {library/cpp => src/library}/yt/memory/chunked_memory_pool_allocator.h (100%) rename {library/cpp => src/library}/yt/memory/chunked_memory_pool_output.cpp (97%) rename {library/cpp => src/library}/yt/memory/chunked_memory_pool_output.h (90%) rename {library/cpp => src/library}/yt/memory/chunked_output_stream.cpp (98%) rename {library/cpp => src/library}/yt/memory/chunked_output_stream.h (92%) rename {library/cpp => src/library}/yt/memory/free_list-inl.h (100%) rename {library/cpp => src/library}/yt/memory/free_list.h (100%) rename {library/cpp => src/library}/yt/memory/intrusive_ptr.h (99%) rename {library/cpp => src/library}/yt/memory/leaky_ref_counted_singleton-inl.h (92%) rename {library/cpp => src/library}/yt/memory/leaky_ref_counted_singleton.h (100%) rename {library/cpp => src/library}/yt/memory/leaky_singleton-inl.h (100%) rename {library/cpp => src/library}/yt/memory/leaky_singleton.h (100%) rename {library/cpp => src/library}/yt/memory/memory_tag-inl.h (96%) rename {library/cpp => src/library}/yt/memory/memory_tag.cpp (89%) rename {library/cpp => src/library}/yt/memory/memory_tag.h (100%) rename {library/cpp => src/library}/yt/memory/new-inl.h (99%) rename {library/cpp => src/library}/yt/memory/new.h (97%) rename {library/cpp => src/library}/yt/memory/public.h (100%) rename {library/cpp => src/library}/yt/memory/range.h (99%) rename {library/cpp => src/library}/yt/memory/ref-inl.h (100%) rename {library/cpp => src/library}/yt/memory/ref.cpp (99%) rename {library/cpp => src/library}/yt/memory/ref.h (99%) rename {library/cpp => src/library}/yt/memory/ref_counted-inl.h (99%) rename {library/cpp => src/library}/yt/memory/ref_counted.h (98%) rename {library/cpp => src/library}/yt/memory/ref_tracked-inl.h (100%) rename {library/cpp => src/library}/yt/memory/ref_tracked.cpp (100%) rename {library/cpp => src/library}/yt/memory/ref_tracked.h (93%) rename {library/cpp => src/library}/yt/memory/safe_memory_reader-inl.h (100%) rename {library/cpp => src/library}/yt/memory/safe_memory_reader.cpp (95%) rename {library/cpp => src/library}/yt/memory/safe_memory_reader.h (100%) rename {library/cpp => src/library}/yt/memory/serialize-inl.h (100%) rename {library/cpp => src/library}/yt/memory/serialize.h (94%) rename {library/cpp => src/library}/yt/memory/shared_range.cpp (100%) rename {library/cpp => src/library}/yt/memory/shared_range.h (99%) rename {library/cpp => src/library}/yt/memory/tagged_ptr-inl.h (93%) rename {library/cpp => src/library}/yt/memory/tagged_ptr.h (96%) rename {library/cpp => src/library}/yt/memory/unittests/atomic_intrusive_ptr_ut.cpp (97%) rename {library/cpp => src/library}/yt/memory/unittests/chunked_memory_pool_allocator_ut.cpp (96%) rename {library/cpp => src/library}/yt/memory/unittests/chunked_memory_pool_output_ut.cpp (84%) rename {library/cpp => src/library}/yt/memory/unittests/chunked_memory_pool_ut.cpp (94%) rename {library/cpp => src/library}/yt/memory/unittests/free_list_ut.cpp (96%) rename {library/cpp => src/library}/yt/memory/unittests/intrusive_ptr_ut.cpp (97%) rename {library/cpp => src/library}/yt/memory/unittests/ref_ut.cpp (76%) rename {library/cpp => src/library}/yt/memory/unittests/safe_memory_reader_ut.cpp (82%) rename {library/cpp => src/library}/yt/memory/unittests/shared_range_ut.cpp (85%) rename {library/cpp => src/library}/yt/memory/unittests/weak_ptr_ut.cpp (98%) rename {library/cpp => src/library}/yt/memory/unittests/ya.make (79%) rename {library/cpp => src/library}/yt/memory/weak_ptr.h (99%) rename {library/cpp => src/library}/yt/misc/CMakeLists.txt (54%) rename {library/cpp => src/library}/yt/misc/arcadia_enum-inl.h (97%) rename {library/cpp => src/library}/yt/misc/arcadia_enum.h (100%) rename {library/cpp => src/library}/yt/misc/cast-inl.h (97%) rename {library/cpp => src/library}/yt/misc/cast.h (92%) rename {library/cpp => src/library}/yt/misc/enum-inl.h (99%) rename {library/cpp => src/library}/yt/misc/enum.h (99%) rename {library/cpp => src/library}/yt/misc/guid-inl.h (100%) rename {library/cpp => src/library}/yt/misc/guid.cpp (98%) rename {library/cpp => src/library}/yt/misc/guid.h (96%) rename {library/cpp => src/library}/yt/misc/hash-inl.h (100%) rename {library/cpp => src/library}/yt/misc/hash.h (92%) rename {library/cpp => src/library}/yt/misc/port.h (98%) rename {library/cpp => src/library}/yt/misc/preprocessor-gen.h (100%) rename {library/cpp => src/library}/yt/misc/preprocessor.h (100%) rename {library/cpp => src/library}/yt/misc/property.h (99%) rename {library/cpp => src/library}/yt/misc/source_location.cpp (100%) rename {library/cpp => src/library}/yt/misc/source_location.h (100%) rename {library/cpp => src/library}/yt/misc/strong_typedef-inl.h (98%) rename {library/cpp => src/library}/yt/misc/strong_typedef.h (100%) rename {library/cpp => src/library}/yt/misc/thread_name.cpp (94%) rename {library/cpp => src/library}/yt/misc/thread_name.h (100%) rename {library/cpp => src/library}/yt/misc/tls-inl.h (100%) rename {library/cpp => src/library}/yt/misc/tls.h (93%) rename {library/cpp => src/library}/yt/misc/unittests/enum_ut.cpp (98%) rename {library/cpp => src/library}/yt/misc/unittests/guid_ut.cpp (91%) rename {library/cpp => src/library}/yt/misc/unittests/preprocessor_ut.cpp (97%) rename {library/cpp => src/library}/yt/misc/unittests/ya.make (59%) rename {library/cpp => src/library}/yt/misc/variant-inl.h (100%) rename {library/cpp => src/library}/yt/misc/variant.cpp (88%) rename {library/cpp => src/library}/yt/misc/variant.h (98%) rename {library/cpp => src/library}/yt/misc/wrapper_traits-inl.h (98%) rename {library/cpp => src/library}/yt/misc/wrapper_traits.h (100%) rename {library/cpp => src/library}/yt/small_containers/CMakeLists.txt (100%) rename {library/cpp => src/library}/yt/small_containers/compact_flat_map-inl.h (100%) rename {library/cpp => src/library}/yt/small_containers/compact_flat_map.h (100%) rename {library/cpp => src/library}/yt/small_containers/compact_heap-inl.h (98%) rename {library/cpp => src/library}/yt/small_containers/compact_heap.h (100%) rename {library/cpp => src/library}/yt/small_containers/compact_queue-inl.h (100%) rename {library/cpp => src/library}/yt/small_containers/compact_queue.h (100%) rename {library/cpp => src/library}/yt/small_containers/compact_set-inl.h (99%) rename {library/cpp => src/library}/yt/small_containers/compact_set.h (100%) rename {library/cpp => src/library}/yt/small_containers/compact_vector-inl.h (99%) rename {library/cpp => src/library}/yt/small_containers/compact_vector.h (99%) rename {library/cpp => src/library}/yt/small_containers/unittests/compact_flat_map_ut.cpp (98%) rename {library/cpp => src/library}/yt/small_containers/unittests/compact_heap_ut.cpp (95%) rename {library/cpp => src/library}/yt/small_containers/unittests/compact_queue_ut.cpp (95%) rename {library/cpp => src/library}/yt/small_containers/unittests/compact_set_ut.cpp (97%) rename {library/cpp => src/library}/yt/small_containers/unittests/compact_vector_ut.cpp (99%) rename {library/cpp => src/library}/yt/small_containers/unittests/ya.make (60%) rename {library/cpp => src/library}/yt/string/CMakeLists.txt (57%) rename {library/cpp => src/library}/yt/string/enum-inl.h (97%) rename {library/cpp => src/library}/yt/string/enum.cpp (100%) rename {library/cpp => src/library}/yt/string/enum.h (95%) rename {library/cpp => src/library}/yt/string/format-inl.h (99%) rename {library/cpp => src/library}/yt/string/format.cpp (100%) rename {library/cpp => src/library}/yt/string/format.h (100%) rename {library/cpp => src/library}/yt/string/guid.cpp (100%) rename {library/cpp => src/library}/yt/string/guid.h (82%) rename {library/cpp => src/library}/yt/string/raw_formatter.h (100%) rename {library/cpp => src/library}/yt/string/string.cpp (98%) rename {library/cpp => src/library}/yt/string/string.h (98%) rename {library/cpp => src/library}/yt/string/string_builder-inl.h (98%) rename {library/cpp => src/library}/yt/string/string_builder.h (98%) rename {library/cpp => src/library}/yt/string/unittests/enum_ut.cpp (95%) rename {library/cpp => src/library}/yt/string/unittests/format_ut.cpp (98%) rename {library/cpp => src/library}/yt/string/unittests/guid_ut.cpp (89%) rename {library/cpp => src/library}/yt/string/unittests/string_ut.cpp (93%) rename {library/cpp => src/library}/yt/string/unittests/ya.make (53%) rename {library/cpp => src/library}/yt/yson/CMakeLists.txt (78%) rename {library/cpp => src/library}/yt/yson/consumer.cpp (87%) rename {library/cpp => src/library}/yt/yson/consumer.h (97%) rename {library/cpp => src/library}/yt/yson/public.h (100%) rename {library/cpp => src/library}/yt/yson_string/CMakeLists.txt (75%) rename {library/cpp => src/library}/yt/yson_string/convert.cpp (98%) rename {library/cpp => src/library}/yt/yson_string/convert.h (96%) rename {library/cpp => src/library}/yt/yson_string/format.h (100%) rename {library/cpp => src/library}/yt/yson_string/public.h (95%) rename {library/cpp => src/library}/yt/yson_string/string-inl.h (100%) rename {library/cpp => src/library}/yt/yson_string/string.cpp (97%) rename {library/cpp => src/library}/yt/yson_string/string.h (98%) rename {library/cpp => src/library}/yt/yson_string/unittests/convert_ut.cpp (93%) rename {library/cpp => src/library}/yt/yson_string/unittests/saveload_ut.cpp (86%) create mode 100644 src/library/yt/yson_string/unittests/ya.make create mode 100644 src/util/CMakeLists.txt rename {util => src/util}/README.md (100%) create mode 100644 src/util/charset/CMakeLists.txt rename {util => src/util}/charset/generated/unidata.cpp (99%) rename {util => src/util}/charset/recode_result.cpp (100%) rename {util => src/util}/charset/recode_result.h (100%) rename {util => src/util}/charset/unicode_table.cpp (100%) rename {util => src/util}/charset/unicode_table.h (96%) rename {util => src/util}/charset/unidata.cpp (100%) rename {util => src/util}/charset/unidata.h (99%) rename {util => src/util}/charset/ut/utf8/invalid_UTF8.bin (100%) rename {util => src/util}/charset/ut/utf8/test1.txt (100%) create mode 100644 src/util/charset/ut/ya.make rename {util => src/util}/charset/utf8.cpp (100%) rename {util => src/util}/charset/utf8.h (98%) rename {util => src/util}/charset/utf8_ut.cpp (91%) rename {util => src/util}/charset/wide.cpp (99%) rename {util => src/util}/charset/wide.h (99%) rename {util => src/util}/charset/wide_specific.h (86%) rename {util => src/util}/charset/wide_sse41.cpp (98%) rename {util => src/util}/charset/wide_ut.cpp (99%) rename {util => src/util}/datetime/base.cpp (97%) rename {util => src/util}/datetime/base.h (98%) rename {util => src/util}/datetime/base_ut.cpp (98%) rename {util => src/util}/datetime/benchmark/gmtime_r/main.cpp (83%) rename {util => src/util}/datetime/benchmark/gmtime_r/ya.make (82%) rename {util => src/util}/datetime/benchmark/ya.make (100%) rename {util => src/util}/datetime/constants.cpp (100%) rename {util => src/util}/datetime/constants.h (100%) rename {util => src/util}/datetime/cputimer.cpp (78%) rename {util => src/util}/datetime/cputimer.h (100%) rename {util => src/util}/datetime/cputimer_ut.cpp (83%) rename {util => src/util}/datetime/parser.h (99%) rename {util => src/util}/datetime/parser.rl6 (99%) rename {util => src/util}/datetime/parser_deprecated_ut.cpp (99%) rename {util => src/util}/datetime/parser_ut.cpp (99%) rename {util => src/util}/datetime/strptime.cpp (99%) rename {util => src/util}/datetime/systime.cpp (99%) rename {util => src/util}/datetime/systime.h (95%) rename {util => src/util}/datetime/uptime.cpp (92%) rename {util => src/util}/datetime/uptime.h (100%) rename {util => src/util}/datetime/uptime_ut.cpp (84%) rename {util => src/util}/datetime/ut/ya.make (78%) rename {util => src/util}/digest/benchmark/murmur/main.cpp (81%) rename {util => src/util}/digest/benchmark/murmur/ya.make (100%) rename {util => src/util}/digest/benchmark/ya.make (100%) rename {util => src/util}/digest/city.cpp (99%) rename {util => src/util}/digest/city.h (98%) rename {util => src/util}/digest/city_ut.cpp (86%) rename {util => src/util}/digest/fnv.cpp (100%) rename {util => src/util}/digest/fnv.h (98%) rename {util => src/util}/digest/fnv_ut.cpp (93%) rename {util => src/util}/digest/multi.cpp (100%) rename {util => src/util}/digest/multi.h (91%) create mode 100644 src/util/digest/multi.pxd rename {util => src/util}/digest/multi_ut.cpp (93%) rename {util => src/util}/digest/multi_ut.pyx (100%) rename {util => src/util}/digest/murmur.cpp (98%) rename {util => src/util}/digest/murmur.h (97%) rename {util => src/util}/digest/murmur_ut.cpp (97%) rename {util => src/util}/digest/numeric.cpp (100%) rename {util => src/util}/digest/numeric.h (95%) rename {util => src/util}/digest/sequence.cpp (100%) rename {util => src/util}/digest/sequence.h (97%) rename {util => src/util}/digest/sequence_ut.cpp (95%) rename {util => src/util}/digest/ut/ya.make (76%) rename {util => src/util}/digest/ut_cython/test_digest.py (100%) rename {util => src/util}/digest/ut_cython/ya.make (85%) rename {util => src/util}/folder/dirent_win.c (98%) rename {util => src/util}/folder/dirent_win.h (93%) rename {util => src/util}/folder/dirut.cpp (98%) rename {util => src/util}/folder/dirut.h (93%) rename {util => src/util}/folder/dirut_ut.cpp (97%) rename {util => src/util}/folder/filelist.cpp (96%) rename {util => src/util}/folder/filelist.h (95%) rename {util => src/util}/folder/filelist_ut.cpp (95%) rename {util => src/util}/folder/fts.cpp (99%) rename {util => src/util}/folder/fts.h (98%) rename {util => src/util}/folder/fts_ut.cpp (96%) rename {util => src/util}/folder/fwd.cpp (100%) rename {util => src/util}/folder/fwd.h (100%) rename {util => src/util}/folder/iterator.cpp (100%) rename {util => src/util}/folder/iterator.h (92%) rename {util => src/util}/folder/iterator_ut.cpp (96%) rename {util => src/util}/folder/lstat_win.c (92%) rename {util => src/util}/folder/lstat_win.h (87%) rename {util => src/util}/folder/path.cpp (97%) rename {util => src/util}/folder/path.h (96%) rename {util => src/util}/folder/path.pxd (98%) rename {util => src/util}/folder/path_ut.cpp (99%) rename {util => src/util}/folder/path_ut.pyx (100%) rename {util => src/util}/folder/pathsplit.cpp (96%) rename {util => src/util}/folder/pathsplit.h (98%) rename {util => src/util}/folder/pathsplit_ut.cpp (98%) rename {util => src/util}/folder/tempdir.cpp (92%) rename {util => src/util}/folder/tempdir.h (100%) rename {util => src/util}/folder/ut/ya.make (71%) rename {util => src/util}/folder/ut_cython/test_folder.py (100%) rename {util => src/util}/folder/ut_cython/ya.make (85%) rename {util => src/util}/generic/adaptor.cpp (100%) rename {util => src/util}/generic/adaptor.h (100%) rename {util => src/util}/generic/adaptor_ut.cpp (98%) rename {util => src/util}/generic/algorithm.cpp (100%) rename {util => src/util}/generic/algorithm.h (99%) rename {util => src/util}/generic/algorithm_ut.cpp (99%) rename {util => src/util}/generic/array_size.cpp (100%) rename {util => src/util}/generic/array_size.h (100%) rename {util => src/util}/generic/array_size_ut.cpp (88%) rename {util => src/util}/generic/bitmap.cpp (100%) rename {util => src/util}/generic/bitmap.h (99%) rename {util => src/util}/generic/bitmap_ut.cpp (99%) rename {util => src/util}/generic/bitops.cpp (100%) rename {util => src/util}/generic/bitops.h (99%) rename {util => src/util}/generic/bitops_ut.cpp (99%) rename {util => src/util}/generic/bt_exception.cpp (100%) rename {util => src/util}/generic/bt_exception.h (90%) rename {util => src/util}/generic/buffer.cpp (95%) rename {util => src/util}/generic/buffer.h (97%) rename {util => src/util}/generic/buffer_ut.cpp (98%) rename {util => src/util}/generic/cast.cpp (100%) rename {util => src/util}/generic/cast.h (97%) rename {util => src/util}/generic/cast_ut.cpp (98%) rename {util => src/util}/generic/explicit_type.cpp (100%) rename {util => src/util}/generic/explicit_type.h (100%) rename {util => src/util}/generic/explicit_type_ut.cpp (97%) rename {util => src/util}/generic/fastqueue.cpp (100%) rename {util => src/util}/generic/fastqueue.h (96%) rename {util => src/util}/generic/flags.cpp (91%) rename {util => src/util}/generic/flags.h (98%) rename {util => src/util}/generic/flags_ut.cpp (98%) rename {util => src/util}/generic/function.cpp (100%) rename {util => src/util}/generic/function.h (100%) rename {util => src/util}/generic/function_ref.cpp (100%) rename {util => src/util}/generic/function_ref.h (98%) rename {util => src/util}/generic/function_ref_ut.cpp (98%) rename {util => src/util}/generic/function_ut.cpp (98%) rename {util => src/util}/generic/fwd.cpp (100%) rename {util => src/util}/generic/fwd.h (98%) rename {util => src/util}/generic/guid.cpp (96%) rename {util => src/util}/generic/guid.h (98%) rename {util => src/util}/generic/guid_ut.cpp (98%) rename {util => src/util}/generic/hash.cpp (100%) rename {util => src/util}/generic/hash.h (100%) rename {util => src/util}/generic/hash.pxd (97%) rename {util => src/util}/generic/hash_multi_map.cpp (100%) rename {util => src/util}/generic/hash_multi_map.h (100%) rename {util => src/util}/generic/hash_primes.cpp (100%) rename {util => src/util}/generic/hash_primes.h (98%) rename {util => src/util}/generic/hash_primes_ut.cpp (93%) rename {util => src/util}/generic/hash_table.cpp (94%) rename {util => src/util}/generic/hash_table.h (99%) rename {util => src/util}/generic/hash_ut.cpp (99%) rename {util => src/util}/generic/hash_ut.pyx (100%) rename {util => src/util}/generic/hide_ptr.cpp (100%) rename {util => src/util}/generic/hide_ptr.h (100%) rename {util => src/util}/generic/intrlist.cpp (100%) rename {util => src/util}/generic/intrlist.h (99%) rename {util => src/util}/generic/intrlist_ut.cpp (99%) rename {util => src/util}/generic/is_in.cpp (100%) rename {util => src/util}/generic/is_in.h (100%) rename {util => src/util}/generic/is_in_ut.cpp (98%) rename {util => src/util}/generic/iterator.cpp (100%) rename {util => src/util}/generic/iterator.h (100%) rename {util => src/util}/generic/iterator_range.cpp (100%) rename {util => src/util}/generic/iterator_range.h (98%) rename {util => src/util}/generic/iterator_range_ut.cpp (95%) rename {util => src/util}/generic/iterator_ut.cpp (97%) rename {util => src/util}/generic/join.h (100%) rename {util => src/util}/generic/lazy_value.cpp (100%) rename {util => src/util}/generic/lazy_value.h (100%) rename {util => src/util}/generic/lazy_value_ut.cpp (98%) rename {util => src/util}/generic/mapfindptr.cpp (100%) rename {util => src/util}/generic/mapfindptr.h (97%) rename {util => src/util}/generic/mapfindptr_ut.cpp (97%) rename {util => src/util}/generic/mem_copy.cpp (100%) rename {util => src/util}/generic/mem_copy.h (96%) rename {util => src/util}/generic/mem_copy_ut.cpp (97%) rename {util => src/util}/generic/noncopyable.cpp (100%) rename {util => src/util}/generic/noncopyable.h (100%) rename {util => src/util}/generic/object_counter.cpp (100%) rename {util => src/util}/generic/object_counter.h (100%) rename {util => src/util}/generic/objects_counter_ut.cpp (94%) rename {util => src/util}/generic/overloaded.cpp (100%) rename {util => src/util}/generic/overloaded.h (100%) rename {util => src/util}/generic/overloaded_ut.cpp (93%) rename {util => src/util}/generic/ptr.cpp (75%) rename {util => src/util}/generic/ptr.h (99%) rename {util => src/util}/generic/ptr.pxd (94%) rename {util => src/util}/generic/ptr_ut.cpp (99%) rename {util => src/util}/generic/ptr_ut.pyx (100%) rename {util => src/util}/generic/refcount.cpp (100%) rename {util => src/util}/generic/refcount.h (95%) rename {util => src/util}/generic/reserve.h (100%) rename {util => src/util}/generic/scope.cpp (100%) rename {util => src/util}/generic/scope.h (95%) rename {util => src/util}/generic/scope_ut.cpp (89%) rename {util => src/util}/generic/set.cpp (100%) rename {util => src/util}/generic/set.h (91%) rename {util => src/util}/generic/set_ut.cpp (99%) rename {util => src/util}/generic/singleton.cpp (92%) rename {util => src/util}/generic/singleton.h (97%) rename {util => src/util}/generic/singleton_ut.cpp (96%) rename {util => src/util}/generic/size_literals.cpp (100%) rename {util => src/util}/generic/size_literals.h (98%) rename {util => src/util}/generic/size_literals_ut.cpp (100%) rename {util => src/util}/generic/stack.cpp (100%) rename {util => src/util}/generic/stack.h (100%) rename {util => src/util}/generic/stack_ut.cpp (84%) rename {util => src/util}/generic/store_policy.cpp (100%) rename {util => src/util}/generic/store_policy.h (100%) rename {util => src/util}/generic/store_policy_ut.cpp (97%) rename {util => src/util}/generic/strfcpy.cpp (100%) rename {util => src/util}/generic/strfcpy.h (100%) rename {util => src/util}/generic/string_hash.h (100%) rename {util => src/util}/generic/string_transparent_hash_ut.cpp (80%) rename {util => src/util}/generic/typelist.cpp (100%) rename {util => src/util}/generic/typelist.h (97%) rename {util => src/util}/generic/typelist_ut.cpp (96%) rename {util => src/util}/generic/typetraits.cpp (100%) rename {util => src/util}/generic/typetraits.h (99%) rename {util => src/util}/generic/typetraits_ut.cpp (99%) rename {util => src/util}/generic/ut/ya.make (93%) rename {util => src/util}/generic/ut_cython/test_generic.py (100%) rename {util => src/util}/generic/ut_cython/ya.make (91%) rename {util => src/util}/generic/utility.cpp (100%) rename {util => src/util}/generic/utility.h (98%) rename {util => src/util}/generic/utility_ut.cpp (99%) rename {util => src/util}/generic/va_args.cpp (100%) rename {util => src/util}/generic/va_args.h (99%) rename {util => src/util}/generic/va_args_ut.cpp (98%) rename {util => src/util}/generic/variant.cpp (100%) rename {util => src/util}/generic/variant.h (100%) rename {util => src/util}/generic/xrange.cpp (100%) rename {util => src/util}/generic/xrange.h (99%) rename {util => src/util}/generic/xrange_ut.cpp (98%) rename {util => src/util}/generic/yexception.cpp (96%) rename {util => src/util}/generic/yexception.h (96%) rename {util => src/util}/generic/yexception_ut.c (100%) rename {util => src/util}/generic/yexception_ut.cpp (96%) rename {util => src/util}/generic/yexception_ut.h (100%) rename {util => src/util}/generic/ylimits.cpp (100%) rename {util => src/util}/generic/ylimits.h (100%) rename {util => src/util}/generic/ylimits_ut.cpp (98%) rename {util => src/util}/generic/ymath.cpp (100%) rename {util => src/util}/generic/ymath.h (98%) rename {util => src/util}/generic/ymath_ut.cpp (98%) rename {util => src/util}/memory/addstorage.cpp (100%) rename {util => src/util}/memory/addstorage.h (97%) rename {util => src/util}/memory/addstorage_ut.cpp (90%) rename {util => src/util}/memory/alloc.cpp (82%) rename {util => src/util}/memory/alloc.h (100%) rename {util => src/util}/memory/blob.cpp (97%) rename {util => src/util}/memory/blob.h (99%) rename {util => src/util}/memory/blob.pxd (95%) rename {util => src/util}/memory/blob_ut.cpp (90%) rename {util => src/util}/memory/blob_ut.pyx (100%) rename {util => src/util}/memory/mmapalloc.cpp (90%) rename {util => src/util}/memory/mmapalloc.h (100%) rename {util => src/util}/memory/pool.cpp (100%) rename {util => src/util}/memory/pool.h (97%) rename {util => src/util}/memory/pool_ut.cpp (98%) rename {util => src/util}/memory/segmented_string_pool.cpp (100%) rename {util => src/util}/memory/segmented_string_pool.h (97%) rename {util => src/util}/memory/segpool_alloc.cpp (100%) rename {util => src/util}/memory/segpool_alloc.h (100%) rename {util => src/util}/memory/smallobj.cpp (100%) rename {util => src/util}/memory/smallobj.h (97%) rename {util => src/util}/memory/smallobj_ut.cpp (97%) rename {util => src/util}/memory/tempbuf.cpp (95%) rename {util => src/util}/memory/tempbuf.h (97%) rename {util => src/util}/memory/tempbuf_ut.cpp (97%) rename {util => src/util}/memory/ut/ya.make (77%) rename {util => src/util}/memory/ut_cython/test_memory.py (100%) rename {util => src/util}/memory/ut_cython/ya.make (85%) rename {util => src/util}/network/address.cpp (99%) rename {util => src/util}/network/address.h (97%) rename {util => src/util}/network/address_ut.cpp (95%) rename {util => src/util}/network/endpoint.cpp (100%) rename {util => src/util}/network/endpoint.h (97%) rename {util => src/util}/network/endpoint_ut.cpp (98%) rename {util => src/util}/network/hostip.cpp (95%) rename {util => src/util}/network/hostip.h (91%) rename {util => src/util}/network/init.cpp (86%) rename {util => src/util}/network/init.h (93%) rename {util => src/util}/network/interface.cpp (98%) rename {util => src/util}/network/interface.h (100%) rename {util => src/util}/network/iovec.cpp (100%) rename {util => src/util}/network/iovec.h (91%) rename {util => src/util}/network/ip.cpp (100%) rename {util => src/util}/network/ip.h (95%) rename {util => src/util}/network/ip_ut.cpp (94%) rename {util => src/util}/network/nonblock.cpp (97%) rename {util => src/util}/network/nonblock.h (100%) rename {util => src/util}/network/pair.cpp (100%) rename {util => src/util}/network/pair.h (100%) rename {util => src/util}/network/poller.cpp (98%) rename {util => src/util}/network/poller.h (95%) rename {util => src/util}/network/poller_ut.cpp (99%) rename {util => src/util}/network/pollerimpl.cpp (100%) rename {util => src/util}/network/pollerimpl.h (98%) rename {util => src/util}/network/sock.cpp (100%) rename {util => src/util}/network/sock.h (98%) rename {util => src/util}/network/sock_ut.cpp (97%) rename {util => src/util}/network/socket.cpp (98%) rename {util => src/util}/network/socket.h (96%) rename {util => src/util}/network/socket_ut.cpp (98%) rename {util => src/util}/network/ut/ya.make (74%) rename {util => src/util}/random/common_ops.cpp (100%) rename {util => src/util}/random/common_ops.h (97%) rename {util => src/util}/random/common_ops_ut.cpp (94%) rename {util => src/util}/random/easy.cpp (100%) rename {util => src/util}/random/easy.h (100%) rename {util => src/util}/random/easy_ut.cpp (90%) rename {util => src/util}/random/entropy.cpp (86%) rename {util => src/util}/random/entropy.h (100%) rename {util => src/util}/random/entropy_ut.cpp (80%) rename {util => src/util}/random/fast.cpp (96%) rename {util => src/util}/random/fast.h (96%) rename {util => src/util}/random/fast_ut.cpp (98%) rename {util => src/util}/random/init_atfork.cpp (86%) rename {util => src/util}/random/init_atfork.h (100%) rename {util => src/util}/random/lcg_engine.cpp (100%) rename {util => src/util}/random/lcg_engine.h (97%) rename {util => src/util}/random/mersenne.cpp (100%) rename {util => src/util}/random/mersenne.h (100%) rename {util => src/util}/random/mersenne32.cpp (96%) rename {util => src/util}/random/mersenne32.h (96%) rename {util => src/util}/random/mersenne64.cpp (96%) rename {util => src/util}/random/mersenne64.h (96%) rename {util => src/util}/random/mersenne_ut.cpp (95%) rename {util => src/util}/random/normal.cpp (100%) rename {util => src/util}/random/normal.h (100%) rename {util => src/util}/random/normal_ut.cpp (95%) rename {util => src/util}/random/random.cpp (93%) rename {util => src/util}/random/random.h (100%) rename {util => src/util}/random/random_ut.cpp (97%) rename {util => src/util}/random/shuffle.cpp (100%) rename {util => src/util}/random/shuffle.h (97%) rename {util => src/util}/random/shuffle_ut.cpp (96%) rename {util => src/util}/random/ut/ya.make (82%) rename {util => src/util}/str_stl.cpp (100%) rename {util => src/util}/str_stl.h (97%) rename {util => src/util}/stream/buffer.cpp (98%) rename {util => src/util}/stream/buffer.h (98%) rename {util => src/util}/stream/buffer_ut.cpp (96%) rename {util => src/util}/stream/buffered.cpp (98%) rename {util => src/util}/stream/buffered.h (98%) rename {util => src/util}/stream/buffered_ut.cpp (97%) rename {util => src/util}/stream/debug.cpp (86%) rename {util => src/util}/stream/debug.h (100%) rename {util => src/util}/stream/file.cpp (96%) rename {util => src/util}/stream/file.h (98%) rename {util => src/util}/stream/file_ut.cpp (94%) rename {util => src/util}/stream/format.cpp (98%) rename {util => src/util}/stream/format.h (99%) rename {util => src/util}/stream/format_std_ut.cpp (97%) rename {util => src/util}/stream/format_ut.cpp (99%) rename {util => src/util}/stream/fwd.cpp (100%) rename {util => src/util}/stream/fwd.h (97%) rename {util => src/util}/stream/hex.cpp (96%) rename {util => src/util}/stream/hex.h (82%) rename {util => src/util}/stream/hex_ut.cpp (93%) rename {util => src/util}/stream/input.cpp (96%) rename {util => src/util}/stream/input.h (98%) rename {util => src/util}/stream/input_ut.cpp (96%) rename {util => src/util}/stream/ios_ut.cpp (98%) rename {util => src/util}/stream/length.cpp (100%) rename {util => src/util}/stream/length.h (95%) rename {util => src/util}/stream/length_ut.cpp (85%) rename {util => src/util}/stream/mem.cpp (96%) rename {util => src/util}/stream/mem.h (100%) rename {util => src/util}/stream/mem_ut.cpp (97%) rename {util => src/util}/stream/multi.cpp (100%) rename {util => src/util}/stream/multi.h (90%) rename {util => src/util}/stream/multi_ut.cpp (97%) rename {util => src/util}/stream/null.cpp (95%) rename {util => src/util}/stream/null.h (100%) rename {util => src/util}/stream/output.cpp (97%) rename {util => src/util}/stream/output.h (98%) rename {util => src/util}/stream/output.pxd (85%) rename {util => src/util}/stream/str.cpp (96%) rename {util => src/util}/stream/str.h (97%) rename {util => src/util}/stream/str.pxd (87%) rename {util => src/util}/stream/str_ut.cpp (97%) rename {util => src/util}/stream/str_ut.pyx (100%) rename {util => src/util}/stream/tee.cpp (100%) rename {util => src/util}/stream/tee.h (100%) rename {util => src/util}/stream/tempbuf.cpp (100%) rename {util => src/util}/stream/tempbuf.h (91%) rename {util => src/util}/stream/ut/ya.make (90%) rename {util => src/util}/stream/ut_cython/test_stream.py (100%) rename {util => src/util}/stream/ut_cython/ya.make (85%) rename {util => src/util}/stream/walk.cpp (100%) rename {util => src/util}/stream/walk.h (100%) rename {util => src/util}/stream/walk_ut.cpp (96%) rename {util => src/util}/stream/zerocopy.cpp (100%) rename {util => src/util}/stream/zerocopy.h (95%) rename {util => src/util}/stream/zerocopy_output.cpp (93%) rename {util => src/util}/stream/zerocopy_output.h (97%) rename {util => src/util}/stream/zerocopy_output_ut.cpp (95%) rename {util => src/util}/stream/zlib.cpp (98%) rename {util => src/util}/stream/zlib.h (97%) rename {util => src/util}/stream/zlib_ut.cpp (98%) rename {util => src/util}/string/ascii.cpp (97%) rename {util => src/util}/string/ascii.h (93%) rename {util => src/util}/string/ascii_ut.cpp (98%) rename {util => src/util}/string/builder.cpp (81%) rename {util => src/util}/string/builder.h (96%) rename {util => src/util}/string/builder_ut.cpp (97%) rename {util => src/util}/string/cast.cpp (98%) rename {util => src/util}/string/cast.h (98%) rename {util => src/util}/string/cast.pxd (83%) rename {util => src/util}/string/cast_ut.cpp (99%) rename {util => src/util}/string/cast_ut.pyx (100%) rename {util => src/util}/string/cstriter.cpp (100%) rename {util => src/util}/string/cstriter.h (100%) rename {util => src/util}/string/escape.cpp (99%) rename {util => src/util}/string/escape.h (98%) rename {util => src/util}/string/escape_ut.cpp (98%) rename {util => src/util}/string/hex.cpp (100%) rename {util => src/util}/string/hex.h (96%) rename {util => src/util}/string/hex_ut.cpp (92%) rename {util => src/util}/string/join.cpp (100%) rename {util => src/util}/string/join.h (99%) rename {util => src/util}/string/join_ut.cpp (98%) rename {util => src/util}/string/reverse.cpp (94%) rename {util => src/util}/string/reverse.h (92%) rename {util => src/util}/string/split.cpp (100%) rename {util => src/util}/string/split.h (98%) rename {util => src/util}/string/split_ut.cpp (99%) rename {util => src/util}/string/strip.cpp (92%) rename {util => src/util}/string/strip.h (99%) rename {util => src/util}/string/strip_ut.cpp (98%) rename {util => src/util}/string/strspn.cpp (100%) rename {util => src/util}/string/strspn.h (97%) rename {util => src/util}/string/strspn_ut.cpp (98%) rename {util => src/util}/string/subst.cpp (99%) rename {util => src/util}/string/subst.h (98%) rename {util => src/util}/string/subst_ut.cpp (99%) rename {util => src/util}/string/type.cpp (100%) rename {util => src/util}/string/type.h (96%) rename {util => src/util}/string/type_ut.cpp (96%) rename {util => src/util}/string/ut/ya.make (87%) rename {util => src/util}/string/ut_cython/test_string.py (100%) rename {util => src/util}/string/ut_cython/ya.make (85%) rename {util => src/util}/string/util.cpp (97%) rename {util => src/util}/string/util.h (99%) rename {util => src/util}/string/util_ut.cpp (96%) rename {util => src/util}/string/vector.cpp (98%) rename {util => src/util}/string/vector.h (98%) rename {util => src/util}/string/vector_ut.cpp (94%) rename {util => src/util}/system/align.cpp (100%) rename {util => src/util}/system/align.h (97%) rename {util => src/util}/system/align_ut.cpp (94%) rename {util => src/util}/system/atexit.cpp (97%) rename {util => src/util}/system/atexit.h (100%) rename {util => src/util}/system/atexit_ut.cpp (95%) rename {util => src/util}/system/backtrace.cpp (97%) rename {util => src/util}/system/backtrace.h (93%) rename {util => src/util}/system/backtrace_ut.cpp (95%) rename {util => src/util}/system/byteorder.cpp (100%) rename {util => src/util}/system/byteorder.h (98%) rename {util => src/util}/system/byteorder_ut.cpp (92%) rename {util => src/util}/system/compat.cpp (100%) rename {util => src/util}/system/compat.h (100%) rename {util => src/util}/system/compat_ut.cpp (54%) rename {util => src/util}/system/compiler.cpp (100%) rename {util => src/util}/system/compiler.h (100%) rename {util => src/util}/system/compiler_ut.cpp (97%) rename {util => src/util}/system/context.cpp (99%) rename {util => src/util}/system/context.h (98%) rename {util => src/util}/system/context_aarch64.S (100%) rename {util => src/util}/system/context_aarch64.h (100%) rename {util => src/util}/system/context_i686.asm (100%) rename {util => src/util}/system/context_i686.h (100%) rename {util => src/util}/system/context_ut.cpp (93%) rename {util => src/util}/system/context_x86.asm (100%) rename {util => src/util}/system/context_x86.h (100%) rename {util => src/util}/system/context_x86_64.asm (100%) rename {util => src/util}/system/context_x86_64.h (100%) rename {util => src/util}/system/cpu_id.cpp (99%) rename {util => src/util}/system/cpu_id.h (99%) rename {util => src/util}/system/cpu_id_ut.cpp (99%) rename {util => src/util}/system/daemon.cpp (98%) rename {util => src/util}/system/daemon.h (100%) rename {util => src/util}/system/daemon_ut.cpp (95%) rename {util => src/util}/system/datetime.cpp (98%) rename {util => src/util}/system/datetime.h (95%) rename {util => src/util}/system/datetime_ut.cpp (100%) rename {util => src/util}/system/defaults.c (100%) rename {util => src/util}/system/defaults.h (98%) rename {util => src/util}/system/demangle_impl.h (91%) rename {util => src/util}/system/direct_io.cpp (97%) rename {util => src/util}/system/direct_io.h (98%) rename {util => src/util}/system/direct_io_ut.cpp (95%) rename {util => src/util}/system/dynlib.cpp (97%) rename {util => src/util}/system/dynlib.h (98%) rename {util => src/util}/system/err.cpp (96%) rename {util => src/util}/system/error.cpp (91%) rename {util => src/util}/system/error.h (100%) rename {util => src/util}/system/error_ut.cpp (88%) rename {util => src/util}/system/event.cpp (100%) rename {util => src/util}/system/event.h (97%) rename {util => src/util}/system/event_ut.cpp (97%) rename {util => src/util}/system/execpath.cpp (98%) rename {util => src/util}/system/execpath.h (93%) rename {util => src/util}/system/execpath_ut.cpp (83%) rename {util => src/util}/system/fake_mutex.cpp (100%) rename {util => src/util}/system/fake_mutex.h (91%) rename {util => src/util}/system/fasttime.cpp (94%) rename {util => src/util}/system/fasttime.h (100%) rename {util => src/util}/system/fhandle.cpp (100%) rename {util => src/util}/system/fhandle.h (100%) rename {util => src/util}/system/file.cpp (98%) rename {util => src/util}/system/file.h (98%) rename {util => src/util}/system/file_lock.cpp (95%) rename {util => src/util}/system/file_lock.h (81%) rename {util => src/util}/system/file_ut.cpp (98%) rename {util => src/util}/system/filemap.cpp (98%) rename {util => src/util}/system/filemap.h (97%) rename {util => src/util}/system/filemap_ut.cpp (99%) rename {util => src/util}/system/flock.cpp (97%) rename {util => src/util}/system/flock.h (100%) rename {util => src/util}/system/flock_ut.cpp (97%) rename {util => src/util}/system/fs.cpp (95%) rename {util => src/util}/system/fs.h (98%) rename {util => src/util}/system/fs_ut.cpp (99%) rename {util => src/util}/system/fs_win.cpp (99%) rename {util => src/util}/system/fs_win.h (100%) rename {util => src/util}/system/fs_win_ut.cpp (94%) rename {util => src/util}/system/fstat.cpp (99%) rename {util => src/util}/system/fstat.h (95%) rename {util => src/util}/system/fstat_ut.cpp (98%) rename {util => src/util}/system/getpid.cpp (100%) rename {util => src/util}/system/getpid.h (100%) rename {util => src/util}/system/getpid_ut.cpp (85%) rename {util => src/util}/system/guard.cpp (100%) rename {util => src/util}/system/guard.h (97%) rename {util => src/util}/system/guard_ut.cpp (97%) rename {util => src/util}/system/hi_lo.cpp (100%) rename {util => src/util}/system/hi_lo.h (100%) rename {util => src/util}/system/hi_lo_ut.cpp (95%) rename {util => src/util}/system/hostname.cpp (94%) rename {util => src/util}/system/hostname.h (83%) rename {util => src/util}/system/hostname_ut.cpp (90%) rename {util => src/util}/system/hp_timer.cpp (95%) rename {util => src/util}/system/hp_timer.h (100%) rename {util => src/util}/system/info.cpp (97%) rename {util => src/util}/system/info.h (100%) rename {util => src/util}/system/info_ut.cpp (91%) rename {util => src/util}/system/interrupt_signals.cpp (97%) rename {util => src/util}/system/interrupt_signals.h (100%) rename {util => src/util}/system/interrupt_signals_ut.cpp (93%) rename {util => src/util}/system/madvise.cpp (97%) rename {util => src/util}/system/madvise.h (100%) rename {util => src/util}/system/maxlen.cpp (100%) rename {util => src/util}/system/maxlen.h (100%) rename {util => src/util}/system/mem_info.cpp (97%) rename {util => src/util}/system/mem_info.h (100%) rename {util => src/util}/system/mem_info_ut.cpp (89%) rename {util => src/util}/system/mincore.cpp (95%) rename {util => src/util}/system/mincore.h (100%) rename {util => src/util}/system/mincore_ut.cpp (92%) rename {util => src/util}/system/mktemp.cpp (95%) rename {util => src/util}/system/mktemp_system.cpp (98%) rename {util => src/util}/system/mlock.cpp (98%) rename {util => src/util}/system/mlock.h (97%) rename {util => src/util}/system/nice.cpp (100%) rename {util => src/util}/system/nice.h (100%) rename {util => src/util}/system/nice_ut.cpp (94%) rename {util => src/util}/system/pipe.cpp (98%) rename {util => src/util}/system/pipe.h (94%) rename {util => src/util}/system/pipe_ut.cpp (85%) rename {util => src/util}/system/platform.cpp (100%) rename {util => src/util}/system/platform.h (100%) rename {util => src/util}/system/platform_ut.cpp (94%) rename {util => src/util}/system/progname.cpp (85%) rename {util => src/util}/system/progname.h (89%) rename {util => src/util}/system/progname_ut.cpp (90%) rename {util => src/util}/system/protect.cpp (98%) rename {util => src/util}/system/protect.h (95%) rename {util => src/util}/system/rusage.cpp (98%) rename {util => src/util}/system/rusage.h (83%) rename {util => src/util}/system/rusage_ut.cpp (77%) rename {util => src/util}/system/rwlock.cpp (99%) rename {util => src/util}/system/rwlock.h (98%) rename {util => src/util}/system/rwlock_ut.cpp (96%) rename {util => src/util}/system/sanitizers.cpp (100%) rename {util => src/util}/system/sanitizers.h (100%) rename {util => src/util}/system/sanitizers_ut.cpp (86%) rename {util => src/util}/system/sem.cpp (98%) rename {util => src/util}/system/sem.h (96%) rename {util => src/util}/system/shellcommand.cpp (98%) rename {util => src/util}/system/shellcommand.h (98%) rename {util => src/util}/system/shellcommand_ut.cpp (97%) rename {util => src/util}/system/shmat.cpp (99%) rename {util => src/util}/system/shmat.h (86%) rename {util => src/util}/system/shmat_ut.cpp (86%) rename {util => src/util}/system/sigset.cpp (100%) rename {util => src/util}/system/sigset.h (100%) rename {util => src/util}/system/spin_wait.cpp (91%) rename {util => src/util}/system/spin_wait.h (100%) rename {util => src/util}/system/spinlock.cpp (100%) rename {util => src/util}/system/spinlock.h (100%) rename {util => src/util}/system/spinlock_ut.cpp (94%) rename {util => src/util}/system/src_location.cpp (88%) rename {util => src/util}/system/src_location.h (100%) rename {util => src/util}/system/src_location_ut.cpp (66%) rename {util => src/util}/system/src_root.h (100%) rename {util => src/util}/system/src_root_ut.cpp (95%) rename {util => src/util}/system/sys_alloc.cpp (100%) rename {util => src/util}/system/sys_alloc.h (95%) rename {util => src/util}/system/sysstat.cpp (100%) rename {util => src/util}/system/sysstat.h (100%) rename {util => src/util}/system/tempfile.cpp (100%) rename {util => src/util}/system/tempfile.h (97%) rename {util => src/util}/system/tempfile_ut.cpp (96%) rename {util => src/util}/system/thread.cpp (98%) rename {util => src/util}/system/thread.h (97%) rename {util => src/util}/system/thread.i (96%) rename {util => src/util}/system/thread_ut.cpp (99%) rename {util => src/util}/system/tls.cpp (98%) rename {util => src/util}/system/tls.h (99%) rename {util => src/util}/system/tls_ut.cpp (95%) rename {util => src/util}/system/type_name.cpp (100%) rename {util => src/util}/system/type_name.h (95%) rename {util => src/util}/system/type_name_ut.cpp (98%) rename {util => src/util}/system/types.cpp (88%) rename {util => src/util}/system/types.h (100%) rename {util => src/util}/system/types.pxd (86%) rename {util => src/util}/system/types_ut.cpp (92%) rename {util => src/util}/system/types_ut.pyx (100%) rename {util => src/util}/system/unaligned_mem.cpp (100%) rename {util => src/util}/system/unaligned_mem.h (100%) rename {util => src/util}/system/unaligned_mem_ut.cpp (95%) rename {util => src/util}/system/user.cpp (97%) rename {util => src/util}/system/user.h (55%) rename {util => src/util}/system/user_ut.cpp (71%) rename {util => src/util}/system/ut/stdin_osfhandle/main.cpp (100%) rename {util => src/util}/system/ut/stdin_osfhandle/ya.make (100%) rename {util => src/util}/system/ut/ya.make (95%) rename {util => src/util}/system/ut_cython/test_system.py (100%) rename {util => src/util}/system/ut_cython/ya.make (85%) rename {util => src/util}/system/utime.cpp (100%) rename {util => src/util}/system/utime.h (100%) rename {util => src/util}/system/valgrind.cpp (100%) rename {util => src/util}/system/valgrind.h (100%) rename {util => src/util}/system/win_undef.h (95%) rename {util => src/util}/system/winint.cpp (100%) rename {util => src/util}/system/winint.h (55%) rename {util => src/util}/system/yassert.cpp (95%) rename {util => src/util}/system/yassert.h (100%) rename {util => src/util}/system/yassert_ut.cpp (95%) rename {util => src/util}/system/yield.cpp (100%) rename {util => src/util}/system/yield.h (100%) rename {util => src/util}/thread/factory.cpp (96%) rename {util => src/util}/thread/factory.h (97%) rename {util => src/util}/thread/factory_ut.cpp (95%) rename {util => src/util}/thread/fwd.cpp (100%) rename {util => src/util}/thread/fwd.h (100%) rename {util => src/util}/thread/pool.cpp (97%) rename {util => src/util}/thread/pool.h (98%) rename {util => src/util}/thread/pool_ut.cpp (97%) rename {util => src/util}/thread/singleton.cpp (100%) rename {util => src/util}/thread/singleton.h (90%) rename {util => src/util}/thread/singleton_ut.cpp (87%) rename {util => src/util}/thread/ut/ya.make (86%) rename {util => src/util}/ysafeptr.cpp (100%) rename {util => src/util}/ysafeptr.h (98%) rename {util => src/util}/ysaveload.cpp (95%) rename {util => src/util}/ysaveload.h (98%) rename {util => src/util}/ysaveload_ut.cpp (98%) create mode 100644 src/yson_value/CMakeLists.txt rename {ydb/public/lib => src}/yson_value/ydb_yson_value.cpp (98%) rename {ydb/public/lib => src}/yson_value/ydb_yson_value.h (65%) create mode 100644 tests/library/CMakeLists.txt create mode 100644 tests/library/login/CMakeLists.txt rename {ydb => tests}/library/login/login_ut.cpp (99%) create mode 100644 tests/library/operation_id/CMakeLists.txt rename {ydb/public/lib => tests/library}/operation_id/operation_id_ut.cpp (97%) create mode 100644 tests/library/yql/CMakeLists.txt rename {ydb/library/yql/utils => tests/library/yql}/utf8_ut.cpp (98%) rename {ydb/library/yql/public/issue => tests/library/yql}/yql_issue_ut.cpp (96%) delete mode 100644 util/CMakeLists.txt delete mode 100644 util/charset/CMakeLists.txt delete mode 100644 util/charset/ut/ya.make delete mode 100644 util/digest/multi.pxd delete mode 100644 ydb/CMakeLists.txt delete mode 100644 ydb/library/CMakeLists.txt delete mode 100644 ydb/library/login/CMakeLists.txt delete mode 100644 ydb/library/login/ut/CMakeLists.txt delete mode 100644 ydb/library/security/CMakeLists.txt delete mode 100644 ydb/library/uuid/CMakeLists.txt delete mode 100644 ydb/library/yql/public/decimal/ut/CMakeLists.txt delete mode 100644 ydb/library/yql/public/issue/ut/CMakeLists.txt delete mode 100644 ydb/library/yql/utils/ut/CMakeLists.txt delete mode 100644 ydb/library/yverify_stream/CMakeLists.txt delete mode 100644 ydb/library/yverify_stream/yverify_stream.h delete mode 100644 ydb/public/CMakeLists.txt delete mode 100644 ydb/public/api/client/yc_private/iam/CMakeLists.txt delete mode 100644 ydb/public/api/grpc/CMakeLists.txt delete mode 100644 ydb/public/api/grpc/draft/CMakeLists.txt delete mode 100644 ydb/public/api/proto_output/CMakeLists.txt delete mode 100644 ydb/public/api/protos/CMakeLists.txt delete mode 100644 ydb/public/api/protos/annotations/ya.make delete mode 100644 ydb/public/lib/CMakeLists.txt delete mode 100644 ydb/public/lib/README.md delete mode 100644 ydb/public/lib/jwt/CMakeLists.txt delete mode 100644 ydb/public/lib/operation_id/CMakeLists.txt delete mode 100644 ydb/public/lib/operation_id/ut/CMakeLists.txt delete mode 100644 ydb/public/lib/yson_value/CMakeLists.txt diff --git a/.gitignore b/.gitignore index 3b9618ac4ea..8f5b5e314c8 100644 --- a/.gitignore +++ b/.gitignore @@ -55,20 +55,20 @@ __pycache__/ *.kdev4 # Other symlinks -util/all_datetime.cpp -util/all_digest.cpp -util/all_folder.cpp -util/all_generic.cpp -util/all_memory.cpp -util/all_network.cpp -util/all_random.cpp -util/all_stream.cpp -util/all_string.cpp -util/all_system_1.cpp -util/all_system_2.cpp -util/all_thread.cpp -util/all_util.cpp -util/charset/all_charset.cpp +src/util/all_datetime.cpp +src/util/all_digest.cpp +src/util/all_folder.cpp +src/util/all_generic.cpp +src/util/all_memory.cpp +src/util/all_network.cpp +src/util/all_random.cpp +src/util/all_stream.cpp +src/util/all_string.cpp +src/util/all_system_1.cpp +src/util/all_system_2.cpp +src/util/all_thread.cpp +src/util/all_util.cpp +src/util/charset/all_charset.cpp cmake-build-debug llvm.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 6706800a722..3c7d19189f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,9 +5,7 @@ set(BUILD_SHARED_LIBS Off) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED On) set(CMAKE_CXX_EXTENSIONS On) -set(YDB_MAX_LINK_JOBS 5 CACHE STRING "Maximum parallel link jobs for Ninja generator") -set_property(GLOBAL PROPERTY JOB_POOLS link_jobs=${YDB_MAX_LINK_JOBS}) -set(CMAKE_JOB_POOL_LINK link_jobs) + set(YDB_SDK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(YDB_SDK_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) @@ -16,10 +14,6 @@ include_directories(${YDB_SDK_SOURCE_DIR} ${YDB_SDK_BINARY_DIR}) list(APPEND CMAKE_CTEST_ARGUMENTS "--output-on-failure") enable_testing() -# Disable 'empty CUDA_ARCHITECTURES not allowed' warning -# Can't set it in cuda.cmake because of CMake policy subdirectory stack rules -cmake_policy(SET CMP0104 OLD) - include(cmake/common.cmake) include(cmake/global_flags.cmake) include(cmake/protobuf.cmake) @@ -29,9 +23,6 @@ include(cmake/testing.cmake) add_subdirectory(tools) add_subdirectory(contrib) -add_subdirectory(library) -add_subdirectory(util) -add_subdirectory(ydb) -add_subdirectory(client) +add_subdirectory(src) add_subdirectory(examples) add_subdirectory(tests) diff --git a/client/impl/ydb_internal/db_driver_state/CMakeLists.txt b/client/impl/ydb_internal/db_driver_state/CMakeLists.txt deleted file mode 100644 index 5b85de405d2..00000000000 --- a/client/impl/ydb_internal/db_driver_state/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -add_library(impl-ydb_internal-db_driver_state) - -target_link_libraries(impl-ydb_internal-db_driver_state PUBLIC - yutil - cpp-string_utils-quote - cpp-threading-future - client-impl-ydb_endpoints - impl-ydb_internal-logger - impl-ydb_internal-plain_status - client-ydb_types-credentials -) - -target_sources(impl-ydb_internal-db_driver_state PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/db_driver_state/authenticator.cpp - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/db_driver_state/endpoint_pool.cpp - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/db_driver_state/state.cpp -) - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) -target_link_libraries(impl-ydb_internal-db_driver_state PUBLIC - -) -endif() diff --git a/client/ydb_federated_topic/impl/CMakeLists.txt b/client/ydb_federated_topic/impl/CMakeLists.txt deleted file mode 100644 index 18fc59377c7..00000000000 --- a/client/ydb_federated_topic/impl/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -add_library(client-ydb_federated_topic-impl) - -target_link_libraries(client-ydb_federated_topic-impl PUBLIC - yutil - library-grpc-client - cpp-monlib-dynamic_counters - cpp-monlib-metrics - cpp-string_utils-url - library-persqueue-obfuscate - api-grpc-draft - api-grpc - impl-ydb_internal-make_request - client-ydb_common_client-impl - cpp-client-ydb_driver - client-ydb_persqueue_core-impl - cpp-client-ydb_proto -) - -target_sources(client-ydb_federated_topic-impl PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_federated_topic/impl/federated_read_session.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_federated_topic/impl/federated_read_session_event.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_federated_topic/impl/federated_write_session.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_federated_topic/impl/federated_topic_impl.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_federated_topic/impl/federated_topic.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_federated_topic/impl/federation_observer.cpp -) - - diff --git a/client/ydb_persqueue_core/impl/CMakeLists.txt b/client/ydb_persqueue_core/impl/CMakeLists.txt deleted file mode 100644 index cea9199262a..00000000000 --- a/client/ydb_persqueue_core/impl/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -add_library(client-ydb_persqueue_core-impl) - -target_link_libraries(client-ydb_persqueue_core-impl PUBLIC - yutil - cpp-containers-disjoint_interval_tree - library-grpc-client - cpp-monlib-dynamic_counters - cpp-monlib-metrics - cpp-string_utils-url - library-persqueue-obfuscate - api-grpc-draft - impl-ydb_internal-make_request - client-ydb_common_client-impl - cpp-client-ydb_driver - cpp-string_utils-misc -) - -target_sources(client-ydb_persqueue_core-impl PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_persqueue_core/impl/read_session_messages.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_persqueue_core/impl/common.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_persqueue_core/impl/write_session.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_persqueue_core/impl/write_session_impl.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_persqueue_core/impl/read_session.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_persqueue_core/impl/persqueue.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_persqueue_core/impl/persqueue_impl.cpp -) - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - target_link_libraries(client-ydb_persqueue_core-impl PUBLIC - - ) -endif() diff --git a/client/ydb_persqueue_public/persqueue.h b/client/ydb_persqueue_public/persqueue.h deleted file mode 100644 index 3b50df14268..00000000000 --- a/client/ydb_persqueue_public/persqueue.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include diff --git a/client/ydb_topic/impl/CMakeLists.txt b/client/ydb_topic/impl/CMakeLists.txt deleted file mode 100644 index ecae660fdcb..00000000000 --- a/client/ydb_topic/impl/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -add_library(client-ydb_topic-impl) - -target_link_libraries(client-ydb_topic-impl PUBLIC - yutil - library-grpc-client - cpp-monlib-dynamic_counters - cpp-monlib-metrics - cpp-string_utils-url - library-persqueue-obfuscate - api-grpc-draft - api-grpc - impl-ydb_internal-make_request - client-ydb_common_client-impl - cpp-client-ydb_driver - client-ydb_persqueue_core-impl - cpp-client-ydb_proto - proto_output -) - -target_sources(client-ydb_topic-impl PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/impl/executor.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/impl/read_session_event.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/impl/counters.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/impl/deferred_commit.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/impl/event_handlers.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/impl/read_session.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/impl/write_session.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/impl/write_session_impl.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/impl/topic_impl.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/impl/topic.cpp -) - - diff --git a/client/ydb_topic/ut/CMakeLists.txt b/client/ydb_topic/ut/CMakeLists.txt deleted file mode 100644 index d863ebd1806..00000000000 --- a/client/ydb_topic/ut/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -# 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 "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -elseif (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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -endif() diff --git a/client/ydb_topic/ut/ut_utils/CMakeLists.txt b/client/ydb_topic/ut/ut_utils/CMakeLists.txt deleted file mode 100644 index d863ebd1806..00000000000 --- a/client/ydb_topic/ut/ut_utils/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -# 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 "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -elseif (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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -endif() diff --git a/cmake/global_vars.cmake b/cmake/global_vars.cmake index e9ed5da4bb1..7ec35a5aa0d 100644 --- a/cmake/global_vars.cmake +++ b/cmake/global_vars.cmake @@ -6,12 +6,12 @@ # original buildsystem will not be accepted. -if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) +if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") set(YASM_FLAGS -f elf64 -D UNIX -D _x86_64_ -D_YASM_ -g dwarf2) set(RAGEL_FLAGS -L -I ${YDB_SDK_SOURCE_DIR}/) endif() -if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) +if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") set(RAGEL_FLAGS -L -I ${YDB_SDK_SOURCE_DIR}/) endif() @@ -24,7 +24,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm6 set(RAGEL_FLAGS -L -I ${YDB_SDK_SOURCE_DIR}/) endif() -if(WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) +if(WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") set(YASM_FLAGS -f win64 -D WIN64 -D _x86_64_ -D_YASM_) set(RAGEL_FLAGS -L -I ${YDB_SDK_SOURCE_DIR}/) endif() diff --git a/cmake/testing.cmake b/cmake/testing.cmake index d7a140de60a..19cb83d8e09 100644 --- a/cmake/testing.cmake +++ b/cmake/testing.cmake @@ -99,7 +99,7 @@ function(add_ydb_test) ${YDB_TEST_NAME} PROPERTY SPLIT_FACTOR - 10 + 1 ) add_yunittest( diff --git a/contrib/libs/libc_compat/CMakeLists.txt b/contrib/libs/libc_compat/CMakeLists.txt index d863ebd1806..4fbe9853d99 100644 --- a/contrib/libs/libc_compat/CMakeLists.txt +++ b/contrib/libs/libc_compat/CMakeLists.txt @@ -6,14 +6,14 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") 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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") include(CMakeLists.windows-x86_64.txt) endif() diff --git a/contrib/libs/libc_compat/ya.make b/contrib/libs/libc_compat/ya.make index f70b32ee29d..451530495d9 100644 --- a/contrib/libs/libc_compat/ya.make +++ b/contrib/libs/libc_compat/ya.make @@ -139,7 +139,7 @@ ENDIF() IF (PROVIDE_GETRANDOM_GETENTROPY) PEERDIR( - library/cpp/sanitizer/include + src/library/sanitizer/include ) SRCS( random/getrandom.c diff --git a/contrib/libs/lzmasdk/CMakeLists.txt b/contrib/libs/lzmasdk/CMakeLists.txt index d863ebd1806..4fbe9853d99 100644 --- a/contrib/libs/lzmasdk/CMakeLists.txt +++ b/contrib/libs/lzmasdk/CMakeLists.txt @@ -6,14 +6,14 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") 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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") include(CMakeLists.windows-x86_64.txt) endif() diff --git a/contrib/libs/nayuki_md5/CMakeLists.txt b/contrib/libs/nayuki_md5/CMakeLists.txt index d863ebd1806..4fbe9853d99 100644 --- a/contrib/libs/nayuki_md5/CMakeLists.txt +++ b/contrib/libs/nayuki_md5/CMakeLists.txt @@ -6,14 +6,14 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") 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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") include(CMakeLists.windows-x86_64.txt) endif() diff --git a/examples/basic_example/basic_example.cpp b/examples/basic_example/basic_example.cpp index 77acc12bf19..3ca85b081c9 100644 --- a/examples/basic_example/basic_example.cpp +++ b/examples/basic_example/basic_example.cpp @@ -1,6 +1,6 @@ #include "basic_example.h" -#include +#include #include diff --git a/examples/basic_example/basic_example.h b/examples/basic_example/basic_example.h index bf0cb784c1e..80d6f865c1b 100644 --- a/examples/basic_example/basic_example.h +++ b/examples/basic_example/basic_example.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include NYdb::TParams GetTablesDataParams(); diff --git a/examples/basic_example/main.cpp b/examples/basic_example/main.cpp index 9c4e2ec8d35..571f10eb166 100644 --- a/examples/basic_example/main.cpp +++ b/examples/basic_example/main.cpp @@ -1,8 +1,8 @@ #include "basic_example.h" -#include +#include -#include +#include #include diff --git a/examples/bulk_upsert_simple/main.cpp b/examples/bulk_upsert_simple/main.cpp index 1da60cde20e..6f920ba09f1 100644 --- a/examples/bulk_upsert_simple/main.cpp +++ b/examples/bulk_upsert_simple/main.cpp @@ -1,8 +1,8 @@ -#include +#include -#include +#include -#include +#include constexpr size_t BATCH_SIZE = 1000; diff --git a/examples/pagination/main.cpp b/examples/pagination/main.cpp index 5345f5b83fa..1906666c33d 100644 --- a/examples/pagination/main.cpp +++ b/examples/pagination/main.cpp @@ -1,6 +1,6 @@ #include "pagination.h" -#include +#include using namespace NLastGetopt; using namespace NYdb; diff --git a/examples/pagination/pagination.cpp b/examples/pagination/pagination.cpp index 1feb8e9a7f8..0f590cf0c37 100644 --- a/examples/pagination/pagination.cpp +++ b/examples/pagination/pagination.cpp @@ -1,6 +1,6 @@ #include "pagination.h" -#include +#include using namespace NYdb; using namespace NYdb::NTable; diff --git a/examples/pagination/pagination.h b/examples/pagination/pagination.h index bf0cb784c1e..80d6f865c1b 100644 --- a/examples/pagination/pagination.h +++ b/examples/pagination/pagination.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include NYdb::TParams GetTablesDataParams(); diff --git a/examples/secondary_index/secondary_index.cpp b/examples/secondary_index/secondary_index.cpp index 19672ef33ba..78353bee51f 100644 --- a/examples/secondary_index/secondary_index.cpp +++ b/examples/secondary_index/secondary_index.cpp @@ -1,6 +1,6 @@ #include "secondary_index.h" -#include +#include std::string GetCmdList() { return "create_tables, drop_tables, update_views, list, generate, delete"; diff --git a/examples/secondary_index/secondary_index.h b/examples/secondary_index/secondary_index.h index 13fafac685b..17e38bc9bcd 100644 --- a/examples/secondary_index/secondary_index.h +++ b/examples/secondary_index/secondary_index.h @@ -1,9 +1,9 @@ #pragma once -#include -#include +#include +#include -#include +#include //////////////////////////////////////////////////////////////////////////////// diff --git a/examples/secondary_index/secondary_index_generate.cpp b/examples/secondary_index/secondary_index_generate.cpp index d40696005d8..a56043f2b9e 100644 --- a/examples/secondary_index/secondary_index_generate.cpp +++ b/examples/secondary_index/secondary_index_generate.cpp @@ -1,7 +1,7 @@ #include "secondary_index.h" -#include -#include +#include +#include using namespace NLastGetopt; using namespace NYdb; diff --git a/examples/secondary_index/secondary_index_list.cpp b/examples/secondary_index/secondary_index_list.cpp index 1f09a06c648..4f802e755fd 100644 --- a/examples/secondary_index/secondary_index_list.cpp +++ b/examples/secondary_index/secondary_index_list.cpp @@ -1,6 +1,6 @@ #include "secondary_index.h" -#include +#include using namespace NLastGetopt; using namespace NYdb; diff --git a/examples/secondary_index_builtin/secondary_index.cpp b/examples/secondary_index_builtin/secondary_index.cpp index 55246832109..c068a83b9b8 100644 --- a/examples/secondary_index_builtin/secondary_index.cpp +++ b/examples/secondary_index_builtin/secondary_index.cpp @@ -1,6 +1,6 @@ #include "secondary_index.h" -#include +#include TCommand Parse(const char * stringCmd) { diff --git a/examples/secondary_index_builtin/secondary_index.h b/examples/secondary_index_builtin/secondary_index.h index 20a09391f80..4e1a3b499d1 100644 --- a/examples/secondary_index_builtin/secondary_index.h +++ b/examples/secondary_index_builtin/secondary_index.h @@ -1,13 +1,13 @@ #pragma once -#include -#include +#include +#include -#include +#include #include -#include -#include -#include +#include +#include +#include #define TABLE_USERS "users" #define TABLE_SERIES "series" diff --git a/examples/secondary_index_builtin/secondary_index_fill.cpp b/examples/secondary_index_builtin/secondary_index_fill.cpp index 2da26052630..cf17fce85da 100644 --- a/examples/secondary_index_builtin/secondary_index_fill.cpp +++ b/examples/secondary_index_builtin/secondary_index_fill.cpp @@ -1,6 +1,6 @@ #include "secondary_index.h" -#include +#include using namespace NYdb; using namespace NYdb::NTable; diff --git a/examples/topic_reader/eventloop/main.cpp b/examples/topic_reader/eventloop/main.cpp index 1cf0dae7834..a813685a8a1 100644 --- a/examples/topic_reader/eventloop/main.cpp +++ b/examples/topic_reader/eventloop/main.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include struct TOptions { std::string Endpoint; diff --git a/examples/topic_reader/simple/main.cpp b/examples/topic_reader/simple/main.cpp index 5cf1fca585e..4ef20e004d8 100644 --- a/examples/topic_reader/simple/main.cpp +++ b/examples/topic_reader/simple/main.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include struct TOptions { std::string Endpoint; diff --git a/examples/topic_reader/transaction/application.h b/examples/topic_reader/transaction/application.h index 5aa5fa234d1..3bcfc072d04 100644 --- a/examples/topic_reader/transaction/application.h +++ b/examples/topic_reader/transaction/application.h @@ -2,9 +2,9 @@ #include "options.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/examples/topic_reader/transaction/main.cpp b/examples/topic_reader/transaction/main.cpp index f3af9a2a0b6..0c895aae80e 100644 --- a/examples/topic_reader/transaction/main.cpp +++ b/examples/topic_reader/transaction/main.cpp @@ -1,7 +1,7 @@ #include "application.h" #include "options.h" -#include +#include #include diff --git a/examples/topic_reader/transaction/options.cpp b/examples/topic_reader/transaction/options.cpp index 2fc95d36979..9795b039434 100644 --- a/examples/topic_reader/transaction/options.cpp +++ b/examples/topic_reader/transaction/options.cpp @@ -1,5 +1,5 @@ #include "options.h" -#include +#include TOptions::TOptions(int argc, const char* argv[]) { diff --git a/examples/topic_reader/transaction/options.h b/examples/topic_reader/transaction/options.h index ec1901c6d6c..12df50c4ecf 100644 --- a/examples/topic_reader/transaction/options.h +++ b/examples/topic_reader/transaction/options.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/examples/ttl/main.cpp b/examples/ttl/main.cpp index 1d98c1c01d2..bf02375b1f9 100644 --- a/examples/ttl/main.cpp +++ b/examples/ttl/main.cpp @@ -1,6 +1,6 @@ #include "ttl.h" -#include +#include using namespace NLastGetopt; using namespace NYdb; diff --git a/examples/ttl/ttl.h b/examples/ttl/ttl.h index bf0cb784c1e..80d6f865c1b 100644 --- a/examples/ttl/ttl.h +++ b/examples/ttl/ttl.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include NYdb::TParams GetTablesDataParams(); diff --git a/examples/ttl/util.h b/examples/ttl/util.h index 4971dedea7e..ec2c2f91996 100644 --- a/examples/ttl/util.h +++ b/examples/ttl/util.h @@ -1,9 +1,9 @@ #pragma once -#include +#include -#include -#include +#include +#include namespace NExample { diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt deleted file mode 100644 index 95ff6b8ebf1..00000000000 --- a/library/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ - -# 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(cpp) diff --git a/library/cpp/blockcodecs/codecs.h b/library/cpp/blockcodecs/codecs.h deleted file mode 100644 index fd499b54b0d..00000000000 --- a/library/cpp/blockcodecs/codecs.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include diff --git a/library/cpp/blockcodecs/stream.h b/library/cpp/blockcodecs/stream.h deleted file mode 100644 index 96c479cf7e1..00000000000 --- a/library/cpp/blockcodecs/stream.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include diff --git a/library/cpp/build_info/CMakeLists.txt b/library/cpp/build_info/CMakeLists.txt deleted file mode 100644 index 4f5fd582414..00000000000 --- a/library/cpp/build_info/CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ -find_package(Python3 REQUIRED) -set( - KOSHER_SVN_VERSION - -) -set( - SANDBOX_TASK_ID - 0 -) -set( - BUILD_TYPE - RELEASE -) - -add_library(library-cpp-build_info) -target_include_directories(library-cpp-build_info PUBLIC - ${YDB_SDK_BINARY_DIR}/library/cpp/build_info -) -target_link_libraries(library-cpp-build_info PUBLIC - yutil - cpp-string_utils-base64 -) -target_sources(library-cpp-build_info PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/build_info/build_info_static.cpp - ${YDB_SDK_BINARY_DIR}/library/cpp/build_info/buildinfo_data.h - ${YDB_SDK_BINARY_DIR}/library/cpp/build_info/sandbox.cpp - ${YDB_SDK_BINARY_DIR}/library/cpp/build_info/build_info.cpp -) -add_custom_command( - OUTPUT - ${YDB_SDK_BINARY_DIR}/library/cpp/build_info/buildinfo_data.h - DEPENDS - ${YDB_SDK_SOURCE_DIR}/scripts/build_info_gen.py - COMMAND - Python3::Interpreter - ${YDB_SDK_SOURCE_DIR}/scripts/build_info_gen.py - ${YDB_SDK_BINARY_DIR}/library/cpp/build_info/buildinfo_data.h - \"${CMAKE_CXX_COMPILER}\" - \"${CMAKE_CXX_FLAGS}\" -) -configure_file( - ${YDB_SDK_SOURCE_DIR}/library/cpp/build_info/sandbox.cpp.in - ${YDB_SDK_BINARY_DIR}/library/cpp/build_info/sandbox.cpp -) -configure_file( - ${YDB_SDK_SOURCE_DIR}/library/cpp/build_info/build_info.cpp.in - ${YDB_SDK_BINARY_DIR}/library/cpp/build_info/build_info.cpp -) diff --git a/library/cpp/charset/lite/CMakeLists.txt b/library/cpp/charset/lite/CMakeLists.txt deleted file mode 100644 index 56c345a6ca9..00000000000 --- a/library/cpp/charset/lite/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -add_library(cpp-charset-lite) - -target_link_libraries(cpp-charset-lite PUBLIC - cpp-string_utils-misc - yutil -) - -target_sources(cpp-charset-lite PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/charset/generated/cp_data.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/charset/generated/encrec_data.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/charset/codepage.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/charset/cp_encrec.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/charset/doccodes.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/charset/ci_string.cpp -) diff --git a/library/cpp/containers/disjoint_interval_tree/ut/ya.make b/library/cpp/containers/disjoint_interval_tree/ut/ya.make deleted file mode 100644 index b4ccc419176..00000000000 --- a/library/cpp/containers/disjoint_interval_tree/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/containers/disjoint_interval_tree) - -SRCS( - disjoint_interval_tree_ut.cpp -) - -END() diff --git a/library/cpp/containers/intrusive_rb_tree/ut/ya.make b/library/cpp/containers/intrusive_rb_tree/ut/ya.make deleted file mode 100644 index db8d6f0a723..00000000000 --- a/library/cpp/containers/intrusive_rb_tree/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/containers/intrusive_rb_tree) - -SRCS( - rb_tree_ut.cpp -) - -END() diff --git a/library/cpp/coroutine/engine/CMakeLists.txt b/library/cpp/coroutine/engine/CMakeLists.txt deleted file mode 100644 index 36da311a12a..00000000000 --- a/library/cpp/coroutine/engine/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -add_library(cpp-coroutine-engine) - -target_link_libraries(cpp-coroutine-engine PUBLIC - yutil - tools-enum_parser-enum_serialization_runtime - contrib-libs-libc_compat - cpp-containers-intrusive_rb_tree - cpp-deprecated-atomic -) - -target_sources(cpp-coroutine-engine PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/cont_poller.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/helper.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/impl.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/iostatus.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/network.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/poller.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/sockpool.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/stack/stack.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/stack/stack_allocator.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/stack/stack_guards.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/stack/stack_storage.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/stack/stack_utils.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/trampoline.cpp -) - -generate_enum_serilization(cpp-coroutine-engine - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/poller.h - INCLUDE_HEADERS - library/cpp/coroutine/engine/poller.h -) - -generate_enum_serilization(cpp-coroutine-engine - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/engine/stack/stack_common.h - INCLUDE_HEADERS - library/cpp/coroutine/engine/stack/stack_common.h -) - - diff --git a/library/cpp/coroutine/engine/ut/ya.make b/library/cpp/coroutine/engine/ut/ya.make deleted file mode 100644 index 450c3bdd7c9..00000000000 --- a/library/cpp/coroutine/engine/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/coroutine/engine) - -SRCS( - coroutine_ut.cpp -) - -END() diff --git a/library/cpp/deprecated/atomic/ut/ya.make b/library/cpp/deprecated/atomic/ut/ya.make deleted file mode 100644 index e21fd089904..00000000000 --- a/library/cpp/deprecated/atomic/ut/ya.make +++ /dev/null @@ -1,5 +0,0 @@ -UNITTEST_FOR(library/cpp/deprecated/atomic) - -SRCS(atomic_ut.cpp) - -END() diff --git a/library/cpp/digest/argonish/internal/proxies/avx2/proxy_avx2.cpp b/library/cpp/digest/argonish/internal/proxies/avx2/proxy_avx2.cpp deleted file mode 100644 index c1cf004f58c..00000000000 --- a/library/cpp/digest/argonish/internal/proxies/avx2/proxy_avx2.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// -// Created by Evgeny Sidorov on 12/04/17. -// - -#include "proxy_avx2.h" -#include -#include -#include -#include - -#define ZEROUPPER _mm256_zeroupper(); - -namespace NArgonish { - ARGON2_PROXY_CLASS_IMPL(AVX2) - BLAKE2B_PROXY_CLASS_IMPL(AVX2) -} - -#undef ZEROUPPER diff --git a/library/cpp/digest/argonish/internal/proxies/avx2/proxy_avx2.h b/library/cpp/digest/argonish/internal/proxies/avx2/proxy_avx2.h deleted file mode 100644 index eec0094563d..00000000000 --- a/library/cpp/digest/argonish/internal/proxies/avx2/proxy_avx2.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -namespace NArgonish { - ARGON2_PROXY_CLASS_DECL(AVX2) - BLAKE2B_PROXY_CLASS_DECL(AVX2) -} diff --git a/library/cpp/digest/argonish/internal/proxies/ref/proxy_ref.cpp b/library/cpp/digest/argonish/internal/proxies/ref/proxy_ref.cpp deleted file mode 100644 index 0bc51866fdf..00000000000 --- a/library/cpp/digest/argonish/internal/proxies/ref/proxy_ref.cpp +++ /dev/null @@ -1,20 +0,0 @@ -// -// Created by Evgeny Sidorov on 12/04/17. -// - -#include "proxy_ref.h" -#include -#include -#include -#include - -#include - -#define ZEROUPPER ; - -namespace NArgonish { - ARGON2_PROXY_CLASS_IMPL(REF) - BLAKE2B_PROXY_CLASS_IMPL(REF) -} - -#undef ZEROUPPER diff --git a/library/cpp/digest/argonish/internal/proxies/ref/proxy_ref.h b/library/cpp/digest/argonish/internal/proxies/ref/proxy_ref.h deleted file mode 100644 index 821abc50cd2..00000000000 --- a/library/cpp/digest/argonish/internal/proxies/ref/proxy_ref.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -namespace NArgonish { - ARGON2_PROXY_CLASS_DECL(REF) - BLAKE2B_PROXY_CLASS_DECL(REF) -} diff --git a/library/cpp/digest/argonish/internal/proxies/sse2/proxy_sse2.cpp b/library/cpp/digest/argonish/internal/proxies/sse2/proxy_sse2.cpp deleted file mode 100644 index 3e63c9ad621..00000000000 --- a/library/cpp/digest/argonish/internal/proxies/sse2/proxy_sse2.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// -// Created by Evgeny Sidorov on 12/04/17. -// - -#include "proxy_sse2.h" -#include -#include -#include -#include - -#define ZEROUPPER ; - -namespace NArgonish { - ARGON2_PROXY_CLASS_IMPL(SSE2) - BLAKE2B_PROXY_CLASS_IMPL(SSE2) -} - -#undef ZEROUPPER diff --git a/library/cpp/digest/argonish/internal/proxies/sse2/proxy_sse2.h b/library/cpp/digest/argonish/internal/proxies/sse2/proxy_sse2.h deleted file mode 100644 index a2b74cd9a73..00000000000 --- a/library/cpp/digest/argonish/internal/proxies/sse2/proxy_sse2.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -namespace NArgonish { - ARGON2_PROXY_CLASS_DECL(SSE2) - BLAKE2B_PROXY_CLASS_DECL(SSE2) -} diff --git a/library/cpp/digest/argonish/internal/proxies/sse41/proxy_sse41.cpp b/library/cpp/digest/argonish/internal/proxies/sse41/proxy_sse41.cpp deleted file mode 100644 index b633ad8cbf1..00000000000 --- a/library/cpp/digest/argonish/internal/proxies/sse41/proxy_sse41.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// -// Created by Evgeny Sidorov on 12/04/17. -// - -#include "proxy_sse41.h" -#include -#include -#include -#include - -#define ZEROUPPER ; - -namespace NArgonish { - ARGON2_PROXY_CLASS_IMPL(SSE41) - BLAKE2B_PROXY_CLASS_IMPL(SSE41) -} - -#undef ZEROUPPER diff --git a/library/cpp/digest/argonish/internal/proxies/sse41/proxy_sse41.h b/library/cpp/digest/argonish/internal/proxies/sse41/proxy_sse41.h deleted file mode 100644 index 2a4b6614aa3..00000000000 --- a/library/cpp/digest/argonish/internal/proxies/sse41/proxy_sse41.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -namespace NArgonish { - ARGON2_PROXY_CLASS_DECL(SSE41) - BLAKE2B_PROXY_CLASS_DECL(SSE41) -} diff --git a/library/cpp/digest/argonish/internal/proxies/ssse3/proxy_ssse3.cpp b/library/cpp/digest/argonish/internal/proxies/ssse3/proxy_ssse3.cpp deleted file mode 100644 index d77b55737cc..00000000000 --- a/library/cpp/digest/argonish/internal/proxies/ssse3/proxy_ssse3.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// -// Created by Evgeny Sidorov on 12/04/17. -// - -#include "proxy_ssse3.h" -#include -#include -#include -#include - -#define ZEROUPPER ; - -namespace NArgonish { - ARGON2_PROXY_CLASS_IMPL(SSSE3) - BLAKE2B_PROXY_CLASS_IMPL(SSSE3) -} - -#undef ZEROUPPER diff --git a/library/cpp/digest/argonish/internal/proxies/ssse3/proxy_ssse3.h b/library/cpp/digest/argonish/internal/proxies/ssse3/proxy_ssse3.h deleted file mode 100644 index 994133e88e9..00000000000 --- a/library/cpp/digest/argonish/internal/proxies/ssse3/proxy_ssse3.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -namespace NArgonish { - ARGON2_PROXY_CLASS_DECL(SSSE3) - BLAKE2B_PROXY_CLASS_DECL(SSSE3) -} diff --git a/library/cpp/digest/argonish/ut/ya.make b/library/cpp/digest/argonish/ut/ya.make deleted file mode 100644 index 38d41702d21..00000000000 --- a/library/cpp/digest/argonish/ut/ya.make +++ /dev/null @@ -1,11 +0,0 @@ -UNITTEST_FOR(library/cpp/digest/argonish) - -PEERDIR( - library/cpp/digest/argonish -) - -SRCS( - ut.cpp -) - -END() diff --git a/library/cpp/digest/lower_case/CMakeLists.txt b/library/cpp/digest/lower_case/CMakeLists.txt deleted file mode 100644 index 8f9ae26c929..00000000000 --- a/library/cpp/digest/lower_case/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_library(cpp-digest-lower_case) - -target_link_libraries(cpp-digest-lower_case PUBLIC - yutil -) - -target_sources(cpp-digest-lower_case PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/digest/lower_case/lciter.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/digest/lower_case/lchash.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/digest/lower_case/hash_ops.cpp -) diff --git a/library/cpp/digest/md5/ut/ya.make b/library/cpp/digest/md5/ut/ya.make deleted file mode 100644 index 76b61b4b196..00000000000 --- a/library/cpp/digest/md5/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/digest/md5) - -SRCS( - md5_ut.cpp -) - -END() diff --git a/library/cpp/digest/murmur/ut/ya.make b/library/cpp/digest/murmur/ut/ya.make deleted file mode 100644 index de14ca6fb6b..00000000000 --- a/library/cpp/digest/murmur/ut/ya.make +++ /dev/null @@ -1,13 +0,0 @@ -UNITTEST() - -PEERDIR( - ADDINCL library/cpp/digest/murmur -) - -SRCDIR(library/cpp/digest/murmur) - -SRCS( - murmur_ut.cpp -) - -END() diff --git a/library/cpp/getopt/last_getopt.h b/library/cpp/getopt/last_getopt.h deleted file mode 100644 index d14f05cc5b3..00000000000 --- a/library/cpp/getopt/last_getopt.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include diff --git a/library/cpp/getopt/last_getopt_support.h b/library/cpp/getopt/last_getopt_support.h deleted file mode 100644 index b71c7045b18..00000000000 --- a/library/cpp/getopt/last_getopt_support.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include diff --git a/library/cpp/getopt/modchooser.h b/library/cpp/getopt/modchooser.h deleted file mode 100644 index 9bf73daf134..00000000000 --- a/library/cpp/getopt/modchooser.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include diff --git a/library/cpp/getopt/opt.h b/library/cpp/getopt/opt.h deleted file mode 100644 index d2a85075bd5..00000000000 --- a/library/cpp/getopt/opt.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include diff --git a/library/cpp/getopt/opt2.h b/library/cpp/getopt/opt2.h deleted file mode 100644 index 2d35bc7b292..00000000000 --- a/library/cpp/getopt/opt2.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include diff --git a/library/cpp/getopt/posix_getopt.h b/library/cpp/getopt/posix_getopt.h deleted file mode 100644 index 8cb7ece624a..00000000000 --- a/library/cpp/getopt/posix_getopt.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include diff --git a/library/cpp/getopt/small/CMakeLists.txt b/library/cpp/getopt/small/CMakeLists.txt deleted file mode 100644 index 16054633839..00000000000 --- a/library/cpp/getopt/small/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -add_library(cpp-getopt-small) - -target_link_libraries(cpp-getopt-small PUBLIC - yutil - library-cpp-colorizer - cpp-string_utils-misc - ) - -target_sources(cpp-getopt-small PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/completer.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/completer_command.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/completion_generator.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/formatted_output.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/last_getopt.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/last_getopt_easy_setup.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/last_getopt_opt.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/last_getopt_opts.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/last_getopt_parser.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/last_getopt_parse_result.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/modchooser.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/opt.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/opt2.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/posix_getopt.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/wrap.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/small/ygetopt.cpp -) - - - diff --git a/library/cpp/getopt/ygetopt.h b/library/cpp/getopt/ygetopt.h deleted file mode 100644 index fd018b31281..00000000000 --- a/library/cpp/getopt/ygetopt.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include diff --git a/library/cpp/http/fetch/CMakeLists.txt b/library/cpp/http/fetch/CMakeLists.txt deleted file mode 100644 index 0319e899354..00000000000 --- a/library/cpp/http/fetch/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -add_library(cpp-http-fetch) - -target_link_libraries(cpp-http-fetch PUBLIC - yutil - ZLIB::ZLIB - library-cpp-charset - cpp-digest-md5 - cpp-http-misc - library-cpp-logger - cpp-mime-types - library-cpp-uri - tools-enum_parser-enum_serialization_runtime -) - -target_sources(cpp-http-fetch PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/fetch/http_digest.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/fetch/http_socket.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/fetch/httpheader.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/fetch/httpload.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/fetch/exthttpcodes.cpp -) - -generate_enum_serilization(cpp-http-fetch - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/fetch/httpheader.h - INCLUDE_HEADERS - library/cpp/http/fetch/httpheader.h -) - -target_ragel_lexers(cpp-http-fetch - PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/fetch/httpfsm.rl6 - -CG1 -) diff --git a/library/cpp/http/server/CMakeLists.txt b/library/cpp/http/server/CMakeLists.txt deleted file mode 100644 index e4bbb3115a4..00000000000 --- a/library/cpp/http/server/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_library(cpp-http-server) - -target_link_libraries(cpp-http-server PUBLIC - yutil - cpp-http-misc - cpp-http-io - cpp-threading-equeue - cpp-deprecated-atomic -) - -target_sources(cpp-http-server PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/server/conn.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/server/http.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/server/http_ex.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/server/options.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/server/response.cpp -) - - diff --git a/library/cpp/http/simple/ut/ya.make b/library/cpp/http/simple/ut/ya.make deleted file mode 100644 index 3f77967ea67..00000000000 --- a/library/cpp/http/simple/ut/ya.make +++ /dev/null @@ -1,21 +0,0 @@ -UNITTEST_FOR(library/cpp/http/simple) - -PEERDIR( - library/cpp/http/misc - library/cpp/testing/mock_server -) - -SRCS( - http_ut.cpp - https_ut.cpp -) - -DEPENDS(library/cpp/http/simple/ut/https_server) - -DATA(arcadia/library/cpp/http/simple/ut/https_server) - -END() - -RECURSE( - https_server -) diff --git a/library/cpp/iterator/CMakeLists.txt b/library/cpp/iterator/CMakeLists.txt deleted file mode 100644 index 0d279192a5a..00000000000 --- a/library/cpp/iterator/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -add_library(library-cpp-iterator) - -target_link_libraries(library-cpp-iterator PUBLIC - yutil -) - -target_sources(library-cpp-iterator PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/iterator/cartesian_product.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/iterator/concatenate.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/iterator/enumerate.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/iterator/iterate_keys.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/iterator/iterate_values.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/iterator/filtering.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/iterator/functools.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/iterator/mapped.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/iterator/zip.cpp -) diff --git a/library/cpp/json/json_value.h b/library/cpp/json/json_value.h deleted file mode 100644 index f70f4d2ee86..00000000000 --- a/library/cpp/json/json_value.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include diff --git a/library/cpp/logger/CMakeLists.txt b/library/cpp/logger/CMakeLists.txt deleted file mode 100644 index ece38a6f695..00000000000 --- a/library/cpp/logger/CMakeLists.txt +++ /dev/null @@ -1,57 +0,0 @@ -add_library(library-cpp-logger) -target_link_libraries(library-cpp-logger PUBLIC - yutil - tools-enum_parser-enum_serialization_runtime - library-cpp-json - cpp-deprecated-atomic -) -target_sources(library-cpp-logger PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/backend.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/backend_creator.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/composite.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/element.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/file.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/filter.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/filter_creator.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/log.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/null.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/rotating_file.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/stream.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/sync_page_cache_file.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/system.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/thread.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/thread_creator.cpp -) -generate_enum_serilization(library-cpp-logger - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/priority.h - INCLUDE_HEADERS - library/cpp/logger/priority.h -) - -add_global_library_for(library-cpp-logger.global library-cpp-logger) -target_link_libraries(library-cpp-logger.global PUBLIC - yutil - tools-enum_parser-enum_serialization_runtime - library-cpp-json - cpp-deprecated-atomic -) -target_sources(library-cpp-logger.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/composite_creator.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/file_creator.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/null_creator.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/rotating_file_creator.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/stream_creator.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/sync_page_cache_file_creator.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/system_creator.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/logger/uninitialized_creator.cpp -) - - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) - target_link_libraries(library-cpp-logger PUBLIC - - ) - target_link_libraries(library-cpp-logger.global PUBLIC - - ) -endif() diff --git a/library/cpp/monlib/dynamic_counters/percentile/ut/ya.make b/library/cpp/monlib/dynamic_counters/percentile/ut/ya.make deleted file mode 100644 index f97dcbd92ea..00000000000 --- a/library/cpp/monlib/dynamic_counters/percentile/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/monlib/dynamic_counters/percentile) - - SRCS( - percentile_ut.cpp - ) - -END() diff --git a/library/cpp/monlib/dynamic_counters/ut/ya.make b/library/cpp/monlib/dynamic_counters/ut/ya.make deleted file mode 100644 index 9c272eaea10..00000000000 --- a/library/cpp/monlib/dynamic_counters/ut/ya.make +++ /dev/null @@ -1,14 +0,0 @@ -UNITTEST_FOR(library/cpp/monlib/dynamic_counters) - -SRCS( - contention_ut.cpp - counters_ut.cpp - encode_ut.cpp -) - -PEERDIR( - library/cpp/monlib/encode/protobuf - library/cpp/monlib/encode/json -) - -END() diff --git a/library/cpp/monlib/encode/buffered/ut/ya.make b/library/cpp/monlib/encode/buffered/ut/ya.make deleted file mode 100644 index 365b6e47405..00000000000 --- a/library/cpp/monlib/encode/buffered/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/monlib/encode/buffered) - -SRCS( - string_pool_ut.cpp -) - -END() diff --git a/library/cpp/monlib/encode/fuzz/ya.make b/library/cpp/monlib/encode/fuzz/ya.make deleted file mode 100644 index d9ca172bae4..00000000000 --- a/library/cpp/monlib/encode/fuzz/ya.make +++ /dev/null @@ -1,5 +0,0 @@ -RECURSE_ROOT_RELATIVE( - library/cpp/monlib/encode/json/fuzz - library/cpp/monlib/encode/prometheus/fuzz - library/cpp/monlib/encode/spack/fuzz -) diff --git a/library/cpp/monlib/encode/json/fuzz/ya.make b/library/cpp/monlib/encode/json/fuzz/ya.make deleted file mode 100644 index 545900c5c1f..00000000000 --- a/library/cpp/monlib/encode/json/fuzz/ya.make +++ /dev/null @@ -1,14 +0,0 @@ -FUZZ() - -PEERDIR( - library/cpp/monlib/encode/json - library/cpp/monlib/encode/fake -) - -SIZE(MEDIUM) - -SRCS( - main.cpp -) - -END() diff --git a/library/cpp/monlib/encode/prometheus/fuzz/ya.make b/library/cpp/monlib/encode/prometheus/fuzz/ya.make deleted file mode 100644 index 22c3ca57834..00000000000 --- a/library/cpp/monlib/encode/prometheus/fuzz/ya.make +++ /dev/null @@ -1,14 +0,0 @@ -FUZZ() - -PEERDIR( - library/cpp/monlib/encode/prometheus - library/cpp/monlib/encode/fake -) - -SIZE(MEDIUM) - -SRCS( - main.cpp -) - -END() diff --git a/library/cpp/monlib/encode/prometheus/ut/ya.make b/library/cpp/monlib/encode/prometheus/ut/ya.make deleted file mode 100644 index 735e48d05fb..00000000000 --- a/library/cpp/monlib/encode/prometheus/ut/ya.make +++ /dev/null @@ -1,12 +0,0 @@ -UNITTEST_FOR(library/cpp/monlib/encode/prometheus) - -SRCS( - prometheus_encoder_ut.cpp - prometheus_decoder_ut.cpp -) - -PEERDIR( - library/cpp/monlib/encode/protobuf -) - -END() diff --git a/library/cpp/monlib/encode/spack/ut/ya.make b/library/cpp/monlib/encode/spack/ut/ya.make deleted file mode 100644 index ff42d19b70c..00000000000 --- a/library/cpp/monlib/encode/spack/ut/ya.make +++ /dev/null @@ -1,11 +0,0 @@ -UNITTEST_FOR(library/cpp/monlib/encode/spack) - -SRCS( - spack_v1_ut.cpp -) - -PEERDIR( - library/cpp/monlib/encode/protobuf -) - -END() diff --git a/library/cpp/monlib/encode/text/ut/ya.make b/library/cpp/monlib/encode/text/ut/ya.make deleted file mode 100644 index beb40819598..00000000000 --- a/library/cpp/monlib/encode/text/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/monlib/encode/text) - -SRCS( - text_encoder_ut.cpp -) - -END() diff --git a/library/cpp/monlib/encode/ut/ya.make b/library/cpp/monlib/encode/ut/ya.make deleted file mode 100644 index 96e75d067c3..00000000000 --- a/library/cpp/monlib/encode/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/monlib/encode) - -SRCS( - format_ut.cpp -) - -END() diff --git a/library/cpp/monlib/metrics/CMakeLists.txt b/library/cpp/monlib/metrics/CMakeLists.txt deleted file mode 100644 index ef0e00d7853..00000000000 --- a/library/cpp/monlib/metrics/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -add_library(cpp-monlib-metrics) - -target_link_libraries(cpp-monlib-metrics PUBLIC - yutil - tools-enum_parser-enum_serialization_runtime - cpp-string_utils-misc -) - -target_sources(cpp-monlib-metrics PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/ewma.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/fake.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/histogram_collector_explicit.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/histogram_collector_exponential.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/histogram_collector_linear.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/histogram_snapshot.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/log_histogram_snapshot.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/labels.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/metric_registry.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/metric_consumer.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/metric_type.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/metric_value.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/summary_collector.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/summary_snapshot.cpp -) - -generate_enum_serilization(cpp-monlib-metrics - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/metrics/metric_value_type.h - GEN_HEADER - ${YDB_SDK_BINARY_DIR}/library/cpp/monlib/metrics/metric_value_type.h_serialized.h - INCLUDE_HEADERS - library/cpp/monlib/metrics/metric_value_type.h -) - - diff --git a/library/cpp/monlib/service/pages/CMakeLists.txt b/library/cpp/monlib/service/pages/CMakeLists.txt deleted file mode 100644 index fa4e9acbcff..00000000000 --- a/library/cpp/monlib/service/pages/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -add_subdirectory(resources) -add_subdirectory(tablesorter) - -add_library(monlib-service-pages) - -target_link_libraries(monlib-service-pages PUBLIC - yutil - library-cpp-build_info - library-cpp-svnversion - library-cpp-resource - cpp-monlib-service - monlib-encode-json - monlib-encode-text - monlib-encode-spack - monlib-encode-prometheus -) - -target_sources(monlib-service-pages PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/diag_mon_page.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/html_mon_page.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/index_mon_page.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/mon_page.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/pre_mon_page.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/resource_mon_page.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/templates.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/version_mon_page.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/registry_mon_page.cpp -) - - diff --git a/library/cpp/openssl/io/ut/ya.make b/library/cpp/openssl/io/ut/ya.make deleted file mode 100644 index 54a88ddad3c..00000000000 --- a/library/cpp/openssl/io/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/openssl/io) - -SRCS( - builtin_ut.cpp -) - -END() diff --git a/library/cpp/openssl/method/ut/ya.make b/library/cpp/openssl/method/ut/ya.make deleted file mode 100644 index 493e582a68b..00000000000 --- a/library/cpp/openssl/method/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/openssl/method) - -SRCS( - io_ut.cpp -) - -END() diff --git a/library/cpp/resource/ut/ya.make b/library/cpp/resource/ut/ya.make deleted file mode 100644 index a07e24f4d82..00000000000 --- a/library/cpp/resource/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/resource/ut/lib) - -SRCS( - resource_ut.cpp -) - -END() diff --git a/library/cpp/streams/brotli/ut/ya.make b/library/cpp/streams/brotli/ut/ya.make deleted file mode 100644 index ffa9c0748ab..00000000000 --- a/library/cpp/streams/brotli/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/streams/brotli) - -SRCS( - brotli_ut.cpp -) - -END() diff --git a/library/cpp/streams/bzip2/ut/ya.make b/library/cpp/streams/bzip2/ut/ya.make deleted file mode 100644 index 86e36216a41..00000000000 --- a/library/cpp/streams/bzip2/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/streams/bzip2) - -SRCS( - bzip2_ut.cpp -) - -END() diff --git a/library/cpp/streams/lzma/ut/ya.make b/library/cpp/streams/lzma/ut/ya.make deleted file mode 100644 index 99b7e5e401a..00000000000 --- a/library/cpp/streams/lzma/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/streams/lzma) - -SRCS( - lzma_ut.cpp -) - -END() diff --git a/library/cpp/streams/zstd/ut/ya.make b/library/cpp/streams/zstd/ut/ya.make deleted file mode 100644 index 3e490b9bc13..00000000000 --- a/library/cpp/streams/zstd/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/streams/zstd) - -SRCS( - zstd_ut.cpp -) - -END() diff --git a/library/cpp/string_utils/quote/ut/ya.make b/library/cpp/string_utils/quote/ut/ya.make deleted file mode 100644 index ad951b1ed1c..00000000000 --- a/library/cpp/string_utils/quote/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/string_utils/quote) - -SRCS( - quote_ut.cpp -) - -END() diff --git a/library/cpp/string_utils/relaxed_escaper/ut/ya.make b/library/cpp/string_utils/relaxed_escaper/ut/ya.make deleted file mode 100644 index d437907e5b4..00000000000 --- a/library/cpp/string_utils/relaxed_escaper/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/string_utils/relaxed_escaper) - -SRCS( - relaxed_escaper_ut.cpp -) - -END() diff --git a/library/cpp/string_utils/url/ut/ya.make b/library/cpp/string_utils/url/ut/ya.make deleted file mode 100644 index c876bb28889..00000000000 --- a/library/cpp/string_utils/url/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/string_utils/url) - -SRCS( - url_ut.cpp -) - -END() diff --git a/library/cpp/testing/common/CMakeLists.txt b/library/cpp/testing/common/CMakeLists.txt deleted file mode 100644 index 52047f36551..00000000000 --- a/library/cpp/testing/common/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -add_library(cpp-testing-common) -target_link_libraries(cpp-testing-common PUBLIC - yutil - library-cpp-json - library-cpp-svnversion -) -target_sources(cpp-testing-common PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/common/env.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/common/env_var.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/common/network.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/common/probe.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/common/scope.cpp -) - -vcs_info(cpp-testing-common) - -add_subdirectory(ut) diff --git a/library/cpp/testing/gmock_in_unittest/gmock.h b/library/cpp/testing/gmock_in_unittest/gmock.h deleted file mode 100644 index 31f6aee1c3d..00000000000 --- a/library/cpp/testing/gmock_in_unittest/gmock.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include - -#include diff --git a/library/cpp/testing/gtest/ut/ya.make b/library/cpp/testing/gtest/ut/ya.make deleted file mode 100644 index d06bbefd492..00000000000 --- a/library/cpp/testing/gtest/ut/ya.make +++ /dev/null @@ -1,15 +0,0 @@ -GTEST() -SRCS( - matchers_ut.cpp - ut.cpp -) - -DATA( - arcadia/library/cpp/testing/gtest/ut/golden -) - -PEERDIR( - library/cpp/testing/hook -) - -END() diff --git a/library/cpp/testing/gtest_extensions/CMakeLists.txt b/library/cpp/testing/gtest_extensions/CMakeLists.txt deleted file mode 100644 index 7d71df4745e..00000000000 --- a/library/cpp/testing/gtest_extensions/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -add_library(cpp-testing-gtest_extensions) -target_link_libraries(cpp-testing-gtest_extensions PUBLIC - yutil - GTest::gmock - GTest::gtest -) -target_sources(cpp-testing-gtest_extensions PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/gtest_extensions/assertions.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/gtest_extensions/gtest_extensions.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/gtest_extensions/matchers.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/gtest_extensions/pretty_printers.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/gtest_extensions/probe.cpp -) - -# Unit tests -add_subdirectory(ut) diff --git a/library/cpp/testing/unittest/CMakeLists.txt b/library/cpp/testing/unittest/CMakeLists.txt deleted file mode 100644 index e50b4c2172b..00000000000 --- a/library/cpp/testing/unittest/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -add_library(cpp-testing-unittest) -target_link_libraries(cpp-testing-unittest PUBLIC - yutil - library-cpp-colorizer - library-cpp-dbg_output - library-cpp-diff - library-cpp-json - cpp-json-writer - cpp-testing-common - cpp-testing-hook -) -target_sources(cpp-testing-unittest PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/unittest/gtest.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/unittest/checks.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/unittest/junit.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/unittest/plugin.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/unittest/registar.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/unittest/tests_data.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/unittest/utmain.cpp -) - -# Unit tests -add_subdirectory(fat) -add_subdirectory(ut) diff --git a/library/cpp/testing/unittest/env.h b/library/cpp/testing/unittest/env.h deleted file mode 100644 index 4807539ab28..00000000000 --- a/library/cpp/testing/unittest/env.h +++ /dev/null @@ -1,3 +0,0 @@ -// just shortcut -#include - diff --git a/library/cpp/testing/unittest_main/CMakeLists.txt b/library/cpp/testing/unittest_main/CMakeLists.txt deleted file mode 100644 index d863ebd1806..00000000000 --- a/library/cpp/testing/unittest_main/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -# 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 "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -elseif (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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -endif() diff --git a/library/cpp/testing/unittest_main/ya.make b/library/cpp/testing/unittest_main/ya.make deleted file mode 100644 index 85022961433..00000000000 --- a/library/cpp/testing/unittest_main/ya.make +++ /dev/null @@ -1,12 +0,0 @@ -LIBRARY() - -PEERDIR( - library/cpp/testing/unittest - library/cpp/terminate_handler -) - -SRCS( - main.cpp -) - -END() diff --git a/library/cpp/threading/atomic/ut/ya.make b/library/cpp/threading/atomic/ut/ya.make deleted file mode 100644 index fe2a5ac8f9a..00000000000 --- a/library/cpp/threading/atomic/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/threading/atomic) - -SRCS( - bool_ut.cpp -) - -END() diff --git a/library/cpp/threading/chunk_queue/ut/ya.make b/library/cpp/threading/chunk_queue/ut/ya.make deleted file mode 100644 index a58422ce02a..00000000000 --- a/library/cpp/threading/chunk_queue/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/threading/chunk_queue) - -SRCS( - queue_ut.cpp -) - -END() diff --git a/library/cpp/threading/equeue/ut/ya.make b/library/cpp/threading/equeue/ut/ya.make deleted file mode 100644 index 2cfcb4ae007..00000000000 --- a/library/cpp/threading/equeue/ut/ya.make +++ /dev/null @@ -1,14 +0,0 @@ -UNITTEST() - -PEERDIR( - ADDINCL library/cpp/threading/equeue - library/cpp/threading/equeue/fast -) - -SRCDIR(library/cpp/threading/equeue) - -SRCS( - equeue_ut.cpp -) - -END() diff --git a/library/cpp/threading/future/CMakeLists.txt b/library/cpp/threading/future/CMakeLists.txt deleted file mode 100644 index a32f8f21c9f..00000000000 --- a/library/cpp/threading/future/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -add_library(cpp-threading-future) - -target_link_libraries(cpp-threading-future PUBLIC - yutil -) - -target_sources(cpp-threading-future PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/future/async_semaphore.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/future/async.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/future/core/future.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/future/core/fwd.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/future/fwd.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/future/wait/fwd.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/future/wait/wait.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/future/wait/wait_group.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/future/wait/wait_policy.cpp -) diff --git a/library/cpp/threading/light_rw_lock/ut/ya.make b/library/cpp/threading/light_rw_lock/ut/ya.make deleted file mode 100644 index 780dd65803c..00000000000 --- a/library/cpp/threading/light_rw_lock/ut/ya.make +++ /dev/null @@ -1,11 +0,0 @@ -UNITTEST_FOR(library/cpp/threading/light_rw_lock) - -SRCS( - rwlock_ut.cpp -) - -PEERDIR( - library/cpp/deprecated/atomic -) - -END() diff --git a/library/cpp/threading/poor_man_openmp/ut/ya.make b/library/cpp/threading/poor_man_openmp/ut/ya.make deleted file mode 100644 index 570b8788f06..00000000000 --- a/library/cpp/threading/poor_man_openmp/ut/ya.make +++ /dev/null @@ -1,7 +0,0 @@ -UNITTEST_FOR(library/cpp/threading/poor_man_openmp) - -SRCS( - thread_helper_ut.cpp -) - -END() diff --git a/library/cpp/uri/CMakeLists.txt b/library/cpp/uri/CMakeLists.txt deleted file mode 100644 index 918b007d46f..00000000000 --- a/library/cpp/uri/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -add_library(library-cpp-uri) - -target_link_libraries(library-cpp-uri PUBLIC - yutil - IDN::IDN - library-cpp-charset -) - -target_sources(library-cpp-uri PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/uri/assign.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/uri/common.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/uri/encode.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/uri/location.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/uri/other.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/uri/parse.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/uri/qargs.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/uri/uri.cpp -) - -if (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") - target_ragel_lexers(library-cpp-uri - PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/uri/encodefsm.rl6 - -CT0 - ) - target_ragel_lexers(library-cpp-uri - PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/uri/parsefsm.rl6 - -CT0 - ) -else () - target_ragel_lexers(library-cpp-uri - PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/uri/encodefsm.rl6 - -CG2 - ) - target_ragel_lexers(library-cpp-uri - PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/uri/parsefsm.rl6 - -CG2 - ) -endif () diff --git a/library/cpp/yson/CMakeLists.txt b/library/cpp/yson/CMakeLists.txt deleted file mode 100644 index 0a74fcde999..00000000000 --- a/library/cpp/yson/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -add_subdirectory(json) -add_subdirectory(node) - -add_library(library-cpp-yson) - -target_link_libraries(library-cpp-yson PUBLIC - yutil - cpp-yt-misc - cpp-yt-yson -) - -target_sources(library-cpp-yson PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/consumer.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/lexer.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/parser.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/token.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/tokenizer.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/varint.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/writer.cpp -) - - diff --git a/library/cpp/yson/node/CMakeLists.txt b/library/cpp/yson/node/CMakeLists.txt deleted file mode 100644 index 5e0f78be975..00000000000 --- a/library/cpp/yson/node/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -add_library(cpp-yson-node) - -target_link_libraries(cpp-yson-node PUBLIC - yutil - tools-enum_parser-enum_serialization_runtime - library-cpp-yson - cpp-yson-json -) - -target_sources(cpp-yson-node PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/node/node.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/node/node_io.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/node/node_builder.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/node/node_visitor.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/node/serialize.cpp -) - -generate_enum_serilization(cpp-yson-node - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/node/node.h - INCLUDE_HEADERS - library/cpp/yson/node/node.h -) - - diff --git a/library/cpp/yt/coding/unittests/ya.make b/library/cpp/yt/coding/unittests/ya.make deleted file mode 100644 index ab94ee8796a..00000000000 --- a/library/cpp/yt/coding/unittests/ya.make +++ /dev/null @@ -1,15 +0,0 @@ -GTEST() - -INCLUDE(${ARCADIA_ROOT}/library/cpp/yt/ya_cpp.make.inc) - -SRCS( - zig_zag_ut.cpp - varint_ut.cpp -) - -PEERDIR( - library/cpp/yt/coding - library/cpp/testing/gtest -) - -END() diff --git a/library/cpp/yt/memory/CMakeLists.txt b/library/cpp/yt/memory/CMakeLists.txt deleted file mode 100644 index 6b30361d43b..00000000000 --- a/library/cpp/yt/memory/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -add_library(cpp-yt-memory) - -target_link_libraries(cpp-yt-memory PUBLIC - yutil - cpp-yt-assert - cpp-yt-misc - cpp-yt-malloc -) - -target_sources(cpp-yt-memory PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/memory/blob.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/memory/chunked_input_stream.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/memory/chunked_memory_allocator.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/memory/chunked_memory_pool.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/memory/chunked_memory_pool_output.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/memory/chunked_output_stream.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/memory/memory_tag.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/memory/ref.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/memory/ref_tracked.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/memory/safe_memory_reader.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/memory/shared_range.cpp -) - -if (NOT WIN32) - target_compile_options(cpp-yt-memory PRIVATE - -Wdeprecated-this-capture - ) -endif() diff --git a/library/cpp/yt/yson_string/unittests/ya.make b/library/cpp/yt/yson_string/unittests/ya.make deleted file mode 100644 index b584119f789..00000000000 --- a/library/cpp/yt/yson_string/unittests/ya.make +++ /dev/null @@ -1,16 +0,0 @@ -GTEST() - -INCLUDE(${ARCADIA_ROOT}/library/cpp/yt/ya_cpp.make.inc) - -SRCS( - convert_ut.cpp - saveload_ut.cpp -) - -PEERDIR( - library/cpp/yt/yson_string - library/cpp/testing/gtest - library/cpp/testing/gtest_extensions -) - -END() diff --git a/scripts/c_templates/README.md b/scripts/c_templates/README.md index 96265c7fece..782be32d6c6 100644 --- a/scripts/c_templates/README.md +++ b/scripts/c_templates/README.md @@ -1,3 +1,3 @@ ### Usage -Не используйте эту библиотеку напрямую. Следует пользоваться `library/cpp/svnversion/svnversion.h`. +Не используйте эту библиотеку напрямую. Следует пользоваться `src/library/svnversion/svnversion.h`. diff --git a/scripts/c_templates/svn_interface.c b/scripts/c_templates/svn_interface.c index 19251960912..c1b6e2f90a7 100644 --- a/scripts/c_templates/svn_interface.c +++ b/scripts/c_templates/svn_interface.c @@ -1,6 +1,6 @@ // Used indirectly. See scripts/vcs_info.py // ya-bin dump vcs-info > vcs.json -// python scripts/vcs_info.py vcs.json out.c scripts/c_templates/svn_interface.c library/cpp/svnversion +// python scripts/vcs_info.py vcs.json out.c scripts/c_templates/svn_interface.c src/library/svnversion #include "scripts/c_templates/svnversion.h" diff --git a/scripts/c_templates/svnversion.h b/scripts/c_templates/svnversion.h index 8c90323d092..8e414425c06 100644 --- a/scripts/c_templates/svnversion.h +++ b/scripts/c_templates/svnversion.h @@ -1,7 +1,7 @@ #pragma once // Permit compilation with NO_UTIL(): -// util/system/compiler.h +// src/util/system/compiler.h #if !defined(Y_HIDDEN) #if defined(__GNUC__) #define Y_HIDDEN __attribute__((visibility("hidden"))) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 00000000000..11245e6d782 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory(api) +add_subdirectory(client) +add_subdirectory(json_value) +add_subdirectory(library) +add_subdirectory(util) +add_subdirectory(yson_value) \ No newline at end of file diff --git a/ydb/public/api/CMakeLists.txt b/src/api/CMakeLists.txt similarity index 100% rename from ydb/public/api/CMakeLists.txt rename to src/api/CMakeLists.txt diff --git a/ydb/public/api/README.md b/src/api/README.md similarity index 100% rename from ydb/public/api/README.md rename to src/api/README.md diff --git a/ydb/public/api/client/CMakeLists.txt b/src/api/client/CMakeLists.txt similarity index 100% rename from ydb/public/api/client/CMakeLists.txt rename to src/api/client/CMakeLists.txt diff --git a/ydb/public/api/client/yc_private/CMakeLists.txt b/src/api/client/yc_private/CMakeLists.txt similarity index 100% rename from ydb/public/api/client/yc_private/CMakeLists.txt rename to src/api/client/yc_private/CMakeLists.txt diff --git a/ydb/public/api/client/yc_private/compute/CMakeLists.txt b/src/api/client/yc_private/compute/CMakeLists.txt similarity index 100% rename from ydb/public/api/client/yc_private/compute/CMakeLists.txt rename to src/api/client/yc_private/compute/CMakeLists.txt diff --git a/ydb/public/api/client/yc_private/compute/inner/CMakeLists.txt b/src/api/client/yc_private/compute/inner/CMakeLists.txt similarity index 80% rename from ydb/public/api/client/yc_private/compute/inner/CMakeLists.txt rename to src/api/client/yc_private/compute/inner/CMakeLists.txt index a22334945b1..cbbb1de2e65 100644 --- a/ydb/public/api/client/yc_private/compute/inner/CMakeLists.txt +++ b/src/api/client/yc_private/compute/inner/CMakeLists.txt @@ -8,12 +8,10 @@ target_link_libraries(yc_private-compute-inner PUBLIC protobuf::libprotobuf ) target_proto_messages(yc_private-compute-inner PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/compute/inner/disk_service.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/compute/inner/disk_service.proto ) target_proto_addincls(yc_private-compute-inner ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} ${YDB_SDK_SOURCE_DIR} ${YDB_SDK_BINARY_DIR} ) diff --git a/ydb/public/api/client/yc_private/compute/inner/disk_service.proto b/src/api/client/yc_private/compute/inner/disk_service.proto similarity index 75% rename from ydb/public/api/client/yc_private/compute/inner/disk_service.proto rename to src/api/client/yc_private/compute/inner/disk_service.proto index 422ab73b4e4..c6ab8709500 100644 --- a/ydb/public/api/client/yc_private/compute/inner/disk_service.proto +++ b/src/api/client/yc_private/compute/inner/disk_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package yandex.cloud.priv.compute.v1.inner; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/compute/inner;compute"; +option go_package = "github.com/ydb-platform/ydb/src/api/client/yc_private/compute/inner;compute"; service DiskService { // Create iam-token for encrypted disk diff --git a/src/api/client/yc_private/iam/CMakeLists.txt b/src/api/client/yc_private/iam/CMakeLists.txt new file mode 100644 index 00000000000..4ed927d4cbb --- /dev/null +++ b/src/api/client/yc_private/iam/CMakeLists.txt @@ -0,0 +1,38 @@ +add_library(client-yc_private-iam) +set_property(TARGET client-yc_private-iam PROPERTY + PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h +) +target_link_libraries(client-yc_private-iam PUBLIC + api-common-protos + yutil + gRPC::grpc++ + client-yc_private-operation + protobuf::libprotobuf +) +target_proto_messages(client-yc_private-iam PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/iam/iam_token_service_subject.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/iam/iam_token_service.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/iam/iam_token.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/iam/oauth_request.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/iam/reference.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/iam/service_account_service.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/iam/service_account.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/iam/user_account_service.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/iam/user_account.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/iam/yandex_passport_cookie.proto +) +target_proto_addincls(client-yc_private-iam + ./ + ${YDB_SDK_SOURCE_DIR} + ${YDB_SDK_BINARY_DIR} + ${YDB_SDK_SOURCE_DIR}/third_party/api-common-protos +) +target_proto_outs(client-yc_private-iam + --cpp_out=${YDB_SDK_BINARY_DIR}/ +) +target_proto_plugin(client-yc_private-iam + grpc_cpp + gRPC::grpc_cpp_plugin +) + + diff --git a/ydb/public/api/client/yc_private/iam/iam_token.proto b/src/api/client/yc_private/iam/iam_token.proto similarity index 100% rename from ydb/public/api/client/yc_private/iam/iam_token.proto rename to src/api/client/yc_private/iam/iam_token.proto diff --git a/ydb/public/api/client/yc_private/iam/iam_token_service.proto b/src/api/client/yc_private/iam/iam_token_service.proto similarity index 88% rename from ydb/public/api/client/yc_private/iam/iam_token_service.proto rename to src/api/client/yc_private/iam/iam_token_service.proto index 74c03d778b7..b6fed773975 100644 --- a/ydb/public/api/client/yc_private/iam/iam_token_service.proto +++ b/src/api/client/yc_private/iam/iam_token_service.proto @@ -4,9 +4,9 @@ package yandex.cloud.priv.iam.v1; import "google/api/annotations.proto"; import "google/protobuf/timestamp.proto"; -import "ydb/public/api/client/yc_private/iam/iam_token_service_subject.proto"; -import "ydb/public/api/client/yc_private/iam/yandex_passport_cookie.proto"; -import "ydb/public/api/client/yc_private/iam/oauth_request.proto"; +import "src/api/client/yc_private/iam/iam_token_service_subject.proto"; +import "src/api/client/yc_private/iam/yandex_passport_cookie.proto"; +import "src/api/client/yc_private/iam/oauth_request.proto"; service IamTokenService { diff --git a/ydb/public/api/client/yc_private/iam/iam_token_service_subject.proto b/src/api/client/yc_private/iam/iam_token_service_subject.proto similarity index 100% rename from ydb/public/api/client/yc_private/iam/iam_token_service_subject.proto rename to src/api/client/yc_private/iam/iam_token_service_subject.proto diff --git a/ydb/public/api/client/yc_private/iam/oauth_request.proto b/src/api/client/yc_private/iam/oauth_request.proto similarity index 100% rename from ydb/public/api/client/yc_private/iam/oauth_request.proto rename to src/api/client/yc_private/iam/oauth_request.proto diff --git a/ydb/public/api/client/yc_private/iam/reference.proto b/src/api/client/yc_private/iam/reference.proto similarity index 100% rename from ydb/public/api/client/yc_private/iam/reference.proto rename to src/api/client/yc_private/iam/reference.proto diff --git a/ydb/public/api/client/yc_private/iam/service_account.proto b/src/api/client/yc_private/iam/service_account.proto similarity index 100% rename from ydb/public/api/client/yc_private/iam/service_account.proto rename to src/api/client/yc_private/iam/service_account.proto diff --git a/ydb/public/api/client/yc_private/iam/service_account_service.proto b/src/api/client/yc_private/iam/service_account_service.proto similarity index 91% rename from ydb/public/api/client/yc_private/iam/service_account_service.proto rename to src/api/client/yc_private/iam/service_account_service.proto index 5b54113b4ec..8a623f47313 100644 --- a/ydb/public/api/client/yc_private/iam/service_account_service.proto +++ b/src/api/client/yc_private/iam/service_account_service.proto @@ -4,11 +4,11 @@ package yandex.cloud.priv.iam.v1; import "google/api/annotations.proto"; import "google/protobuf/field_mask.proto"; -import "ydb/public/api/client/yc_private/iam/iam_token.proto"; -import "ydb/public/api/client/yc_private/iam/service_account.proto"; -//import "ydb/public/api/client/yc_private/access/access.proto"; -import "ydb/public/api/client/yc_private/operation/operation.proto"; -import "ydb/public/api/client/yc_private/iam/reference.proto"; +import "src/api/client/yc_private/iam/iam_token.proto"; +import "src/api/client/yc_private/iam/service_account.proto"; +//import "src/api/client/yc_private/access/access.proto"; +import "src/api/client/yc_private/operation/operation.proto"; +import "src/api/client/yc_private/iam/reference.proto"; service ServiceAccountService { rpc Get (GetServiceAccountRequest) returns (ServiceAccount) { diff --git a/ydb/public/api/client/yc_private/iam/user_account.proto b/src/api/client/yc_private/iam/user_account.proto similarity index 100% rename from ydb/public/api/client/yc_private/iam/user_account.proto rename to src/api/client/yc_private/iam/user_account.proto diff --git a/ydb/public/api/client/yc_private/iam/user_account_service.proto b/src/api/client/yc_private/iam/user_account_service.proto similarity index 94% rename from ydb/public/api/client/yc_private/iam/user_account_service.proto rename to src/api/client/yc_private/iam/user_account_service.proto index e817a0ab9a5..6895be2e430 100644 --- a/ydb/public/api/client/yc_private/iam/user_account_service.proto +++ b/src/api/client/yc_private/iam/user_account_service.proto @@ -4,8 +4,8 @@ package yandex.cloud.priv.iam.v1; import "google/api/annotations.proto"; import "google/protobuf/timestamp.proto"; -import "ydb/public/api/client/yc_private/operation/operation.proto"; -import "ydb/public/api/client/yc_private/iam/user_account.proto"; +import "src/api/client/yc_private/operation/operation.proto"; +import "src/api/client/yc_private/iam/user_account.proto"; service UserAccountService { rpc Get (GetUserAccountRequest) returns (UserAccount) { diff --git a/ydb/public/api/client/yc_private/iam/yandex_passport_cookie.proto b/src/api/client/yc_private/iam/yandex_passport_cookie.proto similarity index 100% rename from ydb/public/api/client/yc_private/iam/yandex_passport_cookie.proto rename to src/api/client/yc_private/iam/yandex_passport_cookie.proto diff --git a/ydb/public/api/client/yc_private/kms/CMakeLists.txt b/src/api/client/yc_private/kms/CMakeLists.txt similarity index 75% rename from ydb/public/api/client/yc_private/kms/CMakeLists.txt rename to src/api/client/yc_private/kms/CMakeLists.txt index 2a5e0e07c79..a9bac18cf62 100644 --- a/ydb/public/api/client/yc_private/kms/CMakeLists.txt +++ b/src/api/client/yc_private/kms/CMakeLists.txt @@ -13,13 +13,11 @@ target_link_libraries(client-yc_private-kms PUBLIC protobuf::libprotobuf ) target_proto_messages(client-yc_private-kms PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/kms/symmetric_crypto_service.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/kms/symmetric_key.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/kms/symmetric_crypto_service.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/kms/symmetric_key.proto ) target_proto_addincls(client-yc_private-kms ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} ${YDB_SDK_SOURCE_DIR} ${YDB_SDK_BINARY_DIR} ) diff --git a/ydb/public/api/client/yc_private/kms/asymmetricencryption/CMakeLists.txt b/src/api/client/yc_private/kms/asymmetricencryption/CMakeLists.txt similarity index 79% rename from ydb/public/api/client/yc_private/kms/asymmetricencryption/CMakeLists.txt rename to src/api/client/yc_private/kms/asymmetricencryption/CMakeLists.txt index 281b901888f..6d878f34771 100644 --- a/ydb/public/api/client/yc_private/kms/asymmetricencryption/CMakeLists.txt +++ b/src/api/client/yc_private/kms/asymmetricencryption/CMakeLists.txt @@ -8,12 +8,10 @@ target_link_libraries(yc_private-kms-asymmetricencryption PUBLIC protobuf::libprotobuf ) target_proto_messages(yc_private-kms-asymmetricencryption PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/kms/asymmetricencryption/asymmetric_encryption_key.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/kms/asymmetricencryption/asymmetric_encryption_key.proto ) target_proto_addincls(yc_private-kms-asymmetricencryption ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} ${YDB_SDK_SOURCE_DIR} ${YDB_SDK_BINARY_DIR} ) diff --git a/ydb/public/api/client/yc_private/kms/asymmetricencryption/asymmetric_encryption_key.proto b/src/api/client/yc_private/kms/asymmetricencryption/asymmetric_encryption_key.proto similarity index 89% rename from ydb/public/api/client/yc_private/kms/asymmetricencryption/asymmetric_encryption_key.proto rename to src/api/client/yc_private/kms/asymmetricencryption/asymmetric_encryption_key.proto index 35807f5bd13..29edbbc6405 100644 --- a/ydb/public/api/client/yc_private/kms/asymmetricencryption/asymmetric_encryption_key.proto +++ b/src/api/client/yc_private/kms/asymmetricencryption/asymmetric_encryption_key.proto @@ -4,7 +4,7 @@ package yandex.cloud.priv.kms.v1.asymmetricencryption; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/kms/asymmetricencryption;kms"; +option go_package = "github.com/ydb-platform/ydb/src/api/client/yc_private/kms/asymmetricencryption;kms"; option java_outer_classname = "PAEK"; enum AsymmetricEncryptionAlgorithm { diff --git a/ydb/public/api/client/yc_private/kms/asymmetricsignature/CMakeLists.txt b/src/api/client/yc_private/kms/asymmetricsignature/CMakeLists.txt similarity index 79% rename from ydb/public/api/client/yc_private/kms/asymmetricsignature/CMakeLists.txt rename to src/api/client/yc_private/kms/asymmetricsignature/CMakeLists.txt index 2b07dfb440a..9aa46f832d9 100644 --- a/ydb/public/api/client/yc_private/kms/asymmetricsignature/CMakeLists.txt +++ b/src/api/client/yc_private/kms/asymmetricsignature/CMakeLists.txt @@ -8,12 +8,10 @@ target_link_libraries(yc_private-kms-asymmetricsignature PUBLIC protobuf::libprotobuf ) target_proto_messages(yc_private-kms-asymmetricsignature PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/kms/asymmetricsignature/asymmetric_signature_key.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/kms/asymmetricsignature/asymmetric_signature_key.proto ) target_proto_addincls(yc_private-kms-asymmetricsignature ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} ${YDB_SDK_SOURCE_DIR} ${YDB_SDK_BINARY_DIR} ) diff --git a/ydb/public/api/client/yc_private/kms/asymmetricsignature/asymmetric_signature_key.proto b/src/api/client/yc_private/kms/asymmetricsignature/asymmetric_signature_key.proto similarity index 93% rename from ydb/public/api/client/yc_private/kms/asymmetricsignature/asymmetric_signature_key.proto rename to src/api/client/yc_private/kms/asymmetricsignature/asymmetric_signature_key.proto index 80484fa20f2..f7d3caa967a 100644 --- a/ydb/public/api/client/yc_private/kms/asymmetricsignature/asymmetric_signature_key.proto +++ b/src/api/client/yc_private/kms/asymmetricsignature/asymmetric_signature_key.proto @@ -4,7 +4,7 @@ package yandex.cloud.priv.kms.v1.asymmetricsignature; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/kms/asymmetricsignature;kms"; +option go_package = "github.com/ydb-platform/ydb/src/api/client/yc_private/kms/asymmetricsignature;kms"; option java_outer_classname = "PASK"; enum AsymmetricSignatureAlgorithm { diff --git a/ydb/public/api/client/yc_private/kms/symmetric_crypto_service.proto b/src/api/client/yc_private/kms/symmetric_crypto_service.proto similarity index 93% rename from ydb/public/api/client/yc_private/kms/symmetric_crypto_service.proto rename to src/api/client/yc_private/kms/symmetric_crypto_service.proto index 747828baf3f..2369e0a1c9f 100644 --- a/ydb/public/api/client/yc_private/kms/symmetric_crypto_service.proto +++ b/src/api/client/yc_private/kms/symmetric_crypto_service.proto @@ -2,11 +2,11 @@ syntax = "proto3"; package yandex.cloud.priv.kms.v1; -import "ydb/public/api/client/yc_private/kms/symmetric_key.proto"; -import "ydb/public/api/client/yc_private/kms/asymmetricencryption/asymmetric_encryption_key.proto"; -import "ydb/public/api/client/yc_private/kms/asymmetricsignature/asymmetric_signature_key.proto"; +import "src/api/client/yc_private/kms/symmetric_key.proto"; +import "src/api/client/yc_private/kms/asymmetricencryption/asymmetric_encryption_key.proto"; +import "src/api/client/yc_private/kms/asymmetricsignature/asymmetric_signature_key.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/kms;kms"; +option go_package = "github.com/ydb-platform/ydb/src/api/client/yc_private/kms;kms"; option java_outer_classname = "PSCS"; // --- data plane for KMS symmetric cryptography operations diff --git a/ydb/public/api/client/yc_private/kms/symmetric_key.proto b/src/api/client/yc_private/kms/symmetric_key.proto similarity index 93% rename from ydb/public/api/client/yc_private/kms/symmetric_key.proto rename to src/api/client/yc_private/kms/symmetric_key.proto index 7131f695c9a..5dd39534249 100644 --- a/ydb/public/api/client/yc_private/kms/symmetric_key.proto +++ b/src/api/client/yc_private/kms/symmetric_key.proto @@ -5,7 +5,7 @@ package yandex.cloud.priv.kms.v1; import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/kms;kms"; +option go_package = "github.com/ydb-platform/ydb/src/api/client/yc_private/kms;kms"; option java_outer_classname = "PSK"; enum SymmetricAlgorithm { diff --git a/ydb/public/api/client/yc_private/operation/CMakeLists.txt b/src/api/client/yc_private/operation/CMakeLists.txt similarity index 83% rename from ydb/public/api/client/yc_private/operation/CMakeLists.txt rename to src/api/client/yc_private/operation/CMakeLists.txt index 0fe0a4691df..6532732ae10 100644 --- a/ydb/public/api/client/yc_private/operation/CMakeLists.txt +++ b/src/api/client/yc_private/operation/CMakeLists.txt @@ -9,15 +9,13 @@ target_link_libraries(client-yc_private-operation PUBLIC protobuf::libprotobuf ) target_proto_messages(client-yc_private-operation PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/operation/operation.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/operation/operation.proto ) target_proto_addincls(client-yc_private-operation ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} ${YDB_SDK_SOURCE_DIR} - ${YDB_SDK_SOURCE_DIR}/third_party/api-common-protos ${YDB_SDK_BINARY_DIR} + ${YDB_SDK_SOURCE_DIR}/third_party/api-common-protos ) target_proto_outs(client-yc_private-operation --cpp_out=${YDB_SDK_BINARY_DIR}/ diff --git a/ydb/public/api/client/yc_private/operation/operation.proto b/src/api/client/yc_private/operation/operation.proto similarity index 100% rename from ydb/public/api/client/yc_private/operation/operation.proto rename to src/api/client/yc_private/operation/operation.proto diff --git a/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.txt b/src/api/client/yc_private/resourcemanager/CMakeLists.txt similarity index 72% rename from ydb/public/api/client/yc_private/resourcemanager/CMakeLists.txt rename to src/api/client/yc_private/resourcemanager/CMakeLists.txt index ce692b05f45..640971ff0a0 100644 --- a/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.txt +++ b/src/api/client/yc_private/resourcemanager/CMakeLists.txt @@ -11,9 +11,9 @@ target_link_libraries(client-yc_private-resourcemanager PUBLIC protobuf::libprotobuf ) target_proto_messages(client-yc_private-resourcemanager PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/resourcemanager/folder.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/resourcemanager/transitional/folder_service.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/resourcemanager/folder_service.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/resourcemanager/folder.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/resourcemanager/transitional/folder_service.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/resourcemanager/folder_service.proto ) target_proto_addincls(client-yc_private-resourcemanager ./ diff --git a/ydb/public/api/client/yc_private/resourcemanager/folder.proto b/src/api/client/yc_private/resourcemanager/folder.proto similarity index 89% rename from ydb/public/api/client/yc_private/resourcemanager/folder.proto rename to src/api/client/yc_private/resourcemanager/folder.proto index 02eca124c93..65445d82bdc 100644 --- a/ydb/public/api/client/yc_private/resourcemanager/folder.proto +++ b/src/api/client/yc_private/resourcemanager/folder.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package yandex.cloud.priv.resourcemanager.v1; import "google/protobuf/timestamp.proto"; -import "ydb/public/api/client/yc_private/servicecontrol/resource.proto"; +import "src/api/client/yc_private/servicecontrol/resource.proto"; message Folder { diff --git a/ydb/public/api/client/yc_private/resourcemanager/folder_service.proto b/src/api/client/yc_private/resourcemanager/folder_service.proto similarity index 87% rename from ydb/public/api/client/yc_private/resourcemanager/folder_service.proto rename to src/api/client/yc_private/resourcemanager/folder_service.proto index eb8ab1c6b4b..0afefa086dc 100644 --- a/ydb/public/api/client/yc_private/resourcemanager/folder_service.proto +++ b/src/api/client/yc_private/resourcemanager/folder_service.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package yandex.cloud.priv.resourcemanager.v1; import "google/protobuf/field_mask.proto"; -import "ydb/public/api/client/yc_private/resourcemanager/folder.proto"; +import "src/api/client/yc_private/resourcemanager/folder.proto"; service FolderService { diff --git a/ydb/public/api/client/yc_private/resourcemanager/transitional/folder_service.proto b/src/api/client/yc_private/resourcemanager/transitional/folder_service.proto similarity index 90% rename from ydb/public/api/client/yc_private/resourcemanager/transitional/folder_service.proto rename to src/api/client/yc_private/resourcemanager/transitional/folder_service.proto index eda82e1ea16..76cdc47e0c3 100644 --- a/ydb/public/api/client/yc_private/resourcemanager/transitional/folder_service.proto +++ b/src/api/client/yc_private/resourcemanager/transitional/folder_service.proto @@ -3,8 +3,8 @@ syntax = "proto3"; package yandex.cloud.priv.resourcemanager.v1.transitional; import "google/api/annotations.proto"; -import "ydb/public/api/client/yc_private/operation/operation.proto"; -import "ydb/public/api/client/yc_private/resourcemanager/folder.proto"; +import "src/api/client/yc_private/operation/operation.proto"; +import "src/api/client/yc_private/resourcemanager/folder.proto"; service FolderService { // TODO no pagination diff --git a/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.txt b/src/api/client/yc_private/servicecontrol/CMakeLists.txt similarity index 78% rename from ydb/public/api/client/yc_private/servicecontrol/CMakeLists.txt rename to src/api/client/yc_private/servicecontrol/CMakeLists.txt index 7d97174a856..8fca36f06f8 100644 --- a/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.txt +++ b/src/api/client/yc_private/servicecontrol/CMakeLists.txt @@ -9,8 +9,8 @@ target_link_libraries(client-yc_private-servicecontrol PUBLIC protobuf::libprotobuf ) target_proto_messages(client-yc_private-servicecontrol PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/servicecontrol/access_service.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/servicecontrol/resource.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/servicecontrol/access_service.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_private/servicecontrol/resource.proto ) target_proto_addincls(client-yc_private-servicecontrol ./ diff --git a/ydb/public/api/client/yc_private/servicecontrol/access_service.proto b/src/api/client/yc_private/servicecontrol/access_service.proto similarity index 98% rename from ydb/public/api/client/yc_private/servicecontrol/access_service.proto rename to src/api/client/yc_private/servicecontrol/access_service.proto index edd8855fa29..b3d4e581040 100644 --- a/ydb/public/api/client/yc_private/servicecontrol/access_service.proto +++ b/src/api/client/yc_private/servicecontrol/access_service.proto @@ -5,7 +5,7 @@ package yandex.cloud.priv.servicecontrol.v1; import "google/protobuf/timestamp.proto"; import "google/protobuf/any.proto"; import "google/protobuf/field_mask.proto"; -import "ydb/public/api/client/yc_private/servicecontrol/resource.proto"; +import "src/api/client/yc_private/servicecontrol/resource.proto"; service AccessService { // Verify the identity of a subject. diff --git a/ydb/public/api/client/yc_private/servicecontrol/resource.proto b/src/api/client/yc_private/servicecontrol/resource.proto similarity index 100% rename from ydb/public/api/client/yc_private/servicecontrol/resource.proto rename to src/api/client/yc_private/servicecontrol/resource.proto diff --git a/ydb/public/api/client/yc_public/CMakeLists.txt b/src/api/client/yc_public/CMakeLists.txt similarity index 100% rename from ydb/public/api/client/yc_public/CMakeLists.txt rename to src/api/client/yc_public/CMakeLists.txt diff --git a/ydb/public/api/client/yc_public/README.md b/src/api/client/yc_public/README.md similarity index 100% rename from ydb/public/api/client/yc_public/README.md rename to src/api/client/yc_public/README.md diff --git a/ydb/public/api/client/yc_public/common/CMakeLists.txt b/src/api/client/yc_public/common/CMakeLists.txt similarity index 88% rename from ydb/public/api/client/yc_public/common/CMakeLists.txt rename to src/api/client/yc_public/common/CMakeLists.txt index 671eb839503..29dadec65ba 100644 --- a/ydb/public/api/client/yc_public/common/CMakeLists.txt +++ b/src/api/client/yc_public/common/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(client-yc_public-common PUBLIC protobuf::libprotobuf ) target_proto_messages(client-yc_public-common PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_public/common/validation.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_public/common/validation.proto ) target_proto_addincls(client-yc_public-common ./ diff --git a/ydb/public/api/client/yc_public/common/validation.proto b/src/api/client/yc_public/common/validation.proto similarity index 100% rename from ydb/public/api/client/yc_public/common/validation.proto rename to src/api/client/yc_public/common/validation.proto diff --git a/ydb/public/api/client/yc_public/events/CMakeLists.txt b/src/api/client/yc_public/events/CMakeLists.txt similarity index 74% rename from ydb/public/api/client/yc_public/events/CMakeLists.txt rename to src/api/client/yc_public/events/CMakeLists.txt index 5e964cf17e7..48541f1f65e 100644 --- a/ydb/public/api/client/yc_public/events/CMakeLists.txt +++ b/src/api/client/yc_public/events/CMakeLists.txt @@ -10,9 +10,9 @@ target_link_libraries(client-yc_public-events PUBLIC protobuf::libprotobuf ) target_proto_messages(client-yc_public-events PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_public/events/options.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_public/events/common.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_public/events/yq.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_public/events/options.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_public/events/common.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_public/events/yq.proto ) target_proto_addincls(client-yc_public-events ./ diff --git a/ydb/public/api/client/yc_public/events/common.proto b/src/api/client/yc_public/events/common.proto similarity index 94% rename from ydb/public/api/client/yc_public/events/common.proto rename to src/api/client/yc_public/events/common.proto index 5c9e3e6cf54..c974cbec5e7 100644 --- a/ydb/public/api/client/yc_public/events/common.proto +++ b/src/api/client/yc_public/events/common.proto @@ -3,8 +3,8 @@ syntax = "proto3"; package yandex.cloud.events; import "google/protobuf/timestamp.proto"; -import "ydb/public/api/client/yc_public/common/validation.proto"; -import "ydb/public/api/client/yc_public/events/options.proto"; +import "src/api/client/yc_public/common/validation.proto"; +import "src/api/client/yc_public/events/options.proto"; option java_package = "yandex.cloud.api.events"; option java_outer_classname = "CommonEvents"; diff --git a/ydb/public/api/client/yc_public/events/options.proto b/src/api/client/yc_public/events/options.proto similarity index 100% rename from ydb/public/api/client/yc_public/events/options.proto rename to src/api/client/yc_public/events/options.proto diff --git a/ydb/public/api/client/yc_public/events/yq.proto b/src/api/client/yc_public/events/yq.proto similarity index 97% rename from ydb/public/api/client/yc_public/events/yq.proto rename to src/api/client/yc_public/events/yq.proto index 7690c2e7530..5025d04dd09 100644 --- a/ydb/public/api/client/yc_public/events/yq.proto +++ b/src/api/client/yc_public/events/yq.proto @@ -3,9 +3,9 @@ syntax = "proto3"; package yandex.cloud.events.yq; import "google/rpc/status.proto"; -import "ydb/public/api/client/yc_public/events/common.proto"; -import "ydb/public/api/client/yc_public/events/options.proto"; -import "ydb/public/api/client/yc_public/common/validation.proto"; +import "src/api/client/yc_public/events/common.proto"; +import "src/api/client/yc_public/events/options.proto"; +import "src/api/client/yc_public/common/validation.proto"; option java_package = "yandex.cloud.api.events.yq"; diff --git a/ydb/public/api/client/yc_public/iam/CMakeLists.txt b/src/api/client/yc_public/iam/CMakeLists.txt similarity index 88% rename from ydb/public/api/client/yc_public/iam/CMakeLists.txt rename to src/api/client/yc_public/iam/CMakeLists.txt index 21488777371..e32f0a00770 100644 --- a/ydb/public/api/client/yc_public/iam/CMakeLists.txt +++ b/src/api/client/yc_public/iam/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries(client-yc_public-iam PUBLIC protobuf::libprotobuf ) target_proto_messages(client-yc_public-iam PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_public/iam/iam_token_service.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_public/iam/iam_token_service.proto ) target_proto_addincls(client-yc_public-iam ./ diff --git a/ydb/public/api/client/yc_public/iam/iam_token_service.proto b/src/api/client/yc_public/iam/iam_token_service.proto similarity index 96% rename from ydb/public/api/client/yc_public/iam/iam_token_service.proto rename to src/api/client/yc_public/iam/iam_token_service.proto index 96c382617be..9fef8440942 100644 --- a/ydb/public/api/client/yc_public/iam/iam_token_service.proto +++ b/src/api/client/yc_public/iam/iam_token_service.proto @@ -4,7 +4,7 @@ package yandex.cloud.iam.v1; import "google/api/annotations.proto"; import "google/protobuf/timestamp.proto"; -import "ydb/public/api/client/yc_public/common/validation.proto"; +import "src/api/client/yc_public/common/validation.proto"; option go_package = "github.com/yandex-cloud/go-genproto/yandex/cloud/iam/v1;iam"; option java_package = "yandex.cloud.api.iam.v1"; diff --git a/ydb/public/api/client/yc_public/logging/CMakeLists.txt b/src/api/client/yc_public/logging/CMakeLists.txt similarity index 71% rename from ydb/public/api/client/yc_public/logging/CMakeLists.txt rename to src/api/client/yc_public/logging/CMakeLists.txt index e5c54faa76c..64e96073e30 100644 --- a/ydb/public/api/client/yc_public/logging/CMakeLists.txt +++ b/src/api/client/yc_public/logging/CMakeLists.txt @@ -10,9 +10,9 @@ target_link_libraries(client-yc_public-logging PUBLIC protobuf::libprotobuf ) target_proto_messages(client-yc_public-logging PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_public/logging/log_entry.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_public/logging/log_ingestion_service.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_public/logging/log_resource.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_public/logging/log_entry.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_public/logging/log_ingestion_service.proto + ${YDB_SDK_SOURCE_DIR}/src/api/client/yc_public/logging/log_resource.proto ) target_proto_addincls(client-yc_public-logging ./ diff --git a/ydb/public/api/client/yc_public/logging/log_entry.proto b/src/api/client/yc_public/logging/log_entry.proto similarity index 96% rename from ydb/public/api/client/yc_public/logging/log_entry.proto rename to src/api/client/yc_public/logging/log_entry.proto index aa12765f709..75541a2b7a4 100644 --- a/ydb/public/api/client/yc_public/logging/log_entry.proto +++ b/src/api/client/yc_public/logging/log_entry.proto @@ -4,8 +4,8 @@ package yandex.cloud.logging.v1; import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; -import "ydb/public/api/client/yc_public/logging/log_resource.proto"; -import "ydb/public/api/client/yc_public/common/validation.proto"; +import "src/api/client/yc_public/logging/log_resource.proto"; +import "src/api/client/yc_public/common/validation.proto"; option java_package = "yandex.cloud.api.logging.v1"; diff --git a/ydb/public/api/client/yc_public/logging/log_ingestion_service.proto b/src/api/client/yc_public/logging/log_ingestion_service.proto similarity index 83% rename from ydb/public/api/client/yc_public/logging/log_ingestion_service.proto rename to src/api/client/yc_public/logging/log_ingestion_service.proto index 4da392849e8..9caf99881bb 100644 --- a/ydb/public/api/client/yc_public/logging/log_ingestion_service.proto +++ b/src/api/client/yc_public/logging/log_ingestion_service.proto @@ -3,9 +3,9 @@ syntax = "proto3"; package yandex.cloud.logging.v1; import "google/rpc/status.proto"; -import "ydb/public/api/client/yc_public/logging/log_entry.proto"; -import "ydb/public/api/client/yc_public/logging/log_resource.proto"; -import "ydb/public/api/client/yc_public/common/validation.proto"; +import "src/api/client/yc_public/logging/log_entry.proto"; +import "src/api/client/yc_public/logging/log_resource.proto"; +import "src/api/client/yc_public/common/validation.proto"; option java_package = "yandex.cloud.api.logging.v1"; diff --git a/ydb/public/api/client/yc_public/logging/log_resource.proto b/src/api/client/yc_public/logging/log_resource.proto similarity index 91% rename from ydb/public/api/client/yc_public/logging/log_resource.proto rename to src/api/client/yc_public/logging/log_resource.proto index 93e4a3c2a27..dbfb8b4423d 100644 --- a/ydb/public/api/client/yc_public/logging/log_resource.proto +++ b/src/api/client/yc_public/logging/log_resource.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package yandex.cloud.logging.v1; -import "ydb/public/api/client/yc_public/common/validation.proto"; +import "src/api/client/yc_public/common/validation.proto"; option java_package = "yandex.cloud.api.logging.v1"; diff --git a/src/api/grpc/CMakeLists.txt b/src/api/grpc/CMakeLists.txt new file mode 100644 index 00000000000..89735fa9a55 --- /dev/null +++ b/src/api/grpc/CMakeLists.txt @@ -0,0 +1,44 @@ +add_subdirectory(draft) + +add_library(api-grpc) +set_property(TARGET api-grpc PROPERTY + PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h +) +target_link_libraries(api-grpc PUBLIC + yutil + gRPC::grpc++ + api-protos + protobuf::libprotobuf +) +target_proto_messages(api-grpc PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_federation_discovery_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_auth_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_cms_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_coordination_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_discovery_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_export_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_import_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_monitoring_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_operation_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_query_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_rate_limiter_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_scheme_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_scripting_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_table_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_topic_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/ydb_keyvalue_v1.proto +) +target_proto_addincls(api-grpc + ./ + ${YDB_SDK_SOURCE_DIR} + ${YDB_SDK_BINARY_DIR} +) +target_proto_outs(api-grpc + --cpp_out=${YDB_SDK_BINARY_DIR}/ +) +target_proto_plugin(api-grpc + grpc_cpp + gRPC::grpc_cpp_plugin +) + + diff --git a/src/api/grpc/draft/CMakeLists.txt b/src/api/grpc/draft/CMakeLists.txt new file mode 100644 index 00000000000..10cb67b66d7 --- /dev/null +++ b/src/api/grpc/draft/CMakeLists.txt @@ -0,0 +1,35 @@ +add_library(api-grpc-draft) +set_property(TARGET api-grpc-draft PROPERTY + PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h +) +target_link_libraries(api-grpc-draft PUBLIC + yutil + gRPC::grpc++ + api-protos + protobuf::libprotobuf +) +target_proto_messages(api-grpc-draft PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/draft/dummy.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/draft/fq_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/draft/ydb_clickhouse_internal_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/draft/ydb_persqueue_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/draft/ydb_datastreams_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/draft/ydb_long_tx_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/draft/ydb_maintenance_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/draft/ydb_logstore_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/grpc/draft/ydb_dynamic_config_v1.proto +) +target_proto_addincls(api-grpc-draft + ./ + ${YDB_SDK_SOURCE_DIR} + ${YDB_SDK_BINARY_DIR} +) +target_proto_outs(api-grpc-draft + --cpp_out=${YDB_SDK_BINARY_DIR}/ +) +target_proto_plugin(api-grpc-draft + grpc_cpp + gRPC::grpc_cpp_plugin +) + + diff --git a/ydb/public/api/grpc/draft/dummy.proto b/src/api/grpc/draft/dummy.proto similarity index 91% rename from ydb/public/api/grpc/draft/dummy.proto rename to src/api/grpc/draft/dummy.proto index 9a2a17f0d8d..a8d85179ec0 100644 --- a/ydb/public/api/grpc/draft/dummy.proto +++ b/src/api/grpc/draft/dummy.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option cc_enable_arenas = true; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_operation.proto"; package Draft.Dummy; diff --git a/ydb/public/api/grpc/draft/fq_v1.proto b/src/api/grpc/draft/fq_v1.proto similarity index 98% rename from ydb/public/api/grpc/draft/fq_v1.proto rename to src/api/grpc/draft/fq_v1.proto index e911c5ce953..645212bb333 100644 --- a/ydb/public/api/grpc/draft/fq_v1.proto +++ b/src/api/grpc/draft/fq_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package FederatedQuery.V1; option java_package = "com.federated.query.v1"; -import "ydb/public/api/protos/draft/fq.proto"; +import "src/api/protos/draft/fq.proto"; service FederatedQueryService { // Query diff --git a/ydb/public/api/grpc/draft/ydb_clickhouse_internal_v1.proto b/src/api/grpc/draft/ydb_clickhouse_internal_v1.proto similarity index 95% rename from ydb/public/api/grpc/draft/ydb_clickhouse_internal_v1.proto rename to src/api/grpc/draft/ydb_clickhouse_internal_v1.proto index 01fe731c7a9..f49d9bece26 100644 --- a/ydb/public/api/grpc/draft/ydb_clickhouse_internal_v1.proto +++ b/src/api/grpc/draft/ydb_clickhouse_internal_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.ClickhouseInternal.V1; option java_package = "com.yandex.ydb.clickhouse.v1"; -import "ydb/public/api/protos/ydb_clickhouse_internal.proto"; +import "src/api/protos/ydb_clickhouse_internal.proto"; service ClickhouseInternalService { rpc Scan(ClickhouseInternal.ScanRequest) returns (ClickhouseInternal.ScanResponse); diff --git a/ydb/public/api/grpc/draft/ydb_datastreams_v1.proto b/src/api/grpc/draft/ydb_datastreams_v1.proto similarity index 98% rename from ydb/public/api/grpc/draft/ydb_datastreams_v1.proto rename to src/api/grpc/draft/ydb_datastreams_v1.proto index c87857ea485..f393e6c9df3 100644 --- a/ydb/public/api/grpc/draft/ydb_datastreams_v1.proto +++ b/src/api/grpc/draft/ydb_datastreams_v1.proto @@ -3,7 +3,7 @@ option cc_enable_arenas = true; package Ydb.DataStreams.V1; -import "ydb/public/api/protos/draft/datastreams.proto"; +import "src/api/protos/draft/datastreams.proto"; option java_package = "com.yandex.ydb.datastreams.v1"; diff --git a/ydb/public/api/grpc/draft/ydb_dynamic_config_v1.proto b/src/api/grpc/draft/ydb_dynamic_config_v1.proto similarity index 97% rename from ydb/public/api/grpc/draft/ydb_dynamic_config_v1.proto rename to src/api/grpc/draft/ydb_dynamic_config_v1.proto index 9c8050a8e9a..7a3b185ec29 100644 --- a/ydb/public/api/grpc/draft/ydb_dynamic_config_v1.proto +++ b/src/api/grpc/draft/ydb_dynamic_config_v1.proto @@ -5,7 +5,7 @@ package Ydb.DynamicConfig.V1; option java_package = "com.yandex.ydb.dynamic_config.v1"; -import "ydb/public/api/protos/draft/ydb_dynamic_config.proto"; +import "src/api/protos/draft/ydb_dynamic_config.proto"; // Dynamic Config is the configuration applied to dynamic nodes without static configuration // and is utilized by certain services, such as logging, which can update their settings diff --git a/ydb/public/api/grpc/draft/ydb_logstore_v1.proto b/src/api/grpc/draft/ydb_logstore_v1.proto similarity index 93% rename from ydb/public/api/grpc/draft/ydb_logstore_v1.proto rename to src/api/grpc/draft/ydb_logstore_v1.proto index 707db612207..91ec7c0427b 100644 --- a/ydb/public/api/grpc/draft/ydb_logstore_v1.proto +++ b/src/api/grpc/draft/ydb_logstore_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.LogStore.V1; option java_package = "com.yandex.ydb.logstore.v1"; -import "ydb/public/api/protos/draft/ydb_logstore.proto"; +import "src/api/protos/draft/ydb_logstore.proto"; service LogStoreService { rpc CreateLogStore(CreateLogStoreRequest) returns (CreateLogStoreResponse); diff --git a/ydb/public/api/grpc/draft/ydb_long_tx_v1.proto b/src/api/grpc/draft/ydb_long_tx_v1.proto similarity index 90% rename from ydb/public/api/grpc/draft/ydb_long_tx_v1.proto rename to src/api/grpc/draft/ydb_long_tx_v1.proto index 581ec581bdb..ba9e20fa31b 100644 --- a/ydb/public/api/grpc/draft/ydb_long_tx_v1.proto +++ b/src/api/grpc/draft/ydb_long_tx_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.LongTx.V1; option java_package = "com.yandex.ydb.long_tx.v1"; -import "ydb/public/api/protos/draft/ydb_long_tx.proto"; +import "src/api/protos/draft/ydb_long_tx.proto"; service LongTxService { rpc BeginTx(BeginTransactionRequest) returns (BeginTransactionResponse); diff --git a/ydb/public/api/grpc/draft/ydb_maintenance_v1.proto b/src/api/grpc/draft/ydb_maintenance_v1.proto similarity index 94% rename from ydb/public/api/grpc/draft/ydb_maintenance_v1.proto rename to src/api/grpc/draft/ydb_maintenance_v1.proto index c308e48d2ab..2e354cbcfca 100644 --- a/ydb/public/api/grpc/draft/ydb_maintenance_v1.proto +++ b/src/api/grpc/draft/ydb_maintenance_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.Maintenance.V1; option java_package = "com.yandex.ydb.maintenance.v1"; -import "ydb/public/api/protos/draft/ydb_maintenance.proto"; +import "src/api/protos/draft/ydb_maintenance.proto"; service MaintenanceService { // List cluster nodes. diff --git a/ydb/public/api/grpc/draft/ydb_persqueue_v1.proto b/src/api/grpc/draft/ydb_persqueue_v1.proto similarity index 96% rename from ydb/public/api/grpc/draft/ydb_persqueue_v1.proto rename to src/api/grpc/draft/ydb_persqueue_v1.proto index cbaba2d0ef1..9833da3708b 100644 --- a/ydb/public/api/grpc/draft/ydb_persqueue_v1.proto +++ b/src/api/grpc/draft/ydb_persqueue_v1.proto @@ -5,8 +5,8 @@ package Ydb.PersQueue.V1; option java_package = "com.yandex.ydb.persqueue.v1"; -import "ydb/public/api/protos/ydb_persqueue_cluster_discovery.proto"; -import "ydb/public/api/protos/ydb_persqueue_v1.proto"; +import "src/api/protos/ydb_persqueue_cluster_discovery.proto"; +import "src/api/protos/ydb_persqueue_v1.proto"; service PersQueueService { diff --git a/ydb/public/api/grpc/ydb_auth_v1.proto b/src/api/grpc/ydb_auth_v1.proto similarity index 82% rename from ydb/public/api/grpc/ydb_auth_v1.proto rename to src/api/grpc/ydb_auth_v1.proto index fe45d0662bc..ac1cc92be5d 100644 --- a/ydb/public/api/grpc/ydb_auth_v1.proto +++ b/src/api/grpc/ydb_auth_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.Auth.V1; option java_package = "com.yandex.ydb.auth.v1"; -import "ydb/public/api/protos/ydb_auth.proto"; +import "src/api/protos/ydb_auth.proto"; service AuthService { // Perform login using built-in auth system diff --git a/ydb/public/api/grpc/ydb_cms_v1.proto b/src/api/grpc/ydb_cms_v1.proto similarity index 95% rename from ydb/public/api/grpc/ydb_cms_v1.proto rename to src/api/grpc/ydb_cms_v1.proto index 11e4517381f..b8b11a277e9 100644 --- a/ydb/public/api/grpc/ydb_cms_v1.proto +++ b/src/api/grpc/ydb_cms_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.Cms.V1; option java_package = "com.yandex.ydb.cms.v1"; -import "ydb/public/api/protos/ydb_cms.proto"; +import "src/api/protos/ydb_cms.proto"; // CMS stands for Cluster Management System. CmsService provides some // functionality for managing cluster, i.e. managing YDB Database diff --git a/ydb/public/api/grpc/ydb_coordination_v1.proto b/src/api/grpc/ydb_coordination_v1.proto similarity index 96% rename from ydb/public/api/grpc/ydb_coordination_v1.proto rename to src/api/grpc/ydb_coordination_v1.proto index c4120a2cd02..fd448dfae5f 100644 --- a/ydb/public/api/grpc/ydb_coordination_v1.proto +++ b/src/api/grpc/ydb_coordination_v1.proto @@ -6,7 +6,7 @@ option java_package = "com.yandex.ydb.coordination.v1"; option java_outer_classname = "CoordinationGrpc"; option java_multiple_files = true; -import "ydb/public/api/protos/ydb_coordination.proto"; +import "src/api/protos/ydb_coordination.proto"; service CoordinationService { /** diff --git a/ydb/public/api/grpc/ydb_discovery_v1.proto b/src/api/grpc/ydb_discovery_v1.proto similarity index 89% rename from ydb/public/api/grpc/ydb_discovery_v1.proto rename to src/api/grpc/ydb_discovery_v1.proto index 7005b5b642e..c1268453516 100644 --- a/ydb/public/api/grpc/ydb_discovery_v1.proto +++ b/src/api/grpc/ydb_discovery_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.Discovery.V1; option java_package = "com.yandex.ydb.discovery.v1"; -import "ydb/public/api/protos/ydb_discovery.proto"; +import "src/api/protos/ydb_discovery.proto"; service DiscoveryService { rpc ListEndpoints(Ydb.Discovery.ListEndpointsRequest) returns (Ydb.Discovery.ListEndpointsResponse); diff --git a/ydb/public/api/grpc/ydb_export_v1.proto b/src/api/grpc/ydb_export_v1.proto similarity index 91% rename from ydb/public/api/grpc/ydb_export_v1.proto rename to src/api/grpc/ydb_export_v1.proto index e3768157751..8bdb8bf24c5 100644 --- a/ydb/public/api/grpc/ydb_export_v1.proto +++ b/src/api/grpc/ydb_export_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.Export.V1; option java_package = "com.yandex.ydb.export.v1"; -import "ydb/public/api/protos/ydb_export.proto"; +import "src/api/protos/ydb_export.proto"; service ExportService { diff --git a/ydb/public/api/grpc/ydb_federation_discovery_v1.proto b/src/api/grpc/ydb_federation_discovery_v1.proto similarity index 84% rename from ydb/public/api/grpc/ydb_federation_discovery_v1.proto rename to src/api/grpc/ydb_federation_discovery_v1.proto index 6d884670ef7..4c44bc606a6 100644 --- a/ydb/public/api/grpc/ydb_federation_discovery_v1.proto +++ b/src/api/grpc/ydb_federation_discovery_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.FederationDiscovery.V1; option java_package = "com.yandex.ydb.federation_discovery.v1"; -import "ydb/public/api/protos/ydb_federation_discovery.proto"; +import "src/api/protos/ydb_federation_discovery.proto"; service FederationDiscoveryService { // Get list of databases. diff --git a/ydb/public/api/grpc/ydb_import_v1.proto b/src/api/grpc/ydb_import_v1.proto similarity index 91% rename from ydb/public/api/grpc/ydb_import_v1.proto rename to src/api/grpc/ydb_import_v1.proto index 192a78bd6d3..1fec2cf96c8 100644 --- a/ydb/public/api/grpc/ydb_import_v1.proto +++ b/src/api/grpc/ydb_import_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.Import.V1; option java_package = "com.yandex.ydb.import_.v1"; -import "ydb/public/api/protos/ydb_import.proto"; +import "src/api/protos/ydb_import.proto"; service ImportService { diff --git a/ydb/public/api/grpc/ydb_keyvalue_v1.proto b/src/api/grpc/ydb_keyvalue_v1.proto similarity index 97% rename from ydb/public/api/grpc/ydb_keyvalue_v1.proto rename to src/api/grpc/ydb_keyvalue_v1.proto index 07f073576dd..7fc298fbc59 100644 --- a/ydb/public/api/grpc/ydb_keyvalue_v1.proto +++ b/src/api/grpc/ydb_keyvalue_v1.proto @@ -6,7 +6,7 @@ option java_package = "com.yandex.ydb.keyvalue.v1"; option java_outer_classname = "KeyValueGrpc"; option java_multiple_files = true; -import "ydb/public/api/protos/ydb_keyvalue.proto"; +import "src/api/protos/ydb_keyvalue.proto"; // KeyValue tablets provide a simple key-value storage in a low-overhead and easy-to-shoot-your-leg manner. // To use KeyValue tablets in an efficient way one must be familiar with the design of both the KeyValue tablet diff --git a/ydb/public/api/grpc/ydb_monitoring_v1.proto b/src/api/grpc/ydb_monitoring_v1.proto similarity index 87% rename from ydb/public/api/grpc/ydb_monitoring_v1.proto rename to src/api/grpc/ydb_monitoring_v1.proto index 02580b91afe..d14b503754b 100644 --- a/ydb/public/api/grpc/ydb_monitoring_v1.proto +++ b/src/api/grpc/ydb_monitoring_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.Monitoring.V1; option java_package = "com.yandex.ydb.monitoring.v1"; -import "ydb/public/api/protos/ydb_monitoring.proto"; +import "src/api/protos/ydb_monitoring.proto"; service MonitoringService { // Gets the health status of the database. diff --git a/ydb/public/api/grpc/ydb_operation_v1.proto b/src/api/grpc/ydb_operation_v1.proto similarity index 97% rename from ydb/public/api/grpc/ydb_operation_v1.proto rename to src/api/grpc/ydb_operation_v1.proto index 8202d084843..c58c5f22835 100644 --- a/ydb/public/api/grpc/ydb_operation_v1.proto +++ b/src/api/grpc/ydb_operation_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.Operation.V1; option java_package = "com.yandex.ydb.operation.v1"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_operation.proto"; // All rpc calls to YDB are allowed to be asynchronous. Response message // of an rpc call contains Operation structure and OperationService diff --git a/ydb/public/api/grpc/ydb_query_v1.proto b/src/api/grpc/ydb_query_v1.proto similarity index 97% rename from ydb/public/api/grpc/ydb_query_v1.proto rename to src/api/grpc/ydb_query_v1.proto index cdf6054a40e..a7f1168789e 100644 --- a/ydb/public/api/grpc/ydb_query_v1.proto +++ b/src/api/grpc/ydb_query_v1.proto @@ -3,8 +3,8 @@ syntax = "proto3"; package Ydb.Query.V1; option java_package = "com.yandex.ydb.query.v1"; -import "ydb/public/api/protos/ydb_operation.proto"; -import "ydb/public/api/protos/ydb_query.proto"; +import "src/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_query.proto"; // ! WARNING: Experimental API // ! This API is currently in experimental state and is a subject for changes. diff --git a/ydb/public/api/grpc/ydb_rate_limiter_v1.proto b/src/api/grpc/ydb_rate_limiter_v1.proto similarity index 95% rename from ydb/public/api/grpc/ydb_rate_limiter_v1.proto rename to src/api/grpc/ydb_rate_limiter_v1.proto index be477d1dd59..d091e692cc9 100644 --- a/ydb/public/api/grpc/ydb_rate_limiter_v1.proto +++ b/src/api/grpc/ydb_rate_limiter_v1.proto @@ -6,7 +6,7 @@ option java_package = "com.yandex.ydb.rate_limiter.v1"; option java_outer_classname = "RateLimiterGrpc"; option java_multiple_files = true; -import "ydb/public/api/protos/ydb_rate_limiter.proto"; +import "src/api/protos/ydb_rate_limiter.proto"; // Service that implements distributed rate limiting. // diff --git a/ydb/public/api/grpc/ydb_scheme_v1.proto b/src/api/grpc/ydb_scheme_v1.proto similarity index 95% rename from ydb/public/api/grpc/ydb_scheme_v1.proto rename to src/api/grpc/ydb_scheme_v1.proto index 634b16e8493..7743a85b80a 100644 --- a/ydb/public/api/grpc/ydb_scheme_v1.proto +++ b/src/api/grpc/ydb_scheme_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.Scheme.V1; option java_package = "com.yandex.ydb.scheme.v1"; -import "ydb/public/api/protos/ydb_scheme.proto"; +import "src/api/protos/ydb_scheme.proto"; // Every YDB Database Instance has set of objects organized a tree. // SchemeService provides some functionality to browse and modify diff --git a/ydb/public/api/grpc/ydb_scripting_v1.proto b/src/api/grpc/ydb_scripting_v1.proto similarity index 89% rename from ydb/public/api/grpc/ydb_scripting_v1.proto rename to src/api/grpc/ydb_scripting_v1.proto index c8743a07de3..fa10a0b171c 100644 --- a/ydb/public/api/grpc/ydb_scripting_v1.proto +++ b/src/api/grpc/ydb_scripting_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.Scripting.V1; option java_package = "com.yandex.ydb.scripting.v1"; -import "ydb/public/api/protos/ydb_scripting.proto"; +import "src/api/protos/ydb_scripting.proto"; service ScriptingService { rpc ExecuteYql(Scripting.ExecuteYqlRequest) returns (Scripting.ExecuteYqlResponse); diff --git a/ydb/public/api/grpc/ydb_table_v1.proto b/src/api/grpc/ydb_table_v1.proto similarity index 98% rename from ydb/public/api/grpc/ydb_table_v1.proto rename to src/api/grpc/ydb_table_v1.proto index 2c2053404c7..fe03b667d28 100644 --- a/ydb/public/api/grpc/ydb_table_v1.proto +++ b/src/api/grpc/ydb_table_v1.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Ydb.Table.V1; option java_package = "com.yandex.ydb.table.v1"; -import "ydb/public/api/protos/ydb_table.proto"; +import "src/api/protos/ydb_table.proto"; service TableService { diff --git a/ydb/public/api/grpc/ydb_topic_v1.proto b/src/api/grpc/ydb_topic_v1.proto similarity index 99% rename from ydb/public/api/grpc/ydb_topic_v1.proto rename to src/api/grpc/ydb_topic_v1.proto index 1650f60b403..0ee41592ae8 100644 --- a/ydb/public/api/grpc/ydb_topic_v1.proto +++ b/src/api/grpc/ydb_topic_v1.proto @@ -5,7 +5,7 @@ package Ydb.Topic.V1; option java_package = "com.yandex.ydb.topic.v1"; -import "ydb/public/api/protos/ydb_topic.proto"; +import "src/api/protos/ydb_topic.proto"; service TopicService { // Create Write Session diff --git a/src/api/proto_output/CMakeLists.txt b/src/api/proto_output/CMakeLists.txt new file mode 100644 index 00000000000..6bd99643778 --- /dev/null +++ b/src/api/proto_output/CMakeLists.txt @@ -0,0 +1,12 @@ +add_library(proto_output) + +target_link_libraries(proto_output PUBLIC + yutil + api-protos + protobuf::libprotobuf +) + +target_sources(proto_output PRIVATE + proto_output.cpp +) + diff --git a/ydb/public/api/proto_output/proto_output.cpp b/src/api/proto_output/proto_output.cpp similarity index 88% rename from ydb/public/api/proto_output/proto_output.cpp rename to src/api/proto_output/proto_output.cpp index 80863fefa6d..e822a0cf1e8 100644 --- a/ydb/public/api/proto_output/proto_output.cpp +++ b/src/api/proto_output/proto_output.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include #include diff --git a/src/api/protos/CMakeLists.txt b/src/api/protos/CMakeLists.txt new file mode 100644 index 00000000000..576e1799b6a --- /dev/null +++ b/src/api/protos/CMakeLists.txt @@ -0,0 +1,79 @@ +add_subdirectory(annotations) + +add_library(api-protos) +target_link_libraries(api-protos PUBLIC + yutil + api-protos-annotations + tools-enum_parser-enum_serialization_runtime + protobuf::libprotobuf +) +target_proto_messages(api-protos PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/api/protos/draft/datastreams.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/draft/fq.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/draft/persqueue_common.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/draft/persqueue_error_codes.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/draft/ydb_long_tx.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/draft/ydb_maintenance.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/draft/ydb_logstore.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/draft/ydb_dynamic_config.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_federation_discovery.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/persqueue_error_codes_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_auth.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_persqueue_v1.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_persqueue_cluster_discovery.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_clickhouse_internal.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_cms.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_common.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_coordination.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_discovery.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_export.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_formats.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_import.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_issue_message.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_monitoring.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_operation.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_query_stats.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_query.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_rate_limiter.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_scheme.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_scripting.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_status_codes.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_table.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_topic.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_value.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/ydb_keyvalue.proto +) +generate_enum_serilization(api-protos + ${YDB_SDK_BINARY_DIR}/src/api/protos/draft/persqueue_common.pb.h + INCLUDE_HEADERS + src/api/protos/draft/persqueue_common.pb.h +) +generate_enum_serilization(api-protos + ${YDB_SDK_BINARY_DIR}/src/api/protos/ydb_persqueue_cluster_discovery.pb.h + INCLUDE_HEADERS + src/api/protos/ydb_persqueue_cluster_discovery.pb.h +) +generate_enum_serilization(api-protos + ${YDB_SDK_BINARY_DIR}/src/api/protos/draft/datastreams.pb.h + INCLUDE_HEADERS + src/api/protos/draft/datastreams.pb.h +) +generate_enum_serilization(api-protos + ${YDB_SDK_BINARY_DIR}/src/api/protos/ydb_topic.pb.h + INCLUDE_HEADERS + src/api/protos/ydb_topic.pb.h +) +target_proto_addincls(api-protos + ./ + ${YDB_SDK_SOURCE_DIR} + ${YDB_SDK_BINARY_DIR} +) +target_proto_outs(api-protos + --cpp_out=${YDB_SDK_BINARY_DIR}/ +) +target_proto_plugin(api-protos + grpc_cpp + gRPC::grpc_cpp_plugin +) + + diff --git a/ydb/public/api/protos/annotations/CMakeLists.txt b/src/api/protos/annotations/CMakeLists.txt similarity index 64% rename from ydb/public/api/protos/annotations/CMakeLists.txt rename to src/api/protos/annotations/CMakeLists.txt index e133b607751..a8fabcb34ed 100644 --- a/ydb/public/api/protos/annotations/CMakeLists.txt +++ b/src/api/protos/annotations/CMakeLists.txt @@ -4,13 +4,11 @@ target_link_libraries(api-protos-annotations PUBLIC protobuf::libprotobuf ) target_proto_messages(api-protos-annotations PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/annotations/sensitive.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/annotations/validation.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/annotations/sensitive.proto + ${YDB_SDK_SOURCE_DIR}/src/api/protos/annotations/validation.proto ) target_proto_addincls(api-protos-annotations ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} ${YDB_SDK_SOURCE_DIR} ${YDB_SDK_BINARY_DIR} ) diff --git a/ydb/public/api/protos/annotations/sensitive.proto b/src/api/protos/annotations/sensitive.proto similarity index 100% rename from ydb/public/api/protos/annotations/sensitive.proto rename to src/api/protos/annotations/sensitive.proto diff --git a/ydb/public/api/protos/annotations/validation.proto b/src/api/protos/annotations/validation.proto similarity index 100% rename from ydb/public/api/protos/annotations/validation.proto rename to src/api/protos/annotations/validation.proto diff --git a/ydb/public/api/protos/draft/datastreams.proto b/src/api/protos/draft/datastreams.proto similarity index 99% rename from ydb/public/api/protos/draft/datastreams.proto rename to src/api/protos/draft/datastreams.proto index 88dff1e0ba7..bdb8d47f180 100644 --- a/ydb/public/api/protos/draft/datastreams.proto +++ b/src/api/protos/draft/datastreams.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option cc_enable_arenas = true; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_operation.proto"; import "google/protobuf/descriptor.proto"; diff --git a/ydb/public/api/protos/draft/fq.proto b/src/api/protos/draft/fq.proto similarity index 98% rename from ydb/public/api/protos/draft/fq.proto rename to src/api/protos/draft/fq.proto index 763701ba6bd..9b1fe8d1ac6 100644 --- a/ydb/public/api/protos/draft/fq.proto +++ b/src/api/protos/draft/fq.proto @@ -5,11 +5,11 @@ package FederatedQuery; option java_package = "com.yandex.query"; option java_outer_classname = "FederatedQueryProtos"; -import "ydb/public/api/protos/annotations/sensitive.proto"; -import "ydb/public/api/protos/annotations/validation.proto"; -import "ydb/public/api/protos/ydb_operation.proto"; -import "ydb/public/api/protos/ydb_value.proto"; -import "ydb/public/api/protos/ydb_issue_message.proto"; +import "src/api/protos/annotations/sensitive.proto"; +import "src/api/protos/annotations/validation.proto"; +import "src/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_value.proto"; +import "src/api/protos/ydb_issue_message.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; diff --git a/ydb/public/api/protos/draft/persqueue_common.proto b/src/api/protos/draft/persqueue_common.proto similarity index 94% rename from ydb/public/api/protos/draft/persqueue_common.proto rename to src/api/protos/draft/persqueue_common.proto index 87bb3f236d9..32643fcefee 100644 --- a/ydb/public/api/protos/draft/persqueue_common.proto +++ b/src/api/protos/draft/persqueue_common.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "google/protobuf/descriptor.proto"; -import "ydb/public/api/protos/draft/persqueue_error_codes.proto"; +import "src/api/protos/draft/persqueue_error_codes.proto"; package NPersQueueCommon; diff --git a/ydb/public/api/protos/draft/persqueue_error_codes.proto b/src/api/protos/draft/persqueue_error_codes.proto similarity index 100% rename from ydb/public/api/protos/draft/persqueue_error_codes.proto rename to src/api/protos/draft/persqueue_error_codes.proto diff --git a/ydb/public/api/protos/draft/ydb_dynamic_config.proto b/src/api/protos/draft/ydb_dynamic_config.proto similarity index 99% rename from ydb/public/api/protos/draft/ydb_dynamic_config.proto rename to src/api/protos/draft/ydb_dynamic_config.proto index 9ba65d706d2..666e69da7a0 100644 --- a/ydb/public/api/protos/draft/ydb_dynamic_config.proto +++ b/src/api/protos/draft/ydb_dynamic_config.proto @@ -4,7 +4,7 @@ option cc_enable_arenas = true; package Ydb.DynamicConfig; option java_package = "com.yandex.ydb.dynamic_console"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_operation.proto"; message ConfigIdentity { // Current main config version diff --git a/ydb/public/api/protos/draft/ydb_logstore.proto b/src/api/protos/draft/ydb_logstore.proto similarity index 96% rename from ydb/public/api/protos/draft/ydb_logstore.proto rename to src/api/protos/draft/ydb_logstore.proto index 8c0a24c53aa..1680424c2e1 100644 --- a/ydb/public/api/protos/draft/ydb_logstore.proto +++ b/src/api/protos/draft/ydb_logstore.proto @@ -5,10 +5,10 @@ package Ydb.LogStore; option java_package = "com.yandex.ydb.logstore"; option java_outer_classname = "LogStoreProtos"; -import "ydb/public/api/protos/ydb_operation.proto"; -import "ydb/public/api/protos/ydb_value.proto"; -import "ydb/public/api/protos/ydb_scheme.proto"; -import "ydb/public/api/protos/ydb_table.proto"; +import "src/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_value.proto"; +import "src/api/protos/ydb_scheme.proto"; +import "src/api/protos/ydb_table.proto"; import "google/protobuf/empty.proto"; message Compression { diff --git a/ydb/public/api/protos/draft/ydb_long_tx.proto b/src/api/protos/draft/ydb_long_tx.proto similarity index 97% rename from ydb/public/api/protos/draft/ydb_long_tx.proto rename to src/api/protos/draft/ydb_long_tx.proto index fd22ec6b13f..d608faf9bfe 100644 --- a/ydb/public/api/protos/draft/ydb_long_tx.proto +++ b/src/api/protos/draft/ydb_long_tx.proto @@ -5,7 +5,7 @@ package Ydb.LongTx; option java_package = "com.yandex.ydb.long_tx"; option java_outer_classname = "LongTxProtos"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_operation.proto"; message Data { diff --git a/ydb/public/api/protos/draft/ydb_maintenance.proto b/src/api/protos/draft/ydb_maintenance.proto similarity index 96% rename from ydb/public/api/protos/draft/ydb_maintenance.proto rename to src/api/protos/draft/ydb_maintenance.proto index 904fdc2ed33..b7cde902526 100644 --- a/ydb/public/api/protos/draft/ydb_maintenance.proto +++ b/src/api/protos/draft/ydb_maintenance.proto @@ -1,10 +1,10 @@ syntax = "proto3"; option cc_enable_arenas = true; -import "ydb/public/api/protos/annotations/validation.proto"; -import "ydb/public/api/protos/ydb_discovery.proto"; -import "ydb/public/api/protos/ydb_operation.proto"; -import "ydb/public/api/protos/ydb_status_codes.proto"; +import "src/api/protos/annotations/validation.proto"; +import "src/api/protos/ydb_discovery.proto"; +import "src/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_status_codes.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; diff --git a/ydb/public/api/protos/persqueue_error_codes_v1.proto b/src/api/protos/persqueue_error_codes_v1.proto similarity index 100% rename from ydb/public/api/protos/persqueue_error_codes_v1.proto rename to src/api/protos/persqueue_error_codes_v1.proto diff --git a/ydb/public/api/protos/ydb_auth.proto b/src/api/protos/ydb_auth.proto similarity index 89% rename from ydb/public/api/protos/ydb_auth.proto rename to src/api/protos/ydb_auth.proto index 458b0bc3a66..d8dd4e795c6 100644 --- a/ydb/public/api/protos/ydb_auth.proto +++ b/src/api/protos/ydb_auth.proto @@ -4,7 +4,7 @@ option cc_enable_arenas = true; package Ydb.Auth; option java_package = "com.yandex.ydb.auth"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_operation.proto"; message LoginRequest { Ydb.Operations.OperationParams operation_params = 1; diff --git a/ydb/public/api/protos/ydb_clickhouse_internal.proto b/src/api/protos/ydb_clickhouse_internal.proto similarity index 96% rename from ydb/public/api/protos/ydb_clickhouse_internal.proto rename to src/api/protos/ydb_clickhouse_internal.proto index 0f9e685ed35..84db32a2ea1 100644 --- a/ydb/public/api/protos/ydb_clickhouse_internal.proto +++ b/src/api/protos/ydb_clickhouse_internal.proto @@ -5,8 +5,8 @@ package Ydb.ClickhouseInternal; option java_package = "com.yandex.ydb.clickhouse"; option java_outer_classname = "ClickhouseInternalProtos"; -import "ydb/public/api/protos/ydb_operation.proto"; -import "ydb/public/api/protos/ydb_table.proto"; +import "src/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_table.proto"; message ScanRequest { Ydb.Operations.OperationParams operation_params = 1; diff --git a/ydb/public/api/protos/ydb_cms.proto b/src/api/protos/ydb_cms.proto similarity index 99% rename from ydb/public/api/protos/ydb_cms.proto rename to src/api/protos/ydb_cms.proto index 1a569c70812..a1edbdd1786 100644 --- a/ydb/public/api/protos/ydb_cms.proto +++ b/src/api/protos/ydb_cms.proto @@ -4,7 +4,7 @@ option cc_enable_arenas = true; package Ydb.Cms; option java_package = "com.yandex.ydb.cms"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_operation.proto"; // A set of uniform storage units. // Single storage unit can be thought of as a reserved part of a RAID. diff --git a/ydb/public/api/protos/ydb_common.proto b/src/api/protos/ydb_common.proto similarity index 100% rename from ydb/public/api/protos/ydb_common.proto rename to src/api/protos/ydb_common.proto diff --git a/ydb/public/api/protos/ydb_coordination.proto b/src/api/protos/ydb_coordination.proto similarity index 98% rename from ydb/public/api/protos/ydb_coordination.proto rename to src/api/protos/ydb_coordination.proto index 378045e78e8..2de4c78598c 100644 --- a/ydb/public/api/protos/ydb_coordination.proto +++ b/src/api/protos/ydb_coordination.proto @@ -7,10 +7,10 @@ option java_package = "com.yandex.ydb.coordination"; option java_outer_classname = "CoordinationProtos"; option java_multiple_files = true; -import "ydb/public/api/protos/ydb_operation.proto"; -import "ydb/public/api/protos/ydb_status_codes.proto"; -import "ydb/public/api/protos/ydb_issue_message.proto"; -import "ydb/public/api/protos/ydb_scheme.proto"; +import "src/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_status_codes.proto"; +import "src/api/protos/ydb_issue_message.proto"; +import "src/api/protos/ydb_scheme.proto"; /** * Stub for unsupported messages diff --git a/ydb/public/api/protos/ydb_discovery.proto b/src/api/protos/ydb_discovery.proto similarity index 98% rename from ydb/public/api/protos/ydb_discovery.proto rename to src/api/protos/ydb_discovery.proto index 4c94372eb71..c36cce21b11 100644 --- a/ydb/public/api/protos/ydb_discovery.proto +++ b/src/api/protos/ydb_discovery.proto @@ -5,7 +5,7 @@ package Ydb.Discovery; option java_package = "com.yandex.ydb.discovery"; option java_outer_classname = "DiscoveryProtos"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_operation.proto"; message ListEndpointsRequest { string database = 1; diff --git a/ydb/public/api/protos/ydb_export.proto b/src/api/protos/ydb_export.proto similarity index 96% rename from ydb/public/api/protos/ydb_export.proto rename to src/api/protos/ydb_export.proto index 4e7d33c2bd1..d5de960aeab 100644 --- a/ydb/public/api/protos/ydb_export.proto +++ b/src/api/protos/ydb_export.proto @@ -1,8 +1,8 @@ syntax = "proto3"; option cc_enable_arenas = true; -import "ydb/public/api/protos/annotations/validation.proto"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/annotations/validation.proto"; +import "src/api/protos/ydb_operation.proto"; import "google/protobuf/timestamp.proto"; diff --git a/ydb/public/api/protos/ydb_federation_discovery.proto b/src/api/protos/ydb_federation_discovery.proto similarity index 95% rename from ydb/public/api/protos/ydb_federation_discovery.proto rename to src/api/protos/ydb_federation_discovery.proto index aa40ab0f12e..58deae56172 100644 --- a/ydb/public/api/protos/ydb_federation_discovery.proto +++ b/src/api/protos/ydb_federation_discovery.proto @@ -5,7 +5,7 @@ package Ydb.FederationDiscovery; option java_package = "com.yandex.ydb.federation_discovery"; option java_outer_classname = "FederationDiscoveryProtos"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_operation.proto"; message DatabaseInfo { enum Status { diff --git a/ydb/public/api/protos/ydb_formats.proto b/src/api/protos/ydb_formats.proto similarity index 100% rename from ydb/public/api/protos/ydb_formats.proto rename to src/api/protos/ydb_formats.proto diff --git a/ydb/public/api/protos/ydb_import.proto b/src/api/protos/ydb_import.proto similarity index 96% rename from ydb/public/api/protos/ydb_import.proto rename to src/api/protos/ydb_import.proto index 53eb5a88148..04126016a11 100644 --- a/ydb/public/api/protos/ydb_import.proto +++ b/src/api/protos/ydb_import.proto @@ -1,8 +1,8 @@ syntax = "proto3"; option cc_enable_arenas = true; -import "ydb/public/api/protos/annotations/validation.proto"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/annotations/validation.proto"; +import "src/api/protos/ydb_operation.proto"; import "google/protobuf/timestamp.proto"; diff --git a/ydb/public/api/protos/ydb_issue_message.proto b/src/api/protos/ydb_issue_message.proto similarity index 80% rename from ydb/public/api/protos/ydb_issue_message.proto rename to src/api/protos/ydb_issue_message.proto index 1c294d7c593..0d2abc71287 100644 --- a/ydb/public/api/protos/ydb_issue_message.proto +++ b/src/api/protos/ydb_issue_message.proto @@ -4,7 +4,7 @@ option cc_enable_arenas = true; package Ydb.Issue; option java_package = "com.yandex.ydb"; -// IssueMessage is a transport format for ydb/library/yql/public/issue library +// IssueMessage is a transport format for src/library/yql/public/issue library message IssueMessage { message Position { uint32 row = 1; @@ -16,7 +16,7 @@ message IssueMessage { string message = 2; Position end_position = 3; uint32 issue_code = 4; - // Severity values from ydb/library/yql/public/issue/protos/issue_severity.proto + // Severity values from src/library/yql/public/issue/protos/issue_severity.proto // FATAL = 0; // ERROR = 1; // WARNING = 2; diff --git a/ydb/public/api/protos/ydb_keyvalue.proto b/src/api/protos/ydb_keyvalue.proto similarity index 99% rename from ydb/public/api/protos/ydb_keyvalue.proto rename to src/api/protos/ydb_keyvalue.proto index e9e58f15a2f..dfcd284bd58 100644 --- a/ydb/public/api/protos/ydb_keyvalue.proto +++ b/src/api/protos/ydb_keyvalue.proto @@ -7,7 +7,7 @@ option java_package = "com.yandex.ydb.keyvalue"; option java_outer_classname = "KeyValueProtos"; option java_multiple_files = true; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_operation.proto"; // // KeyValue API. diff --git a/ydb/public/api/protos/ydb_monitoring.proto b/src/api/protos/ydb_monitoring.proto similarity index 98% rename from ydb/public/api/protos/ydb_monitoring.proto rename to src/api/protos/ydb_monitoring.proto index d58cd6c9988..1dec61b57ff 100644 --- a/ydb/public/api/protos/ydb_monitoring.proto +++ b/src/api/protos/ydb_monitoring.proto @@ -5,7 +5,7 @@ package Ydb.Monitoring; option java_package = "com.yandex.ydb.monitoring"; option java_outer_classname = "MonitoringProtos"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_operation.proto"; message StatusFlag { // Describes the general state of a component. diff --git a/ydb/public/api/protos/ydb_operation.proto b/src/api/protos/ydb_operation.proto similarity index 95% rename from ydb/public/api/protos/ydb_operation.proto rename to src/api/protos/ydb_operation.proto index 9d9c64b9eac..cda749c70d1 100644 --- a/ydb/public/api/protos/ydb_operation.proto +++ b/src/api/protos/ydb_operation.proto @@ -4,10 +4,10 @@ option cc_enable_arenas = true; import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; -import "ydb/public/api/protos/annotations/validation.proto"; -import "ydb/public/api/protos/ydb_common.proto"; -import "ydb/public/api/protos/ydb_issue_message.proto"; -import "ydb/public/api/protos/ydb_status_codes.proto"; +import "src/api/protos/annotations/validation.proto"; +import "src/api/protos/ydb_common.proto"; +import "src/api/protos/ydb_issue_message.proto"; +import "src/api/protos/ydb_status_codes.proto"; package Ydb.Operations; diff --git a/ydb/public/api/protos/ydb_persqueue_cluster_discovery.proto b/src/api/protos/ydb_persqueue_cluster_discovery.proto similarity index 97% rename from ydb/public/api/protos/ydb_persqueue_cluster_discovery.proto rename to src/api/protos/ydb_persqueue_cluster_discovery.proto index f39c900943f..4599ab41d57 100644 --- a/ydb/public/api/protos/ydb_persqueue_cluster_discovery.proto +++ b/src/api/protos/ydb_persqueue_cluster_discovery.proto @@ -2,7 +2,7 @@ syntax = "proto3"; import "google/protobuf/empty.proto"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_operation.proto"; package Ydb.PersQueue.ClusterDiscovery; diff --git a/ydb/public/api/protos/ydb_persqueue_v1.proto b/src/api/protos/ydb_persqueue_v1.proto similarity index 99% rename from ydb/public/api/protos/ydb_persqueue_v1.proto rename to src/api/protos/ydb_persqueue_v1.proto index 5262d50f307..cfb4b7c0914 100644 --- a/ydb/public/api/protos/ydb_persqueue_v1.proto +++ b/src/api/protos/ydb_persqueue_v1.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -import "ydb/public/api/protos/ydb_operation.proto"; -import "ydb/public/api/protos/ydb_scheme.proto"; -import "ydb/public/api/protos/ydb_status_codes.proto"; -import "ydb/public/api/protos/ydb_issue_message.proto"; -import "ydb/public/api/protos/annotations/validation.proto"; +import "src/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_scheme.proto"; +import "src/api/protos/ydb_status_codes.proto"; +import "src/api/protos/ydb_issue_message.proto"; +import "src/api/protos/annotations/validation.proto"; package Ydb.PersQueue.V1; diff --git a/ydb/public/api/protos/ydb_query.proto b/src/api/protos/ydb_query.proto similarity index 94% rename from ydb/public/api/protos/ydb_query.proto rename to src/api/protos/ydb_query.proto index ec0bbe861f4..2d0edaa9631 100644 --- a/ydb/public/api/protos/ydb_query.proto +++ b/src/api/protos/ydb_query.proto @@ -7,12 +7,12 @@ option java_outer_classname = "QueryProtos"; import "google/protobuf/duration.proto"; -import "ydb/public/api/protos/annotations/validation.proto"; -import "ydb/public/api/protos/ydb_issue_message.proto"; -import "ydb/public/api/protos/ydb_operation.proto"; -import "ydb/public/api/protos/ydb_query_stats.proto"; -import "ydb/public/api/protos/ydb_status_codes.proto"; -import "ydb/public/api/protos/ydb_value.proto"; +import "src/api/protos/annotations/validation.proto"; +import "src/api/protos/ydb_issue_message.proto"; +import "src/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_query_stats.proto"; +import "src/api/protos/ydb_status_codes.proto"; +import "src/api/protos/ydb_value.proto"; message CreateSessionRequest { } diff --git a/ydb/public/api/protos/ydb_query_stats.proto b/src/api/protos/ydb_query_stats.proto similarity index 100% rename from ydb/public/api/protos/ydb_query_stats.proto rename to src/api/protos/ydb_query_stats.proto diff --git a/ydb/public/api/protos/ydb_rate_limiter.proto b/src/api/protos/ydb_rate_limiter.proto similarity index 98% rename from ydb/public/api/protos/ydb_rate_limiter.proto rename to src/api/protos/ydb_rate_limiter.proto index a3aa37ae442..eba14010cfb 100644 --- a/ydb/public/api/protos/ydb_rate_limiter.proto +++ b/src/api/protos/ydb_rate_limiter.proto @@ -7,8 +7,8 @@ option java_package = "com.yandex.ydb.rate_limiter"; option java_outer_classname = "RateLimiterProtos"; option java_multiple_files = true; -import "ydb/public/api/protos/annotations/validation.proto"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/annotations/validation.proto"; +import "src/api/protos/ydb_operation.proto"; import "google/protobuf/struct.proto"; diff --git a/ydb/public/api/protos/ydb_scheme.proto b/src/api/protos/ydb_scheme.proto similarity index 96% rename from ydb/public/api/protos/ydb_scheme.proto rename to src/api/protos/ydb_scheme.proto index f111e7a5c89..12ec035a96d 100644 --- a/ydb/public/api/protos/ydb_scheme.proto +++ b/src/api/protos/ydb_scheme.proto @@ -5,8 +5,8 @@ package Ydb.Scheme; option java_package = "com.yandex.ydb.scheme"; option java_outer_classname = "SchemeOperationProtos"; -import "ydb/public/api/protos/ydb_common.proto"; -import "ydb/public/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_common.proto"; +import "src/api/protos/ydb_operation.proto"; // Create directory. // All intermediate directories must be created diff --git a/ydb/public/api/protos/ydb_scripting.proto b/src/api/protos/ydb_scripting.proto similarity index 84% rename from ydb/public/api/protos/ydb_scripting.proto rename to src/api/protos/ydb_scripting.proto index 894f92e0c40..ed0674f6644 100644 --- a/ydb/public/api/protos/ydb_scripting.proto +++ b/src/api/protos/ydb_scripting.proto @@ -5,15 +5,15 @@ package Ydb.Scripting; option java_package = "com.yandex.ydb.scripting"; option java_outer_classname = "ScriptingProtos"; -import "ydb/public/api/protos/ydb_operation.proto"; -import "ydb/public/api/protos/ydb_value.proto"; +import "src/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_value.proto"; // TODO: Refactor to ydb_query usage. -import "ydb/public/api/protos/ydb_table.proto"; -import "ydb/public/api/protos/ydb_query_stats.proto"; -import "ydb/public/api/protos/ydb_issue_message.proto"; -import "ydb/public/api/protos/ydb_status_codes.proto"; -import "ydb/public/api/protos/ydb_query.proto"; +import "src/api/protos/ydb_table.proto"; +import "src/api/protos/ydb_query_stats.proto"; +import "src/api/protos/ydb_issue_message.proto"; +import "src/api/protos/ydb_status_codes.proto"; +import "src/api/protos/ydb_query.proto"; message ExecuteYqlRequest { Ydb.Operations.OperationParams operation_params = 1; diff --git a/ydb/public/api/protos/ydb_status_codes.proto b/src/api/protos/ydb_status_codes.proto similarity index 100% rename from ydb/public/api/protos/ydb_status_codes.proto rename to src/api/protos/ydb_status_codes.proto diff --git a/ydb/public/api/protos/ydb_table.proto b/src/api/protos/ydb_table.proto similarity index 98% rename from ydb/public/api/protos/ydb_table.proto rename to src/api/protos/ydb_table.proto index a5d1abcb483..59aeb63d824 100644 --- a/ydb/public/api/protos/ydb_table.proto +++ b/src/api/protos/ydb_table.proto @@ -1,16 +1,16 @@ syntax = "proto3"; option cc_enable_arenas = true; -import "ydb/public/api/protos/annotations/validation.proto"; -import "ydb/public/api/protos/ydb_common.proto"; -import "ydb/public/api/protos/ydb_issue_message.proto"; -import "ydb/public/api/protos/ydb_operation.proto"; -import "ydb/public/api/protos/ydb_query_stats.proto"; -import "ydb/public/api/protos/ydb_value.proto"; -import "ydb/public/api/protos/ydb_scheme.proto"; -import "ydb/public/api/protos/ydb_status_codes.proto"; -import "ydb/public/api/protos/ydb_topic.proto"; -import "ydb/public/api/protos/ydb_formats.proto"; +import "src/api/protos/annotations/validation.proto"; +import "src/api/protos/ydb_common.proto"; +import "src/api/protos/ydb_issue_message.proto"; +import "src/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_query_stats.proto"; +import "src/api/protos/ydb_value.proto"; +import "src/api/protos/ydb_scheme.proto"; +import "src/api/protos/ydb_status_codes.proto"; +import "src/api/protos/ydb_topic.proto"; +import "src/api/protos/ydb_formats.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/duration.proto"; diff --git a/ydb/public/api/protos/ydb_topic.proto b/src/api/protos/ydb_topic.proto similarity index 99% rename from ydb/public/api/protos/ydb_topic.proto rename to src/api/protos/ydb_topic.proto index 8b5c0aac9cf..64a89d050cd 100644 --- a/ydb/public/api/protos/ydb_topic.proto +++ b/src/api/protos/ydb_topic.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -import "ydb/public/api/protos/ydb_operation.proto"; -import "ydb/public/api/protos/ydb_scheme.proto"; -import "ydb/public/api/protos/ydb_status_codes.proto"; -import "ydb/public/api/protos/ydb_issue_message.proto"; -import "ydb/public/api/protos/annotations/validation.proto"; +import "src/api/protos/ydb_operation.proto"; +import "src/api/protos/ydb_scheme.proto"; +import "src/api/protos/ydb_status_codes.proto"; +import "src/api/protos/ydb_issue_message.proto"; +import "src/api/protos/annotations/validation.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; diff --git a/ydb/public/api/protos/ydb_value.proto b/src/api/protos/ydb_value.proto similarity index 100% rename from ydb/public/api/protos/ydb_value.proto rename to src/api/protos/ydb_value.proto diff --git a/client/CMakeLists.txt b/src/client/CMakeLists.txt similarity index 100% rename from client/CMakeLists.txt rename to src/client/CMakeLists.txt diff --git a/client/draft/CMakeLists.txt b/src/client/draft/CMakeLists.txt similarity index 62% rename from client/draft/CMakeLists.txt rename to src/client/draft/CMakeLists.txt index ed28b696e7c..62c84bf048b 100644 --- a/client/draft/CMakeLists.txt +++ b/src/client/draft/CMakeLists.txt @@ -8,9 +8,9 @@ target_link_libraries(cpp-client-draft PUBLIC cpp-client-ydb_value ) target_sources(cpp-client-draft PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/draft/ydb_dynamic_config.cpp - ${YDB_SDK_SOURCE_DIR}/client/draft/ydb_scripting.cpp - ${YDB_SDK_SOURCE_DIR}/client/draft/ydb_long_tx.cpp + ydb_dynamic_config.cpp + ydb_scripting.cpp + ydb_long_tx.cpp ) add_library(YDB-CPP-SDK::Draft ALIAS cpp-client-draft) diff --git a/client/draft/ydb_dynamic_config.cpp b/src/client/draft/ydb_dynamic_config.cpp similarity index 99% rename from client/draft/ydb_dynamic_config.cpp rename to src/client/draft/ydb_dynamic_config.cpp index 6f9f1eac865..fa530754ae4 100644 --- a/client/draft/ydb_dynamic_config.cpp +++ b/src/client/draft/ydb_dynamic_config.cpp @@ -1,7 +1,7 @@ #include "ydb_dynamic_config.h" -#include -#include +#include +#include namespace NYdb::NDynamicConfig { diff --git a/client/draft/ydb_dynamic_config.h b/src/client/draft/ydb_dynamic_config.h similarity index 95% rename from client/draft/ydb_dynamic_config.h rename to src/client/draft/ydb_dynamic_config.h index 60016e8d1da..1d28b6a1579 100644 --- a/client/draft/ydb_dynamic_config.h +++ b/src/client/draft/ydb_dynamic_config.h @@ -1,14 +1,14 @@ #pragma once -#include -#include -#include -#include -#include -#include - -#include -#include +#include +#include +#include +#include +#include +#include + +#include +#include #include diff --git a/client/draft/ydb_long_tx.cpp b/src/client/draft/ydb_long_tx.cpp similarity index 97% rename from client/draft/ydb_long_tx.cpp rename to src/client/draft/ydb_long_tx.cpp index 390145ee5aa..60786fcd967 100644 --- a/client/draft/ydb_long_tx.cpp +++ b/src/client/draft/ydb_long_tx.cpp @@ -1,10 +1,10 @@ #include "ydb_long_tx.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include +#include namespace NYdb { namespace NLongTx { diff --git a/client/draft/ydb_long_tx.h b/src/client/draft/ydb_long_tx.h similarity index 96% rename from client/draft/ydb_long_tx.h rename to src/client/draft/ydb_long_tx.h index da952bf6616..64a7ecfeb2f 100644 --- a/client/draft/ydb_long_tx.h +++ b/src/client/draft/ydb_long_tx.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace NYdb { namespace NLongTx { diff --git a/client/draft/ydb_scripting.cpp b/src/client/draft/ydb_scripting.cpp similarity index 98% rename from client/draft/ydb_scripting.cpp rename to src/client/draft/ydb_scripting.cpp index bf91c476835..a90aa5f48a5 100644 --- a/client/draft/ydb_scripting.cpp +++ b/src/client/draft/ydb_scripting.cpp @@ -1,13 +1,13 @@ #include "ydb_scripting.h" #define INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include -#include +#include +#include +#include namespace NYdb { namespace NScripting { diff --git a/client/draft/ydb_scripting.h b/src/client/draft/ydb_scripting.h similarity index 97% rename from client/draft/ydb_scripting.h rename to src/client/draft/ydb_scripting.h index 8268139e301..af8801700e8 100644 --- a/client/draft/ydb_scripting.h +++ b/src/client/draft/ydb_scripting.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace NYdb { namespace NScripting { diff --git a/client/extensions/CMakeLists.txt b/src/client/extensions/CMakeLists.txt similarity index 100% rename from client/extensions/CMakeLists.txt rename to src/client/extensions/CMakeLists.txt diff --git a/client/extensions/discovery_mutator/CMakeLists.txt b/src/client/extensions/discovery_mutator/CMakeLists.txt similarity index 78% rename from client/extensions/discovery_mutator/CMakeLists.txt rename to src/client/extensions/discovery_mutator/CMakeLists.txt index 8209f417be2..a2bde3f40f8 100644 --- a/client/extensions/discovery_mutator/CMakeLists.txt +++ b/src/client/extensions/discovery_mutator/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(client-extensions-discovery_mutator PUBLIC ) target_sources(client-extensions-discovery_mutator PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/extensions/discovery_mutator/discovery_mutator.cpp + discovery_mutator.cpp ) add_library(YDB-CPP-SDK::DiscoveryMutator ALIAS client-extensions-discovery_mutator) diff --git a/client/extensions/discovery_mutator/discovery_mutator.cpp b/src/client/extensions/discovery_mutator/discovery_mutator.cpp similarity index 100% rename from client/extensions/discovery_mutator/discovery_mutator.cpp rename to src/client/extensions/discovery_mutator/discovery_mutator.cpp diff --git a/client/extensions/discovery_mutator/discovery_mutator.h b/src/client/extensions/discovery_mutator/discovery_mutator.h similarity index 92% rename from client/extensions/discovery_mutator/discovery_mutator.h rename to src/client/extensions/discovery_mutator/discovery_mutator.h index 260a53492ad..94438ab08d9 100644 --- a/client/extensions/discovery_mutator/discovery_mutator.h +++ b/src/client/extensions/discovery_mutator/discovery_mutator.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NDiscoveryMutator { diff --git a/client/extensions/solomon_stats/CMakeLists.txt b/src/client/extensions/solomon_stats/CMakeLists.txt similarity index 71% rename from client/extensions/solomon_stats/CMakeLists.txt rename to src/client/extensions/solomon_stats/CMakeLists.txt index 9c38798b1ff..e62d7432f00 100644 --- a/client/extensions/solomon_stats/CMakeLists.txt +++ b/src/client/extensions/solomon_stats/CMakeLists.txt @@ -10,8 +10,8 @@ target_link_libraries(client-extensions-solomon_stats PUBLIC ) target_sources(client-extensions-solomon_stats PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/extensions/solomon_stats/pull_client.cpp - ${YDB_SDK_SOURCE_DIR}/client/extensions/solomon_stats/pull_connector.cpp + pull_client.cpp + pull_connector.cpp ) add_library(YDB-CPP-SDK::SolomonStats ALIAS client-extensions-solomon_stats) diff --git a/client/extensions/solomon_stats/README.md b/src/client/extensions/solomon_stats/README.md similarity index 95% rename from client/extensions/solomon_stats/README.md rename to src/client/extensions/solomon_stats/README.md index 483d382fa09..b4e2ebb1795 100644 --- a/client/extensions/solomon_stats/README.md +++ b/src/client/extensions/solomon_stats/README.md @@ -32,8 +32,8 @@ After creating NYdb::TDriver you need to add Solomon Monitoring extension. If yo > **Important**: you must plug in monitoring before driver creation. ```cl -#include -#include +#include +#include ... @@ -65,7 +65,7 @@ Implementing NMonitoring::IMetricRegistry provides more flexibility. You can del Select a method which is right for you: ```cl -#include +#include ... diff --git a/client/extensions/solomon_stats/pull_client.cpp b/src/client/extensions/solomon_stats/pull_client.cpp similarity index 100% rename from client/extensions/solomon_stats/pull_client.cpp rename to src/client/extensions/solomon_stats/pull_client.cpp diff --git a/client/extensions/solomon_stats/pull_client.h b/src/client/extensions/solomon_stats/pull_client.h similarity index 78% rename from client/extensions/solomon_stats/pull_client.h rename to src/client/extensions/solomon_stats/pull_client.h index 127e56ed83c..68bf2811aa6 100644 --- a/client/extensions/solomon_stats/pull_client.h +++ b/src/client/extensions/solomon_stats/pull_client.h @@ -1,13 +1,13 @@ #pragma once -#include - -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include namespace NSolomonStatExtension { diff --git a/client/extensions/solomon_stats/pull_connector.cpp b/src/client/extensions/solomon_stats/pull_connector.cpp similarity index 100% rename from client/extensions/solomon_stats/pull_connector.cpp rename to src/client/extensions/solomon_stats/pull_connector.cpp diff --git a/client/extensions/solomon_stats/pull_connector.h b/src/client/extensions/solomon_stats/pull_connector.h similarity index 93% rename from client/extensions/solomon_stats/pull_connector.h rename to src/client/extensions/solomon_stats/pull_connector.h index c01102bdf01..5896b23e7bd 100644 --- a/client/extensions/solomon_stats/pull_connector.h +++ b/src/client/extensions/solomon_stats/pull_connector.h @@ -1,10 +1,10 @@ #pragma once -#include +#include -#include +#include -#include +#include namespace NSolomonStatExtension { diff --git a/client/helpers/CMakeLists.txt b/src/client/helpers/CMakeLists.txt similarity index 83% rename from client/helpers/CMakeLists.txt rename to src/client/helpers/CMakeLists.txt index 08821daaedd..b6d3c620ab5 100644 --- a/client/helpers/CMakeLists.txt +++ b/src/client/helpers/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries(cpp-client-helpers PUBLIC ) target_sources(cpp-client-helpers PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/helpers/helpers.cpp + helpers.cpp ) add_library(YDB-CPP-SDK::Helpers ALIAS cpp-client-helpers) diff --git a/client/helpers/helpers.cpp b/src/client/helpers/helpers.cpp similarity index 91% rename from client/helpers/helpers.cpp rename to src/client/helpers/helpers.cpp index 68b19191306..ac13c78fe52 100644 --- a/client/helpers/helpers.cpp +++ b/src/client/helpers/helpers.cpp @@ -1,10 +1,10 @@ #include "helpers.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace NYdb { diff --git a/client/helpers/helpers.h b/src/client/helpers/helpers.h similarity index 95% rename from client/helpers/helpers.h rename to src/client/helpers/helpers.h index 6f684086759..1aa52163b3c 100644 --- a/client/helpers/helpers.h +++ b/src/client/helpers/helpers.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NYdb { diff --git a/client/iam/CMakeLists.txt b/src/client/iam/CMakeLists.txt similarity index 85% rename from client/iam/CMakeLists.txt rename to src/client/iam/CMakeLists.txt index 8822262abd9..06d89eb4db5 100644 --- a/client/iam/CMakeLists.txt +++ b/src/client/iam/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(cpp-client-iam PUBLIC ) target_sources(cpp-client-iam PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/iam/iam.cpp + iam.cpp ) add_library(YDB-CPP-SDK::Iam ALIAS cpp-client-iam) diff --git a/client/iam/common/CMakeLists.txt b/src/client/iam/common/CMakeLists.txt similarity index 78% rename from client/iam/common/CMakeLists.txt rename to src/client/iam/common/CMakeLists.txt index cb7dcb4c064..f8c10a02551 100644 --- a/client/iam/common/CMakeLists.txt +++ b/src/client/iam/common/CMakeLists.txt @@ -6,12 +6,12 @@ target_link_libraries(client-iam-common PUBLIC cpp-http-simple library-cpp-json cpp-threading-atomic - public-lib-jwt + library-jwt client-ydb_types-credentials ) target_sources(client-iam-common PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/iam/common/iam.cpp + iam.cpp ) diff --git a/client/iam/common/iam.cpp b/src/client/iam/common/iam.cpp similarity index 96% rename from client/iam/common/iam.cpp rename to src/client/iam/common/iam.cpp index 2b5b7669733..20439c42a20 100644 --- a/client/iam/common/iam.cpp +++ b/src/client/iam/common/iam.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include using namespace NYdbGrpc; diff --git a/client/iam/common/iam.h b/src/client/iam/common/iam.h similarity index 95% rename from client/iam/common/iam.h rename to src/client/iam/common/iam.h index adba5b52d59..64d236e5330 100644 --- a/client/iam/common/iam.h +++ b/src/client/iam/common/iam.h @@ -1,18 +1,18 @@ #pragma once -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include namespace NYdb { diff --git a/client/iam/iam.cpp b/src/client/iam/iam.cpp similarity index 88% rename from client/iam/iam.cpp rename to src/client/iam/iam.cpp index 16a6b9320c1..c48700a16d4 100644 --- a/client/iam/iam.cpp +++ b/src/client/iam/iam.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include using namespace yandex::cloud::iam::v1; diff --git a/client/iam/iam.h b/src/client/iam/iam.h similarity index 100% rename from client/iam/iam.h rename to src/client/iam/iam.h diff --git a/client/iam_private/CMakeLists.txt b/src/client/iam_private/CMakeLists.txt similarity index 83% rename from client/iam_private/CMakeLists.txt rename to src/client/iam_private/CMakeLists.txt index f017cf0cc77..51b0cba5a24 100644 --- a/client/iam_private/CMakeLists.txt +++ b/src/client/iam_private/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries(cpp-client-iam_private PUBLIC ) target_sources(cpp-client-iam_private PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/iam_private/iam.cpp + iam.cpp ) add_library(YDB-CPP-SDK::IamPrivate ALIAS cpp-client-iam_private) diff --git a/client/iam_private/iam.cpp b/src/client/iam_private/iam.cpp similarity index 84% rename from client/iam_private/iam.cpp rename to src/client/iam_private/iam.cpp index 6ad950d3523..3c64e22a75d 100644 --- a/client/iam_private/iam.cpp +++ b/src/client/iam_private/iam.cpp @@ -1,9 +1,9 @@ #include "iam.h" -#include +#include -#include -#include +#include +#include namespace NYdb { diff --git a/client/iam_private/iam.h b/src/client/iam_private/iam.h similarity index 91% rename from client/iam_private/iam.h rename to src/client/iam_private/iam.h index 63cfd718cb9..4bd6736087c 100644 --- a/client/iam_private/iam.h +++ b/src/client/iam_private/iam.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NYdb { diff --git a/client/impl/CMakeLists.txt b/src/client/impl/CMakeLists.txt similarity index 100% rename from client/impl/CMakeLists.txt rename to src/client/impl/CMakeLists.txt diff --git a/client/impl/ydb_endpoints/CMakeLists.txt b/src/client/impl/ydb_endpoints/CMakeLists.txt similarity index 74% rename from client/impl/ydb_endpoints/CMakeLists.txt rename to src/client/impl/ydb_endpoints/CMakeLists.txt index 8dcfc7f404e..1d284dfcb46 100644 --- a/client/impl/ydb_endpoints/CMakeLists.txt +++ b/src/client/impl/ydb_endpoints/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries(client-impl-ydb_endpoints PUBLIC ) target_sources(client-impl-ydb_endpoints PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_endpoints/endpoints.cpp + endpoints.cpp ) diff --git a/client/impl/ydb_endpoints/endpoints.cpp b/src/client/impl/ydb_endpoints/endpoints.cpp similarity index 98% rename from client/impl/ydb_endpoints/endpoints.cpp rename to src/client/impl/ydb_endpoints/endpoints.cpp index 9c4eaf3fccf..2319e41ba5d 100644 --- a/client/impl/ydb_endpoints/endpoints.cpp +++ b/src/client/impl/ydb_endpoints/endpoints.cpp @@ -1,9 +1,9 @@ #include "endpoints.h" -#include -#include +#include +#include -#include +#include #include #include diff --git a/client/impl/ydb_endpoints/endpoints.h b/src/client/impl/ydb_endpoints/endpoints.h similarity index 98% rename from client/impl/ydb_endpoints/endpoints.h rename to src/client/impl/ydb_endpoints/endpoints.h index 36aaf3cae4c..b358d981583 100644 --- a/client/impl/ydb_endpoints/endpoints.h +++ b/src/client/impl/ydb_endpoints/endpoints.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/CMakeLists.txt b/src/client/impl/ydb_internal/CMakeLists.txt similarity index 100% rename from client/impl/ydb_internal/CMakeLists.txt rename to src/client/impl/ydb_internal/CMakeLists.txt diff --git a/client/impl/ydb_internal/common/CMakeLists.txt b/src/client/impl/ydb_internal/common/CMakeLists.txt similarity index 59% rename from client/impl/ydb_internal/common/CMakeLists.txt rename to src/client/impl/ydb_internal/common/CMakeLists.txt index 44307167047..cb631287268 100644 --- a/client/impl/ydb_internal/common/CMakeLists.txt +++ b/src/client/impl/ydb_internal/common/CMakeLists.txt @@ -7,8 +7,8 @@ target_link_libraries(impl-ydb_internal-common PUBLIC ) target_sources(impl-ydb_internal-common PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/common/parser.cpp - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/common/getenv.cpp + parser.cpp + getenv.cpp ) diff --git a/client/impl/ydb_internal/common/getenv.cpp b/src/client/impl/ydb_internal/common/getenv.cpp similarity index 100% rename from client/impl/ydb_internal/common/getenv.cpp rename to src/client/impl/ydb_internal/common/getenv.cpp diff --git a/client/impl/ydb_internal/common/getenv.h b/src/client/impl/ydb_internal/common/getenv.h similarity index 100% rename from client/impl/ydb_internal/common/getenv.h rename to src/client/impl/ydb_internal/common/getenv.h diff --git a/client/impl/ydb_internal/common/parser.cpp b/src/client/impl/ydb_internal/common/parser.cpp similarity index 96% rename from client/impl/ydb_internal/common/parser.cpp rename to src/client/impl/ydb_internal/common/parser.cpp index 6055c5e8314..b9985b5f010 100644 --- a/client/impl/ydb_internal/common/parser.cpp +++ b/src/client/impl/ydb_internal/common/parser.cpp @@ -1,6 +1,6 @@ #include "parser.h" -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/common/parser.h b/src/client/impl/ydb_internal/common/parser.h similarity index 100% rename from client/impl/ydb_internal/common/parser.h rename to src/client/impl/ydb_internal/common/parser.h diff --git a/client/impl/ydb_internal/common/ssl_credentials.h b/src/client/impl/ydb_internal/common/ssl_credentials.h similarity index 100% rename from client/impl/ydb_internal/common/ssl_credentials.h rename to src/client/impl/ydb_internal/common/ssl_credentials.h diff --git a/client/impl/ydb_internal/common/types.h b/src/client/impl/ydb_internal/common/types.h similarity index 52% rename from client/impl/ydb_internal/common/types.h rename to src/client/impl/ydb_internal/common/types.h index 05ec0601c59..7613a28e8de 100644 --- a/client/impl/ydb_internal/common/types.h +++ b/src/client/impl/ydb_internal/common/types.h @@ -1,13 +1,13 @@ #pragma once -#include +#include -#include -#include +#include +#include -#include +#include -#include +#include namespace NYdb { diff --git a/src/client/impl/ydb_internal/db_driver_state/CMakeLists.txt b/src/client/impl/ydb_internal/db_driver_state/CMakeLists.txt new file mode 100644 index 00000000000..f5fa3b801df --- /dev/null +++ b/src/client/impl/ydb_internal/db_driver_state/CMakeLists.txt @@ -0,0 +1,17 @@ +add_library(impl-ydb_internal-db_driver_state) + +target_link_libraries(impl-ydb_internal-db_driver_state PUBLIC + yutil + cpp-string_utils-quote + cpp-threading-future + client-impl-ydb_endpoints + impl-ydb_internal-logger + impl-ydb_internal-plain_status + client-ydb_types-credentials +) + +target_sources(impl-ydb_internal-db_driver_state PRIVATE + authenticator.cpp + endpoint_pool.cpp + state.cpp +) diff --git a/client/impl/ydb_internal/db_driver_state/authenticator.cpp b/src/client/impl/ydb_internal/db_driver_state/authenticator.cpp similarity index 94% rename from client/impl/ydb_internal/db_driver_state/authenticator.cpp rename to src/client/impl/ydb_internal/db_driver_state/authenticator.cpp index d6a911a6635..090baa1a2d7 100644 --- a/client/impl/ydb_internal/db_driver_state/authenticator.cpp +++ b/src/client/impl/ydb_internal/db_driver_state/authenticator.cpp @@ -1,7 +1,7 @@ #define INCLUDE_YDB_INTERNAL_H #include "authenticator.h" -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/db_driver_state/authenticator.h b/src/client/impl/ydb_internal/db_driver_state/authenticator.h similarity index 75% rename from client/impl/ydb_internal/db_driver_state/authenticator.h rename to src/client/impl/ydb_internal/db_driver_state/authenticator.h index a2f8b31f2cc..089aeb22f65 100644 --- a/client/impl/ydb_internal/db_driver_state/authenticator.h +++ b/src/client/impl/ydb_internal/db_driver_state/authenticator.h @@ -1,10 +1,10 @@ #pragma once -#include +#include -#include +#include -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/db_driver_state/endpoint_pool.cpp b/src/client/impl/ydb_internal/db_driver_state/endpoint_pool.cpp similarity index 100% rename from client/impl/ydb_internal/db_driver_state/endpoint_pool.cpp rename to src/client/impl/ydb_internal/db_driver_state/endpoint_pool.cpp diff --git a/client/impl/ydb_internal/db_driver_state/endpoint_pool.h b/src/client/impl/ydb_internal/db_driver_state/endpoint_pool.h similarity index 86% rename from client/impl/ydb_internal/db_driver_state/endpoint_pool.h rename to src/client/impl/ydb_internal/db_driver_state/endpoint_pool.h index dab643d8acc..541ecd3c8c3 100644 --- a/client/impl/ydb_internal/db_driver_state/endpoint_pool.h +++ b/src/client/impl/ydb_internal/db_driver_state/endpoint_pool.h @@ -1,13 +1,13 @@ #pragma once -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include diff --git a/client/impl/ydb_internal/db_driver_state/state.cpp b/src/client/impl/ydb_internal/db_driver_state/state.cpp similarity index 97% rename from client/impl/ydb_internal/db_driver_state/state.cpp rename to src/client/impl/ydb_internal/db_driver_state/state.cpp index dfbecbd9fd6..eec489b6166 100644 --- a/client/impl/ydb_internal/db_driver_state/state.cpp +++ b/src/client/impl/ydb_internal/db_driver_state/state.cpp @@ -1,11 +1,11 @@ #define INCLUDE_YDB_INTERNAL_H #include "state.h" -#include -#include -#include +#include +#include +#include -#include +#include #include #include diff --git a/client/impl/ydb_internal/db_driver_state/state.h b/src/client/impl/ydb_internal/db_driver_state/state.h similarity index 93% rename from client/impl/ydb_internal/db_driver_state/state.h rename to src/client/impl/ydb_internal/db_driver_state/state.h index 02fc2aba569..2ec5d960faf 100644 --- a/client/impl/ydb_internal/db_driver_state/state.h +++ b/src/client/impl/ydb_internal/db_driver_state/state.h @@ -2,11 +2,11 @@ #include "endpoint_pool.h" -#include +#include -#include -#include -#include +#include +#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/driver/constants.h b/src/client/impl/ydb_internal/driver/constants.h similarity index 84% rename from client/impl/ydb_internal/driver/constants.h rename to src/client/impl/ydb_internal/driver/constants.h index f4de34f3511..cab0801491a 100644 --- a/client/impl/ydb_internal/driver/constants.h +++ b/src/client/impl/ydb_internal/driver/constants.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/grpc_connections/CMakeLists.txt b/src/client/impl/ydb_internal/grpc_connections/CMakeLists.txt similarity index 69% rename from client/impl/ydb_internal/grpc_connections/CMakeLists.txt rename to src/client/impl/ydb_internal/grpc_connections/CMakeLists.txt index a9c2af40848..4049d6c9b9b 100644 --- a/client/impl/ydb_internal/grpc_connections/CMakeLists.txt +++ b/src/client/impl/ydb_internal/grpc_connections/CMakeLists.txt @@ -13,8 +13,6 @@ target_link_libraries(impl-ydb_internal-grpc_connections PUBLIC ) target_sources(impl-ydb_internal-grpc_connections PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/grpc_connections/actions.cpp - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/grpc_connections/grpc_connections.cpp + actions.cpp + grpc_connections.cpp ) - - diff --git a/client/impl/ydb_internal/grpc_connections/actions.cpp b/src/client/impl/ydb_internal/grpc_connections/actions.cpp similarity index 98% rename from client/impl/ydb_internal/grpc_connections/actions.cpp rename to src/client/impl/ydb_internal/grpc_connections/actions.cpp index 4e3d279273b..86f5c8305f1 100644 --- a/client/impl/ydb_internal/grpc_connections/actions.cpp +++ b/src/client/impl/ydb_internal/grpc_connections/actions.cpp @@ -2,7 +2,7 @@ #include "actions.h" #include "grpc_connections.h" -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/grpc_connections/actions.h b/src/client/impl/ydb_internal/grpc_connections/actions.h similarity index 93% rename from client/impl/ydb_internal/grpc_connections/actions.h rename to src/client/impl/ydb_internal/grpc_connections/actions.h index d1beba64325..ba65f7b36a7 100644 --- a/client/impl/ydb_internal/grpc_connections/actions.h +++ b/src/client/impl/ydb_internal/grpc_connections/actions.h @@ -1,15 +1,15 @@ #pragma once -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include -#include +#include #include diff --git a/client/impl/ydb_internal/grpc_connections/grpc_connections.cpp b/src/client/impl/ydb_internal/grpc_connections/grpc_connections.cpp similarity index 99% rename from client/impl/ydb_internal/grpc_connections/grpc_connections.cpp rename to src/client/impl/ydb_internal/grpc_connections/grpc_connections.cpp index 7c68bbbe9a9..797955fd589 100644 --- a/client/impl/ydb_internal/grpc_connections/grpc_connections.cpp +++ b/src/client/impl/ydb_internal/grpc_connections/grpc_connections.cpp @@ -1,7 +1,7 @@ #define INCLUDE_YDB_INTERNAL_H #include "grpc_connections.h" -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/grpc_connections/grpc_connections.h b/src/client/impl/ydb_internal/grpc_connections/grpc_connections.h similarity index 98% rename from client/impl/ydb_internal/grpc_connections/grpc_connections.h rename to src/client/impl/ydb_internal/grpc_connections/grpc_connections.h index df6a0db755b..0663293e546 100644 --- a/client/impl/ydb_internal/grpc_connections/grpc_connections.h +++ b/src/client/impl/ydb_internal/grpc_connections/grpc_connections.h @@ -1,19 +1,19 @@ #pragma once -#include -#include +#include +#include #include "actions.h" #include "params.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/grpc_connections/params.h b/src/client/impl/ydb_internal/grpc_connections/params.h similarity index 82% rename from client/impl/ydb_internal/grpc_connections/params.h rename to src/client/impl/ydb_internal/grpc_connections/params.h index 102bb9f3f02..773fbe90e48 100644 --- a/client/impl/ydb_internal/grpc_connections/params.h +++ b/src/client/impl/ydb_internal/grpc_connections/params.h @@ -1,11 +1,11 @@ #pragma once -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/internal_client/client.h b/src/client/impl/ydb_internal/internal_client/client.h similarity index 72% rename from client/impl/ydb_internal/internal_client/client.h rename to src/client/impl/ydb_internal/internal_client/client.h index af9e9c0236b..5981a553a80 100644 --- a/client/impl/ydb_internal/internal_client/client.h +++ b/src/client/impl/ydb_internal/internal_client/client.h @@ -1,13 +1,13 @@ #pragma once -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include namespace NMonitoring { class IMetricRegistry; diff --git a/client/impl/ydb_internal/internal_header.h b/src/client/impl/ydb_internal/internal_header.h similarity index 93% rename from client/impl/ydb_internal/internal_header.h rename to src/client/impl/ydb_internal/internal_header.h index acd8f23824e..130eb833a71 100644 --- a/client/impl/ydb_internal/internal_header.h +++ b/src/client/impl/ydb_internal/internal_header.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #if !defined(INCLUDE_YDB_INTERNAL_H) #error "you are trying to use internal ydb header" diff --git a/client/impl/ydb_internal/kqp_session_common/CMakeLists.txt b/src/client/impl/ydb_internal/kqp_session_common/CMakeLists.txt similarity index 74% rename from client/impl/ydb_internal/kqp_session_common/CMakeLists.txt rename to src/client/impl/ydb_internal/kqp_session_common/CMakeLists.txt index 5310db1d2e6..519217bc91c 100644 --- a/client/impl/ydb_internal/kqp_session_common/CMakeLists.txt +++ b/src/client/impl/ydb_internal/kqp_session_common/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries(impl-ydb_internal-kqp_session_common PUBLIC ) target_sources(impl-ydb_internal-kqp_session_common PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/kqp_session_common/kqp_session_common.cpp + kqp_session_common.cpp ) diff --git a/client/impl/ydb_internal/kqp_session_common/kqp_session_common.cpp b/src/client/impl/ydb_internal/kqp_session_common/kqp_session_common.cpp similarity index 98% rename from client/impl/ydb_internal/kqp_session_common/kqp_session_common.cpp rename to src/client/impl/ydb_internal/kqp_session_common/kqp_session_common.cpp index e1ad800deb0..1e780ebc8a9 100644 --- a/client/impl/ydb_internal/kqp_session_common/kqp_session_common.cpp +++ b/src/client/impl/ydb_internal/kqp_session_common/kqp_session_common.cpp @@ -1,6 +1,6 @@ #include "kqp_session_common.h" -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/kqp_session_common/kqp_session_common.h b/src/client/impl/ydb_internal/kqp_session_common/kqp_session_common.h similarity index 91% rename from client/impl/ydb_internal/kqp_session_common/kqp_session_common.h rename to src/client/impl/ydb_internal/kqp_session_common/kqp_session_common.h index 17e038783c2..1733da2b488 100644 --- a/client/impl/ydb_internal/kqp_session_common/kqp_session_common.h +++ b/src/client/impl/ydb_internal/kqp_session_common/kqp_session_common.h @@ -1,10 +1,10 @@ #pragma once -#include -#include +#include +#include -#include -#include +#include +#include #include diff --git a/client/impl/ydb_internal/logger/CMakeLists.txt b/src/client/impl/ydb_internal/logger/CMakeLists.txt similarity index 73% rename from client/impl/ydb_internal/logger/CMakeLists.txt rename to src/client/impl/ydb_internal/logger/CMakeLists.txt index 38aec0cace3..c81fee4eefb 100644 --- a/client/impl/ydb_internal/logger/CMakeLists.txt +++ b/src/client/impl/ydb_internal/logger/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(impl-ydb_internal-logger PUBLIC ) target_sources(impl-ydb_internal-logger PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/logger/log.cpp + log.cpp ) diff --git a/client/impl/ydb_internal/logger/log.cpp b/src/client/impl/ydb_internal/logger/log.cpp similarity index 92% rename from client/impl/ydb_internal/logger/log.cpp rename to src/client/impl/ydb_internal/logger/log.cpp index 1b9ae0c7bf9..b62823e0bda 100644 --- a/client/impl/ydb_internal/logger/log.cpp +++ b/src/client/impl/ydb_internal/logger/log.cpp @@ -1,10 +1,10 @@ #define INCLUDE_YDB_INTERNAL_H #include "log.h" -#include +#include -#include -#include +#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/logger/log.h b/src/client/impl/ydb_internal/logger/log.h similarity index 65% rename from client/impl/ydb_internal/logger/log.h rename to src/client/impl/ydb_internal/logger/log.h index fc713c352ec..a1ba3e9ed8d 100644 --- a/client/impl/ydb_internal/logger/log.h +++ b/src/client/impl/ydb_internal/logger/log.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/make_request/CMakeLists.txt b/src/client/impl/ydb_internal/make_request/CMakeLists.txt similarity index 74% rename from client/impl/ydb_internal/make_request/CMakeLists.txt rename to src/client/impl/ydb_internal/make_request/CMakeLists.txt index 72ce6245cfb..f81bf636eec 100644 --- a/client/impl/ydb_internal/make_request/CMakeLists.txt +++ b/src/client/impl/ydb_internal/make_request/CMakeLists.txt @@ -7,7 +7,5 @@ target_link_libraries(impl-ydb_internal-make_request PUBLIC ) target_sources(impl-ydb_internal-make_request PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/make_request/make.cpp + make.cpp ) - - diff --git a/client/impl/ydb_internal/make_request/make.cpp b/src/client/impl/ydb_internal/make_request/make.cpp similarity index 100% rename from client/impl/ydb_internal/make_request/make.cpp rename to src/client/impl/ydb_internal/make_request/make.cpp diff --git a/client/impl/ydb_internal/make_request/make.h b/src/client/impl/ydb_internal/make_request/make.h similarity index 91% rename from client/impl/ydb_internal/make_request/make.h rename to src/client/impl/ydb_internal/make_request/make.h index 61d403d2ed7..ba39148b657 100644 --- a/client/impl/ydb_internal/make_request/make.h +++ b/src/client/impl/ydb_internal/make_request/make.h @@ -1,9 +1,9 @@ #pragma once -#include -#include +#include +#include -#include +#include #include diff --git a/client/impl/ydb_internal/plain_status/CMakeLists.txt b/src/client/impl/ydb_internal/plain_status/CMakeLists.txt similarity index 75% rename from client/impl/ydb_internal/plain_status/CMakeLists.txt rename to src/client/impl/ydb_internal/plain_status/CMakeLists.txt index 80738710c41..c320794b3a0 100644 --- a/client/impl/ydb_internal/plain_status/CMakeLists.txt +++ b/src/client/impl/ydb_internal/plain_status/CMakeLists.txt @@ -8,7 +8,5 @@ target_link_libraries(impl-ydb_internal-plain_status PUBLIC ) target_sources(impl-ydb_internal-plain_status PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/plain_status/status.cpp + status.cpp ) - - diff --git a/client/impl/ydb_internal/plain_status/status.cpp b/src/client/impl/ydb_internal/plain_status/status.cpp similarity index 98% rename from client/impl/ydb_internal/plain_status/status.cpp rename to src/client/impl/ydb_internal/plain_status/status.cpp index effbd99b832..a61071bd746 100644 --- a/client/impl/ydb_internal/plain_status/status.cpp +++ b/src/client/impl/ydb_internal/plain_status/status.cpp @@ -1,7 +1,7 @@ #define INCLUDE_YDB_INTERNAL_H #include "status.h" -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/plain_status/status.h b/src/client/impl/ydb_internal/plain_status/status.h similarity index 87% rename from client/impl/ydb_internal/plain_status/status.h rename to src/client/impl/ydb_internal/plain_status/status.h index aa4c86ecd36..25a4e16e415 100644 --- a/client/impl/ydb_internal/plain_status/status.h +++ b/src/client/impl/ydb_internal/plain_status/status.h @@ -1,14 +1,14 @@ #pragma once -#include +#include -#include +#include -#include +#include -#include +#include -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/retry/CMakeLists.txt b/src/client/impl/ydb_internal/retry/CMakeLists.txt similarity index 73% rename from client/impl/ydb_internal/retry/CMakeLists.txt rename to src/client/impl/ydb_internal/retry/CMakeLists.txt index 80439cd91f7..6285c89a48d 100644 --- a/client/impl/ydb_internal/retry/CMakeLists.txt +++ b/src/client/impl/ydb_internal/retry/CMakeLists.txt @@ -6,7 +6,5 @@ target_link_libraries(impl-ydb_internal-retry PUBLIC ) target_sources(impl-ydb_internal-retry PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/retry/retry.cpp + retry.cpp ) - - diff --git a/client/impl/ydb_internal/retry/retry.cpp b/src/client/impl/ydb_internal/retry/retry.cpp similarity index 90% rename from client/impl/ydb_internal/retry/retry.cpp rename to src/client/impl/ydb_internal/retry/retry.cpp index 189f65d852e..67771541220 100644 --- a/client/impl/ydb_internal/retry/retry.cpp +++ b/src/client/impl/ydb_internal/retry/retry.cpp @@ -1,7 +1,7 @@ #include "retry.h" -#include -#include -#include +#include +#include +#include #include diff --git a/client/impl/ydb_internal/retry/retry.h b/src/client/impl/ydb_internal/retry/retry.h similarity index 90% rename from client/impl/ydb_internal/retry/retry.h rename to src/client/impl/ydb_internal/retry/retry.h index 0a607f3718b..b206664ce2f 100644 --- a/client/impl/ydb_internal/retry/retry.h +++ b/src/client/impl/ydb_internal/retry/retry.h @@ -1,14 +1,14 @@ #pragma once -#include -#include -#include - -#include -#include -#include -#include -#include +#include +#include +#include + +#include +#include +#include +#include +#include #include #include diff --git a/client/impl/ydb_internal/retry/retry_async.h b/src/client/impl/ydb_internal/retry/retry_async.h similarity index 98% rename from client/impl/ydb_internal/retry/retry_async.h rename to src/client/impl/ydb_internal/retry/retry_async.h index 6859854ecb0..3b616c05d94 100644 --- a/client/impl/ydb_internal/retry/retry_async.h +++ b/src/client/impl/ydb_internal/retry/retry_async.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include namespace NYdb::NRetry::Async { diff --git a/client/impl/ydb_internal/retry/retry_sync.h b/src/client/impl/ydb_internal/retry/retry_sync.h similarity index 96% rename from client/impl/ydb_internal/retry/retry_sync.h rename to src/client/impl/ydb_internal/retry/retry_sync.h index 56c9051bd0f..ed084d0e4bc 100644 --- a/client/impl/ydb_internal/retry/retry_sync.h +++ b/src/client/impl/ydb_internal/retry/retry_sync.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace NYdb::NRetry::Sync { diff --git a/client/impl/ydb_internal/rpc_request_settings/settings.h b/src/client/impl/ydb_internal/rpc_request_settings/settings.h similarity index 92% rename from client/impl/ydb_internal/rpc_request_settings/settings.h rename to src/client/impl/ydb_internal/rpc_request_settings/settings.h index 44951b87679..34a31f115ee 100644 --- a/client/impl/ydb_internal/rpc_request_settings/settings.h +++ b/src/client/impl/ydb_internal/rpc_request_settings/settings.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/scheme_helpers/helpers.h b/src/client/impl/ydb_internal/scheme_helpers/helpers.h similarity index 91% rename from client/impl/ydb_internal/scheme_helpers/helpers.h rename to src/client/impl/ydb_internal/scheme_helpers/helpers.h index dacc672f14b..74648f7800a 100644 --- a/client/impl/ydb_internal/scheme_helpers/helpers.h +++ b/src/client/impl/ydb_internal/scheme_helpers/helpers.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include namespace NYdb { diff --git a/client/impl/ydb_internal/session_client/session_client.h b/src/client/impl/ydb_internal/session_client/session_client.h similarity index 90% rename from client/impl/ydb_internal/session_client/session_client.h rename to src/client/impl/ydb_internal/session_client/session_client.h index 49f26b28d0e..abd9655eb20 100644 --- a/client/impl/ydb_internal/session_client/session_client.h +++ b/src/client/impl/ydb_internal/session_client/session_client.h @@ -2,7 +2,7 @@ #include -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/session_pool/CMakeLists.txt b/src/client/impl/ydb_internal/session_pool/CMakeLists.txt similarity index 77% rename from client/impl/ydb_internal/session_pool/CMakeLists.txt rename to src/client/impl/ydb_internal/session_pool/CMakeLists.txt index 24d38c9108d..02a5db6701b 100644 --- a/client/impl/ydb_internal/session_pool/CMakeLists.txt +++ b/src/client/impl/ydb_internal/session_pool/CMakeLists.txt @@ -1,7 +1,6 @@ add_library(impl-ydb_internal-session_pool) target_link_libraries(impl-ydb_internal-session_pool PUBLIC - yutil cpp-threading-future api-protos @@ -11,7 +10,5 @@ target_link_libraries(impl-ydb_internal-session_pool PUBLIC ) target_sources(impl-ydb_internal-session_pool PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/session_pool/session_pool.cpp + session_pool.cpp ) - - diff --git a/client/impl/ydb_internal/session_pool/session_pool.cpp b/src/client/impl/ydb_internal/session_pool/session_pool.cpp similarity index 98% rename from client/impl/ydb_internal/session_pool/session_pool.cpp rename to src/client/impl/ydb_internal/session_pool/session_pool.cpp index f623cf5e0f6..9e579d9b1cf 100644 --- a/client/impl/ydb_internal/session_pool/session_pool.cpp +++ b/src/client/impl/ydb_internal/session_pool/session_pool.cpp @@ -1,13 +1,13 @@ #include "session_pool.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include -#include +#include namespace NYdb { namespace NSessionPool { diff --git a/client/impl/ydb_internal/session_pool/session_pool.h b/src/client/impl/ydb_internal/session_pool/session_pool.h similarity index 97% rename from client/impl/ydb_internal/session_pool/session_pool.h rename to src/client/impl/ydb_internal/session_pool/session_pool.h index bb1ac891b2f..108d1abfde4 100644 --- a/client/impl/ydb_internal/session_pool/session_pool.h +++ b/src/client/impl/ydb_internal/session_pool/session_pool.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/stats_extractor/extractor.h b/src/client/impl/ydb_internal/stats_extractor/extractor.h similarity index 81% rename from client/impl/ydb_internal/stats_extractor/extractor.h rename to src/client/impl/ydb_internal/stats_extractor/extractor.h index 053826c156e..1822415e0f9 100644 --- a/client/impl/ydb_internal/stats_extractor/extractor.h +++ b/src/client/impl/ydb_internal/stats_extractor/extractor.h @@ -1,12 +1,12 @@ #pragma once -#include +#include -#include +#include -#include +#include -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/table_helpers/helpers.h b/src/client/impl/ydb_internal/table_helpers/helpers.h similarity index 85% rename from client/impl/ydb_internal/table_helpers/helpers.h rename to src/client/impl/ydb_internal/table_helpers/helpers.h index be5c45a5fd7..185aadc2ad5 100644 --- a/client/impl/ydb_internal/table_helpers/helpers.h +++ b/src/client/impl/ydb_internal/table_helpers/helpers.h @@ -1,9 +1,9 @@ #pragma once -#include +#include -#include -#include +#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/thread_pool/CMakeLists.txt b/src/client/impl/ydb_internal/thread_pool/CMakeLists.txt similarity index 70% rename from client/impl/ydb_internal/thread_pool/CMakeLists.txt rename to src/client/impl/ydb_internal/thread_pool/CMakeLists.txt index 03dcfaeacb1..c243a2beaee 100644 --- a/client/impl/ydb_internal/thread_pool/CMakeLists.txt +++ b/src/client/impl/ydb_internal/thread_pool/CMakeLists.txt @@ -5,7 +5,5 @@ target_link_libraries(impl-ydb_internal-thread_pool PUBLIC ) target_sources(impl-ydb_internal-thread_pool PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/thread_pool/pool.cpp + pool.cpp ) - - diff --git a/client/impl/ydb_internal/thread_pool/pool.cpp b/src/client/impl/ydb_internal/thread_pool/pool.cpp similarity index 100% rename from client/impl/ydb_internal/thread_pool/pool.cpp rename to src/client/impl/ydb_internal/thread_pool/pool.cpp diff --git a/client/impl/ydb_internal/thread_pool/pool.h b/src/client/impl/ydb_internal/thread_pool/pool.h similarity index 80% rename from client/impl/ydb_internal/thread_pool/pool.h rename to src/client/impl/ydb_internal/thread_pool/pool.h index 4054ffe5300..03d7061f36d 100644 --- a/client/impl/ydb_internal/thread_pool/pool.h +++ b/src/client/impl/ydb_internal/thread_pool/pool.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include #include diff --git a/client/impl/ydb_internal/value_helpers/CMakeLists.txt b/src/client/impl/ydb_internal/value_helpers/CMakeLists.txt similarity index 74% rename from client/impl/ydb_internal/value_helpers/CMakeLists.txt rename to src/client/impl/ydb_internal/value_helpers/CMakeLists.txt index c31b3972103..2c0b11ea010 100644 --- a/client/impl/ydb_internal/value_helpers/CMakeLists.txt +++ b/src/client/impl/ydb_internal/value_helpers/CMakeLists.txt @@ -7,7 +7,5 @@ target_link_libraries(impl-ydb_internal-value_helpers PUBLIC ) target_sources(impl-ydb_internal-value_helpers PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_internal/value_helpers/helpers.cpp + helpers.cpp ) - - diff --git a/client/impl/ydb_internal/value_helpers/helpers.cpp b/src/client/impl/ydb_internal/value_helpers/helpers.cpp similarity index 97% rename from client/impl/ydb_internal/value_helpers/helpers.cpp rename to src/client/impl/ydb_internal/value_helpers/helpers.cpp index 1a90f0d3ac2..a0fbdd90a96 100644 --- a/client/impl/ydb_internal/value_helpers/helpers.cpp +++ b/src/client/impl/ydb_internal/value_helpers/helpers.cpp @@ -1,10 +1,10 @@ #define INCLUDE_YDB_INTERNAL_H #include "helpers.h" -#include +#include -#include +#include -#include +#include namespace NYdb { diff --git a/client/impl/ydb_internal/value_helpers/helpers.h b/src/client/impl/ydb_internal/value_helpers/helpers.h similarity index 52% rename from client/impl/ydb_internal/value_helpers/helpers.h rename to src/client/impl/ydb_internal/value_helpers/helpers.h index 8ebab9f07f3..54cc366e1b4 100644 --- a/client/impl/ydb_internal/value_helpers/helpers.h +++ b/src/client/impl/ydb_internal/value_helpers/helpers.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include namespace NYdb { diff --git a/client/impl/ydb_stats/CMakeLists.txt b/src/client/impl/ydb_stats/CMakeLists.txt similarity index 77% rename from client/impl/ydb_stats/CMakeLists.txt rename to src/client/impl/ydb_stats/CMakeLists.txt index 4a87762c51e..194a9ec86b4 100644 --- a/client/impl/ydb_stats/CMakeLists.txt +++ b/src/client/impl/ydb_stats/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries(client-impl-ydb_stats PUBLIC ) target_sources(client-impl-ydb_stats PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_stats/stats.cpp + stats.cpp ) diff --git a/client/impl/ydb_stats/stats.cpp b/src/client/impl/ydb_stats/stats.cpp similarity index 100% rename from client/impl/ydb_stats/stats.cpp rename to src/client/impl/ydb_stats/stats.cpp diff --git a/client/impl/ydb_stats/stats.h b/src/client/impl/ydb_stats/stats.h similarity index 98% rename from client/impl/ydb_stats/stats.h rename to src/client/impl/ydb_stats/stats.h index 8504b7b172f..3810d048b13 100644 --- a/client/impl/ydb_stats/stats.h +++ b/src/client/impl/ydb_stats/stats.h @@ -1,10 +1,10 @@ #pragma once -#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/client/resources/CMakeLists.txt b/src/client/resources/CMakeLists.txt similarity index 58% rename from client/resources/CMakeLists.txt rename to src/client/resources/CMakeLists.txt index f088ddb369c..f7526f918e7 100644 --- a/client/resources/CMakeLists.txt +++ b/src/client/resources/CMakeLists.txt @@ -4,8 +4,8 @@ target_link_libraries(cpp-client-resources PUBLIC library-cpp-resource ) target_sources(cpp-client-resources PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/resources/ydb_resources.cpp - ${YDB_SDK_SOURCE_DIR}/client/resources/ydb_ca.cpp + ydb_resources.cpp + ydb_ca.cpp ) add_global_library_for(cpp-client-resources.global cpp-client-resources) @@ -14,13 +14,13 @@ target_link_libraries(cpp-client-resources.global PUBLIC library-cpp-resource ) target_sources(cpp-client-resources.global PRIVATE - ${YDB_SDK_BINARY_DIR}/client/resources/6ed212bf45019efe2a5e72b6d5ed50fb.cpp + ${YDB_SDK_BINARY_DIR}/src/client/resources/6ed212bf45019efe2a5e72b6d5ed50fb.cpp ) resources(cpp-client-resources.global - ${YDB_SDK_BINARY_DIR}/client/resources/6ed212bf45019efe2a5e72b6d5ed50fb.cpp + ${YDB_SDK_BINARY_DIR}/src/client/resources/6ed212bf45019efe2a5e72b6d5ed50fb.cpp INPUTS - ${YDB_SDK_SOURCE_DIR}/client/resources/ydb_sdk_version.txt - ${YDB_SDK_SOURCE_DIR}/client/resources/ydb_root_ca.pem + ${YDB_SDK_SOURCE_DIR}/src/client/resources/ydb_sdk_version.txt + ${YDB_SDK_SOURCE_DIR}/src/client/resources/ydb_root_ca.pem KEYS ydb_sdk_version.txt ydb_root_ca.pem diff --git a/client/resources/ydb_ca.cpp b/src/client/resources/ydb_ca.cpp similarity index 77% rename from client/resources/ydb_ca.cpp rename to src/client/resources/ydb_ca.cpp index 8e6ac4b5669..d0db07efe11 100644 --- a/client/resources/ydb_ca.cpp +++ b/src/client/resources/ydb_ca.cpp @@ -1,4 +1,4 @@ -#include +#include #include "ydb_ca.h" diff --git a/client/resources/ydb_ca.h b/src/client/resources/ydb_ca.h similarity index 100% rename from client/resources/ydb_ca.h rename to src/client/resources/ydb_ca.h diff --git a/client/resources/ydb_resources.cpp b/src/client/resources/ydb_resources.cpp similarity index 97% rename from client/resources/ydb_resources.cpp rename to src/client/resources/ydb_resources.cpp index fc137650ea7..c4f9df29840 100644 --- a/client/resources/ydb_resources.cpp +++ b/src/client/resources/ydb_resources.cpp @@ -1,4 +1,4 @@ -#include +#include #include "ydb_resources.h" diff --git a/client/resources/ydb_resources.h b/src/client/resources/ydb_resources.h similarity index 100% rename from client/resources/ydb_resources.h rename to src/client/resources/ydb_resources.h diff --git a/client/resources/ydb_root_ca.pem b/src/client/resources/ydb_root_ca.pem similarity index 100% rename from client/resources/ydb_root_ca.pem rename to src/client/resources/ydb_root_ca.pem diff --git a/client/resources/ydb_sdk_version.txt b/src/client/resources/ydb_sdk_version.txt similarity index 100% rename from client/resources/ydb_sdk_version.txt rename to src/client/resources/ydb_sdk_version.txt diff --git a/client/ydb_common_client/CMakeLists.txt b/src/client/ydb_common_client/CMakeLists.txt similarity index 83% rename from client/ydb_common_client/CMakeLists.txt rename to src/client/ydb_common_client/CMakeLists.txt index abed62e68bc..c21e1fac513 100644 --- a/client/ydb_common_client/CMakeLists.txt +++ b/src/client/ydb_common_client/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(cpp-client-ydb_common_client PUBLIC ) target_sources(cpp-client-ydb_common_client PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_common_client/settings.cpp + settings.cpp ) add_library(YDB-CPP-SDK::CommonClient ALIAS cpp-client-ydb_common_client) diff --git a/client/ydb_common_client/impl/CMakeLists.txt b/src/client/ydb_common_client/impl/CMakeLists.txt similarity index 76% rename from client/ydb_common_client/impl/CMakeLists.txt rename to src/client/ydb_common_client/impl/CMakeLists.txt index 26aa184bc1a..7a939ed2da2 100644 --- a/client/ydb_common_client/impl/CMakeLists.txt +++ b/src/client/ydb_common_client/impl/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(client-ydb_common_client-impl PUBLIC ) target_sources(client-ydb_common_client-impl PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_common_client/impl/client.cpp + client.cpp ) diff --git a/client/ydb_common_client/impl/client.cpp b/src/client/ydb_common_client/impl/client.cpp similarity index 100% rename from client/ydb_common_client/impl/client.cpp rename to src/client/ydb_common_client/impl/client.cpp diff --git a/client/ydb_common_client/impl/client.h b/src/client/ydb_common_client/impl/client.h similarity index 95% rename from client/ydb_common_client/impl/client.h rename to src/client/ydb_common_client/impl/client.h index bcf9f5d6a48..f01358d4106 100644 --- a/client/ydb_common_client/impl/client.h +++ b/src/client/ydb_common_client/impl/client.h @@ -3,11 +3,11 @@ #include "iface.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include #include diff --git a/client/ydb_common_client/impl/iface.h b/src/client/ydb_common_client/impl/iface.h similarity index 86% rename from client/ydb_common_client/impl/iface.h rename to src/client/ydb_common_client/impl/iface.h index 2f0e3105996..31977f59b60 100644 --- a/client/ydb_common_client/impl/iface.h +++ b/src/client/ydb_common_client/impl/iface.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace NYdb { diff --git a/client/ydb_common_client/settings.cpp b/src/client/ydb_common_client/settings.cpp similarity index 92% rename from client/ydb_common_client/settings.cpp rename to src/client/ydb_common_client/settings.cpp index 6489e18cde9..ef32906a095 100644 --- a/client/ydb_common_client/settings.cpp +++ b/src/client/ydb_common_client/settings.cpp @@ -1,6 +1,6 @@ #include "settings.h" -#include +#include namespace NYdb { diff --git a/client/ydb_common_client/settings.h b/src/client/ydb_common_client/settings.h similarity index 91% rename from client/ydb_common_client/settings.h rename to src/client/ydb_common_client/settings.h index 42749824a0c..88dbbbd40cc 100644 --- a/client/ydb_common_client/settings.h +++ b/src/client/ydb_common_client/settings.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include +#include +#include +#include -#include +#include #include #include diff --git a/client/ydb_coordination/CMakeLists.txt b/src/client/ydb_coordination/CMakeLists.txt similarity index 70% rename from client/ydb_coordination/CMakeLists.txt rename to src/client/ydb_coordination/CMakeLists.txt index 188c0015e3e..84e5b71cabd 100644 --- a/client/ydb_coordination/CMakeLists.txt +++ b/src/client/ydb_coordination/CMakeLists.txt @@ -14,14 +14,14 @@ target_link_libraries(cpp-client-ydb_coordination PUBLIC ) target_sources(cpp-client-ydb_coordination PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_coordination/coordination.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_coordination/proto_accessor.cpp + coordination.cpp + proto_accessor.cpp ) generate_enum_serilization(cpp-client-ydb_coordination - ${YDB_SDK_SOURCE_DIR}/client/ydb_coordination/coordination.h + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_coordination/coordination.h INCLUDE_HEADERS - client/ydb_coordination/coordination.h + src/client/ydb_coordination/coordination.h ) add_library(YDB-CPP-SDK::Coordination ALIAS cpp-client-ydb_coordination) diff --git a/client/ydb_coordination/coordination.cpp b/src/client/ydb_coordination/coordination.cpp similarity index 99% rename from client/ydb_coordination/coordination.cpp rename to src/client/ydb_coordination/coordination.cpp index aa220079cd5..eeebeee7471 100644 --- a/client/ydb_coordination/coordination.cpp +++ b/src/client/ydb_coordination/coordination.cpp @@ -1,14 +1,14 @@ #include "coordination.h" #define INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include -#include +#include namespace NYdb { namespace NCoordination { diff --git a/client/ydb_coordination/coordination.h b/src/client/ydb_coordination/coordination.h similarity index 99% rename from client/ydb_coordination/coordination.h rename to src/client/ydb_coordination/coordination.h index 2cec5add6de..4ca588d67e5 100644 --- a/client/ydb_coordination/coordination.h +++ b/src/client/ydb_coordination/coordination.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace Ydb { namespace Coordination { diff --git a/client/ydb_coordination/proto_accessor.cpp b/src/client/ydb_coordination/proto_accessor.cpp similarity index 83% rename from client/ydb_coordination/proto_accessor.cpp rename to src/client/ydb_coordination/proto_accessor.cpp index 510ee614162..7ed1f58650a 100644 --- a/client/ydb_coordination/proto_accessor.cpp +++ b/src/client/ydb_coordination/proto_accessor.cpp @@ -1,4 +1,4 @@ -#include +#include #include "coordination.h" diff --git a/client/ydb_datastreams/CMakeLists.txt b/src/client/ydb_datastreams/CMakeLists.txt similarity index 79% rename from client/ydb_datastreams/CMakeLists.txt rename to src/client/ydb_datastreams/CMakeLists.txt index c12f41e05c8..ca2c791f6e5 100644 --- a/client/ydb_datastreams/CMakeLists.txt +++ b/src/client/ydb_datastreams/CMakeLists.txt @@ -1,18 +1,17 @@ add_library(cpp-client-ydb_datastreams) target_link_libraries(cpp-client-ydb_datastreams PUBLIC - yutil library-grpc-client cpp-string_utils-url api-grpc-draft - public-lib-operation_id + library-operation_id impl-ydb_internal-make_request cpp-client-ydb_driver ) target_sources(cpp-client-ydb_datastreams PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_datastreams/datastreams.cpp + datastreams.cpp ) add_library(YDB-CPP-SDK::Datastreams ALIAS cpp-client-ydb_datastreams) diff --git a/client/ydb_datastreams/datastreams.cpp b/src/client/ydb_datastreams/datastreams.cpp similarity index 99% rename from client/ydb_datastreams/datastreams.cpp rename to src/client/ydb_datastreams/datastreams.cpp index 76011206c30..a870d964b45 100644 --- a/client/ydb_datastreams/datastreams.cpp +++ b/src/client/ydb_datastreams/datastreams.cpp @@ -1,13 +1,13 @@ #include "datastreams.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include -#include +#include namespace NYdb::NDataStreams::V1 { diff --git a/client/ydb_datastreams/datastreams.h b/src/client/ydb_datastreams/datastreams.h similarity index 99% rename from client/ydb_datastreams/datastreams.h rename to src/client/ydb_datastreams/datastreams.h index 1d515ecf65d..e0d2ea4597d 100644 --- a/client/ydb_datastreams/datastreams.h +++ b/src/client/ydb_datastreams/datastreams.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include namespace NYdb::NDataStreams::V1 { diff --git a/client/ydb_discovery/CMakeLists.txt b/src/client/ydb_discovery/CMakeLists.txt similarity index 85% rename from client/ydb_discovery/CMakeLists.txt rename to src/client/ydb_discovery/CMakeLists.txt index abb0fb62ba3..4b4dd615119 100644 --- a/client/ydb_discovery/CMakeLists.txt +++ b/src/client/ydb_discovery/CMakeLists.txt @@ -11,7 +11,7 @@ target_link_libraries(cpp-client-ydb_discovery PUBLIC ) target_sources(cpp-client-ydb_discovery PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_discovery/discovery.cpp + discovery.cpp ) add_library(YDB-CPP-SDK::Discovery ALIAS cpp-client-ydb_discovery) diff --git a/client/ydb_discovery/discovery.cpp b/src/client/ydb_discovery/discovery.cpp similarity index 99% rename from client/ydb_discovery/discovery.cpp rename to src/client/ydb_discovery/discovery.cpp index 4edb0795833..6bfd9c1e4a1 100644 --- a/client/ydb_discovery/discovery.cpp +++ b/src/client/ydb_discovery/discovery.cpp @@ -1,6 +1,6 @@ #include "discovery.h" -#include +#include namespace NYdb { namespace NDiscovery { diff --git a/client/ydb_discovery/discovery.h b/src/client/ydb_discovery/discovery.h similarity index 99% rename from client/ydb_discovery/discovery.h rename to src/client/ydb_discovery/discovery.h index 3604e39b6cb..25f90903711 100644 --- a/client/ydb_discovery/discovery.h +++ b/src/client/ydb_discovery/discovery.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace Ydb { namespace Discovery { diff --git a/client/ydb_driver/CMakeLists.txt b/src/client/ydb_driver/CMakeLists.txt similarity index 86% rename from client/ydb_driver/CMakeLists.txt rename to src/client/ydb_driver/CMakeLists.txt index 3f7dc2cbb69..9a10507a71f 100644 --- a/client/ydb_driver/CMakeLists.txt +++ b/src/client/ydb_driver/CMakeLists.txt @@ -1,7 +1,6 @@ add_library(cpp-client-ydb_driver) target_link_libraries(cpp-client-ydb_driver PUBLIC - yutil impl-ydb_internal-common impl-ydb_internal-grpc_connections @@ -11,7 +10,7 @@ target_link_libraries(cpp-client-ydb_driver PUBLIC ) target_sources(cpp-client-ydb_driver PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_driver/driver.cpp + driver.cpp ) add_library(YDB-CPP-SDK::Driver ALIAS cpp-client-ydb_driver) diff --git a/client/ydb_driver/driver.cpp b/src/client/ydb_driver/driver.cpp similarity index 94% rename from client/ydb_driver/driver.cpp rename to src/client/ydb_driver/driver.cpp index 57b46be4435..e1eacda5b1d 100644 --- a/client/ydb_driver/driver.cpp +++ b/src/client/ydb_driver/driver.cpp @@ -1,17 +1,17 @@ #include "driver.h" #define INCLUDE_YDB_INTERNAL_H -#include -#include -#include +#include +#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace NYdb { diff --git a/client/ydb_driver/driver.h b/src/client/ydb_driver/driver.h similarity index 95% rename from client/ydb_driver/driver.h rename to src/client/ydb_driver/driver.h index f1d653fd334..21e7f754ec3 100644 --- a/client/ydb_driver/driver.h +++ b/src/client/ydb_driver/driver.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include + +#include //////////////////////////////////////////////////////////////////////////////// diff --git a/client/ydb_export/CMakeLists.txt b/src/client/ydb_export/CMakeLists.txt similarity index 77% rename from client/ydb_export/CMakeLists.txt rename to src/client/ydb_export/CMakeLists.txt index d67e6e6a039..ed04920550c 100644 --- a/client/ydb_export/CMakeLists.txt +++ b/src/client/ydb_export/CMakeLists.txt @@ -12,13 +12,13 @@ target_link_libraries(cpp-client-ydb_export PUBLIC ) target_sources(cpp-client-ydb_export PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_export/export.cpp + export.cpp ) generate_enum_serilization(cpp-client-ydb_export - ${YDB_SDK_SOURCE_DIR}/client/ydb_export/export.h + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_export/export.h INCLUDE_HEADERS - client/ydb_export/export.h + src/client/ydb_export/export.h ) add_library(YDB-CPP-SDK::Export ALIAS cpp-client-ydb_export) diff --git a/client/ydb_export/export.cpp b/src/client/ydb_export/export.cpp similarity index 95% rename from client/ydb_export/export.cpp rename to src/client/ydb_export/export.cpp index 04f41df9048..1f2de058ea7 100644 --- a/client/ydb_export/export.cpp +++ b/src/client/ydb_export/export.cpp @@ -1,19 +1,19 @@ #include "export.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include +#include namespace NYdb { namespace NExport { diff --git a/client/ydb_export/export.h b/src/client/ydb_export/export.h similarity index 95% rename from client/ydb_export/export.h rename to src/client/ydb_export/export.h index 2e89df60d15..2449695a68f 100644 --- a/client/ydb_export/export.h +++ b/src/client/ydb_export/export.h @@ -1,9 +1,9 @@ #pragma once -#include -#include +#include +#include -#include +#include namespace NYdb { namespace NExport { diff --git a/client/ydb_extension/CMakeLists.txt b/src/client/ydb_extension/CMakeLists.txt similarity index 81% rename from client/ydb_extension/CMakeLists.txt rename to src/client/ydb_extension/CMakeLists.txt index ea30bad63cd..2f57ce5b49e 100644 --- a/client/ydb_extension/CMakeLists.txt +++ b/src/client/ydb_extension/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries(cpp-client-ydb_extension PUBLIC ) target_sources(cpp-client-ydb_extension PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_extension/extension.cpp + extension.cpp ) add_library(YDB-CPP-SDK::Extension ALIAS cpp-client-ydb_extension) diff --git a/client/ydb_extension/extension.cpp b/src/client/ydb_extension/extension.cpp similarity index 87% rename from client/ydb_extension/extension.cpp rename to src/client/ydb_extension/extension.cpp index e2f16ec6be7..c4068ae03d9 100644 --- a/client/ydb_extension/extension.cpp +++ b/src/client/ydb_extension/extension.cpp @@ -1,8 +1,8 @@ #include "extension.h" #define INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include #undef INCLUDE_YDB_INTERNAL_H namespace NYdb { diff --git a/client/ydb_extension/extension.h b/src/client/ydb_extension/extension.h similarity index 93% rename from client/ydb_extension/extension.h rename to src/client/ydb_extension/extension.h index f6faf48d064..6c9cacb429d 100644 --- a/client/ydb_extension/extension.h +++ b/src/client/ydb_extension/extension.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include namespace Ydb { namespace Discovery { diff --git a/client/ydb_federated_topic/CMakeLists.txt b/src/client/ydb_federated_topic/CMakeLists.txt similarity index 76% rename from client/ydb_federated_topic/CMakeLists.txt rename to src/client/ydb_federated_topic/CMakeLists.txt index 9ea908b1328..ae39dcf4cf9 100644 --- a/client/ydb_federated_topic/CMakeLists.txt +++ b/src/client/ydb_federated_topic/CMakeLists.txt @@ -10,9 +10,9 @@ target_link_libraries(cpp-client-ydb_federated_topic PUBLIC ) generate_enum_serilization(cpp-client-ydb_federated_topic - ${YDB_SDK_SOURCE_DIR}/client/ydb_federated_topic/federated_topic.h + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_federated_topic/federated_topic.h INCLUDE_HEADERS - client/ydb_federated_topic/federated_topic.h + src/client/ydb_federated_topic/federated_topic.h ) add_library(YDB-CPP-SDK::FederatedTopic ALIAS cpp-client-ydb_federated_topic) diff --git a/client/ydb_federated_topic/federated_topic.h b/src/client/ydb_federated_topic/federated_topic.h similarity index 99% rename from client/ydb_federated_topic/federated_topic.h rename to src/client/ydb_federated_topic/federated_topic.h index 1e04ca1b7b7..af4e37807b4 100644 --- a/client/ydb_federated_topic/federated_topic.h +++ b/src/client/ydb_federated_topic/federated_topic.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include namespace NYdb::NFederatedTopic { diff --git a/src/client/ydb_federated_topic/impl/CMakeLists.txt b/src/client/ydb_federated_topic/impl/CMakeLists.txt new file mode 100644 index 00000000000..abb71d3eea5 --- /dev/null +++ b/src/client/ydb_federated_topic/impl/CMakeLists.txt @@ -0,0 +1,28 @@ +add_library(client-ydb_federated_topic-impl) + +target_link_libraries(client-ydb_federated_topic-impl PUBLIC + yutil + library-grpc-client + cpp-monlib-dynamic_counters + cpp-monlib-metrics + cpp-string_utils-url + library-persqueue-obfuscate + api-grpc-draft + api-grpc + impl-ydb_internal-make_request + client-ydb_common_client-impl + cpp-client-ydb_driver + client-ydb_persqueue_core-impl + cpp-client-ydb_proto +) + +target_sources(client-ydb_federated_topic-impl PRIVATE + federated_read_session.cpp + federated_read_session_event.cpp + federated_write_session.cpp + federated_topic_impl.cpp + federated_topic.cpp + federation_observer.cpp +) + + diff --git a/client/ydb_federated_topic/impl/federated_read_session.cpp b/src/client/ydb_federated_topic/impl/federated_read_session.cpp similarity index 97% rename from client/ydb_federated_topic/impl/federated_read_session.cpp rename to src/client/ydb_federated_topic/impl/federated_read_session.cpp index 65588a57d07..247a347c954 100644 --- a/client/ydb_federated_topic/impl/federated_read_session.cpp +++ b/src/client/ydb_federated_topic/impl/federated_read_session.cpp @@ -1,10 +1,10 @@ #include "federated_read_session.h" -#include -#include +#include +#include -#include -#include +#include +#include namespace NYdb::NFederatedTopic { diff --git a/client/ydb_federated_topic/impl/federated_read_session.h b/src/client/ydb_federated_topic/impl/federated_read_session.h similarity index 94% rename from client/ydb_federated_topic/impl/federated_read_session.h rename to src/client/ydb_federated_topic/impl/federated_read_session.h index 35830597a77..a366d31b29d 100644 --- a/client/ydb_federated_topic/impl/federated_read_session.h +++ b/src/client/ydb_federated_topic/impl/federated_read_session.h @@ -1,11 +1,11 @@ #pragma once -#include +#include -#include -#include +#include +#include -#include +#include namespace NYdb::NFederatedTopic { diff --git a/client/ydb_federated_topic/impl/federated_read_session_event.cpp b/src/client/ydb_federated_topic/impl/federated_read_session_event.cpp similarity index 98% rename from client/ydb_federated_topic/impl/federated_read_session_event.cpp rename to src/client/ydb_federated_topic/impl/federated_read_session_event.cpp index 1c470ecca0f..0f05b877a5b 100644 --- a/client/ydb_federated_topic/impl/federated_read_session_event.cpp +++ b/src/client/ydb_federated_topic/impl/federated_read_session_event.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include diff --git a/client/ydb_federated_topic/impl/federated_topic.cpp b/src/client/ydb_federated_topic/impl/federated_topic.cpp similarity index 89% rename from client/ydb_federated_topic/impl/federated_topic.cpp rename to src/client/ydb_federated_topic/impl/federated_topic.cpp index 0fd72204818..955a871ad7c 100644 --- a/client/ydb_federated_topic/impl/federated_topic.cpp +++ b/src/client/ydb_federated_topic/impl/federated_topic.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include namespace NYdb::NFederatedTopic { diff --git a/client/ydb_federated_topic/impl/federated_topic_impl.cpp b/src/client/ydb_federated_topic/impl/federated_topic_impl.cpp similarity index 93% rename from client/ydb_federated_topic/impl/federated_topic_impl.cpp rename to src/client/ydb_federated_topic/impl/federated_topic_impl.cpp index 3bc88b9dc04..f7d5108a0cf 100644 --- a/client/ydb_federated_topic/impl/federated_topic_impl.cpp +++ b/src/client/ydb_federated_topic/impl/federated_topic_impl.cpp @@ -3,8 +3,8 @@ #include "federated_read_session.h" #include "federated_write_session.h" -#include -#include +#include +#include namespace NYdb::NFederatedTopic { diff --git a/client/ydb_federated_topic/impl/federated_topic_impl.h b/src/client/ydb_federated_topic/impl/federated_topic_impl.h similarity index 77% rename from client/ydb_federated_topic/impl/federated_topic_impl.h rename to src/client/ydb_federated_topic/impl/federated_topic_impl.h index 939d585af12..41dbb7688ef 100644 --- a/client/ydb_federated_topic/impl/federated_topic_impl.h +++ b/src/client/ydb_federated_topic/impl/federated_topic_impl.h @@ -1,16 +1,16 @@ #pragma once #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include namespace NYdb::NFederatedTopic { diff --git a/client/ydb_federated_topic/impl/federated_write_session.cpp b/src/client/ydb_federated_topic/impl/federated_write_session.cpp similarity index 98% rename from client/ydb_federated_topic/impl/federated_write_session.cpp rename to src/client/ydb_federated_topic/impl/federated_write_session.cpp index f92209f5bb5..687ec0441da 100644 --- a/client/ydb_federated_topic/impl/federated_write_session.cpp +++ b/src/client/ydb_federated_topic/impl/federated_write_session.cpp @@ -1,9 +1,9 @@ #include "federated_write_session.h" -#include -#include +#include +#include -#include +#include #include diff --git a/client/ydb_federated_topic/impl/federated_write_session.h b/src/client/ydb_federated_topic/impl/federated_write_session.h similarity index 95% rename from client/ydb_federated_topic/impl/federated_write_session.h rename to src/client/ydb_federated_topic/impl/federated_write_session.h index ffc5b0faf9d..26989757566 100644 --- a/client/ydb_federated_topic/impl/federated_write_session.h +++ b/src/client/ydb_federated_topic/impl/federated_write_session.h @@ -1,10 +1,10 @@ #pragma once -#include +#include -#include +#include -#include +#include #include diff --git a/client/ydb_federated_topic/impl/federation_observer.cpp b/src/client/ydb_federated_topic/impl/federation_observer.cpp similarity index 97% rename from client/ydb_federated_topic/impl/federation_observer.cpp rename to src/client/ydb_federated_topic/impl/federation_observer.cpp index 6e42b679004..eaf88419228 100644 --- a/client/ydb_federated_topic/impl/federation_observer.cpp +++ b/src/client/ydb_federated_topic/impl/federation_observer.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include namespace NYdb::NFederatedTopic { diff --git a/client/ydb_federated_topic/impl/federation_observer.h b/src/client/ydb_federated_topic/impl/federation_observer.h similarity index 87% rename from client/ydb_federated_topic/impl/federation_observer.h rename to src/client/ydb_federated_topic/impl/federation_observer.h index 13cf0701394..810f0188800 100644 --- a/client/ydb_federated_topic/impl/federation_observer.h +++ b/src/client/ydb_federated_topic/impl/federation_observer.h @@ -1,18 +1,18 @@ #pragma once #define INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/client/ydb_federated_topic/ut/CMakeLists.darwin-arm64.txt b/src/client/ydb_federated_topic/ut/CMakeLists.darwin-arm64.txt similarity index 100% rename from client/ydb_federated_topic/ut/CMakeLists.darwin-arm64.txt rename to src/client/ydb_federated_topic/ut/CMakeLists.darwin-arm64.txt diff --git a/client/ydb_federated_topic/ut/CMakeLists.darwin-x86_64.txt b/src/client/ydb_federated_topic/ut/CMakeLists.darwin-x86_64.txt similarity index 100% rename from client/ydb_federated_topic/ut/CMakeLists.darwin-x86_64.txt rename to src/client/ydb_federated_topic/ut/CMakeLists.darwin-x86_64.txt diff --git a/client/ydb_federated_topic/ut/CMakeLists.linux-aarch64.txt b/src/client/ydb_federated_topic/ut/CMakeLists.linux-aarch64.txt similarity index 100% rename from client/ydb_federated_topic/ut/CMakeLists.linux-aarch64.txt rename to src/client/ydb_federated_topic/ut/CMakeLists.linux-aarch64.txt diff --git a/client/ydb_federated_topic/ut/CMakeLists.linux-x86_64.txt b/src/client/ydb_federated_topic/ut/CMakeLists.linux-x86_64.txt similarity index 100% rename from client/ydb_federated_topic/ut/CMakeLists.linux-x86_64.txt rename to src/client/ydb_federated_topic/ut/CMakeLists.linux-x86_64.txt diff --git a/client/ydb_federated_topic/ut/CMakeLists.txt b/src/client/ydb_federated_topic/ut/CMakeLists.txt similarity index 85% rename from client/ydb_federated_topic/ut/CMakeLists.txt rename to src/client/ydb_federated_topic/ut/CMakeLists.txt index d863ebd1806..4fbe9853d99 100644 --- a/client/ydb_federated_topic/ut/CMakeLists.txt +++ b/src/client/ydb_federated_topic/ut/CMakeLists.txt @@ -6,14 +6,14 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") 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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") include(CMakeLists.windows-x86_64.txt) endif() diff --git a/client/ydb_federated_topic/ut/CMakeLists.windows-x86_64.txt b/src/client/ydb_federated_topic/ut/CMakeLists.windows-x86_64.txt similarity index 100% rename from client/ydb_federated_topic/ut/CMakeLists.windows-x86_64.txt rename to src/client/ydb_federated_topic/ut/CMakeLists.windows-x86_64.txt diff --git a/client/ydb_federated_topic/ut/basic_usage_ut.cpp b/src/client/ydb_federated_topic/ut/basic_usage_ut.cpp similarity index 97% rename from client/ydb_federated_topic/ut/basic_usage_ut.cpp rename to src/client/ydb_federated_topic/ut/basic_usage_ut.cpp index b5d9bbe8d31..333bf8f6e5b 100644 --- a/client/ydb_federated_topic/ut/basic_usage_ut.cpp +++ b/src/client/ydb_federated_topic/ut/basic_usage_ut.cpp @@ -1,19 +1,19 @@ -#include +#include -#include +#include -#include +#include -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/client/ydb_federated_topic/ut/fds_mock.h b/src/client/ydb_federated_topic/ut/fds_mock.h similarity index 96% rename from client/ydb_federated_topic/ut/fds_mock.h rename to src/client/ydb_federated_topic/ut/fds_mock.h index 118d6c5c88b..f1ec0b07b95 100644 --- a/client/ydb_federated_topic/ut/fds_mock.h +++ b/src/client/ydb_federated_topic/ut/fds_mock.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/client/ydb_federated_topic/ut/ya.make b/src/client/ydb_federated_topic/ut/ya.make similarity index 93% rename from client/ydb_federated_topic/ut/ya.make rename to src/client/ydb_federated_topic/ut/ya.make index 1174d4105e1..9ee145d6693 100644 --- a/client/ydb_federated_topic/ut/ya.make +++ b/src/client/ydb_federated_topic/ut/ya.make @@ -12,7 +12,7 @@ ENDIF() FORK_SUBTESTS() PEERDIR( - library/cpp/testing/gmock_in_unittest + src/library/testing/gmock_in_unittest ydb/core/testlib/default ydb/public/lib/json_value ydb/public/lib/yson_value diff --git a/client/ydb_import/CMakeLists.txt b/src/client/ydb_import/CMakeLists.txt similarity index 77% rename from client/ydb_import/CMakeLists.txt rename to src/client/ydb_import/CMakeLists.txt index 9b330c8c840..e2b1f207d42 100644 --- a/client/ydb_import/CMakeLists.txt +++ b/src/client/ydb_import/CMakeLists.txt @@ -1,7 +1,6 @@ add_library(cpp-client-ydb_import) target_link_libraries(cpp-client-ydb_import PUBLIC - yutil tools-enum_parser-enum_serialization_runtime api-grpc @@ -13,13 +12,13 @@ target_link_libraries(cpp-client-ydb_import PUBLIC ) target_sources(cpp-client-ydb_import PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_import/import.cpp + import.cpp ) generate_enum_serilization(cpp-client-ydb_import - ${YDB_SDK_SOURCE_DIR}/client/ydb_import/import.h + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_import/import.h INCLUDE_HEADERS - client/ydb_import/import.h + src/client/ydb_import/import.h ) add_library(YDB-CPP-SDK::Import ALIAS cpp-client-ydb_import) diff --git a/client/ydb_import/import.cpp b/src/client/ydb_import/import.cpp similarity index 95% rename from client/ydb_import/import.cpp rename to src/client/ydb_import/import.cpp index ba3466e8f51..4e553070844 100644 --- a/client/ydb_import/import.cpp +++ b/src/client/ydb_import/import.cpp @@ -1,14 +1,14 @@ #include "import.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace NYdb { namespace NImport { diff --git a/client/ydb_import/import.h b/src/client/ydb_import/import.h similarity index 94% rename from client/ydb_import/import.h rename to src/client/ydb_import/import.h index 8667662f578..36947da81a1 100644 --- a/client/ydb_import/import.h +++ b/src/client/ydb_import/import.h @@ -1,9 +1,9 @@ #pragma once -#include -#include +#include +#include -#include +#include namespace NYdb { namespace NImport { diff --git a/client/ydb_monitoring/CMakeLists.txt b/src/client/ydb_monitoring/CMakeLists.txt similarity index 74% rename from client/ydb_monitoring/CMakeLists.txt rename to src/client/ydb_monitoring/CMakeLists.txt index 527f083c4a1..a0b0e653bf4 100644 --- a/client/ydb_monitoring/CMakeLists.txt +++ b/src/client/ydb_monitoring/CMakeLists.txt @@ -10,13 +10,13 @@ target_link_libraries(cpp-client-ydb_monitoring PUBLIC ) target_sources(cpp-client-ydb_monitoring PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_monitoring/monitoring.cpp + monitoring.cpp ) generate_enum_serilization(cpp-client-ydb_monitoring - ${YDB_SDK_SOURCE_DIR}/client/ydb_monitoring/monitoring.h + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_monitoring/monitoring.h INCLUDE_HEADERS - client/ydb_monitoring/monitoring.h + src/client/ydb_monitoring/monitoring.h ) add_library(YDB-CPP-SDK::Monitoring ALIAS cpp-client-ydb_monitoring) diff --git a/client/ydb_monitoring/monitoring.cpp b/src/client/ydb_monitoring/monitoring.cpp similarity index 92% rename from client/ydb_monitoring/monitoring.cpp rename to src/client/ydb_monitoring/monitoring.cpp index ece51698e55..0e0dbc33572 100644 --- a/client/ydb_monitoring/monitoring.cpp +++ b/src/client/ydb_monitoring/monitoring.cpp @@ -1,13 +1,13 @@ #include "monitoring.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include +#include +#include +#include +#include namespace NYdb { namespace NMonitoring { diff --git a/client/ydb_monitoring/monitoring.h b/src/client/ydb_monitoring/monitoring.h similarity index 96% rename from client/ydb_monitoring/monitoring.h rename to src/client/ydb_monitoring/monitoring.h index da8ff94f291..15b966aa74b 100644 --- a/client/ydb_monitoring/monitoring.h +++ b/src/client/ydb_monitoring/monitoring.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace Ydb { namespace Monitoring { diff --git a/client/ydb_operation/CMakeLists.txt b/src/client/ydb_operation/CMakeLists.txt similarity index 82% rename from client/ydb_operation/CMakeLists.txt rename to src/client/ydb_operation/CMakeLists.txt index 62022d9bb8f..2d60426d0eb 100644 --- a/client/ydb_operation/CMakeLists.txt +++ b/src/client/ydb_operation/CMakeLists.txt @@ -3,7 +3,7 @@ add_library(cpp-client-ydb_operation) target_link_libraries(cpp-client-ydb_operation PUBLIC yutil api-grpc - public-lib-operation_id + library-operation_id cpp-client-ydb_query client-ydb_common_client-impl cpp-client-ydb_driver @@ -13,7 +13,7 @@ target_link_libraries(cpp-client-ydb_operation PUBLIC ) target_sources(cpp-client-ydb_operation PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_operation/operation.cpp + operation.cpp ) add_library(YDB-CPP-SDK::Operation ALIAS cpp-client-ydb_operation) diff --git a/client/ydb_operation/operation.cpp b/src/client/ydb_operation/operation.cpp similarity index 95% rename from client/ydb_operation/operation.cpp rename to src/client/ydb_operation/operation.cpp index 8a3ab083e56..41d5266ae33 100644 --- a/client/ydb_operation/operation.cpp +++ b/src/client/ydb_operation/operation.cpp @@ -1,18 +1,18 @@ #include "operation.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H /* Headers below used to instantiate concrete 'Get' & 'List' methods */ -#include -#include -#include -#include - -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include namespace NYdb { namespace NOperation { diff --git a/client/ydb_operation/operation.h b/src/client/ydb_operation/operation.h similarity index 93% rename from client/ydb_operation/operation.h rename to src/client/ydb_operation/operation.h index bc73e5e8189..534be946f64 100644 --- a/client/ydb_operation/operation.h +++ b/src/client/ydb_operation/operation.h @@ -1,9 +1,9 @@ #pragma once -#include -#include +#include +#include -#include +#include namespace NYdb { namespace NOperation { diff --git a/client/ydb_params/CMakeLists.txt b/src/client/ydb_params/CMakeLists.txt similarity index 73% rename from client/ydb_params/CMakeLists.txt rename to src/client/ydb_params/CMakeLists.txt index c04ce841fae..618f8e230a1 100644 --- a/client/ydb_params/CMakeLists.txt +++ b/src/client/ydb_params/CMakeLists.txt @@ -8,8 +8,8 @@ target_link_libraries(cpp-client-ydb_params PUBLIC ) target_sources(cpp-client-ydb_params PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_params/params.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_params/impl.cpp + params.cpp + impl.cpp ) add_library(YDB-CPP-SDK::Params ALIAS cpp-client-ydb_params) diff --git a/client/ydb_params/impl.cpp b/src/client/ydb_params/impl.cpp similarity index 92% rename from client/ydb_params/impl.cpp rename to src/client/ydb_params/impl.cpp index 22a7aaaa2a7..2ea5efba483 100644 --- a/client/ydb_params/impl.cpp +++ b/src/client/ydb_params/impl.cpp @@ -1,7 +1,7 @@ #include "impl.h" -#include -#include +#include +#include namespace NYdb { diff --git a/client/ydb_params/impl.h b/src/client/ydb_params/impl.h similarity index 100% rename from client/ydb_params/impl.h rename to src/client/ydb_params/impl.h diff --git a/client/ydb_params/params.cpp b/src/client/ydb_params/params.cpp similarity index 97% rename from client/ydb_params/params.cpp rename to src/client/ydb_params/params.cpp index 8a1f57e07d0..66ac8ce817d 100644 --- a/client/ydb_params/params.cpp +++ b/src/client/ydb_params/params.cpp @@ -1,11 +1,11 @@ #include "params.h" #include "impl.h" -#include +#include -#include +#include -#include +#include namespace NYdb { diff --git a/client/ydb_params/params.h b/src/client/ydb_params/params.h similarity index 98% rename from client/ydb_params/params.h rename to src/client/ydb_params/params.h index 4a526204370..cab422de8ae 100644 --- a/client/ydb_params/params.h +++ b/src/client/ydb_params/params.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/client/ydb_persqueue_core/CMakeLists.txt b/src/client/ydb_persqueue_core/CMakeLists.txt similarity index 63% rename from client/ydb_persqueue_core/CMakeLists.txt rename to src/client/ydb_persqueue_core/CMakeLists.txt index 5e926fb4d3b..e34f70fe062 100644 --- a/client/ydb_persqueue_core/CMakeLists.txt +++ b/src/client/ydb_persqueue_core/CMakeLists.txt @@ -16,13 +16,7 @@ target_link_libraries(cpp-client-ydb_persqueue_core PUBLIC ) generate_enum_serilization(cpp-client-ydb_persqueue_core - ${YDB_SDK_SOURCE_DIR}/client/ydb_persqueue_core/persqueue.h + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_persqueue_core/persqueue.h INCLUDE_HEADERS - client/ydb_persqueue_core/persqueue.h + src/client/ydb_persqueue_core/persqueue.h ) - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) - target_link_libraries(cpp-client-ydb_persqueue_core PUBLIC - - ) -endif() diff --git a/src/client/ydb_persqueue_core/impl/CMakeLists.txt b/src/client/ydb_persqueue_core/impl/CMakeLists.txt new file mode 100644 index 00000000000..fc60ec18295 --- /dev/null +++ b/src/client/ydb_persqueue_core/impl/CMakeLists.txt @@ -0,0 +1,26 @@ +add_library(client-ydb_persqueue_core-impl) + +target_link_libraries(client-ydb_persqueue_core-impl PUBLIC + yutil + cpp-containers-disjoint_interval_tree + library-grpc-client + cpp-monlib-dynamic_counters + cpp-monlib-metrics + cpp-string_utils-url + library-persqueue-obfuscate + api-grpc-draft + impl-ydb_internal-make_request + client-ydb_common_client-impl + cpp-client-ydb_driver + cpp-string_utils-misc +) + +target_sources(client-ydb_persqueue_core-impl PRIVATE + read_session_messages.cpp + common.cpp + write_session.cpp + write_session_impl.cpp + read_session.cpp + persqueue.cpp + persqueue_impl.cpp +) diff --git a/client/ydb_persqueue_core/impl/callback_context.h b/src/client/ydb_persqueue_core/impl/callback_context.h similarity index 96% rename from client/ydb_persqueue_core/impl/callback_context.h rename to src/client/ydb_persqueue_core/impl/callback_context.h index 9e7ffe2e6d6..cae5f20d0ad 100644 --- a/client/ydb_persqueue_core/impl/callback_context.h +++ b/src/client/ydb_persqueue_core/impl/callback_context.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/client/ydb_persqueue_core/impl/common.cpp b/src/client/ydb_persqueue_core/impl/common.cpp similarity index 99% rename from client/ydb_persqueue_core/impl/common.cpp rename to src/client/ydb_persqueue_core/impl/common.cpp index da5e40fc6f9..09502ff11a3 100644 --- a/client/ydb_persqueue_core/impl/common.cpp +++ b/src/client/ydb_persqueue_core/impl/common.cpp @@ -1,6 +1,6 @@ #include "common.h" -#include +#include namespace NYdb::NPersQueue { diff --git a/client/ydb_persqueue_core/impl/common.h b/src/client/ydb_persqueue_core/impl/common.h similarity index 99% rename from client/ydb_persqueue_core/impl/common.h rename to src/client/ydb_persqueue_core/impl/common.h index c2f159e67be..3825fbc4605 100644 --- a/client/ydb_persqueue_core/impl/common.h +++ b/src/client/ydb_persqueue_core/impl/common.h @@ -1,9 +1,9 @@ #pragma once -#include -#include +#include +#include -#include +#include #include #include diff --git a/client/ydb_persqueue_core/impl/counters_logger.h b/src/client/ydb_persqueue_core/impl/counters_logger.h similarity index 92% rename from client/ydb_persqueue_core/impl/counters_logger.h rename to src/client/ydb_persqueue_core/impl/counters_logger.h index 1ea34be46d0..c8918a72bed 100644 --- a/client/ydb_persqueue_core/impl/counters_logger.h +++ b/src/client/ydb_persqueue_core/impl/counters_logger.h @@ -1,14 +1,14 @@ #pragma once -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include namespace NYdb::NPersQueue { diff --git a/client/ydb_persqueue_core/impl/log_lazy.h b/src/client/ydb_persqueue_core/impl/log_lazy.h similarity index 100% rename from client/ydb_persqueue_core/impl/log_lazy.h rename to src/client/ydb_persqueue_core/impl/log_lazy.h diff --git a/client/ydb_persqueue_core/impl/persqueue.cpp b/src/client/ydb_persqueue_core/impl/persqueue.cpp similarity index 96% rename from client/ydb_persqueue_core/impl/persqueue.cpp rename to src/client/ydb_persqueue_core/impl/persqueue.cpp index 647af3e935d..22f52f17ab5 100644 --- a/client/ydb_persqueue_core/impl/persqueue.cpp +++ b/src/client/ydb_persqueue_core/impl/persqueue.cpp @@ -1,13 +1,13 @@ -#include -#include -#include +#include +#include +#include -#include +#include -#include -#include -#include +#include +#include +#include namespace NYdb::NPersQueue { diff --git a/client/ydb_persqueue_core/impl/persqueue_impl.cpp b/src/client/ydb_persqueue_core/impl/persqueue_impl.cpp similarity index 100% rename from client/ydb_persqueue_core/impl/persqueue_impl.cpp rename to src/client/ydb_persqueue_core/impl/persqueue_impl.cpp diff --git a/client/ydb_persqueue_core/impl/persqueue_impl.h b/src/client/ydb_persqueue_core/impl/persqueue_impl.h similarity index 98% rename from client/ydb_persqueue_core/impl/persqueue_impl.h rename to src/client/ydb_persqueue_core/impl/persqueue_impl.h index 2fdbd296348..033a8320f06 100644 --- a/client/ydb_persqueue_core/impl/persqueue_impl.h +++ b/src/client/ydb_persqueue_core/impl/persqueue_impl.h @@ -3,11 +3,11 @@ #include "common.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include namespace NYdb::NPersQueue { diff --git a/client/ydb_persqueue_core/impl/read_session.cpp b/src/client/ydb_persqueue_core/impl/read_session.cpp similarity index 99% rename from client/ydb_persqueue_core/impl/read_session.cpp rename to src/client/ydb_persqueue_core/impl/read_session.cpp index 993c168f6ef..baf7c78a432 100644 --- a/client/ydb_persqueue_core/impl/read_session.cpp +++ b/src/client/ydb_persqueue_core/impl/read_session.cpp @@ -2,18 +2,18 @@ #include "read_session.h" #include "common.h" -#include +#include #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/client/ydb_persqueue_core/impl/read_session.h b/src/client/ydb_persqueue_core/impl/read_session.h similarity index 99% rename from client/ydb_persqueue_core/impl/read_session.h rename to src/client/ydb_persqueue_core/impl/read_session.h index 3e6f5c4413b..799ca24b1c8 100644 --- a/client/ydb_persqueue_core/impl/read_session.h +++ b/src/client/ydb_persqueue_core/impl/read_session.h @@ -4,18 +4,18 @@ #include "callback_context.h" #include "counters_logger.h" -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/client/ydb_persqueue_core/impl/read_session.ipp b/src/client/ydb_persqueue_core/impl/read_session.ipp similarity index 99% rename from client/ydb_persqueue_core/impl/read_session.ipp rename to src/client/ydb_persqueue_core/impl/read_session.ipp index 9c50bba7b2f..179857968dc 100644 --- a/client/ydb_persqueue_core/impl/read_session.ipp +++ b/src/client/ydb_persqueue_core/impl/read_session.ipp @@ -6,20 +6,20 @@ #include "persqueue_impl.h" #include "common.h" -#include +#include #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/client/ydb_persqueue_core/impl/read_session_messages.cpp b/src/client/ydb_persqueue_core/impl/read_session_messages.cpp similarity index 99% rename from client/ydb_persqueue_core/impl/read_session_messages.cpp rename to src/client/ydb_persqueue_core/impl/read_session_messages.cpp index b1c7180871d..b035e7d234e 100644 --- a/client/ydb_persqueue_core/impl/read_session_messages.cpp +++ b/src/client/ydb_persqueue_core/impl/read_session_messages.cpp @@ -1,6 +1,6 @@ #include "read_session.h" -#include +#include namespace NYdb::NPersQueue { diff --git a/client/ydb_persqueue_core/impl/write_session.cpp b/src/client/ydb_persqueue_core/impl/write_session.cpp similarity index 95% rename from client/ydb_persqueue_core/impl/write_session.cpp rename to src/client/ydb_persqueue_core/impl/write_session.cpp index b8a2cb5387f..64b67a988a7 100644 --- a/client/ydb_persqueue_core/impl/write_session.cpp +++ b/src/client/ydb_persqueue_core/impl/write_session.cpp @@ -1,13 +1,13 @@ #include "write_session.h" -#include -#include +#include +#include -#include +#include -#include -#include -#include +#include +#include +#include namespace NYdb::NPersQueue { diff --git a/client/ydb_persqueue_core/impl/write_session.h b/src/client/ydb_persqueue_core/impl/write_session.h similarity index 95% rename from client/ydb_persqueue_core/impl/write_session.h rename to src/client/ydb_persqueue_core/impl/write_session.h index 19a07dfef67..8b4f4b27a45 100644 --- a/client/ydb_persqueue_core/impl/write_session.h +++ b/src/client/ydb_persqueue_core/impl/write_session.h @@ -4,10 +4,10 @@ #include "persqueue_impl.h" #include "write_session_impl.h" -#include -#include +#include +#include -#include +#include namespace NYdb::NPersQueue { diff --git a/client/ydb_persqueue_core/impl/write_session_impl.cpp b/src/client/ydb_persqueue_core/impl/write_session_impl.cpp similarity index 99% rename from client/ydb_persqueue_core/impl/write_session_impl.cpp rename to src/client/ydb_persqueue_core/impl/write_session_impl.cpp index 3d3aa4b216e..5d89dc91148 100644 --- a/client/ydb_persqueue_core/impl/write_session_impl.cpp +++ b/src/client/ydb_persqueue_core/impl/write_session_impl.cpp @@ -1,12 +1,12 @@ #include "write_session.h" -#include +#include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include namespace NYdb::NPersQueue { diff --git a/client/ydb_persqueue_core/impl/write_session_impl.h b/src/client/ydb_persqueue_core/impl/write_session_impl.h similarity index 99% rename from client/ydb_persqueue_core/impl/write_session_impl.h rename to src/client/ydb_persqueue_core/impl/write_session_impl.h index 4612fddffb9..34c6ed397d1 100644 --- a/client/ydb_persqueue_core/impl/write_session_impl.h +++ b/src/client/ydb_persqueue_core/impl/write_session_impl.h @@ -3,10 +3,10 @@ #include "common.h" #include "persqueue_impl.h" -#include -#include +#include +#include -#include +#include namespace NYdb::NPersQueue { diff --git a/client/ydb_persqueue_core/persqueue.h b/src/client/ydb_persqueue_core/persqueue.h similarity index 99% rename from client/ydb_persqueue_core/persqueue.h rename to src/client/ydb_persqueue_core/persqueue.h index 4ff40c3ced7..5fb4d30bb40 100644 --- a/client/ydb_persqueue_core/persqueue.h +++ b/src/client/ydb_persqueue_core/persqueue.h @@ -1,19 +1,19 @@ #pragma once -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include #include #include diff --git a/client/ydb_persqueue_core/ut/CMakeLists.darwin-arm64.txt b/src/client/ydb_persqueue_core/ut/CMakeLists.darwin-arm64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/CMakeLists.darwin-arm64.txt rename to src/client/ydb_persqueue_core/ut/CMakeLists.darwin-arm64.txt diff --git a/client/ydb_persqueue_core/ut/CMakeLists.darwin-x86_64.txt b/src/client/ydb_persqueue_core/ut/CMakeLists.darwin-x86_64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/CMakeLists.darwin-x86_64.txt rename to src/client/ydb_persqueue_core/ut/CMakeLists.darwin-x86_64.txt diff --git a/client/ydb_persqueue_core/ut/CMakeLists.linux-aarch64.txt b/src/client/ydb_persqueue_core/ut/CMakeLists.linux-aarch64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/CMakeLists.linux-aarch64.txt rename to src/client/ydb_persqueue_core/ut/CMakeLists.linux-aarch64.txt diff --git a/client/ydb_persqueue_core/ut/CMakeLists.linux-x86_64.txt b/src/client/ydb_persqueue_core/ut/CMakeLists.linux-x86_64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/CMakeLists.linux-x86_64.txt rename to src/client/ydb_persqueue_core/ut/CMakeLists.linux-x86_64.txt diff --git a/client/ydb_persqueue_core/ut/CMakeLists.txt b/src/client/ydb_persqueue_core/ut/CMakeLists.txt similarity index 85% rename from client/ydb_persqueue_core/ut/CMakeLists.txt rename to src/client/ydb_persqueue_core/ut/CMakeLists.txt index d863ebd1806..4fbe9853d99 100644 --- a/client/ydb_persqueue_core/ut/CMakeLists.txt +++ b/src/client/ydb_persqueue_core/ut/CMakeLists.txt @@ -6,14 +6,14 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") 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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") include(CMakeLists.windows-x86_64.txt) endif() diff --git a/client/ydb_persqueue_core/ut/CMakeLists.windows-x86_64.txt b/src/client/ydb_persqueue_core/ut/CMakeLists.windows-x86_64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/CMakeLists.windows-x86_64.txt rename to src/client/ydb_persqueue_core/ut/CMakeLists.windows-x86_64.txt diff --git a/client/ydb_persqueue_core/ut/basic_usage_ut.cpp b/src/client/ydb_persqueue_core/ut/basic_usage_ut.cpp similarity index 98% rename from client/ydb_persqueue_core/ut/basic_usage_ut.cpp rename to src/client/ydb_persqueue_core/ut/basic_usage_ut.cpp index 1f5556e40b9..e6f8ff9c6ea 100644 --- a/client/ydb_persqueue_core/ut/basic_usage_ut.cpp +++ b/src/client/ydb_persqueue_core/ut/basic_usage_ut.cpp @@ -1,14 +1,14 @@ -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/client/ydb_persqueue_core/ut/common_ut.cpp b/src/client/ydb_persqueue_core/ut/common_ut.cpp similarity index 89% rename from client/ydb_persqueue_core/ut/common_ut.cpp rename to src/client/ydb_persqueue_core/ut/common_ut.cpp index 410f7e2728f..a00d54c4c08 100644 --- a/client/ydb_persqueue_core/ut/common_ut.cpp +++ b/src/client/ydb_persqueue_core/ut/common_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include using NYdb::NPersQueue::ApplyClusterEndpoint; diff --git a/client/ydb_persqueue_core/ut/compress_executor_ut.cpp b/src/client/ydb_persqueue_core/ut/compress_executor_ut.cpp similarity index 98% rename from client/ydb_persqueue_core/ut/compress_executor_ut.cpp rename to src/client/ydb_persqueue_core/ut/compress_executor_ut.cpp index 09e0b5ec74a..cb4d070d5c3 100644 --- a/client/ydb_persqueue_core/ut/compress_executor_ut.cpp +++ b/src/client/ydb_persqueue_core/ut/compress_executor_ut.cpp @@ -1,4 +1,4 @@ -#include +#include namespace NYdb::NPersQueue::NTests { diff --git a/client/ydb_persqueue_core/ut/compression_ut.cpp b/src/client/ydb_persqueue_core/ut/compression_ut.cpp similarity index 99% rename from client/ydb_persqueue_core/ut/compression_ut.cpp rename to src/client/ydb_persqueue_core/ut/compression_ut.cpp index bb67f0819be..ee196b668b7 100644 --- a/client/ydb_persqueue_core/ut/compression_ut.cpp +++ b/src/client/ydb_persqueue_core/ut/compression_ut.cpp @@ -1,4 +1,4 @@ -#include +#include namespace NYdb::NPersQueue::NTests { diff --git a/client/ydb_persqueue_core/ut/read_session_ut.cpp b/src/client/ydb_persqueue_core/ut/read_session_ut.cpp similarity index 99% rename from client/ydb_persqueue_core/ut/read_session_ut.cpp rename to src/client/ydb_persqueue_core/ut/read_session_ut.cpp index 1160fae6d6c..f3bf6f8eb12 100644 --- a/client/ydb_persqueue_core/ut/read_session_ut.cpp +++ b/src/client/ydb_persqueue_core/ut/read_session_ut.cpp @@ -1,17 +1,17 @@ -#include +#include #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include +#include #include diff --git a/client/ydb_persqueue_core/ut/retry_policy_ut.cpp b/src/client/ydb_persqueue_core/ut/retry_policy_ut.cpp similarity index 99% rename from client/ydb_persqueue_core/ut/retry_policy_ut.cpp rename to src/client/ydb_persqueue_core/ut/retry_policy_ut.cpp index 3c5251dd5e4..f6492965d4e 100644 --- a/client/ydb_persqueue_core/ut/retry_policy_ut.cpp +++ b/src/client/ydb_persqueue_core/ut/retry_policy_ut.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include using namespace NThreading; diff --git a/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin-arm64.txt b/src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin-arm64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin-arm64.txt rename to src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin-arm64.txt diff --git a/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin-x86_64.txt b/src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin-x86_64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin-x86_64.txt rename to src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin-x86_64.txt diff --git a/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux-aarch64.txt b/src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux-aarch64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux-aarch64.txt rename to src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux-aarch64.txt diff --git a/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux-x86_64.txt b/src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux-x86_64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux-x86_64.txt rename to src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux-x86_64.txt diff --git a/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt b/src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.txt similarity index 85% rename from client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt rename to src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.txt index d863ebd1806..4fbe9853d99 100644 --- a/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt +++ b/src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.txt @@ -6,14 +6,14 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") 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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") include(CMakeLists.windows-x86_64.txt) endif() diff --git a/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.windows-x86_64.txt b/src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.windows-x86_64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/ut_utils/CMakeLists.windows-x86_64.txt rename to src/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.windows-x86_64.txt diff --git a/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.cpp b/src/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.cpp similarity index 100% rename from client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.cpp rename to src/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.cpp diff --git a/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.h b/src/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.h similarity index 92% rename from client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.h rename to src/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.h index 24c4b2b625e..b33da6d5bee 100644 --- a/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.h +++ b/src/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace NKikimr::NPersQueueTests { diff --git a/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h b/src/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h similarity index 98% rename from client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h rename to src/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h index eea12bc8475..939478fc018 100644 --- a/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h +++ b/src/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h @@ -1,8 +1,8 @@ #pragma once #include "test_server.h" -#include -#include -#include +#include +#include +#include #define TEST_CASE_NAME (this->Name_) diff --git a/client/ydb_persqueue_core/ut/ut_utils/test_server.cpp b/src/client/ydb_persqueue_core/ut/ut_utils/test_server.cpp similarity index 100% rename from client/ydb_persqueue_core/ut/ut_utils/test_server.cpp rename to src/client/ydb_persqueue_core/ut/ut_utils/test_server.cpp diff --git a/client/ydb_persqueue_core/ut/ut_utils/test_server.h b/src/client/ydb_persqueue_core/ut/ut_utils/test_server.h similarity index 95% rename from client/ydb_persqueue_core/ut/ut_utils/test_server.h rename to src/client/ydb_persqueue_core/ut/ut_utils/test_server.h index 9683f778094..3a3383857c5 100644 --- a/client/ydb_persqueue_core/ut/ut_utils/test_server.h +++ b/src/client/ydb_persqueue_core/ut/ut_utils/test_server.h @@ -1,13 +1,13 @@ #pragma once #include -#include +#include -#include +#include -#include -#include +#include +#include -#include +#include namespace NPersQueue { diff --git a/client/ydb_persqueue_core/ut/ut_utils/test_utils.h b/src/client/ydb_persqueue_core/ut/ut_utils/test_utils.h similarity index 86% rename from client/ydb_persqueue_core/ut/ut_utils/test_utils.h rename to src/client/ydb_persqueue_core/ut/ut_utils/test_utils.h index 28c021fb3ab..b08fd484d78 100644 --- a/client/ydb_persqueue_core/ut/ut_utils/test_utils.h +++ b/src/client/ydb_persqueue_core/ut/ut_utils/test_utils.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "sdk_test_setup.h" diff --git a/client/ydb_persqueue_core/ut/ut_utils/ut_utils.cpp b/src/client/ydb_persqueue_core/ut/ut_utils/ut_utils.cpp similarity index 100% rename from client/ydb_persqueue_core/ut/ut_utils/ut_utils.cpp rename to src/client/ydb_persqueue_core/ut/ut_utils/ut_utils.cpp diff --git a/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h b/src/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h similarity index 98% rename from client/ydb_persqueue_core/ut/ut_utils/ut_utils.h rename to src/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h index 6e82d702c6b..907650e708f 100644 --- a/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h +++ b/src/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include using namespace NKikimr; diff --git a/client/ydb_persqueue_core/ut/ut_utils/ya.make b/src/client/ydb_persqueue_core/ut/ut_utils/ya.make similarity index 69% rename from client/ydb_persqueue_core/ut/ut_utils/ya.make rename to src/client/ydb_persqueue_core/ut/ut_utils/ya.make index 36ea723c476..ab7595b9564 100644 --- a/client/ydb_persqueue_core/ut/ut_utils/ya.make +++ b/src/client/ydb_persqueue_core/ut/ut_utils/ya.make @@ -11,11 +11,11 @@ SRCS( ) PEERDIR( - ydb/library/grpc/server - library/cpp/testing/unittest - library/cpp/threading/chunk_queue + src/library/grpc/server + src/library/testing/unittest + src/library/threading/chunk_queue ydb/core/testlib/default - ydb/library/persqueue/topic_parser_public + src/library/persqueue/topic_parser_public client/ydb_driver client/ydb_persqueue_core client/ydb_persqueue_public diff --git a/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin-arm64.txt b/src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin-arm64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin-arm64.txt rename to src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin-arm64.txt diff --git a/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin-x86_64.txt b/src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin-x86_64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin-x86_64.txt rename to src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin-x86_64.txt diff --git a/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux-aarch64.txt b/src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux-aarch64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux-aarch64.txt rename to src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux-aarch64.txt diff --git a/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux-x86_64.txt b/src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux-x86_64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux-x86_64.txt rename to src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux-x86_64.txt diff --git a/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.txt b/src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt similarity index 85% rename from client/ydb_persqueue_core/ut/ut_utils/CMakeLists.txt rename to src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt index d863ebd1806..4fbe9853d99 100644 --- a/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.txt +++ b/src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt @@ -6,14 +6,14 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") 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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") include(CMakeLists.windows-x86_64.txt) endif() diff --git a/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.windows-x86_64.txt b/src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.windows-x86_64.txt similarity index 100% rename from client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.windows-x86_64.txt rename to src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.windows-x86_64.txt diff --git a/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/ya.make b/src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/ya.make similarity index 93% rename from client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/ya.make rename to src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/ya.make index ddebb39f883..f1a79724ead 100644 --- a/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/ya.make +++ b/src/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/ya.make @@ -12,7 +12,7 @@ ENDIF() FORK_SUBTESTS() PEERDIR( - library/cpp/testing/gmock_in_unittest + src/library/testing/gmock_in_unittest ydb/public/lib/json_value ydb/public/lib/yson_value client/ydb_driver diff --git a/client/ydb_persqueue_core/ut/ya.make b/src/client/ydb_persqueue_core/ut/ya.make similarity index 94% rename from client/ydb_persqueue_core/ut/ya.make rename to src/client/ydb_persqueue_core/ut/ya.make index cc3e173b66f..5a25cf8d5ef 100644 --- a/client/ydb_persqueue_core/ut/ya.make +++ b/src/client/ydb_persqueue_core/ut/ya.make @@ -12,7 +12,7 @@ ENDIF() FORK_SUBTESTS() PEERDIR( - library/cpp/testing/gmock_in_unittest + src/library/testing/gmock_in_unittest ydb/core/testlib/default ydb/public/lib/json_value ydb/public/lib/yson_value diff --git a/client/ydb_persqueue_public/CMakeLists.txt b/src/client/ydb_persqueue_public/CMakeLists.txt similarity index 61% rename from client/ydb_persqueue_public/CMakeLists.txt rename to src/client/ydb_persqueue_public/CMakeLists.txt index fc28c6fbb99..227b7e132c8 100644 --- a/client/ydb_persqueue_public/CMakeLists.txt +++ b/src/client/ydb_persqueue_public/CMakeLists.txt @@ -7,9 +7,3 @@ target_link_libraries(cpp-client-ydb_persqueue_public INTERFACE cpp-client-ydb_persqueue_core client-ydb_persqueue_public-codecs ) - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) - target_link_libraries(cpp-client-ydb_persqueue_public INTERFACE - - ) -endif() diff --git a/client/ydb_persqueue_public/codecs/CMakeLists.txt b/src/client/ydb_persqueue_public/codecs/CMakeLists.txt similarity index 77% rename from client/ydb_persqueue_public/codecs/CMakeLists.txt rename to src/client/ydb_persqueue_public/codecs/CMakeLists.txt index 2ccfbd6bb27..d842d89a0b7 100644 --- a/client/ydb_persqueue_public/codecs/CMakeLists.txt +++ b/src/client/ydb_persqueue_public/codecs/CMakeLists.txt @@ -1,17 +1,16 @@ add_library(client-ydb_persqueue_public-codecs) target_link_libraries(client-ydb_persqueue_public-codecs PUBLIC - yutil cpp-streams-zstd public-issue-protos api-grpc-draft api-grpc api-protos - ) +) target_sources(client-ydb_persqueue_public-codecs PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_persqueue_public/codecs/codecs.cpp + codecs.cpp ) diff --git a/client/ydb_persqueue_public/codecs/codecs.cpp b/src/client/ydb_persqueue_public/codecs/codecs.cpp similarity index 94% rename from client/ydb_persqueue_public/codecs/codecs.cpp rename to src/client/ydb_persqueue_public/codecs/codecs.cpp index 94b1005eaf6..f06635c2682 100644 --- a/client/ydb_persqueue_public/codecs/codecs.cpp +++ b/src/client/ydb_persqueue_public/codecs/codecs.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include "codecs.h" diff --git a/client/ydb_persqueue_public/codecs/codecs.h b/src/client/ydb_persqueue_public/codecs/codecs.h similarity index 66% rename from client/ydb_persqueue_public/codecs/codecs.h rename to src/client/ydb_persqueue_public/codecs/codecs.h index 727a929cd0b..8930466472a 100644 --- a/client/ydb_persqueue_public/codecs/codecs.h +++ b/src/client/ydb_persqueue_public/codecs/codecs.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace NYdb::NPersQueue { diff --git a/src/client/ydb_persqueue_public/persqueue.h b/src/client/ydb_persqueue_public/persqueue.h new file mode 100644 index 00000000000..c98407edd97 --- /dev/null +++ b/src/client/ydb_persqueue_public/persqueue.h @@ -0,0 +1,2 @@ +#pragma once +#include diff --git a/client/ydb_proto/CMakeLists.txt b/src/client/ydb_proto/CMakeLists.txt similarity index 86% rename from client/ydb_proto/CMakeLists.txt rename to src/client/ydb_proto/CMakeLists.txt index 4fa159d7c06..091ec0da804 100644 --- a/client/ydb_proto/CMakeLists.txt +++ b/src/client/ydb_proto/CMakeLists.txt @@ -12,7 +12,7 @@ target_link_libraries(cpp-client-ydb_proto PUBLIC ) target_sources(cpp-client-ydb_proto PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_proto/accessor.cpp + accessor.cpp ) add_library(YDB-CPP-SDK::Proto ALIAS cpp-client-ydb_proto) diff --git a/client/ydb_proto/accessor.cpp b/src/client/ydb_proto/accessor.cpp similarity index 99% rename from client/ydb_proto/accessor.cpp rename to src/client/ydb_proto/accessor.cpp index 156ad1b5146..300647c1695 100644 --- a/client/ydb_proto/accessor.cpp +++ b/src/client/ydb_proto/accessor.cpp @@ -1,6 +1,6 @@ #include "accessor.h" -#include +#include namespace NYdb { diff --git a/client/ydb_proto/accessor.h b/src/client/ydb_proto/accessor.h similarity index 81% rename from client/ydb_proto/accessor.h rename to src/client/ydb_proto/accessor.h index d2079b57a2f..428123f58ba 100644 --- a/client/ydb_proto/accessor.h +++ b/src/client/ydb_proto/accessor.h @@ -1,21 +1,21 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace NYdb { diff --git a/client/ydb_query/CMakeLists.txt b/src/client/ydb_query/CMakeLists.txt similarity index 70% rename from client/ydb_query/CMakeLists.txt rename to src/client/ydb_query/CMakeLists.txt index 15bcda9c714..29d7324b536 100644 --- a/client/ydb_query/CMakeLists.txt +++ b/src/client/ydb_query/CMakeLists.txt @@ -16,10 +16,10 @@ target_link_libraries(cpp-client-ydb_query PUBLIC ) target_sources(cpp-client-ydb_query PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_query/client.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_query/query.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_query/stats.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_query/tx.cpp + client.cpp + query.cpp + stats.cpp + tx.cpp ) add_library(YDB-CPP-SDK::Query ALIAS cpp-client-ydb_query) diff --git a/client/ydb_query/client.cpp b/src/client/ydb_query/client.cpp similarity index 97% rename from client/ydb_query/client.cpp rename to src/client/ydb_query/client.cpp index 58460253c47..c3aee96ca14 100644 --- a/client/ydb_query/client.cpp +++ b/src/client/ydb_query/client.cpp @@ -2,19 +2,19 @@ #include "impl/client_session.h" #define INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include +#include +#include +#include +#include namespace NYdb::NQuery { diff --git a/client/ydb_query/client.h b/src/client/ydb_query/client.h similarity index 97% rename from client/ydb_query/client.h rename to src/client/ydb_query/client.h index 5e69a44aa93..3319aa53886 100644 --- a/client/ydb_query/client.h +++ b/src/client/ydb_query/client.h @@ -3,12 +3,12 @@ #include "query.h" #include "tx.h" -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include namespace NYdb { class TProtoAccessor; diff --git a/client/ydb_query/impl/CMakeLists.txt b/src/client/ydb_query/impl/CMakeLists.txt similarity index 64% rename from client/ydb_query/impl/CMakeLists.txt rename to src/client/ydb_query/impl/CMakeLists.txt index 228f3177571..9bf723164af 100644 --- a/client/ydb_query/impl/CMakeLists.txt +++ b/src/client/ydb_query/impl/CMakeLists.txt @@ -9,8 +9,8 @@ target_link_libraries(client-ydb_query-impl PUBLIC ) target_sources(client-ydb_query-impl PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_query/impl/exec_query.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_query/impl/client_session.cpp + exec_query.cpp + client_session.cpp ) diff --git a/client/ydb_query/impl/client_session.cpp b/src/client/ydb_query/impl/client_session.cpp similarity index 93% rename from client/ydb_query/impl/client_session.cpp rename to src/client/ydb_query/impl/client_session.cpp index b16e3092beb..f471d37596d 100644 --- a/client/ydb_query/impl/client_session.cpp +++ b/src/client/ydb_query/impl/client_session.cpp @@ -1,10 +1,10 @@ #include "client_session.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include +#include namespace NYdb::NQuery { diff --git a/client/ydb_query/impl/client_session.h b/src/client/ydb_query/impl/client_session.h similarity index 90% rename from client/ydb_query/impl/client_session.h rename to src/client/ydb_query/impl/client_session.h index 82dd7beb7ca..55018b3b693 100644 --- a/client/ydb_query/impl/client_session.h +++ b/src/client/ydb_query/impl/client_session.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace NYdb::NQuery { diff --git a/client/ydb_query/impl/exec_query.cpp b/src/client/ydb_query/impl/exec_query.cpp similarity index 97% rename from client/ydb_query/impl/exec_query.cpp rename to src/client/ydb_query/impl/exec_query.cpp index 31a0ee12acc..50269ac6545 100644 --- a/client/ydb_query/impl/exec_query.cpp +++ b/src/client/ydb_query/impl/exec_query.cpp @@ -1,13 +1,13 @@ #define INCLUDE_YDB_INTERNAL_H #include "exec_query.h" -#include -#include -#include -#include +#include +#include +#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include +#include namespace NYdb::NQuery { diff --git a/client/ydb_query/impl/exec_query.h b/src/client/ydb_query/impl/exec_query.h similarity index 75% rename from client/ydb_query/impl/exec_query.h rename to src/client/ydb_query/impl/exec_query.h index 510fcde04d7..01da5e400e3 100644 --- a/client/ydb_query/impl/exec_query.h +++ b/src/client/ydb_query/impl/exec_query.h @@ -1,11 +1,11 @@ #pragma once -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace NYdb::NQuery { diff --git a/client/ydb_query/query.cpp b/src/client/ydb_query/query.cpp similarity index 100% rename from client/ydb_query/query.cpp rename to src/client/ydb_query/query.cpp diff --git a/client/ydb_query/query.h b/src/client/ydb_query/query.h similarity index 92% rename from client/ydb_query/query.h rename to src/client/ydb_query/query.h index 11b1f393473..d3071f1b11f 100644 --- a/client/ydb_query/query.h +++ b/src/client/ydb_query/query.h @@ -1,15 +1,15 @@ #pragma once -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include #include diff --git a/client/ydb_query/stats.cpp b/src/client/ydb_query/stats.cpp similarity index 94% rename from client/ydb_query/stats.cpp rename to src/client/ydb_query/stats.cpp index 1a3892d27f0..b07db1c29e5 100644 --- a/client/ydb_query/stats.cpp +++ b/src/client/ydb_query/stats.cpp @@ -1,8 +1,8 @@ #include "stats.h" -#include +#include -#include +#include #include diff --git a/client/ydb_query/stats.h b/src/client/ydb_query/stats.h similarity index 95% rename from client/ydb_query/stats.h rename to src/client/ydb_query/stats.h index 5a333533353..e8d2eb4c622 100644 --- a/client/ydb_query/stats.h +++ b/src/client/ydb_query/stats.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/client/ydb_query/tx.cpp b/src/client/ydb_query/tx.cpp similarity index 100% rename from client/ydb_query/tx.cpp rename to src/client/ydb_query/tx.cpp diff --git a/client/ydb_query/tx.h b/src/client/ydb_query/tx.h similarity index 94% rename from client/ydb_query/tx.h rename to src/client/ydb_query/tx.h index c800b047c75..a75f6eec8f1 100644 --- a/client/ydb_query/tx.h +++ b/src/client/ydb_query/tx.h @@ -1,10 +1,10 @@ #pragma once -#include +#include -#include +#include -#include +#include #include diff --git a/client/ydb_rate_limiter/CMakeLists.txt b/src/client/ydb_rate_limiter/CMakeLists.txt similarity index 82% rename from client/ydb_rate_limiter/CMakeLists.txt rename to src/client/ydb_rate_limiter/CMakeLists.txt index ecce3b75e78..fcbbbeda07e 100644 --- a/client/ydb_rate_limiter/CMakeLists.txt +++ b/src/client/ydb_rate_limiter/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries(cpp-client-ydb_rate_limiter PUBLIC ) target_sources(cpp-client-ydb_rate_limiter PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_rate_limiter/rate_limiter.cpp + rate_limiter.cpp ) add_library(YDB-CPP-SDK::RateLimiter ALIAS cpp-client-ydb_rate_limiter) diff --git a/client/ydb_rate_limiter/rate_limiter.cpp b/src/client/ydb_rate_limiter/rate_limiter.cpp similarity index 98% rename from client/ydb_rate_limiter/rate_limiter.cpp rename to src/client/ydb_rate_limiter/rate_limiter.cpp index 18fce0ca0e0..8ffff536c27 100644 --- a/client/ydb_rate_limiter/rate_limiter.cpp +++ b/src/client/ydb_rate_limiter/rate_limiter.cpp @@ -1,11 +1,11 @@ #include "rate_limiter.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include namespace NYdb::NRateLimiter { diff --git a/client/ydb_rate_limiter/rate_limiter.h b/src/client/ydb_rate_limiter/rate_limiter.h similarity index 99% rename from client/ydb_rate_limiter/rate_limiter.h rename to src/client/ydb_rate_limiter/rate_limiter.h index a3f5f22c4b0..93cd4eaff0c 100644 --- a/client/ydb_rate_limiter/rate_limiter.h +++ b/src/client/ydb_rate_limiter/rate_limiter.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace Ydb::RateLimiter { class DescribeResourceResult; diff --git a/client/ydb_result/CMakeLists.txt b/src/client/ydb_result/CMakeLists.txt similarity index 72% rename from client/ydb_result/CMakeLists.txt rename to src/client/ydb_result/CMakeLists.txt index 2b8b5382462..e5d62e0d620 100644 --- a/client/ydb_result/CMakeLists.txt +++ b/src/client/ydb_result/CMakeLists.txt @@ -9,8 +9,8 @@ target_link_libraries(cpp-client-ydb_result PUBLIC ) target_sources(cpp-client-ydb_result PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_result/proto_accessor.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_result/result.cpp + proto_accessor.cpp + result.cpp ) add_library(YDB-CPP-SDK::Result ALIAS cpp-client-ydb_result) diff --git a/client/ydb_result/proto_accessor.cpp b/src/client/ydb_result/proto_accessor.cpp similarity index 80% rename from client/ydb_result/proto_accessor.cpp rename to src/client/ydb_result/proto_accessor.cpp index 8660e091dbf..956386bc63a 100644 --- a/client/ydb_result/proto_accessor.cpp +++ b/src/client/ydb_result/proto_accessor.cpp @@ -1,6 +1,6 @@ #include "result.h" -#include +#include namespace NYdb { diff --git a/client/ydb_result/result.cpp b/src/client/ydb_result/result.cpp similarity index 96% rename from client/ydb_result/result.cpp rename to src/client/ydb_result/result.cpp index 93ab1ad0556..3b312e23e67 100644 --- a/client/ydb_result/result.cpp +++ b/src/client/ydb_result/result.cpp @@ -1,13 +1,13 @@ #include "result.h" -#include +#include -#include -#include +#include +#include -#include +#include -#include +#include #include diff --git a/client/ydb_result/result.h b/src/client/ydb_result/result.h similarity index 98% rename from client/ydb_result/result.h rename to src/client/ydb_result/result.h index 17a37316f2b..373f85a7ad4 100644 --- a/client/ydb_result/result.h +++ b/src/client/ydb_result/result.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/client/ydb_retry/retry.h b/src/client/ydb_retry/retry.h similarity index 93% rename from client/ydb_retry/retry.h rename to src/client/ydb_retry/retry.h index bb57103af23..6e0e43e8f04 100644 --- a/client/ydb_retry/retry.h +++ b/src/client/ydb_retry/retry.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace NYdb::NRetry { diff --git a/client/ydb_scheme/CMakeLists.txt b/src/client/ydb_scheme/CMakeLists.txt similarity index 75% rename from client/ydb_scheme/CMakeLists.txt rename to src/client/ydb_scheme/CMakeLists.txt index 0a23e07802a..15d0759ce39 100644 --- a/client/ydb_scheme/CMakeLists.txt +++ b/src/client/ydb_scheme/CMakeLists.txt @@ -6,16 +6,16 @@ target_link_libraries(cpp-client-ydb_scheme PUBLIC impl-ydb_internal-make_request client-ydb_common_client-impl cpp-client-ydb_driver - ) +) target_sources(cpp-client-ydb_scheme PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_scheme/scheme.cpp + scheme.cpp ) generate_enum_serilization(cpp-client-ydb_scheme - ${YDB_SDK_SOURCE_DIR}/client/ydb_scheme/scheme.h + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_scheme/scheme.h INCLUDE_HEADERS - client/ydb_scheme/scheme.h + src/client/ydb_scheme/scheme.h ) add_library(YDB-CPP-SDK::Scheme ALIAS cpp-client-ydb_scheme) diff --git a/client/ydb_scheme/scheme.cpp b/src/client/ydb_scheme/scheme.cpp similarity index 97% rename from client/ydb_scheme/scheme.cpp rename to src/client/ydb_scheme/scheme.cpp index b6fe989cafd..6dfed7d081a 100644 --- a/client/ydb_scheme/scheme.cpp +++ b/src/client/ydb_scheme/scheme.cpp @@ -1,13 +1,13 @@ #include "scheme.h" #define INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include -#include +#include +#include +#include namespace NYdb { diff --git a/client/ydb_scheme/scheme.h b/src/client/ydb_scheme/scheme.h similarity index 99% rename from client/ydb_scheme/scheme.h rename to src/client/ydb_scheme/scheme.h index e085711e731..707e90de920 100644 --- a/client/ydb_scheme/scheme.h +++ b/src/client/ydb_scheme/scheme.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace Ydb { class VirtualTimestamp; diff --git a/client/ydb_table/CMakeLists.txt b/src/client/ydb_table/CMakeLists.txt similarity index 78% rename from client/ydb_table/CMakeLists.txt rename to src/client/ydb_table/CMakeLists.txt index f2ec980fb85..db4204e7c68 100644 --- a/client/ydb_table/CMakeLists.txt +++ b/src/client/ydb_table/CMakeLists.txt @@ -20,17 +20,17 @@ target_link_libraries(cpp-client-ydb_table PUBLIC client-ydb_types-operation cpp-client-ydb_value cpp-string_utils-misc - ) +) target_sources(cpp-client-ydb_table PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_table/table.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_table/proto_accessor.cpp + table.cpp + proto_accessor.cpp ) generate_enum_serilization(cpp-client-ydb_table - ${YDB_SDK_SOURCE_DIR}/client/ydb_table/table_enum.h + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_table/table_enum.h INCLUDE_HEADERS - client/ydb_table/table_enum.h + src/client/ydb_table/table_enum.h ) add_library(YDB-CPP-SDK::Table ALIAS cpp-client-ydb_table) diff --git a/client/ydb_table/impl/CMakeLists.txt b/src/client/ydb_table/impl/CMakeLists.txt similarity index 50% rename from client/ydb_table/impl/CMakeLists.txt rename to src/client/ydb_table/impl/CMakeLists.txt index 64ed2a760ac..8c8108f9a91 100644 --- a/client/ydb_table/impl/CMakeLists.txt +++ b/src/client/ydb_table/impl/CMakeLists.txt @@ -12,11 +12,11 @@ target_link_libraries(client-ydb_table-impl PUBLIC ) target_sources(client-ydb_table-impl PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_table/impl/client_session.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_table/impl/data_query.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_table/impl/readers.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_table/impl/request_migrator.cpp - ${YDB_SDK_SOURCE_DIR}/client/ydb_table/impl/table_client.cpp + client_session.cpp + data_query.cpp + readers.cpp + request_migrator.cpp + table_client.cpp ) diff --git a/client/ydb_table/impl/client_session.cpp b/src/client/ydb_table/impl/client_session.cpp similarity index 98% rename from client/ydb_table/impl/client_session.cpp rename to src/client/ydb_table/impl/client_session.cpp index 4e5ccc42b90..acff281cca3 100644 --- a/client/ydb_table/impl/client_session.cpp +++ b/src/client/ydb_table/impl/client_session.cpp @@ -1,7 +1,7 @@ #include "client_session.h" #include "data_query.h" -#include +#include namespace NYdb { namespace NTable { diff --git a/client/ydb_table/impl/client_session.h b/src/client/ydb_table/impl/client_session.h similarity index 83% rename from client/ydb_table/impl/client_session.h rename to src/client/ydb_table/impl/client_session.h index fa77db7f538..0aed74484e3 100644 --- a/client/ydb_table/impl/client_session.h +++ b/src/client/ydb_table/impl/client_session.h @@ -1,15 +1,15 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include -#include +#include -#include +#include #include diff --git a/client/ydb_table/impl/data_query.cpp b/src/client/ydb_table/impl/data_query.cpp similarity index 100% rename from client/ydb_table/impl/data_query.cpp rename to src/client/ydb_table/impl/data_query.cpp diff --git a/client/ydb_table/impl/data_query.h b/src/client/ydb_table/impl/data_query.h similarity index 92% rename from client/ydb_table/impl/data_query.h rename to src/client/ydb_table/impl/data_query.h index 041b5a8367e..4de9ad88707 100644 --- a/client/ydb_table/impl/data_query.h +++ b/src/client/ydb_table/impl/data_query.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace NYdb { namespace NTable { diff --git a/client/ydb_table/impl/readers.cpp b/src/client/ydb_table/impl/readers.cpp similarity index 98% rename from client/ydb_table/impl/readers.cpp rename to src/client/ydb_table/impl/readers.cpp index efada1287d8..c211387dd54 100644 --- a/client/ydb_table/impl/readers.cpp +++ b/src/client/ydb_table/impl/readers.cpp @@ -1,6 +1,6 @@ #include "readers.h" -#include +#include namespace NYdb { diff --git a/client/ydb_table/impl/readers.h b/src/client/ydb_table/impl/readers.h similarity index 90% rename from client/ydb_table/impl/readers.h rename to src/client/ydb_table/impl/readers.h index f17489034a3..4beb71d07ea 100644 --- a/client/ydb_table/impl/readers.h +++ b/src/client/ydb_table/impl/readers.h @@ -1,11 +1,11 @@ #pragma once -#include +#include -#include -#include +#include +#include -#include +#include #include "client_session.h" #include "data_query.h" diff --git a/client/ydb_table/impl/request_migrator.cpp b/src/client/ydb_table/impl/request_migrator.cpp similarity index 100% rename from client/ydb_table/impl/request_migrator.cpp rename to src/client/ydb_table/impl/request_migrator.cpp diff --git a/client/ydb_table/impl/request_migrator.h b/src/client/ydb_table/impl/request_migrator.h similarity index 95% rename from client/ydb_table/impl/request_migrator.h rename to src/client/ydb_table/impl/request_migrator.h index 26c6cedd8df..ba0d54bb005 100644 --- a/client/ydb_table/impl/request_migrator.h +++ b/src/client/ydb_table/impl/request_migrator.h @@ -2,9 +2,9 @@ #include "client_session.h" -#include +#include -#include +#include #include diff --git a/client/ydb_table/impl/table_client.cpp b/src/client/ydb_table/impl/table_client.cpp similarity index 100% rename from client/ydb_table/impl/table_client.cpp rename to src/client/ydb_table/impl/table_client.cpp diff --git a/client/ydb_table/impl/table_client.h b/src/client/ydb_table/impl/table_client.h similarity index 96% rename from client/ydb_table/impl/table_client.h rename to src/client/ydb_table/impl/table_client.h index c554f68c8fb..d4c26855e33 100644 --- a/client/ydb_table/impl/table_client.h +++ b/src/client/ydb_table/impl/table_client.h @@ -1,17 +1,17 @@ #pragma once #define INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include +#include +#include +#include +#include #include "client_session.h" #include "data_query.h" diff --git a/client/ydb_table/proto_accessor.cpp b/src/client/ydb_table/proto_accessor.cpp similarity index 98% rename from client/ydb_table/proto_accessor.cpp rename to src/client/ydb_table/proto_accessor.cpp index 35c6dfb368c..ee326786c43 100644 --- a/client/ydb_table/proto_accessor.cpp +++ b/src/client/ydb_table/proto_accessor.cpp @@ -1,4 +1,4 @@ -#include +#include #include "table.h" diff --git a/client/ydb_table/query_stats/CMakeLists.txt b/src/client/ydb_table/query_stats/CMakeLists.txt similarity index 78% rename from client/ydb_table/query_stats/CMakeLists.txt rename to src/client/ydb_table/query_stats/CMakeLists.txt index 0b549f2f4e1..255447cc270 100644 --- a/client/ydb_table/query_stats/CMakeLists.txt +++ b/src/client/ydb_table/query_stats/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries(client-ydb_table-query_stats PUBLIC ) target_sources(client-ydb_table-query_stats PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_table/query_stats/stats.cpp + stats.cpp ) diff --git a/client/ydb_table/query_stats/stats.cpp b/src/client/ydb_table/query_stats/stats.cpp similarity index 100% rename from client/ydb_table/query_stats/stats.cpp rename to src/client/ydb_table/query_stats/stats.cpp diff --git a/client/ydb_table/query_stats/stats.h b/src/client/ydb_table/query_stats/stats.h similarity index 95% rename from client/ydb_table/query_stats/stats.h rename to src/client/ydb_table/query_stats/stats.h index 5817ea1dfcc..d7f4c224e0d 100644 --- a/client/ydb_table/query_stats/stats.h +++ b/src/client/ydb_table/query_stats/stats.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class TDuration; diff --git a/client/ydb_table/table.cpp b/src/client/ydb_table/table.cpp similarity index 98% rename from client/ydb_table/table.cpp rename to src/client/ydb_table/table.cpp index 204c24d0245..5a33e7f304e 100644 --- a/client/ydb_table/table.cpp +++ b/src/client/ydb_table/table.cpp @@ -1,32 +1,32 @@ #include "table.h" #define INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include -#include -#include +#include +#include #include diff --git a/client/ydb_table/table.h b/src/client/ydb_table/table.h similarity index 99% rename from client/ydb_table/table.h rename to src/client/ydb_table/table.h index 39d36ec6485..d88f5794dbb 100644 --- a/client/ydb_table/table.h +++ b/src/client/ydb_table/table.h @@ -2,16 +2,16 @@ #include "table_enum.h" -#include -#include -#include -#include -#include -#include -#include - -#include -#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include namespace Ydb { namespace Table { diff --git a/client/ydb_table/table_enum.h b/src/client/ydb_table/table_enum.h similarity index 100% rename from client/ydb_table/table_enum.h rename to src/client/ydb_table/table_enum.h diff --git a/client/ydb_topic/CMakeLists.txt b/src/client/ydb_topic/CMakeLists.txt similarity index 80% rename from client/ydb_topic/CMakeLists.txt rename to src/client/ydb_topic/CMakeLists.txt index a0df43d6529..209a1596667 100644 --- a/client/ydb_topic/CMakeLists.txt +++ b/src/client/ydb_topic/CMakeLists.txt @@ -18,13 +18,13 @@ target_link_libraries(cpp-client-ydb_topic PUBLIC ) target_sources(cpp-client-ydb_topic PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/proto_accessor.cpp + proto_accessor.cpp ) generate_enum_serilization(cpp-client-ydb_topic - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/topic.h + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_topic/topic.h INCLUDE_HEADERS - client/ydb_topic/topic.h + src/client/ydb_topic/topic.h ) add_library(YDB-CPP-SDK::Topic ALIAS cpp-client-ydb_topic) diff --git a/client/ydb_topic/codecs/CMakeLists.txt b/src/client/ydb_topic/codecs/CMakeLists.txt similarity index 79% rename from client/ydb_topic/codecs/CMakeLists.txt rename to src/client/ydb_topic/codecs/CMakeLists.txt index bea5557d648..09b383965da 100644 --- a/client/ydb_topic/codecs/CMakeLists.txt +++ b/src/client/ydb_topic/codecs/CMakeLists.txt @@ -1,7 +1,6 @@ add_library(client-ydb_topic-codecs) target_link_libraries(client-ydb_topic-codecs PUBLIC - yutil cpp-streams-zstd public-issue-protos @@ -11,7 +10,7 @@ target_link_libraries(client-ydb_topic-codecs PUBLIC ) target_sources(client-ydb_topic-codecs PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_topic/codecs/codecs.cpp + codecs.cpp ) diff --git a/client/ydb_topic/codecs/codecs.cpp b/src/client/ydb_topic/codecs/codecs.cpp similarity index 94% rename from client/ydb_topic/codecs/codecs.cpp rename to src/client/ydb_topic/codecs/codecs.cpp index 8d16511f1cf..c4108bef3b5 100644 --- a/client/ydb_topic/codecs/codecs.cpp +++ b/src/client/ydb_topic/codecs/codecs.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include "codecs.h" diff --git a/client/ydb_topic/codecs/codecs.h b/src/client/ydb_topic/codecs/codecs.h similarity index 74% rename from client/ydb_topic/codecs/codecs.h rename to src/client/ydb_topic/codecs/codecs.h index 1fe022681cb..7f7add18ac8 100644 --- a/client/ydb_topic/codecs/codecs.h +++ b/src/client/ydb_topic/codecs/codecs.h @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace NYdb::NTopic { diff --git a/src/client/ydb_topic/impl/CMakeLists.txt b/src/client/ydb_topic/impl/CMakeLists.txt new file mode 100644 index 00000000000..d0241657fe2 --- /dev/null +++ b/src/client/ydb_topic/impl/CMakeLists.txt @@ -0,0 +1,33 @@ +add_library(client-ydb_topic-impl) + +target_link_libraries(client-ydb_topic-impl PUBLIC + yutil + library-grpc-client + cpp-monlib-dynamic_counters + cpp-monlib-metrics + cpp-string_utils-url + library-persqueue-obfuscate + api-grpc-draft + api-grpc + impl-ydb_internal-make_request + client-ydb_common_client-impl + cpp-client-ydb_driver + client-ydb_persqueue_core-impl + cpp-client-ydb_proto + proto_output +) + +target_sources(client-ydb_topic-impl PRIVATE + executor.cpp + read_session_event.cpp + counters.cpp + deferred_commit.cpp + event_handlers.cpp + read_session.cpp + write_session.cpp + write_session_impl.cpp + topic_impl.cpp + topic.cpp +) + + diff --git a/client/ydb_topic/impl/counters.cpp b/src/client/ydb_topic/impl/counters.cpp similarity index 97% rename from client/ydb_topic/impl/counters.cpp rename to src/client/ydb_topic/impl/counters.cpp index fb9af05b73e..d12e6a1ece6 100644 --- a/client/ydb_topic/impl/counters.cpp +++ b/src/client/ydb_topic/impl/counters.cpp @@ -1,4 +1,4 @@ -#include +#include namespace NYdb::NTopic { diff --git a/client/ydb_topic/impl/deferred_commit.cpp b/src/client/ydb_topic/impl/deferred_commit.cpp similarity index 96% rename from client/ydb_topic/impl/deferred_commit.cpp rename to src/client/ydb_topic/impl/deferred_commit.cpp index fa9dcd56288..28162e4fabc 100644 --- a/client/ydb_topic/impl/deferred_commit.cpp +++ b/src/client/ydb_topic/impl/deferred_commit.cpp @@ -1,8 +1,8 @@ -#include +#include -#include +#include -#include +#include namespace NYdb::NTopic { diff --git a/client/ydb_topic/impl/event_handlers.cpp b/src/client/ydb_topic/impl/event_handlers.cpp similarity index 98% rename from client/ydb_topic/impl/event_handlers.cpp rename to src/client/ydb_topic/impl/event_handlers.cpp index c78fe7b1372..7772c809487 100644 --- a/client/ydb_topic/impl/event_handlers.cpp +++ b/src/client/ydb_topic/impl/event_handlers.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include namespace NYdb::NTopic { diff --git a/client/ydb_topic/impl/executor.cpp b/src/client/ydb_topic/impl/executor.cpp similarity index 100% rename from client/ydb_topic/impl/executor.cpp rename to src/client/ydb_topic/impl/executor.cpp diff --git a/client/ydb_topic/impl/executor.h b/src/client/ydb_topic/impl/executor.h similarity index 93% rename from client/ydb_topic/impl/executor.h rename to src/client/ydb_topic/impl/executor.h index 12e9d5136bd..205ebece838 100644 --- a/client/ydb_topic/impl/executor.h +++ b/src/client/ydb_topic/impl/executor.h @@ -1,9 +1,9 @@ #pragma once -#include -#include +#include +#include -#include +#include namespace NYdb::NTopic { diff --git a/client/ydb_topic/impl/read_session.cpp b/src/client/ydb_topic/impl/read_session.cpp similarity index 98% rename from client/ydb_topic/impl/read_session.cpp rename to src/client/ydb_topic/impl/read_session.cpp index 0bdee4d40c5..5e5cffb3b7c 100644 --- a/client/ydb_topic/impl/read_session.cpp +++ b/src/client/ydb_topic/impl/read_session.cpp @@ -1,12 +1,12 @@ #include "read_session.h" -#include +#include #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include +#include namespace NYdb::NTopic { diff --git a/client/ydb_topic/impl/read_session.h b/src/client/ydb_topic/impl/read_session.h similarity index 94% rename from client/ydb_topic/impl/read_session.h rename to src/client/ydb_topic/impl/read_session.h index 45aa4f7c182..2a0904d7387 100644 --- a/client/ydb_topic/impl/read_session.h +++ b/src/client/ydb_topic/impl/read_session.h @@ -2,9 +2,9 @@ #include "topic_impl.h" -#include -#include -#include +#include +#include +#include namespace NYdb::NTopic { diff --git a/client/ydb_topic/impl/read_session_event.cpp b/src/client/ydb_topic/impl/read_session_event.cpp similarity index 99% rename from client/ydb_topic/impl/read_session_event.cpp rename to src/client/ydb_topic/impl/read_session_event.cpp index f4c37312dc9..60ca6a2696c 100644 --- a/client/ydb_topic/impl/read_session_event.cpp +++ b/src/client/ydb_topic/impl/read_session_event.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include namespace NYdb::NTopic { diff --git a/client/ydb_topic/impl/topic.cpp b/src/client/ydb_topic/impl/topic.cpp similarity index 97% rename from client/ydb_topic/impl/topic.cpp rename to src/client/ydb_topic/impl/topic.cpp index 2e36009d269..737f03d605b 100644 --- a/client/ydb_topic/impl/topic.cpp +++ b/src/client/ydb_topic/impl/topic.cpp @@ -1,14 +1,14 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include -#include -#include -#include +#include +#include +#include namespace NYdb::NTopic { diff --git a/client/ydb_topic/impl/topic_impl.cpp b/src/client/ydb_topic/impl/topic_impl.cpp similarity index 96% rename from client/ydb_topic/impl/topic_impl.cpp rename to src/client/ydb_topic/impl/topic_impl.cpp index 00e8cfe17b6..69a6d1530f9 100644 --- a/client/ydb_topic/impl/topic_impl.cpp +++ b/src/client/ydb_topic/impl/topic_impl.cpp @@ -1,7 +1,7 @@ #include "topic_impl.h" -#include -#include +#include +#include #include "read_session.h" #include "write_session.h" diff --git a/client/ydb_topic/impl/topic_impl.h b/src/client/ydb_topic/impl/topic_impl.h similarity index 97% rename from client/ydb_topic/impl/topic_impl.h rename to src/client/ydb_topic/impl/topic_impl.h index 67683b22787..55f401e1ccc 100644 --- a/client/ydb_topic/impl/topic_impl.h +++ b/src/client/ydb_topic/impl/topic_impl.h @@ -1,16 +1,16 @@ #pragma once #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include namespace NYdb::NTopic { diff --git a/client/ydb_topic/impl/write_session.cpp b/src/client/ydb_topic/impl/write_session.cpp similarity index 99% rename from client/ydb_topic/impl/write_session.cpp rename to src/client/ydb_topic/impl/write_session.cpp index a365f4fb323..132fe81bea7 100644 --- a/client/ydb_topic/impl/write_session.cpp +++ b/src/client/ydb_topic/impl/write_session.cpp @@ -1,6 +1,6 @@ #include "write_session.h" -#include +#include namespace NYdb::NTopic { diff --git a/client/ydb_topic/impl/write_session.h b/src/client/ydb_topic/impl/write_session.h similarity index 94% rename from client/ydb_topic/impl/write_session.h rename to src/client/ydb_topic/impl/write_session.h index 85db4feaa42..8755094c7d1 100644 --- a/client/ydb_topic/impl/write_session.h +++ b/src/client/ydb_topic/impl/write_session.h @@ -3,11 +3,11 @@ #include "topic_impl.h" #include "write_session_impl.h" -#include -#include -#include +#include +#include +#include -#include +#include #include diff --git a/client/ydb_topic/impl/write_session_impl.cpp b/src/client/ydb_topic/impl/write_session_impl.cpp similarity index 99% rename from client/ydb_topic/impl/write_session_impl.cpp rename to src/client/ydb_topic/impl/write_session_impl.cpp index 81c8d5c0ef1..20085e75996 100644 --- a/client/ydb_topic/impl/write_session_impl.cpp +++ b/src/client/ydb_topic/impl/write_session_impl.cpp @@ -1,16 +1,16 @@ #include "write_session.h" -#include +#include -#include -#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace NYdb::NTopic { diff --git a/client/ydb_topic/impl/write_session_impl.h b/src/client/ydb_topic/impl/write_session_impl.h similarity index 98% rename from client/ydb_topic/impl/write_session_impl.h rename to src/client/ydb_topic/impl/write_session_impl.h index 3799da75311..af3d2af9497 100644 --- a/client/ydb_topic/impl/write_session_impl.h +++ b/src/client/ydb_topic/impl/write_session_impl.h @@ -2,11 +2,11 @@ #include "topic_impl.h" -#include -#include -#include +#include +#include +#include -#include +#include namespace NYdb::NTopic { diff --git a/client/ydb_topic/proto_accessor.cpp b/src/client/ydb_topic/proto_accessor.cpp similarity index 97% rename from client/ydb_topic/proto_accessor.cpp rename to src/client/ydb_topic/proto_accessor.cpp index d862bf43660..a5fd7b1f078 100644 --- a/client/ydb_topic/proto_accessor.cpp +++ b/src/client/ydb_topic/proto_accessor.cpp @@ -1,4 +1,4 @@ -#include +#include namespace NYdb { const Ydb::Topic::DescribeTopicResult& TProtoAccessor::GetProto(const NTopic::TTopicDescription& topicDescription) { diff --git a/client/ydb_topic/topic.h b/src/client/ydb_topic/topic.h similarity index 99% rename from client/ydb_topic/topic.h rename to src/client/ydb_topic/topic.h index 603a7bcbe27..9cb874342ee 100644 --- a/client/ydb_topic/topic.h +++ b/src/client/ydb_topic/topic.h @@ -1,19 +1,19 @@ #pragma once -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include #include #include diff --git a/client/ydb_topic/ut/CMakeLists.darwin-arm64.txt b/src/client/ydb_topic/ut/CMakeLists.darwin-arm64.txt similarity index 100% rename from client/ydb_topic/ut/CMakeLists.darwin-arm64.txt rename to src/client/ydb_topic/ut/CMakeLists.darwin-arm64.txt diff --git a/client/ydb_topic/ut/CMakeLists.darwin-x86_64.txt b/src/client/ydb_topic/ut/CMakeLists.darwin-x86_64.txt similarity index 100% rename from client/ydb_topic/ut/CMakeLists.darwin-x86_64.txt rename to src/client/ydb_topic/ut/CMakeLists.darwin-x86_64.txt diff --git a/client/ydb_topic/ut/CMakeLists.linux-aarch64.txt b/src/client/ydb_topic/ut/CMakeLists.linux-aarch64.txt similarity index 100% rename from client/ydb_topic/ut/CMakeLists.linux-aarch64.txt rename to src/client/ydb_topic/ut/CMakeLists.linux-aarch64.txt diff --git a/client/ydb_topic/ut/CMakeLists.linux-x86_64.txt b/src/client/ydb_topic/ut/CMakeLists.linux-x86_64.txt similarity index 100% rename from client/ydb_topic/ut/CMakeLists.linux-x86_64.txt rename to src/client/ydb_topic/ut/CMakeLists.linux-x86_64.txt diff --git a/src/client/ydb_topic/ut/CMakeLists.txt b/src/client/ydb_topic/ut/CMakeLists.txt new file mode 100644 index 00000000000..4fbe9853d99 --- /dev/null +++ b/src/client/ydb_topic/ut/CMakeLists.txt @@ -0,0 +1,19 @@ + +# 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 "x86_64") + include(CMakeLists.linux-x86_64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") + 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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") + include(CMakeLists.darwin-arm64.txt) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") + include(CMakeLists.windows-x86_64.txt) +endif() diff --git a/client/ydb_topic/ut/CMakeLists.windows-x86_64.txt b/src/client/ydb_topic/ut/CMakeLists.windows-x86_64.txt similarity index 100% rename from client/ydb_topic/ut/CMakeLists.windows-x86_64.txt rename to src/client/ydb_topic/ut/CMakeLists.windows-x86_64.txt diff --git a/client/ydb_topic/ut/basic_usage_ut.cpp b/src/client/ydb_topic/ut/basic_usage_ut.cpp similarity index 98% rename from client/ydb_topic/ut/basic_usage_ut.cpp rename to src/client/ydb_topic/ut/basic_usage_ut.cpp index 8f4cce016fc..3f010524e8d 100644 --- a/client/ydb_topic/ut/basic_usage_ut.cpp +++ b/src/client/ydb_topic/ut/basic_usage_ut.cpp @@ -1,19 +1,19 @@ #include "ut_utils/managed_executor.h" #include "ut_utils/topic_sdk_test_setup.h" -#include +#include -#include +#include -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/client/ydb_topic/ut/describe_topic_ut.cpp b/src/client/ydb_topic/ut/describe_topic_ut.cpp similarity index 97% rename from client/ydb_topic/ut/describe_topic_ut.cpp rename to src/client/ydb_topic/ut/describe_topic_ut.cpp index 044974eb03e..2832f991957 100644 --- a/client/ydb_topic/ut/describe_topic_ut.cpp +++ b/src/client/ydb_topic/ut/describe_topic_ut.cpp @@ -1,14 +1,14 @@ #include "ut_utils/topic_sdk_test_setup.h" -#include -#include -#include -#include - -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include #include diff --git a/client/ydb_topic/ut/local_partition_ut.cpp b/src/client/ydb_topic/ut/local_partition_ut.cpp similarity index 97% rename from client/ydb_topic/ut/local_partition_ut.cpp rename to src/client/ydb_topic/ut/local_partition_ut.cpp index 7431b1281ab..5856d36f31e 100644 --- a/client/ydb_topic/ut/local_partition_ut.cpp +++ b/src/client/ydb_topic/ut/local_partition_ut.cpp @@ -1,16 +1,16 @@ #include "ut_utils/topic_sdk_test_setup.h" -#include +#include -#include +#include -#include +#include -#include -#include +#include +#include -#include -#include +#include +#include #include diff --git a/client/ydb_topic/ut/topic_to_table_ut.cpp b/src/client/ydb_topic/ut/topic_to_table_ut.cpp similarity index 96% rename from client/ydb_topic/ut/topic_to_table_ut.cpp rename to src/client/ydb_topic/ut/topic_to_table_ut.cpp index 295d1048b24..aeb43058605 100644 --- a/client/ydb_topic/ut/topic_to_table_ut.cpp +++ b/src/client/ydb_topic/ut/topic_to_table_ut.cpp @@ -1,12 +1,12 @@ #include "ut_utils/topic_sdk_test_setup.h" -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include namespace NYdb::NTopic::NTests { diff --git a/client/ydb_topic/ut/ut_utils/CMakeLists.darwin-arm64.txt b/src/client/ydb_topic/ut/ut_utils/CMakeLists.darwin-arm64.txt similarity index 100% rename from client/ydb_topic/ut/ut_utils/CMakeLists.darwin-arm64.txt rename to src/client/ydb_topic/ut/ut_utils/CMakeLists.darwin-arm64.txt diff --git a/client/ydb_topic/ut/ut_utils/CMakeLists.darwin-x86_64.txt b/src/client/ydb_topic/ut/ut_utils/CMakeLists.darwin-x86_64.txt similarity index 100% rename from client/ydb_topic/ut/ut_utils/CMakeLists.darwin-x86_64.txt rename to src/client/ydb_topic/ut/ut_utils/CMakeLists.darwin-x86_64.txt diff --git a/client/ydb_topic/ut/ut_utils/CMakeLists.linux-aarch64.txt b/src/client/ydb_topic/ut/ut_utils/CMakeLists.linux-aarch64.txt similarity index 100% rename from client/ydb_topic/ut/ut_utils/CMakeLists.linux-aarch64.txt rename to src/client/ydb_topic/ut/ut_utils/CMakeLists.linux-aarch64.txt diff --git a/client/ydb_topic/ut/ut_utils/CMakeLists.linux-x86_64.txt b/src/client/ydb_topic/ut/ut_utils/CMakeLists.linux-x86_64.txt similarity index 100% rename from client/ydb_topic/ut/ut_utils/CMakeLists.linux-x86_64.txt rename to src/client/ydb_topic/ut/ut_utils/CMakeLists.linux-x86_64.txt diff --git a/src/client/ydb_topic/ut/ut_utils/CMakeLists.txt b/src/client/ydb_topic/ut/ut_utils/CMakeLists.txt new file mode 100644 index 00000000000..4fbe9853d99 --- /dev/null +++ b/src/client/ydb_topic/ut/ut_utils/CMakeLists.txt @@ -0,0 +1,19 @@ + +# 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 "x86_64") + include(CMakeLists.linux-x86_64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") + 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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") + include(CMakeLists.darwin-arm64.txt) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") + include(CMakeLists.windows-x86_64.txt) +endif() diff --git a/client/ydb_topic/ut/ut_utils/CMakeLists.windows-x86_64.txt b/src/client/ydb_topic/ut/ut_utils/CMakeLists.windows-x86_64.txt similarity index 100% rename from client/ydb_topic/ut/ut_utils/CMakeLists.windows-x86_64.txt rename to src/client/ydb_topic/ut/ut_utils/CMakeLists.windows-x86_64.txt diff --git a/client/ydb_topic/ut/ut_utils/managed_executor.cpp b/src/client/ydb_topic/ut/ut_utils/managed_executor.cpp similarity index 100% rename from client/ydb_topic/ut/ut_utils/managed_executor.cpp rename to src/client/ydb_topic/ut/ut_utils/managed_executor.cpp diff --git a/client/ydb_topic/ut/ut_utils/managed_executor.h b/src/client/ydb_topic/ut/ut_utils/managed_executor.h similarity index 91% rename from client/ydb_topic/ut/ut_utils/managed_executor.h rename to src/client/ydb_topic/ut/ut_utils/managed_executor.h index 9bf3976af8f..7fd21398de0 100644 --- a/client/ydb_topic/ut/ut_utils/managed_executor.h +++ b/src/client/ydb_topic/ut/ut_utils/managed_executor.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/client/ydb_topic/ut/ut_utils/topic_sdk_test_setup.cpp b/src/client/ydb_topic/ut/ut_utils/topic_sdk_test_setup.cpp similarity index 100% rename from client/ydb_topic/ut/ut_utils/topic_sdk_test_setup.cpp rename to src/client/ydb_topic/ut/ut_utils/topic_sdk_test_setup.cpp diff --git a/client/ydb_topic/ut/ut_utils/topic_sdk_test_setup.h b/src/client/ydb_topic/ut/ut_utils/topic_sdk_test_setup.h similarity index 91% rename from client/ydb_topic/ut/ut_utils/topic_sdk_test_setup.h rename to src/client/ydb_topic/ut/ut_utils/topic_sdk_test_setup.h index 7f6e1d49f62..e6fa568a64d 100644 --- a/client/ydb_topic/ut/ut_utils/topic_sdk_test_setup.h +++ b/src/client/ydb_topic/ut/ut_utils/topic_sdk_test_setup.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include namespace NYdb::NTopic::NTests { diff --git a/client/ydb_topic/ut/ut_utils/ya.make b/src/client/ydb_topic/ut/ut_utils/ya.make similarity index 64% rename from client/ydb_topic/ut/ut_utils/ya.make rename to src/client/ydb_topic/ut/ut_utils/ya.make index 192686e06b2..ecb7aa3ced5 100644 --- a/client/ydb_topic/ut/ut_utils/ya.make +++ b/src/client/ydb_topic/ut/ut_utils/ya.make @@ -8,11 +8,11 @@ SRCS( ) PEERDIR( - ydb/library/grpc/server - library/cpp/testing/unittest - library/cpp/threading/chunk_queue + src/library/grpc/server + src/library/testing/unittest + src/library/threading/chunk_queue ydb/core/testlib/default - ydb/library/persqueue/topic_parser_public + src/library/persqueue/topic_parser_public client/ydb_driver client/ydb_topic client/ydb_table diff --git a/client/ydb_topic/ut/ya.make b/src/client/ydb_topic/ut/ya.make similarity index 94% rename from client/ydb_topic/ut/ya.make rename to src/client/ydb_topic/ut/ya.make index 1cef5a3949b..26dd940da52 100644 --- a/client/ydb_topic/ut/ya.make +++ b/src/client/ydb_topic/ut/ya.make @@ -12,7 +12,7 @@ ENDIF() FORK_SUBTESTS() PEERDIR( - library/cpp/testing/gmock_in_unittest + src/library/testing/gmock_in_unittest ydb/core/testlib/default ydb/public/lib/json_value ydb/public/lib/yson_value diff --git a/client/ydb_types/CMakeLists.txt b/src/client/ydb_types/CMakeLists.txt similarity index 73% rename from client/ydb_types/CMakeLists.txt rename to src/client/ydb_types/CMakeLists.txt index eb5707f2557..53eb72945cc 100644 --- a/client/ydb_types/CMakeLists.txt +++ b/src/client/ydb_types/CMakeLists.txt @@ -13,15 +13,17 @@ target_link_libraries(cpp-client-ydb_types PUBLIC yql-public-issue tools-enum_parser-enum_serialization_runtime ) + generate_enum_serilization(cpp-client-ydb_types - ${YDB_SDK_SOURCE_DIR}/client/ydb_types/s3_settings.h + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_types/s3_settings.h INCLUDE_HEADERS - client/ydb_types/s3_settings.h + src/client/ydb_types/s3_settings.h ) + generate_enum_serilization(cpp-client-ydb_types - ${YDB_SDK_SOURCE_DIR}/client/ydb_types/status_codes.h + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_types/status_codes.h INCLUDE_HEADERS - client/ydb_types/status_codes.h + src/client/ydb_types/status_codes.h ) add_library(YDB-CPP-SDK::Types ALIAS cpp-client-ydb_types) diff --git a/client/ydb_types/core_facility/core_facility.h b/src/client/ydb_types/core_facility/core_facility.h similarity index 81% rename from client/ydb_types/core_facility/core_facility.h rename to src/client/ydb_types/core_facility/core_facility.h index cd3b653653e..6a2a01014f2 100644 --- a/client/ydb_types/core_facility/core_facility.h +++ b/src/client/ydb_types/core_facility/core_facility.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace NYdb { using TPeriodicCb = std::function; diff --git a/client/ydb_types/credentials/CMakeLists.txt b/src/client/ydb_types/credentials/CMakeLists.txt similarity index 73% rename from client/ydb_types/credentials/CMakeLists.txt rename to src/client/ydb_types/credentials/CMakeLists.txt index 69baf7b9a34..103224f0304 100644 --- a/client/ydb_types/credentials/CMakeLists.txt +++ b/src/client/ydb_types/credentials/CMakeLists.txt @@ -4,14 +4,14 @@ add_library(client-ydb_types-credentials) target_link_libraries(client-ydb_types-credentials PUBLIC yutil - ydb-library-login + library-login api-grpc client-ydb_types-status yql-public-issue ) target_sources(client-ydb_types-credentials PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_types/credentials/credentials.cpp + credentials.cpp ) diff --git a/client/ydb_types/credentials/credentials.cpp b/src/client/ydb_types/credentials/credentials.cpp similarity index 98% rename from client/ydb_types/credentials/credentials.cpp rename to src/client/ydb_types/credentials/credentials.cpp index 0d57f8fd638..00407e358a6 100644 --- a/client/ydb_types/credentials/credentials.cpp +++ b/src/client/ydb_types/credentials/credentials.cpp @@ -1,5 +1,5 @@ #include "credentials.h" -#include +#include namespace NYdb { diff --git a/client/ydb_types/credentials/credentials.h b/src/client/ydb_types/credentials/credentials.h similarity index 97% rename from client/ydb_types/credentials/credentials.h rename to src/client/ydb_types/credentials/credentials.h index 0130f3679e0..c345616f2c6 100644 --- a/client/ydb_types/credentials/credentials.h +++ b/src/client/ydb_types/credentials/credentials.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/client/ydb_types/credentials/login/CMakeLists.txt b/src/client/ydb_types/credentials/login/CMakeLists.txt similarity index 69% rename from client/ydb_types/credentials/login/CMakeLists.txt rename to src/client/ydb_types/credentials/login/CMakeLists.txt index 58c4ffe2dae..fcdf1e128d8 100644 --- a/client/ydb_types/credentials/login/CMakeLists.txt +++ b/src/client/ydb_types/credentials/login/CMakeLists.txt @@ -2,8 +2,8 @@ add_library(ydb_types-credentials-login) target_link_libraries(ydb_types-credentials-login PUBLIC yutil - ydb-library-login - ydb-library-security + library-login + library-security api-grpc client-ydb_types-status impl-ydb_internal-grpc_connections @@ -11,7 +11,7 @@ target_link_libraries(ydb_types-credentials-login PUBLIC ) target_sources(ydb_types-credentials-login PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_types/credentials/login/login.cpp + login.cpp ) diff --git a/client/ydb_types/credentials/login/login.cpp b/src/client/ydb_types/credentials/login/login.cpp similarity index 94% rename from client/ydb_types/credentials/login/login.cpp rename to src/client/ydb_types/credentials/login/login.cpp index 4f2565d60a6..c83ab6a1b93 100644 --- a/client/ydb_types/credentials/login/login.cpp +++ b/src/client/ydb_types/credentials/login/login.cpp @@ -1,13 +1,13 @@ -#include +#include #define INCLUDE_YDB_INTERNAL_H -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include + +#include namespace NYdb { diff --git a/client/ydb_types/exceptions/CMakeLists.txt b/src/client/ydb_types/exceptions/CMakeLists.txt similarity index 70% rename from client/ydb_types/exceptions/CMakeLists.txt rename to src/client/ydb_types/exceptions/CMakeLists.txt index 714649fea1a..fdc56032870 100644 --- a/client/ydb_types/exceptions/CMakeLists.txt +++ b/src/client/ydb_types/exceptions/CMakeLists.txt @@ -1,12 +1,11 @@ add_library(client-ydb_types-exceptions) target_link_libraries(client-ydb_types-exceptions PUBLIC - yutil ) target_sources(client-ydb_types-exceptions PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_types/exceptions/exceptions.cpp + exceptions.cpp ) diff --git a/client/ydb_types/exceptions/exceptions.cpp b/src/client/ydb_types/exceptions/exceptions.cpp similarity index 100% rename from client/ydb_types/exceptions/exceptions.cpp rename to src/client/ydb_types/exceptions/exceptions.cpp diff --git a/client/ydb_types/exceptions/exceptions.h b/src/client/ydb_types/exceptions/exceptions.h similarity index 87% rename from client/ydb_types/exceptions/exceptions.h rename to src/client/ydb_types/exceptions/exceptions.h index cd3c51bb857..00055777f31 100644 --- a/client/ydb_types/exceptions/exceptions.h +++ b/src/client/ydb_types/exceptions/exceptions.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NYdb { diff --git a/client/ydb_types/fatal_error_handlers/CMakeLists.txt b/src/client/ydb_types/fatal_error_handlers/CMakeLists.txt similarity index 75% rename from client/ydb_types/fatal_error_handlers/CMakeLists.txt rename to src/client/ydb_types/fatal_error_handlers/CMakeLists.txt index 9fdd6f236a8..358de7a6883 100644 --- a/client/ydb_types/fatal_error_handlers/CMakeLists.txt +++ b/src/client/ydb_types/fatal_error_handlers/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(client-ydb_types-fatal_error_handlers PUBLIC ) target_sources(client-ydb_types-fatal_error_handlers PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_types/fatal_error_handlers/handlers.cpp + handlers.cpp ) diff --git a/client/ydb_types/fatal_error_handlers/handlers.cpp b/src/client/ydb_types/fatal_error_handlers/handlers.cpp similarity index 72% rename from client/ydb_types/fatal_error_handlers/handlers.cpp rename to src/client/ydb_types/fatal_error_handlers/handlers.cpp index f44fd8f9a31..e00f0726211 100644 --- a/client/ydb_types/fatal_error_handlers/handlers.cpp +++ b/src/client/ydb_types/fatal_error_handlers/handlers.cpp @@ -1,5 +1,5 @@ #include "handlers.h" -#include +#include namespace NYdb { diff --git a/client/ydb_types/fatal_error_handlers/handlers.h b/src/client/ydb_types/fatal_error_handlers/handlers.h similarity index 100% rename from client/ydb_types/fatal_error_handlers/handlers.h rename to src/client/ydb_types/fatal_error_handlers/handlers.h diff --git a/client/ydb_types/fluent_settings_helpers.h b/src/client/ydb_types/fluent_settings_helpers.h similarity index 100% rename from client/ydb_types/fluent_settings_helpers.h rename to src/client/ydb_types/fluent_settings_helpers.h diff --git a/client/ydb_types/operation/CMakeLists.txt b/src/client/ydb_types/operation/CMakeLists.txt similarity index 70% rename from client/ydb_types/operation/CMakeLists.txt rename to src/client/ydb_types/operation/CMakeLists.txt index b2a4cb46165..b8e7326ac79 100644 --- a/client/ydb_types/operation/CMakeLists.txt +++ b/src/client/ydb_types/operation/CMakeLists.txt @@ -4,12 +4,12 @@ target_link_libraries(client-ydb_types-operation PUBLIC yutil protobuf::libprotobuf cpp-threading-future - public-lib-operation_id + library-operation_id cpp-client-ydb_types - ) +) target_sources(client-ydb_types-operation PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_types/operation/operation.cpp + operation.cpp ) diff --git a/client/ydb_types/operation/operation.cpp b/src/client/ydb_types/operation/operation.cpp similarity index 95% rename from client/ydb_types/operation/operation.cpp rename to src/client/ydb_types/operation/operation.cpp index 80d69c27219..7dea64f96b5 100644 --- a/client/ydb_types/operation/operation.cpp +++ b/src/client/ydb_types/operation/operation.cpp @@ -1,8 +1,8 @@ #include "operation.h" -#include -#include +#include +#include namespace NYdb { diff --git a/client/ydb_types/operation/operation.h b/src/client/ydb_types/operation/operation.h similarity index 90% rename from client/ydb_types/operation/operation.h rename to src/client/ydb_types/operation/operation.h index 47c5c0925b4..fed6494dc1d 100644 --- a/client/ydb_types/operation/operation.h +++ b/src/client/ydb_types/operation/operation.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include #include #include diff --git a/client/ydb_types/request_settings.h b/src/client/ydb_types/request_settings.h similarity index 98% rename from client/ydb_types/request_settings.h rename to src/client/ydb_types/request_settings.h index 9543616ca52..f2fd3133f48 100644 --- a/client/ydb_types/request_settings.h +++ b/src/client/ydb_types/request_settings.h @@ -2,7 +2,7 @@ #include "fluent_settings_helpers.h" -#include +#include #include #include diff --git a/client/ydb_types/s3_settings.h b/src/client/ydb_types/s3_settings.h similarity index 100% rename from client/ydb_types/s3_settings.h rename to src/client/ydb_types/s3_settings.h diff --git a/client/ydb_types/status/CMakeLists.txt b/src/client/ydb_types/status/CMakeLists.txt similarity index 83% rename from client/ydb_types/status/CMakeLists.txt rename to src/client/ydb_types/status/CMakeLists.txt index 24235263aee..93f16fbe31c 100644 --- a/client/ydb_types/status/CMakeLists.txt +++ b/src/client/ydb_types/status/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries(client-ydb_types-status PUBLIC ) target_sources(client-ydb_types-status PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_types/status/status.cpp + status.cpp ) diff --git a/client/ydb_types/status/status.cpp b/src/client/ydb_types/status/status.cpp similarity index 95% rename from client/ydb_types/status/status.cpp rename to src/client/ydb_types/status/status.cpp index 00e540a8612..67f6544009a 100644 --- a/client/ydb_types/status/status.cpp +++ b/src/client/ydb_types/status/status.cpp @@ -1,10 +1,10 @@ #include "status.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include +#include namespace NYdb { diff --git a/client/ydb_types/status/status.h b/src/client/ydb_types/status/status.h similarity index 83% rename from client/ydb_types/status/status.h rename to src/client/ydb_types/status/status.h index 001959a77f3..2eee86eed80 100644 --- a/client/ydb_types/status/status.h +++ b/src/client/ydb_types/status/status.h @@ -1,11 +1,11 @@ #pragma once -#include -#include +#include +#include -#include +#include -#include +#include namespace NYdb { diff --git a/client/ydb_types/status_codes.h b/src/client/ydb_types/status_codes.h similarity index 98% rename from client/ydb_types/status_codes.h rename to src/client/ydb_types/status_codes.h index 906a2bf00b0..f3f1fb87cdb 100644 --- a/client/ydb_types/status_codes.h +++ b/src/client/ydb_types/status_codes.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NYdb { diff --git a/client/ydb_types/ydb.h b/src/client/ydb_types/ydb.h similarity index 100% rename from client/ydb_types/ydb.h rename to src/client/ydb_types/ydb.h diff --git a/client/ydb_value/CMakeLists.txt b/src/client/ydb_value/CMakeLists.txt similarity index 76% rename from client/ydb_value/CMakeLists.txt rename to src/client/ydb_value/CMakeLists.txt index 930207c7a47..2e5592d266e 100644 --- a/client/ydb_value/CMakeLists.txt +++ b/src/client/ydb_value/CMakeLists.txt @@ -8,18 +8,18 @@ target_link_libraries(cpp-client-ydb_value PUBLIC impl-ydb_internal-value_helpers client-ydb_types-fatal_error_handlers yql-public-decimal - ydb-library-uuid + library-uuid proto_output ) target_sources(cpp-client-ydb_value PRIVATE - ${YDB_SDK_SOURCE_DIR}/client/ydb_value/value.cpp + value.cpp ) generate_enum_serilization(cpp-client-ydb_value - ${YDB_SDK_SOURCE_DIR}/client/ydb_value/value.h + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_value/value.h INCLUDE_HEADERS - client/ydb_value/value.h + src/client/ydb_value/value.h ) add_library(YDB-CPP-SDK::Value ALIAS cpp-client-ydb_value) diff --git a/client/ydb_value/value.cpp b/src/client/ydb_value/value.cpp similarity index 99% rename from client/ydb_value/value.cpp rename to src/client/ydb_value/value.cpp index b30af9b478f..27ad6a77605 100644 --- a/client/ydb_value/value.cpp +++ b/src/client/ydb_value/value.cpp @@ -1,23 +1,23 @@ #include "value.h" #define INCLUDE_YDB_INTERNAL_H -#include +#include #undef INCLUDE_YDB_INTERNAL_H -#include -#include +#include +#include -#include +#include -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include namespace NYdb { diff --git a/client/ydb_value/value.h b/src/client/ydb_value/value.h similarity index 99% rename from client/ydb_value/value.h rename to src/client/ydb_value/value.h index fa25a78c75a..21653d2ce34 100644 --- a/client/ydb_value/value.h +++ b/src/client/ydb_value/value.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/ydb/public/lib/json_value/CMakeLists.txt b/src/json_value/CMakeLists.txt similarity index 70% rename from ydb/public/lib/json_value/CMakeLists.txt rename to src/json_value/CMakeLists.txt index 2a7d068ab17..faeb602cc62 100644 --- a/ydb/public/lib/json_value/CMakeLists.txt +++ b/src/json_value/CMakeLists.txt @@ -6,9 +6,11 @@ target_link_libraries(public-lib-json_value PUBLIC cpp-string_utils-base64 cpp-client-ydb_result cpp-client-ydb_value - ydb-library-uuid + library-uuid ) target_sources(public-lib-json_value PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/lib/json_value/ydb_json_value.cpp + ydb_json_value.cpp ) + +add_library(YDB-CPP-SDK::JsonValue ALIAS public-lib-json_value) diff --git a/ydb/public/lib/json_value/ydb_json_value.cpp b/src/json_value/ydb_json_value.cpp similarity index 99% rename from ydb/public/lib/json_value/ydb_json_value.cpp rename to src/json_value/ydb_json_value.cpp index 14ce9f1aae3..259f0fe0b02 100644 --- a/ydb/public/lib/json_value/ydb_json_value.cpp +++ b/src/json_value/ydb_json_value.cpp @@ -1,9 +1,9 @@ #include "ydb_json_value.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace NYdb { diff --git a/ydb/public/lib/json_value/ydb_json_value.h b/src/json_value/ydb_json_value.h similarity index 87% rename from ydb/public/lib/json_value/ydb_json_value.h rename to src/json_value/ydb_json_value.h index f56bc468460..358b1f2feaa 100644 --- a/ydb/public/lib/json_value/ydb_json_value.h +++ b/src/json_value/ydb_json_value.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include +#include +#include +#include -#include +#include namespace NYdb { diff --git a/library/cpp/CMakeLists.txt b/src/library/CMakeLists.txt similarity index 84% rename from library/cpp/CMakeLists.txt rename to src/library/CMakeLists.txt index 3dda8ca22f4..2e540ad968c 100644 --- a/library/cpp/CMakeLists.txt +++ b/src/library/CMakeLists.txt @@ -13,24 +13,32 @@ add_subdirectory(deprecated) add_subdirectory(diff) add_subdirectory(digest) add_subdirectory(getopt) +add_subdirectory(grpc) add_subdirectory(http) add_subdirectory(iterator) add_subdirectory(json) +add_subdirectory(jwt) add_subdirectory(lcs) add_subdirectory(logger) +add_subdirectory(login) add_subdirectory(mime) add_subdirectory(monlib) add_subdirectory(openssl) +add_subdirectory(operation_id) +add_subdirectory(persqueue) add_subdirectory(resource) add_subdirectory(retry) +add_subdirectory(security) add_subdirectory(streams) add_subdirectory(string_utils) add_subdirectory(svnversion) add_subdirectory(terminate_handler) add_subdirectory(testing) add_subdirectory(threading) -add_subdirectory(uri) add_subdirectory(unicode_normalization) +add_subdirectory(uri) +add_subdirectory(uuid) +add_subdirectory(yql) add_subdirectory(yson) add_subdirectory(yt) diff --git a/library/cpp/blockcodecs/CMakeLists.txt b/src/library/blockcodecs/CMakeLists.txt similarity index 78% rename from library/cpp/blockcodecs/CMakeLists.txt rename to src/library/blockcodecs/CMakeLists.txt index 888a6ccf96c..cea1c51a8b0 100644 --- a/library/cpp/blockcodecs/CMakeLists.txt +++ b/src/library/blockcodecs/CMakeLists.txt @@ -17,6 +17,6 @@ target_link_libraries(library-cpp-blockcodecs PUBLIC ) target_sources(library-cpp-blockcodecs PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/blockcodecs/codecs.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/blockcodecs/stream.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/blockcodecs/codecs.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/blockcodecs/stream.cpp ) diff --git a/library/cpp/blockcodecs/README.md b/src/library/blockcodecs/README.md similarity index 77% rename from library/cpp/blockcodecs/README.md rename to src/library/blockcodecs/README.md index 417917a475b..b1d15b2cb0d 100644 --- a/library/cpp/blockcodecs/README.md +++ b/src/library/blockcodecs/README.md @@ -1,5 +1,5 @@ This is a simple library for block data compression (this means data is compressed/uncompressed -by whole blocks in memory). It's a lite-version of the `library/cpp/codecs`. Lite here means that it +by whole blocks in memory). It's a lite-version of the `src/library/codecs`. Lite here means that it provide only well-known compression algorithms, without the possibility of learning. There are two possible ways to work with it. @@ -19,5 +19,5 @@ write to the resulting stream). Using codec plugins =================== If you don't want your code to bloat from unused codecs, you can use the small version of the -library: `library/cpp/blockcodecs/core`. In that case, you need to manually set `PEERDIR()`s to -needed codecs (i.e. `PEERDIR(library/cpp/blockcodecs/codecs/lzma)`). +library: `src/library/blockcodecs/core`. In that case, you need to manually set `PEERDIR()`s to +needed codecs (i.e. `PEERDIR(src/library/blockcodecs/codecs/lzma)`). diff --git a/library/cpp/blockcodecs/codecs.cpp b/src/library/blockcodecs/codecs.cpp similarity index 100% rename from library/cpp/blockcodecs/codecs.cpp rename to src/library/blockcodecs/codecs.cpp diff --git a/src/library/blockcodecs/codecs.h b/src/library/blockcodecs/codecs.h new file mode 100644 index 00000000000..8d32b733a85 --- /dev/null +++ b/src/library/blockcodecs/codecs.h @@ -0,0 +1,3 @@ +#pragma once + +#include diff --git a/library/cpp/blockcodecs/codecs/CMakeLists.txt b/src/library/blockcodecs/codecs/CMakeLists.txt similarity index 100% rename from library/cpp/blockcodecs/codecs/CMakeLists.txt rename to src/library/blockcodecs/codecs/CMakeLists.txt diff --git a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.txt b/src/library/blockcodecs/codecs/brotli/CMakeLists.txt similarity index 87% rename from library/cpp/blockcodecs/codecs/brotli/CMakeLists.txt rename to src/library/blockcodecs/codecs/brotli/CMakeLists.txt index db0d22d8cbc..3d84c498005 100644 --- a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.txt +++ b/src/library/blockcodecs/codecs/brotli/CMakeLists.txt @@ -17,5 +17,5 @@ target_link_libraries(blockcodecs-codecs-brotli.global PUBLIC ) target_sources(blockcodecs-codecs-brotli.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/blockcodecs/codecs/brotli/brotli.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/blockcodecs/codecs/brotli/brotli.cpp ) diff --git a/library/cpp/blockcodecs/codecs/brotli/brotli.cpp b/src/library/blockcodecs/codecs/brotli/brotli.cpp similarity index 92% rename from library/cpp/blockcodecs/codecs/brotli/brotli.cpp rename to src/library/blockcodecs/codecs/brotli/brotli.cpp index 2b396454353..ad9594b8932 100644 --- a/library/cpp/blockcodecs/codecs/brotli/brotli.cpp +++ b/src/library/blockcodecs/codecs/brotli/brotli.cpp @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include -#include +#include #include #include diff --git a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.txt b/src/library/blockcodecs/codecs/bzip/CMakeLists.txt similarity index 81% rename from library/cpp/blockcodecs/codecs/bzip/CMakeLists.txt rename to src/library/blockcodecs/codecs/bzip/CMakeLists.txt index b0d39a1bf48..9503a86b26d 100644 --- a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.txt +++ b/src/library/blockcodecs/codecs/bzip/CMakeLists.txt @@ -14,10 +14,10 @@ target_link_libraries(blockcodecs-codecs-bzip.global PUBLIC cpp-blockcodecs-core ) target_sources(blockcodecs-codecs-bzip.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/blockcodecs/codecs/bzip/bzip.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/blockcodecs/codecs/bzip/bzip.cpp ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(blockcodecs-codecs-bzip INTERFACE ) diff --git a/library/cpp/blockcodecs/codecs/bzip/bzip.cpp b/src/library/blockcodecs/codecs/bzip/bzip.cpp similarity index 91% rename from library/cpp/blockcodecs/codecs/bzip/bzip.cpp rename to src/library/blockcodecs/codecs/bzip/bzip.cpp index ed6b3d034b2..b6bbbfd99c5 100644 --- a/library/cpp/blockcodecs/codecs/bzip/bzip.cpp +++ b/src/library/blockcodecs/codecs/bzip/bzip.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.txt b/src/library/blockcodecs/codecs/fastlz/CMakeLists.txt similarity index 82% rename from library/cpp/blockcodecs/codecs/fastlz/CMakeLists.txt rename to src/library/blockcodecs/codecs/fastlz/CMakeLists.txt index a49f20491cf..d5f306e413c 100644 --- a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.txt +++ b/src/library/blockcodecs/codecs/fastlz/CMakeLists.txt @@ -15,10 +15,10 @@ target_link_libraries(blockcodecs-codecs-fastlz.global PUBLIC ) target_sources(blockcodecs-codecs-fastlz.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/blockcodecs/codecs/fastlz/fastlz.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/blockcodecs/codecs/fastlz/fastlz.cpp ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(blockcodecs-codecs-fastlz INTERFACE ) diff --git a/library/cpp/blockcodecs/codecs/fastlz/fastlz.cpp b/src/library/blockcodecs/codecs/fastlz/fastlz.cpp similarity index 90% rename from library/cpp/blockcodecs/codecs/fastlz/fastlz.cpp rename to src/library/blockcodecs/codecs/fastlz/fastlz.cpp index 270adeb57bd..c391888c579 100644 --- a/library/cpp/blockcodecs/codecs/fastlz/fastlz.cpp +++ b/src/library/blockcodecs/codecs/fastlz/fastlz.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt b/src/library/blockcodecs/codecs/lz4/CMakeLists.txt similarity index 81% rename from library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt rename to src/library/blockcodecs/codecs/lz4/CMakeLists.txt index d8429a89a31..24b62d814e7 100644 --- a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt +++ b/src/library/blockcodecs/codecs/lz4/CMakeLists.txt @@ -15,10 +15,10 @@ target_link_libraries(blockcodecs-codecs-lz4.global PUBLIC ) target_sources(blockcodecs-codecs-lz4.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/blockcodecs/codecs/lz4/lz4.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/blockcodecs/codecs/lz4/lz4.cpp ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(blockcodecs-codecs-lz4 INTERFACE ) diff --git a/library/cpp/blockcodecs/codecs/lz4/lz4.cpp b/src/library/blockcodecs/codecs/lz4/lz4.cpp similarity index 94% rename from library/cpp/blockcodecs/codecs/lz4/lz4.cpp rename to src/library/blockcodecs/codecs/lz4/lz4.cpp index 2b052e5def8..d85eed1d0e6 100644 --- a/library/cpp/blockcodecs/codecs/lz4/lz4.cpp +++ b/src/library/blockcodecs/codecs/lz4/lz4.cpp @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include -#include +#include #include #include diff --git a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.txt b/src/library/blockcodecs/codecs/lzma/CMakeLists.txt similarity index 82% rename from library/cpp/blockcodecs/codecs/lzma/CMakeLists.txt rename to src/library/blockcodecs/codecs/lzma/CMakeLists.txt index 04f607c39e8..0bf3109d0af 100644 --- a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.txt +++ b/src/library/blockcodecs/codecs/lzma/CMakeLists.txt @@ -15,10 +15,10 @@ target_link_libraries(blockcodecs-codecs-lzma.global PUBLIC ) target_sources(blockcodecs-codecs-lzma.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/blockcodecs/codecs/lzma/lzma.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/blockcodecs/codecs/lzma/lzma.cpp ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(blockcodecs-codecs-lzma INTERFACE ) diff --git a/library/cpp/blockcodecs/codecs/lzma/lzma.cpp b/src/library/blockcodecs/codecs/lzma/lzma.cpp similarity index 93% rename from library/cpp/blockcodecs/codecs/lzma/lzma.cpp rename to src/library/blockcodecs/codecs/lzma/lzma.cpp index b1556862297..935a4120ac9 100644 --- a/library/cpp/blockcodecs/codecs/lzma/lzma.cpp +++ b/src/library/blockcodecs/codecs/lzma/lzma.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.txt b/src/library/blockcodecs/codecs/snappy/CMakeLists.txt similarity index 82% rename from library/cpp/blockcodecs/codecs/snappy/CMakeLists.txt rename to src/library/blockcodecs/codecs/snappy/CMakeLists.txt index 9465d49d43a..93d462f1614 100644 --- a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.txt +++ b/src/library/blockcodecs/codecs/snappy/CMakeLists.txt @@ -15,10 +15,10 @@ target_link_libraries(blockcodecs-codecs-snappy.global PUBLIC ) target_sources(blockcodecs-codecs-snappy.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/blockcodecs/codecs/snappy/snappy.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/blockcodecs/codecs/snappy/snappy.cpp ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(blockcodecs-codecs-snappy INTERFACE ) diff --git a/library/cpp/blockcodecs/codecs/snappy/snappy.cpp b/src/library/blockcodecs/codecs/snappy/snappy.cpp similarity index 89% rename from library/cpp/blockcodecs/codecs/snappy/snappy.cpp rename to src/library/blockcodecs/codecs/snappy/snappy.cpp index 927339ae3bf..cc4ae070a83 100644 --- a/library/cpp/blockcodecs/codecs/snappy/snappy.cpp +++ b/src/library/blockcodecs/codecs/snappy/snappy.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt b/src/library/blockcodecs/codecs/zlib/CMakeLists.txt similarity index 81% rename from library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt rename to src/library/blockcodecs/codecs/zlib/CMakeLists.txt index e30b5a47505..a8414fe04db 100644 --- a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt +++ b/src/library/blockcodecs/codecs/zlib/CMakeLists.txt @@ -16,10 +16,10 @@ target_link_libraries(blockcodecs-codecs-zlib.global PUBLIC ) target_sources(blockcodecs-codecs-zlib.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/blockcodecs/codecs/zlib/zlib.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/blockcodecs/codecs/zlib/zlib.cpp ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(blockcodecs-codecs-zlib INTERFACE ) diff --git a/library/cpp/blockcodecs/codecs/zlib/zlib.cpp b/src/library/blockcodecs/codecs/zlib/zlib.cpp similarity index 91% rename from library/cpp/blockcodecs/codecs/zlib/zlib.cpp rename to src/library/blockcodecs/codecs/zlib/zlib.cpp index f12812c2407..274cba5602b 100644 --- a/library/cpp/blockcodecs/codecs/zlib/zlib.cpp +++ b/src/library/blockcodecs/codecs/zlib/zlib.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.txt b/src/library/blockcodecs/codecs/zstd/CMakeLists.txt similarity index 81% rename from library/cpp/blockcodecs/codecs/zstd/CMakeLists.txt rename to src/library/blockcodecs/codecs/zstd/CMakeLists.txt index b294aaf4a22..ac6e94ee5e1 100644 --- a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.txt +++ b/src/library/blockcodecs/codecs/zstd/CMakeLists.txt @@ -15,10 +15,10 @@ target_link_libraries(blockcodecs-codecs-zstd.global PUBLIC ) target_sources(blockcodecs-codecs-zstd.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/blockcodecs/codecs/zstd/zstd.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/blockcodecs/codecs/zstd/zstd.cpp ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(blockcodecs-codecs-zstd INTERFACE ) diff --git a/library/cpp/blockcodecs/codecs/zstd/zstd.cpp b/src/library/blockcodecs/codecs/zstd/zstd.cpp similarity index 90% rename from library/cpp/blockcodecs/codecs/zstd/zstd.cpp rename to src/library/blockcodecs/codecs/zstd/zstd.cpp index f05bacfa863..5b5d5d10d95 100644 --- a/library/cpp/blockcodecs/codecs/zstd/zstd.cpp +++ b/src/library/blockcodecs/codecs/zstd/zstd.cpp @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include -#include +#include #define ZSTD_STATIC_LINKING_ONLY #include diff --git a/library/cpp/blockcodecs/codecs_ut.cpp b/src/library/blockcodecs/codecs_ut.cpp similarity index 98% rename from library/cpp/blockcodecs/codecs_ut.cpp rename to src/library/blockcodecs/codecs_ut.cpp index 556445055f5..7c18898c623 100644 --- a/library/cpp/blockcodecs/codecs_ut.cpp +++ b/src/library/blockcodecs/codecs_ut.cpp @@ -1,11 +1,11 @@ #include "codecs.h" #include "stream.h" -#include +#include -#include -#include -#include +#include +#include +#include Y_UNIT_TEST_SUITE(TBlockCodecsTest) { using namespace NBlockCodecs; diff --git a/library/cpp/blockcodecs/core/CMakeLists.txt b/src/library/blockcodecs/core/CMakeLists.txt similarity index 52% rename from library/cpp/blockcodecs/core/CMakeLists.txt rename to src/library/blockcodecs/core/CMakeLists.txt index 1077d04977f..cb6d9306874 100644 --- a/library/cpp/blockcodecs/core/CMakeLists.txt +++ b/src/library/blockcodecs/core/CMakeLists.txt @@ -5,8 +5,8 @@ target_link_libraries(cpp-blockcodecs-core PUBLIC ) target_sources(cpp-blockcodecs-core PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/blockcodecs/core/codecs.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/blockcodecs/core/stream.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/blockcodecs/core/codecs.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/blockcodecs/core/stream.cpp ) diff --git a/library/cpp/blockcodecs/core/codecs.cpp b/src/library/blockcodecs/core/codecs.cpp similarity index 88% rename from library/cpp/blockcodecs/core/codecs.cpp rename to src/library/blockcodecs/core/codecs.cpp index 244476add3f..e4ee1b6e271 100644 --- a/library/cpp/blockcodecs/core/codecs.cpp +++ b/src/library/blockcodecs/core/codecs.cpp @@ -2,19 +2,19 @@ #include "common.h" #include "register.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace NBlockCodecs; diff --git a/library/cpp/blockcodecs/core/codecs.h b/src/library/blockcodecs/core/codecs.h similarity index 95% rename from library/cpp/blockcodecs/core/codecs.h rename to src/library/blockcodecs/core/codecs.h index 5bf36f7eb10..08fe1d1dd47 100644 --- a/library/cpp/blockcodecs/core/codecs.h +++ b/src/library/blockcodecs/core/codecs.h @@ -1,10 +1,10 @@ #pragma once -#include +#include #include #include -#include -#include +#include +#include namespace NBlockCodecs { struct TData: public std::string_view { diff --git a/library/cpp/blockcodecs/core/common.h b/src/library/blockcodecs/core/common.h similarity index 84% rename from library/cpp/blockcodecs/core/common.h rename to src/library/blockcodecs/core/common.h index 8a3413ef091..fdb4aacd233 100644 --- a/library/cpp/blockcodecs/core/common.h +++ b/src/library/blockcodecs/core/common.h @@ -2,19 +2,19 @@ #include "codecs.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace NBlockCodecs { struct TDecompressError: public TDataError { diff --git a/library/cpp/blockcodecs/core/register.h b/src/library/blockcodecs/core/register.h similarity index 100% rename from library/cpp/blockcodecs/core/register.h rename to src/library/blockcodecs/core/register.h diff --git a/library/cpp/blockcodecs/core/stream.cpp b/src/library/blockcodecs/core/stream.cpp similarity index 94% rename from library/cpp/blockcodecs/core/stream.cpp rename to src/library/blockcodecs/core/stream.cpp index 5f8ebebdf9a..5a4b370d007 100644 --- a/library/cpp/blockcodecs/core/stream.cpp +++ b/src/library/blockcodecs/core/stream.cpp @@ -1,13 +1,13 @@ #include "stream.h" #include "codecs.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include using namespace NBlockCodecs; diff --git a/library/cpp/blockcodecs/core/stream.h b/src/library/blockcodecs/core/stream.h similarity index 82% rename from library/cpp/blockcodecs/core/stream.h rename to src/library/blockcodecs/core/stream.h index fd44ef88f2c..c26e152f3a1 100644 --- a/library/cpp/blockcodecs/core/stream.h +++ b/src/library/blockcodecs/core/stream.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace NBlockCodecs { struct ICodec; diff --git a/library/cpp/blockcodecs/stream.cpp b/src/library/blockcodecs/stream.cpp similarity index 100% rename from library/cpp/blockcodecs/stream.cpp rename to src/library/blockcodecs/stream.cpp diff --git a/src/library/blockcodecs/stream.h b/src/library/blockcodecs/stream.h new file mode 100644 index 00000000000..33fb95ef9bd --- /dev/null +++ b/src/library/blockcodecs/stream.h @@ -0,0 +1,3 @@ +#pragma once + +#include diff --git a/library/cpp/blockcodecs/ut/ya.make b/src/library/blockcodecs/ut/ya.make similarity index 74% rename from library/cpp/blockcodecs/ut/ya.make rename to src/library/blockcodecs/ut/ya.make index d39e21f3710..c1f583d0bcd 100644 --- a/library/cpp/blockcodecs/ut/ya.make +++ b/src/library/blockcodecs/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/blockcodecs) +UNITTEST_FOR(src/library/blockcodecs) FORK_TESTS() diff --git a/src/library/build_info/CMakeLists.txt b/src/library/build_info/CMakeLists.txt new file mode 100644 index 00000000000..6e3466630ed --- /dev/null +++ b/src/library/build_info/CMakeLists.txt @@ -0,0 +1,40 @@ +find_package(Python3 REQUIRED) + +set(KOSHER_SVN_VERSION "") +set(SANDBOX_TASK_ID 0) +set(BUILD_TYPE RELEASE) + +add_library(library-cpp-build_info) +target_include_directories(library-cpp-build_info PUBLIC + ${YDB_SDK_BINARY_DIR}/src/library/build_info +) +target_link_libraries(library-cpp-build_info PUBLIC + yutil + cpp-string_utils-base64 +) +target_sources(library-cpp-build_info PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/build_info/build_info_static.cpp + ${YDB_SDK_BINARY_DIR}/src/library/build_info/buildinfo_data.h + ${YDB_SDK_BINARY_DIR}/src/library/build_info/sandbox.cpp + ${YDB_SDK_BINARY_DIR}/src/library/build_info/build_info.cpp +) +add_custom_command( + OUTPUT + ${YDB_SDK_BINARY_DIR}/src/library/build_info/buildinfo_data.h + DEPENDS + ${YDB_SDK_SOURCE_DIR}/scripts/build_info_gen.py + COMMAND + Python3::Interpreter + ${YDB_SDK_SOURCE_DIR}/scripts/build_info_gen.py + ${YDB_SDK_BINARY_DIR}/src/library/build_info/buildinfo_data.h + \"${CMAKE_CXX_COMPILER}\" + \"${CMAKE_CXX_FLAGS}\" +) +configure_file( + ${YDB_SDK_SOURCE_DIR}/src/library/build_info/sandbox.cpp.in + ${YDB_SDK_BINARY_DIR}/src/library/build_info/sandbox.cpp +) +configure_file( + ${YDB_SDK_SOURCE_DIR}/src/library/build_info/build_info.cpp.in + ${YDB_SDK_BINARY_DIR}/src/library/build_info/build_info.cpp +) diff --git a/library/cpp/build_info/build_info.cpp.in b/src/library/build_info/build_info.cpp.in similarity index 59% rename from library/cpp/build_info/build_info.cpp.in rename to src/library/build_info/build_info.cpp.in index 71403af13e0..bfc3f50693a 100644 --- a/library/cpp/build_info/build_info.cpp.in +++ b/src/library/build_info/build_info.cpp.in @@ -1,4 +1,4 @@ -#include +#include extern "C" const char* GetBuildType() { return "@BUILD_TYPE@"; diff --git a/library/cpp/build_info/build_info.h b/src/library/build_info/build_info.h similarity index 100% rename from library/cpp/build_info/build_info.h rename to src/library/build_info/build_info.h diff --git a/library/cpp/build_info/build_info_static.cpp b/src/library/build_info/build_info_static.cpp similarity index 89% rename from library/cpp/build_info/build_info_static.cpp rename to src/library/build_info/build_info_static.cpp index 238fb1ecb0f..af4c43114d6 100644 --- a/library/cpp/build_info/build_info_static.cpp +++ b/src/library/build_info/build_info_static.cpp @@ -1,6 +1,6 @@ #include "build_info_static.h" -#include +#include extern "C" const char* GetCompilerVersion() { #if defined(BUILD_COMPILER_VERSION) diff --git a/library/cpp/build_info/build_info_static.h b/src/library/build_info/build_info_static.h similarity index 100% rename from library/cpp/build_info/build_info_static.h rename to src/library/build_info/build_info_static.h diff --git a/library/cpp/build_info/sandbox.cpp.in b/src/library/build_info/sandbox.cpp.in similarity index 77% rename from library/cpp/build_info/sandbox.cpp.in rename to src/library/build_info/sandbox.cpp.in index 44b115881e1..da108d46ad0 100644 --- a/library/cpp/build_info/sandbox.cpp.in +++ b/src/library/build_info/sandbox.cpp.in @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include extern "C" const char* GetSandboxTaskId() { diff --git a/library/cpp/build_info/sandbox.h b/src/library/build_info/sandbox.h similarity index 100% rename from library/cpp/build_info/sandbox.h rename to src/library/build_info/sandbox.h diff --git a/library/cpp/cache/CMakeLists.txt b/src/library/cache/CMakeLists.txt similarity index 53% rename from library/cpp/cache/CMakeLists.txt rename to src/library/cache/CMakeLists.txt index 66311e1b910..fc1e6e005cf 100644 --- a/library/cpp/cache/CMakeLists.txt +++ b/src/library/cache/CMakeLists.txt @@ -5,6 +5,6 @@ target_link_libraries(library-cpp-cache PUBLIC ) target_sources(library-cpp-cache PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/cache/cache.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/cache/thread_safe_cache.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/cache/cache.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/cache/thread_safe_cache.cpp ) diff --git a/library/cpp/cache/cache.cpp b/src/library/cache/cache.cpp similarity index 100% rename from library/cpp/cache/cache.cpp rename to src/library/cache/cache.cpp diff --git a/library/cpp/cache/cache.h b/src/library/cache/cache.h similarity index 99% rename from library/cpp/cache/cache.h rename to src/library/cache/cache.h index 95711b95fd8..fd9391b8fd7 100644 --- a/library/cpp/cache/cache.h +++ b/src/library/cache/cache.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/library/cpp/cache/thread_safe_cache.cpp b/src/library/cache/thread_safe_cache.cpp similarity index 100% rename from library/cpp/cache/thread_safe_cache.cpp rename to src/library/cache/thread_safe_cache.cpp diff --git a/library/cpp/cache/thread_safe_cache.h b/src/library/cache/thread_safe_cache.h similarity index 98% rename from library/cpp/cache/thread_safe_cache.h rename to src/library/cache/thread_safe_cache.h index fc7165b5298..19d183961a6 100644 --- a/library/cpp/cache/thread_safe_cache.h +++ b/src/library/cache/thread_safe_cache.h @@ -2,9 +2,9 @@ #include "cache.h" -#include -#include -#include +#include +#include +#include namespace NPrivate { // We are interested in getters promotion policy _here_ because of Read-Write-Lock optimizations. diff --git a/library/cpp/cache/ut/cache_ut.cpp b/src/library/cache/ut/cache_ut.cpp similarity index 99% rename from library/cpp/cache/ut/cache_ut.cpp rename to src/library/cache/ut/cache_ut.cpp index 826367ed251..e8bc48b6c64 100644 --- a/library/cpp/cache/ut/cache_ut.cpp +++ b/src/library/cache/ut/cache_ut.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include struct TStrokaWeighter { static size_t Weight(const std::string& s) { diff --git a/library/cpp/cache/ut/ya.make b/src/library/cache/ut/ya.make similarity index 71% rename from library/cpp/cache/ut/ya.make rename to src/library/cache/ut/ya.make index 32fb8fd1531..0b1c9d1c6d1 100644 --- a/library/cpp/cache/ut/ya.make +++ b/src/library/cache/ut/ya.make @@ -1,7 +1,7 @@ UNITTEST() PEERDIR( - library/cpp/cache + src/library/cache ) SRCS( diff --git a/library/cpp/case_insensitive_string/CMakeLists.txt b/src/library/case_insensitive_string/CMakeLists.txt similarity index 69% rename from library/cpp/case_insensitive_string/CMakeLists.txt rename to src/library/case_insensitive_string/CMakeLists.txt index ac92eeff8ed..a44791efc90 100644 --- a/library/cpp/case_insensitive_string/CMakeLists.txt +++ b/src/library/case_insensitive_string/CMakeLists.txt @@ -7,6 +7,6 @@ target_link_libraries(library-cpp-case_insensitive_string PUBLIC ) target_sources(library-cpp-case_insensitive_string PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/case_insensitive_string/case_insensitive_char_traits.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/case_insensitive_string/case_insensitive_string.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/case_insensitive_string/case_insensitive_char_traits.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/case_insensitive_string/case_insensitive_string.cpp ) diff --git a/library/cpp/case_insensitive_string/case_insensitive_char_traits.cpp b/src/library/case_insensitive_string/case_insensitive_char_traits.cpp similarity index 95% rename from library/cpp/case_insensitive_string/case_insensitive_char_traits.cpp rename to src/library/case_insensitive_string/case_insensitive_char_traits.cpp index 14e6d1d51f8..3e6d8a81451 100644 --- a/library/cpp/case_insensitive_string/case_insensitive_char_traits.cpp +++ b/src/library/case_insensitive_string/case_insensitive_char_traits.cpp @@ -1,7 +1,7 @@ #include "case_insensitive_char_traits.h" #include "case_insensitive_string.h" -#include +#include int TCaseInsensitiveCharTraits::compare(const char* s1, const char* s2, std::size_t n) { while (n-- != 0) { diff --git a/library/cpp/case_insensitive_string/case_insensitive_char_traits.h b/src/library/case_insensitive_string/case_insensitive_char_traits.h similarity index 100% rename from library/cpp/case_insensitive_string/case_insensitive_char_traits.h rename to src/library/case_insensitive_string/case_insensitive_char_traits.h diff --git a/library/cpp/case_insensitive_string/case_insensitive_string.cpp b/src/library/case_insensitive_string/case_insensitive_string.cpp similarity index 87% rename from library/cpp/case_insensitive_string/case_insensitive_string.cpp rename to src/library/case_insensitive_string/case_insensitive_string.cpp index 1b7e719e5b8..9469ee28629 100644 --- a/library/cpp/case_insensitive_string/case_insensitive_string.cpp +++ b/src/library/case_insensitive_string/case_insensitive_string.cpp @@ -1,6 +1,6 @@ #include "case_insensitive_string.h" -#include +#include size_t THash::operator()(TCaseInsensitiveStringBuf str) const noexcept { TMurmurHash2A hash; diff --git a/library/cpp/case_insensitive_string/case_insensitive_string.h b/src/library/case_insensitive_string/case_insensitive_string.h similarity index 93% rename from library/cpp/case_insensitive_string/case_insensitive_string.h rename to src/library/case_insensitive_string/case_insensitive_string.h index c0dd6ad867f..a9514a08c6c 100644 --- a/library/cpp/case_insensitive_string/case_insensitive_string.h +++ b/src/library/case_insensitive_string/case_insensitive_string.h @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include using TCaseInsensitiveString = std::basic_string; using TCaseInsensitiveStringBuf = std::basic_string_view; diff --git a/library/cpp/case_insensitive_string/case_insensitive_string_ut.cpp b/src/library/case_insensitive_string/case_insensitive_string_ut.cpp similarity index 98% rename from library/cpp/case_insensitive_string/case_insensitive_string_ut.cpp rename to src/library/case_insensitive_string/case_insensitive_string_ut.cpp index 7e766b719ab..8a747923e9d 100644 --- a/library/cpp/case_insensitive_string/case_insensitive_string_ut.cpp +++ b/src/library/case_insensitive_string/case_insensitive_string_ut.cpp @@ -1,6 +1,6 @@ #include "case_insensitive_string.h" -#include +#include class TCaseInsensitiveStringTest : public TTestBase, private TStringTestImpl> { public: diff --git a/library/cpp/case_insensitive_string/ut/ya.make b/src/library/case_insensitive_string/ut/ya.make similarity index 50% rename from library/cpp/case_insensitive_string/ut/ya.make rename to src/library/case_insensitive_string/ut/ya.make index 85db6ec4681..de22d88d7b7 100644 --- a/library/cpp/case_insensitive_string/ut/ya.make +++ b/src/library/case_insensitive_string/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/case_insensitive_string) +UNITTEST_FOR(src/library/case_insensitive_string) SRCS( case_insensitive_string_ut.cpp diff --git a/library/cpp/cgiparam/CMakeLists.txt b/src/library/cgiparam/CMakeLists.txt similarity index 78% rename from library/cpp/cgiparam/CMakeLists.txt rename to src/library/cgiparam/CMakeLists.txt index 713c360de85..09c9992ebd1 100644 --- a/library/cpp/cgiparam/CMakeLists.txt +++ b/src/library/cgiparam/CMakeLists.txt @@ -8,5 +8,5 @@ target_link_libraries(library-cpp-cgiparam PUBLIC ) target_sources(library-cpp-cgiparam PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/cgiparam/cgiparam.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/cgiparam/cgiparam.cpp ) diff --git a/library/cpp/cgiparam/cgiparam.cpp b/src/library/cgiparam/cgiparam.cpp similarity index 98% rename from library/cpp/cgiparam/cgiparam.cpp rename to src/library/cgiparam/cgiparam.cpp index 4f63ea908b6..580d801fce3 100644 --- a/library/cpp/cgiparam/cgiparam.cpp +++ b/src/library/cgiparam/cgiparam.cpp @@ -1,9 +1,9 @@ #include "cgiparam.h" -#include -#include +#include +#include -#include +#include #include diff --git a/library/cpp/cgiparam/cgiparam.h b/src/library/cgiparam/cgiparam.h similarity index 98% rename from library/cpp/cgiparam/cgiparam.h rename to src/library/cgiparam/cgiparam.h index b3cc9258975..3b81e0849d5 100644 --- a/library/cpp/cgiparam/cgiparam.h +++ b/src/library/cgiparam/cgiparam.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include #include #include diff --git a/library/cpp/cgiparam/cgiparam_ut.cpp b/src/library/cgiparam/cgiparam_ut.cpp similarity index 99% rename from library/cpp/cgiparam/cgiparam_ut.cpp rename to src/library/cgiparam/cgiparam_ut.cpp index fcaf982405a..0c699156e50 100644 --- a/library/cpp/cgiparam/cgiparam_ut.cpp +++ b/src/library/cgiparam/cgiparam_ut.cpp @@ -1,6 +1,6 @@ #include "cgiparam.h" -#include +#include Y_UNIT_TEST_SUITE(TCgiParametersTest) { Y_UNIT_TEST(TestScan1) { diff --git a/library/cpp/cgiparam/ut/ya.make b/src/library/cgiparam/ut/ya.make similarity index 50% rename from library/cpp/cgiparam/ut/ya.make rename to src/library/cgiparam/ut/ya.make index 0edb867245b..e0a97ffcb27 100644 --- a/library/cpp/cgiparam/ut/ya.make +++ b/src/library/cgiparam/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/cgiparam) +UNITTEST_FOR(src/library/cgiparam) SRCS( cgiparam_ut.cpp diff --git a/library/cpp/charset/CMakeLists.txt b/src/library/charset/CMakeLists.txt similarity index 53% rename from library/cpp/charset/CMakeLists.txt rename to src/library/charset/CMakeLists.txt index c23ec563d93..7dd9a84c13e 100644 --- a/library/cpp/charset/CMakeLists.txt +++ b/src/library/charset/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(library-cpp-charset PUBLIC ) target_sources(library-cpp-charset PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/charset/decodeunknownplane.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/charset/wide.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/charset/iconv.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/charset/decodeunknownplane.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/charset/wide.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/charset/iconv.cpp ) diff --git a/library/cpp/charset/README.md b/src/library/charset/README.md similarity index 71% rename from library/cpp/charset/README.md rename to src/library/charset/README.md index c1c217373e9..599dcc1c45e 100644 --- a/library/cpp/charset/README.md +++ b/src/library/charset/README.md @@ -1,12 +1,12 @@ Здесь представлены функции и enum'ы для работы с кодировками. Наиболее полезные конструкции этой библиотеки: -1. [`enum ECharset`](https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/charset/doccodes.h) - перечень кодировок, которые умеет определять [детектор кодировок](https://a.yandex-team.ru/arc/trunk/arcadia/kernel/recshell/recshell.h?rev=8268697#L56). -2. [Функция](https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/charset/recyr.hh?rev=r6888372#L137) `inline std::string Recode(ECharset from, ECharset to, const std::string& in)` для преобразования кодировок. -3. [Функция](https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/charset/wide.h?rev=r6888372#L277) `inline TUtf16String UTF8ToWide(const char* text, size_t len, const CodePage& cp)`, пытающаяся построить широкую строку из UTF-8, а если не получается - с помощью кодировки `cp`. +1. [`enum ECharset`](https://a.yandex-team.ru/arc/trunk/arcadia/src/library/charset/doccodes.h) - перечень кодировок, которые умеет определять [детектор кодировок](https://a.yandex-team.ru/arc/trunk/arcadia/kernel/recshell/recshell.h?rev=8268697#L56). +2. [Функция](https://a.yandex-team.ru/arc/trunk/arcadia/src/library/charset/recyr.hh?rev=r6888372#L137) `inline std::string Recode(ECharset from, ECharset to, const std::string& in)` для преобразования кодировок. +3. [Функция](https://a.yandex-team.ru/arc/trunk/arcadia/src/library/charset/wide.h?rev=r6888372#L277) `inline TUtf16String UTF8ToWide(const char* text, size_t len, const CodePage& cp)`, пытающаяся построить широкую строку из UTF-8, а если не получается - с помощью кодировки `cp`. -3. [Класс `TCiString`](https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/charset/ci_string.h) - аналог `std::string`, но использующий case-insensitive-компаратор и хеш и поддерживающий разные кодировки. +3. [Класс `TCiString`](https://a.yandex-team.ru/arc/trunk/arcadia/src/library/charset/ci_string.h) - аналог `std::string`, но использующий case-insensitive-компаратор и хеш и поддерживающий разные кодировки. -В комплекте есть ещё много функций для работы со старой однобайтной Yandex-кодировкой. Не рекомендуется к использованию. Для преобразования из UTF-8 в `TUtf16String` и для работы с Unicode используйте функции из [arcadia/util/charset](https://a.yandex-team.ru/arc/trunk/arcadia/util/charset). +В комплекте есть ещё много функций для работы со старой однобайтной Yandex-кодировкой. Не рекомендуется к использованию. Для преобразования из UTF-8 в `TUtf16String` и для работы с Unicode используйте функции из [arcadia/src/util/charset](https://a.yandex-team.ru/arc/trunk/arcadia/src/util/charset). -Библиотека library/cpp/charset/lite - содержит часть функциональности, не зависящей от libiconv (e.g. пункты 2 и 3 из основной библиотеки) +Библиотека src/library/charset/lite - содержит часть функциональности, не зависящей от libiconv (e.g. пункты 2 и 3 из основной библиотеки) diff --git a/library/cpp/charset/ci_string.cpp b/src/library/charset/ci_string.cpp similarity index 100% rename from library/cpp/charset/ci_string.cpp rename to src/library/charset/ci_string.cpp diff --git a/library/cpp/charset/ci_string.h b/src/library/charset/ci_string.h similarity index 99% rename from library/cpp/charset/ci_string.h rename to src/library/charset/ci_string.h index 93a8399e234..6630924b2da 100644 --- a/library/cpp/charset/ci_string.h +++ b/src/library/charset/ci_string.h @@ -3,7 +3,7 @@ #include "codepage.h" #include -#include +#include // Same as std::string but uses CASE INSENSITIVE comparator and hash. Use with care. class TCiString: public std::string { diff --git a/library/cpp/charset/ci_string_ut.cpp b/src/library/charset/ci_string_ut.cpp similarity index 87% rename from library/cpp/charset/ci_string_ut.cpp rename to src/library/charset/ci_string_ut.cpp index 3d2a53d5fe4..8962b3fa5d3 100644 --- a/library/cpp/charset/ci_string_ut.cpp +++ b/src/library/charset/ci_string_ut.cpp @@ -1,7 +1,7 @@ #include "ci_string.h" -#include -#include +#include +#include class TCaseStringTest: public TTestBase, private TStringTestImpl> { public: diff --git a/library/cpp/charset/codepage.cpp b/src/library/charset/codepage.cpp similarity index 96% rename from library/cpp/charset/codepage.cpp rename to src/library/charset/codepage.cpp index 4161b2413d1..7cf66fe80fc 100644 --- a/library/cpp/charset/codepage.cpp +++ b/src/library/charset/codepage.cpp @@ -1,17 +1,17 @@ #include "ci_string.h" #include "codepage.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/library/cpp/charset/codepage.h b/src/library/charset/codepage.h similarity index 96% rename from library/cpp/charset/codepage.h rename to src/library/charset/codepage.h index 8d66d6c7d3a..bde5ea51dab 100644 --- a/library/cpp/charset/codepage.h +++ b/src/library/charset/codepage.h @@ -2,16 +2,16 @@ #include "doccodes.h" -#include +#include -#include -#include // all wchar32 functions -#include +#include +#include // all wchar32 functions +#include #include -#include -#include -#include -#include +#include +#include +#include +#include struct CodePage; struct Recoder; diff --git a/library/cpp/charset/codepage_ut.cpp b/src/library/charset/codepage_ut.cpp similarity index 98% rename from library/cpp/charset/codepage_ut.cpp rename to src/library/charset/codepage_ut.cpp index 65672794b94..9012acd567c 100644 --- a/library/cpp/charset/codepage_ut.cpp +++ b/src/library/charset/codepage_ut.cpp @@ -1,10 +1,10 @@ #include "codepage.h" #include "wide.h" -#include +#include -#include -#include +#include +#include #if defined(_MSC_VER) #pragma warning(disable : 4309) /*truncation of constant value*/ diff --git a/library/cpp/charset/cp_encrec.cpp b/src/library/charset/cp_encrec.cpp similarity index 97% rename from library/cpp/charset/cp_encrec.cpp rename to src/library/charset/cp_encrec.cpp index e4570cd6284..86d0b4da06f 100644 --- a/library/cpp/charset/cp_encrec.cpp +++ b/src/library/charset/cp_encrec.cpp @@ -1,6 +1,6 @@ #include "codepage.h" -#include +#include void Encoder::Tr(const wchar32* in, char* out, size_t len) const { while (len--) diff --git a/library/cpp/charset/decodeunknownplane.cpp b/src/library/charset/decodeunknownplane.cpp similarity index 99% rename from library/cpp/charset/decodeunknownplane.cpp rename to src/library/charset/decodeunknownplane.cpp index 683f238794a..8753d41acdc 100644 --- a/library/cpp/charset/decodeunknownplane.cpp +++ b/src/library/charset/decodeunknownplane.cpp @@ -2,7 +2,7 @@ #include "codepage.h" #include "recyr.hh" -#include +#include template diff --git a/library/cpp/charset/doccodes.cpp b/src/library/charset/doccodes.cpp similarity index 100% rename from library/cpp/charset/doccodes.cpp rename to src/library/charset/doccodes.cpp diff --git a/library/cpp/charset/doccodes.h b/src/library/charset/doccodes.h similarity index 100% rename from library/cpp/charset/doccodes.h rename to src/library/charset/doccodes.h diff --git a/library/cpp/charset/generated/cp_data.cpp b/src/library/charset/generated/cp_data.cpp similarity index 99% rename from library/cpp/charset/generated/cp_data.cpp rename to src/library/charset/generated/cp_data.cpp index 202362c596e..9ff46dc4367 100644 --- a/library/cpp/charset/generated/cp_data.cpp +++ b/src/library/charset/generated/cp_data.cpp @@ -1,4 +1,4 @@ -#include +#include extern const char defchars[][DEFCHAR_BUF]; diff --git a/library/cpp/charset/generated/encrec_data.cpp b/src/library/charset/generated/encrec_data.cpp similarity index 99% rename from library/cpp/charset/generated/encrec_data.cpp rename to src/library/charset/generated/encrec_data.cpp index ca59f8ddef0..8d57bc10e65 100644 --- a/library/cpp/charset/generated/encrec_data.cpp +++ b/src/library/charset/generated/encrec_data.cpp @@ -1,4 +1,4 @@ -#include +#include extern const char defchars[][DEFCHAR_BUF]; static const char PP_00[257] = diff --git a/library/cpp/charset/iconv.cpp b/src/library/charset/iconv.cpp similarity index 100% rename from library/cpp/charset/iconv.cpp rename to src/library/charset/iconv.cpp diff --git a/library/cpp/charset/iconv.h b/src/library/charset/iconv.h similarity index 99% rename from library/cpp/charset/iconv.h rename to src/library/charset/iconv.h index ac13539347f..acd6c4a95da 100644 --- a/library/cpp/charset/iconv.h +++ b/src/library/charset/iconv.h @@ -2,7 +2,7 @@ #include "codepage.h" -#include +#include // WARNING: Do not use this functions - use functions from wide.h or recyr.hh instead. diff --git a/library/cpp/charset/iconv_ut.cpp b/src/library/charset/iconv_ut.cpp similarity index 98% rename from library/cpp/charset/iconv_ut.cpp rename to src/library/charset/iconv_ut.cpp index dba874d5f5d..06dd7e4dcf5 100644 --- a/library/cpp/charset/iconv_ut.cpp +++ b/src/library/charset/iconv_ut.cpp @@ -2,7 +2,7 @@ #include "recyr.hh" #include "codepage.h" -#include +#include static void TestIconv(const std::string& utf8, const std::string& other, ECharset enc) { TUtf16String wide0 = CharToWide(utf8, CODES_UTF8); diff --git a/src/library/charset/lite/CMakeLists.txt b/src/library/charset/lite/CMakeLists.txt new file mode 100644 index 00000000000..79dfc3fc13b --- /dev/null +++ b/src/library/charset/lite/CMakeLists.txt @@ -0,0 +1,15 @@ +add_library(cpp-charset-lite) + +target_link_libraries(cpp-charset-lite PUBLIC + cpp-string_utils-misc + yutil +) + +target_sources(cpp-charset-lite PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/charset/generated/cp_data.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/charset/generated/encrec_data.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/charset/codepage.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/charset/cp_encrec.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/charset/doccodes.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/charset/ci_string.cpp +) diff --git a/library/cpp/charset/lite/ut/ya.make b/src/library/charset/lite/ut/ya.make similarity index 61% rename from library/cpp/charset/lite/ut/ya.make rename to src/library/charset/lite/ut/ya.make index b9c6b94382f..23701bc9717 100644 --- a/library/cpp/charset/lite/ut/ya.make +++ b/src/library/charset/lite/ut/ya.make @@ -1,6 +1,6 @@ -UNITTEST_FOR(library/cpp/charset/lite) +UNITTEST_FOR(src/library/charset/lite) -SRCDIR(library/cpp/charset) +SRCDIR(src/library/charset) CFLAGS(-DLIBRARY_CHARSET_WITHOUT_LIBICONV=yes) SRCS( diff --git a/library/cpp/charset/recyr.hh b/src/library/charset/recyr.hh similarity index 98% rename from library/cpp/charset/recyr.hh rename to src/library/charset/recyr.hh index 409bf66bcb1..8d17fb3ad62 100644 --- a/library/cpp/charset/recyr.hh +++ b/src/library/charset/recyr.hh @@ -2,9 +2,9 @@ #include -#include -#include -#include +#include +#include +#include #include "codepage.h" #include "doccodes.h" diff --git a/library/cpp/charset/recyr_int.hh b/src/library/charset/recyr_int.hh similarity index 98% rename from library/cpp/charset/recyr_int.hh rename to src/library/charset/recyr_int.hh index 14ac04e1226..dd9b7e7a15d 100644 --- a/library/cpp/charset/recyr_int.hh +++ b/src/library/charset/recyr_int.hh @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include +#include +#include +#include #include -#include +#include #include "codepage.h" #include "doccodes.h" diff --git a/library/cpp/charset/recyr_int_ut.cpp b/src/library/charset/recyr_int_ut.cpp similarity index 98% rename from library/cpp/charset/recyr_int_ut.cpp rename to src/library/charset/recyr_int_ut.cpp index f31400652b2..424a3267c50 100644 --- a/library/cpp/charset/recyr_int_ut.cpp +++ b/src/library/charset/recyr_int_ut.cpp @@ -2,10 +2,10 @@ #include "recyr.hh" #include "wide.h" -#include +#include -#include -#include +#include +#include class TRecyr_intTest: public TTestBase { private: diff --git a/library/cpp/charset/ut/ya.make b/src/library/charset/ut/ya.make similarity index 67% rename from library/cpp/charset/ut/ya.make rename to src/library/charset/ut/ya.make index c22436f8acf..aca56b585f1 100644 --- a/library/cpp/charset/ut/ya.make +++ b/src/library/charset/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/charset) +UNITTEST_FOR(src/library/charset) SRCS( iconv_ut.cpp diff --git a/library/cpp/charset/wide.cpp b/src/library/charset/wide.cpp similarity index 100% rename from library/cpp/charset/wide.cpp rename to src/library/charset/wide.cpp diff --git a/library/cpp/charset/wide.h b/src/library/charset/wide.h similarity index 99% rename from library/cpp/charset/wide.h rename to src/library/charset/wide.h index 0c6254540b1..ab3842652d9 100644 --- a/library/cpp/charset/wide.h +++ b/src/library/charset/wide.h @@ -3,7 +3,7 @@ #include "codepage.h" #include "iconv.h" -#include +#include #include //! converts text from unicode to yandex codepage diff --git a/library/cpp/charset/wide_ut.cpp b/src/library/charset/wide_ut.cpp similarity index 99% rename from library/cpp/charset/wide_ut.cpp rename to src/library/charset/wide_ut.cpp index e2f8d500744..d4ccef57e77 100644 --- a/library/cpp/charset/wide_ut.cpp +++ b/src/library/charset/wide_ut.cpp @@ -2,10 +2,10 @@ #include "codepage.h" #include "recyr.hh" -#include +#include -#include -#include +#include +#include #include #include diff --git a/library/cpp/colorizer/CMakeLists.txt b/src/library/colorizer/CMakeLists.txt similarity index 55% rename from library/cpp/colorizer/CMakeLists.txt rename to src/library/colorizer/CMakeLists.txt index dfafe6faa0b..0752e0b0cef 100644 --- a/library/cpp/colorizer/CMakeLists.txt +++ b/src/library/colorizer/CMakeLists.txt @@ -5,6 +5,6 @@ target_link_libraries(library-cpp-colorizer PUBLIC ) target_sources(library-cpp-colorizer PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/colorizer/colors.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/colorizer/output.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/colorizer/colors.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/colorizer/output.cpp ) diff --git a/library/cpp/colorizer/colors.cpp b/src/library/colorizer/colors.cpp similarity index 99% rename from library/cpp/colorizer/colors.cpp rename to src/library/colorizer/colors.cpp index 75212190d76..d31f7ec30c5 100644 --- a/library/cpp/colorizer/colors.cpp +++ b/src/library/colorizer/colors.cpp @@ -1,7 +1,7 @@ #include "colors.h" -#include -#include +#include +#include #include diff --git a/library/cpp/colorizer/colors.h b/src/library/colorizer/colors.h similarity index 99% rename from library/cpp/colorizer/colors.h rename to src/library/colorizer/colors.h index fab42b5f8ca..31031226d44 100644 --- a/library/cpp/colorizer/colors.h +++ b/src/library/colorizer/colors.h @@ -2,7 +2,7 @@ #include "fwd.h" -#include +#include #include #include diff --git a/library/cpp/colorizer/fwd.h b/src/library/colorizer/fwd.h similarity index 100% rename from library/cpp/colorizer/fwd.h rename to src/library/colorizer/fwd.h diff --git a/library/cpp/colorizer/output.cpp b/src/library/colorizer/output.cpp similarity index 87% rename from library/cpp/colorizer/output.cpp rename to src/library/colorizer/output.cpp index 017c2fd8854..6985df11374 100644 --- a/library/cpp/colorizer/output.cpp +++ b/src/library/colorizer/output.cpp @@ -1,6 +1,6 @@ #include "output.h" -#include +#include using namespace NColorizer; diff --git a/library/cpp/colorizer/output.h b/src/library/colorizer/output.h similarity index 100% rename from library/cpp/colorizer/output.h rename to src/library/colorizer/output.h diff --git a/library/cpp/colorizer/ut/colorizer_ut.cpp b/src/library/colorizer/ut/colorizer_ut.cpp similarity index 94% rename from library/cpp/colorizer/ut/colorizer_ut.cpp rename to src/library/colorizer/ut/colorizer_ut.cpp index 42f16994868..96d62aab88c 100644 --- a/library/cpp/colorizer/ut/colorizer_ut.cpp +++ b/src/library/colorizer/ut/colorizer_ut.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include +#include +#include -#include +#include Y_UNIT_TEST_SUITE(ColorizerTest) { Y_UNIT_TEST(BasicTest) { diff --git a/library/cpp/colorizer/ut/ya.make b/src/library/colorizer/ut/ya.make similarity index 50% rename from library/cpp/colorizer/ut/ya.make rename to src/library/colorizer/ut/ya.make index 493514e1768..a1c8a235026 100644 --- a/library/cpp/colorizer/ut/ya.make +++ b/src/library/colorizer/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/colorizer) +UNITTEST_FOR(src/library/colorizer) SRCS( colorizer_ut.cpp diff --git a/library/cpp/containers/CMakeLists.txt b/src/library/containers/CMakeLists.txt similarity index 100% rename from library/cpp/containers/CMakeLists.txt rename to src/library/containers/CMakeLists.txt diff --git a/library/cpp/containers/disjoint_interval_tree/CMakeLists.txt b/src/library/containers/disjoint_interval_tree/CMakeLists.txt similarity index 78% rename from library/cpp/containers/disjoint_interval_tree/CMakeLists.txt rename to src/library/containers/disjoint_interval_tree/CMakeLists.txt index 09faa2e4c77..e8996b21951 100644 --- a/library/cpp/containers/disjoint_interval_tree/CMakeLists.txt +++ b/src/library/containers/disjoint_interval_tree/CMakeLists.txt @@ -5,7 +5,7 @@ target_link_libraries(cpp-containers-disjoint_interval_tree PUBLIC ) target_sources(cpp-containers-disjoint_interval_tree PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/containers/disjoint_interval_tree/disjoint_interval_tree.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/containers/disjoint_interval_tree/disjoint_interval_tree.cpp ) diff --git a/library/cpp/containers/disjoint_interval_tree/disjoint_interval_tree.cpp b/src/library/containers/disjoint_interval_tree/disjoint_interval_tree.cpp similarity index 100% rename from library/cpp/containers/disjoint_interval_tree/disjoint_interval_tree.cpp rename to src/library/containers/disjoint_interval_tree/disjoint_interval_tree.cpp diff --git a/library/cpp/containers/disjoint_interval_tree/disjoint_interval_tree.h b/src/library/containers/disjoint_interval_tree/disjoint_interval_tree.h similarity index 99% rename from library/cpp/containers/disjoint_interval_tree/disjoint_interval_tree.h rename to src/library/containers/disjoint_interval_tree/disjoint_interval_tree.h index 1b1a20de50d..7a5d2ba9cf8 100644 --- a/library/cpp/containers/disjoint_interval_tree/disjoint_interval_tree.h +++ b/src/library/containers/disjoint_interval_tree/disjoint_interval_tree.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/library/cpp/containers/disjoint_interval_tree/ut/disjoint_interval_tree_ut.cpp b/src/library/containers/disjoint_interval_tree/ut/disjoint_interval_tree_ut.cpp similarity index 98% rename from library/cpp/containers/disjoint_interval_tree/ut/disjoint_interval_tree_ut.cpp rename to src/library/containers/disjoint_interval_tree/ut/disjoint_interval_tree_ut.cpp index 8474ae89b04..a20930b8afc 100644 --- a/library/cpp/containers/disjoint_interval_tree/ut/disjoint_interval_tree_ut.cpp +++ b/src/library/containers/disjoint_interval_tree/ut/disjoint_interval_tree_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include Y_UNIT_TEST_SUITE(DisjointIntervalTreeTest) { Y_UNIT_TEST(GenericTest) { diff --git a/src/library/containers/disjoint_interval_tree/ut/ya.make b/src/library/containers/disjoint_interval_tree/ut/ya.make new file mode 100644 index 00000000000..e1b5c4d4430 --- /dev/null +++ b/src/library/containers/disjoint_interval_tree/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/containers/disjoint_interval_tree) + +SRCS( + disjoint_interval_tree_ut.cpp +) + +END() diff --git a/library/cpp/containers/intrusive_rb_tree/CMakeLists.txt b/src/library/containers/intrusive_rb_tree/CMakeLists.txt similarity index 75% rename from library/cpp/containers/intrusive_rb_tree/CMakeLists.txt rename to src/library/containers/intrusive_rb_tree/CMakeLists.txt index 2a22745014f..059c6f8d804 100644 --- a/library/cpp/containers/intrusive_rb_tree/CMakeLists.txt +++ b/src/library/containers/intrusive_rb_tree/CMakeLists.txt @@ -5,7 +5,7 @@ target_link_libraries(cpp-containers-intrusive_rb_tree PUBLIC ) target_sources(cpp-containers-intrusive_rb_tree PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/containers/intrusive_rb_tree/rb_tree.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/containers/intrusive_rb_tree/rb_tree.cpp ) diff --git a/library/cpp/containers/intrusive_rb_tree/rb_tree.cpp b/src/library/containers/intrusive_rb_tree/rb_tree.cpp similarity index 100% rename from library/cpp/containers/intrusive_rb_tree/rb_tree.cpp rename to src/library/containers/intrusive_rb_tree/rb_tree.cpp diff --git a/library/cpp/containers/intrusive_rb_tree/rb_tree.h b/src/library/containers/intrusive_rb_tree/rb_tree.h similarity index 99% rename from library/cpp/containers/intrusive_rb_tree/rb_tree.h rename to src/library/containers/intrusive_rb_tree/rb_tree.h index 0259452a145..95219b1beaa 100644 --- a/library/cpp/containers/intrusive_rb_tree/rb_tree.h +++ b/src/library/containers/intrusive_rb_tree/rb_tree.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include using TRbTreeColorType = bool; diff --git a/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp b/src/library/containers/intrusive_rb_tree/rb_tree_ut.cpp similarity index 98% rename from library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp rename to src/library/containers/intrusive_rb_tree/rb_tree_ut.cpp index 066e5035ff2..73c1a9e9baa 100644 --- a/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp +++ b/src/library/containers/intrusive_rb_tree/rb_tree_ut.cpp @@ -1,10 +1,10 @@ #include "rb_tree.h" -#include +#include -#include -#include -#include +#include +#include +#include class TRedBlackTreeTest: public TTestBase { struct TCmp { diff --git a/src/library/containers/intrusive_rb_tree/ut/ya.make b/src/library/containers/intrusive_rb_tree/ut/ya.make new file mode 100644 index 00000000000..a91126797b7 --- /dev/null +++ b/src/library/containers/intrusive_rb_tree/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/containers/intrusive_rb_tree) + +SRCS( + rb_tree_ut.cpp +) + +END() diff --git a/library/cpp/containers/paged_vector/CMakeLists.txt b/src/library/containers/paged_vector/CMakeLists.txt similarity index 73% rename from library/cpp/containers/paged_vector/CMakeLists.txt rename to src/library/containers/paged_vector/CMakeLists.txt index 9929853074b..ce87e094460 100644 --- a/library/cpp/containers/paged_vector/CMakeLists.txt +++ b/src/library/containers/paged_vector/CMakeLists.txt @@ -5,7 +5,7 @@ target_link_libraries(cpp-containers-paged_vector PUBLIC ) target_sources(cpp-containers-paged_vector PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/containers/paged_vector/paged_vector.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/containers/paged_vector/paged_vector.cpp ) diff --git a/library/cpp/containers/paged_vector/paged_vector.cpp b/src/library/containers/paged_vector/paged_vector.cpp similarity index 100% rename from library/cpp/containers/paged_vector/paged_vector.cpp rename to src/library/containers/paged_vector/paged_vector.cpp diff --git a/library/cpp/containers/paged_vector/paged_vector.h b/src/library/containers/paged_vector/paged_vector.h similarity index 99% rename from library/cpp/containers/paged_vector/paged_vector.h rename to src/library/containers/paged_vector/paged_vector.h index 7613fb76ea1..e0e8c2e205a 100644 --- a/library/cpp/containers/paged_vector/paged_vector.h +++ b/src/library/containers/paged_vector/paged_vector.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/library/cpp/containers/paged_vector/ut/paged_vector_ut.cpp b/src/library/containers/paged_vector/ut/paged_vector_ut.cpp similarity index 99% rename from library/cpp/containers/paged_vector/ut/paged_vector_ut.cpp rename to src/library/containers/paged_vector/ut/paged_vector_ut.cpp index d0cb33ca9b7..001c6ab41ee 100644 --- a/library/cpp/containers/paged_vector/ut/paged_vector_ut.cpp +++ b/src/library/containers/paged_vector/ut/paged_vector_ut.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include diff --git a/library/cpp/containers/paged_vector/ut/ya.make b/src/library/containers/paged_vector/ut/ya.make similarity index 61% rename from library/cpp/containers/paged_vector/ut/ya.make rename to src/library/containers/paged_vector/ut/ya.make index d0ffac4d79b..8c35c1cd7b4 100644 --- a/library/cpp/containers/paged_vector/ut/ya.make +++ b/src/library/containers/paged_vector/ut/ya.make @@ -1,7 +1,7 @@ UNITTEST() PEERDIR( - library/cpp/containers/paged_vector + src/library/containers/paged_vector ) SRCS( diff --git a/library/cpp/containers/stack_vector/CMakeLists.txt b/src/library/containers/stack_vector/CMakeLists.txt similarity index 73% rename from library/cpp/containers/stack_vector/CMakeLists.txt rename to src/library/containers/stack_vector/CMakeLists.txt index 2d8f0ca696e..2ad30c09791 100644 --- a/library/cpp/containers/stack_vector/CMakeLists.txt +++ b/src/library/containers/stack_vector/CMakeLists.txt @@ -5,7 +5,7 @@ target_link_libraries(cpp-containers-stack_vector PUBLIC ) target_sources(cpp-containers-stack_vector PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/containers/stack_vector/stack_vec.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/containers/stack_vector/stack_vec.cpp ) diff --git a/library/cpp/containers/stack_vector/stack_vec.cpp b/src/library/containers/stack_vector/stack_vec.cpp similarity index 100% rename from library/cpp/containers/stack_vector/stack_vec.cpp rename to src/library/containers/stack_vector/stack_vec.cpp diff --git a/library/cpp/containers/stack_vector/stack_vec.h b/src/library/containers/stack_vector/stack_vec.h similarity index 99% rename from library/cpp/containers/stack_vector/stack_vec.h rename to src/library/containers/stack_vector/stack_vec.h index 2224d1ce398..14b3efba9b9 100644 --- a/library/cpp/containers/stack_vector/stack_vec.h +++ b/src/library/containers/stack_vector/stack_vec.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/library/cpp/containers/stack_vector/stack_vec_ut.cpp b/src/library/containers/stack_vector/stack_vec_ut.cpp similarity index 98% rename from library/cpp/containers/stack_vector/stack_vec_ut.cpp rename to src/library/containers/stack_vector/stack_vec_ut.cpp index 19f9677781c..9dbd8194bcb 100644 --- a/library/cpp/containers/stack_vector/stack_vec_ut.cpp +++ b/src/library/containers/stack_vector/stack_vec_ut.cpp @@ -1,6 +1,6 @@ #include "stack_vec.h" -#include +#include namespace { struct TNotCopyAssignable { diff --git a/library/cpp/containers/stack_vector/ut/ya.make b/src/library/containers/stack_vector/ut/ya.make similarity index 52% rename from library/cpp/containers/stack_vector/ut/ya.make rename to src/library/containers/stack_vector/ut/ya.make index 1c07585ff7f..3918b82e812 100644 --- a/library/cpp/containers/stack_vector/ut/ya.make +++ b/src/library/containers/stack_vector/ut/ya.make @@ -1,6 +1,6 @@ UNITTEST() -SRCDIR(library/cpp/containers/stack_vector) +SRCDIR(src/library/containers/stack_vector) SRCS( stack_vec_ut.cpp diff --git a/library/cpp/coroutine/CMakeLists.txt b/src/library/coroutine/CMakeLists.txt similarity index 100% rename from library/cpp/coroutine/CMakeLists.txt rename to src/library/coroutine/CMakeLists.txt diff --git a/src/library/coroutine/engine/CMakeLists.txt b/src/library/coroutine/engine/CMakeLists.txt new file mode 100644 index 00000000000..581d941737a --- /dev/null +++ b/src/library/coroutine/engine/CMakeLists.txt @@ -0,0 +1,39 @@ +add_library(cpp-coroutine-engine) + +target_link_libraries(cpp-coroutine-engine PUBLIC + yutil + tools-enum_parser-enum_serialization_runtime + contrib-libs-libc_compat + cpp-containers-intrusive_rb_tree + cpp-deprecated-atomic +) + +target_sources(cpp-coroutine-engine PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/cont_poller.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/helper.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/impl.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/iostatus.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/network.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/poller.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/sockpool.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/stack/stack.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/stack/stack_allocator.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/stack/stack_guards.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/stack/stack_storage.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/stack/stack_utils.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/trampoline.cpp +) + +generate_enum_serilization(cpp-coroutine-engine + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/poller.h + INCLUDE_HEADERS + src/library/coroutine/engine/poller.h +) + +generate_enum_serilization(cpp-coroutine-engine + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/engine/stack/stack_common.h + INCLUDE_HEADERS + src/library/coroutine/engine/stack/stack_common.h +) + + diff --git a/library/cpp/coroutine/engine/callbacks.h b/src/library/coroutine/engine/callbacks.h similarity index 100% rename from library/cpp/coroutine/engine/callbacks.h rename to src/library/coroutine/engine/callbacks.h diff --git a/library/cpp/coroutine/engine/condvar.h b/src/library/coroutine/engine/condvar.h similarity index 100% rename from library/cpp/coroutine/engine/condvar.h rename to src/library/coroutine/engine/condvar.h diff --git a/library/cpp/coroutine/engine/cont_poller.cpp b/src/library/coroutine/engine/cont_poller.cpp similarity index 100% rename from library/cpp/coroutine/engine/cont_poller.cpp rename to src/library/coroutine/engine/cont_poller.cpp diff --git a/library/cpp/coroutine/engine/cont_poller.h b/src/library/coroutine/engine/cont_poller.h similarity index 96% rename from library/cpp/coroutine/engine/cont_poller.h rename to src/library/coroutine/engine/cont_poller.h index b638b2df1af..273e5adc310 100644 --- a/library/cpp/coroutine/engine/cont_poller.h +++ b/src/library/coroutine/engine/cont_poller.h @@ -3,12 +3,12 @@ #include "poller.h" #include "sockmap.h" -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/library/cpp/coroutine/engine/coroutine_ut.cpp b/src/library/coroutine/engine/coroutine_ut.cpp similarity index 98% rename from library/cpp/coroutine/engine/coroutine_ut.cpp rename to src/library/coroutine/engine/coroutine_ut.cpp index e3fce345246..52a409a8170 100644 --- a/library/cpp/coroutine/engine/coroutine_ut.cpp +++ b/src/library/coroutine/engine/coroutine_ut.cpp @@ -2,16 +2,16 @@ #include "condvar.h" #include "network.h" -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include #include diff --git a/library/cpp/coroutine/engine/custom_time.h b/src/library/coroutine/engine/custom_time.h similarity index 72% rename from library/cpp/coroutine/engine/custom_time.h rename to src/library/coroutine/engine/custom_time.h index 0bff0f6a60d..7d1f2346186 100644 --- a/library/cpp/coroutine/engine/custom_time.h +++ b/src/library/coroutine/engine/custom_time.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NCoro { class ITime { diff --git a/library/cpp/coroutine/engine/events.h b/src/library/coroutine/engine/events.h similarity index 98% rename from library/cpp/coroutine/engine/events.h rename to src/library/coroutine/engine/events.h index 07cc4d25e87..0f93cc2b8e3 100644 --- a/library/cpp/coroutine/engine/events.h +++ b/src/library/coroutine/engine/events.h @@ -2,7 +2,7 @@ #include "impl.h" -#include +#include class TContEvent { public: diff --git a/library/cpp/coroutine/engine/helper.cpp b/src/library/coroutine/engine/helper.cpp similarity index 100% rename from library/cpp/coroutine/engine/helper.cpp rename to src/library/coroutine/engine/helper.cpp diff --git a/library/cpp/coroutine/engine/helper.h b/src/library/coroutine/engine/helper.h similarity index 92% rename from library/cpp/coroutine/engine/helper.h rename to src/library/coroutine/engine/helper.h index cf2c3e0fefd..c462a73cac4 100644 --- a/library/cpp/coroutine/engine/helper.h +++ b/src/library/coroutine/engine/helper.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace NCoro { diff --git a/library/cpp/coroutine/engine/impl.cpp b/src/library/coroutine/engine/impl.cpp similarity index 98% rename from library/cpp/coroutine/engine/impl.cpp rename to src/library/coroutine/engine/impl.cpp index 8acf7a90e16..9944763f79e 100644 --- a/library/cpp/coroutine/engine/impl.cpp +++ b/src/library/coroutine/engine/impl.cpp @@ -3,11 +3,11 @@ #include "stack/stack_allocator.h" #include "stack/stack_guards.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include TCont::TJoinWait::TJoinWait(TCont& c) noexcept : Cont_(c) diff --git a/library/cpp/coroutine/engine/impl.h b/src/library/coroutine/engine/impl.h similarity index 97% rename from library/cpp/coroutine/engine/impl.h rename to src/library/coroutine/engine/impl.h index b0abc2482c8..09f05367d57 100644 --- a/library/cpp/coroutine/engine/impl.h +++ b/src/library/coroutine/engine/impl.h @@ -8,13 +8,13 @@ #include "trampoline.h" #include "custom_time.h" -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/library/cpp/coroutine/engine/iostatus.cpp b/src/library/coroutine/engine/iostatus.cpp similarity index 100% rename from library/cpp/coroutine/engine/iostatus.cpp rename to src/library/coroutine/engine/iostatus.cpp diff --git a/library/cpp/coroutine/engine/iostatus.h b/src/library/coroutine/engine/iostatus.h similarity index 97% rename from library/cpp/coroutine/engine/iostatus.h rename to src/library/coroutine/engine/iostatus.h index bf6036805d5..d57efad13d3 100644 --- a/library/cpp/coroutine/engine/iostatus.h +++ b/src/library/coroutine/engine/iostatus.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class TIOStatus { public: diff --git a/library/cpp/coroutine/engine/mutex.h b/src/library/coroutine/engine/mutex.h similarity index 100% rename from library/cpp/coroutine/engine/mutex.h rename to src/library/coroutine/engine/mutex.h diff --git a/library/cpp/coroutine/engine/network.cpp b/src/library/coroutine/engine/network.cpp similarity index 99% rename from library/cpp/coroutine/engine/network.cpp rename to src/library/coroutine/engine/network.cpp index 85b647d2105..627c3196af8 100644 --- a/library/cpp/coroutine/engine/network.cpp +++ b/src/library/coroutine/engine/network.cpp @@ -1,8 +1,8 @@ #include "impl.h" #include "network.h" -#include -#include +#include +#include #include diff --git a/library/cpp/coroutine/engine/network.h b/src/library/coroutine/engine/network.h similarity index 94% rename from library/cpp/coroutine/engine/network.h rename to src/library/coroutine/engine/network.h index f2c9afe4f8a..0f7256981cc 100644 --- a/library/cpp/coroutine/engine/network.h +++ b/src/library/coroutine/engine/network.h @@ -2,11 +2,11 @@ #include "iostatus.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class TCont; diff --git a/library/cpp/coroutine/engine/poller.cpp b/src/library/coroutine/engine/poller.cpp similarity index 98% rename from library/cpp/coroutine/engine/poller.cpp rename to src/library/coroutine/engine/poller.cpp index dce8cc1edae..310121d7f6f 100644 --- a/library/cpp/coroutine/engine/poller.cpp +++ b/src/library/coroutine/engine/poller.cpp @@ -1,10 +1,10 @@ #include "poller.h" #include "sockmap.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace { using TChange = IPollerFace::TChange; diff --git a/library/cpp/coroutine/engine/poller.h b/src/library/coroutine/engine/poller.h similarity index 86% rename from library/cpp/coroutine/engine/poller.h rename to src/library/coroutine/engine/poller.h index bf06090490a..9235d159d8f 100644 --- a/library/cpp/coroutine/engine/poller.h +++ b/src/library/coroutine/engine/poller.h @@ -1,10 +1,10 @@ #pragma once -#include +#include -#include -#include -#include +#include +#include +#include enum class EContPoller { Default /* "default" */, diff --git a/library/cpp/coroutine/engine/sockmap.h b/src/library/coroutine/engine/sockmap.h similarity index 90% rename from library/cpp/coroutine/engine/sockmap.h rename to src/library/coroutine/engine/sockmap.h index 2480123688f..af5e3156a62 100644 --- a/library/cpp/coroutine/engine/sockmap.h +++ b/src/library/coroutine/engine/sockmap.h @@ -1,6 +1,6 @@ #pragma once -#include +#include template diff --git a/library/cpp/coroutine/engine/sockpool.cpp b/src/library/coroutine/engine/sockpool.cpp similarity index 100% rename from library/cpp/coroutine/engine/sockpool.cpp rename to src/library/coroutine/engine/sockpool.cpp diff --git a/library/cpp/coroutine/engine/sockpool.h b/src/library/coroutine/engine/sockpool.h similarity index 98% rename from library/cpp/coroutine/engine/sockpool.h rename to src/library/coroutine/engine/sockpool.h index 67c588f25b3..009563edffe 100644 --- a/library/cpp/coroutine/engine/sockpool.h +++ b/src/library/coroutine/engine/sockpool.h @@ -3,8 +3,8 @@ #include "impl.h" #include "network.h" -#include -#include +#include +#include #include diff --git a/library/cpp/coroutine/engine/stack/benchmark/alloc_bm.cpp b/src/library/coroutine/engine/stack/benchmark/alloc_bm.cpp similarity index 98% rename from library/cpp/coroutine/engine/stack/benchmark/alloc_bm.cpp rename to src/library/coroutine/engine/stack/benchmark/alloc_bm.cpp index c6e785f4373..d7a9a97f665 100644 --- a/library/cpp/coroutine/engine/stack/benchmark/alloc_bm.cpp +++ b/src/library/coroutine/engine/stack/benchmark/alloc_bm.cpp @@ -1,12 +1,12 @@ #include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace NCoro::NStack::NBenchmark { diff --git a/library/cpp/coroutine/engine/stack/benchmark/ya.make b/src/library/coroutine/engine/stack/benchmark/ya.make similarity index 63% rename from library/cpp/coroutine/engine/stack/benchmark/ya.make rename to src/library/coroutine/engine/stack/benchmark/ya.make index f2fca4aeb5a..56d391e9c1c 100644 --- a/library/cpp/coroutine/engine/stack/benchmark/ya.make +++ b/src/library/coroutine/engine/stack/benchmark/ya.make @@ -5,7 +5,7 @@ SRCS( ) PEERDIR( - library/cpp/coroutine/engine + src/library/coroutine/engine ) END() \ No newline at end of file diff --git a/library/cpp/coroutine/engine/stack/stack.cpp b/src/library/coroutine/engine/stack/stack.cpp similarity index 100% rename from library/cpp/coroutine/engine/stack/stack.cpp rename to src/library/coroutine/engine/stack/stack.cpp diff --git a/library/cpp/coroutine/engine/stack/stack.h b/src/library/coroutine/engine/stack/stack.h similarity index 96% rename from library/cpp/coroutine/engine/stack/stack.h rename to src/library/coroutine/engine/stack/stack.h index 1b77364aec7..8fe61c93cca 100644 --- a/library/cpp/coroutine/engine/stack/stack.h +++ b/src/library/coroutine/engine/stack/stack.h @@ -1,7 +1,7 @@ #pragma once #include -#include -#include +#include +#include #include diff --git a/library/cpp/coroutine/engine/stack/stack_allocator.cpp b/src/library/coroutine/engine/stack/stack_allocator.cpp similarity index 100% rename from library/cpp/coroutine/engine/stack/stack_allocator.cpp rename to src/library/coroutine/engine/stack/stack_allocator.cpp diff --git a/library/cpp/coroutine/engine/stack/stack_allocator.h b/src/library/coroutine/engine/stack/stack_allocator.h similarity index 95% rename from library/cpp/coroutine/engine/stack/stack_allocator.h rename to src/library/coroutine/engine/stack/stack_allocator.h index 15980326e17..c6c1beeb812 100644 --- a/library/cpp/coroutine/engine/stack/stack_allocator.h +++ b/src/library/coroutine/engine/stack/stack_allocator.h @@ -3,8 +3,8 @@ #include "stack.h" #include "stack_common.h" -#include -#include +#include +#include #include #include diff --git a/library/cpp/coroutine/engine/stack/stack_allocator.inl b/src/library/coroutine/engine/stack/stack_allocator.inl similarity index 99% rename from library/cpp/coroutine/engine/stack/stack_allocator.inl rename to src/library/coroutine/engine/stack/stack_allocator.inl index f8890d0daa5..827b0ed2f05 100644 --- a/library/cpp/coroutine/engine/stack/stack_allocator.inl +++ b/src/library/coroutine/engine/stack/stack_allocator.inl @@ -2,7 +2,7 @@ #include "stack_pool.h" #include "stack_utils.h" -#include +#include #include #ifdef _linux_ diff --git a/library/cpp/coroutine/engine/stack/stack_common.h b/src/library/coroutine/engine/stack/stack_common.h similarity index 100% rename from library/cpp/coroutine/engine/stack/stack_common.h rename to src/library/coroutine/engine/stack/stack_common.h diff --git a/library/cpp/coroutine/engine/stack/stack_guards.cpp b/src/library/coroutine/engine/stack/stack_guards.cpp similarity index 100% rename from library/cpp/coroutine/engine/stack/stack_guards.cpp rename to src/library/coroutine/engine/stack/stack_guards.cpp diff --git a/library/cpp/coroutine/engine/stack/stack_guards.h b/src/library/coroutine/engine/stack/stack_guards.h similarity index 98% rename from library/cpp/coroutine/engine/stack/stack_guards.h rename to src/library/coroutine/engine/stack/stack_guards.h index 41d6a794fa4..a71f8b90660 100644 --- a/library/cpp/coroutine/engine/stack/stack_guards.h +++ b/src/library/coroutine/engine/stack/stack_guards.h @@ -2,10 +2,10 @@ #include "stack_common.h" -#include +#include #include #include -#include +#include namespace NCoro::NStack { diff --git a/library/cpp/coroutine/engine/stack/stack_pool.h b/src/library/coroutine/engine/stack/stack_pool.h similarity index 95% rename from library/cpp/coroutine/engine/stack/stack_pool.h rename to src/library/coroutine/engine/stack/stack_pool.h index 400cc846d0b..f07f7009f73 100644 --- a/library/cpp/coroutine/engine/stack/stack_pool.h +++ b/src/library/coroutine/engine/stack/stack_pool.h @@ -3,8 +3,8 @@ #include "stack.h" #include "stack_common.h" -#include -#include +#include +#include diff --git a/library/cpp/coroutine/engine/stack/stack_pool.inl b/src/library/coroutine/engine/stack/stack_pool.inl similarity index 100% rename from library/cpp/coroutine/engine/stack/stack_pool.inl rename to src/library/coroutine/engine/stack/stack_pool.inl diff --git a/library/cpp/coroutine/engine/stack/stack_storage.cpp b/src/library/coroutine/engine/stack/stack_storage.cpp similarity index 96% rename from library/cpp/coroutine/engine/stack/stack_storage.cpp rename to src/library/coroutine/engine/stack/stack_storage.cpp index 121c1f5b0f8..249e3b5db77 100644 --- a/library/cpp/coroutine/engine/stack/stack_storage.cpp +++ b/src/library/coroutine/engine/stack/stack_storage.cpp @@ -3,7 +3,7 @@ #include "stack.h" #include "stack_utils.h" -#include +#include namespace NCoro::NStack { diff --git a/library/cpp/coroutine/engine/stack/stack_storage.h b/src/library/coroutine/engine/stack/stack_storage.h similarity index 97% rename from library/cpp/coroutine/engine/stack/stack_storage.h rename to src/library/coroutine/engine/stack/stack_storage.h index 1b90a55f1e2..2574c9043ec 100644 --- a/library/cpp/coroutine/engine/stack/stack_storage.h +++ b/src/library/coroutine/engine/stack/stack_storage.h @@ -2,7 +2,7 @@ #include "stack.h" -#include +#include class TCont; diff --git a/library/cpp/coroutine/engine/stack/stack_utils.cpp b/src/library/coroutine/engine/stack/stack_utils.cpp similarity index 96% rename from library/cpp/coroutine/engine/stack/stack_utils.cpp rename to src/library/coroutine/engine/stack/stack_utils.cpp index d8fae1ae1f0..cbe49994b7a 100644 --- a/library/cpp/coroutine/engine/stack/stack_utils.cpp +++ b/src/library/coroutine/engine/stack/stack_utils.cpp @@ -1,7 +1,7 @@ #include "stack_utils.h" -#include -#include +#include +#include #ifdef _linux_ #include diff --git a/library/cpp/coroutine/engine/stack/stack_utils.h b/src/library/coroutine/engine/stack/stack_utils.h similarity index 100% rename from library/cpp/coroutine/engine/stack/stack_utils.h rename to src/library/coroutine/engine/stack/stack_utils.h diff --git a/library/cpp/coroutine/engine/stack/ut/stack_allocator_ut.cpp b/src/library/coroutine/engine/stack/ut/stack_allocator_ut.cpp similarity index 95% rename from library/cpp/coroutine/engine/stack/ut/stack_allocator_ut.cpp rename to src/library/coroutine/engine/stack/ut/stack_allocator_ut.cpp index dfb97354faf..b161a57c87e 100644 --- a/library/cpp/coroutine/engine/stack/ut/stack_allocator_ut.cpp +++ b/src/library/coroutine/engine/stack/ut/stack_allocator_ut.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include using namespace testing; diff --git a/library/cpp/coroutine/engine/stack/ut/stack_guards_ut.cpp b/src/library/coroutine/engine/stack/ut/stack_guards_ut.cpp similarity index 96% rename from library/cpp/coroutine/engine/stack/ut/stack_guards_ut.cpp rename to src/library/coroutine/engine/stack/ut/stack_guards_ut.cpp index 418ec56096b..eb200fd5aaf 100644 --- a/library/cpp/coroutine/engine/stack/ut/stack_guards_ut.cpp +++ b/src/library/coroutine/engine/stack/ut/stack_guards_ut.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include using namespace testing; diff --git a/library/cpp/coroutine/engine/stack/ut/stack_pool_ut.cpp b/src/library/coroutine/engine/stack/ut/stack_pool_ut.cpp similarity index 90% rename from library/cpp/coroutine/engine/stack/ut/stack_pool_ut.cpp rename to src/library/coroutine/engine/stack/ut/stack_pool_ut.cpp index cec3f2ae56f..f0d25ca7d6a 100644 --- a/library/cpp/coroutine/engine/stack/ut/stack_pool_ut.cpp +++ b/src/library/coroutine/engine/stack/ut/stack_pool_ut.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include using namespace testing; diff --git a/library/cpp/coroutine/engine/stack/ut/stack_ut.cpp b/src/library/coroutine/engine/stack/ut/stack_ut.cpp similarity index 86% rename from library/cpp/coroutine/engine/stack/ut/stack_ut.cpp rename to src/library/coroutine/engine/stack/ut/stack_ut.cpp index 7b02d0cfd49..43e80948cc3 100644 --- a/library/cpp/coroutine/engine/stack/ut/stack_ut.cpp +++ b/src/library/coroutine/engine/stack/ut/stack_ut.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace testing; diff --git a/library/cpp/coroutine/engine/stack/ut/stack_utils_ut.cpp b/src/library/coroutine/engine/stack/ut/stack_utils_ut.cpp similarity index 93% rename from library/cpp/coroutine/engine/stack/ut/stack_utils_ut.cpp rename to src/library/coroutine/engine/stack/ut/stack_utils_ut.cpp index 8ef895dcf09..3fe34a93abc 100644 --- a/library/cpp/coroutine/engine/stack/ut/stack_utils_ut.cpp +++ b/src/library/coroutine/engine/stack/ut/stack_utils_ut.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include using namespace testing; diff --git a/library/cpp/coroutine/engine/stack/ut/ya.make b/src/library/coroutine/engine/stack/ut/ya.make similarity index 81% rename from library/cpp/coroutine/engine/stack/ut/ya.make rename to src/library/coroutine/engine/stack/ut/ya.make index e3f33ecf6c8..d078d2a04b5 100644 --- a/library/cpp/coroutine/engine/stack/ut/ya.make +++ b/src/library/coroutine/engine/stack/ut/ya.make @@ -9,7 +9,7 @@ SRCS( ) PEERDIR( - library/cpp/coroutine/engine + src/library/coroutine/engine ) END() \ No newline at end of file diff --git a/library/cpp/coroutine/engine/trampoline.cpp b/src/library/coroutine/engine/trampoline.cpp similarity index 83% rename from library/cpp/coroutine/engine/trampoline.cpp rename to src/library/coroutine/engine/trampoline.cpp index cae35f0657f..196ccc0a17a 100644 --- a/library/cpp/coroutine/engine/trampoline.cpp +++ b/src/library/coroutine/engine/trampoline.cpp @@ -3,13 +3,13 @@ #include "stack/stack_allocator.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include namespace NCoro { diff --git a/library/cpp/coroutine/engine/trampoline.h b/src/library/coroutine/engine/trampoline.h similarity index 89% rename from library/cpp/coroutine/engine/trampoline.h rename to src/library/coroutine/engine/trampoline.h index df801da706d..e9c31551de4 100644 --- a/library/cpp/coroutine/engine/trampoline.h +++ b/src/library/coroutine/engine/trampoline.h @@ -3,10 +3,10 @@ #include "stack/stack_common.h" #include "stack/stack.h" -#include -#include -#include -#include +#include +#include +#include +#include #if !defined(STACK_GROW_DOWN) # error "unsupported" diff --git a/src/library/coroutine/engine/ut/ya.make b/src/library/coroutine/engine/ut/ya.make new file mode 100644 index 00000000000..598cea05f24 --- /dev/null +++ b/src/library/coroutine/engine/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/coroutine/engine) + +SRCS( + coroutine_ut.cpp +) + +END() diff --git a/library/cpp/coroutine/listener/CMakeLists.txt b/src/library/coroutine/listener/CMakeLists.txt similarity index 72% rename from library/cpp/coroutine/listener/CMakeLists.txt rename to src/library/coroutine/listener/CMakeLists.txt index 8d22d37952e..4485112048f 100644 --- a/library/cpp/coroutine/listener/CMakeLists.txt +++ b/src/library/coroutine/listener/CMakeLists.txt @@ -6,5 +6,5 @@ target_link_libraries(cpp-coroutine-listener PUBLIC ) target_sources(cpp-coroutine-listener PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/coroutine/listener/listen.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/coroutine/listener/listen.cpp ) diff --git a/library/cpp/coroutine/listener/listen.cpp b/src/library/coroutine/listener/listen.cpp similarity index 97% rename from library/cpp/coroutine/listener/listen.cpp rename to src/library/coroutine/listener/listen.cpp index 42ed324c41e..54370cc94b9 100644 --- a/library/cpp/coroutine/listener/listen.cpp +++ b/src/library/coroutine/listener/listen.cpp @@ -1,12 +1,12 @@ #include "listen.h" -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include using namespace NAddr; diff --git a/library/cpp/coroutine/listener/listen.h b/src/library/coroutine/listener/listen.h similarity index 97% rename from library/cpp/coroutine/listener/listen.h rename to src/library/coroutine/listener/listen.h index 3a89cd3eccc..8a44d4f1db1 100644 --- a/library/cpp/coroutine/listener/listen.h +++ b/src/library/coroutine/listener/listen.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include struct TIpAddress; class TContExecutor; diff --git a/library/cpp/cppparser/CMakeLists.txt b/src/library/cppparser/CMakeLists.txt similarity index 72% rename from library/cpp/cppparser/CMakeLists.txt rename to src/library/cppparser/CMakeLists.txt index c132be53d2d..6fdcdfe5adf 100644 --- a/library/cpp/cppparser/CMakeLists.txt +++ b/src/library/cppparser/CMakeLists.txt @@ -5,7 +5,7 @@ target_link_libraries(library-cpp-cppparser PUBLIC ) target_sources(library-cpp-cppparser PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/cppparser/parser.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/cppparser/parser.cpp ) diff --git a/library/cpp/cppparser/README.md b/src/library/cppparser/README.md similarity index 100% rename from library/cpp/cppparser/README.md rename to src/library/cppparser/README.md diff --git a/library/cpp/cppparser/parser.cpp b/src/library/cppparser/parser.cpp similarity index 99% rename from library/cpp/cppparser/parser.cpp rename to src/library/cppparser/parser.cpp index cfd656c7380..34e6c2eeb43 100644 --- a/library/cpp/cppparser/parser.cpp +++ b/src/library/cppparser/parser.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include #include "parser.h" diff --git a/library/cpp/cppparser/parser.h b/src/library/cppparser/parser.h similarity index 97% rename from library/cpp/cppparser/parser.h rename to src/library/cppparser/parser.h index 9c90dc1b5fe..6d283d2c08b 100644 --- a/library/cpp/cppparser/parser.h +++ b/src/library/cppparser/parser.h @@ -1,8 +1,8 @@ #pragma once -#include +#include #include -#include +#include class TCppSaxParser: public IOutputStream { public: diff --git a/library/cpp/cpuid_check/CMakeLists.txt b/src/library/cpuid_check/CMakeLists.txt similarity index 79% rename from library/cpp/cpuid_check/CMakeLists.txt rename to src/library/cpuid_check/CMakeLists.txt index b6448594f0f..3ad6cefa6be 100644 --- a/library/cpp/cpuid_check/CMakeLists.txt +++ b/src/library/cpuid_check/CMakeLists.txt @@ -11,10 +11,10 @@ target_link_libraries(library-cpp-cpuid_check.global PUBLIC ) target_sources(library-cpp-cpuid_check.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/cpuid_check/cpu_id_check.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/cpuid_check/cpu_id_check.cpp ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(library-cpp-cpuid_check INTERFACE ) diff --git a/library/cpp/cpuid_check/README.md b/src/library/cpuid_check/README.md similarity index 100% rename from library/cpp/cpuid_check/README.md rename to src/library/cpuid_check/README.md diff --git a/library/cpp/cpuid_check/cpu_id_check.cpp b/src/library/cpuid_check/cpu_id_check.cpp similarity index 91% rename from library/cpp/cpuid_check/cpu_id_check.cpp rename to src/library/cpuid_check/cpu_id_check.cpp index f19a5735671..3995f06c9be 100644 --- a/library/cpp/cpuid_check/cpu_id_check.cpp +++ b/src/library/cpuid_check/cpu_id_check.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include #define Y_CPU_ID_ENUMERATE_STARTUP_CHECKS(F) \ F(SSE42) \ diff --git a/library/cpp/dbg_output/CMakeLists.txt b/src/library/dbg_output/CMakeLists.txt similarity index 53% rename from library/cpp/dbg_output/CMakeLists.txt rename to src/library/dbg_output/CMakeLists.txt index 0105d8b07c5..91cc7c4cc5c 100644 --- a/library/cpp/dbg_output/CMakeLists.txt +++ b/src/library/dbg_output/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries(library-cpp-dbg_output PUBLIC ) target_sources(library-cpp-dbg_output PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/dbg_output/dump.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/dbg_output/dumpers.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/dbg_output/engine.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/dbg_output/dump.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/dbg_output/dumpers.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/dbg_output/engine.cpp ) diff --git a/library/cpp/dbg_output/auto.h b/src/library/dbg_output/auto.h similarity index 97% rename from library/cpp/dbg_output/auto.h rename to src/library/dbg_output/auto.h index d16574938d6..4d3e6775aa3 100644 --- a/library/cpp/dbg_output/auto.h +++ b/src/library/dbg_output/auto.h @@ -1,6 +1,6 @@ #pragma once -#include +#include // int a = 1, b = 2; std::cout << LabeledDump(a, b, 1 + 2); yields {"a": 1, "b": 2, "1 + 2": 3} #define LabeledDump(...) \ diff --git a/library/cpp/dbg_output/colorscheme.h b/src/library/dbg_output/colorscheme.h similarity index 96% rename from library/cpp/dbg_output/colorscheme.h rename to src/library/dbg_output/colorscheme.h index 924c2587455..6571b61f9ff 100644 --- a/library/cpp/dbg_output/colorscheme.h +++ b/src/library/dbg_output/colorscheme.h @@ -1,7 +1,7 @@ #pragma once #include "engine.h" -#include +#include #ifndef DBG_OUTPUT_DEFAULT_COLOR_SCHEME #define DBG_OUTPUT_DEFAULT_COLOR_SCHEME NDbgDump::NColorScheme::TPlain @@ -68,7 +68,7 @@ namespace NDbgDump { } // Background color modifiers - // TODO: support backgrounds in library/cpp/colorizer + // TODO: support backgrounds in src/library/colorizer DBG_OUTPUT_COLOR_HANDLER(Key) { if (Depth++ == 0 && Colors.IsTTY()) { stream << DumpRaw(std::string_view("\033[42m")); diff --git a/library/cpp/dbg_output/dump.cpp b/src/library/dbg_output/dump.cpp similarity index 100% rename from library/cpp/dbg_output/dump.cpp rename to src/library/dbg_output/dump.cpp diff --git a/library/cpp/dbg_output/dump.h b/src/library/dbg_output/dump.h similarity index 97% rename from library/cpp/dbg_output/dump.h rename to src/library/dbg_output/dump.h index b23ea2cfb43..573d54427dc 100644 --- a/library/cpp/dbg_output/dump.h +++ b/src/library/dbg_output/dump.h @@ -5,8 +5,8 @@ #include "auto.h" #include "colorscheme.h" -#include -#include +#include +#include #include #include diff --git a/library/cpp/dbg_output/dumpers.cpp b/src/library/dbg_output/dumpers.cpp similarity index 100% rename from library/cpp/dbg_output/dumpers.cpp rename to src/library/dbg_output/dumpers.cpp diff --git a/library/cpp/dbg_output/dumpers.h b/src/library/dbg_output/dumpers.h similarity index 99% rename from library/cpp/dbg_output/dumpers.h rename to src/library/dbg_output/dumpers.h index 8c4ed308684..746d57a6a40 100644 --- a/library/cpp/dbg_output/dumpers.h +++ b/src/library/dbg_output/dumpers.h @@ -2,7 +2,7 @@ #include "engine.h" -#include +#include #include #include diff --git a/library/cpp/dbg_output/engine.cpp b/src/library/dbg_output/engine.cpp similarity index 91% rename from library/cpp/dbg_output/engine.cpp rename to src/library/dbg_output/engine.cpp index bff32d32d79..ad6ada654b0 100644 --- a/library/cpp/dbg_output/engine.cpp +++ b/src/library/dbg_output/engine.cpp @@ -1,7 +1,7 @@ #include "engine.h" -#include -#include +#include +#include #if !defined(DBGDUMP_INLINE_IF_INCLUDED) #define DBGDUMP_INLINE_IF_INCLUDED diff --git a/library/cpp/dbg_output/engine.h b/src/library/dbg_output/engine.h similarity index 99% rename from library/cpp/dbg_output/engine.h rename to src/library/dbg_output/engine.h index 315a7ff502c..936faa80d58 100644 --- a/library/cpp/dbg_output/engine.h +++ b/src/library/dbg_output/engine.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/library/cpp/dbg_output/ut/dbg_output_ut.cpp b/src/library/dbg_output/ut/dbg_output_ut.cpp similarity index 92% rename from library/cpp/dbg_output/ut/dbg_output_ut.cpp rename to src/library/dbg_output/ut/dbg_output_ut.cpp index e3259bcc799..3cdb48aba64 100644 --- a/library/cpp/dbg_output/ut/dbg_output_ut.cpp +++ b/src/library/dbg_output/ut/dbg_output_ut.cpp @@ -1,10 +1,10 @@ -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace { struct TX { diff --git a/library/cpp/dbg_output/ut/ya.make b/src/library/dbg_output/ut/ya.make similarity index 50% rename from library/cpp/dbg_output/ut/ya.make rename to src/library/dbg_output/ut/ya.make index 2a1e2fb45c0..672569d03d5 100644 --- a/library/cpp/dbg_output/ut/ya.make +++ b/src/library/dbg_output/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/dbg_output) +UNITTEST_FOR(src/library/dbg_output) SRCS( dbg_output_ut.cpp diff --git a/library/cpp/deprecated/CMakeLists.txt b/src/library/deprecated/CMakeLists.txt similarity index 100% rename from library/cpp/deprecated/CMakeLists.txt rename to src/library/deprecated/CMakeLists.txt diff --git a/library/cpp/deprecated/atomic/CMakeLists.txt b/src/library/deprecated/atomic/CMakeLists.txt similarity index 76% rename from library/cpp/deprecated/atomic/CMakeLists.txt rename to src/library/deprecated/atomic/CMakeLists.txt index 0d2c972044b..75c2c2bfbad 100644 --- a/library/cpp/deprecated/atomic/CMakeLists.txt +++ b/src/library/deprecated/atomic/CMakeLists.txt @@ -4,7 +4,7 @@ target_link_libraries(cpp-deprecated-atomic INTERFACE yutil ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(cpp-deprecated-atomic INTERFACE ) diff --git a/library/cpp/deprecated/atomic/Readme.md b/src/library/deprecated/atomic/Readme.md similarity index 100% rename from library/cpp/deprecated/atomic/Readme.md rename to src/library/deprecated/atomic/Readme.md diff --git a/library/cpp/deprecated/atomic/atomic.h b/src/library/deprecated/atomic/atomic.h similarity index 96% rename from library/cpp/deprecated/atomic/atomic.h rename to src/library/deprecated/atomic/atomic.h index b376f34efa0..636ee33d936 100644 --- a/library/cpp/deprecated/atomic/atomic.h +++ b/src/library/deprecated/atomic/atomic.h @@ -1,6 +1,6 @@ #pragma once -#include +#include using TAtomicBase = intptr_t; using TAtomic = volatile TAtomicBase; diff --git a/library/cpp/deprecated/atomic/atomic_gcc.h b/src/library/deprecated/atomic/atomic_gcc.h similarity index 100% rename from library/cpp/deprecated/atomic/atomic_gcc.h rename to src/library/deprecated/atomic/atomic_gcc.h diff --git a/library/cpp/deprecated/atomic/atomic_ops.h b/src/library/deprecated/atomic/atomic_ops.h similarity index 99% rename from library/cpp/deprecated/atomic/atomic_ops.h rename to src/library/deprecated/atomic/atomic_ops.h index d705cd9b1d3..4f90277de8d 100644 --- a/library/cpp/deprecated/atomic/atomic_ops.h +++ b/src/library/deprecated/atomic/atomic_ops.h @@ -2,7 +2,7 @@ #include "atomic.h" -#include +#include template inline TAtomic* AsAtomicPtr(T volatile* target) { diff --git a/library/cpp/deprecated/atomic/atomic_ut.cpp b/src/library/deprecated/atomic/atomic_ut.cpp similarity index 98% rename from library/cpp/deprecated/atomic/atomic_ut.cpp rename to src/library/deprecated/atomic/atomic_ut.cpp index b23c755b2da..a735403ebeb 100644 --- a/library/cpp/deprecated/atomic/atomic_ut.cpp +++ b/src/library/deprecated/atomic/atomic_ut.cpp @@ -1,8 +1,8 @@ #include "atomic.h" -#include +#include -#include +#include template class TAtomicTest diff --git a/library/cpp/deprecated/atomic/atomic_win.h b/src/library/deprecated/atomic/atomic_win.h similarity index 100% rename from library/cpp/deprecated/atomic/atomic_win.h rename to src/library/deprecated/atomic/atomic_win.h diff --git a/src/library/deprecated/atomic/ut/ya.make b/src/library/deprecated/atomic/ut/ya.make new file mode 100644 index 00000000000..e8fc8daa22a --- /dev/null +++ b/src/library/deprecated/atomic/ut/ya.make @@ -0,0 +1,5 @@ +UNITTEST_FOR(src/library/deprecated/atomic) + +SRCS(atomic_ut.cpp) + +END() diff --git a/library/cpp/diff/CMakeLists.txt b/src/library/diff/CMakeLists.txt similarity index 74% rename from library/cpp/diff/CMakeLists.txt rename to src/library/diff/CMakeLists.txt index 384c14e257b..622af556faf 100644 --- a/library/cpp/diff/CMakeLists.txt +++ b/src/library/diff/CMakeLists.txt @@ -6,5 +6,5 @@ target_link_libraries(library-cpp-diff PUBLIC ) target_sources(library-cpp-diff PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/diff/diff.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/diff/diff.cpp ) diff --git a/library/cpp/diff/README.md b/src/library/diff/README.md similarity index 79% rename from library/cpp/diff/README.md rename to src/library/diff/README.md index ff68b10eaef..f0e7d3f1a69 100644 --- a/library/cpp/diff/README.md +++ b/src/library/diff/README.md @@ -1 +1 @@ -Note: underlying algorithm `library/cpp/lcs` has complexity of O(r log n) by time and O(r) of additional memory, where r is the number of pairs (i, j) for which S1[i] = S2[j]. When comparing file with itself (or with little modifications) it becomes quadratic on the number of occurences of the most frequent line. +Note: underlying algorithm `src/library/lcs` has complexity of O(r log n) by time and O(r) of additional memory, where r is the number of pairs (i, j) for which S1[i] = S2[j]. When comparing file with itself (or with little modifications) it becomes quadratic on the number of occurences of the most frequent line. diff --git a/library/cpp/diff/diff.cpp b/src/library/diff/diff.cpp similarity index 97% rename from library/cpp/diff/diff.cpp rename to src/library/diff/diff.cpp index 18d14c896ca..39a0a1ee74f 100644 --- a/library/cpp/diff/diff.cpp +++ b/src/library/diff/diff.cpp @@ -1,7 +1,7 @@ #include "diff.h" -#include -#include +#include +#include #include diff --git a/library/cpp/diff/diff.h b/src/library/diff/diff.h similarity index 96% rename from library/cpp/diff/diff.h rename to src/library/diff/diff.h index 8ed47ef4399..2a154ba9f41 100644 --- a/library/cpp/diff/diff.h +++ b/src/library/diff/diff.h @@ -1,14 +1,14 @@ #pragma once -#include +#include -#include +#include #include #include -#include -#include +#include +#include namespace NDiff { template diff --git a/library/cpp/diff/diff_ut.cpp b/src/library/diff/diff_ut.cpp similarity index 99% rename from library/cpp/diff/diff_ut.cpp rename to src/library/diff/diff_ut.cpp index bc3e20de1c1..f8ab7afe210 100644 --- a/library/cpp/diff/diff_ut.cpp +++ b/src/library/diff/diff_ut.cpp @@ -1,6 +1,6 @@ #include "diff.h" -#include +#include using namespace NDiff; diff --git a/library/cpp/diff/ut/ya.make b/src/library/diff/ut/ya.make similarity index 54% rename from library/cpp/diff/ut/ya.make rename to src/library/diff/ut/ya.make index c0a091aa867..21d88c73bcb 100644 --- a/library/cpp/diff/ut/ya.make +++ b/src/library/diff/ut/ya.make @@ -1,9 +1,9 @@ UNITTEST() -SRCDIR(library/cpp/diff) +SRCDIR(src/library/diff) PEERDIR( - library/cpp/diff + src/library/diff ) SRCS( diff --git a/library/cpp/digest/CMakeLists.txt b/src/library/digest/CMakeLists.txt similarity index 100% rename from library/cpp/digest/CMakeLists.txt rename to src/library/digest/CMakeLists.txt diff --git a/library/cpp/digest/argonish/AUTHORS.md b/src/library/digest/argonish/AUTHORS.md similarity index 100% rename from library/cpp/digest/argonish/AUTHORS.md rename to src/library/digest/argonish/AUTHORS.md diff --git a/library/cpp/digest/argonish/CMakeLists.txt b/src/library/digest/argonish/CMakeLists.txt similarity index 83% rename from library/cpp/digest/argonish/CMakeLists.txt rename to src/library/digest/argonish/CMakeLists.txt index 9f3854ae8d7..007accafe3f 100644 --- a/library/cpp/digest/argonish/CMakeLists.txt +++ b/src/library/digest/argonish/CMakeLists.txt @@ -13,5 +13,5 @@ target_link_libraries(cpp-digest-argonish PUBLIC ) target_sources(cpp-digest-argonish PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/digest/argonish/factory/factory.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/digest/argonish/factory/factory.cpp ) diff --git a/library/cpp/digest/argonish/CONTRIBUTING.md b/src/library/digest/argonish/CONTRIBUTING.md similarity index 100% rename from library/cpp/digest/argonish/CONTRIBUTING.md rename to src/library/digest/argonish/CONTRIBUTING.md diff --git a/library/cpp/digest/argonish/LICENSE.md b/src/library/digest/argonish/LICENSE.md similarity index 100% rename from library/cpp/digest/argonish/LICENSE.md rename to src/library/digest/argonish/LICENSE.md diff --git a/library/cpp/digest/argonish/README.md b/src/library/digest/argonish/README.md similarity index 95% rename from library/cpp/digest/argonish/README.md rename to src/library/digest/argonish/README.md index 7b3ae79cca9..148ebbb536a 100644 --- a/library/cpp/digest/argonish/README.md +++ b/src/library/digest/argonish/README.md @@ -50,7 +50,7 @@ How to use ---------- ``` -#include +#include ... uint32_t tcost = 1; /* one pass */ uint32_t mcost = 32; /* in KB */ @@ -59,7 +59,7 @@ NArgonish::TArgon2Factory afactory; THolder argon2 = afactory.Create(NArgonish::EArgon2Type::Argon2d, tcost, mcost, threads); argon2->Hash(input, insize, salt, saltsize, out, outlen); ... -#include +#include ... NArgonish::TBlake2BFactory bfactory; uint32_t outlen = 32; diff --git a/library/cpp/digest/argonish/argon2.h b/src/library/digest/argonish/argon2.h similarity index 98% rename from library/cpp/digest/argonish/argon2.h rename to src/library/digest/argonish/argon2.h index bbe8ad52f30..688d7551ee1 100644 --- a/library/cpp/digest/argonish/argon2.h +++ b/src/library/digest/argonish/argon2.h @@ -2,8 +2,8 @@ #include "common.h" -#include -#include +#include +#include namespace NArgonish { /** diff --git a/library/cpp/digest/argonish/blake2b.h b/src/library/digest/argonish/blake2b.h similarity index 98% rename from library/cpp/digest/argonish/blake2b.h rename to src/library/digest/argonish/blake2b.h index 21ca4684232..dcb0464a6b7 100644 --- a/library/cpp/digest/argonish/blake2b.h +++ b/src/library/digest/argonish/blake2b.h @@ -2,7 +2,7 @@ #include "common.h" -#include +#include namespace NArgonish { /** diff --git a/library/cpp/digest/argonish/common.h b/src/library/digest/argonish/common.h similarity index 91% rename from library/cpp/digest/argonish/common.h rename to src/library/digest/argonish/common.h index 973d82f13af..4afd80eebe3 100644 --- a/library/cpp/digest/argonish/common.h +++ b/src/library/digest/argonish/common.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NArgonish { /** diff --git a/library/cpp/digest/argonish/factory/factory.cpp b/src/library/digest/argonish/factory/factory.cpp similarity index 95% rename from library/cpp/digest/argonish/factory/factory.cpp rename to src/library/digest/argonish/factory/factory.cpp index c1f5f5ce795..dee5c6c7d18 100644 --- a/library/cpp/digest/argonish/factory/factory.cpp +++ b/src/library/digest/argonish/factory/factory.cpp @@ -2,18 +2,18 @@ // Created by Evgeny Sidorov on 12/04/17. // -#include -#include -#include +#include +#include +#include #if !defined(_arm64_) -#include -#include -#include -#include +#include +#include +#include +#include #endif -#include -#include +#include +#include namespace NArgonish { static EInstructionSet GetBestSet() { diff --git a/library/cpp/digest/argonish/internal/CMakeLists.txt b/src/library/digest/argonish/internal/CMakeLists.txt similarity index 100% rename from library/cpp/digest/argonish/internal/CMakeLists.txt rename to src/library/digest/argonish/internal/CMakeLists.txt diff --git a/library/cpp/digest/argonish/internal/argon2/CMakeLists.txt b/src/library/digest/argonish/internal/argon2/CMakeLists.txt similarity index 100% rename from library/cpp/digest/argonish/internal/argon2/CMakeLists.txt rename to src/library/digest/argonish/internal/argon2/CMakeLists.txt diff --git a/library/cpp/digest/argonish/internal/argon2/argon2_avx2.h b/src/library/digest/argonish/internal/argon2/argon2_avx2.h similarity index 98% rename from library/cpp/digest/argonish/internal/argon2/argon2_avx2.h rename to src/library/digest/argonish/internal/argon2/argon2_avx2.h index 8bf5367817d..3f8af9de932 100644 --- a/library/cpp/digest/argonish/internal/argon2/argon2_avx2.h +++ b/src/library/digest/argonish/internal/argon2/argon2_avx2.h @@ -2,7 +2,7 @@ #include #include "argon2_base.h" -#include +#include namespace NArgonish { template diff --git a/library/cpp/digest/argonish/internal/argon2/argon2_base.h b/src/library/digest/argonish/internal/argon2/argon2_base.h similarity index 98% rename from library/cpp/digest/argonish/internal/argon2/argon2_base.h rename to src/library/digest/argonish/internal/argon2/argon2_base.h index 2385cc947c8..79b42260b49 100644 --- a/library/cpp/digest/argonish/internal/argon2/argon2_base.h +++ b/src/library/digest/argonish/internal/argon2/argon2_base.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace NArgonish { const ui32 ARGON2_PREHASH_DIGEST_LENGTH = 64; diff --git a/library/cpp/digest/argonish/internal/argon2/argon2_ref.h b/src/library/digest/argonish/internal/argon2/argon2_ref.h similarity index 98% rename from library/cpp/digest/argonish/internal/argon2/argon2_ref.h rename to src/library/digest/argonish/internal/argon2/argon2_ref.h index 8e5e3fa9713..f5bc88f462e 100644 --- a/library/cpp/digest/argonish/internal/argon2/argon2_ref.h +++ b/src/library/digest/argonish/internal/argon2/argon2_ref.h @@ -1,7 +1,7 @@ #pragma once #include "argon2_base.h" -#include +#include namespace NArgonish { static inline ui64 FBlaMka(ui64 x, ui64 y) { diff --git a/library/cpp/digest/argonish/internal/argon2/argon2_sse2.h b/src/library/digest/argonish/internal/argon2/argon2_sse2.h similarity index 98% rename from library/cpp/digest/argonish/internal/argon2/argon2_sse2.h rename to src/library/digest/argonish/internal/argon2/argon2_sse2.h index 1d2230a6574..dd4f2357c1f 100644 --- a/library/cpp/digest/argonish/internal/argon2/argon2_sse2.h +++ b/src/library/digest/argonish/internal/argon2/argon2_sse2.h @@ -2,7 +2,7 @@ #include #include "argon2_base.h" -#include +#include namespace NArgonish { template diff --git a/library/cpp/digest/argonish/internal/argon2/argon2_sse41.h b/src/library/digest/argonish/internal/argon2/argon2_sse41.h similarity index 98% rename from library/cpp/digest/argonish/internal/argon2/argon2_sse41.h rename to src/library/digest/argonish/internal/argon2/argon2_sse41.h index 1ad35048ea1..370d10b024f 100644 --- a/library/cpp/digest/argonish/internal/argon2/argon2_sse41.h +++ b/src/library/digest/argonish/internal/argon2/argon2_sse41.h @@ -2,7 +2,7 @@ #include #include "argon2_base.h" -#include +#include namespace NArgonish { template diff --git a/library/cpp/digest/argonish/internal/argon2/argon2_ssse3.h b/src/library/digest/argonish/internal/argon2/argon2_ssse3.h similarity index 98% rename from library/cpp/digest/argonish/internal/argon2/argon2_ssse3.h rename to src/library/digest/argonish/internal/argon2/argon2_ssse3.h index a25a4168341..77129bab9c8 100644 --- a/library/cpp/digest/argonish/internal/argon2/argon2_ssse3.h +++ b/src/library/digest/argonish/internal/argon2/argon2_ssse3.h @@ -3,7 +3,7 @@ #include #include #include "argon2_base.h" -#include +#include namespace NArgonish { template diff --git a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.txt b/src/library/digest/argonish/internal/blake2b/CMakeLists.txt similarity index 100% rename from library/cpp/digest/argonish/internal/blake2b/CMakeLists.txt rename to src/library/digest/argonish/internal/blake2b/CMakeLists.txt diff --git a/library/cpp/digest/argonish/internal/blake2b/blake2b.h b/src/library/digest/argonish/internal/blake2b/blake2b.h similarity index 97% rename from library/cpp/digest/argonish/internal/blake2b/blake2b.h rename to src/library/digest/argonish/internal/blake2b/blake2b.h index 3dcfc3fc481..619f6d7694f 100644 --- a/library/cpp/digest/argonish/internal/blake2b/blake2b.h +++ b/src/library/digest/argonish/internal/blake2b/blake2b.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace NArgonish { const ui32 BLAKE2B_BLOCKBYTES = 128; diff --git a/library/cpp/digest/argonish/internal/blake2b/blake2b_avx2.h b/src/library/digest/argonish/internal/blake2b/blake2b_avx2.h similarity index 98% rename from library/cpp/digest/argonish/internal/blake2b/blake2b_avx2.h rename to src/library/digest/argonish/internal/blake2b/blake2b_avx2.h index 359ca90ebbf..f1df2737c1d 100644 --- a/library/cpp/digest/argonish/internal/blake2b/blake2b_avx2.h +++ b/src/library/digest/argonish/internal/blake2b/blake2b_avx2.h @@ -2,7 +2,7 @@ #include #include "blake2b.h" -#include +#include namespace NArgonish { template <> diff --git a/library/cpp/digest/argonish/internal/blake2b/blake2b_ref.h b/src/library/digest/argonish/internal/blake2b/blake2b_ref.h similarity index 97% rename from library/cpp/digest/argonish/internal/blake2b/blake2b_ref.h rename to src/library/digest/argonish/internal/blake2b/blake2b_ref.h index ef98ed8fc88..fb834e0a527 100644 --- a/library/cpp/digest/argonish/internal/blake2b/blake2b_ref.h +++ b/src/library/digest/argonish/internal/blake2b/blake2b_ref.h @@ -1,7 +1,7 @@ #pragma once #include "blake2b.h" -#include +#include namespace NArgonish { static const ui8 Sigma[12][16] = { diff --git a/library/cpp/digest/argonish/internal/blake2b/blake2b_sse2.h b/src/library/digest/argonish/internal/blake2b/blake2b_sse2.h similarity index 99% rename from library/cpp/digest/argonish/internal/blake2b/blake2b_sse2.h rename to src/library/digest/argonish/internal/blake2b/blake2b_sse2.h index e85a78044c7..8f96bb272bd 100644 --- a/library/cpp/digest/argonish/internal/blake2b/blake2b_sse2.h +++ b/src/library/digest/argonish/internal/blake2b/blake2b_sse2.h @@ -2,7 +2,7 @@ #include #include "blake2b.h" -#include +#include namespace NArgonish { template <> diff --git a/library/cpp/digest/argonish/internal/blake2b/blake2b_sse41.h b/src/library/digest/argonish/internal/blake2b/blake2b_sse41.h similarity index 99% rename from library/cpp/digest/argonish/internal/blake2b/blake2b_sse41.h rename to src/library/digest/argonish/internal/blake2b/blake2b_sse41.h index 1a033bcceb5..d0c64872c02 100644 --- a/library/cpp/digest/argonish/internal/blake2b/blake2b_sse41.h +++ b/src/library/digest/argonish/internal/blake2b/blake2b_sse41.h @@ -3,7 +3,7 @@ #include #include "blake2b.h" #include "load_sse41.h" -#include +#include namespace NArgonish { template <> diff --git a/library/cpp/digest/argonish/internal/blake2b/blake2b_ssse3.h b/src/library/digest/argonish/internal/blake2b/blake2b_ssse3.h similarity index 99% rename from library/cpp/digest/argonish/internal/blake2b/blake2b_ssse3.h rename to src/library/digest/argonish/internal/blake2b/blake2b_ssse3.h index 4cca5a5e7f7..d7417cca6d1 100644 --- a/library/cpp/digest/argonish/internal/blake2b/blake2b_ssse3.h +++ b/src/library/digest/argonish/internal/blake2b/blake2b_ssse3.h @@ -3,7 +3,7 @@ #include #include #include "blake2b.h" -#include +#include namespace NArgonish { template <> diff --git a/library/cpp/digest/argonish/internal/blake2b/load_sse41.h b/src/library/digest/argonish/internal/blake2b/load_sse41.h similarity index 100% rename from library/cpp/digest/argonish/internal/blake2b/load_sse41.h rename to src/library/digest/argonish/internal/blake2b/load_sse41.h diff --git a/library/cpp/digest/argonish/internal/blamka/CMakeLists.txt b/src/library/digest/argonish/internal/blamka/CMakeLists.txt similarity index 100% rename from library/cpp/digest/argonish/internal/blamka/CMakeLists.txt rename to src/library/digest/argonish/internal/blamka/CMakeLists.txt diff --git a/library/cpp/digest/argonish/internal/blamka/blamka_avx2.h b/src/library/digest/argonish/internal/blamka/blamka_avx2.h similarity index 98% rename from library/cpp/digest/argonish/internal/blamka/blamka_avx2.h rename to src/library/digest/argonish/internal/blamka/blamka_avx2.h index 02c506d6ffa..a6cc088c5e8 100644 --- a/library/cpp/digest/argonish/internal/blamka/blamka_avx2.h +++ b/src/library/digest/argonish/internal/blamka/blamka_avx2.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace NArgonish { static inline void BlamkaG1AVX2( diff --git a/library/cpp/digest/argonish/internal/blamka/blamka_sse2.h b/src/library/digest/argonish/internal/blamka/blamka_sse2.h similarity index 97% rename from library/cpp/digest/argonish/internal/blamka/blamka_sse2.h rename to src/library/digest/argonish/internal/blamka/blamka_sse2.h index 1b55651b348..ebdeb7903f9 100644 --- a/library/cpp/digest/argonish/internal/blamka/blamka_sse2.h +++ b/src/library/digest/argonish/internal/blamka/blamka_sse2.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NArgonish { static inline void BlamkaG1SSE2( diff --git a/library/cpp/digest/argonish/internal/blamka/blamka_ssse3.h b/src/library/digest/argonish/internal/blamka/blamka_ssse3.h similarity index 97% rename from library/cpp/digest/argonish/internal/blamka/blamka_ssse3.h rename to src/library/digest/argonish/internal/blamka/blamka_ssse3.h index 46e8500cd6c..d2b76cb568d 100644 --- a/library/cpp/digest/argonish/internal/blamka/blamka_ssse3.h +++ b/src/library/digest/argonish/internal/blamka/blamka_ssse3.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NArgonish { static inline void BlamkaG1SSSE3( diff --git a/library/cpp/digest/argonish/internal/proxies/CMakeLists.txt b/src/library/digest/argonish/internal/proxies/CMakeLists.txt similarity index 100% rename from library/cpp/digest/argonish/internal/proxies/CMakeLists.txt rename to src/library/digest/argonish/internal/proxies/CMakeLists.txt diff --git a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt b/src/library/digest/argonish/internal/proxies/avx2/CMakeLists.txt similarity index 82% rename from library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt rename to src/library/digest/argonish/internal/proxies/avx2/CMakeLists.txt index 31115562931..fbcafaf2924 100644 --- a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt +++ b/src/library/digest/argonish/internal/proxies/avx2/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(internal-proxies-avx2 PUBLIC target_sources_custom(internal-proxies-avx2 .avx2 SRCS - ${YDB_SDK_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/avx2/proxy_avx2.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.cpp CUSTOM_FLAGS -mavx2 -mfma diff --git a/src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.cpp b/src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.cpp new file mode 100644 index 00000000000..434fd715704 --- /dev/null +++ b/src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.cpp @@ -0,0 +1,18 @@ +// +// Created by Evgeny Sidorov on 12/04/17. +// + +#include "proxy_avx2.h" +#include +#include +#include +#include + +#define ZEROUPPER _mm256_zeroupper(); + +namespace NArgonish { + ARGON2_PROXY_CLASS_IMPL(AVX2) + BLAKE2B_PROXY_CLASS_IMPL(AVX2) +} + +#undef ZEROUPPER diff --git a/src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.h b/src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.h new file mode 100644 index 00000000000..b181dc7776e --- /dev/null +++ b/src/library/digest/argonish/internal/proxies/avx2/proxy_avx2.h @@ -0,0 +1,11 @@ +#pragma once + +#include +#include +#include +#include + +namespace NArgonish { + ARGON2_PROXY_CLASS_DECL(AVX2) + BLAKE2B_PROXY_CLASS_DECL(AVX2) +} diff --git a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.txt b/src/library/digest/argonish/internal/proxies/macro/CMakeLists.txt similarity index 100% rename from library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.txt rename to src/library/digest/argonish/internal/proxies/macro/CMakeLists.txt diff --git a/library/cpp/digest/argonish/internal/proxies/macro/proxy_macros.h b/src/library/digest/argonish/internal/proxies/macro/proxy_macros.h similarity index 100% rename from library/cpp/digest/argonish/internal/proxies/macro/proxy_macros.h rename to src/library/digest/argonish/internal/proxies/macro/proxy_macros.h diff --git a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.txt b/src/library/digest/argonish/internal/proxies/ref/CMakeLists.txt similarity index 78% rename from library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.txt rename to src/library/digest/argonish/internal/proxies/ref/CMakeLists.txt index 2be13975f12..47a46c4ddeb 100644 --- a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.txt +++ b/src/library/digest/argonish/internal/proxies/ref/CMakeLists.txt @@ -7,5 +7,5 @@ target_link_libraries(internal-proxies-ref PUBLIC ) target_sources(internal-proxies-ref PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/ref/proxy_ref.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/digest/argonish/internal/proxies/ref/proxy_ref.cpp ) diff --git a/src/library/digest/argonish/internal/proxies/ref/proxy_ref.cpp b/src/library/digest/argonish/internal/proxies/ref/proxy_ref.cpp new file mode 100644 index 00000000000..82b416e38e3 --- /dev/null +++ b/src/library/digest/argonish/internal/proxies/ref/proxy_ref.cpp @@ -0,0 +1,20 @@ +// +// Created by Evgeny Sidorov on 12/04/17. +// + +#include "proxy_ref.h" +#include +#include +#include +#include + +#include + +#define ZEROUPPER ; + +namespace NArgonish { + ARGON2_PROXY_CLASS_IMPL(REF) + BLAKE2B_PROXY_CLASS_IMPL(REF) +} + +#undef ZEROUPPER diff --git a/src/library/digest/argonish/internal/proxies/ref/proxy_ref.h b/src/library/digest/argonish/internal/proxies/ref/proxy_ref.h new file mode 100644 index 00000000000..c52fba79baf --- /dev/null +++ b/src/library/digest/argonish/internal/proxies/ref/proxy_ref.h @@ -0,0 +1,11 @@ +#pragma once + +#include +#include +#include +#include + +namespace NArgonish { + ARGON2_PROXY_CLASS_DECL(REF) + BLAKE2B_PROXY_CLASS_DECL(REF) +} diff --git a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt b/src/library/digest/argonish/internal/proxies/sse2/CMakeLists.txt similarity index 81% rename from library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt rename to src/library/digest/argonish/internal/proxies/sse2/CMakeLists.txt index ab48b0d1180..63b0d2f65fa 100644 --- a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt +++ b/src/library/digest/argonish/internal/proxies/sse2/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(internal-proxies-sse2 PUBLIC target_sources_custom(internal-proxies-sse2 .sse2 SRCS - ${YDB_SDK_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/sse2/proxy_sse2.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.cpp CUSTOM_FLAGS -msse2 ) diff --git a/src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.cpp b/src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.cpp new file mode 100644 index 00000000000..fb41db0ea9a --- /dev/null +++ b/src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.cpp @@ -0,0 +1,18 @@ +// +// Created by Evgeny Sidorov on 12/04/17. +// + +#include "proxy_sse2.h" +#include +#include +#include +#include + +#define ZEROUPPER ; + +namespace NArgonish { + ARGON2_PROXY_CLASS_IMPL(SSE2) + BLAKE2B_PROXY_CLASS_IMPL(SSE2) +} + +#undef ZEROUPPER diff --git a/src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.h b/src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.h new file mode 100644 index 00000000000..2b0c9f16dab --- /dev/null +++ b/src/library/digest/argonish/internal/proxies/sse2/proxy_sse2.h @@ -0,0 +1,11 @@ +#pragma once + +#include +#include +#include +#include + +namespace NArgonish { + ARGON2_PROXY_CLASS_DECL(SSE2) + BLAKE2B_PROXY_CLASS_DECL(SSE2) +} diff --git a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt b/src/library/digest/argonish/internal/proxies/sse41/CMakeLists.txt similarity index 81% rename from library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt rename to src/library/digest/argonish/internal/proxies/sse41/CMakeLists.txt index 8e89b62a403..caf3ae23e69 100644 --- a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt +++ b/src/library/digest/argonish/internal/proxies/sse41/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(internal-proxies-sse41 PUBLIC target_sources_custom(internal-proxies-sse41 .sse41 SRCS - ${YDB_SDK_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/sse41/proxy_sse41.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.cpp CUSTOM_FLAGS -msse4.1 ) diff --git a/src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.cpp b/src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.cpp new file mode 100644 index 00000000000..5acfc3b4001 --- /dev/null +++ b/src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.cpp @@ -0,0 +1,18 @@ +// +// Created by Evgeny Sidorov on 12/04/17. +// + +#include "proxy_sse41.h" +#include +#include +#include +#include + +#define ZEROUPPER ; + +namespace NArgonish { + ARGON2_PROXY_CLASS_IMPL(SSE41) + BLAKE2B_PROXY_CLASS_IMPL(SSE41) +} + +#undef ZEROUPPER diff --git a/src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.h b/src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.h new file mode 100644 index 00000000000..96100e3ad27 --- /dev/null +++ b/src/library/digest/argonish/internal/proxies/sse41/proxy_sse41.h @@ -0,0 +1,11 @@ +#pragma once + +#include +#include +#include +#include + +namespace NArgonish { + ARGON2_PROXY_CLASS_DECL(SSE41) + BLAKE2B_PROXY_CLASS_DECL(SSE41) +} diff --git a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt b/src/library/digest/argonish/internal/proxies/ssse3/CMakeLists.txt similarity index 81% rename from library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt rename to src/library/digest/argonish/internal/proxies/ssse3/CMakeLists.txt index eeb472898ec..bc358a697c3 100644 --- a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt +++ b/src/library/digest/argonish/internal/proxies/ssse3/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(internal-proxies-ssse3 PUBLIC target_sources_custom(internal-proxies-ssse3 .ssse3 SRCS - ${YDB_SDK_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/ssse3/proxy_ssse3.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.cpp CUSTOM_FLAGS -mssse3 ) diff --git a/src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.cpp b/src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.cpp new file mode 100644 index 00000000000..b30367cde29 --- /dev/null +++ b/src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.cpp @@ -0,0 +1,18 @@ +// +// Created by Evgeny Sidorov on 12/04/17. +// + +#include "proxy_ssse3.h" +#include +#include +#include +#include + +#define ZEROUPPER ; + +namespace NArgonish { + ARGON2_PROXY_CLASS_IMPL(SSSE3) + BLAKE2B_PROXY_CLASS_IMPL(SSSE3) +} + +#undef ZEROUPPER diff --git a/src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.h b/src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.h new file mode 100644 index 00000000000..18d5ad69f7f --- /dev/null +++ b/src/library/digest/argonish/internal/proxies/ssse3/proxy_ssse3.h @@ -0,0 +1,11 @@ +#pragma once + +#include +#include +#include +#include + +namespace NArgonish { + ARGON2_PROXY_CLASS_DECL(SSSE3) + BLAKE2B_PROXY_CLASS_DECL(SSSE3) +} diff --git a/library/cpp/digest/argonish/internal/rotations/CMakeLists.txt b/src/library/digest/argonish/internal/rotations/CMakeLists.txt similarity index 100% rename from library/cpp/digest/argonish/internal/rotations/CMakeLists.txt rename to src/library/digest/argonish/internal/rotations/CMakeLists.txt diff --git a/library/cpp/digest/argonish/internal/rotations/rotations_avx2.h b/src/library/digest/argonish/internal/rotations/rotations_avx2.h similarity index 100% rename from library/cpp/digest/argonish/internal/rotations/rotations_avx2.h rename to src/library/digest/argonish/internal/rotations/rotations_avx2.h diff --git a/library/cpp/digest/argonish/internal/rotations/rotations_ref.h b/src/library/digest/argonish/internal/rotations/rotations_ref.h similarity index 100% rename from library/cpp/digest/argonish/internal/rotations/rotations_ref.h rename to src/library/digest/argonish/internal/rotations/rotations_ref.h diff --git a/library/cpp/digest/argonish/internal/rotations/rotations_sse2.h b/src/library/digest/argonish/internal/rotations/rotations_sse2.h similarity index 100% rename from library/cpp/digest/argonish/internal/rotations/rotations_sse2.h rename to src/library/digest/argonish/internal/rotations/rotations_sse2.h diff --git a/library/cpp/digest/argonish/internal/rotations/rotations_ssse3.h b/src/library/digest/argonish/internal/rotations/rotations_ssse3.h similarity index 100% rename from library/cpp/digest/argonish/internal/rotations/rotations_ssse3.h rename to src/library/digest/argonish/internal/rotations/rotations_ssse3.h diff --git a/library/cpp/digest/argonish/ut/ut.cpp b/src/library/digest/argonish/ut/ut.cpp similarity index 99% rename from library/cpp/digest/argonish/ut/ut.cpp rename to src/library/digest/argonish/ut/ut.cpp index 12ef530a18c..06ff8798879 100644 --- a/library/cpp/digest/argonish/ut/ut.cpp +++ b/src/library/digest/argonish/ut/ut.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include Y_UNIT_TEST_SUITE(ArgonishTest) { const ui8 GenKatPassword[32] = { diff --git a/src/library/digest/argonish/ut/ya.make b/src/library/digest/argonish/ut/ya.make new file mode 100644 index 00000000000..7ee7e2717ce --- /dev/null +++ b/src/library/digest/argonish/ut/ya.make @@ -0,0 +1,11 @@ +UNITTEST_FOR(src/library/digest/argonish) + +PEERDIR( + src/library/digest/argonish +) + +SRCS( + ut.cpp +) + +END() diff --git a/library/cpp/digest/argonish/ut_fat/ut.cpp b/src/library/digest/argonish/ut_fat/ut.cpp similarity index 99% rename from library/cpp/digest/argonish/ut_fat/ut.cpp rename to src/library/digest/argonish/ut_fat/ut.cpp index 41fa001685a..fa28f354b9d 100644 --- a/library/cpp/digest/argonish/ut_fat/ut.cpp +++ b/src/library/digest/argonish/ut_fat/ut.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include Y_UNIT_TEST_SUITE(ArgonishTest) { const ui8 GenKatPassword[32] = { diff --git a/library/cpp/digest/argonish/ut_fat/ya.make b/src/library/digest/argonish/ut_fat/ya.make similarity index 60% rename from library/cpp/digest/argonish/ut_fat/ya.make rename to src/library/digest/argonish/ut_fat/ya.make index 6f0a77611d4..8367f529e1d 100644 --- a/library/cpp/digest/argonish/ut_fat/ya.make +++ b/src/library/digest/argonish/ut_fat/ya.make @@ -1,7 +1,7 @@ -UNITTEST_FOR(library/cpp/digest/argonish) +UNITTEST_FOR(src/library/digest/argonish) PEERDIR( - library/cpp/digest/argonish + src/library/digest/argonish ) SRCS( diff --git a/src/library/digest/lower_case/CMakeLists.txt b/src/library/digest/lower_case/CMakeLists.txt new file mode 100644 index 00000000000..1ac72e0d089 --- /dev/null +++ b/src/library/digest/lower_case/CMakeLists.txt @@ -0,0 +1,11 @@ +add_library(cpp-digest-lower_case) + +target_link_libraries(cpp-digest-lower_case PUBLIC + yutil +) + +target_sources(cpp-digest-lower_case PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/digest/lower_case/lciter.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/digest/lower_case/lchash.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/digest/lower_case/hash_ops.cpp +) diff --git a/library/cpp/digest/lower_case/hash_ops.cpp b/src/library/digest/lower_case/hash_ops.cpp similarity index 94% rename from library/cpp/digest/lower_case/hash_ops.cpp rename to src/library/digest/lower_case/hash_ops.cpp index 8299380229e..ed96cd81bea 100644 --- a/library/cpp/digest/lower_case/hash_ops.cpp +++ b/src/library/digest/lower_case/hash_ops.cpp @@ -2,7 +2,7 @@ #include "lciter.h" #include "hash_ops.h" -#include +#include size_t TCIOps::operator()(const std::string_view& s) const noexcept { return FnvCaseLess(s, (size_t)0xBEE); diff --git a/library/cpp/digest/lower_case/hash_ops.h b/src/library/digest/lower_case/hash_ops.h similarity index 100% rename from library/cpp/digest/lower_case/hash_ops.h rename to src/library/digest/lower_case/hash_ops.h diff --git a/library/cpp/digest/lower_case/hash_ops_ut.cpp b/src/library/digest/lower_case/hash_ops_ut.cpp similarity index 94% rename from library/cpp/digest/lower_case/hash_ops_ut.cpp rename to src/library/digest/lower_case/hash_ops_ut.cpp index a23aea2709a..219fa0f50f8 100644 --- a/library/cpp/digest/lower_case/hash_ops_ut.cpp +++ b/src/library/digest/lower_case/hash_ops_ut.cpp @@ -1,6 +1,6 @@ #include "hash_ops.h" -#include +#include Y_UNIT_TEST_SUITE(TestCIHash) { Y_UNIT_TEST(TestYHash1) { diff --git a/library/cpp/digest/lower_case/lchash.cpp b/src/library/digest/lower_case/lchash.cpp similarity index 100% rename from library/cpp/digest/lower_case/lchash.cpp rename to src/library/digest/lower_case/lchash.cpp diff --git a/library/cpp/digest/lower_case/lchash.h b/src/library/digest/lower_case/lchash.h similarity index 92% rename from library/cpp/digest/lower_case/lchash.h rename to src/library/digest/lower_case/lchash.h index f30c60680bc..8f21a239013 100644 --- a/library/cpp/digest/lower_case/lchash.h +++ b/src/library/digest/lower_case/lchash.h @@ -2,7 +2,7 @@ #include "lciter.h" -#include +#include #include template diff --git a/library/cpp/digest/lower_case/lchash_ut.cpp b/src/library/digest/lower_case/lchash_ut.cpp similarity index 93% rename from library/cpp/digest/lower_case/lchash_ut.cpp rename to src/library/digest/lower_case/lchash_ut.cpp index 5711fe7cd7e..daec36047bb 100644 --- a/library/cpp/digest/lower_case/lchash_ut.cpp +++ b/src/library/digest/lower_case/lchash_ut.cpp @@ -1,6 +1,6 @@ #include "lchash.h" -#include +#include Y_UNIT_TEST_SUITE(TWebDaemonHash) { Y_UNIT_TEST(Stability) { diff --git a/library/cpp/digest/lower_case/lciter.cpp b/src/library/digest/lower_case/lciter.cpp similarity index 100% rename from library/cpp/digest/lower_case/lciter.cpp rename to src/library/digest/lower_case/lciter.cpp diff --git a/library/cpp/digest/lower_case/lciter.h b/src/library/digest/lower_case/lciter.h similarity index 91% rename from library/cpp/digest/lower_case/lciter.h rename to src/library/digest/lower_case/lciter.h index 9538e57932c..19b0d1c06c1 100644 --- a/library/cpp/digest/lower_case/lciter.h +++ b/src/library/digest/lower_case/lciter.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/library/cpp/digest/lower_case/ut/ya.make b/src/library/digest/lower_case/ut/ya.make similarity index 55% rename from library/cpp/digest/lower_case/ut/ya.make rename to src/library/digest/lower_case/ut/ya.make index 159d49aa2a8..aa91593bc40 100644 --- a/library/cpp/digest/lower_case/ut/ya.make +++ b/src/library/digest/lower_case/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/digest/lower_case) +UNITTEST_FOR(src/library/digest/lower_case) SRCS( lchash_ut.cpp diff --git a/library/cpp/digest/md5/CMakeLists.txt b/src/library/digest/md5/CMakeLists.txt similarity index 76% rename from library/cpp/digest/md5/CMakeLists.txt rename to src/library/digest/md5/CMakeLists.txt index 9db91283d53..62129dbddf4 100644 --- a/library/cpp/digest/md5/CMakeLists.txt +++ b/src/library/digest/md5/CMakeLists.txt @@ -7,5 +7,5 @@ target_link_libraries(cpp-digest-md5 PUBLIC ) target_sources(cpp-digest-md5 PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/digest/md5/md5.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/digest/md5/md5.cpp ) diff --git a/library/cpp/digest/md5/md5.cpp b/src/library/digest/md5/md5.cpp similarity index 97% rename from library/cpp/digest/md5/md5.cpp rename to src/library/digest/md5/md5.cpp index df3d1c0ec73..b2fc87533db 100644 --- a/library/cpp/digest/md5/md5.cpp +++ b/src/library/digest/md5/md5.cpp @@ -1,10 +1,10 @@ #include "md5.h" -#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/digest/md5/md5.h b/src/library/digest/md5/md5.h similarity index 98% rename from library/cpp/digest/md5/md5.h rename to src/library/digest/md5/md5.h index 38a97b3c75f..7025fcd5d1b 100644 --- a/library/cpp/digest/md5/md5.h +++ b/src/library/digest/md5/md5.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/library/cpp/digest/md5/md5_medium_ut.cpp b/src/library/digest/md5/md5_medium_ut.cpp similarity index 92% rename from library/cpp/digest/md5/md5_medium_ut.cpp rename to src/library/digest/md5/md5_medium_ut.cpp index 4f7095ab2b1..73b2a974e0d 100644 --- a/library/cpp/digest/md5/md5_medium_ut.cpp +++ b/src/library/digest/md5/md5_medium_ut.cpp @@ -1,6 +1,6 @@ #include "md5.h" -#include +#include Y_UNIT_TEST_SUITE(TMD5MediumTest) { Y_UNIT_TEST(TestOverflow) { diff --git a/library/cpp/digest/md5/md5_ut.cpp b/src/library/digest/md5/md5_ut.cpp similarity index 95% rename from library/cpp/digest/md5/md5_ut.cpp rename to src/library/digest/md5/md5_ut.cpp index ec1f787ff73..ddbbcd18913 100644 --- a/library/cpp/digest/md5/md5_ut.cpp +++ b/src/library/digest/md5/md5_ut.cpp @@ -1,9 +1,9 @@ #include "md5.h" -#include +#include -#include -#include +#include +#include Y_UNIT_TEST_SUITE(TMD5Test) { Y_UNIT_TEST(TestMD5) { diff --git a/library/cpp/digest/md5/medium_ut/ya.make b/src/library/digest/md5/medium_ut/ya.make similarity index 70% rename from library/cpp/digest/md5/medium_ut/ya.make rename to src/library/digest/md5/medium_ut/ya.make index 5ccfc9a6eee..d5adca0e933 100644 --- a/library/cpp/digest/md5/medium_ut/ya.make +++ b/src/library/digest/md5/medium_ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/digest/md5) +UNITTEST_FOR(src/library/digest/md5) SIZE(MEDIUM) diff --git a/src/library/digest/md5/ut/ya.make b/src/library/digest/md5/ut/ya.make new file mode 100644 index 00000000000..d64a855d4cd --- /dev/null +++ b/src/library/digest/md5/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/digest/md5) + +SRCS( + md5_ut.cpp +) + +END() diff --git a/library/cpp/digest/murmur/CMakeLists.txt b/src/library/digest/murmur/CMakeLists.txt similarity index 68% rename from library/cpp/digest/murmur/CMakeLists.txt rename to src/library/digest/murmur/CMakeLists.txt index 4d1adc50f58..1258b894a54 100644 --- a/library/cpp/digest/murmur/CMakeLists.txt +++ b/src/library/digest/murmur/CMakeLists.txt @@ -5,5 +5,5 @@ target_link_libraries(cpp-digest-murmur PUBLIC ) target_sources(cpp-digest-murmur PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/digest/murmur/murmur.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/digest/murmur/murmur.cpp ) diff --git a/library/cpp/digest/murmur/murmur.cpp b/src/library/digest/murmur/murmur.cpp similarity index 100% rename from library/cpp/digest/murmur/murmur.cpp rename to src/library/digest/murmur/murmur.cpp diff --git a/library/cpp/digest/murmur/murmur.h b/src/library/digest/murmur/murmur.h similarity index 96% rename from library/cpp/digest/murmur/murmur.h rename to src/library/digest/murmur/murmur.h index cbf28864128..0d177c4912a 100644 --- a/library/cpp/digest/murmur/murmur.h +++ b/src/library/digest/murmur/murmur.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include /* * https://sites.google.com/site/murmurhash/ diff --git a/library/cpp/digest/murmur/murmur_ut.cpp b/src/library/digest/murmur/murmur_ut.cpp similarity index 97% rename from library/cpp/digest/murmur/murmur_ut.cpp rename to src/library/digest/murmur/murmur_ut.cpp index 3447980c8cf..4802b41da0e 100644 --- a/library/cpp/digest/murmur/murmur_ut.cpp +++ b/src/library/digest/murmur/murmur_ut.cpp @@ -1,6 +1,6 @@ #include "murmur.h" -#include +#include class TMurmurHashTest: public TTestBase { private: diff --git a/src/library/digest/murmur/ut/ya.make b/src/library/digest/murmur/ut/ya.make new file mode 100644 index 00000000000..ec07e7cad01 --- /dev/null +++ b/src/library/digest/murmur/ut/ya.make @@ -0,0 +1,13 @@ +UNITTEST() + +PEERDIR( + ADDINCL src/library/digest/murmur +) + +SRCDIR(src/library/digest/murmur) + +SRCS( + murmur_ut.cpp +) + +END() diff --git a/library/cpp/getopt/CMakeLists.txt b/src/library/getopt/CMakeLists.txt similarity index 84% rename from library/cpp/getopt/CMakeLists.txt rename to src/library/getopt/CMakeLists.txt index 6feb84f566c..e78c61f6d41 100644 --- a/library/cpp/getopt/CMakeLists.txt +++ b/src/library/getopt/CMakeLists.txt @@ -16,10 +16,10 @@ target_link_libraries(library-cpp-getopt.global PUBLIC library-cpp-build_info ) target_sources(library-cpp-getopt.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/getopt/print.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/print.cpp ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(library-cpp-getopt INTERFACE ) diff --git a/src/library/getopt/last_getopt.h b/src/library/getopt/last_getopt.h new file mode 100644 index 00000000000..b5050052cce --- /dev/null +++ b/src/library/getopt/last_getopt.h @@ -0,0 +1,3 @@ +#pragma once + +#include diff --git a/library/cpp/getopt/last_getopt_demo/demo.cpp b/src/library/getopt/last_getopt_demo/demo.cpp similarity index 98% rename from library/cpp/getopt/last_getopt_demo/demo.cpp rename to src/library/getopt/last_getopt_demo/demo.cpp index 4173ab3a71a..528aa4e951f 100644 --- a/library/cpp/getopt/last_getopt_demo/demo.cpp +++ b/src/library/getopt/last_getopt_demo/demo.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include // For the sake of this example, let's implement Wget @@ -157,7 +157,7 @@ class TMain: public TMainClassArgs { opts.AddSection( "Description", - "LastGetoptDemo is a showcase of library/cpp/getopt capabilities. It mimics interface of Wget " + "LastGetoptDemo is a showcase of src/library/getopt capabilities. It mimics interface of Wget " "but doesn't actually do anything." "\n\n" "GNU Wget, on the other hand, is a free utility for non-interactive download of files from the Web." diff --git a/src/library/getopt/last_getopt_support.h b/src/library/getopt/last_getopt_support.h new file mode 100644 index 00000000000..6e3406ad62d --- /dev/null +++ b/src/library/getopt/last_getopt_support.h @@ -0,0 +1,3 @@ +#pragma once + +#include diff --git a/src/library/getopt/modchooser.h b/src/library/getopt/modchooser.h new file mode 100644 index 00000000000..8800c3b80b5 --- /dev/null +++ b/src/library/getopt/modchooser.h @@ -0,0 +1,3 @@ +#pragma once + +#include diff --git a/src/library/getopt/opt.h b/src/library/getopt/opt.h new file mode 100644 index 00000000000..c58106afc18 --- /dev/null +++ b/src/library/getopt/opt.h @@ -0,0 +1,3 @@ +#pragma once + +#include diff --git a/src/library/getopt/opt2.h b/src/library/getopt/opt2.h new file mode 100644 index 00000000000..cb724a1da4e --- /dev/null +++ b/src/library/getopt/opt2.h @@ -0,0 +1,3 @@ +#pragma once + +#include diff --git a/src/library/getopt/posix_getopt.h b/src/library/getopt/posix_getopt.h new file mode 100644 index 00000000000..b5fda553526 --- /dev/null +++ b/src/library/getopt/posix_getopt.h @@ -0,0 +1,3 @@ +#pragma once + +#include diff --git a/library/cpp/getopt/print.cpp b/src/library/getopt/print.cpp similarity index 90% rename from library/cpp/getopt/print.cpp rename to src/library/getopt/print.cpp index 108dcda47f5..73b6da3f363 100644 --- a/library/cpp/getopt/print.cpp +++ b/src/library/getopt/print.cpp @@ -6,8 +6,8 @@ #include "posix_getopt.h" #include "ygetopt.h" -#include -#include +#include +#include namespace NLastGetoptPrivate { std::string InitVersionString() { diff --git a/src/library/getopt/small/CMakeLists.txt b/src/library/getopt/small/CMakeLists.txt new file mode 100644 index 00000000000..7088bed6770 --- /dev/null +++ b/src/library/getopt/small/CMakeLists.txt @@ -0,0 +1,29 @@ +add_library(cpp-getopt-small) + +target_link_libraries(cpp-getopt-small PUBLIC + yutil + library-cpp-colorizer + cpp-string_utils-misc + ) + +target_sources(cpp-getopt-small PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/completer.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/completer_command.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/completion_generator.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/formatted_output.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/last_getopt.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/last_getopt_easy_setup.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/last_getopt_opt.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/last_getopt_opts.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/last_getopt_parser.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/last_getopt_parse_result.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/modchooser.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/opt.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/opt2.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/posix_getopt.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/wrap.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/getopt/small/ygetopt.cpp +) + + + diff --git a/library/cpp/getopt/small/completer.cpp b/src/library/getopt/small/completer.cpp similarity index 99% rename from library/cpp/getopt/small/completer.cpp rename to src/library/getopt/small/completer.cpp index f5a1bf73bc2..990b8221b5a 100644 --- a/library/cpp/getopt/small/completer.cpp +++ b/src/library/getopt/small/completer.cpp @@ -2,8 +2,8 @@ #include "completion_generator.h" -#include -#include +#include +#include using NLastGetopt::NEscaping::Q; using NLastGetopt::NEscaping::QQ; diff --git a/library/cpp/getopt/small/completer.h b/src/library/getopt/small/completer.h similarity index 99% rename from library/cpp/getopt/small/completer.h rename to src/library/getopt/small/completer.h index a633342f5c4..5423f03bbf9 100644 --- a/library/cpp/getopt/small/completer.h +++ b/src/library/getopt/small/completer.h @@ -2,7 +2,7 @@ #include "formatted_output.h" -#include +#include namespace NLastGetopt::NComp { class ICompleter; diff --git a/library/cpp/getopt/small/completer_command.cpp b/src/library/getopt/small/completer_command.cpp similarity index 98% rename from library/cpp/getopt/small/completer_command.cpp rename to src/library/getopt/small/completer_command.cpp index 3a3d6cedec9..58c3f2e1e3c 100644 --- a/library/cpp/getopt/small/completer_command.cpp +++ b/src/library/getopt/small/completer_command.cpp @@ -4,8 +4,8 @@ #include "last_getopt.h" #include "wrap.h" -#include -#include +#include +#include namespace NLastGetopt { std::string MakeInfo(std::string_view command, std::string_view flag) { diff --git a/library/cpp/getopt/small/completer_command.h b/src/library/getopt/small/completer_command.h similarity index 100% rename from library/cpp/getopt/small/completer_command.h rename to src/library/getopt/small/completer_command.h diff --git a/library/cpp/getopt/small/completion_generator.cpp b/src/library/getopt/small/completion_generator.cpp similarity index 99% rename from library/cpp/getopt/small/completion_generator.cpp rename to src/library/getopt/small/completion_generator.cpp index 52d7a7adc39..bd36e7c53c5 100644 --- a/library/cpp/getopt/small/completion_generator.cpp +++ b/src/library/getopt/small/completion_generator.cpp @@ -1,6 +1,6 @@ #include "completion_generator.h" -#include +#include #include "last_getopt_parse_result.h" diff --git a/library/cpp/getopt/small/completion_generator.h b/src/library/getopt/small/completion_generator.h similarity index 100% rename from library/cpp/getopt/small/completion_generator.h rename to src/library/getopt/small/completion_generator.h diff --git a/library/cpp/getopt/small/formatted_output.cpp b/src/library/getopt/small/formatted_output.cpp similarity index 92% rename from library/cpp/getopt/small/formatted_output.cpp rename to src/library/getopt/small/formatted_output.cpp index 9292d710766..ec1912e3515 100644 --- a/library/cpp/getopt/small/formatted_output.cpp +++ b/src/library/getopt/small/formatted_output.cpp @@ -1,7 +1,7 @@ #include "formatted_output.h" -#include -#include +#include +#include #include diff --git a/library/cpp/getopt/small/formatted_output.h b/src/library/getopt/small/formatted_output.h similarity index 95% rename from library/cpp/getopt/small/formatted_output.h rename to src/library/getopt/small/formatted_output.h index 06a2dad5af3..5e367c6d800 100644 --- a/library/cpp/getopt/small/formatted_output.h +++ b/src/library/getopt/small/formatted_output.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/library/cpp/getopt/small/last_getopt.cpp b/src/library/getopt/small/last_getopt.cpp similarity index 100% rename from library/cpp/getopt/small/last_getopt.cpp rename to src/library/getopt/small/last_getopt.cpp diff --git a/library/cpp/getopt/small/last_getopt.h b/src/library/getopt/small/last_getopt.h similarity index 95% rename from library/cpp/getopt/small/last_getopt.h rename to src/library/getopt/small/last_getopt.h index 980bf00706b..0b8e23a0948 100644 --- a/library/cpp/getopt/small/last_getopt.h +++ b/src/library/getopt/small/last_getopt.h @@ -4,14 +4,14 @@ #include "last_getopt_easy_setup.h" #include "last_getopt_parse_result.h" -#include -#include -#include +#include +#include +#include /// see some documentation in -/// https://wiki.yandex-team.ru/development/poisk/arcadia/util/lastgetopt/ +/// https://wiki.yandex-team.ru/development/poisk/arcadia/src/util/lastgetopt/ /// https://wiki.yandex-team.ru/development/poisk/arcadia/library/getopt/ -/// see examples in library/cpp/getopt/last_getopt_demo +/// see examples in src/library/getopt/last_getopt_demo //TODO: in most cases this include is unnecessary, but needed THandlerFunctor1::HandleOpt #include "last_getopt_parser.h" diff --git a/library/cpp/getopt/small/last_getopt_easy_setup.cpp b/src/library/getopt/small/last_getopt_easy_setup.cpp similarity index 100% rename from library/cpp/getopt/small/last_getopt_easy_setup.cpp rename to src/library/getopt/small/last_getopt_easy_setup.cpp diff --git a/library/cpp/getopt/small/last_getopt_easy_setup.h b/src/library/getopt/small/last_getopt_easy_setup.h similarity index 100% rename from library/cpp/getopt/small/last_getopt_easy_setup.h rename to src/library/getopt/small/last_getopt_easy_setup.h diff --git a/library/cpp/getopt/small/last_getopt_handlers.h b/src/library/getopt/small/last_getopt_handlers.h similarity index 100% rename from library/cpp/getopt/small/last_getopt_handlers.h rename to src/library/getopt/small/last_getopt_handlers.h diff --git a/library/cpp/getopt/small/last_getopt_opt.cpp b/src/library/getopt/small/last_getopt_opt.cpp similarity index 100% rename from library/cpp/getopt/small/last_getopt_opt.cpp rename to src/library/getopt/small/last_getopt_opt.cpp diff --git a/library/cpp/getopt/small/last_getopt_opt.h b/src/library/getopt/small/last_getopt_opt.h similarity index 99% rename from library/cpp/getopt/small/last_getopt_opt.h rename to src/library/getopt/small/last_getopt_opt.h index 27c97301bbc..57c8c5ddced 100644 --- a/library/cpp/getopt/small/last_getopt_opt.h +++ b/src/library/getopt/small/last_getopt_opt.h @@ -3,9 +3,9 @@ #include "completer.h" #include "last_getopt_handlers.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/library/cpp/getopt/small/last_getopt_opts.cpp b/src/library/getopt/small/last_getopt_opts.cpp similarity index 98% rename from library/cpp/getopt/small/last_getopt_opts.cpp rename to src/library/getopt/small/last_getopt_opts.cpp index 0370445c29f..c0f27c0f658 100644 --- a/library/cpp/getopt/small/last_getopt_opts.cpp +++ b/src/library/getopt/small/last_getopt_opts.cpp @@ -3,11 +3,11 @@ #include "wrap.h" #include "last_getopt_parser.h" -#include -#include +#include +#include -#include -#include +#include +#include #include @@ -26,12 +26,12 @@ namespace NLastGetopt { static const std::string_view SPad = " "; void PrintVersionAndExit(const TOptsParser*) { - std::cout << (!NLastGetoptPrivate::VersionString().empty() ? NLastGetoptPrivate::VersionString() : "program version: not linked with library/cpp/getopt") << std::endl; + std::cout << (!NLastGetoptPrivate::VersionString().empty() ? NLastGetoptPrivate::VersionString() : "program version: not linked with src/library/getopt") << std::endl; exit(NLastGetoptPrivate::VersionString().empty()); } void PrintShortVersionAndExit(const std::string& appName) { - std::cout << appName << " version " << (!NLastGetoptPrivate::ShortVersionString().empty() ? NLastGetoptPrivate::ShortVersionString() : "not linked with library/cpp/getopt") << std::endl; + std::cout << appName << " version " << (!NLastGetoptPrivate::ShortVersionString().empty() ? NLastGetoptPrivate::ShortVersionString() : "not linked with src/library/getopt") << std::endl; exit(NLastGetoptPrivate::ShortVersionString().empty()); } diff --git a/library/cpp/getopt/small/last_getopt_opts.h b/src/library/getopt/small/last_getopt_opts.h similarity index 99% rename from library/cpp/getopt/small/last_getopt_opts.h rename to src/library/getopt/small/last_getopt_opts.h index 3e0ead7b6a5..e04399275f2 100644 --- a/library/cpp/getopt/small/last_getopt_opts.h +++ b/src/library/getopt/small/last_getopt_opts.h @@ -2,7 +2,7 @@ #include "last_getopt_opt.h" -#include +#include #include #include diff --git a/library/cpp/getopt/small/last_getopt_parse_result.cpp b/src/library/getopt/small/last_getopt_parse_result.cpp similarity index 100% rename from library/cpp/getopt/small/last_getopt_parse_result.cpp rename to src/library/getopt/small/last_getopt_parse_result.cpp diff --git a/library/cpp/getopt/small/last_getopt_parse_result.h b/src/library/getopt/small/last_getopt_parse_result.h similarity index 100% rename from library/cpp/getopt/small/last_getopt_parse_result.h rename to src/library/getopt/small/last_getopt_parse_result.h diff --git a/library/cpp/getopt/small/last_getopt_parser.cpp b/src/library/getopt/small/last_getopt_parser.cpp similarity index 98% rename from library/cpp/getopt/small/last_getopt_parser.cpp rename to src/library/getopt/small/last_getopt_parser.cpp index 40025d70b5f..bf102d8c29c 100644 --- a/library/cpp/getopt/small/last_getopt_parser.cpp +++ b/src/library/getopt/small/last_getopt_parser.cpp @@ -1,9 +1,9 @@ #include "last_getopt_parser.h" -#include -#include +#include +#include -#include +#include namespace NLastGetopt { void TOptsParser::Init(const TOpts* opts, int argc, const char* argv[]) { diff --git a/library/cpp/getopt/small/last_getopt_parser.h b/src/library/getopt/small/last_getopt_parser.h similarity index 99% rename from library/cpp/getopt/small/last_getopt_parser.h rename to src/library/getopt/small/last_getopt_parser.h index c8bcdb7f3b2..8be81431e03 100644 --- a/library/cpp/getopt/small/last_getopt_parser.h +++ b/src/library/getopt/small/last_getopt_parser.h @@ -2,7 +2,7 @@ #include "last_getopt_opts.h" -#include +#include #include #include diff --git a/library/cpp/getopt/small/last_getopt_support.h b/src/library/getopt/small/last_getopt_support.h similarity index 96% rename from library/cpp/getopt/small/last_getopt_support.h rename to src/library/getopt/small/last_getopt_support.h index 2f0a2d2e619..b1b94ba2466 100644 --- a/library/cpp/getopt/small/last_getopt_support.h +++ b/src/library/getopt/small/last_getopt_support.h @@ -1,12 +1,12 @@ #pragma once -#include +#include -#include -#include +#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/getopt/small/modchooser.cpp b/src/library/getopt/small/modchooser.cpp similarity index 99% rename from library/cpp/getopt/small/modchooser.cpp rename to src/library/getopt/small/modchooser.cpp index 9379adee798..5108696d221 100644 --- a/library/cpp/getopt/small/modchooser.cpp +++ b/src/library/getopt/small/modchooser.cpp @@ -3,10 +3,10 @@ #include "last_getopt.h" #include "modchooser.h" -#include +#include -#include -#include +#include +#include class PtrWrapper: public TMainClass { public: diff --git a/library/cpp/getopt/small/modchooser.h b/src/library/getopt/small/modchooser.h similarity index 100% rename from library/cpp/getopt/small/modchooser.h rename to src/library/getopt/small/modchooser.h diff --git a/library/cpp/getopt/small/opt.cpp b/src/library/getopt/small/opt.cpp similarity index 98% rename from library/cpp/getopt/small/opt.cpp rename to src/library/getopt/small/opt.cpp index f98e0325f77..8964de9d0ec 100644 --- a/library/cpp/getopt/small/opt.cpp +++ b/src/library/getopt/small/opt.cpp @@ -1,6 +1,6 @@ #include "opt.h" -#include +#include #include diff --git a/library/cpp/getopt/small/opt.h b/src/library/getopt/small/opt.h similarity index 98% rename from library/cpp/getopt/small/opt.h rename to src/library/getopt/small/opt.h index 74a96ad038f..346e6c5f44f 100644 --- a/library/cpp/getopt/small/opt.h +++ b/src/library/getopt/small/opt.h @@ -2,8 +2,8 @@ #include "last_getopt.h" -#include -#include +#include +#include // implementation of Opt class using last getopt diff --git a/library/cpp/getopt/small/opt2.cpp b/src/library/getopt/small/opt2.cpp similarity index 99% rename from library/cpp/getopt/small/opt2.cpp rename to src/library/getopt/small/opt2.cpp index f3eba41c7c3..8cc66f7ab32 100644 --- a/library/cpp/getopt/small/opt2.cpp +++ b/src/library/getopt/small/opt2.cpp @@ -1,6 +1,6 @@ #include "opt2.h" -#include +#include #include diff --git a/library/cpp/getopt/small/opt2.h b/src/library/getopt/small/opt2.h similarity index 99% rename from library/cpp/getopt/small/opt2.h rename to src/library/getopt/small/opt2.h index 8c511c46fb4..8db3ef8b626 100644 --- a/library/cpp/getopt/small/opt2.h +++ b/src/library/getopt/small/opt2.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/library/cpp/getopt/small/posix_getopt.cpp b/src/library/getopt/small/posix_getopt.cpp similarity index 100% rename from library/cpp/getopt/small/posix_getopt.cpp rename to src/library/getopt/small/posix_getopt.cpp diff --git a/library/cpp/getopt/small/posix_getopt.h b/src/library/getopt/small/posix_getopt.h similarity index 100% rename from library/cpp/getopt/small/posix_getopt.h rename to src/library/getopt/small/posix_getopt.h diff --git a/library/cpp/getopt/small/wrap.cpp b/src/library/getopt/small/wrap.cpp similarity index 96% rename from library/cpp/getopt/small/wrap.cpp rename to src/library/getopt/small/wrap.cpp index 4794793e35e..ed3a316cdc7 100644 --- a/library/cpp/getopt/small/wrap.cpp +++ b/src/library/getopt/small/wrap.cpp @@ -1,9 +1,9 @@ #include "wrap.h" -#include +#include -#include -#include +#include +#include namespace NLastGetopt { std::string Wrap(ui32 width, std::string_view text, std::string_view indent, size_t* lastLineLen, bool* hasParagraphs) { diff --git a/library/cpp/getopt/small/wrap.h b/src/library/getopt/small/wrap.h similarity index 94% rename from library/cpp/getopt/small/wrap.h rename to src/library/getopt/small/wrap.h index d8c5192d978..b4fd089cfe7 100644 --- a/library/cpp/getopt/small/wrap.h +++ b/src/library/getopt/small/wrap.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/library/cpp/getopt/small/ygetopt.cpp b/src/library/getopt/small/ygetopt.cpp similarity index 100% rename from library/cpp/getopt/small/ygetopt.cpp rename to src/library/getopt/small/ygetopt.cpp diff --git a/library/cpp/getopt/small/ygetopt.h b/src/library/getopt/small/ygetopt.h similarity index 95% rename from library/cpp/getopt/small/ygetopt.h rename to src/library/getopt/small/ygetopt.h index 5bfd73c1daf..43b4957f9ca 100644 --- a/library/cpp/getopt/small/ygetopt.h +++ b/src/library/getopt/small/ygetopt.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include class TGetOpt { public: diff --git a/library/cpp/getopt/ut/last_getopt_ut.cpp b/src/library/getopt/ut/last_getopt_ut.cpp similarity index 99% rename from library/cpp/getopt/ut/last_getopt_ut.cpp rename to src/library/getopt/ut/last_getopt_ut.cpp index 96360384b22..35dcf66d3bf 100644 --- a/library/cpp/getopt/ut/last_getopt_ut.cpp +++ b/src/library/getopt/ut/last_getopt_ut.cpp @@ -1,12 +1,12 @@ -#include +#include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include using namespace NLastGetopt; diff --git a/library/cpp/getopt/ut/modchooser_ut.cpp b/src/library/getopt/ut/modchooser_ut.cpp similarity index 93% rename from library/cpp/getopt/ut/modchooser_ut.cpp rename to src/library/getopt/ut/modchooser_ut.cpp index e95e5f92e89..6045a9a47bb 100644 --- a/library/cpp/getopt/ut/modchooser_ut.cpp +++ b/src/library/getopt/ut/modchooser_ut.cpp @@ -1,8 +1,8 @@ -#include +#include -#include +#include -#include +#include void ValidateArgcArgv(int argc, const char** argv) { UNIT_ASSERT_EQUAL(argc, 1); diff --git a/library/cpp/getopt/ut/opt2_ut.cpp b/src/library/getopt/ut/opt2_ut.cpp similarity index 95% rename from library/cpp/getopt/ut/opt2_ut.cpp rename to src/library/getopt/ut/opt2_ut.cpp index ab5b24a69ba..8067d80f246 100644 --- a/library/cpp/getopt/ut/opt2_ut.cpp +++ b/src/library/getopt/ut/opt2_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include //using namespace NLastGetopt; diff --git a/library/cpp/getopt/ut/opt_ut.cpp b/src/library/getopt/ut/opt_ut.cpp similarity index 93% rename from library/cpp/getopt/ut/opt_ut.cpp rename to src/library/getopt/ut/opt_ut.cpp index 129c6e3c36e..df5502b3c7e 100644 --- a/library/cpp/getopt/ut/opt_ut.cpp +++ b/src/library/getopt/ut/opt_ut.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include Y_UNIT_TEST_SUITE(OptTest) { Y_UNIT_TEST(TestSimple) { diff --git a/library/cpp/getopt/ut/posix_getopt_ut.cpp b/src/library/getopt/ut/posix_getopt_ut.cpp similarity index 98% rename from library/cpp/getopt/ut/posix_getopt_ut.cpp rename to src/library/getopt/ut/posix_getopt_ut.cpp index 0b3c15d535f..497caee3dec 100644 --- a/library/cpp/getopt/ut/posix_getopt_ut.cpp +++ b/src/library/getopt/ut/posix_getopt_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include using namespace NLastGetopt; diff --git a/library/cpp/getopt/ut/wrap.cpp b/src/library/getopt/ut/wrap.cpp similarity index 97% rename from library/cpp/getopt/ut/wrap.cpp rename to src/library/getopt/ut/wrap.cpp index 0483a9a6f93..64415891405 100644 --- a/library/cpp/getopt/ut/wrap.cpp +++ b/src/library/getopt/ut/wrap.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include Y_UNIT_TEST_SUITE(Wrap) { Y_UNIT_TEST(TestWrapping) { diff --git a/library/cpp/getopt/ut/ya.make b/src/library/getopt/ut/ya.make similarity index 81% rename from library/cpp/getopt/ut/ya.make rename to src/library/getopt/ut/ya.make index fde0eab8bcd..820bb3a3295 100644 --- a/library/cpp/getopt/ut/ya.make +++ b/src/library/getopt/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/getopt) +UNITTEST_FOR(src/library/getopt) SRCS( last_getopt_ut.cpp diff --git a/library/cpp/getopt/ut/ygetopt_ut.cpp b/src/library/getopt/ut/ygetopt_ut.cpp similarity index 90% rename from library/cpp/getopt/ut/ygetopt_ut.cpp rename to src/library/getopt/ut/ygetopt_ut.cpp index 5a46417fece..b06a4966dc3 100644 --- a/library/cpp/getopt/ut/ygetopt_ut.cpp +++ b/src/library/getopt/ut/ygetopt_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include class TGetOptTest: public TTestBase { UNIT_TEST_SUITE(TGetOptTest); diff --git a/src/library/getopt/ygetopt.h b/src/library/getopt/ygetopt.h new file mode 100644 index 00000000000..d88cdf31b95 --- /dev/null +++ b/src/library/getopt/ygetopt.h @@ -0,0 +1,3 @@ +#pragma once + +#include diff --git a/ydb/library/grpc/CMakeLists.txt b/src/library/grpc/CMakeLists.txt similarity index 100% rename from ydb/library/grpc/CMakeLists.txt rename to src/library/grpc/CMakeLists.txt diff --git a/ydb/library/grpc/client/CMakeLists.txt b/src/library/grpc/client/CMakeLists.txt similarity index 72% rename from ydb/library/grpc/client/CMakeLists.txt rename to src/library/grpc/client/CMakeLists.txt index dc4f2d48b01..e3754921558 100644 --- a/ydb/library/grpc/client/CMakeLists.txt +++ b/src/library/grpc/client/CMakeLists.txt @@ -7,5 +7,5 @@ target_link_libraries(library-grpc-client PUBLIC ) target_sources(library-grpc-client PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/library/grpc/client/grpc_client_low.cpp + grpc_client_low.cpp ) diff --git a/ydb/library/grpc/client/grpc_client_low.cpp b/src/library/grpc/client/grpc_client_low.cpp similarity index 99% rename from ydb/library/grpc/client/grpc_client_low.cpp rename to src/library/grpc/client/grpc_client_low.cpp index 74444216f4c..67e672ac3aa 100644 --- a/ydb/library/grpc/client/grpc_client_low.cpp +++ b/src/library/grpc/client/grpc_client_low.cpp @@ -1,10 +1,10 @@ #include "grpc_client_low.h" #include -#include +#include -#include -#include +#include +#include #if !defined(_WIN32) && !defined(_WIN64) #include diff --git a/ydb/library/grpc/client/grpc_client_low.h b/src/library/grpc/client/grpc_client_low.h similarity index 99% rename from ydb/library/grpc/client/grpc_client_low.h rename to src/library/grpc/client/grpc_client_low.h index b58506e271f..3b618840e46 100644 --- a/ydb/library/grpc/client/grpc_client_low.h +++ b/src/library/grpc/client/grpc_client_low.h @@ -2,11 +2,11 @@ #include "grpc_common.h" -#include -#include +#include +#include -#include -#include +#include +#include #include #include #include diff --git a/ydb/library/grpc/client/grpc_common.h b/src/library/grpc/client/grpc_common.h similarity index 97% rename from ydb/library/grpc/client/grpc_common.h rename to src/library/grpc/client/grpc_common.h index 359f17fa298..6181a7a9657 100644 --- a/ydb/library/grpc/client/grpc_common.h +++ b/src/library/grpc/client/grpc_common.h @@ -3,8 +3,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/ydb/library/grpc/common/CMakeLists.txt b/src/library/grpc/common/CMakeLists.txt similarity index 100% rename from ydb/library/grpc/common/CMakeLists.txt rename to src/library/grpc/common/CMakeLists.txt diff --git a/ydb/library/grpc/common/constants.h b/src/library/grpc/common/constants.h similarity index 73% rename from ydb/library/grpc/common/constants.h rename to src/library/grpc/common/constants.h index 7a5227e4e0e..f56dbbf2b5e 100644 --- a/ydb/library/grpc/common/constants.h +++ b/src/library/grpc/common/constants.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NYdbGrpc { diff --git a/library/cpp/http/CMakeLists.txt b/src/library/http/CMakeLists.txt similarity index 100% rename from library/cpp/http/CMakeLists.txt rename to src/library/http/CMakeLists.txt diff --git a/src/library/http/fetch/CMakeLists.txt b/src/library/http/fetch/CMakeLists.txt new file mode 100644 index 00000000000..a15261f835f --- /dev/null +++ b/src/library/http/fetch/CMakeLists.txt @@ -0,0 +1,33 @@ +add_library(cpp-http-fetch) + +target_link_libraries(cpp-http-fetch PUBLIC + yutil + ZLIB::ZLIB + library-cpp-charset + cpp-digest-md5 + cpp-http-misc + library-cpp-logger + cpp-mime-types + library-cpp-uri + tools-enum_parser-enum_serialization_runtime +) + +target_sources(cpp-http-fetch PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/http/fetch/http_digest.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/fetch/http_socket.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/fetch/httpheader.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/fetch/httpload.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/fetch/exthttpcodes.cpp +) + +generate_enum_serilization(cpp-http-fetch + ${YDB_SDK_SOURCE_DIR}/src/library/http/fetch/httpheader.h + INCLUDE_HEADERS + src/library/http/fetch/httpheader.h +) + +target_ragel_lexers(cpp-http-fetch + PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/http/fetch/httpfsm.rl6 + -CG1 +) diff --git a/library/cpp/http/fetch/exthttpcodes.cpp b/src/library/http/fetch/exthttpcodes.cpp similarity index 100% rename from library/cpp/http/fetch/exthttpcodes.cpp rename to src/library/http/fetch/exthttpcodes.cpp diff --git a/library/cpp/http/fetch/exthttpcodes.h b/src/library/http/fetch/exthttpcodes.h similarity index 97% rename from library/cpp/http/fetch/exthttpcodes.h rename to src/library/http/fetch/exthttpcodes.h index 030e1b1eded..c1b4761b218 100644 --- a/library/cpp/http/fetch/exthttpcodes.h +++ b/src/library/http/fetch/exthttpcodes.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include enum ExtHttpCodes { // Custom diff --git a/library/cpp/http/fetch/http_digest.cpp b/src/library/http/fetch/http_digest.cpp similarity index 98% rename from library/cpp/http/fetch/http_digest.cpp rename to src/library/http/fetch/http_digest.cpp index 3a9877fa6e9..1e491701057 100644 --- a/library/cpp/http/fetch/http_digest.cpp +++ b/src/library/http/fetch/http_digest.cpp @@ -1,8 +1,8 @@ #include "http_digest.h" -#include -#include -#include +#include +#include +#include /************************************************************/ /************************************************************/ diff --git a/library/cpp/http/fetch/http_digest.h b/src/library/http/fetch/http_digest.h similarity index 93% rename from library/cpp/http/fetch/http_digest.h rename to src/library/http/fetch/http_digest.h index e9ba97badcb..a280f3e663e 100644 --- a/library/cpp/http/fetch/http_digest.h +++ b/src/library/http/fetch/http_digest.h @@ -2,8 +2,8 @@ #include "httpheader.h" -#include -#include +#include +#include class httpDigestHandler { protected: diff --git a/library/cpp/http/fetch/http_socket.cpp b/src/library/http/fetch/http_socket.cpp similarity index 98% rename from library/cpp/http/fetch/http_socket.cpp rename to src/library/http/fetch/http_socket.cpp index 64af871d219..2218655179f 100644 --- a/library/cpp/http/fetch/http_socket.cpp +++ b/src/library/http/fetch/http_socket.cpp @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/library/cpp/http/fetch/httpagent.h b/src/library/http/fetch/httpagent.h similarity index 97% rename from library/cpp/http/fetch/httpagent.h rename to src/library/http/fetch/httpagent.h index 17a45be4fd9..722a393d7f8 100644 --- a/library/cpp/http/fetch/httpagent.h +++ b/src/library/http/fetch/httpagent.h @@ -4,13 +4,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "exthttpcodes.h" #include "sockhandler.h" diff --git a/library/cpp/http/fetch/httpfetcher.h b/src/library/http/fetch/httpfetcher.h similarity index 99% rename from library/cpp/http/fetch/httpfetcher.h rename to src/library/http/fetch/httpfetcher.h index c63a9db7369..e786f336bd8 100644 --- a/library/cpp/http/fetch/httpfetcher.h +++ b/src/library/http/fetch/httpfetcher.h @@ -4,7 +4,7 @@ #include #endif -#include +#include #include "httpagent.h" #include "httpparser.h" diff --git a/library/cpp/http/fetch/httpfsm.h b/src/library/http/fetch/httpfsm.h similarity index 96% rename from library/cpp/http/fetch/httpfsm.h rename to src/library/http/fetch/httpfsm.h index 4e65ff4f0c4..3e7ca165fea 100644 --- a/library/cpp/http/fetch/httpfsm.h +++ b/src/library/http/fetch/httpfsm.h @@ -2,8 +2,8 @@ #include "httpheader.h" -#include -#include +#include +#include #include diff --git a/library/cpp/http/fetch/httpfsm.rl6 b/src/library/http/fetch/httpfsm.rl6 similarity index 98% rename from library/cpp/http/fetch/httpfsm.rl6 rename to src/library/http/fetch/httpfsm.rl6 index ce91f0b7a19..bad852cabc7 100644 --- a/library/cpp/http/fetch/httpfsm.rl6 +++ b/src/library/http/fetch/httpfsm.rl6 @@ -1,15 +1,15 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include // max -#include -#include +#include +#include #ifdef _MSC_VER #pragma warning(disable: 4702) // unreachable code @@ -39,7 +39,7 @@ static inline void setguarded(x &val, long cnt) { %%{ machine http_header_parser; -include HttpDateTimeParser "../../../../util/datetime/parser.rl6"; +include HttpDateTimeParser "../../../../src/util/datetime/parser.rl6"; alphtype unsigned char; diff --git a/library/cpp/http/fetch/httpfsm_ut.cpp b/src/library/http/fetch/httpfsm_ut.cpp similarity index 99% rename from library/cpp/http/fetch/httpfsm_ut.cpp rename to src/library/http/fetch/httpfsm_ut.cpp index bcf6f0fee81..17f07d415b3 100644 --- a/library/cpp/http/fetch/httpfsm_ut.cpp +++ b/src/library/http/fetch/httpfsm_ut.cpp @@ -2,9 +2,9 @@ #include "library-htfetch_ut_hreflang_in.h" #include "library-htfetch_ut_hreflang_out.h" -#include -#include -#include +#include +#include +#include class THttpHeaderParserTestSuite: public TTestBase { UNIT_TEST_SUITE(THttpHeaderParserTestSuite); diff --git a/library/cpp/http/fetch/httpheader.cpp b/src/library/http/fetch/httpheader.cpp similarity index 100% rename from library/cpp/http/fetch/httpheader.cpp rename to src/library/http/fetch/httpheader.cpp diff --git a/library/cpp/http/fetch/httpheader.h b/src/library/http/fetch/httpheader.h similarity index 97% rename from library/cpp/http/fetch/httpheader.h rename to src/library/http/fetch/httpheader.h index f291fbb8615..7666a928e48 100644 --- a/library/cpp/http/fetch/httpheader.h +++ b/src/library/http/fetch/httpheader.h @@ -4,13 +4,13 @@ #include -#include +#include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/library/cpp/http/fetch/httpload.cpp b/src/library/http/fetch/httpload.cpp similarity index 100% rename from library/cpp/http/fetch/httpload.cpp rename to src/library/http/fetch/httpload.cpp diff --git a/library/cpp/http/fetch/httpload.h b/src/library/http/fetch/httpload.h similarity index 98% rename from library/cpp/http/fetch/httpload.h rename to src/library/http/fetch/httpload.h index e5ed85f90af..a462e5fa4ff 100644 --- a/library/cpp/http/fetch/httpload.h +++ b/src/library/http/fetch/httpload.h @@ -4,10 +4,10 @@ #include "httpparser.h" #include "http_digest.h" -#include -#include -#include -#include +#include +#include +#include +#include /********************************************************/ // Section 1: socket handlers diff --git a/library/cpp/http/fetch/httpparser.h b/src/library/http/fetch/httpparser.h similarity index 99% rename from library/cpp/http/fetch/httpparser.h rename to src/library/http/fetch/httpparser.h index 769828e4ae6..6855657229d 100644 --- a/library/cpp/http/fetch/httpparser.h +++ b/src/library/http/fetch/httpparser.h @@ -3,9 +3,9 @@ #include "httpfsm.h" #include "httpheader.h" -#include -#include -#include +#include +#include +#include template struct TFakeCheck { diff --git a/library/cpp/http/fetch/httpparser_ut.cpp b/src/library/http/fetch/httpparser_ut.cpp similarity index 99% rename from library/cpp/http/fetch/httpparser_ut.cpp rename to src/library/http/fetch/httpparser_ut.cpp index 8a7af7f4a3f..1ac1149c426 100644 --- a/library/cpp/http/fetch/httpparser_ut.cpp +++ b/src/library/http/fetch/httpparser_ut.cpp @@ -1,6 +1,6 @@ #include "httpparser.h" -#include +#include #define ENUM_OUT(arg) \ case type ::arg: { \ diff --git a/library/cpp/http/fetch/httpzreader.h b/src/library/http/fetch/httpzreader.h similarity index 99% rename from library/cpp/http/fetch/httpzreader.h rename to src/library/http/fetch/httpzreader.h index 6fdddf6bf80..6e4d16b6ae4 100644 --- a/library/cpp/http/fetch/httpzreader.h +++ b/src/library/http/fetch/httpzreader.h @@ -4,8 +4,8 @@ #include "httpparser.h" #include "exthttpcodes.h" -#include -#include +#include +#include #include diff --git a/library/cpp/http/fetch/library-htfetch_ut_hreflang_in.h b/src/library/http/fetch/library-htfetch_ut_hreflang_in.h similarity index 100% rename from library/cpp/http/fetch/library-htfetch_ut_hreflang_in.h rename to src/library/http/fetch/library-htfetch_ut_hreflang_in.h diff --git a/library/cpp/http/fetch/library-htfetch_ut_hreflang_out.h b/src/library/http/fetch/library-htfetch_ut_hreflang_out.h similarity index 100% rename from library/cpp/http/fetch/library-htfetch_ut_hreflang_out.h rename to src/library/http/fetch/library-htfetch_ut_hreflang_out.h diff --git a/library/cpp/http/fetch/sockhandler.h b/src/library/http/fetch/sockhandler.h similarity index 92% rename from library/cpp/http/fetch/sockhandler.h rename to src/library/http/fetch/sockhandler.h index 94f97ff6d0e..f5ef245ac0f 100644 --- a/library/cpp/http/fetch/sockhandler.h +++ b/src/library/http/fetch/sockhandler.h @@ -1,16 +1,16 @@ #pragma once -#include +#include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include class TAddrList: public std::vector { private: diff --git a/library/cpp/http/fetch/ut/ya.make b/src/library/http/fetch/ut/ya.make similarity index 60% rename from library/cpp/http/fetch/ut/ya.make rename to src/library/http/fetch/ut/ya.make index df14c2a09f0..ef0f9279b24 100644 --- a/library/cpp/http/fetch/ut/ya.make +++ b/src/library/http/fetch/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/http/fetch) +UNITTEST_FOR(src/library/http/fetch) SRCS( httpfsm_ut.cpp diff --git a/library/cpp/http/io/CMakeLists.txt b/src/library/http/io/CMakeLists.txt similarity index 52% rename from library/cpp/http/io/CMakeLists.txt rename to src/library/http/io/CMakeLists.txt index 68e8388c62b..be46545fb60 100644 --- a/library/cpp/http/io/CMakeLists.txt +++ b/src/library/http/io/CMakeLists.txt @@ -11,10 +11,10 @@ target_link_libraries(cpp-http-io PUBLIC ) target_sources(cpp-http-io PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/io/chunk.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/io/compression.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/io/headers.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/io/stream.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/io/chunk.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/io/compression.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/io/headers.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/io/stream.cpp ) diff --git a/library/cpp/http/io/benchmark/main.cpp b/src/library/http/io/benchmark/main.cpp similarity index 97% rename from library/cpp/http/io/benchmark/main.cpp rename to src/library/http/io/benchmark/main.cpp index 270ba0d494a..d9a7f364b8a 100644 --- a/library/cpp/http/io/benchmark/main.cpp +++ b/src/library/http/io/benchmark/main.cpp @@ -1,8 +1,8 @@ -#include +#include #include -#include +#include void FindHeaderFirstMatch(benchmark::State& state) { THttpHeaders headers; diff --git a/library/cpp/http/io/benchmark/ya.make b/src/library/http/io/benchmark/ya.make similarity index 69% rename from library/cpp/http/io/benchmark/ya.make rename to src/library/http/io/benchmark/ya.make index 6e1d252df0c..33cde6fe010 100644 --- a/library/cpp/http/io/benchmark/ya.make +++ b/src/library/http/io/benchmark/ya.make @@ -1,7 +1,7 @@ G_BENCHMARK() PEERDIR( - library/cpp/http/io + src/library/http/io ) SRCS( diff --git a/library/cpp/http/io/chunk.cpp b/src/library/http/io/chunk.cpp similarity index 100% rename from library/cpp/http/io/chunk.cpp rename to src/library/http/io/chunk.cpp diff --git a/library/cpp/http/io/chunk.h b/src/library/http/io/chunk.h similarity index 91% rename from library/cpp/http/io/chunk.h rename to src/library/http/io/chunk.h index 7ccfd2f676c..c208f01f113 100644 --- a/library/cpp/http/io/chunk.h +++ b/src/library/http/io/chunk.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/library/cpp/http/io/chunk_ut.cpp b/src/library/http/io/chunk_ut.cpp similarity index 94% rename from library/cpp/http/io/chunk_ut.cpp rename to src/library/http/io/chunk_ut.cpp index 3af14276715..a43587dd0cb 100644 --- a/library/cpp/http/io/chunk_ut.cpp +++ b/src/library/http/io/chunk_ut.cpp @@ -1,10 +1,10 @@ #include "chunk.h" -#include +#include -#include -#include -#include +#include +#include +#include #define CDATA "./chunkedio" diff --git a/library/cpp/http/io/compression.cpp b/src/library/http/io/compression.cpp similarity index 85% rename from library/cpp/http/io/compression.cpp rename to src/library/http/io/compression.cpp index ede72af5bd6..a95740c1bf5 100644 --- a/library/cpp/http/io/compression.cpp +++ b/src/library/http/io/compression.cpp @@ -1,19 +1,19 @@ #include "compression.h" #if defined(ENABLE_GPL) -#include +#include #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include -#include +#include TCompressionCodecFactory::TCompressionCodecFactory() { diff --git a/library/cpp/http/io/compression.h b/src/library/http/io/compression.h similarity index 98% rename from library/cpp/http/io/compression.h rename to src/library/http/io/compression.h index 6fcd4fe3348..3d3bd8debbe 100644 --- a/library/cpp/http/io/compression.h +++ b/src/library/http/io/compression.h @@ -2,7 +2,7 @@ #include "stream.h" -#include +#include #include diff --git a/library/cpp/http/io/compression_ut.cpp b/src/library/http/io/compression_ut.cpp similarity index 92% rename from library/cpp/http/io/compression_ut.cpp rename to src/library/http/io/compression_ut.cpp index af145c82263..8edaebb5586 100644 --- a/library/cpp/http/io/compression_ut.cpp +++ b/src/library/http/io/compression_ut.cpp @@ -1,10 +1,10 @@ #include "stream.h" #include "compression.h" -#include -#include +#include +#include -#include +#include #include Y_UNIT_TEST_SUITE(THttpCompressionTest) { diff --git a/library/cpp/http/io/fuzz/main.cpp b/src/library/http/io/fuzz/main.cpp similarity index 77% rename from library/cpp/http/io/fuzz/main.cpp rename to src/library/http/io/fuzz/main.cpp index 275bce86e01..f1991b5a885 100644 --- a/library/cpp/http/io/fuzz/main.cpp +++ b/src/library/http/io/fuzz/main.cpp @@ -1,7 +1,7 @@ -#include +#include -#include +#include extern "C" int LLVMFuzzerTestOneInput(const ui8* data, size_t size) { TMemoryInput mi(data, size); diff --git a/library/cpp/http/io/fuzz/ya.make b/src/library/http/io/fuzz/ya.make similarity index 72% rename from library/cpp/http/io/fuzz/ya.make rename to src/library/http/io/fuzz/ya.make index 8cb1fe288d6..ed0aa2c6870 100644 --- a/library/cpp/http/io/fuzz/ya.make +++ b/src/library/http/io/fuzz/ya.make @@ -1,7 +1,7 @@ FUZZ() PEERDIR( - library/cpp/http/io + src/library/http/io ) SIZE(MEDIUM) diff --git a/library/cpp/http/io/headers.cpp b/src/library/http/io/headers.cpp similarity index 96% rename from library/cpp/http/io/headers.cpp rename to src/library/http/io/headers.cpp index a4907da1df4..b8b3c03ccff 100644 --- a/library/cpp/http/io/headers.cpp +++ b/src/library/http/io/headers.cpp @@ -1,9 +1,9 @@ #include "headers.h" #include "stream.h" -#include -#include -#include +#include +#include +#include static inline std::string_view Trim(const char* b, const char* e) noexcept { return StripString(std::string_view(b, e)); diff --git a/library/cpp/http/io/headers.h b/src/library/http/io/headers.h similarity index 98% rename from library/cpp/http/io/headers.h rename to src/library/http/io/headers.h index 582b24b1c3c..bf466fd8938 100644 --- a/library/cpp/http/io/headers.h +++ b/src/library/http/io/headers.h @@ -1,11 +1,11 @@ #pragma once -#include +#include #include #include -#include +#include class IInputStream; class IOutputStream; diff --git a/library/cpp/http/io/headers_ut.cpp b/src/library/http/io/headers_ut.cpp similarity index 97% rename from library/cpp/http/io/headers_ut.cpp rename to src/library/http/io/headers_ut.cpp index 3e205266256..2f57a1477fb 100644 --- a/library/cpp/http/io/headers_ut.cpp +++ b/src/library/http/io/headers_ut.cpp @@ -1,10 +1,10 @@ -#include +#include #include #include #include -#include -#include +#include +#include namespace { class THeadersExistence { diff --git a/library/cpp/http/io/list_codings/main.cpp b/src/library/http/io/list_codings/main.cpp similarity index 58% rename from library/cpp/http/io/list_codings/main.cpp rename to src/library/http/io/list_codings/main.cpp index fe15b0d170f..a8a86135dff 100644 --- a/library/cpp/http/io/list_codings/main.cpp +++ b/src/library/http/io/list_codings/main.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include int main() { for (auto codec : SupportedCodings()) { diff --git a/library/cpp/http/io/list_codings/ya.make b/src/library/http/io/list_codings/ya.make similarity index 68% rename from library/cpp/http/io/list_codings/ya.make rename to src/library/http/io/list_codings/ya.make index afc5c454442..3a0e5f4370f 100644 --- a/library/cpp/http/io/list_codings/ya.make +++ b/src/library/http/io/list_codings/ya.make @@ -1,7 +1,7 @@ PROGRAM() PEERDIR( - library/cpp/http/io + src/library/http/io ) SRCS( diff --git a/library/cpp/http/io/stream.cpp b/src/library/http/io/stream.cpp similarity index 98% rename from library/cpp/http/io/stream.cpp rename to src/library/http/io/stream.cpp index fff5a0bc493..1f50a33e999 100644 --- a/library/cpp/http/io/stream.cpp +++ b/src/library/http/io/stream.cpp @@ -3,20 +3,20 @@ #include "compression.h" #include "chunk.h" -#include -#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include -#include +#include -#include +#include #include diff --git a/library/cpp/http/io/stream.h b/src/library/http/io/stream.h similarity index 98% rename from library/cpp/http/io/stream.h rename to src/library/http/io/stream.h index d4634ab91cd..9ebe1fdc79d 100644 --- a/library/cpp/http/io/stream.h +++ b/src/library/http/io/stream.h @@ -2,12 +2,12 @@ #include "headers.h" -#include -#include +#include +#include #include #include #include -#include +#include class TSocket; diff --git a/library/cpp/http/io/stream_ut.cpp b/src/library/http/io/stream_ut.cpp similarity index 98% rename from library/cpp/http/io/stream_ut.cpp rename to src/library/http/io/stream_ut.cpp index 9d5fb4cd8f9..51e11f22abf 100644 --- a/library/cpp/http/io/stream_ut.cpp +++ b/src/library/http/io/stream_ut.cpp @@ -1,17 +1,17 @@ #include "stream.h" #include "chunk.h" -#include +#include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include Y_UNIT_TEST_SUITE(THttpStreamTest) { class TTestHttpServer: public THttpServer::ICallBack { diff --git a/library/cpp/http/io/stream_ut_medium.cpp b/src/library/http/io/stream_ut_medium.cpp similarity index 93% rename from library/cpp/http/io/stream_ut_medium.cpp rename to src/library/http/io/stream_ut_medium.cpp index cd30aa1922e..09e1e9a2c0e 100644 --- a/library/cpp/http/io/stream_ut_medium.cpp +++ b/src/library/http/io/stream_ut_medium.cpp @@ -1,6 +1,6 @@ #include "stream.h" -#include -#include +#include +#include Y_UNIT_TEST_SUITE(THttpTestMedium) { Y_UNIT_TEST(TestCodings2) { diff --git a/library/cpp/http/io/ut/ya.make b/src/library/http/io/ut/ya.make similarity index 67% rename from library/cpp/http/io/ut/ya.make rename to src/library/http/io/ut/ya.make index 75beaaafb96..a4aa961cf7d 100644 --- a/library/cpp/http/io/ut/ya.make +++ b/src/library/http/io/ut/ya.make @@ -1,7 +1,7 @@ -UNITTEST_FOR(library/cpp/http/io) +UNITTEST_FOR(src/library/http/io) PEERDIR( - library/cpp/http/server + src/library/http/server ) SRCS( diff --git a/library/cpp/http/misc/CMakeLists.txt b/src/library/http/misc/CMakeLists.txt similarity index 50% rename from library/cpp/http/misc/CMakeLists.txt rename to src/library/http/misc/CMakeLists.txt index 75b765ddc4e..9dc11f69a5f 100644 --- a/library/cpp/http/misc/CMakeLists.txt +++ b/src/library/http/misc/CMakeLists.txt @@ -10,16 +10,16 @@ target_link_libraries(cpp-http-misc PUBLIC ) target_sources(cpp-http-misc PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/misc/httpcodes.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/misc/httpdate.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/misc/httpreqdata.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/misc/parsed_request.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/misc/httpcodes.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/misc/httpdate.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/misc/httpreqdata.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/misc/parsed_request.cpp ) generate_enum_serilization(cpp-http-misc - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/misc/httpcodes.h + ${YDB_SDK_SOURCE_DIR}/src/library/http/misc/httpcodes.h INCLUDE_HEADERS - library/cpp/http/misc/httpcodes.h + src/library/http/misc/httpcodes.h ) diff --git a/library/cpp/http/misc/httpcodes.cpp b/src/library/http/misc/httpcodes.cpp similarity index 100% rename from library/cpp/http/misc/httpcodes.cpp rename to src/library/http/misc/httpcodes.cpp diff --git a/library/cpp/http/misc/httpcodes.h b/src/library/http/misc/httpcodes.h similarity index 100% rename from library/cpp/http/misc/httpcodes.h rename to src/library/http/misc/httpcodes.h diff --git a/library/cpp/http/misc/httpdate.cpp b/src/library/http/misc/httpdate.cpp similarity index 94% rename from library/cpp/http/misc/httpdate.cpp rename to src/library/http/misc/httpdate.cpp index 48c296063c3..609e0f24431 100644 --- a/library/cpp/http/misc/httpdate.cpp +++ b/src/library/http/misc/httpdate.cpp @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#include +#include #include #include @@ -35,10 +35,10 @@ #include #include -#include /* stricmp */ -#include +#include /* stricmp */ +#include #include "httpdate.h" -#include +#include static const char *wkdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" diff --git a/library/cpp/http/misc/httpdate.h b/src/library/http/misc/httpdate.h similarity index 92% rename from library/cpp/http/misc/httpdate.h rename to src/library/http/misc/httpdate.h index cc296d8a2d4..5f7d68cc2e1 100644 --- a/library/cpp/http/misc/httpdate.h +++ b/src/library/http/misc/httpdate.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/library/cpp/http/misc/httpdate_ut.cpp b/src/library/http/misc/httpdate_ut.cpp similarity index 88% rename from library/cpp/http/misc/httpdate_ut.cpp rename to src/library/http/misc/httpdate_ut.cpp index c1a0103501b..4e98d5d9fb1 100644 --- a/library/cpp/http/misc/httpdate_ut.cpp +++ b/src/library/http/misc/httpdate_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #include "httpdate.h" diff --git a/library/cpp/http/misc/httpreqdata.cpp b/src/library/http/misc/httpreqdata.cpp similarity index 96% rename from library/cpp/http/misc/httpreqdata.cpp rename to src/library/http/misc/httpreqdata.cpp index 81d3a5cc7f3..504f6391307 100644 --- a/library/cpp/http/misc/httpreqdata.cpp +++ b/src/library/http/misc/httpreqdata.cpp @@ -1,11 +1,11 @@ #include "httpreqdata.h" -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/http/misc/httpreqdata.h b/src/library/http/misc/httpreqdata.h similarity index 89% rename from library/cpp/http/misc/httpreqdata.h rename to src/library/http/misc/httpreqdata.h index b6c75a5be35..138fed5119f 100644 --- a/library/cpp/http/misc/httpreqdata.h +++ b/src/library/http/misc/httpreqdata.h @@ -1,14 +1,14 @@ #pragma once -#include - -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include using THttpHeadersContainer = THashMap; diff --git a/library/cpp/http/misc/httpreqdata_ut.cpp b/src/library/http/misc/httpreqdata_ut.cpp similarity index 99% rename from library/cpp/http/misc/httpreqdata_ut.cpp rename to src/library/http/misc/httpreqdata_ut.cpp index 2f7c7f7bc01..953b9b820cf 100644 --- a/library/cpp/http/misc/httpreqdata_ut.cpp +++ b/src/library/http/misc/httpreqdata_ut.cpp @@ -1,6 +1,6 @@ #include "httpreqdata.h" -#include +#include Y_UNIT_TEST_SUITE(TRequestServerDataTest) { Y_UNIT_TEST(Headers) { diff --git a/library/cpp/http/misc/parsed_request.cpp b/src/library/http/misc/parsed_request.cpp similarity index 80% rename from library/cpp/http/misc/parsed_request.cpp rename to src/library/http/misc/parsed_request.cpp index 38df18302ac..ed89f3f19a9 100644 --- a/library/cpp/http/misc/parsed_request.cpp +++ b/src/library/http/misc/parsed_request.cpp @@ -1,11 +1,11 @@ #include "parsed_request.h" -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include static inline std::string_view StripLeft(const std::string_view& s) noexcept { const char* b = s.begin(); diff --git a/library/cpp/http/misc/parsed_request.h b/src/library/http/misc/parsed_request.h similarity index 100% rename from library/cpp/http/misc/parsed_request.h rename to src/library/http/misc/parsed_request.h diff --git a/library/cpp/http/misc/parsed_request_ut.cpp b/src/library/http/misc/parsed_request_ut.cpp similarity index 92% rename from library/cpp/http/misc/parsed_request_ut.cpp rename to src/library/http/misc/parsed_request_ut.cpp index da6d95c6ab5..6e20a9d2099 100644 --- a/library/cpp/http/misc/parsed_request_ut.cpp +++ b/src/library/http/misc/parsed_request_ut.cpp @@ -1,6 +1,6 @@ #include "parsed_request.h" -#include +#include Y_UNIT_TEST_SUITE(THttpParse) { Y_UNIT_TEST(TestParse) { diff --git a/library/cpp/http/misc/ut/ya.make b/src/library/http/misc/ut/ya.make similarity index 70% rename from library/cpp/http/misc/ut/ya.make rename to src/library/http/misc/ut/ya.make index 604f1c4e749..6238f3569eb 100644 --- a/library/cpp/http/misc/ut/ya.make +++ b/src/library/http/misc/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/http/misc) +UNITTEST_FOR(src/library/http/misc) SRCS( httpdate_ut.cpp diff --git a/src/library/http/server/CMakeLists.txt b/src/library/http/server/CMakeLists.txt new file mode 100644 index 00000000000..7efe03cdfee --- /dev/null +++ b/src/library/http/server/CMakeLists.txt @@ -0,0 +1,19 @@ +add_library(cpp-http-server) + +target_link_libraries(cpp-http-server PUBLIC + yutil + cpp-http-misc + cpp-http-io + cpp-threading-equeue + cpp-deprecated-atomic +) + +target_sources(cpp-http-server PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/http/server/conn.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/server/http.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/server/http_ex.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/server/options.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/server/response.cpp +) + + diff --git a/library/cpp/http/server/conn.cpp b/src/library/http/server/conn.cpp similarity index 94% rename from library/cpp/http/server/conn.cpp rename to src/library/http/server/conn.cpp index 38a76c4c309..8206a882c2b 100644 --- a/library/cpp/http/server/conn.cpp +++ b/src/library/http/server/conn.cpp @@ -1,7 +1,7 @@ #include "conn.h" -#include -#include +#include +#include class THttpServerConn::TImpl { public: diff --git a/library/cpp/http/server/conn.h b/src/library/http/server/conn.h similarity index 93% rename from library/cpp/http/server/conn.h rename to src/library/http/server/conn.h index 3aa5329af42..4fa41d8a68e 100644 --- a/library/cpp/http/server/conn.h +++ b/src/library/http/server/conn.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include class TSocket; diff --git a/library/cpp/http/server/http.cpp b/src/library/http/server/http.cpp similarity index 97% rename from library/cpp/http/server/http.cpp rename to src/library/http/server/http.cpp index d36d2980c2e..ad24be5a13c 100644 --- a/library/cpp/http/server/http.cpp +++ b/src/library/http/server/http.cpp @@ -1,21 +1,21 @@ #include "http.h" #include "http_ex.h" -#include - -#include -#include -#include -#include -#include -#include -#include -#include // stricmp, strnicmp, strlwr, strupr, stpcpy -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include // stricmp, strnicmp, strlwr, strupr, stpcpy +#include +#include +#include +#include +#include #include #include diff --git a/library/cpp/http/server/http.h b/src/library/http/server/http.h similarity index 95% rename from library/cpp/http/server/http.h rename to src/library/http/server/http.h index 693167db2a0..c8a94be7a86 100644 --- a/library/cpp/http/server/http.h +++ b/src/library/http/server/http.h @@ -3,12 +3,12 @@ #include "conn.h" #include "options.h" -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include class IThreadFactory; class TClientRequest; diff --git a/library/cpp/http/server/http_ex.cpp b/src/library/http/server/http_ex.cpp similarity index 96% rename from library/cpp/http/server/http_ex.cpp rename to src/library/http/server/http_ex.cpp index 75042bc1ad9..ce9825b2537 100644 --- a/library/cpp/http/server/http_ex.cpp +++ b/src/library/http/server/http_ex.cpp @@ -1,8 +1,8 @@ #include "http_ex.h" -#include -#include -#include +#include +#include +#include bool THttpClientRequestExtension::Parse(char* req, TBaseServerRequestData& rd) { rd.SetSocket(Socket()); diff --git a/library/cpp/http/server/http_ex.h b/src/library/http/server/http_ex.h similarity index 94% rename from library/cpp/http/server/http_ex.h rename to src/library/http/server/http_ex.h index 4c3887996c5..2055f051f57 100644 --- a/library/cpp/http/server/http_ex.h +++ b/src/library/http/server/http_ex.h @@ -2,7 +2,7 @@ #include "http.h" -#include +#include class THttpClientRequestExtension: public TClientRequest { public: diff --git a/library/cpp/http/server/http_ut.cpp b/src/library/http/server/http_ut.cpp similarity index 99% rename from library/cpp/http/server/http_ut.cpp rename to src/library/http/server/http_ut.cpp index 5526d150a73..87b8004014f 100644 --- a/library/cpp/http/server/http_ut.cpp +++ b/src/library/http/server/http_ut.cpp @@ -1,14 +1,14 @@ #include "http.h" #include "http_ex.h" -#include -#include - -#include -#include -#include -#include -#include +#include +#include + +#include +#include +#include +#include +#include #include diff --git a/library/cpp/http/server/options.cpp b/src/library/http/server/options.cpp similarity index 84% rename from library/cpp/http/server/options.cpp rename to src/library/http/server/options.cpp index b0a1f7ca1e3..45fa6f442bb 100644 --- a/library/cpp/http/server/options.cpp +++ b/src/library/http/server/options.cpp @@ -1,10 +1,10 @@ #include "options.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include using TAddr = THttpServerOptions::TAddr; diff --git a/library/cpp/http/server/options.h b/src/library/http/server/options.h similarity index 96% rename from library/cpp/http/server/options.h rename to src/library/http/server/options.h index 4251d19e8a0..fd7df0de277 100644 --- a/library/cpp/http/server/options.h +++ b/src/library/http/server/options.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include class THttpServerOptions { public: diff --git a/library/cpp/http/server/response.cpp b/src/library/http/server/response.cpp similarity index 98% rename from library/cpp/http/server/response.cpp rename to src/library/http/server/response.cpp index e2917ce1ecc..dd4a7061bb8 100644 --- a/library/cpp/http/server/response.cpp +++ b/src/library/http/server/response.cpp @@ -1,6 +1,6 @@ #include "response.h" -#include +#include THttpResponse& THttpResponse::AddMultipleHeaders(const THttpHeaders& headers) { for (THttpHeaders::TConstIterator i = headers.Begin(); i != headers.End(); ++i) { diff --git a/library/cpp/http/server/response.h b/src/library/http/server/response.h similarity index 96% rename from library/cpp/http/server/response.h rename to src/library/http/server/response.h index e05f2cc24b0..22c1537b3e6 100644 --- a/library/cpp/http/server/response.h +++ b/src/library/http/server/response.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/library/cpp/http/server/response_ut.cpp b/src/library/http/server/response_ut.cpp similarity index 98% rename from library/cpp/http/server/response_ut.cpp rename to src/library/http/server/response_ut.cpp index bdf2fc1c7d8..b7076acf349 100644 --- a/library/cpp/http/server/response_ut.cpp +++ b/src/library/http/server/response_ut.cpp @@ -1,8 +1,8 @@ #include "response.h" -#include +#include -#include +#include Y_UNIT_TEST_SUITE(TestHttpResponse) { Y_UNIT_TEST(TestCodeOnly) { diff --git a/library/cpp/http/server/ut/ya.make b/src/library/http/server/ut/ya.make similarity index 63% rename from library/cpp/http/server/ut/ya.make rename to src/library/http/server/ut/ya.make index 78911fc4f1a..cdda8463ce6 100644 --- a/library/cpp/http/server/ut/ya.make +++ b/src/library/http/server/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/http/server) +UNITTEST_FOR(src/library/http/server) SIZE(MEDIUM) diff --git a/library/cpp/http/simple/CMakeLists.txt b/src/library/http/simple/CMakeLists.txt similarity index 75% rename from library/cpp/http/simple/CMakeLists.txt rename to src/library/http/simple/CMakeLists.txt index 732032b6e7e..222ba0f40b7 100644 --- a/library/cpp/http/simple/CMakeLists.txt +++ b/src/library/http/simple/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(cpp-http-simple PUBLIC ) target_sources(cpp-http-simple PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/http/simple/http_client.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/http/simple/http_client.cpp ) diff --git a/library/cpp/http/simple/http_client.cpp b/src/library/http/simple/http_client.cpp similarity index 98% rename from library/cpp/http/simple/http_client.cpp rename to src/library/http/simple/http_client.cpp index afb4cb1c8a0..2f605da52c7 100644 --- a/library/cpp/http/simple/http_client.cpp +++ b/src/library/http/simple/http_client.cpp @@ -1,10 +1,10 @@ #include "http_client.h" -#include -#include +#include +#include -#include -#include +#include +#include TKeepAliveHttpClient::TKeepAliveHttpClient(const std::string& host, ui32 port, diff --git a/library/cpp/http/simple/http_client.h b/src/library/http/simple/http_client.h similarity index 97% rename from library/cpp/http/simple/http_client.h rename to src/library/http/simple/http_client.h index af1f5c16e3e..aeaef5ad455 100644 --- a/library/cpp/http/simple/http_client.h +++ b/src/library/http/simple/http_client.h @@ -2,14 +2,14 @@ #include "http_client_options.h" -#include -#include -#include -#include - -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include class TNetworkAddress; class IOutputStream; diff --git a/library/cpp/http/simple/http_client_options.h b/src/library/http/simple/http_client_options.h similarity index 93% rename from library/cpp/http/simple/http_client_options.h rename to src/library/http/simple/http_client_options.h index a1d5db3a593..da9dafa2d37 100644 --- a/library/cpp/http/simple/http_client_options.h +++ b/src/library/http/simple/http_client_options.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include class TSimpleHttpClientOptions { using TSelf = TSimpleHttpClientOptions; diff --git a/library/cpp/http/simple/ut/http_ut.cpp b/src/library/http/simple/ut/http_ut.cpp similarity index 98% rename from library/cpp/http/simple/ut/http_ut.cpp rename to src/library/http/simple/ut/http_ut.cpp index 2de75dd76a6..c17bdfebb17 100644 --- a/library/cpp/http/simple/ut/http_ut.cpp +++ b/src/library/http/simple/ut/http_ut.cpp @@ -1,13 +1,13 @@ -#include +#include -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/http/simple/ut/https_server/http_server.crt b/src/library/http/simple/ut/https_server/http_server.crt similarity index 100% rename from library/cpp/http/simple/ut/https_server/http_server.crt rename to src/library/http/simple/ut/https_server/http_server.crt diff --git a/library/cpp/http/simple/ut/https_server/http_server.key b/src/library/http/simple/ut/https_server/http_server.key similarity index 100% rename from library/cpp/http/simple/ut/https_server/http_server.key rename to src/library/http/simple/ut/https_server/http_server.key diff --git a/library/cpp/http/simple/ut/https_server/main.go b/src/library/http/simple/ut/https_server/main.go similarity index 100% rename from library/cpp/http/simple/ut/https_server/main.go rename to src/library/http/simple/ut/https_server/main.go diff --git a/library/cpp/http/simple/ut/https_server/ya.make b/src/library/http/simple/ut/https_server/ya.make similarity index 100% rename from library/cpp/http/simple/ut/https_server/ya.make rename to src/library/http/simple/ut/https_server/ya.make diff --git a/library/cpp/http/simple/ut/https_ut.cpp b/src/library/http/simple/ut/https_ut.cpp similarity index 86% rename from library/cpp/http/simple/ut/https_ut.cpp rename to src/library/http/simple/ut/https_ut.cpp index 5f18154ffc5..15813282142 100644 --- a/library/cpp/http/simple/ut/https_ut.cpp +++ b/src/library/http/simple/ut/https_ut.cpp @@ -1,11 +1,11 @@ -#include +#include -#include +#include -#include -#include +#include +#include -#include +#include #include @@ -13,11 +13,11 @@ Y_UNIT_TEST_SUITE(Https) { using TShellCommandPtr = std::unique_ptr; static TShellCommandPtr start(ui16 port) { - const std::string data = ArcadiaSourceRoot() + "/library/cpp/http/simple/ut/https_server"; + const std::string data = ArcadiaSourceRoot() + "/src/library/http/simple/ut/https_server"; const std::string command = TStringBuilder() - << BuildRoot() << "/library/cpp/http/simple/ut/https_server/https_server" + << BuildRoot() << "/src/library/http/simple/ut/https_server/https_server" << " --port " << port << " --keyfile " << data << "/http_server.key" << " --certfile " << data << "/http_server.crt"; diff --git a/src/library/http/simple/ut/ya.make b/src/library/http/simple/ut/ya.make new file mode 100644 index 00000000000..62e61df005b --- /dev/null +++ b/src/library/http/simple/ut/ya.make @@ -0,0 +1,21 @@ +UNITTEST_FOR(src/library/http/simple) + +PEERDIR( + src/library/http/misc + src/library/testing/mock_server +) + +SRCS( + http_ut.cpp + https_ut.cpp +) + +DEPENDS(src/library/http/simple/ut/https_server) + +DATA(arcadia/src/library/http/simple/ut/https_server) + +END() + +RECURSE( + https_server +) diff --git a/src/library/iterator/CMakeLists.txt b/src/library/iterator/CMakeLists.txt new file mode 100644 index 00000000000..5f64c894953 --- /dev/null +++ b/src/library/iterator/CMakeLists.txt @@ -0,0 +1,17 @@ +add_library(library-cpp-iterator) + +target_link_libraries(library-cpp-iterator PUBLIC + yutil +) + +target_sources(library-cpp-iterator PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/iterator/cartesian_product.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/iterator/concatenate.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/iterator/enumerate.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/iterator/iterate_keys.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/iterator/iterate_values.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/iterator/filtering.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/iterator/functools.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/iterator/mapped.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/iterator/zip.cpp +) diff --git a/library/cpp/iterator/README.md b/src/library/iterator/README.md similarity index 100% rename from library/cpp/iterator/README.md rename to src/library/iterator/README.md diff --git a/library/cpp/iterator/cartesian_product.cpp b/src/library/iterator/cartesian_product.cpp similarity index 100% rename from library/cpp/iterator/cartesian_product.cpp rename to src/library/iterator/cartesian_product.cpp diff --git a/library/cpp/iterator/cartesian_product.h b/src/library/iterator/cartesian_product.h similarity index 99% rename from library/cpp/iterator/cartesian_product.h rename to src/library/iterator/cartesian_product.h index 3ef70339a2c..2ea524f8d41 100644 --- a/library/cpp/iterator/cartesian_product.h +++ b/src/library/iterator/cartesian_product.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/library/cpp/iterator/concatenate.cpp b/src/library/iterator/concatenate.cpp similarity index 100% rename from library/cpp/iterator/concatenate.cpp rename to src/library/iterator/concatenate.cpp diff --git a/library/cpp/iterator/concatenate.h b/src/library/iterator/concatenate.h similarity index 99% rename from library/cpp/iterator/concatenate.h rename to src/library/iterator/concatenate.h index 1eb914b6991..bfdc645b3c9 100644 --- a/library/cpp/iterator/concatenate.h +++ b/src/library/iterator/concatenate.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/library/cpp/iterator/enumerate.cpp b/src/library/iterator/enumerate.cpp similarity index 100% rename from library/cpp/iterator/enumerate.cpp rename to src/library/iterator/enumerate.cpp diff --git a/library/cpp/iterator/enumerate.h b/src/library/iterator/enumerate.h similarity index 98% rename from library/cpp/iterator/enumerate.h rename to src/library/iterator/enumerate.h index 2c83fb41bfc..9efee9fabd1 100644 --- a/library/cpp/iterator/enumerate.h +++ b/src/library/iterator/enumerate.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/library/cpp/iterator/filtering.cpp b/src/library/iterator/filtering.cpp similarity index 100% rename from library/cpp/iterator/filtering.cpp rename to src/library/iterator/filtering.cpp diff --git a/library/cpp/iterator/filtering.h b/src/library/iterator/filtering.h similarity index 97% rename from library/cpp/iterator/filtering.h rename to src/library/iterator/filtering.h index c28e3bc6c44..325bb0bb516 100644 --- a/library/cpp/iterator/filtering.h +++ b/src/library/iterator/filtering.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/library/cpp/iterator/functools.cpp b/src/library/iterator/functools.cpp similarity index 100% rename from library/cpp/iterator/functools.cpp rename to src/library/iterator/functools.cpp diff --git a/library/cpp/iterator/functools.h b/src/library/iterator/functools.h similarity index 95% rename from library/cpp/iterator/functools.h rename to src/library/iterator/functools.h index 57a0d663734..5d62cdbf40b 100644 --- a/library/cpp/iterator/functools.h +++ b/src/library/iterator/functools.h @@ -7,8 +7,8 @@ #include "mapped.h" #include "zip.h" -#include -#include +#include +#include #include #include diff --git a/library/cpp/iterator/iterate_keys.cpp b/src/library/iterator/iterate_keys.cpp similarity index 100% rename from library/cpp/iterator/iterate_keys.cpp rename to src/library/iterator/iterate_keys.cpp diff --git a/library/cpp/iterator/iterate_keys.h b/src/library/iterator/iterate_keys.h similarity index 100% rename from library/cpp/iterator/iterate_keys.h rename to src/library/iterator/iterate_keys.h diff --git a/library/cpp/iterator/iterate_values.cpp b/src/library/iterator/iterate_values.cpp similarity index 100% rename from library/cpp/iterator/iterate_values.cpp rename to src/library/iterator/iterate_values.cpp diff --git a/library/cpp/iterator/iterate_values.h b/src/library/iterator/iterate_values.h similarity index 100% rename from library/cpp/iterator/iterate_values.h rename to src/library/iterator/iterate_values.h diff --git a/library/cpp/iterator/mapped.cpp b/src/library/iterator/mapped.cpp similarity index 100% rename from library/cpp/iterator/mapped.cpp rename to src/library/iterator/mapped.cpp diff --git a/library/cpp/iterator/mapped.h b/src/library/iterator/mapped.h similarity index 98% rename from library/cpp/iterator/mapped.h rename to src/library/iterator/mapped.h index 0eb14714415..fd2b3f14c81 100644 --- a/library/cpp/iterator/mapped.h +++ b/src/library/iterator/mapped.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/library/cpp/iterator/ut/filtering_ut.cpp b/src/library/iterator/ut/filtering_ut.cpp similarity index 89% rename from library/cpp/iterator/ut/filtering_ut.cpp rename to src/library/iterator/ut/filtering_ut.cpp index eeac0ecc402..e6e2ae962e8 100644 --- a/library/cpp/iterator/ut/filtering_ut.cpp +++ b/src/library/iterator/ut/filtering_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include diff --git a/library/cpp/iterator/ut/functools_ut.cpp b/src/library/iterator/ut/functools_ut.cpp similarity index 99% rename from library/cpp/iterator/ut/functools_ut.cpp rename to src/library/iterator/ut/functools_ut.cpp index 95a7d4892d6..e73822d0250 100644 --- a/library/cpp/iterator/ut/functools_ut.cpp +++ b/src/library/iterator/ut/functools_ut.cpp @@ -1,10 +1,10 @@ -#include +#include -#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/iterator/ut/iterate_keys_ut.cpp b/src/library/iterator/ut/iterate_keys_ut.cpp similarity index 86% rename from library/cpp/iterator/ut/iterate_keys_ut.cpp rename to src/library/iterator/ut/iterate_keys_ut.cpp index 49eb866b6ec..d75fa307e86 100644 --- a/library/cpp/iterator/ut/iterate_keys_ut.cpp +++ b/src/library/iterator/ut/iterate_keys_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include #include diff --git a/library/cpp/iterator/ut/iterate_values_ut.cpp b/src/library/iterator/ut/iterate_values_ut.cpp similarity index 94% rename from library/cpp/iterator/ut/iterate_values_ut.cpp rename to src/library/iterator/ut/iterate_values_ut.cpp index ed099e560d0..dd170d0897e 100644 --- a/library/cpp/iterator/ut/iterate_values_ut.cpp +++ b/src/library/iterator/ut/iterate_values_ut.cpp @@ -1,8 +1,8 @@ -#include +#include -#include +#include -#include +#include #include #include diff --git a/library/cpp/iterator/ut/mapped_ut.cpp b/src/library/iterator/ut/mapped_ut.cpp similarity index 93% rename from library/cpp/iterator/ut/mapped_ut.cpp rename to src/library/iterator/ut/mapped_ut.cpp index 7cb86787cd2..36d2b8b53b7 100644 --- a/library/cpp/iterator/ut/mapped_ut.cpp +++ b/src/library/iterator/ut/mapped_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include using namespace testing; diff --git a/library/cpp/iterator/ut/ya.make b/src/library/iterator/ut/ya.make similarity index 86% rename from library/cpp/iterator/ut/ya.make rename to src/library/iterator/ut/ya.make index 4a5fb14c586..64de3a55c8f 100644 --- a/library/cpp/iterator/ut/ya.make +++ b/src/library/iterator/ut/ya.make @@ -1,7 +1,7 @@ GTEST() PEERDIR( - library/cpp/iterator + src/library/iterator ) SRCS( diff --git a/library/cpp/iterator/ut/zip_ut.cpp b/src/library/iterator/ut/zip_ut.cpp similarity index 86% rename from library/cpp/iterator/ut/zip_ut.cpp rename to src/library/iterator/ut/zip_ut.cpp index 1783fe552fa..ce2f952929f 100644 --- a/library/cpp/iterator/ut/zip_ut.cpp +++ b/src/library/iterator/ut/zip_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include diff --git a/library/cpp/iterator/zip.cpp b/src/library/iterator/zip.cpp similarity index 100% rename from library/cpp/iterator/zip.cpp rename to src/library/iterator/zip.cpp diff --git a/library/cpp/iterator/zip.h b/src/library/iterator/zip.h similarity index 99% rename from library/cpp/iterator/zip.h rename to src/library/iterator/zip.h index ac12ed35fe8..c40a302d2ea 100644 --- a/library/cpp/iterator/zip.h +++ b/src/library/iterator/zip.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/library/cpp/json/CMakeLists.txt b/src/library/json/CMakeLists.txt similarity index 57% rename from library/cpp/json/CMakeLists.txt rename to src/library/json/CMakeLists.txt index 0dc01b50f93..324ead0ff73 100644 --- a/library/cpp/json/CMakeLists.txt +++ b/src/library/json/CMakeLists.txt @@ -14,10 +14,10 @@ target_link_libraries(library-cpp-json PUBLIC ) target_sources(library-cpp-json PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/json/json_writer.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/json/json_reader.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/json/json_prettifier.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/json/rapidjson_helpers.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/json/json_writer.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/json/json_reader.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/json/json_prettifier.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/json/rapidjson_helpers.cpp ) diff --git a/library/cpp/json/common/CMakeLists.txt b/src/library/json/common/CMakeLists.txt similarity index 69% rename from library/cpp/json/common/CMakeLists.txt rename to src/library/json/common/CMakeLists.txt index cc41e0675b9..5f85160ce3b 100644 --- a/library/cpp/json/common/CMakeLists.txt +++ b/src/library/json/common/CMakeLists.txt @@ -5,7 +5,7 @@ target_link_libraries(cpp-json-common PUBLIC ) target_sources(cpp-json-common PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/json/common/defs.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/json/common/defs.cpp ) diff --git a/library/cpp/json/common/defs.cpp b/src/library/json/common/defs.cpp similarity index 100% rename from library/cpp/json/common/defs.cpp rename to src/library/json/common/defs.cpp diff --git a/library/cpp/json/common/defs.h b/src/library/json/common/defs.h similarity index 96% rename from library/cpp/json/common/defs.h rename to src/library/json/common/defs.h index 249e4f8883d..76dddd957c5 100644 --- a/library/cpp/json/common/defs.h +++ b/src/library/json/common/defs.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace NJson { class TJsonException: public yexception { diff --git a/library/cpp/json/fast_sax/CMakeLists.txt b/src/library/json/fast_sax/CMakeLists.txt similarity index 65% rename from library/cpp/json/fast_sax/CMakeLists.txt rename to src/library/json/fast_sax/CMakeLists.txt index 6e2c00809fd..1d8f0d55d4b 100644 --- a/library/cpp/json/fast_sax/CMakeLists.txt +++ b/src/library/json/fast_sax/CMakeLists.txt @@ -6,19 +6,19 @@ target_link_libraries(cpp-json-fast_sax PUBLIC ) target_sources(cpp-json-fast_sax PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/json/fast_sax/unescape.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/json/fast_sax/unescape.cpp ) if (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") target_ragel_lexers(cpp-json-fast_sax PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/json/fast_sax/parser.rl6 + ${YDB_SDK_SOURCE_DIR}/src/library/json/fast_sax/parser.rl6 -CT0 ) else () target_ragel_lexers(cpp-json-fast_sax PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/json/fast_sax/parser.rl6 + ${YDB_SDK_SOURCE_DIR}/src/library/json/fast_sax/parser.rl6 -CG2 ) endif () diff --git a/library/cpp/json/fast_sax/parser.h b/src/library/json/fast_sax/parser.h similarity index 90% rename from library/cpp/json/fast_sax/parser.h rename to src/library/json/fast_sax/parser.h index 7e2dcf53bbf..7f45fca9f68 100644 --- a/library/cpp/json/fast_sax/parser.h +++ b/src/library/json/fast_sax/parser.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NJson { bool ReadJsonFast(std::string_view in, TJsonCallbacks* callbacks); diff --git a/library/cpp/json/fast_sax/parser.rl6 b/src/library/json/fast_sax/parser.rl6 similarity index 96% rename from library/cpp/json/fast_sax/parser.rl6 rename to src/library/json/fast_sax/parser.rl6 index 4bdc33ad05b..b1e95d502f7 100644 --- a/library/cpp/json/fast_sax/parser.rl6 +++ b/src/library/json/fast_sax/parser.rl6 @@ -1,11 +1,11 @@ -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #include -#include +#include namespace NJson { diff --git a/library/cpp/json/fast_sax/unescape.cpp b/src/library/json/fast_sax/unescape.cpp similarity index 83% rename from library/cpp/json/fast_sax/unescape.cpp rename to src/library/json/fast_sax/unescape.cpp index f6259f26be7..6d2b88ab729 100644 --- a/library/cpp/json/fast_sax/unescape.cpp +++ b/src/library/json/fast_sax/unescape.cpp @@ -1,6 +1,6 @@ #include "unescape.h" -#include +#include std::string_view UnescapeJsonUnicode(std::string_view data, char* scratch) { return std::string_view(scratch, UnescapeC(data.data(), data.size(), scratch)); diff --git a/library/cpp/json/fast_sax/unescape.h b/src/library/json/fast_sax/unescape.h similarity index 100% rename from library/cpp/json/fast_sax/unescape.h rename to src/library/json/fast_sax/unescape.h diff --git a/library/cpp/json/fuzzy_test/main.cpp b/src/library/json/fuzzy_test/main.cpp similarity index 86% rename from library/cpp/json/fuzzy_test/main.cpp rename to src/library/json/fuzzy_test/main.cpp index a5ce20454ba..76e48beac14 100644 --- a/library/cpp/json/fuzzy_test/main.cpp +++ b/src/library/json/fuzzy_test/main.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include extern "C" int LLVMFuzzerTestOneInput(const ui8* data, size_t size) { const auto json = std::string((const char*)data, size); diff --git a/library/cpp/json/fuzzy_test/ya.make b/src/library/json/fuzzy_test/ya.make similarity index 69% rename from library/cpp/json/fuzzy_test/ya.make rename to src/library/json/fuzzy_test/ya.make index 224f3ab6f23..46eb406b343 100644 --- a/library/cpp/json/fuzzy_test/ya.make +++ b/src/library/json/fuzzy_test/ya.make @@ -1,7 +1,7 @@ FUZZ() PEERDIR( - library/cpp/json + src/library/json ) SRCS( diff --git a/library/cpp/json/json_prettifier.cpp b/src/library/json/json_prettifier.cpp similarity index 97% rename from library/cpp/json/json_prettifier.cpp rename to src/library/json/json_prettifier.cpp index 98615e475ad..c40ae7929dd 100644 --- a/library/cpp/json/json_prettifier.cpp +++ b/src/library/json/json_prettifier.cpp @@ -1,11 +1,11 @@ #include "json_prettifier.h" -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include namespace NJson { struct TRewritableOut { diff --git a/library/cpp/json/json_prettifier.h b/src/library/json/json_prettifier.h similarity index 98% rename from library/cpp/json/json_prettifier.h rename to src/library/json/json_prettifier.h index eb10c9481bb..6026cb2d173 100644 --- a/library/cpp/json/json_prettifier.h +++ b/src/library/json/json_prettifier.h @@ -2,7 +2,7 @@ #include "json_reader.h" -#include +#include namespace NJson { struct TJsonPrettifier { diff --git a/library/cpp/json/json_reader.cpp b/src/library/json/json_reader.cpp similarity index 99% rename from library/cpp/json/json_reader.cpp rename to src/library/json/json_reader.cpp index 95441effdfa..998d08aaa4b 100644 --- a/library/cpp/json/json_reader.cpp +++ b/src/library/json/json_reader.cpp @@ -6,10 +6,10 @@ #include #include -#include +#include -#include -#include +#include +#include namespace NJson { namespace { diff --git a/library/cpp/json/json_reader.h b/src/library/json/json_reader.h similarity index 96% rename from library/cpp/json/json_reader.h rename to src/library/json/json_reader.h index 45b303e0fc9..5ff061971f2 100644 --- a/library/cpp/json/json_reader.h +++ b/src/library/json/json_reader.h @@ -2,10 +2,10 @@ #include "json_value.h" -#include -#include +#include +#include -#include +#include namespace NJson { struct TJsonReaderConfig { @@ -124,7 +124,7 @@ namespace NJson { bool CloseComplexValue(); }; - //// relaxed json, used in library/cpp/scheme + //// relaxed json, used in src/library/scheme bool ReadJsonFastTree(std::string_view in, TJsonValue* out, bool throwOnError = false, bool notClosedBracketIsError = false); TJsonValue ReadJsonFastTree(std::string_view in, bool notClosedBracketIsError = false); } diff --git a/src/library/json/json_value.h b/src/library/json/json_value.h new file mode 100644 index 00000000000..fea01f6a0f1 --- /dev/null +++ b/src/library/json/json_value.h @@ -0,0 +1,3 @@ +#pragma once + +#include diff --git a/library/cpp/json/json_writer.cpp b/src/library/json/json_writer.cpp similarity index 98% rename from library/cpp/json/json_writer.cpp rename to src/library/json/json_writer.cpp index fbfb57117b1..2d4c5337343 100644 --- a/library/cpp/json/json_writer.cpp +++ b/src/library/json/json_writer.cpp @@ -1,8 +1,8 @@ #include "json_writer.h" -#include +#include -#include +#include namespace NJson { TJsonWriter::TJsonWriter(IOutputStream* out, bool formatOutput, bool sortkeys, bool validateUtf8) diff --git a/library/cpp/json/json_writer.h b/src/library/json/json_writer.h similarity index 97% rename from library/cpp/json/json_writer.h rename to src/library/json/json_writer.h index 45168797c5c..be663782f45 100644 --- a/library/cpp/json/json_writer.h +++ b/src/library/json/json_writer.h @@ -1,13 +1,13 @@ #pragma once -// Deprecated. Use library/cpp/json/writer in new code. +// Deprecated. Use src/library/json/writer in new code. #include "json_value.h" -#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/json/rapidjson_helpers.cpp b/src/library/json/rapidjson_helpers.cpp similarity index 100% rename from library/cpp/json/rapidjson_helpers.cpp rename to src/library/json/rapidjson_helpers.cpp diff --git a/library/cpp/json/rapidjson_helpers.h b/src/library/json/rapidjson_helpers.h similarity index 96% rename from library/cpp/json/rapidjson_helpers.h rename to src/library/json/rapidjson_helpers.h index d35b38ca2db..b4f907fc081 100644 --- a/library/cpp/json/rapidjson_helpers.h +++ b/src/library/json/rapidjson_helpers.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/library/cpp/json/ut/json_prettifier_ut.cpp b/src/library/json/ut/json_prettifier_ut.cpp similarity index 99% rename from library/cpp/json/ut/json_prettifier_ut.cpp rename to src/library/json/ut/json_prettifier_ut.cpp index ae5f8dd81a4..4fd1132c802 100644 --- a/library/cpp/json/ut/json_prettifier_ut.cpp +++ b/src/library/json/ut/json_prettifier_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include Y_UNIT_TEST_SUITE(JsonPrettifier) { Y_UNIT_TEST(PrettifyJsonShort) { diff --git a/library/cpp/json/ut/json_reader_fast_ut.cpp b/src/library/json/ut/json_reader_fast_ut.cpp similarity index 98% rename from library/cpp/json/ut/json_reader_fast_ut.cpp rename to src/library/json/ut/json_reader_fast_ut.cpp index 7ba5b265bc9..9692f6758b2 100644 --- a/library/cpp/json/ut/json_reader_fast_ut.cpp +++ b/src/library/json/ut/json_reader_fast_ut.cpp @@ -1,9 +1,9 @@ -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/json/ut/json_reader_ut.cpp b/src/library/json/ut/json_reader_ut.cpp similarity index 99% rename from library/cpp/json/ut/json_reader_ut.cpp rename to src/library/json/ut/json_reader_ut.cpp index a51d684ca0a..d7ff70ab58d 100644 --- a/library/cpp/json/ut/json_reader_ut.cpp +++ b/src/library/json/ut/json_reader_ut.cpp @@ -1,8 +1,8 @@ -#include -#include +#include +#include -#include -#include +#include +#include using namespace NJson; diff --git a/library/cpp/json/ut/json_saveload_ut.cpp b/src/library/json/ut/json_saveload_ut.cpp similarity index 81% rename from library/cpp/json/ut/json_saveload_ut.cpp rename to src/library/json/ut/json_saveload_ut.cpp index b480a80fe4c..4f4dd6b4b98 100644 --- a/library/cpp/json/ut/json_saveload_ut.cpp +++ b/src/library/json/ut/json_saveload_ut.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include Y_UNIT_TEST_SUITE(JsonSaveLoad) { Y_UNIT_TEST(Serialize) { diff --git a/library/cpp/json/ut/json_writer_ut.cpp b/src/library/json/ut/json_writer_ut.cpp similarity index 98% rename from library/cpp/json/ut/json_writer_ut.cpp rename to src/library/json/ut/json_writer_ut.cpp index ba085996561..f8952050736 100644 --- a/library/cpp/json/ut/json_writer_ut.cpp +++ b/src/library/json/ut/json_writer_ut.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include -#include +#include using namespace NJson; diff --git a/library/cpp/json/ut/ya.make b/src/library/json/ut/ya.make similarity index 66% rename from library/cpp/json/ut/ya.make rename to src/library/json/ut/ya.make index 1f14dd8f6f0..99a7d809017 100644 --- a/library/cpp/json/ut/ya.make +++ b/src/library/json/ut/ya.make @@ -1,7 +1,7 @@ -UNITTEST_FOR(library/cpp/json) +UNITTEST_FOR(src/library/json) PEERDIR( - library/cpp/string_utils/relaxed_escaper + src/library/string_utils/relaxed_escaper ) SRCS( diff --git a/library/cpp/json/writer/CMakeLists.txt b/src/library/json/writer/CMakeLists.txt similarity index 56% rename from library/cpp/json/writer/CMakeLists.txt rename to src/library/json/writer/CMakeLists.txt index c7c69b8a782..ab15a0e30ea 100644 --- a/library/cpp/json/writer/CMakeLists.txt +++ b/src/library/json/writer/CMakeLists.txt @@ -9,14 +9,14 @@ target_link_libraries(cpp-json-writer PUBLIC ) target_sources(cpp-json-writer PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/json/writer/json_value.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/json/writer/json.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/json/writer/json_value.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/json/writer/json.cpp ) generate_enum_serilization(cpp-json-writer - ${YDB_SDK_SOURCE_DIR}/library/cpp/json/writer/json_value.h + ${YDB_SDK_SOURCE_DIR}/src/library/json/writer/json_value.h INCLUDE_HEADERS - library/cpp/json/writer/json_value.h + src/library/json/writer/json_value.h ) diff --git a/library/cpp/json/writer/README.md b/src/library/json/writer/README.md similarity index 93% rename from library/cpp/json/writer/README.md rename to src/library/json/writer/README.md index 0986cf62c81..a4dc38fc569 100644 --- a/library/cpp/json/writer/README.md +++ b/src/library/json/writer/README.md @@ -3,7 +3,7 @@ where HTML special characters are always escaped. Use it like this: - #include + #include ... NJsonWriter::TBuf json; diff --git a/library/cpp/json/writer/json.cpp b/src/library/json/writer/json.cpp similarity index 98% rename from library/cpp/json/writer/json.cpp rename to src/library/json/writer/json.cpp index bd1ed26233a..d8e90a68c42 100644 --- a/library/cpp/json/writer/json.cpp +++ b/src/library/json/writer/json.cpp @@ -1,11 +1,11 @@ #include "json.h" -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include namespace NJsonWriter { TBuf::TBuf(EHtmlEscapeMode mode, IOutputStream* stream) diff --git a/library/cpp/json/writer/json.h b/src/library/json/writer/json.h similarity index 99% rename from library/cpp/json/writer/json.h rename to src/library/json/writer/json.h index ce6451f2e42..e1b9f975fa6 100644 --- a/library/cpp/json/writer/json.h +++ b/src/library/json/writer/json.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/library/cpp/json/writer/json_ut.cpp b/src/library/json/writer/json_ut.cpp similarity index 98% rename from library/cpp/json/writer/json_ut.cpp rename to src/library/json/writer/json_ut.cpp index f3514a35e7e..b4da1470100 100644 --- a/library/cpp/json/writer/json_ut.cpp +++ b/src/library/json/writer/json_ut.cpp @@ -1,8 +1,8 @@ -#include -#include +#include +#include #include "json.h" -#include +#include #include diff --git a/library/cpp/json/writer/json_value.cpp b/src/library/json/writer/json_value.cpp similarity index 98% rename from library/cpp/json/writer/json_value.cpp rename to src/library/json/writer/json_value.cpp index 89ba1e6bee4..61bf99f1883 100644 --- a/library/cpp/json/writer/json_value.cpp +++ b/src/library/json/writer/json_value.cpp @@ -1,20 +1,20 @@ #include "json_value.h" #include "json.h" -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static bool AreJsonMapsEqual(const NJson::TJsonValue& lhs, const NJson::TJsonValue& rhs) { diff --git a/library/cpp/json/writer/json_value.h b/src/library/json/writer/json_value.h similarity index 96% rename from library/cpp/json/writer/json_value.h rename to src/library/json/writer/json_value.h index 278da1e92f3..a612a0c154c 100644 --- a/library/cpp/json/writer/json_value.h +++ b/src/library/json/writer/json_value.h @@ -1,11 +1,11 @@ #pragma once -#include +#include -#include +#include -#include -#include +#include +#include namespace NJson { enum EJsonValueType { @@ -178,10 +178,10 @@ namespace NJson { void Swap(TJsonValue& rhs) noexcept; - // save using util/ysaveload.h serialization (not to JSON stream) + // save using src/util/ysaveload.h serialization (not to JSON stream) void Save(IOutputStream* s) const; - // load using util/ysaveload.h serialization (not as JSON stream) + // load using src/util/ysaveload.h serialization (not as JSON stream) void Load(IInputStream* s); static const TJsonValue UNDEFINED; diff --git a/library/cpp/json/writer/json_value_ut.cpp b/src/library/json/writer/json_value_ut.cpp similarity index 99% rename from library/cpp/json/writer/json_value_ut.cpp rename to src/library/json/writer/json_value_ut.cpp index 8d1654462cb..b9c8a94ecd5 100644 --- a/library/cpp/json/writer/json_value_ut.cpp +++ b/src/library/json/writer/json_value_ut.cpp @@ -1,8 +1,8 @@ #include "json_value.h" -#include +#include -#include +#include using namespace NJson; diff --git a/library/cpp/json/writer/ut/ya.make b/src/library/json/writer/ut/ya.make similarity index 53% rename from library/cpp/json/writer/ut/ya.make rename to src/library/json/writer/ut/ya.make index 256b950a6e3..becb1b1394e 100644 --- a/library/cpp/json/writer/ut/ya.make +++ b/src/library/json/writer/ut/ya.make @@ -1,10 +1,10 @@ UNITTEST() PEERDIR( - ADDINCL library/cpp/json/writer + ADDINCL src/library/json/writer ) -SRCDIR(library/cpp/json/writer) +SRCDIR(src/library/json/writer) SRCS( json_ut.cpp diff --git a/src/library/jwt/CMakeLists.txt b/src/library/jwt/CMakeLists.txt new file mode 100644 index 00000000000..eef58d2b9aa --- /dev/null +++ b/src/library/jwt/CMakeLists.txt @@ -0,0 +1,12 @@ +add_library(library-jwt) + +target_link_libraries(library-jwt PUBLIC + yutil + jwt-cpp::jwt-cpp + library-cpp-json + impl-ydb_internal-common +) + +target_sources(library-jwt PRIVATE + jwt.cpp +) diff --git a/ydb/public/lib/jwt/jwt.cpp b/src/library/jwt/jwt.cpp similarity index 96% rename from ydb/public/lib/jwt/jwt.cpp rename to src/library/jwt/jwt.cpp index cb3bcdd1f85..d066223e2fb 100644 --- a/ydb/public/lib/jwt/jwt.cpp +++ b/src/library/jwt/jwt.cpp @@ -2,8 +2,8 @@ #include "jwt.h" -#include -#include +#include +#include namespace NYdb { diff --git a/ydb/public/lib/jwt/jwt.h b/src/library/jwt/jwt.h similarity index 90% rename from ydb/public/lib/jwt/jwt.h rename to src/library/jwt/jwt.h index 4d3d90f3153..a2c60ae4d64 100644 --- a/ydb/public/lib/jwt/jwt.h +++ b/src/library/jwt/jwt.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NYdb { diff --git a/library/cpp/lcs/CMakeLists.txt b/src/library/lcs/CMakeLists.txt similarity index 73% rename from library/cpp/lcs/CMakeLists.txt rename to src/library/lcs/CMakeLists.txt index b1d1307ed7a..85c1ffca722 100644 --- a/library/cpp/lcs/CMakeLists.txt +++ b/src/library/lcs/CMakeLists.txt @@ -6,5 +6,5 @@ target_link_libraries(library-cpp-lcs PUBLIC ) target_sources(library-cpp-lcs PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/lcs/lcs_via_lis.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/lcs/lcs_via_lis.cpp ) diff --git a/library/cpp/lcs/README.md b/src/library/lcs/README.md similarity index 100% rename from library/cpp/lcs/README.md rename to src/library/lcs/README.md diff --git a/library/cpp/lcs/lcs_via_lis.cpp b/src/library/lcs/lcs_via_lis.cpp similarity index 100% rename from library/cpp/lcs/lcs_via_lis.cpp rename to src/library/lcs/lcs_via_lis.cpp diff --git a/library/cpp/lcs/lcs_via_lis.h b/src/library/lcs/lcs_via_lis.h similarity index 96% rename from library/cpp/lcs/lcs_via_lis.h rename to src/library/lcs/lcs_via_lis.h index 22752eb5756..e1f8708299c 100644 --- a/library/cpp/lcs/lcs_via_lis.h +++ b/src/library/lcs/lcs_via_lis.h @@ -1,12 +1,12 @@ #pragma once -#include +#include -#include -#include +#include +#include -#include -#include +#include +#include namespace NLCS { template diff --git a/library/cpp/lcs/lcs_via_lis_ut.cpp b/src/library/lcs/lcs_via_lis_ut.cpp similarity index 98% rename from library/cpp/lcs/lcs_via_lis_ut.cpp rename to src/library/lcs/lcs_via_lis_ut.cpp index 7f70cfef0ed..858bdc18334 100644 --- a/library/cpp/lcs/lcs_via_lis_ut.cpp +++ b/src/library/lcs/lcs_via_lis_ut.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include "lcs_via_lis.h" class TLCSTest: public TTestBase { diff --git a/library/cpp/lcs/ut/ya.make b/src/library/lcs/ut/ya.make similarity index 54% rename from library/cpp/lcs/ut/ya.make rename to src/library/lcs/ut/ya.make index e893bc95278..9b50a64f465 100644 --- a/library/cpp/lcs/ut/ya.make +++ b/src/library/lcs/ut/ya.make @@ -1,10 +1,10 @@ UNITTEST() PEERDIR( - ADDINCL library/cpp/lcs + ADDINCL src/library/lcs ) -SRCDIR(library/cpp/lcs) +SRCDIR(src/library/lcs) SRCS( lcs_via_lis_ut.cpp diff --git a/src/library/logger/CMakeLists.txt b/src/library/logger/CMakeLists.txt new file mode 100644 index 00000000000..e62637bcc45 --- /dev/null +++ b/src/library/logger/CMakeLists.txt @@ -0,0 +1,57 @@ +add_library(library-cpp-logger) +target_link_libraries(library-cpp-logger PUBLIC + yutil + tools-enum_parser-enum_serialization_runtime + library-cpp-json + cpp-deprecated-atomic +) +target_sources(library-cpp-logger PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/logger/backend.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/backend_creator.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/composite.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/element.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/file.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/filter.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/filter_creator.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/log.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/null.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/rotating_file.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/stream.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/sync_page_cache_file.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/system.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/thread.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/thread_creator.cpp +) +generate_enum_serilization(library-cpp-logger + ${YDB_SDK_SOURCE_DIR}/src/library/logger/priority.h + INCLUDE_HEADERS + src/library/logger/priority.h +) + +add_global_library_for(library-cpp-logger.global library-cpp-logger) +target_link_libraries(library-cpp-logger.global PUBLIC + yutil + tools-enum_parser-enum_serialization_runtime + library-cpp-json + cpp-deprecated-atomic +) +target_sources(library-cpp-logger.global PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/logger/composite_creator.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/file_creator.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/null_creator.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/rotating_file_creator.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/stream_creator.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/sync_page_cache_file_creator.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/system_creator.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/logger/uninitialized_creator.cpp +) + + +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + target_link_libraries(library-cpp-logger PUBLIC + + ) + target_link_libraries(library-cpp-logger.global PUBLIC + + ) +endif() diff --git a/library/cpp/logger/all.h b/src/library/logger/all.h similarity index 100% rename from library/cpp/logger/all.h rename to src/library/logger/all.h diff --git a/library/cpp/logger/backend.cpp b/src/library/logger/backend.cpp similarity index 95% rename from library/cpp/logger/backend.cpp rename to src/library/logger/backend.cpp index 4e3a69826b3..9f4b3352f01 100644 --- a/library/cpp/logger/backend.cpp +++ b/src/library/logger/backend.cpp @@ -1,7 +1,7 @@ #include "backend.h" -#include -#include +#include +#include #include diff --git a/library/cpp/logger/backend.h b/src/library/logger/backend.h similarity index 94% rename from library/cpp/logger/backend.h rename to src/library/logger/backend.h index 4b85accb39f..31155c7ff0e 100644 --- a/library/cpp/logger/backend.h +++ b/src/library/logger/backend.h @@ -2,7 +2,7 @@ #include "priority.h" -#include +#include #include #include diff --git a/library/cpp/logger/backend_creator.cpp b/src/library/logger/backend_creator.cpp similarity index 91% rename from library/cpp/logger/backend_creator.cpp rename to src/library/logger/backend_creator.cpp index 688e579db28..4764b1951ca 100644 --- a/library/cpp/logger/backend_creator.cpp +++ b/src/library/logger/backend_creator.cpp @@ -1,9 +1,9 @@ #include "backend_creator.h" #include "stream.h" #include "uninitialized_creator.h" -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/logger/backend_creator.h b/src/library/logger/backend_creator.h similarity index 90% rename from library/cpp/logger/backend_creator.h rename to src/library/logger/backend_creator.h index 909f3491304..3a635be1c52 100644 --- a/library/cpp/logger/backend_creator.h +++ b/src/library/logger/backend_creator.h @@ -1,11 +1,11 @@ #pragma once #include "backend.h" -#include -#include +#include +#include -#include -#include +#include +#include class ILogBackendCreator { public: diff --git a/library/cpp/logger/composite.cpp b/src/library/logger/composite.cpp similarity index 100% rename from library/cpp/logger/composite.cpp rename to src/library/logger/composite.cpp diff --git a/library/cpp/logger/composite.h b/src/library/logger/composite.h similarity index 92% rename from library/cpp/logger/composite.h rename to src/library/logger/composite.h index 4fd534ca0c5..5b8db273c1f 100644 --- a/library/cpp/logger/composite.h +++ b/src/library/logger/composite.h @@ -1,7 +1,7 @@ #pragma once #include "backend.h" -#include +#include class TCompositeLogBackend: public TLogBackend { diff --git a/library/cpp/logger/composite_creator.cpp b/src/library/logger/composite_creator.cpp similarity index 100% rename from library/cpp/logger/composite_creator.cpp rename to src/library/logger/composite_creator.cpp diff --git a/library/cpp/logger/composite_creator.h b/src/library/logger/composite_creator.h similarity index 100% rename from library/cpp/logger/composite_creator.h rename to src/library/logger/composite_creator.h diff --git a/library/cpp/logger/composite_ut.cpp b/src/library/logger/composite_ut.cpp similarity index 91% rename from library/cpp/logger/composite_ut.cpp rename to src/library/logger/composite_ut.cpp index 00d0fa99a2d..2c6536686b8 100644 --- a/library/cpp/logger/composite_ut.cpp +++ b/src/library/logger/composite_ut.cpp @@ -1,10 +1,10 @@ #include "log.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include Y_UNIT_TEST_SUITE(TCompositeLogTest) { diff --git a/library/cpp/logger/element.cpp b/src/library/logger/element.cpp similarity index 100% rename from library/cpp/logger/element.cpp rename to src/library/logger/element.cpp diff --git a/library/cpp/logger/element.h b/src/library/logger/element.h similarity index 94% rename from library/cpp/logger/element.h rename to src/library/logger/element.h index ea6c607b06f..adc5456c148 100644 --- a/library/cpp/logger/element.h +++ b/src/library/logger/element.h @@ -4,8 +4,8 @@ #include "record.h" -#include -#include +#include +#include class TLog; diff --git a/library/cpp/logger/element_ut.cpp b/src/library/logger/element_ut.cpp similarity index 91% rename from library/cpp/logger/element_ut.cpp rename to src/library/logger/element_ut.cpp index 72ef32ff771..ec2d457faa7 100644 --- a/library/cpp/logger/element_ut.cpp +++ b/src/library/logger/element_ut.cpp @@ -3,11 +3,11 @@ #include "stream.h" #include -#include -#include +#include +#include #include -#include +#include class TLogElementTest: public TTestBase { diff --git a/library/cpp/logger/file.cpp b/src/library/logger/file.cpp similarity index 93% rename from library/cpp/logger/file.cpp rename to src/library/logger/file.cpp index ec10bb1e587..6f5e1407013 100644 --- a/library/cpp/logger/file.cpp +++ b/src/library/logger/file.cpp @@ -1,8 +1,8 @@ #include "file.h" #include "record.h" -#include -#include +#include +#include /* * file log diff --git a/library/cpp/logger/file.h b/src/library/logger/file.h similarity index 82% rename from library/cpp/logger/file.h rename to src/library/logger/file.h index 5bf5634bf3d..94be5312136 100644 --- a/library/cpp/logger/file.h +++ b/src/library/logger/file.h @@ -2,8 +2,8 @@ #include "backend.h" -#include -#include +#include +#include class TFileLogBackend: public TLogBackend { public: diff --git a/library/cpp/logger/file_creator.cpp b/src/library/logger/file_creator.cpp similarity index 100% rename from library/cpp/logger/file_creator.cpp rename to src/library/logger/file_creator.cpp diff --git a/library/cpp/logger/file_creator.h b/src/library/logger/file_creator.h similarity index 100% rename from library/cpp/logger/file_creator.h rename to src/library/logger/file_creator.h diff --git a/library/cpp/logger/filter.cpp b/src/library/logger/filter.cpp similarity index 100% rename from library/cpp/logger/filter.cpp rename to src/library/logger/filter.cpp diff --git a/library/cpp/logger/filter.h b/src/library/logger/filter.h similarity index 95% rename from library/cpp/logger/filter.h rename to src/library/logger/filter.h index 9ef83fb58c8..dfa603cbaef 100644 --- a/library/cpp/logger/filter.h +++ b/src/library/logger/filter.h @@ -3,7 +3,7 @@ #include "priority.h" #include "record.h" #include "backend.h" -#include +#include class TFilteredLogBackend: public TLogBackend { THolder Backend; diff --git a/library/cpp/logger/filter_creator.cpp b/src/library/logger/filter_creator.cpp similarity index 100% rename from library/cpp/logger/filter_creator.cpp rename to src/library/logger/filter_creator.cpp diff --git a/library/cpp/logger/filter_creator.h b/src/library/logger/filter_creator.h similarity index 100% rename from library/cpp/logger/filter_creator.h rename to src/library/logger/filter_creator.h diff --git a/library/cpp/logger/init_context/README.md b/src/library/logger/init_context/README.md similarity index 81% rename from library/cpp/logger/init_context/README.md rename to src/library/logger/init_context/README.md index 93564e48906..ad35c6534f6 100644 --- a/library/cpp/logger/init_context/README.md +++ b/src/library/logger/init_context/README.md @@ -1,5 +1,5 @@ Эта библиотека содержит две раплизации InitContext для TLogBackendCreator. -TLogBackendCreatorInitContextYConf работает с YandexConfig (library/cpp/yconf). +TLogBackendCreatorInitContextYConf работает с YandexConfig (src/library/yconf). -TLogBackendCreatorInitContextConfig работает с NConfig::TConfig (library/cpp/config). +TLogBackendCreatorInitContextConfig работает с NConfig::TConfig (src/library/config). diff --git a/library/cpp/logger/init_context/config.cpp b/src/library/logger/init_context/config.cpp similarity index 100% rename from library/cpp/logger/init_context/config.cpp rename to src/library/logger/init_context/config.cpp diff --git a/library/cpp/logger/init_context/config.h b/src/library/logger/init_context/config.h similarity index 82% rename from library/cpp/logger/init_context/config.h rename to src/library/logger/init_context/config.h index 753160c9fc1..0483dc93ac7 100644 --- a/library/cpp/logger/init_context/config.h +++ b/src/library/logger/init_context/config.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include class TLogBackendCreatorInitContextConfig : public ILogBackendCreator::IInitContext { public: diff --git a/library/cpp/logger/init_context/yconf.cpp b/src/library/logger/init_context/yconf.cpp similarity index 100% rename from library/cpp/logger/init_context/yconf.cpp rename to src/library/logger/init_context/yconf.cpp diff --git a/library/cpp/logger/init_context/yconf.h b/src/library/logger/init_context/yconf.h similarity index 83% rename from library/cpp/logger/init_context/yconf.h rename to src/library/logger/init_context/yconf.h index ccff3505cdd..562ae502c76 100644 --- a/library/cpp/logger/init_context/yconf.h +++ b/src/library/logger/init_context/yconf.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include class TLogBackendCreatorInitContextYConf: public ILogBackendCreator::IInitContext { public: diff --git a/library/cpp/logger/log.cpp b/src/library/logger/log.cpp similarity index 98% rename from library/cpp/logger/log.cpp rename to src/library/logger/log.cpp index c0dd1177eb5..58461245bab 100644 --- a/library/cpp/logger/log.cpp +++ b/src/library/logger/log.cpp @@ -5,8 +5,8 @@ #include "stream.h" #include "thread.h" -#include -#include +#include +#include #include diff --git a/library/cpp/logger/log.h b/src/library/logger/log.h similarity index 98% rename from library/cpp/logger/log.h rename to src/library/logger/log.h index adf66268f0c..17f2faca72f 100644 --- a/library/cpp/logger/log.h +++ b/src/library/logger/log.h @@ -6,8 +6,8 @@ #include "record.h" #include "thread.h" -#include -#include +#include +#include #include #include diff --git a/library/cpp/logger/log_ut.cpp b/src/library/logger/log_ut.cpp similarity index 95% rename from library/cpp/logger/log_ut.cpp rename to src/library/logger/log_ut.cpp index d928bf5b41c..55c6f8f05ed 100644 --- a/library/cpp/logger/log_ut.cpp +++ b/src/library/logger/log_ut.cpp @@ -1,12 +1,12 @@ #include "all.h" -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/library/cpp/logger/null.cpp b/src/library/logger/null.cpp similarity index 100% rename from library/cpp/logger/null.cpp rename to src/library/logger/null.cpp diff --git a/library/cpp/logger/null.h b/src/library/logger/null.h similarity index 100% rename from library/cpp/logger/null.h rename to src/library/logger/null.h diff --git a/library/cpp/logger/null_creator.cpp b/src/library/logger/null_creator.cpp similarity index 100% rename from library/cpp/logger/null_creator.cpp rename to src/library/logger/null_creator.cpp diff --git a/library/cpp/logger/null_creator.h b/src/library/logger/null_creator.h similarity index 100% rename from library/cpp/logger/null_creator.h rename to src/library/logger/null_creator.h diff --git a/library/cpp/logger/priority.h b/src/library/logger/priority.h similarity index 100% rename from library/cpp/logger/priority.h rename to src/library/logger/priority.h diff --git a/library/cpp/logger/record.h b/src/library/logger/record.h similarity index 93% rename from library/cpp/logger/record.h rename to src/library/logger/record.h index c8ef6ca058f..54897d932d0 100644 --- a/library/cpp/logger/record.h +++ b/src/library/logger/record.h @@ -3,7 +3,7 @@ #include "priority.h" #include -#include +#include #include #include diff --git a/library/cpp/logger/reopen.h b/src/library/logger/reopen.h similarity index 89% rename from library/cpp/logger/reopen.h rename to src/library/logger/reopen.h index 47f44be11b6..43837195611 100644 --- a/library/cpp/logger/reopen.h +++ b/src/library/logger/reopen.h @@ -3,9 +3,9 @@ #include "log.h" #include "backend.h" -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/logger/reopen_ut.cpp b/src/library/logger/reopen_ut.cpp similarity index 97% rename from library/cpp/logger/reopen_ut.cpp rename to src/library/logger/reopen_ut.cpp index 344b169c2a8..4466da3314b 100644 --- a/library/cpp/logger/reopen_ut.cpp +++ b/src/library/logger/reopen_ut.cpp @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/library/cpp/logger/rotating_file.cpp b/src/library/logger/rotating_file.cpp similarity index 91% rename from library/cpp/logger/rotating_file.cpp rename to src/library/logger/rotating_file.cpp index 2c80cf30cc3..94aaefe381b 100644 --- a/library/cpp/logger/rotating_file.cpp +++ b/src/library/logger/rotating_file.cpp @@ -2,13 +2,13 @@ #include "file.h" #include "record.h" -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* * rotating file log diff --git a/library/cpp/logger/rotating_file.h b/src/library/logger/rotating_file.h similarity index 88% rename from library/cpp/logger/rotating_file.h rename to src/library/logger/rotating_file.h index a5763276881..511784f547b 100644 --- a/library/cpp/logger/rotating_file.h +++ b/src/library/logger/rotating_file.h @@ -2,8 +2,8 @@ #include "backend.h" -#include -#include +#include +#include class TRotatingFileLogBackend: public TLogBackend { public: diff --git a/library/cpp/logger/rotating_file_creator.cpp b/src/library/logger/rotating_file_creator.cpp similarity index 100% rename from library/cpp/logger/rotating_file_creator.cpp rename to src/library/logger/rotating_file_creator.cpp diff --git a/library/cpp/logger/rotating_file_creator.h b/src/library/logger/rotating_file_creator.h similarity index 100% rename from library/cpp/logger/rotating_file_creator.h rename to src/library/logger/rotating_file_creator.h diff --git a/library/cpp/logger/rotating_file_ut.cpp b/src/library/logger/rotating_file_ut.cpp similarity index 94% rename from library/cpp/logger/rotating_file_ut.cpp rename to src/library/logger/rotating_file_ut.cpp index d5b2017e550..eacb2d978f2 100644 --- a/library/cpp/logger/rotating_file_ut.cpp +++ b/src/library/logger/rotating_file_ut.cpp @@ -2,11 +2,11 @@ #include "record.h" #include -#include -#include +#include +#include -#include -#include +#include +#include Y_UNIT_TEST_SUITE(NewRotatingFileSuite) { const std::string PATH = GetWorkPath() + "/my.log"; diff --git a/library/cpp/logger/stream.cpp b/src/library/logger/stream.cpp similarity index 92% rename from library/cpp/logger/stream.cpp rename to src/library/logger/stream.cpp index 2f7c0bfb03c..24257ffb48e 100644 --- a/library/cpp/logger/stream.cpp +++ b/src/library/logger/stream.cpp @@ -1,9 +1,9 @@ #include "stream.h" #include "record.h" -#include +#include -#include +#include #include diff --git a/library/cpp/logger/stream.h b/src/library/logger/stream.h similarity index 100% rename from library/cpp/logger/stream.h rename to src/library/logger/stream.h diff --git a/library/cpp/logger/stream_creator.cpp b/src/library/logger/stream_creator.cpp similarity index 100% rename from library/cpp/logger/stream_creator.cpp rename to src/library/logger/stream_creator.cpp diff --git a/library/cpp/logger/stream_creator.h b/src/library/logger/stream_creator.h similarity index 100% rename from library/cpp/logger/stream_creator.h rename to src/library/logger/stream_creator.h diff --git a/library/cpp/logger/sync_page_cache_file.cpp b/src/library/logger/sync_page_cache_file.cpp similarity index 95% rename from library/cpp/logger/sync_page_cache_file.cpp rename to src/library/logger/sync_page_cache_file.cpp index 4f87896afb2..a19b1dd2061 100644 --- a/library/cpp/logger/sync_page_cache_file.cpp +++ b/src/library/logger/sync_page_cache_file.cpp @@ -1,11 +1,11 @@ #include "sync_page_cache_file.h" #include "record.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/library/cpp/logger/sync_page_cache_file.h b/src/library/logger/sync_page_cache_file.h similarity index 85% rename from library/cpp/logger/sync_page_cache_file.h rename to src/library/logger/sync_page_cache_file.h index 3ded5b2b25b..bbccb387e56 100644 --- a/library/cpp/logger/sync_page_cache_file.h +++ b/src/library/logger/sync_page_cache_file.h @@ -2,8 +2,8 @@ #include "backend.h" -#include -#include +#include +#include class TSyncPageCacheFileLogBackend final: public TLogBackend { public: diff --git a/library/cpp/logger/sync_page_cache_file_creator.cpp b/src/library/logger/sync_page_cache_file_creator.cpp similarity index 100% rename from library/cpp/logger/sync_page_cache_file_creator.cpp rename to src/library/logger/sync_page_cache_file_creator.cpp diff --git a/library/cpp/logger/sync_page_cache_file_creator.h b/src/library/logger/sync_page_cache_file_creator.h similarity index 100% rename from library/cpp/logger/sync_page_cache_file_creator.h rename to src/library/logger/sync_page_cache_file_creator.h diff --git a/library/cpp/logger/system.cpp b/src/library/logger/system.cpp similarity index 87% rename from library/cpp/logger/system.cpp rename to src/library/logger/system.cpp index 5a12d79441b..9fdd8118fb7 100644 --- a/library/cpp/logger/system.cpp +++ b/src/library/logger/system.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #if defined(_unix_) #include diff --git a/library/cpp/logger/system.h b/src/library/logger/system.h similarity index 100% rename from library/cpp/logger/system.h rename to src/library/logger/system.h diff --git a/library/cpp/logger/system_creator.cpp b/src/library/logger/system_creator.cpp similarity index 100% rename from library/cpp/logger/system_creator.cpp rename to src/library/logger/system_creator.cpp diff --git a/library/cpp/logger/system_creator.h b/src/library/logger/system_creator.h similarity index 100% rename from library/cpp/logger/system_creator.h rename to src/library/logger/system_creator.h diff --git a/library/cpp/logger/thread.cpp b/src/library/logger/thread.cpp similarity index 95% rename from library/cpp/logger/thread.cpp rename to src/library/logger/thread.cpp index 0ccf9e374be..bd11a75eeae 100644 --- a/library/cpp/logger/thread.cpp +++ b/src/library/logger/thread.cpp @@ -1,11 +1,11 @@ #include "thread.h" #include "record.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class TThreadedLogBackend::TImpl { class TRec: public IObjectInQueue, public TAdditionalStorage, public TLogRecord { diff --git a/library/cpp/logger/thread.h b/src/library/logger/thread.h similarity index 96% rename from library/cpp/logger/thread.h rename to src/library/logger/thread.h index 65f7a88e87c..b02722a5004 100644 --- a/library/cpp/logger/thread.h +++ b/src/library/logger/thread.h @@ -2,7 +2,7 @@ #include "backend.h" -#include +#include #include diff --git a/library/cpp/logger/thread_creator.cpp b/src/library/logger/thread_creator.cpp similarity index 100% rename from library/cpp/logger/thread_creator.cpp rename to src/library/logger/thread_creator.cpp diff --git a/library/cpp/logger/thread_creator.h b/src/library/logger/thread_creator.h similarity index 100% rename from library/cpp/logger/thread_creator.h rename to src/library/logger/thread_creator.h diff --git a/library/cpp/logger/uninitialized_creator.cpp b/src/library/logger/uninitialized_creator.cpp similarity index 97% rename from library/cpp/logger/uninitialized_creator.cpp rename to src/library/logger/uninitialized_creator.cpp index 86d2eaf8602..abbd7c52a2d 100644 --- a/library/cpp/logger/uninitialized_creator.cpp +++ b/src/library/logger/uninitialized_creator.cpp @@ -3,7 +3,7 @@ #include "thread_creator.h" #include "file_creator.h" #include "null_creator.h" -#include +#include THolder TLogBackendCreatorUninitialized::DoCreateLogBackend() const { return Slave->CreateLogBackend(); diff --git a/library/cpp/logger/uninitialized_creator.h b/src/library/logger/uninitialized_creator.h similarity index 100% rename from library/cpp/logger/uninitialized_creator.h rename to src/library/logger/uninitialized_creator.h diff --git a/library/cpp/logger/ut/ya.make b/src/library/logger/ut/ya.make similarity index 52% rename from library/cpp/logger/ut/ya.make rename to src/library/logger/ut/ya.make index c6fe244bd73..3b551ccc33a 100644 --- a/library/cpp/logger/ut/ya.make +++ b/src/library/logger/ut/ya.make @@ -1,12 +1,12 @@ UNITTEST() PEERDIR( - ADDINCL library/cpp/logger - library/cpp/logger/init_context - library/cpp/yconf/patcher + ADDINCL src/library/logger + src/library/logger/init_context + src/library/yconf/patcher ) -SRCDIR(library/cpp/logger) +SRCDIR(src/library/logger) SRCS( log_ut.cpp diff --git a/src/library/login/CMakeLists.txt b/src/library/login/CMakeLists.txt new file mode 100644 index 00000000000..b9413c189d2 --- /dev/null +++ b/src/library/login/CMakeLists.txt @@ -0,0 +1,18 @@ +add_subdirectory(protos) + +add_library(library-login) + +target_link_libraries(library-login PUBLIC + yutil + jwt-cpp::jwt-cpp + protobuf::libprotobuf + cpp-digest-argonish + library-cpp-json + cpp-string_utils-base64 + library-login-protos +) + +target_sources(library-login PRIVATE + login.cpp +) + diff --git a/ydb/library/login/login.cpp b/src/library/login/login.cpp similarity index 98% rename from ydb/library/login/login.cpp rename to src/library/login/login.cpp index 50e6e3ba19f..aba398daa26 100644 --- a/ydb/library/login/login.cpp +++ b/src/library/login/login.cpp @@ -1,18 +1,18 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/ydb/library/login/login.h b/src/library/login/login.h similarity index 99% rename from ydb/library/login/login.h rename to src/library/login/login.h index 03f777ed85d..5e3de01f1f2 100644 --- a/ydb/library/login/login.h +++ b/src/library/login/login.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace NLogin { diff --git a/ydb/library/login/protos/CMakeLists.txt b/src/library/login/protos/CMakeLists.txt similarity index 76% rename from ydb/library/login/protos/CMakeLists.txt rename to src/library/login/protos/CMakeLists.txt index 418ceab77d4..e31bb03312f 100644 --- a/ydb/library/login/protos/CMakeLists.txt +++ b/src/library/login/protos/CMakeLists.txt @@ -6,13 +6,11 @@ target_link_libraries(library-login-protos PUBLIC ) target_proto_messages(library-login-protos PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/library/login/protos/login.proto + ${YDB_SDK_SOURCE_DIR}/src/library/login/protos/login.proto ) target_proto_addincls(library-login-protos ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} ${YDB_SDK_SOURCE_DIR} ${YDB_SDK_BINARY_DIR} ) diff --git a/ydb/library/login/protos/login.proto b/src/library/login/protos/login.proto similarity index 100% rename from ydb/library/login/protos/login.proto rename to src/library/login/protos/login.proto diff --git a/library/cpp/mime/CMakeLists.txt b/src/library/mime/CMakeLists.txt similarity index 100% rename from library/cpp/mime/CMakeLists.txt rename to src/library/mime/CMakeLists.txt diff --git a/library/cpp/mime/types/CMakeLists.txt b/src/library/mime/types/CMakeLists.txt similarity index 62% rename from library/cpp/mime/types/CMakeLists.txt rename to src/library/mime/types/CMakeLists.txt index d47ac4a7b8d..fb2bd94b5e0 100644 --- a/library/cpp/mime/types/CMakeLists.txt +++ b/src/library/mime/types/CMakeLists.txt @@ -6,11 +6,11 @@ target_link_libraries(cpp-mime-types PUBLIC ) target_sources(cpp-mime-types PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/mime/types/mime.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/mime/types/mime.cpp ) generate_enum_serilization(cpp-mime-types - ${YDB_SDK_SOURCE_DIR}/library/cpp/mime/types/mime.h + ${YDB_SDK_SOURCE_DIR}/src/library/mime/types/mime.h INCLUDE_HEADERS - library/cpp/mime/types/mime.h + src/library/mime/types/mime.h ) diff --git a/library/cpp/mime/types/mime.cpp b/src/library/mime/types/mime.cpp similarity index 99% rename from library/cpp/mime/types/mime.cpp rename to src/library/mime/types/mime.cpp index e82ebb0cd20..f5b4adfe3d0 100644 --- a/library/cpp/mime/types/mime.cpp +++ b/src/library/mime/types/mime.cpp @@ -1,7 +1,7 @@ #include "mime.h" -#include -#include +#include +#include #include diff --git a/library/cpp/mime/types/mime.h b/src/library/mime/types/mime.h similarity index 97% rename from library/cpp/mime/types/mime.h rename to src/library/mime/types/mime.h index ec7ec33f8a4..b97bd412497 100644 --- a/library/cpp/mime/types/mime.h +++ b/src/library/mime/types/mime.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/library/cpp/monlib/CMakeLists.txt b/src/library/monlib/CMakeLists.txt similarity index 100% rename from library/cpp/monlib/CMakeLists.txt rename to src/library/monlib/CMakeLists.txt diff --git a/library/cpp/monlib/counters/counters.h b/src/library/monlib/counters/counters.h similarity index 94% rename from library/cpp/monlib/counters/counters.h rename to src/library/monlib/counters/counters.h index b0c74f81d26..a12549eed44 100644 --- a/library/cpp/monlib/counters/counters.h +++ b/src/library/monlib/counters/counters.h @@ -1,20 +1,20 @@ #pragma once #include -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -35,7 +35,7 @@ namespace NMonitoring { char* PrettyNum(i64 val, char* buf, size_t size); // This class is deprecated. Please consider to use - // library/cpp/monlib/metrics instead. See more info at + // src/library/monlib/metrics instead. See more info at // https://wiki.yandex-team.ru/solomon/libs/monlib_cpp/ class TDeprecatedCounter { public: @@ -140,7 +140,7 @@ namespace NMonitoring { }; // This class is deprecated. Please consider to use - // library/cpp/monlib/metrics instead. See more info at + // src/library/monlib/metrics instead. See more info at // https://wiki.yandex-team.ru/solomon/libs/monlib_cpp/ // // Groups of G counters, defined by T type. diff --git a/library/cpp/monlib/dynamic_counters/CMakeLists.txt b/src/library/monlib/dynamic_counters/CMakeLists.txt similarity index 61% rename from library/cpp/monlib/dynamic_counters/CMakeLists.txt rename to src/library/monlib/dynamic_counters/CMakeLists.txt index c56668944ac..95cb5d74e98 100644 --- a/library/cpp/monlib/dynamic_counters/CMakeLists.txt +++ b/src/library/monlib/dynamic_counters/CMakeLists.txt @@ -14,10 +14,10 @@ target_link_libraries(cpp-monlib-dynamic_counters PUBLIC ) target_sources(cpp-monlib-dynamic_counters PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/dynamic_counters/counters.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/dynamic_counters/encode.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/dynamic_counters/golovan_page.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/dynamic_counters/page.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/dynamic_counters/counters.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/dynamic_counters/encode.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/dynamic_counters/golovan_page.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/dynamic_counters/page.cpp ) diff --git a/library/cpp/monlib/dynamic_counters/contention_ut.cpp b/src/library/monlib/dynamic_counters/contention_ut.cpp similarity index 94% rename from library/cpp/monlib/dynamic_counters/contention_ut.cpp rename to src/library/monlib/dynamic_counters/contention_ut.cpp index cf215bc11f8..75bd8edb34d 100644 --- a/library/cpp/monlib/dynamic_counters/contention_ut.cpp +++ b/src/library/monlib/dynamic_counters/contention_ut.cpp @@ -1,7 +1,7 @@ #include "counters.h" -#include -#include -#include +#include +#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/dynamic_counters/counters.cpp b/src/library/monlib/dynamic_counters/counters.cpp similarity index 98% rename from library/cpp/monlib/dynamic_counters/counters.cpp rename to src/library/monlib/dynamic_counters/counters.cpp index 72e3544e062..01dc2a1c6b4 100644 --- a/library/cpp/monlib/dynamic_counters/counters.cpp +++ b/src/library/monlib/dynamic_counters/counters.cpp @@ -1,9 +1,9 @@ #include "counters.h" -#include -#include +#include +#include -#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/dynamic_counters/counters.h b/src/library/monlib/dynamic_counters/counters.h similarity index 97% rename from library/cpp/monlib/dynamic_counters/counters.h rename to src/library/monlib/dynamic_counters/counters.h index 2d58d74b9ab..900396606a3 100644 --- a/library/cpp/monlib/dynamic_counters/counters.h +++ b/src/library/monlib/dynamic_counters/counters.h @@ -1,15 +1,15 @@ #pragma once -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/library/cpp/monlib/dynamic_counters/counters_ut.cpp b/src/library/monlib/dynamic_counters/counters_ut.cpp similarity index 99% rename from library/cpp/monlib/dynamic_counters/counters_ut.cpp rename to src/library/monlib/dynamic_counters/counters_ut.cpp index 2a4c64fbddd..085b4087027 100644 --- a/library/cpp/monlib/dynamic_counters/counters_ut.cpp +++ b/src/library/monlib/dynamic_counters/counters_ut.cpp @@ -1,6 +1,6 @@ #include "counters.h" -#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/dynamic_counters/encode.cpp b/src/library/monlib/dynamic_counters/encode.cpp similarity index 95% rename from library/cpp/monlib/dynamic_counters/encode.cpp rename to src/library/monlib/dynamic_counters/encode.cpp index 4b46f845c31..392f2051ccd 100644 --- a/library/cpp/monlib/dynamic_counters/encode.cpp +++ b/src/library/monlib/dynamic_counters/encode.cpp @@ -1,11 +1,11 @@ #include "encode.h" -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include namespace NMonitoring { namespace { diff --git a/library/cpp/monlib/dynamic_counters/encode.h b/src/library/monlib/dynamic_counters/encode.h similarity index 87% rename from library/cpp/monlib/dynamic_counters/encode.h rename to src/library/monlib/dynamic_counters/encode.h index e02b3de825e..77f000dd188 100644 --- a/library/cpp/monlib/dynamic_counters/encode.h +++ b/src/library/monlib/dynamic_counters/encode.h @@ -2,8 +2,8 @@ #include "counters.h" -#include -#include +#include +#include namespace NMonitoring { diff --git a/library/cpp/monlib/dynamic_counters/encode_ut.cpp b/src/library/monlib/dynamic_counters/encode_ut.cpp similarity index 95% rename from library/cpp/monlib/dynamic_counters/encode_ut.cpp rename to src/library/monlib/dynamic_counters/encode_ut.cpp index 35aebc1f1b6..5c996b13406 100644 --- a/library/cpp/monlib/dynamic_counters/encode_ut.cpp +++ b/src/library/monlib/dynamic_counters/encode_ut.cpp @@ -1,14 +1,14 @@ #include "encode.h" -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include -#include -#include +#include +#include namespace NMonitoring { struct TTestData: public TDynamicCounters { diff --git a/library/cpp/monlib/dynamic_counters/golovan_page.cpp b/src/library/monlib/dynamic_counters/golovan_page.cpp similarity index 93% rename from library/cpp/monlib/dynamic_counters/golovan_page.cpp rename to src/library/monlib/dynamic_counters/golovan_page.cpp index f46abe0c3a2..89d81622cc1 100644 --- a/library/cpp/monlib/dynamic_counters/golovan_page.cpp +++ b/src/library/monlib/dynamic_counters/golovan_page.cpp @@ -1,9 +1,9 @@ #include "golovan_page.h" -#include +#include -#include -#include +#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/dynamic_counters/golovan_page.h b/src/library/monlib/dynamic_counters/golovan_page.h similarity index 86% rename from library/cpp/monlib/dynamic_counters/golovan_page.h rename to src/library/monlib/dynamic_counters/golovan_page.h index 75042e729b5..24768eb5606 100644 --- a/library/cpp/monlib/dynamic_counters/golovan_page.h +++ b/src/library/monlib/dynamic_counters/golovan_page.h @@ -2,9 +2,9 @@ #include "counters.h" -#include +#include -#include +#include #include diff --git a/library/cpp/monlib/dynamic_counters/page.cpp b/src/library/monlib/dynamic_counters/page.cpp similarity index 96% rename from library/cpp/monlib/dynamic_counters/page.cpp rename to src/library/monlib/dynamic_counters/page.cpp index 1d1e7aeec48..98d61275212 100644 --- a/library/cpp/monlib/dynamic_counters/page.cpp +++ b/src/library/monlib/dynamic_counters/page.cpp @@ -1,11 +1,11 @@ #include "page.h" #include "encode.h" -#include -#include +#include +#include -#include -#include +#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/dynamic_counters/page.h b/src/library/monlib/dynamic_counters/page.h similarity index 94% rename from library/cpp/monlib/dynamic_counters/page.h rename to src/library/monlib/dynamic_counters/page.h index ebc12cf341b..5748170402d 100644 --- a/library/cpp/monlib/dynamic_counters/page.h +++ b/src/library/monlib/dynamic_counters/page.h @@ -2,9 +2,9 @@ #include "counters.h" -#include +#include -#include +#include #include diff --git a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.txt b/src/library/monlib/dynamic_counters/percentile/CMakeLists.txt similarity index 82% rename from library/cpp/monlib/dynamic_counters/percentile/CMakeLists.txt rename to src/library/monlib/dynamic_counters/percentile/CMakeLists.txt index 2c1fcbf9cd0..a3d1de9373d 100644 --- a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.txt +++ b/src/library/monlib/dynamic_counters/percentile/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(monlib-dynamic_counters-percentile INTERFACE cpp-monlib-dynamic_counters ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(monlib-dynamic_counters-percentile INTERFACE ) diff --git a/library/cpp/monlib/dynamic_counters/percentile/percentile.h b/src/library/monlib/dynamic_counters/percentile/percentile.h similarity index 100% rename from library/cpp/monlib/dynamic_counters/percentile/percentile.h rename to src/library/monlib/dynamic_counters/percentile/percentile.h diff --git a/library/cpp/monlib/dynamic_counters/percentile/percentile_base.h b/src/library/monlib/dynamic_counters/percentile/percentile_base.h similarity index 96% rename from library/cpp/monlib/dynamic_counters/percentile/percentile_base.h rename to src/library/monlib/dynamic_counters/percentile/percentile_base.h index 2d1f75865c1..acabfcbeeba 100644 --- a/library/cpp/monlib/dynamic_counters/percentile/percentile_base.h +++ b/src/library/monlib/dynamic_counters/percentile/percentile_base.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NMonitoring { diff --git a/library/cpp/monlib/dynamic_counters/percentile/percentile_lg.h b/src/library/monlib/dynamic_counters/percentile/percentile_lg.h similarity index 99% rename from library/cpp/monlib/dynamic_counters/percentile/percentile_lg.h rename to src/library/monlib/dynamic_counters/percentile/percentile_lg.h index 01a2277346e..081bb5abba2 100644 --- a/library/cpp/monlib/dynamic_counters/percentile/percentile_lg.h +++ b/src/library/monlib/dynamic_counters/percentile/percentile_lg.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/library/cpp/monlib/dynamic_counters/percentile/percentile_ut.cpp b/src/library/monlib/dynamic_counters/percentile/percentile_ut.cpp similarity index 98% rename from library/cpp/monlib/dynamic_counters/percentile/percentile_ut.cpp rename to src/library/monlib/dynamic_counters/percentile/percentile_ut.cpp index a6e979340f9..701d69a804a 100644 --- a/library/cpp/monlib/dynamic_counters/percentile/percentile_ut.cpp +++ b/src/library/monlib/dynamic_counters/percentile/percentile_ut.cpp @@ -1,7 +1,7 @@ #include "percentile.h" #include "percentile_lg.h" -#include -#include +#include +#include #include diff --git a/src/library/monlib/dynamic_counters/percentile/ut/ya.make b/src/library/monlib/dynamic_counters/percentile/ut/ya.make new file mode 100644 index 00000000000..6dc6903f913 --- /dev/null +++ b/src/library/monlib/dynamic_counters/percentile/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/monlib/dynamic_counters/percentile) + + SRCS( + percentile_ut.cpp + ) + +END() diff --git a/src/library/monlib/dynamic_counters/ut/ya.make b/src/library/monlib/dynamic_counters/ut/ya.make new file mode 100644 index 00000000000..202b9ac4d7a --- /dev/null +++ b/src/library/monlib/dynamic_counters/ut/ya.make @@ -0,0 +1,14 @@ +UNITTEST_FOR(src/library/monlib/dynamic_counters) + +SRCS( + contention_ut.cpp + counters_ut.cpp + encode_ut.cpp +) + +PEERDIR( + src/library/monlib/encode/protobuf + src/library/monlib/encode/json +) + +END() diff --git a/library/cpp/monlib/encode/CMakeLists.txt b/src/library/monlib/encode/CMakeLists.txt similarity index 57% rename from library/cpp/monlib/encode/CMakeLists.txt rename to src/library/monlib/encode/CMakeLists.txt index 438c67cfbc4..51786333751 100644 --- a/library/cpp/monlib/encode/CMakeLists.txt +++ b/src/library/monlib/encode/CMakeLists.txt @@ -13,16 +13,16 @@ target_link_libraries(cpp-monlib-encode PUBLIC cpp-string_utils-misc ) target_sources(cpp-monlib-encode PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/encoder.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/encoder_state.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/format.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/encoder.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/encoder_state.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/format.cpp ) generate_enum_serilization(cpp-monlib-encode - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/encoder_state_enum.h + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/encoder_state_enum.h GEN_HEADER - ${YDB_SDK_BINARY_DIR}/library/cpp/monlib/encode/encoder_state_enum.h_serialized.h + ${YDB_SDK_BINARY_DIR}/src/library/monlib/encode/encoder_state_enum.h_serialized.h INCLUDE_HEADERS - library/cpp/monlib/encode/encoder_state_enum.h + src/library/monlib/encode/encoder_state_enum.h ) diff --git a/library/cpp/monlib/encode/buffered/CMakeLists.txt b/src/library/monlib/encode/buffered/CMakeLists.txt similarity index 63% rename from library/cpp/monlib/encode/buffered/CMakeLists.txt rename to src/library/monlib/encode/buffered/CMakeLists.txt index 00b8225e41a..34908b7eead 100644 --- a/library/cpp/monlib/encode/buffered/CMakeLists.txt +++ b/src/library/monlib/encode/buffered/CMakeLists.txt @@ -7,8 +7,8 @@ target_link_libraries(monlib-encode-buffered PUBLIC ) target_sources(monlib-encode-buffered PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/buffered/buffered_encoder_base.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/buffered/string_pool.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/buffered/buffered_encoder_base.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/buffered/string_pool.cpp ) diff --git a/library/cpp/monlib/encode/buffered/buffered_encoder_base.cpp b/src/library/monlib/encode/buffered/buffered_encoder_base.cpp similarity index 98% rename from library/cpp/monlib/encode/buffered/buffered_encoder_base.cpp rename to src/library/monlib/encode/buffered/buffered_encoder_base.cpp index 93bffaf150a..fcdad1fd697 100644 --- a/library/cpp/monlib/encode/buffered/buffered_encoder_base.cpp +++ b/src/library/monlib/encode/buffered/buffered_encoder_base.cpp @@ -1,9 +1,9 @@ #include "buffered_encoder_base.h" -#include +#include -#include -#include +#include +#include namespace NMonitoring { diff --git a/library/cpp/monlib/encode/buffered/buffered_encoder_base.h b/src/library/monlib/encode/buffered/buffered_encoder_base.h similarity index 90% rename from library/cpp/monlib/encode/buffered/buffered_encoder_base.h rename to src/library/monlib/encode/buffered/buffered_encoder_base.h index 2c6065be04e..ffc59f4cbc8 100644 --- a/library/cpp/monlib/encode/buffered/buffered_encoder_base.h +++ b/src/library/monlib/encode/buffered/buffered_encoder_base.h @@ -2,13 +2,13 @@ #include "string_pool.h" -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include namespace NMonitoring { diff --git a/library/cpp/monlib/encode/buffered/string_pool.cpp b/src/library/monlib/encode/buffered/string_pool.cpp similarity index 98% rename from library/cpp/monlib/encode/buffered/string_pool.cpp rename to src/library/monlib/encode/buffered/string_pool.cpp index a603aa1f4fe..beaa4b8aca7 100644 --- a/library/cpp/monlib/encode/buffered/string_pool.cpp +++ b/src/library/monlib/encode/buffered/string_pool.cpp @@ -1,6 +1,6 @@ #include "string_pool.h" -#include +#include namespace NMonitoring { //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/monlib/encode/buffered/string_pool.h b/src/library/monlib/encode/buffered/string_pool.h similarity index 98% rename from library/cpp/monlib/encode/buffered/string_pool.h rename to src/library/monlib/encode/buffered/string_pool.h index bf7cd15ce30..67d587802a9 100644 --- a/library/cpp/monlib/encode/buffered/string_pool.h +++ b/src/library/monlib/encode/buffered/string_pool.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NMonitoring { diff --git a/library/cpp/monlib/encode/buffered/string_pool_ut.cpp b/src/library/monlib/encode/buffered/string_pool_ut.cpp similarity index 98% rename from library/cpp/monlib/encode/buffered/string_pool_ut.cpp rename to src/library/monlib/encode/buffered/string_pool_ut.cpp index 89f446bb51d..ffa44671a48 100644 --- a/library/cpp/monlib/encode/buffered/string_pool_ut.cpp +++ b/src/library/monlib/encode/buffered/string_pool_ut.cpp @@ -1,6 +1,6 @@ #include "string_pool.h" -#include +#include using namespace NMonitoring; diff --git a/src/library/monlib/encode/buffered/ut/ya.make b/src/library/monlib/encode/buffered/ut/ya.make new file mode 100644 index 00000000000..9a03e557c0c --- /dev/null +++ b/src/library/monlib/encode/buffered/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/monlib/encode/buffered) + +SRCS( + string_pool_ut.cpp +) + +END() diff --git a/library/cpp/monlib/encode/encoder.cpp b/src/library/monlib/encode/encoder.cpp similarity index 100% rename from library/cpp/monlib/encode/encoder.cpp rename to src/library/monlib/encode/encoder.cpp diff --git a/library/cpp/monlib/encode/encoder.h b/src/library/monlib/encode/encoder.h similarity index 72% rename from library/cpp/monlib/encode/encoder.h rename to src/library/monlib/encode/encoder.h index a26a133d16b..2aaf8ba598a 100644 --- a/library/cpp/monlib/encode/encoder.h +++ b/src/library/monlib/encode/encoder.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include namespace NMonitoring { class IMetricEncoder: public IMetricConsumer { diff --git a/library/cpp/monlib/encode/encoder_state.cpp b/src/library/monlib/encode/encoder_state.cpp similarity index 100% rename from library/cpp/monlib/encode/encoder_state.cpp rename to src/library/monlib/encode/encoder_state.cpp diff --git a/library/cpp/monlib/encode/encoder_state.h b/src/library/monlib/encode/encoder_state.h similarity index 97% rename from library/cpp/monlib/encode/encoder_state.h rename to src/library/monlib/encode/encoder_state.h index 14b9188ca8c..8480f581f90 100644 --- a/library/cpp/monlib/encode/encoder_state.h +++ b/src/library/monlib/encode/encoder_state.h @@ -3,7 +3,7 @@ #include "encoder_state_enum.h" #include -#include +#include namespace NMonitoring { diff --git a/library/cpp/monlib/encode/encoder_state_enum.h b/src/library/monlib/encode/encoder_state_enum.h similarity index 100% rename from library/cpp/monlib/encode/encoder_state_enum.h rename to src/library/monlib/encode/encoder_state_enum.h diff --git a/library/cpp/monlib/encode/format.cpp b/src/library/monlib/encode/format.cpp similarity index 96% rename from library/cpp/monlib/encode/format.cpp rename to src/library/monlib/encode/format.cpp index 01459f84594..ec5de0ae44a 100644 --- a/library/cpp/monlib/encode/format.cpp +++ b/src/library/monlib/encode/format.cpp @@ -1,12 +1,12 @@ #include "format.h" -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace NMonitoring { static ECompression CompressionFromHeader(std::string_view value) { diff --git a/library/cpp/monlib/encode/format.h b/src/library/monlib/encode/format.h similarity index 100% rename from library/cpp/monlib/encode/format.h rename to src/library/monlib/encode/format.h diff --git a/library/cpp/monlib/encode/format_ut.cpp b/src/library/monlib/encode/format_ut.cpp similarity index 98% rename from library/cpp/monlib/encode/format_ut.cpp rename to src/library/monlib/encode/format_ut.cpp index 266eeea11b5..0c36fb72afb 100644 --- a/library/cpp/monlib/encode/format_ut.cpp +++ b/src/library/monlib/encode/format_ut.cpp @@ -1,9 +1,9 @@ #include "format.h" -#include +#include #include -#include +#include #include diff --git a/src/library/monlib/encode/fuzz/ya.make b/src/library/monlib/encode/fuzz/ya.make new file mode 100644 index 00000000000..eff94d30b76 --- /dev/null +++ b/src/library/monlib/encode/fuzz/ya.make @@ -0,0 +1,5 @@ +RECURSE_ROOT_RELATIVE( + src/library/monlib/encode/json/fuzz + src/library/monlib/encode/prometheus/fuzz + src/library/monlib/encode/spack/fuzz +) diff --git a/library/cpp/monlib/encode/json/CMakeLists.txt b/src/library/monlib/encode/json/CMakeLists.txt similarity index 66% rename from library/cpp/monlib/encode/json/CMakeLists.txt rename to src/library/monlib/encode/json/CMakeLists.txt index e96f332de6e..e1338122ad4 100644 --- a/library/cpp/monlib/encode/json/CMakeLists.txt +++ b/src/library/monlib/encode/json/CMakeLists.txt @@ -10,8 +10,8 @@ target_link_libraries(monlib-encode-json PUBLIC ) target_sources(monlib-encode-json PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/json/json_decoder.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/json/json_encoder.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/json/json_decoder.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/json/json_encoder.cpp ) diff --git a/library/cpp/monlib/encode/json/fuzz/main.cpp b/src/library/monlib/encode/json/fuzz/main.cpp similarity index 74% rename from library/cpp/monlib/encode/json/fuzz/main.cpp rename to src/library/monlib/encode/json/fuzz/main.cpp index dcff9805d62..7fca11f514b 100644 --- a/library/cpp/monlib/encode/json/fuzz/main.cpp +++ b/src/library/monlib/encode/json/fuzz/main.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include diff --git a/src/library/monlib/encode/json/fuzz/ya.make b/src/library/monlib/encode/json/fuzz/ya.make new file mode 100644 index 00000000000..86c61c70976 --- /dev/null +++ b/src/library/monlib/encode/json/fuzz/ya.make @@ -0,0 +1,14 @@ +FUZZ() + +PEERDIR( + src/library/monlib/encode/json + src/library/monlib/encode/fake +) + +SIZE(MEDIUM) + +SRCS( + main.cpp +) + +END() diff --git a/library/cpp/monlib/encode/json/json.h b/src/library/monlib/encode/json/json.h similarity index 90% rename from library/cpp/monlib/encode/json/json.h rename to src/library/monlib/encode/json/json.h index 6c32a201838..c3c2d2c8e2e 100644 --- a/library/cpp/monlib/encode/json/json.h +++ b/src/library/monlib/encode/json/json.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include class IOutputStream; diff --git a/library/cpp/monlib/encode/json/json_decoder.cpp b/src/library/monlib/encode/json/json_decoder.cpp similarity index 99% rename from library/cpp/monlib/encode/json/json_decoder.cpp rename to src/library/monlib/encode/json/json_decoder.cpp index f1aa205e775..9bb341e2ed4 100644 --- a/library/cpp/monlib/encode/json/json_decoder.cpp +++ b/src/library/monlib/encode/json/json_decoder.cpp @@ -2,16 +2,16 @@ #include "typed_point.h" -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/monlib/encode/json/json_decoder_ut.cpp b/src/library/monlib/encode/json/json_decoder_ut.cpp similarity index 98% rename from library/cpp/monlib/encode/json/json_decoder_ut.cpp rename to src/library/monlib/encode/json/json_decoder_ut.cpp index 7f9d8582f08..c62bd6cde7a 100644 --- a/library/cpp/monlib/encode/json/json_decoder_ut.cpp +++ b/src/library/monlib/encode/json/json_decoder_ut.cpp @@ -1,7 +1,7 @@ #include "json_decoder.cpp" -#include -#include +#include +#include #include diff --git a/library/cpp/monlib/encode/json/json_encoder.cpp b/src/library/monlib/encode/json/json_encoder.cpp similarity index 98% rename from library/cpp/monlib/encode/json/json_encoder.cpp rename to src/library/monlib/encode/json/json_encoder.cpp index 50c63496071..8e818faffca 100644 --- a/library/cpp/monlib/encode/json/json_encoder.cpp +++ b/src/library/monlib/encode/json/json_encoder.cpp @@ -1,16 +1,16 @@ #include "json.h" #include "typed_point.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include -#include -#include +#include +#include namespace NMonitoring { namespace { diff --git a/library/cpp/monlib/encode/json/json_ut.cpp b/src/library/monlib/encode/json/json_ut.cpp similarity index 99% rename from library/cpp/monlib/encode/json/json_ut.cpp rename to src/library/monlib/encode/json/json_ut.cpp index e42cac9c5bc..a1b2b63e34a 100644 --- a/library/cpp/monlib/encode/json/json_ut.cpp +++ b/src/library/monlib/encode/json/json_ut.cpp @@ -1,14 +1,14 @@ #include "json.h" -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/library/cpp/monlib/encode/json/typed_point.h b/src/library/monlib/encode/json/typed_point.h similarity index 98% rename from library/cpp/monlib/encode/json/typed_point.h rename to src/library/monlib/encode/json/typed_point.h index fbaa840c4bf..10a357bfb0d 100644 --- a/library/cpp/monlib/encode/json/typed_point.h +++ b/src/library/monlib/encode/json/typed_point.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NMonitoring { diff --git a/library/cpp/monlib/encode/json/ut/buffered_test.json b/src/library/monlib/encode/json/ut/buffered_test.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/buffered_test.json rename to src/library/monlib/encode/json/ut/buffered_test.json diff --git a/library/cpp/monlib/encode/json/ut/buffered_ts_merge.json b/src/library/monlib/encode/json/ut/buffered_ts_merge.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/buffered_ts_merge.json rename to src/library/monlib/encode/json/ut/buffered_ts_merge.json diff --git a/library/cpp/monlib/encode/json/ut/crash.json b/src/library/monlib/encode/json/ut/crash.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/crash.json rename to src/library/monlib/encode/json/ut/crash.json diff --git a/library/cpp/monlib/encode/json/ut/empty_series.json b/src/library/monlib/encode/json/ut/empty_series.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/empty_series.json rename to src/library/monlib/encode/json/ut/empty_series.json diff --git a/library/cpp/monlib/encode/json/ut/expected.json b/src/library/monlib/encode/json/ut/expected.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/expected.json rename to src/library/monlib/encode/json/ut/expected.json diff --git a/library/cpp/monlib/encode/json/ut/expected_buffered.json b/src/library/monlib/encode/json/ut/expected_buffered.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/expected_buffered.json rename to src/library/monlib/encode/json/ut/expected_buffered.json diff --git a/library/cpp/monlib/encode/json/ut/expected_cloud.json b/src/library/monlib/encode/json/ut/expected_cloud.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/expected_cloud.json rename to src/library/monlib/encode/json/ut/expected_cloud.json diff --git a/library/cpp/monlib/encode/json/ut/expected_cloud_buffered.json b/src/library/monlib/encode/json/ut/expected_cloud_buffered.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/expected_cloud_buffered.json rename to src/library/monlib/encode/json/ut/expected_cloud_buffered.json diff --git a/library/cpp/monlib/encode/json/ut/hist_crash.json b/src/library/monlib/encode/json/ut/hist_crash.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/hist_crash.json rename to src/library/monlib/encode/json/ut/hist_crash.json diff --git a/library/cpp/monlib/encode/json/ut/histogram_timeseries.json b/src/library/monlib/encode/json/ut/histogram_timeseries.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/histogram_timeseries.json rename to src/library/monlib/encode/json/ut/histogram_timeseries.json diff --git a/library/cpp/monlib/encode/json/ut/histogram_value.json b/src/library/monlib/encode/json/ut/histogram_value.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/histogram_value.json rename to src/library/monlib/encode/json/ut/histogram_value.json diff --git a/library/cpp/monlib/encode/json/ut/histogram_value_inf_before_bounds.json b/src/library/monlib/encode/json/ut/histogram_value_inf_before_bounds.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/histogram_value_inf_before_bounds.json rename to src/library/monlib/encode/json/ut/histogram_value_inf_before_bounds.json diff --git a/library/cpp/monlib/encode/json/ut/int_gauge.json b/src/library/monlib/encode/json/ut/int_gauge.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/int_gauge.json rename to src/library/monlib/encode/json/ut/int_gauge.json diff --git a/library/cpp/monlib/encode/json/ut/log_histogram_timeseries.json b/src/library/monlib/encode/json/ut/log_histogram_timeseries.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/log_histogram_timeseries.json rename to src/library/monlib/encode/json/ut/log_histogram_timeseries.json diff --git a/library/cpp/monlib/encode/json/ut/log_histogram_value.json b/src/library/monlib/encode/json/ut/log_histogram_value.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/log_histogram_value.json rename to src/library/monlib/encode/json/ut/log_histogram_value.json diff --git a/library/cpp/monlib/encode/json/ut/merged.json b/src/library/monlib/encode/json/ut/merged.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/merged.json rename to src/library/monlib/encode/json/ut/merged.json diff --git a/library/cpp/monlib/encode/json/ut/metrics.json b/src/library/monlib/encode/json/ut/metrics.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/metrics.json rename to src/library/monlib/encode/json/ut/metrics.json diff --git a/library/cpp/monlib/encode/json/ut/named_metrics.json b/src/library/monlib/encode/json/ut/named_metrics.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/named_metrics.json rename to src/library/monlib/encode/json/ut/named_metrics.json diff --git a/library/cpp/monlib/encode/json/ut/sensors.json b/src/library/monlib/encode/json/ut/sensors.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/sensors.json rename to src/library/monlib/encode/json/ut/sensors.json diff --git a/library/cpp/monlib/encode/json/ut/summary_inf.json b/src/library/monlib/encode/json/ut/summary_inf.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/summary_inf.json rename to src/library/monlib/encode/json/ut/summary_inf.json diff --git a/library/cpp/monlib/encode/json/ut/summary_timeseries.json b/src/library/monlib/encode/json/ut/summary_timeseries.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/summary_timeseries.json rename to src/library/monlib/encode/json/ut/summary_timeseries.json diff --git a/library/cpp/monlib/encode/json/ut/summary_value.json b/src/library/monlib/encode/json/ut/summary_value.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/summary_value.json rename to src/library/monlib/encode/json/ut/summary_value.json diff --git a/library/cpp/monlib/encode/json/ut/test_decode_to_encode.json b/src/library/monlib/encode/json/ut/test_decode_to_encode.json similarity index 100% rename from library/cpp/monlib/encode/json/ut/test_decode_to_encode.json rename to src/library/monlib/encode/json/ut/test_decode_to_encode.json diff --git a/library/cpp/monlib/encode/json/ut/ya.make b/src/library/monlib/encode/json/ut/ya.make similarity index 87% rename from library/cpp/monlib/encode/json/ut/ya.make rename to src/library/monlib/encode/json/ut/ya.make index 9be38d2fd47..7c9bea3300a 100644 --- a/library/cpp/monlib/encode/json/ut/ya.make +++ b/src/library/monlib/encode/json/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/monlib/encode/json) +UNITTEST_FOR(src/library/monlib/encode/json) SRCS( json_decoder_ut.cpp @@ -32,10 +32,10 @@ RESOURCE( ) PEERDIR( - library/cpp/json - library/cpp/monlib/consumers - library/cpp/monlib/encode/protobuf - library/cpp/resource + src/library/json + src/library/monlib/consumers + src/library/monlib/encode/protobuf + src/library/resource ) END() diff --git a/library/cpp/monlib/encode/legacy_protobuf/CMakeLists.txt b/src/library/monlib/encode/legacy_protobuf/CMakeLists.txt similarity index 100% rename from library/cpp/monlib/encode/legacy_protobuf/CMakeLists.txt rename to src/library/monlib/encode/legacy_protobuf/CMakeLists.txt diff --git a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt b/src/library/monlib/encode/legacy_protobuf/protos/CMakeLists.txt similarity index 86% rename from library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt rename to src/library/monlib/encode/legacy_protobuf/protos/CMakeLists.txt index 41e0fc279e0..7e4d3d1c80a 100644 --- a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt +++ b/src/library/monlib/encode/legacy_protobuf/protos/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(encode-legacy_protobuf-protos PUBLIC ) target_proto_messages(encode-legacy_protobuf-protos PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.proto + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/legacy_protobuf/protos/metric_meta.proto ) target_proto_addincls(encode-legacy_protobuf-protos diff --git a/library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.proto b/src/library/monlib/encode/legacy_protobuf/protos/metric_meta.proto similarity index 100% rename from library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.proto rename to src/library/monlib/encode/legacy_protobuf/protos/metric_meta.proto diff --git a/library/cpp/monlib/encode/prometheus/CMakeLists.txt b/src/library/monlib/encode/prometheus/CMakeLists.txt similarity index 65% rename from library/cpp/monlib/encode/prometheus/CMakeLists.txt rename to src/library/monlib/encode/prometheus/CMakeLists.txt index 16675bf153c..c1a360233f6 100644 --- a/library/cpp/monlib/encode/prometheus/CMakeLists.txt +++ b/src/library/monlib/encode/prometheus/CMakeLists.txt @@ -7,8 +7,8 @@ target_link_libraries(monlib-encode-prometheus PUBLIC ) target_sources(monlib-encode-prometheus PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/prometheus/prometheus_decoder.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/prometheus/prometheus_encoder.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/prometheus/prometheus_decoder.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/prometheus/prometheus_encoder.cpp ) diff --git a/library/cpp/monlib/encode/prometheus/fuzz/main.cpp b/src/library/monlib/encode/prometheus/fuzz/main.cpp similarity index 68% rename from library/cpp/monlib/encode/prometheus/fuzz/main.cpp rename to src/library/monlib/encode/prometheus/fuzz/main.cpp index 8c3c6dae821..07edcbb65ac 100644 --- a/library/cpp/monlib/encode/prometheus/fuzz/main.cpp +++ b/src/library/monlib/encode/prometheus/fuzz/main.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include -#include +#include extern "C" int LLVMFuzzerTestOneInput(const ui8* buf, size_t size) { diff --git a/src/library/monlib/encode/prometheus/fuzz/ya.make b/src/library/monlib/encode/prometheus/fuzz/ya.make new file mode 100644 index 00000000000..04cb7c4f6f5 --- /dev/null +++ b/src/library/monlib/encode/prometheus/fuzz/ya.make @@ -0,0 +1,14 @@ +FUZZ() + +PEERDIR( + src/library/monlib/encode/prometheus + src/library/monlib/encode/fake +) + +SIZE(MEDIUM) + +SRCS( + main.cpp +) + +END() diff --git a/library/cpp/monlib/encode/prometheus/prometheus.h b/src/library/monlib/encode/prometheus/prometheus.h similarity index 71% rename from library/cpp/monlib/encode/prometheus/prometheus.h rename to src/library/monlib/encode/prometheus/prometheus.h index f102b87a5a9..57e8ceb016c 100644 --- a/library/cpp/monlib/encode/prometheus/prometheus.h +++ b/src/library/monlib/encode/prometheus/prometheus.h @@ -1,9 +1,9 @@ #pragma once -#include -#include +#include +#include -#include +#include namespace NMonitoring { diff --git a/library/cpp/monlib/encode/prometheus/prometheus_decoder.cpp b/src/library/monlib/encode/prometheus/prometheus_decoder.cpp similarity index 98% rename from library/cpp/monlib/encode/prometheus/prometheus_decoder.cpp rename to src/library/monlib/encode/prometheus/prometheus_decoder.cpp index 00b1e4d6e6b..f7fe1b74467 100644 --- a/library/cpp/monlib/encode/prometheus/prometheus_decoder.cpp +++ b/src/library/monlib/encode/prometheus/prometheus_decoder.cpp @@ -1,15 +1,15 @@ #include "prometheus.h" #include "prometheus_model.h" -#include -#include +#include +#include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/library/cpp/monlib/encode/prometheus/prometheus_decoder_ut.cpp b/src/library/monlib/encode/prometheus/prometheus_decoder_ut.cpp similarity index 99% rename from library/cpp/monlib/encode/prometheus/prometheus_decoder_ut.cpp rename to src/library/monlib/encode/prometheus/prometheus_decoder_ut.cpp index 741be03cb2f..1adc5b3af52 100644 --- a/library/cpp/monlib/encode/prometheus/prometheus_decoder_ut.cpp +++ b/src/library/monlib/encode/prometheus/prometheus_decoder_ut.cpp @@ -1,8 +1,8 @@ #include "prometheus.h" -#include +#include -#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/encode/prometheus/prometheus_encoder.cpp b/src/library/monlib/encode/prometheus/prometheus_encoder.cpp similarity index 98% rename from library/cpp/monlib/encode/prometheus/prometheus_encoder.cpp rename to src/library/monlib/encode/prometheus/prometheus_encoder.cpp index 5609b2ed09f..533d893ce7a 100644 --- a/library/cpp/monlib/encode/prometheus/prometheus_encoder.cpp +++ b/src/library/monlib/encode/prometheus/prometheus_encoder.cpp @@ -1,12 +1,12 @@ #include "prometheus.h" #include "prometheus_model.h" -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include diff --git a/library/cpp/monlib/encode/prometheus/prometheus_encoder_ut.cpp b/src/library/monlib/encode/prometheus/prometheus_encoder_ut.cpp similarity index 98% rename from library/cpp/monlib/encode/prometheus/prometheus_encoder_ut.cpp rename to src/library/monlib/encode/prometheus/prometheus_encoder_ut.cpp index ae77f04effd..f5e9b5411fb 100644 --- a/library/cpp/monlib/encode/prometheus/prometheus_encoder_ut.cpp +++ b/src/library/monlib/encode/prometheus/prometheus_encoder_ut.cpp @@ -1,12 +1,12 @@ #include "prometheus.h" -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/encode/prometheus/prometheus_model.h b/src/library/monlib/encode/prometheus/prometheus_model.h similarity index 100% rename from library/cpp/monlib/encode/prometheus/prometheus_model.h rename to src/library/monlib/encode/prometheus/prometheus_model.h diff --git a/src/library/monlib/encode/prometheus/ut/ya.make b/src/library/monlib/encode/prometheus/ut/ya.make new file mode 100644 index 00000000000..0d5be96b34e --- /dev/null +++ b/src/library/monlib/encode/prometheus/ut/ya.make @@ -0,0 +1,12 @@ +UNITTEST_FOR(src/library/monlib/encode/prometheus) + +SRCS( + prometheus_encoder_ut.cpp + prometheus_decoder_ut.cpp +) + +PEERDIR( + src/library/monlib/encode/protobuf +) + +END() diff --git a/library/cpp/monlib/encode/spack/CMakeLists.txt b/src/library/monlib/encode/spack/CMakeLists.txt similarity index 52% rename from library/cpp/monlib/encode/spack/CMakeLists.txt rename to src/library/monlib/encode/spack/CMakeLists.txt index b7565ace4b6..8bf0a8ba21a 100644 --- a/library/cpp/monlib/encode/spack/CMakeLists.txt +++ b/src/library/monlib/encode/spack/CMakeLists.txt @@ -11,10 +11,10 @@ target_link_libraries(monlib-encode-spack PUBLIC ) target_sources(monlib-encode-spack PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/spack/spack_v1_decoder.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/spack/spack_v1_encoder.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/spack/varint.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/spack/compression.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/spack/spack_v1_decoder.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/spack/spack_v1_encoder.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/spack/varint.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/spack/compression.cpp ) diff --git a/library/cpp/monlib/encode/spack/compression.cpp b/src/library/monlib/encode/spack/compression.cpp similarity index 98% rename from library/cpp/monlib/encode/spack/compression.cpp rename to src/library/monlib/encode/spack/compression.cpp index 94faa0b1ca9..6dabb4d70e1 100644 --- a/library/cpp/monlib/encode/spack/compression.cpp +++ b/src/library/monlib/encode/spack/compression.cpp @@ -1,13 +1,13 @@ #include "compression.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/library/cpp/monlib/encode/spack/compression.h b/src/library/monlib/encode/spack/compression.h similarity index 85% rename from library/cpp/monlib/encode/spack/compression.h rename to src/library/monlib/encode/spack/compression.h index f74d8b424e4..267ae0a1e71 100644 --- a/library/cpp/monlib/encode/spack/compression.h +++ b/src/library/monlib/encode/spack/compression.h @@ -2,8 +2,8 @@ #include "spack_v1.h" -#include -#include +#include +#include namespace NMonitoring { diff --git a/library/cpp/monlib/encode/spack/fuzz/main.cpp b/src/library/monlib/encode/spack/fuzz/main.cpp similarity index 66% rename from library/cpp/monlib/encode/spack/fuzz/main.cpp rename to src/library/monlib/encode/spack/fuzz/main.cpp index 6a14afe71c0..db5f9b93ef1 100644 --- a/library/cpp/monlib/encode/spack/fuzz/main.cpp +++ b/src/library/monlib/encode/spack/fuzz/main.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include -#include +#include extern "C" int LLVMFuzzerTestOneInput(const ui8* data, size_t size) { diff --git a/library/cpp/monlib/encode/spack/fuzz/ya.make b/src/library/monlib/encode/spack/fuzz/ya.make similarity index 56% rename from library/cpp/monlib/encode/spack/fuzz/ya.make rename to src/library/monlib/encode/spack/fuzz/ya.make index bacb1f50a6d..dc570d74697 100644 --- a/library/cpp/monlib/encode/spack/fuzz/ya.make +++ b/src/library/monlib/encode/spack/fuzz/ya.make @@ -5,8 +5,8 @@ FUZZ_OPTS(-rss_limit_mb=1024) SIZE(MEDIUM) PEERDIR( - library/cpp/monlib/encode/spack - library/cpp/monlib/encode/fake + src/library/monlib/encode/spack + src/library/monlib/encode/fake ) SRCS( diff --git a/library/cpp/monlib/encode/spack/spack_v1.h b/src/library/monlib/encode/spack/spack_v1.h similarity index 94% rename from library/cpp/monlib/encode/spack/spack_v1.h rename to src/library/monlib/encode/spack/spack_v1.h index 588b75f020a..d55bba9da65 100644 --- a/library/cpp/monlib/encode/spack/spack_v1.h +++ b/src/library/monlib/encode/spack/spack_v1.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include +#include +#include +#include -#include +#include // // format specification available here: diff --git a/library/cpp/monlib/encode/spack/spack_v1_decoder.cpp b/src/library/monlib/encode/spack/spack_v1_decoder.cpp similarity index 97% rename from library/cpp/monlib/encode/spack/spack_v1_decoder.cpp rename to src/library/monlib/encode/spack/spack_v1_decoder.cpp index c1873449969..2a14301da36 100644 --- a/library/cpp/monlib/encode/spack/spack_v1_decoder.cpp +++ b/src/library/monlib/encode/spack/spack_v1_decoder.cpp @@ -2,15 +2,15 @@ #include "varint.h" #include "compression.h" -#include -#include -#include -#include - -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include #ifndef _little_endian_ #error Unsupported platform diff --git a/library/cpp/monlib/encode/spack/spack_v1_encoder.cpp b/src/library/monlib/encode/spack/spack_v1_encoder.cpp similarity index 98% rename from library/cpp/monlib/encode/spack/spack_v1_encoder.cpp rename to src/library/monlib/encode/spack/spack_v1_encoder.cpp index 1156f892657..5a083d95fc8 100644 --- a/library/cpp/monlib/encode/spack/spack_v1_encoder.cpp +++ b/src/library/monlib/encode/spack/spack_v1_encoder.cpp @@ -2,11 +2,11 @@ #include "compression.h" #include "varint.h" -#include +#include -#include -#include -#include +#include +#include +#include #ifndef _little_endian_ #error Unsupported platform diff --git a/library/cpp/monlib/encode/spack/spack_v1_ut.cpp b/src/library/monlib/encode/spack/spack_v1_ut.cpp similarity index 99% rename from library/cpp/monlib/encode/spack/spack_v1_ut.cpp rename to src/library/monlib/encode/spack/spack_v1_ut.cpp index 4296799b0d9..bea50414a88 100644 --- a/library/cpp/monlib/encode/spack/spack_v1_ut.cpp +++ b/src/library/monlib/encode/spack/spack_v1_ut.cpp @@ -1,14 +1,14 @@ #include "spack_v1.h" -#include -#include -#include +#include +#include +#include -#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/src/library/monlib/encode/spack/ut/ya.make b/src/library/monlib/encode/spack/ut/ya.make new file mode 100644 index 00000000000..e2747666a5c --- /dev/null +++ b/src/library/monlib/encode/spack/ut/ya.make @@ -0,0 +1,11 @@ +UNITTEST_FOR(src/library/monlib/encode/spack) + +SRCS( + spack_v1_ut.cpp +) + +PEERDIR( + src/library/monlib/encode/protobuf +) + +END() diff --git a/library/cpp/monlib/encode/spack/varint.cpp b/src/library/monlib/encode/spack/varint.cpp similarity index 95% rename from library/cpp/monlib/encode/spack/varint.cpp rename to src/library/monlib/encode/spack/varint.cpp index 051cf17380c..98cd6bb0654 100644 --- a/library/cpp/monlib/encode/spack/varint.cpp +++ b/src/library/monlib/encode/spack/varint.cpp @@ -1,8 +1,8 @@ #include "varint.h" -#include -#include -#include +#include +#include +#include namespace NMonitoring { ui32 WriteVarUInt32(IOutputStream* output, ui32 value) { diff --git a/library/cpp/monlib/encode/spack/varint.h b/src/library/monlib/encode/spack/varint.h similarity index 92% rename from library/cpp/monlib/encode/spack/varint.h rename to src/library/monlib/encode/spack/varint.h index 7ac522dd6c7..a93ac76de24 100644 --- a/library/cpp/monlib/encode/spack/varint.h +++ b/src/library/monlib/encode/spack/varint.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class IInputStream; class IOutputStream; diff --git a/library/cpp/monlib/encode/text/CMakeLists.txt b/src/library/monlib/encode/text/CMakeLists.txt similarity index 71% rename from library/cpp/monlib/encode/text/CMakeLists.txt rename to src/library/monlib/encode/text/CMakeLists.txt index e8365a09194..e6b7ac48318 100644 --- a/library/cpp/monlib/encode/text/CMakeLists.txt +++ b/src/library/monlib/encode/text/CMakeLists.txt @@ -6,5 +6,5 @@ target_link_libraries(monlib-encode-text PUBLIC ) target_sources(monlib-encode-text PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/encode/text/text_encoder.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/encode/text/text_encoder.cpp ) diff --git a/library/cpp/monlib/encode/text/text.h b/src/library/monlib/encode/text/text.h similarity index 75% rename from library/cpp/monlib/encode/text/text.h rename to src/library/monlib/encode/text/text.h index 6b2be3937bd..fbaf7221815 100644 --- a/library/cpp/monlib/encode/text/text.h +++ b/src/library/monlib/encode/text/text.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class IOutputStream; diff --git a/library/cpp/monlib/encode/text/text_encoder.cpp b/src/library/monlib/encode/text/text_encoder.cpp similarity index 97% rename from library/cpp/monlib/encode/text/text_encoder.cpp rename to src/library/monlib/encode/text/text_encoder.cpp index 940dc379142..20f8ecfcbb6 100644 --- a/library/cpp/monlib/encode/text/text_encoder.cpp +++ b/src/library/monlib/encode/text/text_encoder.cpp @@ -1,11 +1,11 @@ #include "text.h" -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include namespace NMonitoring { namespace { diff --git a/library/cpp/monlib/encode/text/text_encoder_ut.cpp b/src/library/monlib/encode/text/text_encoder_ut.cpp similarity index 99% rename from library/cpp/monlib/encode/text/text_encoder_ut.cpp rename to src/library/monlib/encode/text/text_encoder_ut.cpp index a827d54bee7..f451b729ff2 100644 --- a/library/cpp/monlib/encode/text/text_encoder_ut.cpp +++ b/src/library/monlib/encode/text/text_encoder_ut.cpp @@ -1,8 +1,8 @@ #include "text.h" -#include +#include -#include +#include using namespace NMonitoring; diff --git a/src/library/monlib/encode/text/ut/ya.make b/src/library/monlib/encode/text/ut/ya.make new file mode 100644 index 00000000000..61f26f9b410 --- /dev/null +++ b/src/library/monlib/encode/text/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/monlib/encode/text) + +SRCS( + text_encoder_ut.cpp +) + +END() diff --git a/src/library/monlib/encode/ut/ya.make b/src/library/monlib/encode/ut/ya.make new file mode 100644 index 00000000000..8531cc54890 --- /dev/null +++ b/src/library/monlib/encode/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/monlib/encode) + +SRCS( + format_ut.cpp +) + +END() diff --git a/library/cpp/monlib/exception/CMakeLists.txt b/src/library/monlib/exception/CMakeLists.txt similarity index 69% rename from library/cpp/monlib/exception/CMakeLists.txt rename to src/library/monlib/exception/CMakeLists.txt index 33c052a70b4..06eabd8e898 100644 --- a/library/cpp/monlib/exception/CMakeLists.txt +++ b/src/library/monlib/exception/CMakeLists.txt @@ -5,7 +5,7 @@ target_link_libraries(cpp-monlib-exception PUBLIC ) target_sources(cpp-monlib-exception PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/exception/exception.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/exception/exception.cpp ) diff --git a/library/cpp/monlib/exception/exception.cpp b/src/library/monlib/exception/exception.cpp similarity index 100% rename from library/cpp/monlib/exception/exception.cpp rename to src/library/monlib/exception/exception.cpp diff --git a/library/cpp/monlib/exception/exception.h b/src/library/monlib/exception/exception.h similarity index 100% rename from library/cpp/monlib/exception/exception.h rename to src/library/monlib/exception/exception.h diff --git a/src/library/monlib/metrics/CMakeLists.txt b/src/library/monlib/metrics/CMakeLists.txt new file mode 100644 index 00000000000..7cf1a028712 --- /dev/null +++ b/src/library/monlib/metrics/CMakeLists.txt @@ -0,0 +1,34 @@ +add_library(cpp-monlib-metrics) + +target_link_libraries(cpp-monlib-metrics PUBLIC + yutil + tools-enum_parser-enum_serialization_runtime + cpp-string_utils-misc +) + +target_sources(cpp-monlib-metrics PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/ewma.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/fake.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/histogram_collector_explicit.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/histogram_collector_exponential.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/histogram_collector_linear.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/histogram_snapshot.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/log_histogram_snapshot.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/labels.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/metric_registry.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/metric_consumer.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/metric_type.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/metric_value.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/summary_collector.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/summary_snapshot.cpp +) + +generate_enum_serilization(cpp-monlib-metrics + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/metrics/metric_value_type.h + GEN_HEADER + ${YDB_SDK_BINARY_DIR}/src/library/monlib/metrics/metric_value_type.h_serialized.h + INCLUDE_HEADERS + src/library/monlib/metrics/metric_value_type.h +) + + diff --git a/library/cpp/monlib/metrics/atomics_array.h b/src/library/monlib/metrics/atomics_array.h similarity index 97% rename from library/cpp/monlib/metrics/atomics_array.h rename to src/library/monlib/metrics/atomics_array.h index 3df4737fe08..ad3ec782f42 100644 --- a/library/cpp/monlib/metrics/atomics_array.h +++ b/src/library/monlib/metrics/atomics_array.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/library/cpp/monlib/metrics/ewma.cpp b/src/library/monlib/metrics/ewma.cpp similarity index 100% rename from library/cpp/monlib/metrics/ewma.cpp rename to src/library/monlib/metrics/ewma.cpp diff --git a/library/cpp/monlib/metrics/ewma.h b/src/library/monlib/metrics/ewma.h similarity index 94% rename from library/cpp/monlib/metrics/ewma.h rename to src/library/monlib/metrics/ewma.h index 9b2dad7cc5c..2ab52799ffd 100644 --- a/library/cpp/monlib/metrics/ewma.h +++ b/src/library/monlib/metrics/ewma.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/library/cpp/monlib/metrics/ewma_ut.cpp b/src/library/monlib/metrics/ewma_ut.cpp similarity index 98% rename from library/cpp/monlib/metrics/ewma_ut.cpp rename to src/library/monlib/metrics/ewma_ut.cpp index b76b3f87362..b73ecf9ffa5 100644 --- a/library/cpp/monlib/metrics/ewma_ut.cpp +++ b/src/library/monlib/metrics/ewma_ut.cpp @@ -1,7 +1,7 @@ #include "ewma.h" #include "metric.h" -#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/metrics/fake.cpp b/src/library/monlib/metrics/fake.cpp similarity index 100% rename from library/cpp/monlib/metrics/fake.cpp rename to src/library/monlib/metrics/fake.cpp diff --git a/library/cpp/monlib/metrics/fake.h b/src/library/monlib/metrics/fake.h similarity index 100% rename from library/cpp/monlib/metrics/fake.h rename to src/library/monlib/metrics/fake.h diff --git a/library/cpp/monlib/metrics/fake_ut.cpp b/src/library/monlib/metrics/fake_ut.cpp similarity index 90% rename from library/cpp/monlib/metrics/fake_ut.cpp rename to src/library/monlib/metrics/fake_ut.cpp index c3368ca3021..b3a84f52828 100644 --- a/library/cpp/monlib/metrics/fake_ut.cpp +++ b/src/library/monlib/metrics/fake_ut.cpp @@ -1,8 +1,8 @@ #include "fake.h" -#include +#include -#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/metrics/histogram_collector.h b/src/library/monlib/metrics/histogram_collector.h similarity index 100% rename from library/cpp/monlib/metrics/histogram_collector.h rename to src/library/monlib/metrics/histogram_collector.h diff --git a/library/cpp/monlib/metrics/histogram_collector_explicit.cpp b/src/library/monlib/metrics/histogram_collector_explicit.cpp similarity index 93% rename from library/cpp/monlib/metrics/histogram_collector_explicit.cpp rename to src/library/monlib/metrics/histogram_collector_explicit.cpp index 914529d5e60..9375e33b51a 100644 --- a/library/cpp/monlib/metrics/histogram_collector_explicit.cpp +++ b/src/library/monlib/metrics/histogram_collector_explicit.cpp @@ -1,10 +1,10 @@ #include "histogram_collector.h" #include "atomics_array.h" -#include +#include -#include -#include +#include +#include namespace NMonitoring { diff --git a/library/cpp/monlib/metrics/histogram_collector_exponential.cpp b/src/library/monlib/metrics/histogram_collector_exponential.cpp similarity index 94% rename from library/cpp/monlib/metrics/histogram_collector_exponential.cpp rename to src/library/monlib/metrics/histogram_collector_exponential.cpp index e696d4c32bc..88ead91dc52 100644 --- a/library/cpp/monlib/metrics/histogram_collector_exponential.cpp +++ b/src/library/monlib/metrics/histogram_collector_exponential.cpp @@ -1,10 +1,10 @@ #include "histogram_collector.h" #include "atomics_array.h" -#include +#include -#include -#include +#include +#include namespace NMonitoring { /////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/monlib/metrics/histogram_collector_linear.cpp b/src/library/monlib/metrics/histogram_collector_linear.cpp similarity index 94% rename from library/cpp/monlib/metrics/histogram_collector_linear.cpp rename to src/library/monlib/metrics/histogram_collector_linear.cpp index 2c708bc9e4f..3eb9b84d6e8 100644 --- a/library/cpp/monlib/metrics/histogram_collector_linear.cpp +++ b/src/library/monlib/metrics/histogram_collector_linear.cpp @@ -1,10 +1,10 @@ #include "histogram_collector.h" #include "atomics_array.h" -#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/monlib/metrics/histogram_collector_ut.cpp b/src/library/monlib/metrics/histogram_collector_ut.cpp similarity index 98% rename from library/cpp/monlib/metrics/histogram_collector_ut.cpp rename to src/library/monlib/metrics/histogram_collector_ut.cpp index 759c5a8b9c4..d5b4a177c7d 100644 --- a/library/cpp/monlib/metrics/histogram_collector_ut.cpp +++ b/src/library/monlib/metrics/histogram_collector_ut.cpp @@ -1,6 +1,6 @@ #include "histogram_collector.h" -#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/metrics/histogram_snapshot.cpp b/src/library/monlib/metrics/histogram_snapshot.cpp similarity index 98% rename from library/cpp/monlib/metrics/histogram_snapshot.cpp rename to src/library/monlib/metrics/histogram_snapshot.cpp index deaad35ccf3..58e4676d964 100644 --- a/library/cpp/monlib/metrics/histogram_snapshot.cpp +++ b/src/library/monlib/metrics/histogram_snapshot.cpp @@ -1,6 +1,6 @@ #include "histogram_snapshot.h" -#include +#include #include diff --git a/library/cpp/monlib/metrics/histogram_snapshot.h b/src/library/monlib/metrics/histogram_snapshot.h similarity index 98% rename from library/cpp/monlib/metrics/histogram_snapshot.h rename to src/library/monlib/metrics/histogram_snapshot.h index b281bd73f50..e08abbe7843 100644 --- a/library/cpp/monlib/metrics/histogram_snapshot.h +++ b/src/library/monlib/metrics/histogram_snapshot.h @@ -1,9 +1,9 @@ #pragma once -#include +#include -#include -#include +#include +#include #include #include diff --git a/library/cpp/monlib/metrics/histogram_snapshot_ut.cpp b/src/library/monlib/metrics/histogram_snapshot_ut.cpp similarity index 98% rename from library/cpp/monlib/metrics/histogram_snapshot_ut.cpp rename to src/library/monlib/metrics/histogram_snapshot_ut.cpp index 7ef9b5a5b52..3b834f447cd 100644 --- a/library/cpp/monlib/metrics/histogram_snapshot_ut.cpp +++ b/src/library/monlib/metrics/histogram_snapshot_ut.cpp @@ -1,6 +1,6 @@ #include "histogram_snapshot.h" -#include +#include #include diff --git a/library/cpp/monlib/metrics/labels.cpp b/src/library/monlib/metrics/labels.cpp similarity index 96% rename from library/cpp/monlib/metrics/labels.cpp rename to src/library/monlib/metrics/labels.cpp index 661d7979500..7d565457f3f 100644 --- a/library/cpp/monlib/metrics/labels.cpp +++ b/src/library/monlib/metrics/labels.cpp @@ -1,7 +1,7 @@ #include "labels.h" -#include -#include +#include +#include static void OutputLabels(IOutputStream& out, const NMonitoring::ILabels& labels) { size_t i = 0; diff --git a/library/cpp/monlib/metrics/labels.h b/src/library/monlib/metrics/labels.h similarity index 98% rename from library/cpp/monlib/metrics/labels.h rename to src/library/monlib/metrics/labels.h index c6fc4d801b1..4b520acbd3e 100644 --- a/library/cpp/monlib/metrics/labels.h +++ b/src/library/monlib/metrics/labels.h @@ -1,14 +1,14 @@ #pragma once -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/library/cpp/monlib/metrics/labels_ut.cpp b/src/library/monlib/metrics/labels_ut.cpp similarity index 99% rename from library/cpp/monlib/metrics/labels_ut.cpp rename to src/library/monlib/metrics/labels_ut.cpp index 9ba8e4213be..1a9310cb679 100644 --- a/library/cpp/monlib/metrics/labels_ut.cpp +++ b/src/library/monlib/metrics/labels_ut.cpp @@ -1,6 +1,6 @@ #include "labels.h" -#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/metrics/log_histogram_collector.h b/src/library/monlib/metrics/log_histogram_collector.h similarity index 97% rename from library/cpp/monlib/metrics/log_histogram_collector.h rename to src/library/monlib/metrics/log_histogram_collector.h index 427e73923bc..e9831fce2ff 100644 --- a/library/cpp/monlib/metrics/log_histogram_collector.h +++ b/src/library/monlib/metrics/log_histogram_collector.h @@ -2,9 +2,9 @@ #include "log_histogram_snapshot.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/library/cpp/monlib/metrics/log_histogram_collector_ut.cpp b/src/library/monlib/metrics/log_histogram_collector_ut.cpp similarity index 96% rename from library/cpp/monlib/metrics/log_histogram_collector_ut.cpp rename to src/library/monlib/metrics/log_histogram_collector_ut.cpp index ac9a3522ce7..cf3bde57978 100644 --- a/library/cpp/monlib/metrics/log_histogram_collector_ut.cpp +++ b/src/library/monlib/metrics/log_histogram_collector_ut.cpp @@ -1,6 +1,6 @@ #include "log_histogram_collector.h" -#include +#include Y_UNIT_TEST_SUITE(LogHistogramCollector) { diff --git a/library/cpp/monlib/metrics/log_histogram_snapshot.cpp b/src/library/monlib/metrics/log_histogram_snapshot.cpp similarity index 95% rename from library/cpp/monlib/metrics/log_histogram_snapshot.cpp rename to src/library/monlib/metrics/log_histogram_snapshot.cpp index 02a42897f85..b285801971d 100644 --- a/library/cpp/monlib/metrics/log_histogram_snapshot.cpp +++ b/src/library/monlib/metrics/log_histogram_snapshot.cpp @@ -1,6 +1,6 @@ #include "log_histogram_snapshot.h" -#include +#include #include diff --git a/library/cpp/monlib/metrics/log_histogram_snapshot.h b/src/library/monlib/metrics/log_histogram_snapshot.h similarity index 98% rename from library/cpp/monlib/metrics/log_histogram_snapshot.h rename to src/library/monlib/metrics/log_histogram_snapshot.h index 012f6da9cc1..0e9a301be29 100644 --- a/library/cpp/monlib/metrics/log_histogram_snapshot.h +++ b/src/library/monlib/metrics/log_histogram_snapshot.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/library/cpp/monlib/metrics/metric.h b/src/library/monlib/metrics/metric.h similarity index 99% rename from library/cpp/monlib/metrics/metric.h rename to src/library/monlib/metrics/metric.h index cf736e8d808..9b86070758a 100644 --- a/library/cpp/monlib/metrics/metric.h +++ b/src/library/monlib/metrics/metric.h @@ -2,8 +2,8 @@ #include "metric_consumer.h" -#include -#include +#include +#include namespace NMonitoring { /////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/monlib/metrics/metric_consumer.cpp b/src/library/monlib/metrics/metric_consumer.cpp similarity index 91% rename from library/cpp/monlib/metrics/metric_consumer.cpp rename to src/library/monlib/metrics/metric_consumer.cpp index c9a06a38304..faa57e0ac0a 100644 --- a/library/cpp/monlib/metrics/metric_consumer.cpp +++ b/src/library/monlib/metrics/metric_consumer.cpp @@ -1,6 +1,6 @@ #include "metric_consumer.h" -#include +#include namespace NMonitoring { void IMetricConsumer::OnLabel(ui32 name, ui32 value) { diff --git a/library/cpp/monlib/metrics/metric_consumer.h b/src/library/monlib/metrics/metric_consumer.h similarity index 100% rename from library/cpp/monlib/metrics/metric_consumer.h rename to src/library/monlib/metrics/metric_consumer.h diff --git a/library/cpp/monlib/metrics/metric_registry.cpp b/src/library/monlib/metrics/metric_registry.cpp similarity index 100% rename from library/cpp/monlib/metrics/metric_registry.cpp rename to src/library/monlib/metrics/metric_registry.cpp diff --git a/library/cpp/monlib/metrics/metric_registry.h b/src/library/monlib/metrics/metric_registry.h similarity index 98% rename from library/cpp/monlib/metrics/metric_registry.h rename to src/library/monlib/metrics/metric_registry.h index 7b3a7aab70e..6909d01ecb1 100644 --- a/library/cpp/monlib/metrics/metric_registry.h +++ b/src/library/monlib/metrics/metric_registry.h @@ -3,9 +3,9 @@ #include "labels.h" #include "metric.h" -#include +#include -#include +#include namespace NMonitoring { diff --git a/library/cpp/monlib/metrics/metric_registry_ut.cpp b/src/library/monlib/metrics/metric_registry_ut.cpp similarity index 98% rename from library/cpp/monlib/metrics/metric_registry_ut.cpp rename to src/library/monlib/metrics/metric_registry_ut.cpp index c8ba696f321..371a021c803 100644 --- a/library/cpp/monlib/metrics/metric_registry_ut.cpp +++ b/src/library/monlib/metrics/metric_registry_ut.cpp @@ -1,12 +1,12 @@ #include "metric_registry.h" -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/metrics/metric_sub_registry.h b/src/library/monlib/metrics/metric_sub_registry.h similarity index 100% rename from library/cpp/monlib/metrics/metric_sub_registry.h rename to src/library/monlib/metrics/metric_sub_registry.h diff --git a/library/cpp/monlib/metrics/metric_sub_registry_ut.cpp b/src/library/monlib/metrics/metric_sub_registry_ut.cpp similarity index 97% rename from library/cpp/monlib/metrics/metric_sub_registry_ut.cpp rename to src/library/monlib/metrics/metric_sub_registry_ut.cpp index 0c5d48b8765..afd0ba7f7a4 100644 --- a/library/cpp/monlib/metrics/metric_sub_registry_ut.cpp +++ b/src/library/monlib/metrics/metric_sub_registry_ut.cpp @@ -1,6 +1,6 @@ #include "metric_sub_registry.h" -#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/metrics/metric_type.cpp b/src/library/monlib/metrics/metric_type.cpp similarity index 96% rename from library/cpp/monlib/metrics/metric_type.cpp rename to src/library/monlib/metrics/metric_type.cpp index c6d9b3260d9..b7aed64372e 100644 --- a/library/cpp/monlib/metrics/metric_type.cpp +++ b/src/library/monlib/metrics/metric_type.cpp @@ -1,8 +1,8 @@ #include "metric_type.h" #include -#include -#include +#include +#include namespace NMonitoring { std::string_view MetricTypeToStr(EMetricType type) { diff --git a/library/cpp/monlib/metrics/metric_type.h b/src/library/monlib/metrics/metric_type.h similarity index 93% rename from library/cpp/monlib/metrics/metric_type.h rename to src/library/monlib/metrics/metric_type.h index 2e9f1c2f13a..f8b42cca668 100644 --- a/library/cpp/monlib/metrics/metric_type.h +++ b/src/library/monlib/metrics/metric_type.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/library/cpp/monlib/metrics/metric_value.cpp b/src/library/monlib/metrics/metric_value.cpp similarity index 100% rename from library/cpp/monlib/metrics/metric_value.cpp rename to src/library/monlib/metrics/metric_value.cpp diff --git a/library/cpp/monlib/metrics/metric_value.h b/src/library/monlib/metrics/metric_value.h similarity index 99% rename from library/cpp/monlib/metrics/metric_value.h rename to src/library/monlib/metrics/metric_value.h index 29a26d7512f..7e875550b8c 100644 --- a/library/cpp/monlib/metrics/metric_value.h +++ b/src/library/monlib/metrics/metric_value.h @@ -5,11 +5,11 @@ #include "summary_collector.h" #include "log_histogram_snapshot.h" -#include -#include +#include +#include -#include -#include +#include +#include namespace NMonitoring { namespace NPrivate { diff --git a/library/cpp/monlib/metrics/metric_value_type.h b/src/library/monlib/metrics/metric_value_type.h similarity index 100% rename from library/cpp/monlib/metrics/metric_value_type.h rename to src/library/monlib/metrics/metric_value_type.h diff --git a/library/cpp/monlib/metrics/metric_value_ut.cpp b/src/library/monlib/metrics/metric_value_ut.cpp similarity index 99% rename from library/cpp/monlib/metrics/metric_value_ut.cpp rename to src/library/monlib/metrics/metric_value_ut.cpp index 710ad66d9c7..1e0143227d1 100644 --- a/library/cpp/monlib/metrics/metric_value_ut.cpp +++ b/src/library/monlib/metrics/metric_value_ut.cpp @@ -1,6 +1,6 @@ #include "metric_value.h" -#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/metrics/summary_collector.cpp b/src/library/monlib/metrics/summary_collector.cpp similarity index 100% rename from library/cpp/monlib/metrics/summary_collector.cpp rename to src/library/monlib/metrics/summary_collector.cpp diff --git a/library/cpp/monlib/metrics/summary_collector.h b/src/library/monlib/metrics/summary_collector.h similarity index 100% rename from library/cpp/monlib/metrics/summary_collector.h rename to src/library/monlib/metrics/summary_collector.h diff --git a/library/cpp/monlib/metrics/summary_collector_ut.cpp b/src/library/monlib/metrics/summary_collector_ut.cpp similarity index 95% rename from library/cpp/monlib/metrics/summary_collector_ut.cpp rename to src/library/monlib/metrics/summary_collector_ut.cpp index 17459bba23a..1c5800ebaa5 100644 --- a/library/cpp/monlib/metrics/summary_collector_ut.cpp +++ b/src/library/monlib/metrics/summary_collector_ut.cpp @@ -1,8 +1,8 @@ #include "summary_collector.h" -#include +#include -#include +#include #include #include diff --git a/library/cpp/monlib/metrics/summary_snapshot.cpp b/src/library/monlib/metrics/summary_snapshot.cpp similarity index 96% rename from library/cpp/monlib/metrics/summary_snapshot.cpp rename to src/library/monlib/metrics/summary_snapshot.cpp index e9df9dda215..17c4393e6ba 100644 --- a/library/cpp/monlib/metrics/summary_snapshot.cpp +++ b/src/library/monlib/metrics/summary_snapshot.cpp @@ -1,6 +1,6 @@ #include "summary_snapshot.h" -#include +#include #include diff --git a/library/cpp/monlib/metrics/summary_snapshot.h b/src/library/monlib/metrics/summary_snapshot.h similarity index 97% rename from library/cpp/monlib/metrics/summary_snapshot.h rename to src/library/monlib/metrics/summary_snapshot.h index afcc895fd39..0d659c2664d 100644 --- a/library/cpp/monlib/metrics/summary_snapshot.h +++ b/src/library/monlib/metrics/summary_snapshot.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NMonitoring { diff --git a/library/cpp/monlib/metrics/timer.h b/src/library/monlib/metrics/timer.h similarity index 99% rename from library/cpp/monlib/metrics/timer.h rename to src/library/monlib/metrics/timer.h index 93e5e7eb274..edc24bb2e3f 100644 --- a/library/cpp/monlib/metrics/timer.h +++ b/src/library/monlib/metrics/timer.h @@ -2,7 +2,7 @@ #include "metric.h" -#include +#include #include diff --git a/library/cpp/monlib/metrics/timer_ut.cpp b/src/library/monlib/metrics/timer_ut.cpp similarity index 96% rename from library/cpp/monlib/metrics/timer_ut.cpp rename to src/library/monlib/metrics/timer_ut.cpp index 8fa7d33172e..d848c63024b 100644 --- a/library/cpp/monlib/metrics/timer_ut.cpp +++ b/src/library/monlib/metrics/timer_ut.cpp @@ -1,8 +1,8 @@ #include "timer.h" -#include -#include -#include +#include +#include +#include using namespace NMonitoring; using namespace NThreading; diff --git a/library/cpp/monlib/metrics/ut/histograms.json b/src/library/monlib/metrics/ut/histograms.json similarity index 100% rename from library/cpp/monlib/metrics/ut/histograms.json rename to src/library/monlib/metrics/ut/histograms.json diff --git a/library/cpp/monlib/metrics/ut/ya.make b/src/library/monlib/metrics/ut/ya.make similarity index 67% rename from library/cpp/monlib/metrics/ut/ya.make rename to src/library/monlib/metrics/ut/ya.make index d30cc3db84b..d1a0e40b1bc 100644 --- a/library/cpp/monlib/metrics/ut/ya.make +++ b/src/library/monlib/metrics/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/monlib/metrics) +UNITTEST_FOR(src/library/monlib/metrics) SRCS( ewma_ut.cpp @@ -19,10 +19,10 @@ RESOURCE( ) PEERDIR( - library/cpp/resource - library/cpp/monlib/encode/protobuf - library/cpp/monlib/encode/json - library/cpp/threading/future + src/library/resource + src/library/monlib/encode/protobuf + src/library/monlib/encode/json + src/library/threading/future ) END() diff --git a/library/cpp/monlib/service/CMakeLists.txt b/src/library/monlib/service/CMakeLists.txt similarity index 57% rename from library/cpp/monlib/service/CMakeLists.txt rename to src/library/monlib/service/CMakeLists.txt index bee57c3f45f..fdd21f9b4de 100644 --- a/library/cpp/monlib/service/CMakeLists.txt +++ b/src/library/monlib/service/CMakeLists.txt @@ -18,11 +18,11 @@ target_link_libraries(cpp-monlib-service PUBLIC ) target_sources(cpp-monlib-service PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/monservice.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/mon_service_http_request.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/service.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/format.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/auth.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/monservice.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/mon_service_http_request.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/service.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/format.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/auth.cpp ) diff --git a/library/cpp/monlib/service/auth.cpp b/src/library/monlib/service/auth.cpp similarity index 100% rename from library/cpp/monlib/service/auth.cpp rename to src/library/monlib/service/auth.cpp diff --git a/library/cpp/monlib/service/auth.h b/src/library/monlib/service/auth.h similarity index 100% rename from library/cpp/monlib/service/auth.h rename to src/library/monlib/service/auth.h diff --git a/library/cpp/monlib/service/format.cpp b/src/library/monlib/service/format.cpp similarity index 100% rename from library/cpp/monlib/service/format.cpp rename to src/library/monlib/service/format.cpp diff --git a/library/cpp/monlib/service/format.h b/src/library/monlib/service/format.h similarity index 94% rename from library/cpp/monlib/service/format.h rename to src/library/monlib/service/format.h index d23908f4da3..c1f90cbbcf8 100644 --- a/library/cpp/monlib/service/format.h +++ b/src/library/monlib/service/format.h @@ -1,10 +1,10 @@ #pragma once -#include +#include -#include -#include -#include +#include +#include +#include namespace NMonitoring { namespace NPrivate { diff --git a/library/cpp/monlib/service/mon_service_http_request.cpp b/src/library/monlib/service/mon_service_http_request.cpp similarity index 100% rename from library/cpp/monlib/service/mon_service_http_request.cpp rename to src/library/monlib/service/mon_service_http_request.cpp diff --git a/library/cpp/monlib/service/mon_service_http_request.h b/src/library/monlib/service/mon_service_http_request.h similarity index 98% rename from library/cpp/monlib/service/mon_service_http_request.h rename to src/library/monlib/service/mon_service_http_request.h index 7b2bf619b25..8d3c8acfb26 100644 --- a/library/cpp/monlib/service/mon_service_http_request.h +++ b/src/library/monlib/service/mon_service_http_request.h @@ -2,7 +2,7 @@ #include "service.h" -#include +#include namespace NMonitoring { class TMonService2; diff --git a/library/cpp/monlib/service/monservice.cpp b/src/library/monlib/service/monservice.cpp similarity index 95% rename from library/cpp/monlib/service/monservice.cpp rename to src/library/monlib/service/monservice.cpp index a268343c55d..6fbdfba0505 100644 --- a/library/cpp/monlib/service/monservice.cpp +++ b/src/library/monlib/service/monservice.cpp @@ -1,10 +1,10 @@ #include "monservice.h" -#include -#include +#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/monlib/service/monservice.h b/src/library/monlib/service/monservice.h similarity index 94% rename from library/cpp/monlib/service/monservice.h rename to src/library/monlib/service/monservice.h index 0e312c31c11..27e21f69c4a 100644 --- a/library/cpp/monlib/service/monservice.h +++ b/src/library/monlib/service/monservice.h @@ -4,10 +4,10 @@ #include "auth.h" #include "mon_service_http_request.h" -#include -#include +#include +#include -#include +#include #include diff --git a/src/library/monlib/service/pages/CMakeLists.txt b/src/library/monlib/service/pages/CMakeLists.txt new file mode 100644 index 00000000000..e4783ff55b3 --- /dev/null +++ b/src/library/monlib/service/pages/CMakeLists.txt @@ -0,0 +1,30 @@ +add_subdirectory(resources) +add_subdirectory(tablesorter) + +add_library(monlib-service-pages) + +target_link_libraries(monlib-service-pages PUBLIC + yutil + library-cpp-build_info + library-cpp-svnversion + library-cpp-resource + cpp-monlib-service + monlib-encode-json + monlib-encode-text + monlib-encode-spack + monlib-encode-prometheus +) + +target_sources(monlib-service-pages PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/diag_mon_page.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/html_mon_page.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/index_mon_page.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/mon_page.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/pre_mon_page.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/resource_mon_page.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/templates.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/version_mon_page.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/registry_mon_page.cpp +) + + diff --git a/library/cpp/monlib/service/pages/diag_mon_page.cpp b/src/library/monlib/service/pages/diag_mon_page.cpp similarity index 100% rename from library/cpp/monlib/service/pages/diag_mon_page.cpp rename to src/library/monlib/service/pages/diag_mon_page.cpp diff --git a/library/cpp/monlib/service/pages/diag_mon_page.h b/src/library/monlib/service/pages/diag_mon_page.h similarity index 100% rename from library/cpp/monlib/service/pages/diag_mon_page.h rename to src/library/monlib/service/pages/diag_mon_page.h diff --git a/library/cpp/monlib/service/pages/html_mon_page.cpp b/src/library/monlib/service/pages/html_mon_page.cpp similarity index 97% rename from library/cpp/monlib/service/pages/html_mon_page.cpp rename to src/library/monlib/service/pages/html_mon_page.cpp index 4cace114afc..d9288d7332d 100644 --- a/library/cpp/monlib/service/pages/html_mon_page.cpp +++ b/src/library/monlib/service/pages/html_mon_page.cpp @@ -1,6 +1,6 @@ #include "html_mon_page.h" -#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/service/pages/html_mon_page.h b/src/library/monlib/service/pages/html_mon_page.h similarity index 100% rename from library/cpp/monlib/service/pages/html_mon_page.h rename to src/library/monlib/service/pages/html_mon_page.h diff --git a/library/cpp/monlib/service/pages/index_mon_page.cpp b/src/library/monlib/service/pages/index_mon_page.cpp similarity index 98% rename from library/cpp/monlib/service/pages/index_mon_page.cpp rename to src/library/monlib/service/pages/index_mon_page.cpp index 2db1bddcd01..2e68bf80671 100644 --- a/library/cpp/monlib/service/pages/index_mon_page.cpp +++ b/src/library/monlib/service/pages/index_mon_page.cpp @@ -1,7 +1,7 @@ #include "index_mon_page.h" -#include -#include +#include +#include using namespace NMonitoring; diff --git a/library/cpp/monlib/service/pages/index_mon_page.h b/src/library/monlib/service/pages/index_mon_page.h similarity index 100% rename from library/cpp/monlib/service/pages/index_mon_page.h rename to src/library/monlib/service/pages/index_mon_page.h diff --git a/library/cpp/monlib/service/pages/mon_page.cpp b/src/library/monlib/service/pages/mon_page.cpp similarity index 100% rename from library/cpp/monlib/service/pages/mon_page.cpp rename to src/library/monlib/service/pages/mon_page.cpp diff --git a/library/cpp/monlib/service/pages/mon_page.h b/src/library/monlib/service/pages/mon_page.h similarity index 96% rename from library/cpp/monlib/service/pages/mon_page.h rename to src/library/monlib/service/pages/mon_page.h index 8912a42f6d7..4ec567df27c 100644 --- a/library/cpp/monlib/service/pages/mon_page.h +++ b/src/library/monlib/service/pages/mon_page.h @@ -1,10 +1,10 @@ #pragma once -#include -#include +#include +#include #include -#include +#include namespace NMonitoring { static const char HTTPOKTEXT[] = "HTTP/1.1 200 Ok\r\nContent-Type: text/plain\r\nConnection: Close\r\n\r\n"; diff --git a/library/cpp/monlib/service/pages/pre_mon_page.cpp b/src/library/monlib/service/pages/pre_mon_page.cpp similarity index 100% rename from library/cpp/monlib/service/pages/pre_mon_page.cpp rename to src/library/monlib/service/pages/pre_mon_page.cpp diff --git a/library/cpp/monlib/service/pages/pre_mon_page.h b/src/library/monlib/service/pages/pre_mon_page.h similarity index 100% rename from library/cpp/monlib/service/pages/pre_mon_page.h rename to src/library/monlib/service/pages/pre_mon_page.h diff --git a/library/cpp/monlib/service/pages/registry_mon_page.cpp b/src/library/monlib/service/pages/registry_mon_page.cpp similarity index 83% rename from library/cpp/monlib/service/pages/registry_mon_page.cpp rename to src/library/monlib/service/pages/registry_mon_page.cpp index ef722b08233..fd0dbff01c4 100644 --- a/library/cpp/monlib/service/pages/registry_mon_page.cpp +++ b/src/library/monlib/service/pages/registry_mon_page.cpp @@ -1,12 +1,12 @@ #include "registry_mon_page.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include namespace NMonitoring { void TMetricRegistryPage::Output(NMonitoring::IMonHttpRequest& request) { diff --git a/library/cpp/monlib/service/pages/registry_mon_page.h b/src/library/monlib/service/pages/registry_mon_page.h similarity index 94% rename from library/cpp/monlib/service/pages/registry_mon_page.h rename to src/library/monlib/service/pages/registry_mon_page.h index 4fe90b7d167..6e0972d1ec3 100644 --- a/library/cpp/monlib/service/pages/registry_mon_page.h +++ b/src/library/monlib/service/pages/registry_mon_page.h @@ -2,7 +2,7 @@ #include "pre_mon_page.h" -#include +#include namespace NMonitoring { // For now this class can only enumerate all metrics without any grouping or serve JSON/Spack/Prometheus diff --git a/library/cpp/monlib/service/pages/resource_mon_page.cpp b/src/library/monlib/service/pages/resource_mon_page.cpp similarity index 100% rename from library/cpp/monlib/service/pages/resource_mon_page.cpp rename to src/library/monlib/service/pages/resource_mon_page.cpp diff --git a/library/cpp/monlib/service/pages/resource_mon_page.h b/src/library/monlib/service/pages/resource_mon_page.h similarity index 95% rename from library/cpp/monlib/service/pages/resource_mon_page.h rename to src/library/monlib/service/pages/resource_mon_page.h index 8d2465abd01..fdb3c1c911d 100644 --- a/library/cpp/monlib/service/pages/resource_mon_page.h +++ b/src/library/monlib/service/pages/resource_mon_page.h @@ -2,7 +2,7 @@ #include "mon_page.h" -#include +#include namespace NMonitoring { struct TResourceMonPage: public IMonPage { diff --git a/library/cpp/monlib/service/pages/resources/CMakeLists.txt b/src/library/monlib/service/pages/resources/CMakeLists.txt similarity index 66% rename from library/cpp/monlib/service/pages/resources/CMakeLists.txt rename to src/library/monlib/service/pages/resources/CMakeLists.txt index 51831b63957..fdca19db7d8 100644 --- a/library/cpp/monlib/service/pages/resources/CMakeLists.txt +++ b/src/library/monlib/service/pages/resources/CMakeLists.txt @@ -14,18 +14,18 @@ target_link_libraries(service-pages-resources.global PUBLIC cpp-monlib-dynamic_counters ) target_sources(service-pages-resources.global PRIVATE - ${YDB_SDK_BINARY_DIR}/library/cpp/monlib/service/pages/resources/ff1cb2429e1fce561e9b0ed0d5522c37.cpp + ${YDB_SDK_BINARY_DIR}/src/library/monlib/service/pages/resources/ff1cb2429e1fce561e9b0ed0d5522c37.cpp ) resources(service-pages-resources.global - ${YDB_SDK_BINARY_DIR}/library/cpp/monlib/service/pages/resources/ff1cb2429e1fce561e9b0ed0d5522c37.cpp + ${YDB_SDK_BINARY_DIR}/src/library/monlib/service/pages/resources/ff1cb2429e1fce561e9b0ed0d5522c37.cpp INPUTS - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/resources/static/css/bootstrap.min.css - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.eot - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.svg - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.ttf - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.woff - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/resources/static/js/bootstrap.min.js - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/resources/static/js/jquery.min.js + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/resources/static/css/bootstrap.min.css + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.eot + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.svg + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.ttf + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.woff + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/resources/static/js/bootstrap.min.js + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/resources/static/js/jquery.min.js KEYS static/css/bootstrap.min.css static/fonts/glyphicons-halflings-regular.eot @@ -36,7 +36,7 @@ resources(service-pages-resources.global static/js/jquery.min.js ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(service-pages-resources INTERFACE ) diff --git a/library/cpp/monlib/service/pages/resources/css_mon_page.h b/src/library/monlib/service/pages/resources/css_mon_page.h similarity index 80% rename from library/cpp/monlib/service/pages/resources/css_mon_page.h rename to src/library/monlib/service/pages/resources/css_mon_page.h index f8e72b1a6d4..55f9b22fbc2 100644 --- a/library/cpp/monlib/service/pages/resources/css_mon_page.h +++ b/src/library/monlib/service/pages/resources/css_mon_page.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NMonitoring { struct TBootstrapCssMonPage: public TResourceMonPage { diff --git a/library/cpp/monlib/service/pages/resources/fonts_mon_page.h b/src/library/monlib/service/pages/resources/fonts_mon_page.h similarity index 94% rename from library/cpp/monlib/service/pages/resources/fonts_mon_page.h rename to src/library/monlib/service/pages/resources/fonts_mon_page.h index b9bd92dd9da..4be73354f87 100644 --- a/library/cpp/monlib/service/pages/resources/fonts_mon_page.h +++ b/src/library/monlib/service/pages/resources/fonts_mon_page.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NMonitoring { struct TBootstrapFontsEotMonPage: public TResourceMonPage { diff --git a/library/cpp/monlib/service/pages/resources/js_mon_page.h b/src/library/monlib/service/pages/resources/js_mon_page.h similarity index 88% rename from library/cpp/monlib/service/pages/resources/js_mon_page.h rename to src/library/monlib/service/pages/resources/js_mon_page.h index 7ef2c3d2ec5..2a3b2922ddf 100644 --- a/library/cpp/monlib/service/pages/resources/js_mon_page.h +++ b/src/library/monlib/service/pages/resources/js_mon_page.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NMonitoring { struct TBootstrapJsMonPage: public TResourceMonPage { diff --git a/library/cpp/monlib/service/pages/resources/static/css/bootstrap.min.css b/src/library/monlib/service/pages/resources/static/css/bootstrap.min.css similarity index 100% rename from library/cpp/monlib/service/pages/resources/static/css/bootstrap.min.css rename to src/library/monlib/service/pages/resources/static/css/bootstrap.min.css diff --git a/library/cpp/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.eot b/src/library/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from library/cpp/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.eot rename to src/library/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.eot diff --git a/library/cpp/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.svg b/src/library/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from library/cpp/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.svg rename to src/library/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.svg diff --git a/library/cpp/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.ttf b/src/library/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from library/cpp/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.ttf rename to src/library/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.ttf diff --git a/library/cpp/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.woff b/src/library/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from library/cpp/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.woff rename to src/library/monlib/service/pages/resources/static/fonts/glyphicons-halflings-regular.woff diff --git a/library/cpp/monlib/service/pages/resources/static/js/bootstrap.min.js b/src/library/monlib/service/pages/resources/static/js/bootstrap.min.js similarity index 100% rename from library/cpp/monlib/service/pages/resources/static/js/bootstrap.min.js rename to src/library/monlib/service/pages/resources/static/js/bootstrap.min.js diff --git a/library/cpp/monlib/service/pages/resources/static/js/jquery.min.js b/src/library/monlib/service/pages/resources/static/js/jquery.min.js similarity index 100% rename from library/cpp/monlib/service/pages/resources/static/js/jquery.min.js rename to src/library/monlib/service/pages/resources/static/js/jquery.min.js diff --git a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.txt b/src/library/monlib/service/pages/tablesorter/CMakeLists.txt similarity index 73% rename from library/cpp/monlib/service/pages/tablesorter/CMakeLists.txt rename to src/library/monlib/service/pages/tablesorter/CMakeLists.txt index 3c40b0c93f4..93e1d49f2d9 100644 --- a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.txt +++ b/src/library/monlib/service/pages/tablesorter/CMakeLists.txt @@ -15,20 +15,20 @@ target_link_libraries(service-pages-tablesorter.global PUBLIC ) target_sources(service-pages-tablesorter.global PRIVATE - ${YDB_SDK_BINARY_DIR}/library/cpp/monlib/service/pages/tablesorter/0c255888afcc3e2adc5fd360ee152bac.cpp + ${YDB_SDK_BINARY_DIR}/src/library/monlib/service/pages/tablesorter/0c255888afcc3e2adc5fd360ee152bac.cpp ) resources(service-pages-tablesorter.global - ${YDB_SDK_BINARY_DIR}/library/cpp/monlib/service/pages/tablesorter/0c255888afcc3e2adc5fd360ee152bac.cpp + ${YDB_SDK_BINARY_DIR}/src/library/monlib/service/pages/tablesorter/0c255888afcc3e2adc5fd360ee152bac.cpp INPUTS - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/tablesorter/resources/jquery.tablesorter.css - ${YDB_SDK_SOURCE_DIR}/library/cpp/monlib/service/pages/tablesorter/resources/jquery.tablesorter.js + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/tablesorter/resources/jquery.tablesorter.css + ${YDB_SDK_SOURCE_DIR}/src/library/monlib/service/pages/tablesorter/resources/jquery.tablesorter.js KEYS jquery.tablesorter.css jquery.tablesorter.js ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(service-pages-tablesorter INTERFACE ) diff --git a/library/cpp/monlib/service/pages/tablesorter/css_mon_page.h b/src/library/monlib/service/pages/tablesorter/css_mon_page.h similarity index 79% rename from library/cpp/monlib/service/pages/tablesorter/css_mon_page.h rename to src/library/monlib/service/pages/tablesorter/css_mon_page.h index c2c8330089f..1325ab6b6c2 100644 --- a/library/cpp/monlib/service/pages/tablesorter/css_mon_page.h +++ b/src/library/monlib/service/pages/tablesorter/css_mon_page.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NMonitoring { struct TTablesorterCssMonPage: public TResourceMonPage { diff --git a/library/cpp/monlib/service/pages/tablesorter/js_mon_page.h b/src/library/monlib/service/pages/tablesorter/js_mon_page.h similarity index 79% rename from library/cpp/monlib/service/pages/tablesorter/js_mon_page.h rename to src/library/monlib/service/pages/tablesorter/js_mon_page.h index f8a1d8254e2..deaefef01cf 100644 --- a/library/cpp/monlib/service/pages/tablesorter/js_mon_page.h +++ b/src/library/monlib/service/pages/tablesorter/js_mon_page.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NMonitoring { struct TTablesorterJsMonPage: public TResourceMonPage { diff --git a/library/cpp/monlib/service/pages/tablesorter/resources/jquery.tablesorter.css b/src/library/monlib/service/pages/tablesorter/resources/jquery.tablesorter.css similarity index 100% rename from library/cpp/monlib/service/pages/tablesorter/resources/jquery.tablesorter.css rename to src/library/monlib/service/pages/tablesorter/resources/jquery.tablesorter.css diff --git a/library/cpp/monlib/service/pages/tablesorter/resources/jquery.tablesorter.js b/src/library/monlib/service/pages/tablesorter/resources/jquery.tablesorter.js similarity index 100% rename from library/cpp/monlib/service/pages/tablesorter/resources/jquery.tablesorter.js rename to src/library/monlib/service/pages/tablesorter/resources/jquery.tablesorter.js diff --git a/library/cpp/monlib/service/pages/templates.cpp b/src/library/monlib/service/pages/templates.cpp similarity index 100% rename from library/cpp/monlib/service/pages/templates.cpp rename to src/library/monlib/service/pages/templates.cpp diff --git a/library/cpp/monlib/service/pages/templates.h b/src/library/monlib/service/pages/templates.h similarity index 99% rename from library/cpp/monlib/service/pages/templates.h rename to src/library/monlib/service/pages/templates.h index 435497d0593..8fb18c55a60 100644 --- a/library/cpp/monlib/service/pages/templates.h +++ b/src/library/monlib/service/pages/templates.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #define WITH_SCOPED(var, value) WITH_SCOPED_I(var, value, Y_GENERATE_UNIQUE_ID(WITH_SCOPED_LABEL_)) diff --git a/library/cpp/monlib/service/pages/version_mon_page.cpp b/src/library/monlib/service/pages/version_mon_page.cpp similarity index 77% rename from library/cpp/monlib/service/pages/version_mon_page.cpp rename to src/library/monlib/service/pages/version_mon_page.cpp index dad34fa06a2..16ed25fe5ef 100644 --- a/library/cpp/monlib/service/pages/version_mon_page.cpp +++ b/src/library/monlib/service/pages/version_mon_page.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "version_mon_page.h" diff --git a/library/cpp/monlib/service/pages/version_mon_page.h b/src/library/monlib/service/pages/version_mon_page.h similarity index 100% rename from library/cpp/monlib/service/pages/version_mon_page.h rename to src/library/monlib/service/pages/version_mon_page.h diff --git a/library/cpp/monlib/service/service.cpp b/src/library/monlib/service/service.cpp similarity index 95% rename from library/cpp/monlib/service/service.cpp rename to src/library/monlib/service/service.cpp index 9f6685ac427..1f8cb6bec89 100644 --- a/library/cpp/monlib/service/service.cpp +++ b/src/library/monlib/service/service.cpp @@ -1,16 +1,16 @@ #include "service.h" -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include namespace NMonitoring { class THttpClient: public IHttpRequest { diff --git a/library/cpp/monlib/service/service.h b/src/library/monlib/service/service.h similarity index 91% rename from library/cpp/monlib/service/service.h rename to src/library/monlib/service/service.h index f14a6ab97b0..50304337883 100644 --- a/library/cpp/monlib/service/service.h +++ b/src/library/monlib/service/service.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include -#include - -#include -#include +#include +#include +#include +#include +#include + +#include +#include #include diff --git a/library/cpp/object_factory/object_factory.h b/src/library/object_factory/object_factory.h similarity index 97% rename from library/cpp/object_factory/object_factory.h rename to src/library/object_factory/object_factory.h index 3fa2cdafc79..02f03a1c6bb 100644 --- a/library/cpp/object_factory/object_factory.h +++ b/src/library/object_factory/object_factory.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/library/cpp/openssl/CMakeLists.txt b/src/library/openssl/CMakeLists.txt similarity index 100% rename from library/cpp/openssl/CMakeLists.txt rename to src/library/openssl/CMakeLists.txt diff --git a/library/cpp/openssl/holders/CMakeLists.txt b/src/library/openssl/holders/CMakeLists.txt similarity index 55% rename from library/cpp/openssl/holders/CMakeLists.txt rename to src/library/openssl/holders/CMakeLists.txt index eb98cc05a2b..acc6196296b 100644 --- a/library/cpp/openssl/holders/CMakeLists.txt +++ b/src/library/openssl/holders/CMakeLists.txt @@ -6,6 +6,6 @@ target_link_libraries(cpp-openssl-holders PUBLIC ) target_sources(cpp-openssl-holders PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/openssl/holders/bio.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/openssl/holders/x509_vfy.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/openssl/holders/bio.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/openssl/holders/x509_vfy.cpp ) diff --git a/library/cpp/openssl/holders/bio.cpp b/src/library/openssl/holders/bio.cpp similarity index 100% rename from library/cpp/openssl/holders/bio.cpp rename to src/library/openssl/holders/bio.cpp diff --git a/library/cpp/openssl/holders/bio.h b/src/library/openssl/holders/bio.h similarity index 92% rename from library/cpp/openssl/holders/bio.h rename to src/library/openssl/holders/bio.h index a474492801d..db64fce7659 100644 --- a/library/cpp/openssl/holders/bio.h +++ b/src/library/openssl/holders/bio.h @@ -2,7 +2,7 @@ #include -#include +#include namespace NOpenSSL { diff --git a/library/cpp/openssl/holders/evp.h b/src/library/openssl/holders/evp.h similarity index 100% rename from library/cpp/openssl/holders/evp.h rename to src/library/openssl/holders/evp.h diff --git a/library/cpp/openssl/holders/hmac.h b/src/library/openssl/holders/hmac.h similarity index 100% rename from library/cpp/openssl/holders/hmac.h rename to src/library/openssl/holders/hmac.h diff --git a/library/cpp/openssl/holders/holder.h b/src/library/openssl/holders/holder.h similarity index 92% rename from library/cpp/openssl/holders/holder.h rename to src/library/openssl/holders/holder.h index c2a26ce4312..7ef2b03a25b 100644 --- a/library/cpp/openssl/holders/holder.h +++ b/src/library/openssl/holders/holder.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NOpenSSL { diff --git a/library/cpp/openssl/holders/ut/evp_ut.cpp b/src/library/openssl/holders/ut/evp_ut.cpp similarity index 81% rename from library/cpp/openssl/holders/ut/evp_ut.cpp rename to src/library/openssl/holders/ut/evp_ut.cpp index 0f8c0aed011..49b3d7b69ae 100644 --- a/library/cpp/openssl/holders/ut/evp_ut.cpp +++ b/src/library/openssl/holders/ut/evp_ut.cpp @@ -1,6 +1,6 @@ #include "evp.h" -#include +#include Y_UNIT_TEST_SUITE(Evp) { Y_UNIT_TEST(Cipher) { diff --git a/library/cpp/openssl/holders/ut/hmac_ut.cpp b/src/library/openssl/holders/ut/hmac_ut.cpp similarity index 72% rename from library/cpp/openssl/holders/ut/hmac_ut.cpp rename to src/library/openssl/holders/ut/hmac_ut.cpp index 60f561c337d..d41d9620afc 100644 --- a/library/cpp/openssl/holders/ut/hmac_ut.cpp +++ b/src/library/openssl/holders/ut/hmac_ut.cpp @@ -1,6 +1,6 @@ #include "hmac.h" -#include +#include Y_UNIT_TEST_SUITE(Hmac) { Y_UNIT_TEST(Ctx) { diff --git a/library/cpp/openssl/holders/ut/ya.make b/src/library/openssl/holders/ut/ya.make similarity index 52% rename from library/cpp/openssl/holders/ut/ya.make rename to src/library/openssl/holders/ut/ya.make index cae373a4a99..878c2b61186 100644 --- a/library/cpp/openssl/holders/ut/ya.make +++ b/src/library/openssl/holders/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/openssl/holders) +UNITTEST_FOR(src/library/openssl/holders) SRCS( evp_ut.cpp diff --git a/library/cpp/openssl/holders/x509_vfy.cpp b/src/library/openssl/holders/x509_vfy.cpp similarity index 100% rename from library/cpp/openssl/holders/x509_vfy.cpp rename to src/library/openssl/holders/x509_vfy.cpp diff --git a/library/cpp/openssl/holders/x509_vfy.h b/src/library/openssl/holders/x509_vfy.h similarity index 93% rename from library/cpp/openssl/holders/x509_vfy.h rename to src/library/openssl/holders/x509_vfy.h index ef84859848d..fbdd2ba07b1 100644 --- a/library/cpp/openssl/holders/x509_vfy.h +++ b/src/library/openssl/holders/x509_vfy.h @@ -2,7 +2,7 @@ #include -#include +#include namespace NOpenSSL { diff --git a/library/cpp/openssl/init/CMakeLists.txt b/src/library/openssl/init/CMakeLists.txt similarity index 71% rename from library/cpp/openssl/init/CMakeLists.txt rename to src/library/openssl/init/CMakeLists.txt index 37c15f460b5..291f898bd34 100644 --- a/library/cpp/openssl/init/CMakeLists.txt +++ b/src/library/openssl/init/CMakeLists.txt @@ -6,5 +6,5 @@ target_link_libraries(cpp-openssl-init PUBLIC ) target_sources(cpp-openssl-init PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/openssl/init/init.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/openssl/init/init.cpp ) diff --git a/library/cpp/openssl/init/init.cpp b/src/library/openssl/init/init.cpp similarity index 84% rename from library/cpp/openssl/init/init.cpp rename to src/library/openssl/init/init.cpp index aa9e545047d..c04eb53824f 100644 --- a/library/cpp/openssl/init/init.cpp +++ b/src/library/openssl/init/init.cpp @@ -1,15 +1,15 @@ #include "init.h" -#include +#include -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/library/cpp/openssl/init/init.h b/src/library/openssl/init/init.h similarity index 100% rename from library/cpp/openssl/init/init.h rename to src/library/openssl/init/init.h diff --git a/library/cpp/openssl/io/CMakeLists.txt b/src/library/openssl/io/CMakeLists.txt similarity index 75% rename from library/cpp/openssl/io/CMakeLists.txt rename to src/library/openssl/io/CMakeLists.txt index c74fc926419..9f124ccf69a 100644 --- a/library/cpp/openssl/io/CMakeLists.txt +++ b/src/library/openssl/io/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries(cpp-openssl-io PUBLIC ) target_sources(cpp-openssl-io PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/openssl/io/stream.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/openssl/io/stream.cpp ) diff --git a/library/cpp/openssl/io/stream.cpp b/src/library/openssl/io/stream.cpp similarity index 97% rename from library/cpp/openssl/io/stream.cpp rename to src/library/openssl/io/stream.cpp index 1a235f4e4fc..4bd2dfa629c 100644 --- a/library/cpp/openssl/io/stream.cpp +++ b/src/library/openssl/io/stream.cpp @@ -1,11 +1,11 @@ #include "stream.h" -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/library/cpp/openssl/io/stream.h b/src/library/openssl/io/stream.h similarity index 90% rename from library/cpp/openssl/io/stream.h rename to src/library/openssl/io/stream.h index d7657b4063e..3c5dae617da 100644 --- a/library/cpp/openssl/io/stream.h +++ b/src/library/openssl/io/stream.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/openssl/io/ut/builtin_ut.cpp b/src/library/openssl/io/ut/builtin_ut.cpp similarity index 66% rename from library/cpp/openssl/io/ut/builtin_ut.cpp rename to src/library/openssl/io/ut/builtin_ut.cpp index 987cd084922..ced950cfc05 100644 --- a/library/cpp/openssl/io/ut/builtin_ut.cpp +++ b/src/library/openssl/io/ut/builtin_ut.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include Y_UNIT_TEST_SUITE(Builtin) { Y_UNIT_TEST(Init) { diff --git a/src/library/openssl/io/ut/ya.make b/src/library/openssl/io/ut/ya.make new file mode 100644 index 00000000000..0b2c9da7528 --- /dev/null +++ b/src/library/openssl/io/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/openssl/io) + +SRCS( + builtin_ut.cpp +) + +END() diff --git a/library/cpp/openssl/method/CMakeLists.txt b/src/library/openssl/method/CMakeLists.txt similarity index 74% rename from library/cpp/openssl/method/CMakeLists.txt rename to src/library/openssl/method/CMakeLists.txt index 244540931d7..5c8377a0f0a 100644 --- a/library/cpp/openssl/method/CMakeLists.txt +++ b/src/library/openssl/method/CMakeLists.txt @@ -7,5 +7,5 @@ target_link_libraries(cpp-openssl-method PUBLIC ) target_sources(cpp-openssl-method PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/openssl/method/io.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/openssl/method/io.cpp ) diff --git a/library/cpp/openssl/method/io.cpp b/src/library/openssl/method/io.cpp similarity index 94% rename from library/cpp/openssl/method/io.cpp rename to src/library/openssl/method/io.cpp index 533cb04180a..82710308ed2 100644 --- a/library/cpp/openssl/method/io.cpp +++ b/src/library/openssl/method/io.cpp @@ -1,9 +1,9 @@ #include "io.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace { using NOpenSSL::TAbstractIO; diff --git a/library/cpp/openssl/method/io.h b/src/library/openssl/method/io.h similarity index 93% rename from library/cpp/openssl/method/io.h rename to src/library/openssl/method/io.h index f1d3df978d7..ecaf9bd8be1 100644 --- a/library/cpp/openssl/method/io.h +++ b/src/library/openssl/method/io.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NOpenSSL { diff --git a/library/cpp/openssl/method/ut/io_ut.cpp b/src/library/openssl/method/ut/io_ut.cpp similarity index 91% rename from library/cpp/openssl/method/ut/io_ut.cpp rename to src/library/openssl/method/ut/io_ut.cpp index bff2b23d31b..6c763b7a903 100644 --- a/library/cpp/openssl/method/ut/io_ut.cpp +++ b/src/library/openssl/method/ut/io_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include class TTestIO : public NOpenSSL::TAbstractIO { public: diff --git a/src/library/openssl/method/ut/ya.make b/src/library/openssl/method/ut/ya.make new file mode 100644 index 00000000000..c669885a9d9 --- /dev/null +++ b/src/library/openssl/method/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/openssl/method) + +SRCS( + io_ut.cpp +) + +END() diff --git a/src/library/operation_id/CMakeLists.txt b/src/library/operation_id/CMakeLists.txt new file mode 100644 index 00000000000..46c9ceb2d20 --- /dev/null +++ b/src/library/operation_id/CMakeLists.txt @@ -0,0 +1,15 @@ +add_subdirectory(protos) + +add_library(library-operation_id) + +target_link_libraries(library-operation_id PUBLIC + yutil + protobuf::libprotobuf + library-cpp-cgiparam + library-cpp-uri + lib-operation_id-protos +) + +target_sources(library-operation_id PRIVATE + operation_id.cpp +) diff --git a/ydb/public/lib/operation_id/operation_id.cpp b/src/library/operation_id/operation_id.cpp similarity index 97% rename from ydb/public/lib/operation_id/operation_id.cpp rename to src/library/operation_id/operation_id.cpp index f7a0365a590..d08598beee7 100644 --- a/ydb/public/lib/operation_id/operation_id.cpp +++ b/src/library/operation_id/operation_id.cpp @@ -2,11 +2,11 @@ #include -#include -#include +#include +#include -#include -#include +#include +#include namespace NKikimr { namespace NOperationId { diff --git a/ydb/public/lib/operation_id/operation_id.h b/src/library/operation_id/operation_id.h similarity index 91% rename from ydb/public/lib/operation_id/operation_id.h rename to src/library/operation_id/operation_id.h index 7bdbda6b96f..c961d8f67fe 100644 --- a/ydb/public/lib/operation_id/operation_id.h +++ b/src/library/operation_id/operation_id.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include #include #include diff --git a/ydb/public/lib/operation_id/protos/CMakeLists.txt b/src/library/operation_id/protos/CMakeLists.txt similarity index 73% rename from ydb/public/lib/operation_id/protos/CMakeLists.txt rename to src/library/operation_id/protos/CMakeLists.txt index f8e2f487175..38dac33b6c3 100644 --- a/ydb/public/lib/operation_id/protos/CMakeLists.txt +++ b/src/library/operation_id/protos/CMakeLists.txt @@ -1,16 +1,13 @@ add_library(lib-operation_id-protos) target_link_libraries(lib-operation_id-protos PUBLIC - yutil protobuf::libprotobuf ) target_proto_messages(lib-operation_id-protos PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/lib/operation_id/protos/operation_id.proto + ${YDB_SDK_SOURCE_DIR}/src/library/operation_id/protos/operation_id.proto ) target_proto_addincls(lib-operation_id-protos ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} ${YDB_SDK_SOURCE_DIR} ${YDB_SDK_BINARY_DIR} ) diff --git a/ydb/public/lib/operation_id/protos/operation_id.proto b/src/library/operation_id/protos/operation_id.proto similarity index 100% rename from ydb/public/lib/operation_id/protos/operation_id.proto rename to src/library/operation_id/protos/operation_id.proto diff --git a/ydb/library/persqueue/CMakeLists.txt b/src/library/persqueue/CMakeLists.txt similarity index 100% rename from ydb/library/persqueue/CMakeLists.txt rename to src/library/persqueue/CMakeLists.txt diff --git a/ydb/library/persqueue/obfuscate/CMakeLists.txt b/src/library/persqueue/obfuscate/CMakeLists.txt similarity index 69% rename from ydb/library/persqueue/obfuscate/CMakeLists.txt rename to src/library/persqueue/obfuscate/CMakeLists.txt index d99d24bc21d..30264014185 100644 --- a/ydb/library/persqueue/obfuscate/CMakeLists.txt +++ b/src/library/persqueue/obfuscate/CMakeLists.txt @@ -5,5 +5,5 @@ target_link_libraries(library-persqueue-obfuscate PUBLIC ) target_sources(library-persqueue-obfuscate PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/library/persqueue/obfuscate/obfuscate.cpp + obfuscate.cpp ) diff --git a/ydb/library/persqueue/obfuscate/obfuscate.cpp b/src/library/persqueue/obfuscate/obfuscate.cpp similarity index 88% rename from ydb/library/persqueue/obfuscate/obfuscate.cpp rename to src/library/persqueue/obfuscate/obfuscate.cpp index 0c260a743b3..6053a70e090 100644 --- a/ydb/library/persqueue/obfuscate/obfuscate.cpp +++ b/src/library/persqueue/obfuscate/obfuscate.cpp @@ -1,6 +1,6 @@ #include "obfuscate.h" -#include +#include namespace NPersQueue { diff --git a/ydb/library/persqueue/obfuscate/obfuscate.h b/src/library/persqueue/obfuscate/obfuscate.h similarity index 100% rename from ydb/library/persqueue/obfuscate/obfuscate.h rename to src/library/persqueue/obfuscate/obfuscate.h diff --git a/ydb/library/persqueue/topic_parser_public/CMakeLists.txt b/src/library/persqueue/topic_parser_public/CMakeLists.txt similarity index 69% rename from ydb/library/persqueue/topic_parser_public/CMakeLists.txt rename to src/library/persqueue/topic_parser_public/CMakeLists.txt index 8d0e08307e6..9b8b278057d 100644 --- a/ydb/library/persqueue/topic_parser_public/CMakeLists.txt +++ b/src/library/persqueue/topic_parser_public/CMakeLists.txt @@ -5,5 +5,5 @@ target_link_libraries(library-persqueue-topic_parser_public PUBLIC ) target_sources(library-persqueue-topic_parser_public PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/library/persqueue/topic_parser_public/topic_parser.cpp + topic_parser.cpp ) diff --git a/ydb/library/persqueue/topic_parser_public/topic_parser.cpp b/src/library/persqueue/topic_parser_public/topic_parser.cpp similarity index 98% rename from ydb/library/persqueue/topic_parser_public/topic_parser.cpp rename to src/library/persqueue/topic_parser_public/topic_parser.cpp index a5e760b9140..4d1b01d0cdb 100644 --- a/ydb/library/persqueue/topic_parser_public/topic_parser.cpp +++ b/src/library/persqueue/topic_parser_public/topic_parser.cpp @@ -1,8 +1,8 @@ #include "topic_parser.h" -#include +#include -#include +#include namespace NPersQueue { diff --git a/ydb/library/persqueue/topic_parser_public/topic_parser.h b/src/library/persqueue/topic_parser_public/topic_parser.h similarity index 100% rename from ydb/library/persqueue/topic_parser_public/topic_parser.h rename to src/library/persqueue/topic_parser_public/topic_parser.h diff --git a/library/cpp/resource/CMakeLists.txt b/src/library/resource/CMakeLists.txt similarity index 65% rename from library/cpp/resource/CMakeLists.txt rename to src/library/resource/CMakeLists.txt index dfa95c9f85a..51ae4bf7cb7 100644 --- a/library/cpp/resource/CMakeLists.txt +++ b/src/library/resource/CMakeLists.txt @@ -8,8 +8,8 @@ target_link_libraries(library-cpp-resource PUBLIC ) target_sources(library-cpp-resource PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/resource/registry.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/resource/resource.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/resource/registry.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/resource/resource.cpp ) diff --git a/library/cpp/resource/README.md b/src/library/resource/README.md similarity index 93% rename from library/cpp/resource/README.md rename to src/library/resource/README.md index 99aedbd72ed..d1d65042dc3 100644 --- a/library/cpp/resource/README.md +++ b/src/library/resource/README.md @@ -16,7 +16,7 @@ END() ### Example - access to a file content by a key: ```cpp -#include +#include int main() { std::cout << NResource::Find("/key/in/program/1") << std::endl; std::cout << NResource::Find("/key2") << std::endl; diff --git a/library/cpp/resource/registry.cpp b/src/library/resource/registry.cpp similarity index 94% rename from library/cpp/resource/registry.cpp rename to src/library/resource/registry.cpp index 1868730e638..cd3b2c2ff4b 100644 --- a/library/cpp/resource/registry.cpp +++ b/src/library/resource/registry.cpp @@ -1,12 +1,12 @@ #include "registry.h" -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/library/cpp/resource/registry.h b/src/library/resource/registry.h similarity index 100% rename from library/cpp/resource/registry.h rename to src/library/resource/registry.h diff --git a/library/cpp/resource/resource.cpp b/src/library/resource/resource.cpp similarity index 94% rename from library/cpp/resource/resource.cpp rename to src/library/resource/resource.cpp index 80991c01999..fa27c54c775 100644 --- a/library/cpp/resource/resource.cpp +++ b/src/library/resource/resource.cpp @@ -2,8 +2,8 @@ #include "resource.h" #include "registry.h" -#include -#include +#include +#include using namespace NResource; diff --git a/library/cpp/resource/resource.h b/src/library/resource/resource.h similarity index 100% rename from library/cpp/resource/resource.h rename to src/library/resource/resource.h diff --git a/library/cpp/resource/ut/lib/data b/src/library/resource/ut/lib/data similarity index 100% rename from library/cpp/resource/ut/lib/data rename to src/library/resource/ut/lib/data diff --git a/library/cpp/resource/ut/lib/ya.make b/src/library/resource/ut/lib/ya.make similarity index 100% rename from library/cpp/resource/ut/lib/ya.make rename to src/library/resource/ut/lib/ya.make diff --git a/library/cpp/resource/ut/resource_ut.cpp b/src/library/resource/ut/resource_ut.cpp similarity index 77% rename from library/cpp/resource/ut/resource_ut.cpp rename to src/library/resource/ut/resource_ut.cpp index 67cf77c5713..14564ff4c55 100644 --- a/library/cpp/resource/ut/resource_ut.cpp +++ b/src/library/resource/ut/resource_ut.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include Y_UNIT_TEST_SUITE(TestResource) { Y_UNIT_TEST(Test1) { diff --git a/src/library/resource/ut/ya.make b/src/library/resource/ut/ya.make new file mode 100644 index 00000000000..e6c0e573af3 --- /dev/null +++ b/src/library/resource/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/resource/ut/lib) + +SRCS( + resource_ut.cpp +) + +END() diff --git a/library/cpp/retry/CMakeLists.txt b/src/library/retry/CMakeLists.txt similarity index 62% rename from library/cpp/retry/CMakeLists.txt rename to src/library/retry/CMakeLists.txt index c34891473a1..999edb5a69c 100644 --- a/library/cpp/retry/CMakeLists.txt +++ b/src/library/retry/CMakeLists.txt @@ -7,6 +7,6 @@ target_link_libraries(library-cpp-retry PUBLIC ) target_sources(library-cpp-retry PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/retry/retry.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/retry/utils.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/retry/retry.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/retry/utils.cpp ) \ No newline at end of file diff --git a/library/cpp/retry/protos/CMakeLists.txt b/src/library/retry/protos/CMakeLists.txt similarity index 83% rename from library/cpp/retry/protos/CMakeLists.txt rename to src/library/retry/protos/CMakeLists.txt index d2776777233..3c1c775a3d5 100644 --- a/library/cpp/retry/protos/CMakeLists.txt +++ b/src/library/retry/protos/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(cpp-retry-protos PUBLIC ) target_proto_messages(cpp-retry-protos PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/retry/protos/retry_options.proto + ${YDB_SDK_SOURCE_DIR}/src/library/retry/protos/retry_options.proto ) target_proto_addincls(cpp-retry-protos diff --git a/library/cpp/retry/protos/retry_options.proto b/src/library/retry/protos/retry_options.proto similarity index 100% rename from library/cpp/retry/protos/retry_options.proto rename to src/library/retry/protos/retry_options.proto diff --git a/library/cpp/retry/retry.cpp b/src/library/retry/retry.cpp similarity index 97% rename from library/cpp/retry/retry.cpp rename to src/library/retry/retry.cpp index 1ed6b9ac7dc..5a1ed509037 100644 --- a/library/cpp/retry/retry.cpp +++ b/src/library/retry/retry.cpp @@ -1,6 +1,6 @@ #include "retry.h" -#include +#include namespace { class TRetryOptionsWithRetCodePolicy : public IRetryPolicy { diff --git a/library/cpp/retry/retry.h b/src/library/retry/retry.h similarity index 97% rename from library/cpp/retry/retry.h rename to src/library/retry/retry.h index 6f2b68389e7..4d1aeb1350d 100644 --- a/library/cpp/retry/retry.h +++ b/src/library/retry/retry.h @@ -2,11 +2,11 @@ #include "retry_policy.h" #include "utils.h" -#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/retry/retry_policy.h b/src/library/retry/retry_policy.h similarity index 99% rename from library/cpp/retry/retry_policy.h rename to src/library/retry/retry_policy.h index dd7e5b97464..a9e59cc38ae 100644 --- a/library/cpp/retry/retry_policy.h +++ b/src/library/retry/retry_policy.h @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/library/cpp/retry/retry_policy_ut.cpp b/src/library/retry/retry_policy_ut.cpp similarity index 98% rename from library/cpp/retry/retry_policy_ut.cpp rename to src/library/retry/retry_policy_ut.cpp index 32a5896e082..1f7dd4d2555 100644 --- a/library/cpp/retry/retry_policy_ut.cpp +++ b/src/library/retry/retry_policy_ut.cpp @@ -1,6 +1,6 @@ #include "retry_policy.h" -#include +#include Y_UNIT_TEST_SUITE(RetryPolicy) { Y_UNIT_TEST(NoRetryPolicy) { diff --git a/library/cpp/retry/retry_ut.cpp b/src/library/retry/retry_ut.cpp similarity index 98% rename from library/cpp/retry/retry_ut.cpp rename to src/library/retry/retry_ut.cpp index 92153e987eb..ed2911895f9 100644 --- a/library/cpp/retry/retry_ut.cpp +++ b/src/library/retry/retry_ut.cpp @@ -1,6 +1,6 @@ #include "retry.h" -#include +#include namespace { class TDoOnSecondOrThrow { diff --git a/library/cpp/retry/ut/ya.make b/src/library/retry/ut/ya.make similarity index 64% rename from library/cpp/retry/ut/ya.make rename to src/library/retry/ut/ya.make index 10825edd324..4a1f99f94ef 100644 --- a/library/cpp/retry/ut/ya.make +++ b/src/library/retry/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/retry) +UNITTEST_FOR(src/library/retry) SRCS( retry_policy_ut.cpp diff --git a/library/cpp/retry/utils.cpp b/src/library/retry/utils.cpp similarity index 94% rename from library/cpp/retry/utils.cpp rename to src/library/retry/utils.cpp index 24d943f5185..c020dd5d6b1 100644 --- a/library/cpp/retry/utils.cpp +++ b/src/library/retry/utils.cpp @@ -1,6 +1,6 @@ #include "utils.h" -#include +#include TDuration NRetryPrivate::AddRandomDelta(TDuration maxDelta) { if (maxDelta == TDuration::Zero()) { diff --git a/library/cpp/retry/utils.h b/src/library/retry/utils.h similarity index 87% rename from library/cpp/retry/utils.h rename to src/library/retry/utils.h index a8fd3d1a898..501137fe1fb 100644 --- a/library/cpp/retry/utils.h +++ b/src/library/retry/utils.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NRetryPrivate { TDuration AddRandomDelta(TDuration delta); diff --git a/src/library/security/CMakeLists.txt b/src/library/security/CMakeLists.txt new file mode 100644 index 00000000000..8f6e598274c --- /dev/null +++ b/src/library/security/CMakeLists.txt @@ -0,0 +1,5 @@ +add_library(library-security INTERFACE) + +target_link_libraries(library-security INTERFACE + yutil +) diff --git a/ydb/library/security/util.h b/src/library/security/util.h similarity index 88% rename from ydb/library/security/util.h rename to src/library/security/util.h index 5086e45d580..2d57a948be7 100644 --- a/ydb/library/security/util.h +++ b/src/library/security/util.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace NKikimr { // copy-pasted from diff --git a/library/cpp/streams/CMakeLists.txt b/src/library/streams/CMakeLists.txt similarity index 100% rename from library/cpp/streams/CMakeLists.txt rename to src/library/streams/CMakeLists.txt diff --git a/library/cpp/streams/brotli/CMakeLists.txt b/src/library/streams/brotli/CMakeLists.txt similarity index 72% rename from library/cpp/streams/brotli/CMakeLists.txt rename to src/library/streams/brotli/CMakeLists.txt index 6a2fa32b121..e03008b5048 100644 --- a/library/cpp/streams/brotli/CMakeLists.txt +++ b/src/library/streams/brotli/CMakeLists.txt @@ -7,5 +7,5 @@ target_link_libraries(cpp-streams-brotli PUBLIC ) target_sources(cpp-streams-brotli PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/streams/brotli/brotli.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/streams/brotli/brotli.cpp ) diff --git a/library/cpp/streams/brotli/brotli.cpp b/src/library/streams/brotli/brotli.cpp similarity index 98% rename from library/cpp/streams/brotli/brotli.cpp rename to src/library/streams/brotli/brotli.cpp index aad6e9945e0..ed9715e36f0 100644 --- a/library/cpp/streams/brotli/brotli.cpp +++ b/src/library/streams/brotli/brotli.cpp @@ -3,8 +3,8 @@ #include #include -#include -#include +#include +#include namespace { struct TAllocator { diff --git a/library/cpp/streams/brotli/brotli.h b/src/library/streams/brotli/brotli.h similarity index 91% rename from library/cpp/streams/brotli/brotli.h rename to src/library/streams/brotli/brotli.h index b3af869e29c..dac484fa032 100644 --- a/library/cpp/streams/brotli/brotli.h +++ b/src/library/streams/brotli/brotli.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include /** * @addtogroup Streams_Archs diff --git a/library/cpp/streams/brotli/brotli_ut.cpp b/src/library/streams/brotli/brotli_ut.cpp similarity index 96% rename from library/cpp/streams/brotli/brotli_ut.cpp rename to src/library/streams/brotli/brotli_ut.cpp index 29d80007440..acca6b5b4ff 100644 --- a/library/cpp/streams/brotli/brotli_ut.cpp +++ b/src/library/streams/brotli/brotli_ut.cpp @@ -1,8 +1,8 @@ #include "brotli.h" -#include +#include -#include +#include Y_UNIT_TEST_SUITE(TBrotliTestSuite) { std::string Compress(std::string data) { diff --git a/src/library/streams/brotli/ut/ya.make b/src/library/streams/brotli/ut/ya.make new file mode 100644 index 00000000000..9378de6dc8f --- /dev/null +++ b/src/library/streams/brotli/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/streams/brotli) + +SRCS( + brotli_ut.cpp +) + +END() diff --git a/library/cpp/streams/bzip2/CMakeLists.txt b/src/library/streams/bzip2/CMakeLists.txt similarity index 71% rename from library/cpp/streams/bzip2/CMakeLists.txt rename to src/library/streams/bzip2/CMakeLists.txt index 66a3c8727a4..d42712fce8e 100644 --- a/library/cpp/streams/bzip2/CMakeLists.txt +++ b/src/library/streams/bzip2/CMakeLists.txt @@ -6,5 +6,5 @@ target_link_libraries(cpp-streams-bzip2 PUBLIC ) target_sources(cpp-streams-bzip2 PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/streams/bzip2/bzip2.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/streams/bzip2/bzip2.cpp ) diff --git a/library/cpp/streams/bzip2/bzip2.cpp b/src/library/streams/bzip2/bzip2.cpp similarity index 98% rename from library/cpp/streams/bzip2/bzip2.cpp rename to src/library/streams/bzip2/bzip2.cpp index 4f73ff10cb4..f1a135de7c6 100644 --- a/library/cpp/streams/bzip2/bzip2.cpp +++ b/src/library/streams/bzip2/bzip2.cpp @@ -1,7 +1,7 @@ #include "bzip2.h" -#include -#include +#include +#include #include diff --git a/library/cpp/streams/bzip2/bzip2.h b/src/library/streams/bzip2/bzip2.h similarity index 86% rename from library/cpp/streams/bzip2/bzip2.h rename to src/library/streams/bzip2/bzip2.h index 2322277ef6f..3fdef27de03 100644 --- a/library/cpp/streams/bzip2/bzip2.h +++ b/src/library/streams/bzip2/bzip2.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #define BZIP_BUF_LEN (8 * 1024) #define BZIP_COMPRESSION_LEVEL 6 diff --git a/library/cpp/streams/bzip2/bzip2_ut.cpp b/src/library/streams/bzip2/bzip2_ut.cpp similarity index 86% rename from library/cpp/streams/bzip2/bzip2_ut.cpp rename to src/library/streams/bzip2/bzip2_ut.cpp index e3d52116cdb..01377a154d0 100644 --- a/library/cpp/streams/bzip2/bzip2_ut.cpp +++ b/src/library/streams/bzip2/bzip2_ut.cpp @@ -1,9 +1,9 @@ #include "bzip2.h" -#include +#include -#include -#include +#include +#include #define ZDATA "./zdata" diff --git a/src/library/streams/bzip2/ut/ya.make b/src/library/streams/bzip2/ut/ya.make new file mode 100644 index 00000000000..8941cef7dd5 --- /dev/null +++ b/src/library/streams/bzip2/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/streams/bzip2) + +SRCS( + bzip2_ut.cpp +) + +END() diff --git a/library/cpp/streams/lz/common/error.h b/src/library/streams/lz/common/error.h similarity index 61% rename from library/cpp/streams/lz/common/error.h rename to src/library/streams/lz/common/error.h index 371945d5b43..20be71e719f 100644 --- a/library/cpp/streams/lz/common/error.h +++ b/src/library/streams/lz/common/error.h @@ -1,6 +1,6 @@ #pragma once -#include +#include struct TDecompressorError: public yexception { }; diff --git a/library/cpp/streams/lz/lz.h b/src/library/streams/lz/lz.h similarity index 92% rename from library/cpp/streams/lz/lz.h rename to src/library/streams/lz/lz.h index a18b69b53f4..4ef41718341 100644 --- a/library/cpp/streams/lz/lz.h +++ b/src/library/streams/lz/lz.h @@ -1,14 +1,14 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include -#include -#include +#include +#include /** * @file diff --git a/library/cpp/streams/lz/lz4/lz4.h b/src/library/streams/lz/lz4/lz4.h similarity index 88% rename from library/cpp/streams/lz/lz4/lz4.h rename to src/library/streams/lz/lz4/lz4.h index 24d66c80719..d6296c9bb8f 100644 --- a/library/cpp/streams/lz/lz4/lz4.h +++ b/src/library/streams/lz/lz4/lz4.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include /** * @addtogroup Streams_Archs diff --git a/library/cpp/streams/lz/snappy/snappy.h b/src/library/streams/lz/snappy/snappy.h similarity index 88% rename from library/cpp/streams/lz/snappy/snappy.h rename to src/library/streams/lz/snappy/snappy.h index 2e680217aab..03b6b248c10 100644 --- a/library/cpp/streams/lz/snappy/snappy.h +++ b/src/library/streams/lz/snappy/snappy.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include /** * @addtogroup Streams_Archs diff --git a/library/cpp/streams/lzma/CMakeLists.txt b/src/library/streams/lzma/CMakeLists.txt similarity index 72% rename from library/cpp/streams/lzma/CMakeLists.txt rename to src/library/streams/lzma/CMakeLists.txt index bf4d74a82c4..f6e67fbbe64 100644 --- a/library/cpp/streams/lzma/CMakeLists.txt +++ b/src/library/streams/lzma/CMakeLists.txt @@ -6,5 +6,5 @@ target_link_libraries(cpp-streams-lzma PUBLIC ) target_sources(cpp-streams-lzma PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/streams/lzma/lzma.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/streams/lzma/lzma.cpp ) diff --git a/library/cpp/streams/lzma/lzma.cpp b/src/library/streams/lzma/lzma.cpp similarity index 97% rename from library/cpp/streams/lzma/lzma.cpp rename to src/library/streams/lzma/lzma.cpp index b0f2a8102c4..b649eba8f3e 100644 --- a/library/cpp/streams/lzma/lzma.cpp +++ b/src/library/streams/lzma/lzma.cpp @@ -1,12 +1,12 @@ #include "lzma.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include extern "C" { #include diff --git a/library/cpp/streams/lzma/lzma.h b/src/library/streams/lzma/lzma.h similarity index 81% rename from library/cpp/streams/lzma/lzma.h rename to src/library/streams/lzma/lzma.h index ca1e06e9ef4..5a5abbe9673 100644 --- a/library/cpp/streams/lzma/lzma.h +++ b/src/library/streams/lzma/lzma.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include +#include +#include +#include -#include +#include class TLzmaCompress: public IOutputStream { public: diff --git a/library/cpp/streams/lzma/lzma_ut.cpp b/src/library/streams/lzma/lzma_ut.cpp similarity index 94% rename from library/cpp/streams/lzma/lzma_ut.cpp rename to src/library/streams/lzma/lzma_ut.cpp index d79df41eab3..9d99f0ce46d 100644 --- a/library/cpp/streams/lzma/lzma_ut.cpp +++ b/src/library/streams/lzma/lzma_ut.cpp @@ -1,10 +1,10 @@ #include "lzma.h" -#include +#include -#include -#include -#include +#include +#include +#include class TStrokaByOneByte: public IZeroCopyInput { public: diff --git a/src/library/streams/lzma/ut/ya.make b/src/library/streams/lzma/ut/ya.make new file mode 100644 index 00000000000..9f6fcf25c8d --- /dev/null +++ b/src/library/streams/lzma/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/streams/lzma) + +SRCS( + lzma_ut.cpp +) + +END() diff --git a/library/cpp/streams/zstd/CMakeLists.txt b/src/library/streams/zstd/CMakeLists.txt similarity index 70% rename from library/cpp/streams/zstd/CMakeLists.txt rename to src/library/streams/zstd/CMakeLists.txt index 5b13b0dd427..33c03904fc4 100644 --- a/library/cpp/streams/zstd/CMakeLists.txt +++ b/src/library/streams/zstd/CMakeLists.txt @@ -4,5 +4,5 @@ target_link_libraries(cpp-streams-zstd PUBLIC ZSTD::ZSTD ) target_sources(cpp-streams-zstd PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/streams/zstd/zstd.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/streams/zstd/zstd.cpp ) diff --git a/src/library/streams/zstd/ut/ya.make b/src/library/streams/zstd/ut/ya.make new file mode 100644 index 00000000000..5942d93e4a0 --- /dev/null +++ b/src/library/streams/zstd/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/streams/zstd) + +SRCS( + zstd_ut.cpp +) + +END() diff --git a/library/cpp/streams/zstd/zstd.cpp b/src/library/streams/zstd/zstd.cpp similarity index 98% rename from library/cpp/streams/zstd/zstd.cpp rename to src/library/streams/zstd/zstd.cpp index 40fe9e055fe..b71922847f6 100644 --- a/library/cpp/streams/zstd/zstd.cpp +++ b/src/library/streams/zstd/zstd.cpp @@ -1,7 +1,7 @@ #include "zstd.h" -#include -#include +#include +#include #define ZSTD_STATIC_LINKING_ONLY #include diff --git a/library/cpp/streams/zstd/zstd.h b/src/library/streams/zstd/zstd.h similarity index 92% rename from library/cpp/streams/zstd/zstd.h rename to src/library/streams/zstd/zstd.h index 667a0494b71..e6698207502 100644 --- a/library/cpp/streams/zstd/zstd.h +++ b/src/library/streams/zstd/zstd.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include /** * @addtogroup Streams_Archs diff --git a/library/cpp/streams/zstd/zstd_ut.cpp b/src/library/streams/zstd/zstd_ut.cpp similarity index 95% rename from library/cpp/streams/zstd/zstd_ut.cpp rename to src/library/streams/zstd/zstd_ut.cpp index 8f2d67b3b7f..d158fdbe002 100644 --- a/library/cpp/streams/zstd/zstd_ut.cpp +++ b/src/library/streams/zstd/zstd_ut.cpp @@ -1,10 +1,10 @@ #include "zstd.h" -#include +#include -#include -#include -#include +#include +#include +#include Y_UNIT_TEST_SUITE(TZstdTestSuite) { std::string Compress(std::string data, int quality = -1) { diff --git a/library/cpp/string_utils/CMakeLists.txt b/src/library/string_utils/CMakeLists.txt similarity index 100% rename from library/cpp/string_utils/CMakeLists.txt rename to src/library/string_utils/CMakeLists.txt diff --git a/library/cpp/string_utils/base64/CMakeLists.txt b/src/library/string_utils/base64/CMakeLists.txt similarity index 72% rename from library/cpp/string_utils/base64/CMakeLists.txt rename to src/library/string_utils/base64/CMakeLists.txt index 6c02752e267..163fe891589 100644 --- a/library/cpp/string_utils/base64/CMakeLists.txt +++ b/src/library/string_utils/base64/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(cpp-string_utils-base64 PUBLIC ) target_sources(cpp-string_utils-base64 PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/string_utils/base64/base64.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/string_utils/base64/base64.cpp ) diff --git a/library/cpp/string_utils/base64/base64.cpp b/src/library/string_utils/base64/base64.cpp similarity index 98% rename from library/cpp/string_utils/base64/base64.cpp rename to src/library/string_utils/base64/base64.cpp index 1b18220b496..3432c3549a1 100644 --- a/library/cpp/string_utils/base64/base64.cpp +++ b/src/library/string_utils/base64/base64.cpp @@ -1,9 +1,9 @@ #include "base64.h" #include -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/string_utils/base64/base64.h b/src/library/string_utils/base64/base64.h similarity index 100% rename from library/cpp/string_utils/base64/base64.h rename to src/library/string_utils/base64/base64.h diff --git a/library/cpp/string_utils/base64/base64_decode_uneven_ut.cpp b/src/library/string_utils/base64/base64_decode_uneven_ut.cpp similarity index 96% rename from library/cpp/string_utils/base64/base64_decode_uneven_ut.cpp rename to src/library/string_utils/base64/base64_decode_uneven_ut.cpp index 90128642f5c..1aa4408bbf6 100644 --- a/library/cpp/string_utils/base64/base64_decode_uneven_ut.cpp +++ b/src/library/string_utils/base64/base64_decode_uneven_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include Y_UNIT_TEST_SUITE(TBase64DecodeUneven) { Y_UNIT_TEST(Base64DecodeUneven) { diff --git a/library/cpp/string_utils/base64/base64_ut.cpp b/src/library/string_utils/base64/base64_ut.cpp similarity index 99% rename from library/cpp/string_utils/base64/base64_ut.cpp rename to src/library/string_utils/base64/base64_ut.cpp index 84bc597ce0c..1a20fca2246 100644 --- a/library/cpp/string_utils/base64/base64_ut.cpp +++ b/src/library/string_utils/base64/base64_ut.cpp @@ -7,12 +7,12 @@ #include #include -#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/string_utils/base64/ut/ya.make b/src/library/string_utils/base64/ut/ya.make similarity index 85% rename from library/cpp/string_utils/base64/ut/ya.make rename to src/library/string_utils/base64/ut/ya.make index bfab185e891..b47b23c35e2 100644 --- a/library/cpp/string_utils/base64/ut/ya.make +++ b/src/library/string_utils/base64/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/string_utils/base64) +UNITTEST_FOR(src/library/string_utils/base64) SRCS( base64_ut.cpp diff --git a/library/cpp/string_utils/helpers/CMakeLists.txt b/src/library/string_utils/helpers/CMakeLists.txt similarity index 59% rename from library/cpp/string_utils/helpers/CMakeLists.txt rename to src/library/string_utils/helpers/CMakeLists.txt index c0b6e3bca59..39ba4b6b772 100644 --- a/library/cpp/string_utils/helpers/CMakeLists.txt +++ b/src/library/string_utils/helpers/CMakeLists.txt @@ -1,5 +1,5 @@ add_library(cpp-string_utils-helpers) target_sources(cpp-string_utils-helpers PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/string_utils/helpers/helpers.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/string_utils/helpers/helpers.cpp ) diff --git a/library/cpp/string_utils/helpers/helpers.cpp b/src/library/string_utils/helpers/helpers.cpp similarity index 100% rename from library/cpp/string_utils/helpers/helpers.cpp rename to src/library/string_utils/helpers/helpers.cpp diff --git a/library/cpp/string_utils/helpers/helpers.h b/src/library/string_utils/helpers/helpers.h similarity index 100% rename from library/cpp/string_utils/helpers/helpers.h rename to src/library/string_utils/helpers/helpers.h diff --git a/library/cpp/string_utils/misc/CMakeLists.txt b/src/library/string_utils/misc/CMakeLists.txt similarity index 78% rename from library/cpp/string_utils/misc/CMakeLists.txt rename to src/library/string_utils/misc/CMakeLists.txt index 49e55bc5aa8..066892833eb 100644 --- a/library/cpp/string_utils/misc/CMakeLists.txt +++ b/src/library/string_utils/misc/CMakeLists.txt @@ -5,7 +5,7 @@ target_link_libraries(cpp-string_utils-misc INTERFACE cpp-string_utils-helpers ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(cpp-string_utils-misc INTERFACE ) diff --git a/library/cpp/string_utils/misc/misc.h b/src/library/string_utils/misc/misc.h similarity index 89% rename from library/cpp/string_utils/misc/misc.h rename to src/library/string_utils/misc/misc.h index 6ec6a3774a6..b0bbdbc530e 100644 --- a/library/cpp/string_utils/misc/misc.h +++ b/src/library/string_utils/misc/misc.h @@ -1,9 +1,9 @@ #pragma once -#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/string_utils/quote/CMakeLists.txt b/src/library/string_utils/quote/CMakeLists.txt similarity index 70% rename from library/cpp/string_utils/quote/CMakeLists.txt rename to src/library/string_utils/quote/CMakeLists.txt index aad5bc60bca..fa653350c03 100644 --- a/library/cpp/string_utils/quote/CMakeLists.txt +++ b/src/library/string_utils/quote/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(cpp-string_utils-quote PUBLIC ) target_sources(cpp-string_utils-quote PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/string_utils/quote/quote.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/string_utils/quote/quote.cpp ) diff --git a/library/cpp/string_utils/quote/quote.cpp b/src/library/string_utils/quote/quote.cpp similarity index 98% rename from library/cpp/string_utils/quote/quote.cpp rename to src/library/string_utils/quote/quote.cpp index cbb49f902ff..351520c661d 100644 --- a/library/cpp/string_utils/quote/quote.cpp +++ b/src/library/string_utils/quote/quote.cpp @@ -1,8 +1,8 @@ #include "quote.h" -#include -#include -#include +#include +#include +#include /* note: (x & 0xdf) makes x upper case */ #define GETXC \ diff --git a/library/cpp/string_utils/quote/quote.h b/src/library/string_utils/quote/quote.h similarity index 100% rename from library/cpp/string_utils/quote/quote.h rename to src/library/string_utils/quote/quote.h diff --git a/library/cpp/string_utils/quote/quote_ut.cpp b/src/library/string_utils/quote/quote_ut.cpp similarity index 99% rename from library/cpp/string_utils/quote/quote_ut.cpp rename to src/library/string_utils/quote/quote_ut.cpp index caf7a04efcf..b139e3c4267 100644 --- a/library/cpp/string_utils/quote/quote_ut.cpp +++ b/src/library/string_utils/quote/quote_ut.cpp @@ -1,6 +1,6 @@ #include "quote.h" -#include +#include Y_UNIT_TEST_SUITE(TCGIEscapeTest) { Y_UNIT_TEST(ReturnsEndOfTo) { diff --git a/src/library/string_utils/quote/ut/ya.make b/src/library/string_utils/quote/ut/ya.make new file mode 100644 index 00000000000..43b659195f8 --- /dev/null +++ b/src/library/string_utils/quote/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/string_utils/quote) + +SRCS( + quote_ut.cpp +) + +END() diff --git a/library/cpp/string_utils/relaxed_escaper/CMakeLists.txt b/src/library/string_utils/relaxed_escaper/CMakeLists.txt similarity index 76% rename from library/cpp/string_utils/relaxed_escaper/CMakeLists.txt rename to src/library/string_utils/relaxed_escaper/CMakeLists.txt index 70b5cd9fd43..fb3cf0c8cfc 100644 --- a/library/cpp/string_utils/relaxed_escaper/CMakeLists.txt +++ b/src/library/string_utils/relaxed_escaper/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(cpp-string_utils-relaxed_escaper PUBLIC ) target_sources(cpp-string_utils-relaxed_escaper PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/string_utils/relaxed_escaper/relaxed_escaper.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/string_utils/relaxed_escaper/relaxed_escaper.cpp ) diff --git a/library/cpp/string_utils/relaxed_escaper/relaxed_escaper.cpp b/src/library/string_utils/relaxed_escaper/relaxed_escaper.cpp similarity index 100% rename from library/cpp/string_utils/relaxed_escaper/relaxed_escaper.cpp rename to src/library/string_utils/relaxed_escaper/relaxed_escaper.cpp diff --git a/library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h b/src/library/string_utils/relaxed_escaper/relaxed_escaper.h similarity index 97% rename from library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h rename to src/library/string_utils/relaxed_escaper/relaxed_escaper.h index a4d4252f857..6c5873827d4 100644 --- a/library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h +++ b/src/library/string_utils/relaxed_escaper/relaxed_escaper.h @@ -1,12 +1,12 @@ #pragma once -#include -#include -#include +#include +#include +#include #include namespace NEscJ { - // almost copypaste from util/string/escape.h + // almost copypaste from src/util/string/escape.h // todo: move there (note difference in IsPrintable and handling of string) inline char HexDigit(char value) { diff --git a/library/cpp/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp b/src/library/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp similarity index 98% rename from library/cpp/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp rename to src/library/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp index a4abca91675..d69792e7540 100644 --- a/library/cpp/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp +++ b/src/library/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp @@ -1,6 +1,6 @@ #include "relaxed_escaper.h" -#include +#include #define RESC_FIXED_STR(s) std::string_view(s, sizeof(s) - 1) static const std::string_view CommonTestData[] = { diff --git a/src/library/string_utils/relaxed_escaper/ut/ya.make b/src/library/string_utils/relaxed_escaper/ut/ya.make new file mode 100644 index 00000000000..0458ab6a71a --- /dev/null +++ b/src/library/string_utils/relaxed_escaper/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/string_utils/relaxed_escaper) + +SRCS( + relaxed_escaper_ut.cpp +) + +END() diff --git a/library/cpp/string_utils/scan/CMakeLists.txt b/src/library/string_utils/scan/CMakeLists.txt similarity index 70% rename from library/cpp/string_utils/scan/CMakeLists.txt rename to src/library/string_utils/scan/CMakeLists.txt index 4a229454e52..b97df00f1f8 100644 --- a/library/cpp/string_utils/scan/CMakeLists.txt +++ b/src/library/string_utils/scan/CMakeLists.txt @@ -5,7 +5,7 @@ target_link_libraries(cpp-string_utils-scan PUBLIC ) target_sources(cpp-string_utils-scan PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/string_utils/scan/scan.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/string_utils/scan/scan.cpp ) diff --git a/library/cpp/string_utils/scan/scan.cpp b/src/library/string_utils/scan/scan.cpp similarity index 100% rename from library/cpp/string_utils/scan/scan.cpp rename to src/library/string_utils/scan/scan.cpp diff --git a/library/cpp/string_utils/scan/scan.h b/src/library/string_utils/scan/scan.h similarity index 90% rename from library/cpp/string_utils/scan/scan.h rename to src/library/string_utils/scan/scan.h index 4f555decaba..07730717c40 100644 --- a/library/cpp/string_utils/scan/scan.h +++ b/src/library/string_utils/scan/scan.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/library/cpp/string_utils/stream/CMakeLists.txt b/src/library/string_utils/stream/CMakeLists.txt similarity index 70% rename from library/cpp/string_utils/stream/CMakeLists.txt rename to src/library/string_utils/stream/CMakeLists.txt index 252b40a634b..4981cca291d 100644 --- a/library/cpp/string_utils/stream/CMakeLists.txt +++ b/src/library/string_utils/stream/CMakeLists.txt @@ -5,6 +5,6 @@ target_link_libraries(cpp-string_utils-stream PUBLIC ) target_sources(cpp-string_utils-stream PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/string_utils/stream/stream.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/string_utils/stream/stream.cpp ) diff --git a/library/cpp/string_utils/stream/stream.cpp b/src/library/string_utils/stream/stream.cpp similarity index 100% rename from library/cpp/string_utils/stream/stream.cpp rename to src/library/string_utils/stream/stream.cpp diff --git a/library/cpp/string_utils/stream/stream.h b/src/library/string_utils/stream/stream.h similarity index 68% rename from library/cpp/string_utils/stream/stream.h rename to src/library/string_utils/stream/stream.h index c4f9a88297b..51b4ae17b4a 100644 --- a/library/cpp/string_utils/stream/stream.h +++ b/src/library/string_utils/stream/stream.h @@ -1,4 +1,4 @@ -#include +#include namespace NUtils { diff --git a/library/cpp/string_utils/url/CMakeLists.txt b/src/library/string_utils/url/CMakeLists.txt similarity index 73% rename from library/cpp/string_utils/url/CMakeLists.txt rename to src/library/string_utils/url/CMakeLists.txt index cf0ad91fc8b..7b594f20fd9 100644 --- a/library/cpp/string_utils/url/CMakeLists.txt +++ b/src/library/string_utils/url/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(cpp-string_utils-url PUBLIC ) target_sources(cpp-string_utils-url PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/string_utils/url/url.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/string_utils/url/url.cpp ) diff --git a/library/cpp/string_utils/url/url.cpp b/src/library/string_utils/url/url.cpp similarity index 96% rename from library/cpp/string_utils/url/url.cpp rename to src/library/string_utils/url/url.cpp index 32205dfd448..d357645d854 100644 --- a/library/cpp/string_utils/url/url.cpp +++ b/src/library/string_utils/url/url.cpp @@ -1,19 +1,19 @@ #include "url.h" -#include -#include - -#include -#include -#include -#include -#include - -#include // for ToLower -#include -#include -#include -#include +#include +#include + +#include +#include +#include +#include +#include + +#include // for ToLower +#include +#include +#include +#include #include diff --git a/library/cpp/string_utils/url/url.h b/src/library/string_utils/url/url.h similarity index 99% rename from library/cpp/string_utils/url/url.h rename to src/library/string_utils/url/url.h index 71e144a8856..9ff0b169dc2 100644 --- a/library/cpp/string_utils/url/url.h +++ b/src/library/string_utils/url/url.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include namespace NUrl { diff --git a/library/cpp/string_utils/url/url_ut.cpp b/src/library/string_utils/url/url_ut.cpp similarity index 99% rename from library/cpp/string_utils/url/url_ut.cpp rename to src/library/string_utils/url/url_ut.cpp index 4a6ff4fedb3..b68ffb32ed4 100644 --- a/library/cpp/string_utils/url/url_ut.cpp +++ b/src/library/string_utils/url/url_ut.cpp @@ -1,8 +1,8 @@ #include "url.h" -#include +#include -#include +#include Y_UNIT_TEST_SUITE(TUtilUrlTest) { Y_UNIT_TEST(TestGetHostAndGetHostAndPort) { diff --git a/src/library/string_utils/url/ut/ya.make b/src/library/string_utils/url/ut/ya.make new file mode 100644 index 00000000000..45bf21e27fa --- /dev/null +++ b/src/library/string_utils/url/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/string_utils/url) + +SRCS( + url_ut.cpp +) + +END() diff --git a/library/cpp/svnversion/CMakeLists.txt b/src/library/svnversion/CMakeLists.txt similarity index 58% rename from library/cpp/svnversion/CMakeLists.txt rename to src/library/svnversion/CMakeLists.txt index dd029466f54..d6e29776c11 100644 --- a/library/cpp/svnversion/CMakeLists.txt +++ b/src/library/svnversion/CMakeLists.txt @@ -6,8 +6,8 @@ target_link_libraries(library-cpp-svnversion PUBLIC ) target_sources(library-cpp-svnversion PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/svnversion/svnversion.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/svnversion/svn_interface.c + ${YDB_SDK_SOURCE_DIR}/src/library/svnversion/svnversion.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/svnversion/svn_interface.c ) diff --git a/library/cpp/svnversion/svn_interface.c b/src/library/svnversion/svn_interface.c similarity index 100% rename from library/cpp/svnversion/svn_interface.c rename to src/library/svnversion/svn_interface.c diff --git a/library/cpp/svnversion/svnversion.cpp b/src/library/svnversion/svnversion.cpp similarity index 94% rename from library/cpp/svnversion/svnversion.cpp rename to src/library/svnversion/svnversion.cpp index f0f70538183..0553a186fba 100644 --- a/library/cpp/svnversion/svnversion.cpp +++ b/src/library/svnversion/svnversion.cpp @@ -5,7 +5,7 @@ #define FROM_IMPL #include "svnversion.h" -#include +#include #include extern "C" void PrintProgramSvnVersion() { diff --git a/library/cpp/svnversion/svnversion.h b/src/library/svnversion/svnversion.h similarity index 90% rename from library/cpp/svnversion/svnversion.h rename to src/library/svnversion/svnversion.h index 6475a140a76..b289cb07696 100644 --- a/library/cpp/svnversion/svnversion.h +++ b/src/library/svnversion/svnversion.h @@ -7,7 +7,7 @@ #define PRINT_VERSION_EX(opts) PrintSvnVersionAndExitEx(argc, (char**)argv, opts) #endif -#include +#include // Automatically generated functions. #include "scripts/c_templates/svnversion.h" diff --git a/library/cpp/terminate_handler/CMakeLists.txt b/src/library/terminate_handler/CMakeLists.txt similarity index 76% rename from library/cpp/terminate_handler/CMakeLists.txt rename to src/library/terminate_handler/CMakeLists.txt index dfcd21c8a08..f153d68856f 100644 --- a/library/cpp/terminate_handler/CMakeLists.txt +++ b/src/library/terminate_handler/CMakeLists.txt @@ -3,7 +3,7 @@ target_link_libraries(library-cpp-terminate_handler PUBLIC yutil ) target_sources(library-cpp-terminate_handler PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/terminate_handler/segv_handler.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/terminate_handler/segv_handler.cpp ) add_global_library_for(library-cpp-terminate_handler.global library-cpp-terminate_handler) @@ -11,5 +11,5 @@ target_link_libraries(library-cpp-terminate_handler.global PUBLIC yutil ) target_sources(library-cpp-terminate_handler.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/terminate_handler/terminate_handler.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/terminate_handler/terminate_handler.cpp ) diff --git a/library/cpp/terminate_handler/sample/exception/main.cpp b/src/library/terminate_handler/sample/exception/main.cpp similarity index 81% rename from library/cpp/terminate_handler/sample/exception/main.cpp rename to src/library/terminate_handler/sample/exception/main.cpp index 35bfae8874a..cee44b23032 100644 --- a/library/cpp/terminate_handler/sample/exception/main.cpp +++ b/src/library/terminate_handler/sample/exception/main.cpp @@ -1,4 +1,4 @@ -#include +#include void Foo(unsigned i = 0) { diff --git a/library/cpp/terminate_handler/sample/exception/ya.make b/src/library/terminate_handler/sample/exception/ya.make similarity index 66% rename from library/cpp/terminate_handler/sample/exception/ya.make rename to src/library/terminate_handler/sample/exception/ya.make index c43de8348e0..cee8a638958 100644 --- a/library/cpp/terminate_handler/sample/exception/ya.make +++ b/src/library/terminate_handler/sample/exception/ya.make @@ -5,7 +5,7 @@ SRCS( ) PEERDIR( - library/cpp/terminate_handler + src/library/terminate_handler ) END() diff --git a/library/cpp/terminate_handler/sample/pure-virtual/main.cpp b/src/library/terminate_handler/sample/pure-virtual/main.cpp similarity index 100% rename from library/cpp/terminate_handler/sample/pure-virtual/main.cpp rename to src/library/terminate_handler/sample/pure-virtual/main.cpp diff --git a/library/cpp/terminate_handler/sample/pure-virtual/ya.make b/src/library/terminate_handler/sample/pure-virtual/ya.make similarity index 60% rename from library/cpp/terminate_handler/sample/pure-virtual/ya.make rename to src/library/terminate_handler/sample/pure-virtual/ya.make index ae4a907f402..c04f5ca56d6 100644 --- a/library/cpp/terminate_handler/sample/pure-virtual/ya.make +++ b/src/library/terminate_handler/sample/pure-virtual/ya.make @@ -5,7 +5,7 @@ SRCS( ) PEERDIR( - library/cpp/terminate_handler + src/library/terminate_handler ) END() diff --git a/library/cpp/terminate_handler/sample/rethrow/main.cpp b/src/library/terminate_handler/sample/rethrow/main.cpp similarity index 85% rename from library/cpp/terminate_handler/sample/rethrow/main.cpp rename to src/library/terminate_handler/sample/rethrow/main.cpp index 303548cfb01..007919cc2a6 100644 --- a/library/cpp/terminate_handler/sample/rethrow/main.cpp +++ b/src/library/terminate_handler/sample/rethrow/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/library/cpp/terminate_handler/sample/rethrow/ya.make b/src/library/terminate_handler/sample/rethrow/ya.make similarity index 60% rename from library/cpp/terminate_handler/sample/rethrow/ya.make rename to src/library/terminate_handler/sample/rethrow/ya.make index ae4a907f402..c04f5ca56d6 100644 --- a/library/cpp/terminate_handler/sample/rethrow/ya.make +++ b/src/library/terminate_handler/sample/rethrow/ya.make @@ -5,7 +5,7 @@ SRCS( ) PEERDIR( - library/cpp/terminate_handler + src/library/terminate_handler ) END() diff --git a/library/cpp/terminate_handler/sample/segv/main.cpp b/src/library/terminate_handler/sample/segv/main.cpp similarity index 100% rename from library/cpp/terminate_handler/sample/segv/main.cpp rename to src/library/terminate_handler/sample/segv/main.cpp diff --git a/library/cpp/terminate_handler/sample/segv/ya.make b/src/library/terminate_handler/sample/segv/ya.make similarity index 60% rename from library/cpp/terminate_handler/sample/segv/ya.make rename to src/library/terminate_handler/sample/segv/ya.make index ae4a907f402..c04f5ca56d6 100644 --- a/library/cpp/terminate_handler/sample/segv/ya.make +++ b/src/library/terminate_handler/sample/segv/ya.make @@ -5,7 +5,7 @@ SRCS( ) PEERDIR( - library/cpp/terminate_handler + src/library/terminate_handler ) END() diff --git a/library/cpp/terminate_handler/segv_handler.cpp b/src/library/terminate_handler/segv_handler.cpp similarity index 81% rename from library/cpp/terminate_handler/segv_handler.cpp rename to src/library/terminate_handler/segv_handler.cpp index af461797e05..8858ebaaff3 100644 --- a/library/cpp/terminate_handler/segv_handler.cpp +++ b/src/library/terminate_handler/segv_handler.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/library/cpp/terminate_handler/segv_handler.h b/src/library/terminate_handler/segv_handler.h similarity index 100% rename from library/cpp/terminate_handler/segv_handler.h rename to src/library/terminate_handler/segv_handler.h diff --git a/library/cpp/terminate_handler/terminate_handler.cpp b/src/library/terminate_handler/terminate_handler.cpp similarity index 89% rename from library/cpp/terminate_handler/terminate_handler.cpp rename to src/library/terminate_handler/terminate_handler.cpp index ae93ff73686..4a7cdadb70a 100644 --- a/library/cpp/terminate_handler/terminate_handler.cpp +++ b/src/library/terminate_handler/terminate_handler.cpp @@ -1,9 +1,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/library/cpp/testing/CMakeLists.txt b/src/library/testing/CMakeLists.txt similarity index 100% rename from library/cpp/testing/CMakeLists.txt rename to src/library/testing/CMakeLists.txt diff --git a/library/cpp/testing/README.md b/src/library/testing/README.md similarity index 100% rename from library/cpp/testing/README.md rename to src/library/testing/README.md diff --git a/src/library/testing/common/CMakeLists.txt b/src/library/testing/common/CMakeLists.txt new file mode 100644 index 00000000000..ba6d2cf21dd --- /dev/null +++ b/src/library/testing/common/CMakeLists.txt @@ -0,0 +1,17 @@ +add_library(cpp-testing-common) +target_link_libraries(cpp-testing-common PUBLIC + yutil + library-cpp-json + library-cpp-svnversion +) +target_sources(cpp-testing-common PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/testing/common/env.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/common/env_var.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/common/network.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/common/probe.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/common/scope.cpp +) + +vcs_info(cpp-testing-common) + +add_subdirectory(ut) diff --git a/library/cpp/testing/common/env.cpp b/src/library/testing/common/env.cpp similarity index 94% rename from library/cpp/testing/common/env.cpp rename to src/library/testing/common/env.cpp index 87cae207527..99ae896d95c 100644 --- a/library/cpp/testing/common/env.cpp +++ b/src/library/testing/common/env.cpp @@ -2,19 +2,19 @@ #include "env_var.h" -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include #include diff --git a/library/cpp/testing/common/env.h b/src/library/testing/common/env.h similarity index 97% rename from library/cpp/testing/common/env.h rename to src/library/testing/common/env.h index 03df71dfc0d..f06174f3609 100644 --- a/library/cpp/testing/common/env.h +++ b/src/library/testing/common/env.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/library/cpp/testing/common/env_var.cpp b/src/library/testing/common/env_var.cpp similarity index 88% rename from library/cpp/testing/common/env_var.cpp rename to src/library/testing/common/env_var.cpp index 4d349fb3bcb..7310d4f92c2 100644 --- a/library/cpp/testing/common/env_var.cpp +++ b/src/library/testing/common/env_var.cpp @@ -1,11 +1,11 @@ #include "env_var.h" -#include +#include -#include +#include #if defined(_win_) - #include + #include #else #include #endif diff --git a/library/cpp/testing/common/env_var.h b/src/library/testing/common/env_var.h similarity index 100% rename from library/cpp/testing/common/env_var.h rename to src/library/testing/common/env_var.h diff --git a/library/cpp/testing/common/network.cpp b/src/library/testing/common/network.cpp similarity index 94% rename from library/cpp/testing/common/network.cpp rename to src/library/testing/common/network.cpp index bc63bc59df8..ae5842d7299 100644 --- a/library/cpp/testing/common/network.cpp +++ b/src/library/testing/common/network.cpp @@ -2,20 +2,20 @@ #include "env_var.h" -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef _darwin_ #include diff --git a/library/cpp/testing/common/network.h b/src/library/testing/common/network.h similarity index 97% rename from library/cpp/testing/common/network.h rename to src/library/testing/common/network.h index 12cbb304e7c..b66e0685057 100644 --- a/library/cpp/testing/common/network.h +++ b/src/library/testing/common/network.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NTesting { diff --git a/library/cpp/testing/common/probe.cpp b/src/library/testing/common/probe.cpp similarity index 100% rename from library/cpp/testing/common/probe.cpp rename to src/library/testing/common/probe.cpp diff --git a/library/cpp/testing/common/probe.h b/src/library/testing/common/probe.h similarity index 98% rename from library/cpp/testing/common/probe.h rename to src/library/testing/common/probe.h index 19910979b56..dca290df55a 100644 --- a/library/cpp/testing/common/probe.h +++ b/src/library/testing/common/probe.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NTesting { //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/testing/common/scope.cpp b/src/library/testing/common/scope.cpp similarity index 100% rename from library/cpp/testing/common/scope.cpp rename to src/library/testing/common/scope.cpp diff --git a/library/cpp/testing/common/scope.h b/src/library/testing/common/scope.h similarity index 100% rename from library/cpp/testing/common/scope.h rename to src/library/testing/common/scope.h diff --git a/library/cpp/testing/common/ut/CMakeLists.txt b/src/library/testing/common/ut/CMakeLists.txt similarity index 100% rename from library/cpp/testing/common/ut/CMakeLists.txt rename to src/library/testing/common/ut/CMakeLists.txt diff --git a/library/cpp/testing/common/ut/env_ut.cpp b/src/library/testing/common/ut/env_ut.cpp similarity index 94% rename from library/cpp/testing/common/ut/env_ut.cpp rename to src/library/testing/common/ut/env_ut.cpp index b99b6c24457..3e28277c8c9 100644 --- a/library/cpp/testing/common/ut/env_ut.cpp +++ b/src/library/testing/common/ut/env_ut.cpp @@ -1,11 +1,11 @@ -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include TEST(Runtime, ArcadiaSourceRoot) { @@ -41,7 +41,7 @@ TEST(Runtime, BuildRoot) { TEST(Runtime, BinaryPath) { NTesting::TScopedEnvironment contextGuard("YA_TEST_CONTEXT_FILE", ""); // remove context filename Singleton()->ReInitialize(); - EXPECT_TRUE(TFsPath(BinaryPath("library/cpp/testing/common/ut")).Exists()); + EXPECT_TRUE(TFsPath(BinaryPath("src/library/testing/common/ut")).Exists()); } TEST(Runtime, GetArcadiaTestsData) { diff --git a/library/cpp/testing/common/ut/network_ut.cpp b/src/library/testing/common/ut/network_ut.cpp similarity index 90% rename from library/cpp/testing/common/ut/network_ut.cpp rename to src/library/testing/common/ut/network_ut.cpp index d240353d78e..21731802c2e 100644 --- a/library/cpp/testing/common/ut/network_ut.cpp +++ b/src/library/testing/common/ut/network_ut.cpp @@ -1,14 +1,14 @@ -#include -#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include #include static TTempDir TmpDir; diff --git a/library/cpp/testing/common/ut/scope_ut.cpp b/src/library/testing/common/ut/scope_ut.cpp similarity index 87% rename from library/cpp/testing/common/ut/scope_ut.cpp rename to src/library/testing/common/ut/scope_ut.cpp index 85bb68a5757..595b4079106 100644 --- a/library/cpp/testing/common/ut/scope_ut.cpp +++ b/src/library/testing/common/ut/scope_ut.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include -#include +#include TEST(TScopedEnvironment, SingleValue) { const std::string before = NUtils::GetEnv("ARCADIA_SOURCE_ROOT"); diff --git a/library/cpp/testing/common/ut/ya.make b/src/library/testing/common/ut/ya.make similarity index 73% rename from library/cpp/testing/common/ut/ya.make rename to src/library/testing/common/ut/ya.make index 100c42f835a..f71b4c69cb5 100644 --- a/library/cpp/testing/common/ut/ya.make +++ b/src/library/testing/common/ut/ya.make @@ -6,7 +6,7 @@ SRCS( ) PEERDIR( - library/cpp/testing/common + src/library/testing/common ) END() diff --git a/library/cpp/testing/common/ya.make b/src/library/testing/common/ya.make similarity index 84% rename from library/cpp/testing/common/ya.make rename to src/library/testing/common/ya.make index c0ec98af53a..14c3632adee 100644 --- a/library/cpp/testing/common/ya.make +++ b/src/library/testing/common/ya.make @@ -8,7 +8,7 @@ SRCS( ) PEERDIR( - library/cpp/json + src/library/json ) END() diff --git a/library/cpp/testing/gmock_in_unittest/CMakeLists.txt b/src/library/testing/gmock_in_unittest/CMakeLists.txt similarity index 83% rename from library/cpp/testing/gmock_in_unittest/CMakeLists.txt rename to src/library/testing/gmock_in_unittest/CMakeLists.txt index a2f75a0f2a6..ec096f5a615 100644 --- a/library/cpp/testing/gmock_in_unittest/CMakeLists.txt +++ b/src/library/testing/gmock_in_unittest/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries(cpp-testing-gmock_in_unittest PUBLIC cpp-testing-unittest ) target_sources(cpp-testing-gmock_in_unittest PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/gmock_in_unittest/events.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/gmock_in_unittest/events.cpp ) add_global_library_for(cpp-testing-gmock_in_unittest.global cpp-testing-gmock_in_unittest) @@ -19,7 +19,7 @@ target_link_libraries(cpp-testing-gmock_in_unittest.global PUBLIC cpp-testing-unittest ) target_sources(cpp-testing-gmock_in_unittest.global PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/gmock_in_unittest/registration.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/gmock_in_unittest/registration.cpp ) # Unit tests diff --git a/library/cpp/testing/gmock_in_unittest/events.cpp b/src/library/testing/gmock_in_unittest/events.cpp similarity index 91% rename from library/cpp/testing/gmock_in_unittest/events.cpp rename to src/library/testing/gmock_in_unittest/events.cpp index f47cb4b9a6a..9d2a1ca4b96 100644 --- a/library/cpp/testing/gmock_in_unittest/events.cpp +++ b/src/library/testing/gmock_in_unittest/events.cpp @@ -1,8 +1,8 @@ #include "events.h" -#include +#include -#include +#include #include #include diff --git a/library/cpp/testing/gmock_in_unittest/events.h b/src/library/testing/gmock_in_unittest/events.h similarity index 100% rename from library/cpp/testing/gmock_in_unittest/events.h rename to src/library/testing/gmock_in_unittest/events.h diff --git a/library/cpp/testing/gmock_in_unittest/example_ut/CMakeLists.txt b/src/library/testing/gmock_in_unittest/example_ut/CMakeLists.txt similarity index 100% rename from library/cpp/testing/gmock_in_unittest/example_ut/CMakeLists.txt rename to src/library/testing/gmock_in_unittest/example_ut/CMakeLists.txt diff --git a/library/cpp/testing/gmock_in_unittest/example_ut/example_ut.cpp b/src/library/testing/gmock_in_unittest/example_ut/example_ut.cpp similarity index 96% rename from library/cpp/testing/gmock_in_unittest/example_ut/example_ut.cpp rename to src/library/testing/gmock_in_unittest/example_ut/example_ut.cpp index d2323fb2556..89e33c01f92 100644 --- a/library/cpp/testing/gmock_in_unittest/example_ut/example_ut.cpp +++ b/src/library/testing/gmock_in_unittest/example_ut/example_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include #include diff --git a/library/cpp/testing/gmock_in_unittest/example_ut/ya.make b/src/library/testing/gmock_in_unittest/example_ut/ya.make similarity index 58% rename from library/cpp/testing/gmock_in_unittest/example_ut/ya.make rename to src/library/testing/gmock_in_unittest/example_ut/ya.make index 38d3aae8117..87427a3bd72 100644 --- a/library/cpp/testing/gmock_in_unittest/example_ut/ya.make +++ b/src/library/testing/gmock_in_unittest/example_ut/ya.make @@ -1,7 +1,7 @@ UNITTEST() PEERDIR( - library/cpp/testing/gmock_in_unittest + src/library/testing/gmock_in_unittest ) SRCS( diff --git a/src/library/testing/gmock_in_unittest/gmock.h b/src/library/testing/gmock_in_unittest/gmock.h new file mode 100644 index 00000000000..e8d46e6de21 --- /dev/null +++ b/src/library/testing/gmock_in_unittest/gmock.h @@ -0,0 +1,5 @@ +#pragma once + +#include + +#include diff --git a/library/cpp/testing/gmock_in_unittest/registration.cpp b/src/library/testing/gmock_in_unittest/registration.cpp similarity index 92% rename from library/cpp/testing/gmock_in_unittest/registration.cpp rename to src/library/testing/gmock_in_unittest/registration.cpp index c2872a4c27e..4dd90916d77 100644 --- a/library/cpp/testing/gmock_in_unittest/registration.cpp +++ b/src/library/testing/gmock_in_unittest/registration.cpp @@ -2,7 +2,7 @@ #include -#include +#include namespace { class TGMockUnittestPlugin: public NUnitTest::NPlugin::IPlugin { diff --git a/library/cpp/testing/gmock_in_unittest/ya.make b/src/library/testing/gmock_in_unittest/ya.make similarity index 73% rename from library/cpp/testing/gmock_in_unittest/ya.make rename to src/library/testing/gmock_in_unittest/ya.make index cd2fa65b48d..6ede8e950a8 100644 --- a/library/cpp/testing/gmock_in_unittest/ya.make +++ b/src/library/testing/gmock_in_unittest/ya.make @@ -3,8 +3,8 @@ LIBRARY() PEERDIR( contrib/restricted/googletest/googlemock contrib/restricted/googletest/googletest - library/cpp/testing/gtest_extensions - library/cpp/testing/unittest + src/library/testing/gtest_extensions + src/library/testing/unittest ) SRCS( diff --git a/library/cpp/testing/gtest/CMakeLists.txt b/src/library/testing/gtest/CMakeLists.txt similarity index 100% rename from library/cpp/testing/gtest/CMakeLists.txt rename to src/library/testing/gtest/CMakeLists.txt diff --git a/library/cpp/testing/gtest/README.md b/src/library/testing/gtest/README.md similarity index 100% rename from library/cpp/testing/gtest/README.md rename to src/library/testing/gtest/README.md diff --git a/library/cpp/testing/gtest/gtest.cpp b/src/library/testing/gtest/gtest.cpp similarity index 83% rename from library/cpp/testing/gtest/gtest.cpp rename to src/library/testing/gtest/gtest.cpp index 4c7a9e8f5e6..47e62990a2d 100644 --- a/library/cpp/testing/gtest/gtest.cpp +++ b/src/library/testing/gtest/gtest.cpp @@ -1,6 +1,6 @@ #include "gtest.h" -#include +#include std::optional NGTest::GetTestParam(std::string_view name) { auto val = ::GetTestParam(name); diff --git a/library/cpp/testing/gtest/gtest.h b/src/library/testing/gtest/gtest.h similarity index 89% rename from library/cpp/testing/gtest/gtest.h rename to src/library/testing/gtest/gtest.h index a4d0c775d00..a802603356f 100644 --- a/library/cpp/testing/gtest/gtest.h +++ b/src/library/testing/gtest/gtest.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include #include #include diff --git a/library/cpp/testing/gtest/main.cpp b/src/library/testing/gtest/main.cpp similarity index 98% rename from library/cpp/testing/gtest/main.cpp rename to src/library/testing/gtest/main.cpp index e405930f103..ec547e0ae51 100644 --- a/library/cpp/testing/gtest/main.cpp +++ b/src/library/testing/gtest/main.cpp @@ -1,12 +1,12 @@ #include "main.h" #include "gtest.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/library/cpp/testing/gtest/main.h b/src/library/testing/gtest/main.h similarity index 95% rename from library/cpp/testing/gtest/main.h rename to src/library/testing/gtest/main.h index ee025d52da6..145e67646ec 100644 --- a/library/cpp/testing/gtest/main.h +++ b/src/library/testing/gtest/main.h @@ -60,9 +60,9 @@ namespace NGTest { }; /** - * Parse unittest-related flags. Test binaries support flags from `library/cpp/testing/unittest` and flags from gtest. + * Parse unittest-related flags. Test binaries support flags from `src/library/testing/unittest` and flags from gtest. * This means that there are usually two parsing passes. The first one parses arguments as recognized - * by the `library/cpp/testing/unittest`, so things like `--trace-path` and filters. The second one parses flags + * by the `src/library/testing/unittest`, so things like `--trace-path` and filters. The second one parses flags * as recognized by gtest. */ TFlags ParseFlags(int argc, char** argv); diff --git a/library/cpp/testing/gtest/matchers.cpp b/src/library/testing/gtest/matchers.cpp similarity index 78% rename from library/cpp/testing/gtest/matchers.cpp rename to src/library/testing/gtest/matchers.cpp index 58d769d4ffd..4e4c7b522f1 100644 --- a/library/cpp/testing/gtest/matchers.cpp +++ b/src/library/testing/gtest/matchers.cpp @@ -1,10 +1,10 @@ -#include +#include -#include +#include -#include -#include -#include +#include +#include +#include bool NGTest::NDetail::MatchOrUpdateGolden(std::string_view actualContent, const std::string& goldenFilename) { if (!GetTestParam("GTEST_UPDATE_GOLDEN").empty()) { diff --git a/library/cpp/testing/gtest/matchers.h b/src/library/testing/gtest/matchers.h similarity index 100% rename from library/cpp/testing/gtest/matchers.h rename to src/library/testing/gtest/matchers.h diff --git a/library/cpp/testing/gtest/ut/CMakeLists.txt b/src/library/testing/gtest/ut/CMakeLists.txt similarity index 100% rename from library/cpp/testing/gtest/ut/CMakeLists.txt rename to src/library/testing/gtest/ut/CMakeLists.txt diff --git a/library/cpp/testing/gtest/ut/README.md b/src/library/testing/gtest/ut/README.md similarity index 100% rename from library/cpp/testing/gtest/ut/README.md rename to src/library/testing/gtest/ut/README.md diff --git a/library/cpp/testing/gtest/ut/golden/data.txt b/src/library/testing/gtest/ut/golden/data.txt similarity index 100% rename from library/cpp/testing/gtest/ut/golden/data.txt rename to src/library/testing/gtest/ut/golden/data.txt diff --git a/library/cpp/testing/gtest/ut/matchers_ut.cpp b/src/library/testing/gtest/ut/matchers_ut.cpp similarity index 85% rename from library/cpp/testing/gtest/ut/matchers_ut.cpp rename to src/library/testing/gtest/ut/matchers_ut.cpp index 81973ec77af..bc1522032af 100644 --- a/library/cpp/testing/gtest/ut/matchers_ut.cpp +++ b/src/library/testing/gtest/ut/matchers_ut.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include diff --git a/library/cpp/testing/gtest/ut/ut.cpp b/src/library/testing/gtest/ut/ut.cpp similarity index 92% rename from library/cpp/testing/gtest/ut/ut.cpp rename to src/library/testing/gtest/ut/ut.cpp index 160adbc86bb..4f550dacbf0 100644 --- a/library/cpp/testing/gtest/ut/ut.cpp +++ b/src/library/testing/gtest/ut/ut.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include static int HookOrder = 0; static int PreInitHook1 = 0; diff --git a/src/library/testing/gtest/ut/ya.make b/src/library/testing/gtest/ut/ya.make new file mode 100644 index 00000000000..73224d0fc15 --- /dev/null +++ b/src/library/testing/gtest/ut/ya.make @@ -0,0 +1,15 @@ +GTEST() +SRCS( + matchers_ut.cpp + ut.cpp +) + +DATA( + arcadia/src/library/testing/gtest/ut/golden +) + +PEERDIR( + src/library/testing/hook +) + +END() diff --git a/library/cpp/testing/gtest/ya.make b/src/library/testing/gtest/ya.make similarity index 60% rename from library/cpp/testing/gtest/ya.make rename to src/library/testing/gtest/ya.make index 74beb1a0512..6589c0313dd 100644 --- a/library/cpp/testing/gtest/ya.make +++ b/src/library/testing/gtest/ya.make @@ -11,10 +11,10 @@ SRCS( PEERDIR( contrib/restricted/googletest/googlemock contrib/restricted/googletest/googletest - library/cpp/string_utils/relaxed_escaper - library/cpp/testing/common - library/cpp/testing/gtest_extensions - library/cpp/testing/hook + src/library/string_utils/relaxed_escaper + src/library/testing/common + src/library/testing/gtest_extensions + src/library/testing/hook ) END() diff --git a/src/library/testing/gtest_extensions/CMakeLists.txt b/src/library/testing/gtest_extensions/CMakeLists.txt new file mode 100644 index 00000000000..96de13c9c14 --- /dev/null +++ b/src/library/testing/gtest_extensions/CMakeLists.txt @@ -0,0 +1,16 @@ +add_library(cpp-testing-gtest_extensions) +target_link_libraries(cpp-testing-gtest_extensions PUBLIC + yutil + GTest::gmock + GTest::gtest +) +target_sources(cpp-testing-gtest_extensions PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/testing/gtest_extensions/assertions.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/gtest_extensions/gtest_extensions.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/gtest_extensions/matchers.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/gtest_extensions/pretty_printers.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/gtest_extensions/probe.cpp +) + +# Unit tests +add_subdirectory(ut) diff --git a/library/cpp/testing/gtest_extensions/README.md b/src/library/testing/gtest_extensions/README.md similarity index 85% rename from library/cpp/testing/gtest_extensions/README.md rename to src/library/testing/gtest_extensions/README.md index 5445c7a464a..55ef1640af9 100644 --- a/library/cpp/testing/gtest_extensions/README.md +++ b/src/library/testing/gtest_extensions/README.md @@ -2,4 +2,4 @@ Extensions that enable better support of util types in gtest and gmock: pretty printers, matchers, some convenience macros. -If you're using `GTEST`, include `library/cpp/testing/gtest/gtest.h` and it will automatically enable these extensions. This is the preferred way to include gtest and gmock as opposed to including gtest, gmock and extensions directly. It eliminates chances of forgetting to include extensions. +If you're using `GTEST`, include `src/library/testing/gtest/gtest.h` and it will automatically enable these extensions. This is the preferred way to include gtest and gmock as opposed to including gtest, gmock and extensions directly. It eliminates chances of forgetting to include extensions. diff --git a/library/cpp/testing/gtest_extensions/assertions.cpp b/src/library/testing/gtest_extensions/assertions.cpp similarity index 95% rename from library/cpp/testing/gtest_extensions/assertions.cpp rename to src/library/testing/gtest_extensions/assertions.cpp index fe865af1be3..cf9edd2ae71 100644 --- a/library/cpp/testing/gtest_extensions/assertions.cpp +++ b/src/library/testing/gtest_extensions/assertions.cpp @@ -1,9 +1,9 @@ #include "assertions.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace NGTest::NInternal { namespace { diff --git a/library/cpp/testing/gtest_extensions/assertions.h b/src/library/testing/gtest_extensions/assertions.h similarity index 100% rename from library/cpp/testing/gtest_extensions/assertions.h rename to src/library/testing/gtest_extensions/assertions.h diff --git a/library/cpp/testing/gtest_extensions/gtest_extensions.cpp b/src/library/testing/gtest_extensions/gtest_extensions.cpp similarity index 100% rename from library/cpp/testing/gtest_extensions/gtest_extensions.cpp rename to src/library/testing/gtest_extensions/gtest_extensions.cpp diff --git a/library/cpp/testing/gtest_extensions/gtest_extensions.h b/src/library/testing/gtest_extensions/gtest_extensions.h similarity index 100% rename from library/cpp/testing/gtest_extensions/gtest_extensions.h rename to src/library/testing/gtest_extensions/gtest_extensions.h diff --git a/library/cpp/testing/gtest_extensions/matchers.cpp b/src/library/testing/gtest_extensions/matchers.cpp similarity index 100% rename from library/cpp/testing/gtest_extensions/matchers.cpp rename to src/library/testing/gtest_extensions/matchers.cpp diff --git a/library/cpp/testing/gtest_extensions/matchers.h b/src/library/testing/gtest_extensions/matchers.h similarity index 100% rename from library/cpp/testing/gtest_extensions/matchers.h rename to src/library/testing/gtest_extensions/matchers.h diff --git a/library/cpp/testing/gtest_extensions/pretty_printers.cpp b/src/library/testing/gtest_extensions/pretty_printers.cpp similarity index 100% rename from library/cpp/testing/gtest_extensions/pretty_printers.cpp rename to src/library/testing/gtest_extensions/pretty_printers.cpp diff --git a/library/cpp/testing/gtest_extensions/pretty_printers.h b/src/library/testing/gtest_extensions/pretty_printers.h similarity index 92% rename from library/cpp/testing/gtest_extensions/pretty_printers.h rename to src/library/testing/gtest_extensions/pretty_printers.h index 8a154ed8ffc..77dc6f61bbe 100644 --- a/library/cpp/testing/gtest_extensions/pretty_printers.h +++ b/src/library/testing/gtest_extensions/pretty_printers.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/library/cpp/testing/gtest_extensions/probe.cpp b/src/library/testing/gtest_extensions/probe.cpp similarity index 100% rename from library/cpp/testing/gtest_extensions/probe.cpp rename to src/library/testing/gtest_extensions/probe.cpp diff --git a/library/cpp/testing/gtest_extensions/probe.h b/src/library/testing/gtest_extensions/probe.h similarity index 96% rename from library/cpp/testing/gtest_extensions/probe.h rename to src/library/testing/gtest_extensions/probe.h index 7d1fee83d38..40a6f7bd336 100644 --- a/library/cpp/testing/gtest_extensions/probe.h +++ b/src/library/testing/gtest_extensions/probe.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include #include #include diff --git a/library/cpp/testing/gtest_extensions/ut/CMakeLists.txt b/src/library/testing/gtest_extensions/ut/CMakeLists.txt similarity index 100% rename from library/cpp/testing/gtest_extensions/ut/CMakeLists.txt rename to src/library/testing/gtest_extensions/ut/CMakeLists.txt diff --git a/library/cpp/testing/gtest_extensions/ut/README.md b/src/library/testing/gtest_extensions/ut/README.md similarity index 100% rename from library/cpp/testing/gtest_extensions/ut/README.md rename to src/library/testing/gtest_extensions/ut/README.md diff --git a/library/cpp/testing/gtest_extensions/ut/gtest_extensions_ut.cpp b/src/library/testing/gtest_extensions/ut/gtest_extensions_ut.cpp similarity index 98% rename from library/cpp/testing/gtest_extensions/ut/gtest_extensions_ut.cpp rename to src/library/testing/gtest_extensions/ut/gtest_extensions_ut.cpp index 2985b249e9d..82897fa2c4f 100644 --- a/library/cpp/testing/gtest_extensions/ut/gtest_extensions_ut.cpp +++ b/src/library/testing/gtest_extensions/ut/gtest_extensions_ut.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/testing/gtest_extensions/ut/probe_ut.cpp b/src/library/testing/gtest_extensions/ut/probe_ut.cpp similarity index 96% rename from library/cpp/testing/gtest_extensions/ut/probe_ut.cpp rename to src/library/testing/gtest_extensions/ut/probe_ut.cpp index a9d53f896a3..5b72ad15dce 100644 --- a/library/cpp/testing/gtest_extensions/ut/probe_ut.cpp +++ b/src/library/testing/gtest_extensions/ut/probe_ut.cpp @@ -1,4 +1,4 @@ -#include +#include using namespace testing; diff --git a/library/cpp/testing/gtest_extensions/ut/ya.make b/src/library/testing/gtest_extensions/ut/ya.make similarity index 66% rename from library/cpp/testing/gtest_extensions/ut/ya.make rename to src/library/testing/gtest_extensions/ut/ya.make index 61c20583b40..0b2b6e3d413 100644 --- a/library/cpp/testing/gtest_extensions/ut/ya.make +++ b/src/library/testing/gtest_extensions/ut/ya.make @@ -5,7 +5,7 @@ SRCS( ) PEERDIR( - library/cpp/testing/gtest_extensions + src/library/testing/gtest_extensions ) END() diff --git a/library/cpp/testing/gtest_extensions/ya.make b/src/library/testing/gtest_extensions/ya.make similarity index 100% rename from library/cpp/testing/gtest_extensions/ya.make rename to src/library/testing/gtest_extensions/ya.make diff --git a/library/cpp/testing/hook/CMakeLists.txt b/src/library/testing/hook/CMakeLists.txt similarity index 68% rename from library/cpp/testing/hook/CMakeLists.txt rename to src/library/testing/hook/CMakeLists.txt index 5993a557de7..dcb3923acf7 100644 --- a/library/cpp/testing/hook/CMakeLists.txt +++ b/src/library/testing/hook/CMakeLists.txt @@ -3,5 +3,5 @@ target_link_libraries(cpp-testing-hook PUBLIC yutil ) target_sources(cpp-testing-hook PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/hook/hook.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/hook/hook.cpp ) diff --git a/library/cpp/testing/hook/README.md b/src/library/testing/hook/README.md similarity index 100% rename from library/cpp/testing/hook/README.md rename to src/library/testing/hook/README.md diff --git a/library/cpp/testing/hook/hook.cpp b/src/library/testing/hook/hook.cpp similarity index 100% rename from library/cpp/testing/hook/hook.cpp rename to src/library/testing/hook/hook.cpp diff --git a/library/cpp/testing/hook/hook.h b/src/library/testing/hook/hook.h similarity index 100% rename from library/cpp/testing/hook/hook.h rename to src/library/testing/hook/hook.h diff --git a/library/cpp/testing/hook/ya.make b/src/library/testing/hook/ya.make similarity index 100% rename from library/cpp/testing/hook/ya.make rename to src/library/testing/hook/ya.make diff --git a/src/library/testing/unittest/CMakeLists.txt b/src/library/testing/unittest/CMakeLists.txt new file mode 100644 index 00000000000..a44c5387902 --- /dev/null +++ b/src/library/testing/unittest/CMakeLists.txt @@ -0,0 +1,24 @@ +add_library(cpp-testing-unittest) +target_link_libraries(cpp-testing-unittest PUBLIC + yutil + library-cpp-colorizer + library-cpp-dbg_output + library-cpp-diff + library-cpp-json + cpp-json-writer + cpp-testing-common + cpp-testing-hook +) +target_sources(cpp-testing-unittest PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest/gtest.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest/checks.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest/junit.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest/plugin.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest/registar.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest/tests_data.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest/utmain.cpp +) + +# Unit tests +add_subdirectory(fat) +add_subdirectory(ut) diff --git a/library/cpp/testing/unittest/checks.cpp b/src/library/testing/unittest/checks.cpp similarity index 95% rename from library/cpp/testing/unittest/checks.cpp rename to src/library/testing/unittest/checks.cpp index e3b0695555c..5f297b7effd 100644 --- a/library/cpp/testing/unittest/checks.cpp +++ b/src/library/testing/unittest/checks.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/library/testing/unittest/env.h b/src/library/testing/unittest/env.h new file mode 100644 index 00000000000..134d8199612 --- /dev/null +++ b/src/library/testing/unittest/env.h @@ -0,0 +1,3 @@ +// just shortcut +#include + diff --git a/library/cpp/testing/unittest/fat/CMakeLists.txt b/src/library/testing/unittest/fat/CMakeLists.txt similarity index 100% rename from library/cpp/testing/unittest/fat/CMakeLists.txt rename to src/library/testing/unittest/fat/CMakeLists.txt diff --git a/library/cpp/testing/unittest/fat/test_port_manager.cpp b/src/library/testing/unittest/fat/test_port_manager.cpp similarity index 91% rename from library/cpp/testing/unittest/fat/test_port_manager.cpp rename to src/library/testing/unittest/fat/test_port_manager.cpp index f77d2e3a25c..f2fb12ccf4a 100644 --- a/library/cpp/testing/unittest/fat/test_port_manager.cpp +++ b/src/library/testing/unittest/fat/test_port_manager.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include bool IsFreePort(ui16 port) { TInet6StreamSocket sock; diff --git a/library/cpp/testing/unittest/fat/ya.make b/src/library/testing/unittest/fat/ya.make similarity index 100% rename from library/cpp/testing/unittest/fat/ya.make rename to src/library/testing/unittest/fat/ya.make diff --git a/library/cpp/testing/unittest/gtest.cpp b/src/library/testing/unittest/gtest.cpp similarity index 97% rename from library/cpp/testing/unittest/gtest.cpp rename to src/library/testing/unittest/gtest.cpp index 909284021c9..e094941efeb 100644 --- a/library/cpp/testing/unittest/gtest.cpp +++ b/src/library/testing/unittest/gtest.cpp @@ -1,7 +1,7 @@ #include "gtest.h" #include "simple.h" -#include +#include using namespace NUnitTest; using namespace NUnitTest::NPrivate; diff --git a/library/cpp/testing/unittest/gtest.h b/src/library/testing/unittest/gtest.h similarity index 96% rename from library/cpp/testing/unittest/gtest.h rename to src/library/testing/unittest/gtest.h index 79af8cca581..b1f8276e1f2 100644 --- a/library/cpp/testing/unittest/gtest.h +++ b/src/library/testing/unittest/gtest.h @@ -3,12 +3,12 @@ // WARNING: this is a legacy header that tries to mimic the gtest interface while using unittest // under the hood. Avoid using this interface -- use the genuine gtest instead (the GTEST macro). // If you're already using GTEST macro and you've found yourself here, you probably meant -// to include `library/cpp/testing/gtest/gtest.h`. +// to include `src/library/testing/gtest/gtest.h`. #include "registar.h" -#include -#include +#include +#include namespace NUnitTest { namespace NPrivate { @@ -90,7 +90,7 @@ namespace testing { #define EXPECT_DOUBLE_EQ_TOLERANCE(A, B, tolerance) UNIT_ASSERT_C(fabs((A) - (B)) < tolerance * std::numeric_limits::epsilon(), std::string("\n") + ToString(A) + " <> " + ToString(B)) #define EXPECT_DOUBLE_EQ(A, B) EXPECT_DOUBLE_EQ_TOLERANCE(A, B, 4.0) -//conflicts with util/system/defaults.h +//conflicts with src/util/system/defaults.h #undef EXPECT_TRUE #define EXPECT_TRUE(X) UNIT_ASSERT(X) #undef EXPECT_FALSE diff --git a/library/cpp/testing/unittest/junit.cpp b/src/library/testing/unittest/junit.cpp similarity index 97% rename from library/cpp/testing/unittest/junit.cpp rename to src/library/testing/unittest/junit.cpp index 5add42eec28..f7aa479508f 100644 --- a/library/cpp/testing/unittest/junit.cpp +++ b/src/library/testing/unittest/junit.cpp @@ -1,22 +1,22 @@ #include "junit.h" -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/library/cpp/testing/unittest/junit.h b/src/library/testing/unittest/junit.h similarity index 98% rename from library/cpp/testing/unittest/junit.h rename to src/library/testing/unittest/junit.h index 323233c099c..e0478995bf1 100644 --- a/library/cpp/testing/unittest/junit.h +++ b/src/library/testing/unittest/junit.h @@ -1,7 +1,7 @@ #include "registar.h" -#include -#include +#include +#include #include diff --git a/library/cpp/testing/unittest/plugin.cpp b/src/library/testing/unittest/plugin.cpp similarity index 94% rename from library/cpp/testing/unittest/plugin.cpp rename to src/library/testing/unittest/plugin.cpp index 9eab925af82..3878dc8984b 100644 --- a/library/cpp/testing/unittest/plugin.cpp +++ b/src/library/testing/unittest/plugin.cpp @@ -1,7 +1,7 @@ #include "plugin.h" -#include -#include +#include +#include #include namespace NUnitTest::NPlugin { diff --git a/library/cpp/testing/unittest/plugin.h b/src/library/testing/unittest/plugin.h similarity index 82% rename from library/cpp/testing/unittest/plugin.h rename to src/library/testing/unittest/plugin.h index 102f2c1469e..20915d16867 100644 --- a/library/cpp/testing/unittest/plugin.h +++ b/src/library/testing/unittest/plugin.h @@ -1,9 +1,9 @@ #pragma once -#include +#include namespace NUnitTest { - // Plugins are deprecated, please use Y_TEST_HOOK_* from library/cpp/hook/hook.h + // Plugins are deprecated, please use Y_TEST_HOOK_* from src/library/hook/hook.h namespace NPlugin { class IPlugin { public: diff --git a/library/cpp/testing/unittest/pytests/test_subject/tests.cpp b/src/library/testing/unittest/pytests/test_subject/tests.cpp similarity index 95% rename from library/cpp/testing/unittest/pytests/test_subject/tests.cpp rename to src/library/testing/unittest/pytests/test_subject/tests.cpp index 6e38696aa75..d5a1fc31ddd 100644 --- a/library/cpp/testing/unittest/pytests/test_subject/tests.cpp +++ b/src/library/testing/unittest/pytests/test_subject/tests.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/library/cpp/testing/unittest/pytests/test_subject/ya.make b/src/library/testing/unittest/pytests/test_subject/ya.make similarity index 67% rename from library/cpp/testing/unittest/pytests/test_subject/ya.make rename to src/library/testing/unittest/pytests/test_subject/ya.make index c9990b674fb..39a0235d2e1 100644 --- a/library/cpp/testing/unittest/pytests/test_subject/ya.make +++ b/src/library/testing/unittest/pytests/test_subject/ya.make @@ -7,7 +7,7 @@ SRCS( ) PEERDIR( - library/cpp/testing/unittest + src/library/testing/unittest ) END() diff --git a/library/cpp/testing/unittest/pytests/test_tear_down.py b/src/library/testing/unittest/pytests/test_tear_down.py similarity index 88% rename from library/cpp/testing/unittest/pytests/test_tear_down.py rename to src/library/testing/unittest/pytests/test_tear_down.py index 5aec40198da..e836895669f 100644 --- a/library/cpp/testing/unittest/pytests/test_tear_down.py +++ b/src/library/testing/unittest/pytests/test_tear_down.py @@ -2,7 +2,7 @@ def test_sanity(): - test_path = ya_common.binary_path("library/cpp/testing/unittest/pytests/test_subject/library-cpp-testing-unittest-pytests-test_subject") + test_path = ya_common.binary_path("src/library/testing/unittest/pytests/test_subject/library-cpp-testing-unittest-pytests-test_subject") tests = ya_common.execute([test_path, '-A']).std_out \ .decode().strip().split('\n') diff --git a/library/cpp/testing/unittest/pytests/ya.make b/src/library/testing/unittest/pytests/ya.make similarity index 74% rename from library/cpp/testing/unittest/pytests/ya.make rename to src/library/testing/unittest/pytests/ya.make index bbc1c9dec33..ef878c2e560 100644 --- a/library/cpp/testing/unittest/pytests/ya.make +++ b/src/library/testing/unittest/pytests/ya.make @@ -11,7 +11,7 @@ PEERDIR( ) DEPENDS( - library/cpp/testing/unittest/pytests/test_subject + src/library/testing/unittest/pytests/test_subject ) END() diff --git a/library/cpp/testing/unittest/registar.cpp b/src/library/testing/unittest/registar.cpp similarity index 97% rename from library/cpp/testing/unittest/registar.cpp rename to src/library/testing/unittest/registar.cpp index 8a9b73af6dd..c88e31d781e 100644 --- a/library/cpp/testing/unittest/registar.cpp +++ b/src/library/testing/unittest/registar.cpp @@ -1,15 +1,15 @@ #include "registar.h" -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include #include diff --git a/library/cpp/testing/unittest/registar.h b/src/library/testing/unittest/registar.h similarity index 98% rename from library/cpp/testing/unittest/registar.h rename to src/library/testing/unittest/registar.h index 4b530a760fe..f7bd8b3a08c 100644 --- a/library/cpp/testing/unittest/registar.h +++ b/src/library/testing/unittest/registar.h @@ -1,26 +1,26 @@ #pragma once -#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include +#include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include #include @@ -48,7 +48,7 @@ namespace NUnitTest { std::string GetResetTag(); // Raise error handler - // Used for testing library/cpp/testing/unittest macroses + // Used for testing src/library/testing/unittest macroses // and unittest helpers. // For all other unittests standard handler is used using TRaiseErrorHandler = std::function; diff --git a/library/cpp/testing/unittest/registar_ut.cpp b/src/library/testing/unittest/registar_ut.cpp similarity index 99% rename from library/cpp/testing/unittest/registar_ut.cpp rename to src/library/testing/unittest/registar_ut.cpp index 44830caa838..0d7841064b5 100644 --- a/library/cpp/testing/unittest/registar_ut.cpp +++ b/src/library/testing/unittest/registar_ut.cpp @@ -1,4 +1,4 @@ -#include +#include using namespace std::string_literals; using namespace std::string_view_literals; diff --git a/library/cpp/testing/unittest/simple.h b/src/library/testing/unittest/simple.h similarity index 100% rename from library/cpp/testing/unittest/simple.h rename to src/library/testing/unittest/simple.h diff --git a/library/cpp/testing/unittest/tests_data.cpp b/src/library/testing/unittest/tests_data.cpp similarity index 96% rename from library/cpp/testing/unittest/tests_data.cpp rename to src/library/testing/unittest/tests_data.cpp index 7d796fae7fc..255ef3d86ee 100644 --- a/library/cpp/testing/unittest/tests_data.cpp +++ b/src/library/testing/unittest/tests_data.cpp @@ -1,8 +1,8 @@ #include "tests_data.h" #include "registar.h" -#include -#include +#include +#include #include diff --git a/library/cpp/testing/unittest/tests_data.h b/src/library/testing/unittest/tests_data.h similarity index 89% rename from library/cpp/testing/unittest/tests_data.h rename to src/library/testing/unittest/tests_data.h index dfab1105cc4..6569fdc5d9c 100644 --- a/library/cpp/testing/unittest/tests_data.h +++ b/src/library/testing/unittest/tests_data.h @@ -1,10 +1,10 @@ #pragma once -#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/library/cpp/testing/unittest/ut/CMakeLists.txt b/src/library/testing/unittest/ut/CMakeLists.txt similarity index 100% rename from library/cpp/testing/unittest/ut/CMakeLists.txt rename to src/library/testing/unittest/ut/CMakeLists.txt diff --git a/library/cpp/testing/unittest/ut/main.cpp b/src/library/testing/unittest/ut/main.cpp similarity index 86% rename from library/cpp/testing/unittest/ut/main.cpp rename to src/library/testing/unittest/ut/main.cpp index f11a3edea3e..746d88979fa 100644 --- a/library/cpp/testing/unittest/ut/main.cpp +++ b/src/library/testing/unittest/ut/main.cpp @@ -1,10 +1,10 @@ -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include TEST(GTest, Test1) { UNIT_ASSERT_EQUAL(1, 1); diff --git a/library/cpp/testing/unittest/ut/ya.make b/src/library/testing/unittest/ut/ya.make similarity index 53% rename from library/cpp/testing/unittest/ut/ya.make rename to src/library/testing/unittest/ut/ya.make index 86efa0d788f..50e9b365f7e 100644 --- a/library/cpp/testing/unittest/ut/ya.make +++ b/src/library/testing/unittest/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/testing/unittest) +UNITTEST_FOR(src/library/testing/unittest) SRCS( main.cpp diff --git a/library/cpp/testing/unittest/utmain.cpp b/src/library/testing/unittest/utmain.cpp similarity index 97% rename from library/cpp/testing/unittest/utmain.cpp rename to src/library/testing/unittest/utmain.cpp index 0182363c798..e421038b130 100644 --- a/library/cpp/testing/unittest/utmain.cpp +++ b/src/library/testing/unittest/utmain.cpp @@ -3,33 +3,33 @@ #include "registar.h" #include "utmain.h" -#include +#include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include +#include -#include -#include -#include +#include +#include +#include -#include +#include -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/library/cpp/testing/unittest/utmain.h b/src/library/testing/unittest/utmain.h similarity index 100% rename from library/cpp/testing/unittest/utmain.h rename to src/library/testing/unittest/utmain.h diff --git a/library/cpp/testing/unittest/ya.make b/src/library/testing/unittest/ya.make similarity index 54% rename from library/cpp/testing/unittest/ya.make rename to src/library/testing/unittest/ya.make index 67a3c2d85cf..88c13cd0de9 100644 --- a/library/cpp/testing/unittest/ya.make +++ b/src/library/testing/unittest/ya.make @@ -3,13 +3,13 @@ LIBRARY() PROVIDES(test_framework) PEERDIR( - library/cpp/colorizer - library/cpp/dbg_output - library/cpp/diff - library/cpp/json - library/cpp/json/writer - library/cpp/testing/common - library/cpp/testing/hook + src/library/colorizer + src/library/dbg_output + src/library/diff + src/library/json + src/library/json/writer + src/library/testing/common + src/library/testing/hook ) SRCS( diff --git a/library/cpp/testing/unittest_main/CMakeLists.darwin-arm64.txt b/src/library/testing/unittest_main/CMakeLists.darwin-arm64.txt similarity index 90% rename from library/cpp/testing/unittest_main/CMakeLists.darwin-arm64.txt rename to src/library/testing/unittest_main/CMakeLists.darwin-arm64.txt index 1d775b1ee72..d030fff60e2 100644 --- a/library/cpp/testing/unittest_main/CMakeLists.darwin-arm64.txt +++ b/src/library/testing/unittest_main/CMakeLists.darwin-arm64.txt @@ -14,5 +14,5 @@ target_link_libraries(cpp-testing-unittest_main PUBLIC library-cpp-terminate_handler ) target_sources(cpp-testing-unittest_main PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/unittest_main/main.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest_main/main.cpp ) diff --git a/library/cpp/testing/unittest_main/CMakeLists.darwin-x86_64.txt b/src/library/testing/unittest_main/CMakeLists.darwin-x86_64.txt similarity index 90% rename from library/cpp/testing/unittest_main/CMakeLists.darwin-x86_64.txt rename to src/library/testing/unittest_main/CMakeLists.darwin-x86_64.txt index 1d775b1ee72..d030fff60e2 100644 --- a/library/cpp/testing/unittest_main/CMakeLists.darwin-x86_64.txt +++ b/src/library/testing/unittest_main/CMakeLists.darwin-x86_64.txt @@ -14,5 +14,5 @@ target_link_libraries(cpp-testing-unittest_main PUBLIC library-cpp-terminate_handler ) target_sources(cpp-testing-unittest_main PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/unittest_main/main.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest_main/main.cpp ) diff --git a/library/cpp/testing/unittest_main/CMakeLists.linux-aarch64.txt b/src/library/testing/unittest_main/CMakeLists.linux-aarch64.txt similarity index 90% rename from library/cpp/testing/unittest_main/CMakeLists.linux-aarch64.txt rename to src/library/testing/unittest_main/CMakeLists.linux-aarch64.txt index 244f8ea7b1c..65e40690f8c 100644 --- a/library/cpp/testing/unittest_main/CMakeLists.linux-aarch64.txt +++ b/src/library/testing/unittest_main/CMakeLists.linux-aarch64.txt @@ -15,5 +15,5 @@ target_link_libraries(cpp-testing-unittest_main PUBLIC library-cpp-terminate_handler ) target_sources(cpp-testing-unittest_main PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/unittest_main/main.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest_main/main.cpp ) diff --git a/library/cpp/testing/unittest_main/CMakeLists.linux-x86_64.txt b/src/library/testing/unittest_main/CMakeLists.linux-x86_64.txt similarity index 90% rename from library/cpp/testing/unittest_main/CMakeLists.linux-x86_64.txt rename to src/library/testing/unittest_main/CMakeLists.linux-x86_64.txt index 244f8ea7b1c..65e40690f8c 100644 --- a/library/cpp/testing/unittest_main/CMakeLists.linux-x86_64.txt +++ b/src/library/testing/unittest_main/CMakeLists.linux-x86_64.txt @@ -15,5 +15,5 @@ target_link_libraries(cpp-testing-unittest_main PUBLIC library-cpp-terminate_handler ) target_sources(cpp-testing-unittest_main PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/unittest_main/main.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest_main/main.cpp ) diff --git a/src/library/testing/unittest_main/CMakeLists.txt b/src/library/testing/unittest_main/CMakeLists.txt new file mode 100644 index 00000000000..4fbe9853d99 --- /dev/null +++ b/src/library/testing/unittest_main/CMakeLists.txt @@ -0,0 +1,19 @@ + +# 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 "x86_64") + include(CMakeLists.linux-x86_64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") + 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 (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") + include(CMakeLists.darwin-arm64.txt) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") + include(CMakeLists.windows-x86_64.txt) +endif() diff --git a/library/cpp/testing/unittest_main/CMakeLists.windows-x86_64.txt b/src/library/testing/unittest_main/CMakeLists.windows-x86_64.txt similarity index 90% rename from library/cpp/testing/unittest_main/CMakeLists.windows-x86_64.txt rename to src/library/testing/unittest_main/CMakeLists.windows-x86_64.txt index 1d775b1ee72..d030fff60e2 100644 --- a/library/cpp/testing/unittest_main/CMakeLists.windows-x86_64.txt +++ b/src/library/testing/unittest_main/CMakeLists.windows-x86_64.txt @@ -14,5 +14,5 @@ target_link_libraries(cpp-testing-unittest_main PUBLIC library-cpp-terminate_handler ) target_sources(cpp-testing-unittest_main PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/testing/unittest_main/main.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest_main/main.cpp ) diff --git a/library/cpp/testing/unittest_main/main.cpp b/src/library/testing/unittest_main/main.cpp similarity index 62% rename from library/cpp/testing/unittest_main/main.cpp rename to src/library/testing/unittest_main/main.cpp index fc5d2d9418d..91382a6f019 100644 --- a/library/cpp/testing/unittest_main/main.cpp +++ b/src/library/testing/unittest_main/main.cpp @@ -1,4 +1,4 @@ -#include +#include int main(int argc, char** argv) { return NUnitTest::RunMain(argc, argv); diff --git a/src/library/testing/unittest_main/ya.make b/src/library/testing/unittest_main/ya.make new file mode 100644 index 00000000000..e86cdc99239 --- /dev/null +++ b/src/library/testing/unittest_main/ya.make @@ -0,0 +1,12 @@ +LIBRARY() + +PEERDIR( + src/library/testing/unittest + src/library/terminate_handler +) + +SRCS( + main.cpp +) + +END() diff --git a/library/cpp/threading/CMakeLists.txt b/src/library/threading/CMakeLists.txt similarity index 100% rename from library/cpp/threading/CMakeLists.txt rename to src/library/threading/CMakeLists.txt diff --git a/library/cpp/threading/atomic/CMakeLists.txt b/src/library/threading/atomic/CMakeLists.txt similarity index 72% rename from library/cpp/threading/atomic/CMakeLists.txt rename to src/library/threading/atomic/CMakeLists.txt index 12867a61991..6fa8ec13456 100644 --- a/library/cpp/threading/atomic/CMakeLists.txt +++ b/src/library/threading/atomic/CMakeLists.txt @@ -6,5 +6,5 @@ target_link_libraries(cpp-threading-atomic PUBLIC ) target_sources(cpp-threading-atomic PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/atomic/bool.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/atomic/bool.cpp ) diff --git a/library/cpp/threading/atomic/bool.cpp b/src/library/threading/atomic/bool.cpp similarity index 100% rename from library/cpp/threading/atomic/bool.cpp rename to src/library/threading/atomic/bool.cpp diff --git a/library/cpp/threading/atomic/bool.h b/src/library/threading/atomic/bool.h similarity index 93% rename from library/cpp/threading/atomic/bool.h rename to src/library/threading/atomic/bool.h index 6e336280ed5..97fdca8f2e0 100644 --- a/library/cpp/threading/atomic/bool.h +++ b/src/library/threading/atomic/bool.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NAtomic { class TBool { diff --git a/library/cpp/threading/atomic/bool_ut.cpp b/src/library/threading/atomic/bool_ut.cpp similarity index 90% rename from library/cpp/threading/atomic/bool_ut.cpp rename to src/library/threading/atomic/bool_ut.cpp index 9481f41d8dc..b67482d2e6d 100644 --- a/library/cpp/threading/atomic/bool_ut.cpp +++ b/src/library/threading/atomic/bool_ut.cpp @@ -1,6 +1,6 @@ #include "bool.h" -#include +#include Y_UNIT_TEST_SUITE(AtomicBool) { Y_UNIT_TEST(ReadWrite) { diff --git a/src/library/threading/atomic/ut/ya.make b/src/library/threading/atomic/ut/ya.make new file mode 100644 index 00000000000..fdfdf69c4b0 --- /dev/null +++ b/src/library/threading/atomic/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/threading/atomic) + +SRCS( + bool_ut.cpp +) + +END() diff --git a/library/cpp/threading/cancellation/operation_cancelled_exception.h b/src/library/threading/cancellation/operation_cancelled_exception.h similarity index 80% rename from library/cpp/threading/cancellation/operation_cancelled_exception.h rename to src/library/threading/cancellation/operation_cancelled_exception.h index 4315fa0a6ef..43540b55a14 100644 --- a/library/cpp/threading/cancellation/operation_cancelled_exception.h +++ b/src/library/threading/cancellation/operation_cancelled_exception.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NThreading { diff --git a/library/cpp/threading/chunk_queue/CMakeLists.txt b/src/library/threading/chunk_queue/CMakeLists.txt similarity index 74% rename from library/cpp/threading/chunk_queue/CMakeLists.txt rename to src/library/threading/chunk_queue/CMakeLists.txt index 83d9f3fe32a..71ffb7055da 100644 --- a/library/cpp/threading/chunk_queue/CMakeLists.txt +++ b/src/library/threading/chunk_queue/CMakeLists.txt @@ -6,5 +6,5 @@ target_link_libraries(cpp-threading-chunk_queue PUBLIC ) target_sources(cpp-threading-chunk_queue PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/chunk_queue/queue.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/chunk_queue/queue.cpp ) diff --git a/library/cpp/threading/chunk_queue/queue.cpp b/src/library/threading/chunk_queue/queue.cpp similarity index 100% rename from library/cpp/threading/chunk_queue/queue.cpp rename to src/library/threading/chunk_queue/queue.cpp diff --git a/library/cpp/threading/chunk_queue/queue.h b/src/library/threading/chunk_queue/queue.h similarity index 97% rename from library/cpp/threading/chunk_queue/queue.h rename to src/library/threading/chunk_queue/queue.h index d5d60ce4f83..cb68e459d1a 100644 --- a/library/cpp/threading/chunk_queue/queue.h +++ b/src/library/threading/chunk_queue/queue.h @@ -1,15 +1,15 @@ #pragma once -#include -#include -#include -#include - -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include #include #include diff --git a/library/cpp/threading/chunk_queue/queue_ut.cpp b/src/library/threading/chunk_queue/queue_ut.cpp similarity index 98% rename from library/cpp/threading/chunk_queue/queue_ut.cpp rename to src/library/threading/chunk_queue/queue_ut.cpp index 717ce9f047e..d7ea5bb4d21 100644 --- a/library/cpp/threading/chunk_queue/queue_ut.cpp +++ b/src/library/threading/chunk_queue/queue_ut.cpp @@ -1,8 +1,8 @@ #include "queue.h" -#include +#include -#include +#include namespace NThreading { //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/threading/chunk_queue/readme.txt b/src/library/threading/chunk_queue/readme.txt similarity index 100% rename from library/cpp/threading/chunk_queue/readme.txt rename to src/library/threading/chunk_queue/readme.txt diff --git a/src/library/threading/chunk_queue/ut/ya.make b/src/library/threading/chunk_queue/ut/ya.make new file mode 100644 index 00000000000..692a5313e93 --- /dev/null +++ b/src/library/threading/chunk_queue/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/threading/chunk_queue) + +SRCS( + queue_ut.cpp +) + +END() diff --git a/library/cpp/threading/equeue/CMakeLists.txt b/src/library/threading/equeue/CMakeLists.txt similarity index 72% rename from library/cpp/threading/equeue/CMakeLists.txt rename to src/library/threading/equeue/CMakeLists.txt index d550296bdb7..c11adabada1 100644 --- a/library/cpp/threading/equeue/CMakeLists.txt +++ b/src/library/threading/equeue/CMakeLists.txt @@ -6,5 +6,5 @@ target_link_libraries(cpp-threading-equeue PUBLIC ) target_sources(cpp-threading-equeue PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/equeue/equeue.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/equeue/equeue.cpp ) diff --git a/library/cpp/threading/equeue/equeue.cpp b/src/library/threading/equeue/equeue.cpp similarity index 100% rename from library/cpp/threading/equeue/equeue.cpp rename to src/library/threading/equeue/equeue.cpp diff --git a/library/cpp/threading/equeue/equeue.h b/src/library/threading/equeue/equeue.h similarity index 84% rename from library/cpp/threading/equeue/equeue.h rename to src/library/threading/equeue/equeue.h index c61b9f7b857..d145370493f 100644 --- a/library/cpp/threading/equeue/equeue.h +++ b/src/library/threading/equeue/equeue.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include //actual queue limit will be (maxQueueSize - numBusyThreads) or 0 class TElasticQueue: public IThreadPool { diff --git a/library/cpp/threading/equeue/equeue_ut.cpp b/src/library/threading/equeue/equeue_ut.cpp similarity index 95% rename from library/cpp/threading/equeue/equeue_ut.cpp rename to src/library/threading/equeue/equeue_ut.cpp index 7ad87d59179..c4924325cbb 100644 --- a/library/cpp/threading/equeue/equeue_ut.cpp +++ b/src/library/threading/equeue/equeue_ut.cpp @@ -1,10 +1,10 @@ #include "equeue.h" -#include +#include -#include +#include -#include -#include +#include +#include Y_UNIT_TEST_SUITE(TElasticQueueTest) { diff --git a/src/library/threading/equeue/ut/ya.make b/src/library/threading/equeue/ut/ya.make new file mode 100644 index 00000000000..56e20c812b3 --- /dev/null +++ b/src/library/threading/equeue/ut/ya.make @@ -0,0 +1,14 @@ +UNITTEST() + +PEERDIR( + ADDINCL src/library/threading/equeue + src/library/threading/equeue/fast +) + +SRCDIR(src/library/threading/equeue) + +SRCS( + equeue_ut.cpp +) + +END() diff --git a/src/library/threading/future/CMakeLists.txt b/src/library/threading/future/CMakeLists.txt new file mode 100644 index 00000000000..eeed159f0e7 --- /dev/null +++ b/src/library/threading/future/CMakeLists.txt @@ -0,0 +1,17 @@ +add_library(cpp-threading-future) + +target_link_libraries(cpp-threading-future PUBLIC + yutil +) + +target_sources(cpp-threading-future PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/threading/future/async_semaphore.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/future/async.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/future/core/future.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/future/core/fwd.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/future/fwd.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/future/wait/fwd.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/future/wait/wait.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/future/wait/wait_group.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/future/wait/wait_policy.cpp +) diff --git a/library/cpp/threading/future/async.cpp b/src/library/threading/future/async.cpp similarity index 100% rename from library/cpp/threading/future/async.cpp rename to src/library/threading/future/async.cpp diff --git a/library/cpp/threading/future/async.h b/src/library/threading/future/async.h similarity index 92% rename from library/cpp/threading/future/async.h rename to src/library/threading/future/async.h index 8543fdd5c68..471266895ba 100644 --- a/library/cpp/threading/future/async.h +++ b/src/library/threading/future/async.h @@ -2,8 +2,8 @@ #include "future.h" -#include -#include +#include +#include namespace NThreading { /** diff --git a/library/cpp/threading/future/async_semaphore.cpp b/src/library/threading/future/async_semaphore.cpp similarity index 92% rename from library/cpp/threading/future/async_semaphore.cpp rename to src/library/threading/future/async_semaphore.cpp index ff856d92799..e2d1a3c904b 100644 --- a/library/cpp/threading/future/async_semaphore.cpp +++ b/src/library/threading/future/async_semaphore.cpp @@ -1,9 +1,9 @@ #include "async_semaphore.h" -#include -#include +#include +#include -#include +#include #include diff --git a/library/cpp/threading/future/async_semaphore.h b/src/library/threading/future/async_semaphore.h similarity index 88% rename from library/cpp/threading/future/async_semaphore.h rename to src/library/threading/future/async_semaphore.h index fa4cabad3cd..3c985ac1752 100644 --- a/library/cpp/threading/future/async_semaphore.h +++ b/src/library/threading/future/async_semaphore.h @@ -1,9 +1,9 @@ #pragma once -#include +#include -#include -#include +#include +#include #include #include diff --git a/library/cpp/threading/future/async_semaphore_ut.cpp b/src/library/threading/future/async_semaphore_ut.cpp similarity index 96% rename from library/cpp/threading/future/async_semaphore_ut.cpp rename to src/library/threading/future/async_semaphore_ut.cpp index c883cd62b06..dbe9d90194c 100644 --- a/library/cpp/threading/future/async_semaphore_ut.cpp +++ b/src/library/threading/future/async_semaphore_ut.cpp @@ -1,12 +1,12 @@ #include "async_semaphore.h" #include "async.h" -#include -#include +#include +#include -#include +#include -#include +#include using namespace NThreading; diff --git a/library/cpp/threading/future/async_ut.cpp b/src/library/threading/future/async_ut.cpp similarity index 94% rename from library/cpp/threading/future/async_ut.cpp rename to src/library/threading/future/async_ut.cpp index c3dd2c4b5b5..690fabdac31 100644 --- a/library/cpp/threading/future/async_ut.cpp +++ b/src/library/threading/future/async_ut.cpp @@ -1,8 +1,8 @@ #include "async.h" -#include +#include -#include +#include namespace { diff --git a/library/cpp/threading/future/core/future-inl.h b/src/library/threading/future/core/future-inl.h similarity index 100% rename from library/cpp/threading/future/core/future-inl.h rename to src/library/threading/future/core/future-inl.h diff --git a/library/cpp/threading/future/core/future.cpp b/src/library/threading/future/core/future.cpp similarity index 100% rename from library/cpp/threading/future/core/future.cpp rename to src/library/threading/future/core/future.cpp diff --git a/library/cpp/threading/future/core/future.h b/src/library/threading/future/core/future.h similarity index 96% rename from library/cpp/threading/future/core/future.h rename to src/library/threading/future/core/future.h index e540d993a09..ffe4c7dc926 100644 --- a/library/cpp/threading/future/core/future.h +++ b/src/library/threading/future/core/future.h @@ -2,15 +2,15 @@ #include "fwd.h" -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/library/cpp/threading/future/core/fwd.cpp b/src/library/threading/future/core/fwd.cpp similarity index 100% rename from library/cpp/threading/future/core/fwd.cpp rename to src/library/threading/future/core/fwd.cpp diff --git a/library/cpp/threading/future/core/fwd.h b/src/library/threading/future/core/fwd.h similarity index 100% rename from library/cpp/threading/future/core/fwd.h rename to src/library/threading/future/core/fwd.h diff --git a/library/cpp/threading/future/future.h b/src/library/threading/future/future.h similarity index 100% rename from library/cpp/threading/future/future.h rename to src/library/threading/future/future.h diff --git a/library/cpp/threading/future/future_mt_ut.cpp b/src/library/threading/future/future_mt_ut.cpp similarity index 97% rename from library/cpp/threading/future/future_mt_ut.cpp rename to src/library/threading/future/future_mt_ut.cpp index cc90df03032..23e211c38a7 100644 --- a/library/cpp/threading/future/future_mt_ut.cpp +++ b/src/library/threading/future/future_mt_ut.cpp @@ -1,10 +1,10 @@ #include "future.h" -#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/library/cpp/threading/future/future_ut.cpp b/src/library/threading/future/future_ut.cpp similarity index 99% rename from library/cpp/threading/future/future_ut.cpp rename to src/library/threading/future/future_ut.cpp index 26343750ff8..5b8aeb88d06 100644 --- a/library/cpp/threading/future/future_ut.cpp +++ b/src/library/threading/future/future_ut.cpp @@ -1,6 +1,6 @@ #include "future.h" -#include +#include #include #include diff --git a/library/cpp/threading/future/fwd.cpp b/src/library/threading/future/fwd.cpp similarity index 100% rename from library/cpp/threading/future/fwd.cpp rename to src/library/threading/future/fwd.cpp diff --git a/library/cpp/threading/future/fwd.h b/src/library/threading/future/fwd.h similarity index 100% rename from library/cpp/threading/future/fwd.h rename to src/library/threading/future/fwd.h diff --git a/library/cpp/threading/future/legacy_future.h b/src/library/threading/future/legacy_future.h similarity index 98% rename from library/cpp/threading/future/legacy_future.h rename to src/library/threading/future/legacy_future.h index 6f1eabad73b..2931cf16587 100644 --- a/library/cpp/threading/future/legacy_future.h +++ b/src/library/threading/future/legacy_future.h @@ -3,7 +3,7 @@ #include "fwd.h" #include "future.h" -#include +#include #include diff --git a/library/cpp/threading/future/legacy_future_ut.cpp b/src/library/threading/future/legacy_future_ut.cpp similarity index 97% rename from library/cpp/threading/future/legacy_future_ut.cpp rename to src/library/threading/future/legacy_future_ut.cpp index ff63db17250..fdd38c1e15b 100644 --- a/library/cpp/threading/future/legacy_future_ut.cpp +++ b/src/library/threading/future/legacy_future_ut.cpp @@ -1,6 +1,6 @@ #include "legacy_future.h" -#include +#include namespace NThreading { Y_UNIT_TEST_SUITE(TLegacyFutureTest) { diff --git a/library/cpp/threading/future/mt_ut/ya.make b/src/library/threading/future/mt_ut/ya.make similarity index 65% rename from library/cpp/threading/future/mt_ut/ya.make rename to src/library/threading/future/mt_ut/ya.make index fee088813ad..4593407970d 100644 --- a/library/cpp/threading/future/mt_ut/ya.make +++ b/src/library/threading/future/mt_ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/threading/future) +UNITTEST_FOR(src/library/threading/future) SRCS( future_mt_ut.cpp diff --git a/library/cpp/threading/future/perf/main.cpp b/src/library/threading/future/perf/main.cpp similarity index 88% rename from library/cpp/threading/future/perf/main.cpp rename to src/library/threading/future/perf/main.cpp index 303589efcd7..d0f28180f60 100644 --- a/library/cpp/threading/future/perf/main.cpp +++ b/src/library/threading/future/perf/main.cpp @@ -1,8 +1,8 @@ -#include -#include +#include +#include #include -#include +#include using namespace NThreading; diff --git a/library/cpp/threading/future/perf/ya.make b/src/library/threading/future/perf/ya.make similarity index 71% rename from library/cpp/threading/future/perf/ya.make rename to src/library/threading/future/perf/ya.make index 06774201073..b1cc06ab01b 100644 --- a/library/cpp/threading/future/perf/ya.make +++ b/src/library/threading/future/perf/ya.make @@ -5,7 +5,7 @@ SRCS( ) PEERDIR( - library/cpp/threading/future + src/library/threading/future ) END() diff --git a/library/cpp/threading/future/ut/ya.make b/src/library/threading/future/ut/ya.make similarity index 70% rename from library/cpp/threading/future/ut/ya.make rename to src/library/threading/future/ut/ya.make index 7b182741691..eeae58841c0 100644 --- a/library/cpp/threading/future/ut/ya.make +++ b/src/library/threading/future/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/threading/future) +UNITTEST_FOR(src/library/threading/future) SRCS( async_semaphore_ut.cpp diff --git a/library/cpp/threading/future/wait/fwd.cpp b/src/library/threading/future/wait/fwd.cpp similarity index 100% rename from library/cpp/threading/future/wait/fwd.cpp rename to src/library/threading/future/wait/fwd.cpp diff --git a/library/cpp/threading/future/wait/fwd.h b/src/library/threading/future/wait/fwd.h similarity index 100% rename from library/cpp/threading/future/wait/fwd.h rename to src/library/threading/future/wait/fwd.h diff --git a/library/cpp/threading/future/wait/wait-inl.h b/src/library/threading/future/wait/wait-inl.h similarity index 100% rename from library/cpp/threading/future/wait/wait-inl.h rename to src/library/threading/future/wait/wait-inl.h diff --git a/library/cpp/threading/future/wait/wait.cpp b/src/library/threading/future/wait/wait.cpp similarity index 100% rename from library/cpp/threading/future/wait/wait.cpp rename to src/library/threading/future/wait/wait.cpp diff --git a/library/cpp/threading/future/wait/wait.h b/src/library/threading/future/wait/wait.h similarity index 93% rename from library/cpp/threading/future/wait/wait.h rename to src/library/threading/future/wait/wait.h index f7dd38b151d..3eab7aa9ddb 100644 --- a/library/cpp/threading/future/wait/wait.h +++ b/src/library/threading/future/wait/wait.h @@ -4,8 +4,8 @@ #include -#include -#include +#include +#include namespace NThreading { namespace NImpl { diff --git a/library/cpp/threading/future/wait/wait_group-inl.h b/src/library/threading/future/wait/wait_group-inl.h similarity index 98% rename from library/cpp/threading/future/wait/wait_group-inl.h rename to src/library/threading/future/wait/wait_group-inl.h index 664c02b2951..278ce4cda82 100644 --- a/library/cpp/threading/future/wait/wait_group-inl.h +++ b/src/library/threading/future/wait/wait_group-inl.h @@ -6,11 +6,11 @@ #include "wait_policy.h" -#include +#include -#include +#include -#include +#include #include #include diff --git a/library/cpp/threading/future/wait/wait_group.cpp b/src/library/threading/future/wait/wait_group.cpp similarity index 100% rename from library/cpp/threading/future/wait/wait_group.cpp rename to src/library/threading/future/wait/wait_group.cpp diff --git a/library/cpp/threading/future/wait/wait_group.h b/src/library/threading/future/wait/wait_group.h similarity index 95% rename from library/cpp/threading/future/wait/wait_group.h rename to src/library/threading/future/wait/wait_group.h index 78d85594a2d..d668a889f1f 100644 --- a/library/cpp/threading/future/wait/wait_group.h +++ b/src/library/threading/future/wait/wait_group.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include namespace NThreading { namespace NWaitGroup::NImpl { diff --git a/library/cpp/threading/future/wait/wait_policy.cpp b/src/library/threading/future/wait/wait_policy.cpp similarity index 100% rename from library/cpp/threading/future/wait/wait_policy.cpp rename to src/library/threading/future/wait/wait_policy.cpp diff --git a/library/cpp/threading/future/wait/wait_policy.h b/src/library/threading/future/wait/wait_policy.h similarity index 100% rename from library/cpp/threading/future/wait/wait_policy.h rename to src/library/threading/future/wait/wait_policy.h diff --git a/library/cpp/threading/light_rw_lock/CMakeLists.txt b/src/library/threading/light_rw_lock/CMakeLists.txt similarity index 73% rename from library/cpp/threading/light_rw_lock/CMakeLists.txt rename to src/library/threading/light_rw_lock/CMakeLists.txt index a17e0cba845..4cb7d28e4b9 100644 --- a/library/cpp/threading/light_rw_lock/CMakeLists.txt +++ b/src/library/threading/light_rw_lock/CMakeLists.txt @@ -5,5 +5,5 @@ target_link_libraries(cpp-threading-light_rw_lock PUBLIC ) target_sources(cpp-threading-light_rw_lock PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/light_rw_lock/lightrwlock.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/light_rw_lock/lightrwlock.cpp ) diff --git a/library/cpp/threading/light_rw_lock/bench/lightrwlock_test.cpp b/src/library/threading/light_rw_lock/bench/lightrwlock_test.cpp similarity index 96% rename from library/cpp/threading/light_rw_lock/bench/lightrwlock_test.cpp rename to src/library/threading/light_rw_lock/bench/lightrwlock_test.cpp index c3027ea5449..6be551dcbe2 100644 --- a/library/cpp/threading/light_rw_lock/bench/lightrwlock_test.cpp +++ b/src/library/threading/light_rw_lock/bench/lightrwlock_test.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #ifdef _linux_ // Light rw lock is implemented only for linux @@ -13,7 +13,7 @@ using namespace NS_LightRWLock; #define LIGHT #ifdef RWSPINLOCK -#include +#include #endif #define CHECK_LOGIC 1 diff --git a/library/cpp/threading/light_rw_lock/bench/ya.make b/src/library/threading/light_rw_lock/bench/ya.make similarity index 66% rename from library/cpp/threading/light_rw_lock/bench/ya.make rename to src/library/threading/light_rw_lock/bench/ya.make index 297cfe1d0ab..06daa138914 100644 --- a/library/cpp/threading/light_rw_lock/bench/ya.make +++ b/src/library/threading/light_rw_lock/bench/ya.make @@ -5,7 +5,7 @@ SRCS( ) PEERDIR( - library/cpp/threading/light_rw_lock + src/library/threading/light_rw_lock ) END() diff --git a/library/cpp/threading/light_rw_lock/lightrwlock.cpp b/src/library/threading/light_rw_lock/lightrwlock.cpp similarity index 98% rename from library/cpp/threading/light_rw_lock/lightrwlock.cpp rename to src/library/threading/light_rw_lock/lightrwlock.cpp index ab056f9cef3..7034853ec86 100644 --- a/library/cpp/threading/light_rw_lock/lightrwlock.cpp +++ b/src/library/threading/light_rw_lock/lightrwlock.cpp @@ -1,5 +1,5 @@ #include "lightrwlock.h" -#include +#include #if defined(_linux_) && !defined(_tsan_enabled_) diff --git a/library/cpp/threading/light_rw_lock/lightrwlock.h b/src/library/threading/light_rw_lock/lightrwlock.h similarity index 98% rename from library/cpp/threading/light_rw_lock/lightrwlock.h rename to src/library/threading/light_rw_lock/lightrwlock.h index 16523e91822..58d8590ecb8 100644 --- a/library/cpp/threading/light_rw_lock/lightrwlock.h +++ b/src/library/threading/light_rw_lock/lightrwlock.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include // TLightRWLock and TSAN are not friends... diff --git a/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp b/src/library/threading/light_rw_lock/ut/rwlock_ut.cpp similarity index 96% rename from library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp rename to src/library/threading/light_rw_lock/ut/rwlock_ut.cpp index 84746c98934..ac34bc8b502 100644 --- a/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp +++ b/src/library/threading/light_rw_lock/ut/rwlock_ut.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class TRWMutexTest: public TTestBase { UNIT_TEST_SUITE(TRWMutexTest); diff --git a/src/library/threading/light_rw_lock/ut/ya.make b/src/library/threading/light_rw_lock/ut/ya.make new file mode 100644 index 00000000000..56b52315186 --- /dev/null +++ b/src/library/threading/light_rw_lock/ut/ya.make @@ -0,0 +1,11 @@ +UNITTEST_FOR(src/library/threading/light_rw_lock) + +SRCS( + rwlock_ut.cpp +) + +PEERDIR( + src/library/deprecated/atomic +) + +END() diff --git a/library/cpp/threading/poor_man_openmp/CMakeLists.txt b/src/library/threading/poor_man_openmp/CMakeLists.txt similarity index 76% rename from library/cpp/threading/poor_man_openmp/CMakeLists.txt rename to src/library/threading/poor_man_openmp/CMakeLists.txt index f90ebcf11a6..acc5413464e 100644 --- a/library/cpp/threading/poor_man_openmp/CMakeLists.txt +++ b/src/library/threading/poor_man_openmp/CMakeLists.txt @@ -6,5 +6,5 @@ target_link_libraries(cpp-threading-poor_man_openmp PUBLIC ) target_sources(cpp-threading-poor_man_openmp PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/threading/poor_man_openmp/thread_helper.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/threading/poor_man_openmp/thread_helper.cpp ) diff --git a/library/cpp/threading/poor_man_openmp/thread_helper.cpp b/src/library/threading/poor_man_openmp/thread_helper.cpp similarity index 75% rename from library/cpp/threading/poor_man_openmp/thread_helper.cpp rename to src/library/threading/poor_man_openmp/thread_helper.cpp index 34cb6507b9f..5cfb65a5d7a 100644 --- a/library/cpp/threading/poor_man_openmp/thread_helper.cpp +++ b/src/library/threading/poor_man_openmp/thread_helper.cpp @@ -1,6 +1,6 @@ #include "thread_helper.h" -#include +#include TMtpQueueHelper& TMtpQueueHelper::Instance() { return *Singleton(); diff --git a/library/cpp/threading/poor_man_openmp/thread_helper.h b/src/library/threading/poor_man_openmp/thread_helper.h similarity index 92% rename from library/cpp/threading/poor_man_openmp/thread_helper.h rename to src/library/threading/poor_man_openmp/thread_helper.h index f4c4c2759a5..b4067a8156f 100644 --- a/library/cpp/threading/poor_man_openmp/thread_helper.h +++ b/src/library/threading/poor_man_openmp/thread_helper.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/library/cpp/threading/poor_man_openmp/thread_helper_ut.cpp b/src/library/threading/poor_man_openmp/thread_helper_ut.cpp similarity index 83% rename from library/cpp/threading/poor_man_openmp/thread_helper_ut.cpp rename to src/library/threading/poor_man_openmp/thread_helper_ut.cpp index ef348e289d9..6716e3c9d42 100644 --- a/library/cpp/threading/poor_man_openmp/thread_helper_ut.cpp +++ b/src/library/threading/poor_man_openmp/thread_helper_ut.cpp @@ -1,9 +1,9 @@ #include "thread_helper.h" -#include +#include #include -#include +#include Y_UNIT_TEST_SUITE(TestMP) { Y_UNIT_TEST(TestErr) { diff --git a/src/library/threading/poor_man_openmp/ut/ya.make b/src/library/threading/poor_man_openmp/ut/ya.make new file mode 100644 index 00000000000..8ef7805b8e2 --- /dev/null +++ b/src/library/threading/poor_man_openmp/ut/ya.make @@ -0,0 +1,7 @@ +UNITTEST_FOR(src/library/threading/poor_man_openmp) + +SRCS( + thread_helper_ut.cpp +) + +END() diff --git a/library/cpp/unicode_normalization/CMakeLists.txt b/src/library/unicode_normalization/CMakeLists.txt similarity index 100% rename from library/cpp/unicode_normalization/CMakeLists.txt rename to src/library/unicode_normalization/CMakeLists.txt diff --git a/library/cpp/unicode_normalization/decomposition_table.h b/src/library/unicode_normalization/decomposition_table.h similarity index 94% rename from library/cpp/unicode_normalization/decomposition_table.h rename to src/library/unicode_normalization/decomposition_table.h index 0e62dd3149f..800da949bed 100644 --- a/library/cpp/unicode_normalization/decomposition_table.h +++ b/src/library/unicode_normalization/decomposition_table.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NUnicode { namespace NPrivate { diff --git a/library/cpp/unicode_normalization/generated/composition.cpp b/src/library/unicode_normalization/generated/composition.cpp similarity index 99% rename from library/cpp/unicode_normalization/generated/composition.cpp rename to src/library/unicode_normalization/generated/composition.cpp index 5812ac17887..aed35476915 100644 --- a/library/cpp/unicode_normalization/generated/composition.cpp +++ b/src/library/unicode_normalization/generated/composition.cpp @@ -1,4 +1,4 @@ -#include +#include const NUnicode::NPrivate::TComposition::TRawData NUnicode::NPrivate::TComposition::RawData[] = { { 0x41, 0x300, 0xC0 }, diff --git a/library/cpp/unicode_normalization/generated/decomposition.cpp b/src/library/unicode_normalization/generated/decomposition.cpp similarity index 99% rename from library/cpp/unicode_normalization/generated/decomposition.cpp rename to src/library/unicode_normalization/generated/decomposition.cpp index 544c5001384..1a7891aa011 100644 --- a/library/cpp/unicode_normalization/generated/decomposition.cpp +++ b/src/library/unicode_normalization/generated/decomposition.cpp @@ -1,4 +1,4 @@ -#include +#include namespace { namespace NCannonDecompositionTableGenerated { using TV = const NUnicode::NPrivate::TDecompositionTable::TStored; diff --git a/library/cpp/unicode_normalization/normalization.cpp b/src/library/unicode_normalization/normalization.cpp similarity index 100% rename from library/cpp/unicode_normalization/normalization.cpp rename to src/library/unicode_normalization/normalization.cpp diff --git a/library/cpp/unicode_normalization/normalization.h b/src/library/unicode_normalization/normalization.h similarity index 97% rename from library/cpp/unicode_normalization/normalization.h rename to src/library/unicode_normalization/normalization.h index 8050ad4ffb3..dda94194835 100644 --- a/library/cpp/unicode_normalization/normalization.h +++ b/src/library/unicode_normalization/normalization.h @@ -2,12 +2,12 @@ #include "decomposition_table.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace NUnicode { @@ -243,7 +243,7 @@ namespace NUnicode { } } - static inline void Write(const TBuffer::const_iterator& begin, const TBuffer::const_iterator& end, std::u32string& out) { // because WriteSymbol from util/charset/wide.h works wrong in this case + static inline void Write(const TBuffer::const_iterator& begin, const TBuffer::const_iterator& end, std::u32string& out) { // because WriteSymbol from src/util/charset/wide.h works wrong in this case for (TBuffer::const_iterator i = begin; i != end; ++i) { out += i->first; } diff --git a/library/cpp/unicode_normalization/ut/normalization_ut.cpp b/src/library/unicode_normalization/ut/normalization_ut.cpp similarity index 80% rename from library/cpp/unicode_normalization/ut/normalization_ut.cpp rename to src/library/unicode_normalization/ut/normalization_ut.cpp index 71590053bfc..c9a39f254fa 100644 --- a/library/cpp/unicode_normalization/ut/normalization_ut.cpp +++ b/src/library/unicode_normalization/ut/normalization_ut.cpp @@ -1,8 +1,8 @@ -#include +#include -#include +#include -#include +#include Y_UNIT_TEST_SUITE(TUnicodeNormalizationTest) { template diff --git a/src/library/uri/CMakeLists.txt b/src/library/uri/CMakeLists.txt new file mode 100644 index 00000000000..bc7f69b5318 --- /dev/null +++ b/src/library/uri/CMakeLists.txt @@ -0,0 +1,42 @@ +add_library(library-cpp-uri) + +target_link_libraries(library-cpp-uri PUBLIC + yutil + IDN::IDN + library-cpp-charset +) + +target_sources(library-cpp-uri PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/uri/assign.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/uri/common.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/uri/encode.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/uri/location.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/uri/other.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/uri/parse.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/uri/qargs.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/uri/uri.cpp +) + +if (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") + target_ragel_lexers(library-cpp-uri + PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/uri/encodefsm.rl6 + -CT0 + ) + target_ragel_lexers(library-cpp-uri + PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/uri/parsefsm.rl6 + -CT0 + ) +else () + target_ragel_lexers(library-cpp-uri + PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/uri/encodefsm.rl6 + -CG2 + ) + target_ragel_lexers(library-cpp-uri + PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/uri/parsefsm.rl6 + -CG2 + ) +endif () diff --git a/library/cpp/uri/assign.cpp b/src/library/uri/assign.cpp similarity index 98% rename from library/cpp/uri/assign.cpp rename to src/library/uri/assign.cpp index 1ca03dd1973..590ddcf56a8 100644 --- a/library/cpp/uri/assign.cpp +++ b/src/library/uri/assign.cpp @@ -3,12 +3,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace NUri { diff --git a/library/cpp/uri/benchmark/main.cpp b/src/library/uri/benchmark/main.cpp similarity index 98% rename from library/cpp/uri/benchmark/main.cpp rename to src/library/uri/benchmark/main.cpp index 9a900a78880..47b1a15003e 100644 --- a/library/cpp/uri/benchmark/main.cpp +++ b/src/library/uri/benchmark/main.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include diff --git a/library/cpp/uri/benchmark/ya.make b/src/library/uri/benchmark/ya.make similarity index 50% rename from library/cpp/uri/benchmark/ya.make rename to src/library/uri/benchmark/ya.make index 6822537c459..33226703109 100644 --- a/library/cpp/uri/benchmark/ya.make +++ b/src/library/uri/benchmark/ya.make @@ -1,8 +1,8 @@ Y_BENCHMARK() PEERDIR( - library/cpp/testing/benchmark - library/cpp/uri + src/library/testing/benchmark + src/library/uri ) SRCS( diff --git a/library/cpp/uri/common.cpp b/src/library/uri/common.cpp similarity index 99% rename from library/cpp/uri/common.cpp rename to src/library/uri/common.cpp index fda93628240..747bb62e839 100644 --- a/library/cpp/uri/common.cpp +++ b/src/library/uri/common.cpp @@ -1,6 +1,6 @@ #include "common.h" -#include +#include #include diff --git a/library/cpp/uri/common.h b/src/library/uri/common.h similarity index 99% rename from library/cpp/uri/common.h rename to src/library/uri/common.h index bf0ff5f01b6..95703627112 100644 --- a/library/cpp/uri/common.h +++ b/src/library/uri/common.h @@ -2,8 +2,8 @@ #include -#include -#include +#include +#include #include namespace NUri { diff --git a/library/cpp/uri/encode.cpp b/src/library/uri/encode.cpp similarity index 99% rename from library/cpp/uri/encode.cpp rename to src/library/uri/encode.cpp index 6d3acac68f1..cf679caf66e 100644 --- a/library/cpp/uri/encode.cpp +++ b/src/library/uri/encode.cpp @@ -1,6 +1,6 @@ #include "encode.h" -#include +#include namespace NUri { namespace NEncode { diff --git a/library/cpp/uri/encode.h b/src/library/uri/encode.h similarity index 99% rename from library/cpp/uri/encode.h rename to src/library/uri/encode.h index e8ebfdd1d07..fde6e15c626 100644 --- a/library/cpp/uri/encode.h +++ b/src/library/uri/encode.h @@ -2,7 +2,7 @@ #include "common.h" -#include +#include namespace NUri { namespace NEncode { diff --git a/library/cpp/uri/encodefsm.rl6 b/src/library/uri/encodefsm.rl6 similarity index 96% rename from library/cpp/uri/encodefsm.rl6 rename to src/library/uri/encodefsm.rl6 index 43806f3946a..fc1621cb582 100644 --- a/library/cpp/uri/encodefsm.rl6 +++ b/src/library/uri/encodefsm.rl6 @@ -1,4 +1,4 @@ -#include +#include #ifdef __clang__ #pragma clang diagnostic ignored "-Wunused-variable" diff --git a/library/cpp/uri/http_url.h b/src/library/uri/http_url.h similarity index 100% rename from library/cpp/uri/http_url.h rename to src/library/uri/http_url.h diff --git a/library/cpp/uri/location.cpp b/src/library/uri/location.cpp similarity index 100% rename from library/cpp/uri/location.cpp rename to src/library/uri/location.cpp diff --git a/library/cpp/uri/location.h b/src/library/uri/location.h similarity index 100% rename from library/cpp/uri/location.h rename to src/library/uri/location.h diff --git a/library/cpp/uri/location_ut.cpp b/src/library/uri/location_ut.cpp similarity index 97% rename from library/cpp/uri/location_ut.cpp rename to src/library/uri/location_ut.cpp index 26a0f644711..a1c5eadbb30 100644 --- a/library/cpp/uri/location_ut.cpp +++ b/src/library/uri/location_ut.cpp @@ -1,6 +1,6 @@ #include "location.h" -#include +#include Y_UNIT_TEST_SUITE(TResolveRedirectTests) { Y_UNIT_TEST(Absolute) { diff --git a/library/cpp/uri/other.cpp b/src/library/uri/other.cpp similarity index 94% rename from library/cpp/uri/other.cpp rename to src/library/uri/other.cpp index d3bfd35b92d..00b3660141c 100644 --- a/library/cpp/uri/other.cpp +++ b/src/library/uri/other.cpp @@ -2,9 +2,9 @@ #include -#include -#include -#include +#include +#include +#include /********************************************************/ /********************************************************/ diff --git a/library/cpp/uri/other.h b/src/library/uri/other.h similarity index 100% rename from library/cpp/uri/other.h rename to src/library/uri/other.h diff --git a/library/cpp/uri/parse.cpp b/src/library/uri/parse.cpp similarity index 100% rename from library/cpp/uri/parse.cpp rename to src/library/uri/parse.cpp diff --git a/library/cpp/uri/parse.h b/src/library/uri/parse.h similarity index 98% rename from library/cpp/uri/parse.h rename to src/library/uri/parse.h index f50b48e8f0f..5dba3a27c3d 100644 --- a/library/cpp/uri/parse.h +++ b/src/library/uri/parse.h @@ -6,11 +6,11 @@ #include "common.h" -#include +#include #include -#include -#include -#include +#include +#include +#include namespace NUri { class TParser; diff --git a/library/cpp/uri/parsefsm.rl6 b/src/library/uri/parsefsm.rl6 similarity index 99% rename from library/cpp/uri/parsefsm.rl6 rename to src/library/uri/parsefsm.rl6 index 70977236503..a44f1fa50cd 100644 --- a/library/cpp/uri/parsefsm.rl6 +++ b/src/library/uri/parsefsm.rl6 @@ -1,4 +1,4 @@ -#include +#include #ifdef __clang__ #pragma clang diagnostic ignored "-Wunused-variable" diff --git a/library/cpp/uri/qargs.cpp b/src/library/uri/qargs.cpp similarity index 100% rename from library/cpp/uri/qargs.cpp rename to src/library/uri/qargs.cpp diff --git a/library/cpp/uri/qargs.h b/src/library/uri/qargs.h similarity index 100% rename from library/cpp/uri/qargs.h rename to src/library/uri/qargs.h diff --git a/library/cpp/uri/uri-ru_ut.cpp b/src/library/uri/uri-ru_ut.cpp similarity index 98% rename from library/cpp/uri/uri-ru_ut.cpp rename to src/library/uri/uri-ru_ut.cpp index 75a6e8b5090..26b737dfc95 100644 --- a/library/cpp/uri/uri-ru_ut.cpp +++ b/src/library/uri/uri-ru_ut.cpp @@ -1,7 +1,7 @@ #include "uri_ut.h" -#include -#include -#include +#include +#include +#include namespace NUri { namespace { diff --git a/library/cpp/uri/uri.cpp b/src/library/uri/uri.cpp similarity index 99% rename from library/cpp/uri/uri.cpp rename to src/library/uri/uri.cpp index 6b4c6213807..334ef899e6c 100644 --- a/library/cpp/uri/uri.cpp +++ b/src/library/uri/uri.cpp @@ -1,8 +1,8 @@ #include "uri.h" -#include -#include -#include +#include +#include +#include namespace NUri { TState::EParsed TUri::CheckHost(const std::string_view& host) { diff --git a/library/cpp/uri/uri.h b/src/library/uri/uri.h similarity index 98% rename from library/cpp/uri/uri.h rename to src/library/uri/uri.h index f7857f18c63..48fda8a4578 100644 --- a/library/cpp/uri/uri.h +++ b/src/library/uri/uri.h @@ -3,13 +3,13 @@ #include "common.h" #include "encode.h" -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/library/cpp/uri/uri_ut.cpp b/src/library/uri/uri_ut.cpp similarity index 99% rename from library/cpp/uri/uri_ut.cpp rename to src/library/uri/uri_ut.cpp index 2b5a49c3a54..58ec07ff734 100644 --- a/library/cpp/uri/uri_ut.cpp +++ b/src/library/uri/uri_ut.cpp @@ -1,9 +1,9 @@ #include "uri_ut.h" #include "other.h" #include "qargs.h" -#include +#include -#include +#include namespace NUri { Y_UNIT_TEST_SUITE(URLTest) { diff --git a/library/cpp/uri/uri_ut.h b/src/library/uri/uri_ut.h similarity index 99% rename from library/cpp/uri/uri_ut.h rename to src/library/uri/uri_ut.h index b99ed061855..47ef58f7898 100644 --- a/library/cpp/uri/uri_ut.h +++ b/src/library/uri/uri_ut.h @@ -2,7 +2,7 @@ #include "uri.h" -#include +#include namespace NUri { struct TTest { diff --git a/library/cpp/uri/ut/ya.make b/src/library/uri/ut/ya.make similarity index 65% rename from library/cpp/uri/ut/ya.make rename to src/library/uri/ut/ya.make index e9907497210..2afefdb72c4 100644 --- a/library/cpp/uri/ut/ya.make +++ b/src/library/uri/ut/ya.make @@ -1,11 +1,11 @@ -UNITTEST_FOR(library/cpp/uri) +UNITTEST_FOR(src/library/uri) NO_OPTIMIZE() NO_WSHADOW() PEERDIR( - library/cpp/html/entity + src/library/html/entity ) SRCS( diff --git a/src/library/uuid/CMakeLists.txt b/src/library/uuid/CMakeLists.txt new file mode 100644 index 00000000000..6dae2f81aea --- /dev/null +++ b/src/library/uuid/CMakeLists.txt @@ -0,0 +1,9 @@ +add_library(library-uuid) + +target_link_libraries(library-uuid PUBLIC + yutil +) + +target_sources(library-uuid PRIVATE + uuid.cpp +) diff --git a/ydb/library/uuid/uuid.cpp b/src/library/uuid/uuid.cpp similarity index 97% rename from ydb/library/uuid/uuid.cpp rename to src/library/uuid/uuid.cpp index aa12c7664b4..858c9965462 100644 --- a/ydb/library/uuid/uuid.cpp +++ b/src/library/uuid/uuid.cpp @@ -1,6 +1,6 @@ #include "uuid.h" -#include +#include namespace NKikimr { namespace NUuid { diff --git a/ydb/library/uuid/uuid.h b/src/library/uuid/uuid.h similarity index 97% rename from ydb/library/uuid/uuid.h rename to src/library/uuid/uuid.h index 0cbdc08588e..48858b0f601 100644 --- a/ydb/library/uuid/uuid.h +++ b/src/library/uuid/uuid.h @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/ydb/library/yql/CMakeLists.txt b/src/library/yql/CMakeLists.txt similarity index 100% rename from ydb/library/yql/CMakeLists.txt rename to src/library/yql/CMakeLists.txt diff --git a/ydb/library/yql/public/CMakeLists.txt b/src/library/yql/public/CMakeLists.txt similarity index 100% rename from ydb/library/yql/public/CMakeLists.txt rename to src/library/yql/public/CMakeLists.txt diff --git a/ydb/library/yql/public/decimal/CMakeLists.txt b/src/library/yql/public/decimal/CMakeLists.txt similarity index 51% rename from ydb/library/yql/public/decimal/CMakeLists.txt rename to src/library/yql/public/decimal/CMakeLists.txt index bba738508cf..e43997e6105 100644 --- a/ydb/library/yql/public/decimal/CMakeLists.txt +++ b/src/library/yql/public/decimal/CMakeLists.txt @@ -6,8 +6,8 @@ target_link_libraries(yql-public-decimal PUBLIC ) target_sources(yql-public-decimal PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/public/decimal/yql_decimal.cpp - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/public/decimal/yql_decimal_serialize.cpp + yql_decimal.cpp + yql_decimal_serialize.cpp ) diff --git a/src/library/yql/public/decimal/ut/CMakeLists.txt b/src/library/yql/public/decimal/ut/CMakeLists.txt new file mode 100644 index 00000000000..fe45e458750 --- /dev/null +++ b/src/library/yql/public/decimal/ut/CMakeLists.txt @@ -0,0 +1,11 @@ +add_ydb_test(NAME yql-public-decimal_ut + INCLUDE_DIRS + ${YDB_SDK_SOURCE_DIR}/src/library/yql/public/decimal + SOURCES + ${YDB_SDK_SOURCE_DIR}/src/library/yql/public/decimal/ut/yql_decimal_ut.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yql/public/decimal/ut/yql_wide_int_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + yql-public-decimal +) diff --git a/ydb/library/yql/public/decimal/ut/yql_decimal_ut.cpp b/src/library/yql/public/decimal/ut/yql_decimal_ut.cpp similarity index 98% rename from ydb/library/yql/public/decimal/ut/yql_decimal_ut.cpp rename to src/library/yql/public/decimal/ut/yql_decimal_ut.cpp index d7303d78fc0..9778e56582b 100644 --- a/ydb/library/yql/public/decimal/ut/yql_decimal_ut.cpp +++ b/src/library/yql/public/decimal/ut/yql_decimal_ut.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include -#include +#include namespace NYql { namespace NDecimal { diff --git a/ydb/library/yql/public/decimal/ut/yql_wide_int_ut.cpp b/src/library/yql/public/decimal/ut/yql_wide_int_ut.cpp similarity index 99% rename from ydb/library/yql/public/decimal/ut/yql_wide_int_ut.cpp rename to src/library/yql/public/decimal/ut/yql_wide_int_ut.cpp index 29ec766cafa..b85844f872f 100644 --- a/ydb/library/yql/public/decimal/ut/yql_wide_int_ut.cpp +++ b/src/library/yql/public/decimal/ut/yql_wide_int_ut.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include namespace NYql { Y_UNIT_TEST_SUITE(TYqlWideIntTest) { diff --git a/ydb/library/yql/public/decimal/yql_decimal.cpp b/src/library/yql/public/decimal/yql_decimal.cpp similarity index 100% rename from ydb/library/yql/public/decimal/yql_decimal.cpp rename to src/library/yql/public/decimal/yql_decimal.cpp diff --git a/ydb/library/yql/public/decimal/yql_decimal.h b/src/library/yql/public/decimal/yql_decimal.h similarity index 100% rename from ydb/library/yql/public/decimal/yql_decimal.h rename to src/library/yql/public/decimal/yql_decimal.h diff --git a/ydb/library/yql/public/decimal/yql_decimal_serialize.cpp b/src/library/yql/public/decimal/yql_decimal_serialize.cpp similarity index 100% rename from ydb/library/yql/public/decimal/yql_decimal_serialize.cpp rename to src/library/yql/public/decimal/yql_decimal_serialize.cpp diff --git a/ydb/library/yql/public/decimal/yql_decimal_serialize.h b/src/library/yql/public/decimal/yql_decimal_serialize.h similarity index 78% rename from ydb/library/yql/public/decimal/yql_decimal_serialize.h rename to src/library/yql/public/decimal/yql_decimal_serialize.h index 57a642f36b6..b21f0babf45 100644 --- a/ydb/library/yql/public/decimal/yql_decimal_serialize.h +++ b/src/library/yql/public/decimal/yql_decimal_serialize.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NYql { namespace NDecimal { diff --git a/ydb/library/yql/public/decimal/yql_wide_int.h b/src/library/yql/public/decimal/yql_wide_int.h similarity index 99% rename from ydb/library/yql/public/decimal/yql_wide_int.h rename to src/library/yql/public/decimal/yql_wide_int.h index 0f650213b90..8a33e2cc03f 100644 --- a/ydb/library/yql/public/decimal/yql_wide_int.h +++ b/src/library/yql/public/decimal/yql_wide_int.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/ydb/library/yql/public/issue/CMakeLists.txt b/src/library/yql/public/issue/CMakeLists.txt similarity index 68% rename from ydb/library/yql/public/issue/CMakeLists.txt rename to src/library/yql/public/issue/CMakeLists.txt index 64b07be098e..e35613252a7 100644 --- a/ydb/library/yql/public/issue/CMakeLists.txt +++ b/src/library/yql/public/issue/CMakeLists.txt @@ -1,5 +1,4 @@ add_subdirectory(protos) -add_subdirectory(ut) add_library(yql-public-issue) @@ -16,8 +15,8 @@ target_link_libraries(yql-public-issue PUBLIC ) target_sources(yql-public-issue PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/public/issue/yql_issue.cpp - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/public/issue/yql_issue_message.cpp + yql_issue.cpp + yql_issue_message.cpp ) diff --git a/ydb/library/yql/public/issue/protos/CMakeLists.txt b/src/library/yql/public/issue/protos/CMakeLists.txt similarity index 68% rename from ydb/library/yql/public/issue/protos/CMakeLists.txt rename to src/library/yql/public/issue/protos/CMakeLists.txt index c48be3611b5..6bcbfad35ab 100644 --- a/ydb/library/yql/public/issue/protos/CMakeLists.txt +++ b/src/library/yql/public/issue/protos/CMakeLists.txt @@ -6,14 +6,12 @@ target_link_libraries(public-issue-protos PUBLIC ) target_proto_messages(public-issue-protos PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/public/issue/protos/issue_message.proto - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/public/issue/protos/issue_severity.proto + ${YDB_SDK_SOURCE_DIR}/src/library/yql/public/issue/protos/issue_message.proto + ${YDB_SDK_SOURCE_DIR}/src/library/yql/public/issue/protos/issue_severity.proto ) target_proto_addincls(public-issue-protos ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} ${YDB_SDK_SOURCE_DIR} ${YDB_SDK_BINARY_DIR} ) diff --git a/ydb/library/yql/public/issue/protos/issue_message.proto b/src/library/yql/public/issue/protos/issue_message.proto similarity index 100% rename from ydb/library/yql/public/issue/protos/issue_message.proto rename to src/library/yql/public/issue/protos/issue_message.proto diff --git a/ydb/library/yql/public/issue/protos/issue_severity.proto b/src/library/yql/public/issue/protos/issue_severity.proto similarity index 100% rename from ydb/library/yql/public/issue/protos/issue_severity.proto rename to src/library/yql/public/issue/protos/issue_severity.proto diff --git a/ydb/library/yql/public/issue/yql_issue.cpp b/src/library/yql/public/issue/yql_issue.cpp similarity index 96% rename from ydb/library/yql/public/issue/yql_issue.cpp rename to src/library/yql/public/issue/yql_issue.cpp index 94e256e6ebf..e583dcbc067 100644 --- a/ydb/library/yql/public/issue/yql_issue.cpp +++ b/src/library/yql/public/issue/yql_issue.cpp @@ -1,18 +1,18 @@ #include "yql_issue.h" #include "yql_issue_id.h" -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include #include diff --git a/ydb/library/yql/public/issue/yql_issue.h b/src/library/yql/public/issue/yql_issue.h similarity index 98% rename from ydb/library/yql/public/issue/yql_issue.h rename to src/library/yql/public/issue/yql_issue.h index 653dd270efc..b2ef496a038 100644 --- a/ydb/library/yql/public/issue/yql_issue.h +++ b/src/library/yql/public/issue/yql_issue.h @@ -2,9 +2,9 @@ #include "yql_issue_id.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/ydb/library/yql/public/issue/yql_issue_id.h b/src/library/yql/public/issue/yql_issue_id.h similarity index 93% rename from ydb/library/yql/public/issue/yql_issue_id.h rename to src/library/yql/public/issue/yql_issue_id.h index c6b8461439d..1433184b33f 100644 --- a/ydb/library/yql/public/issue/yql_issue_id.h +++ b/src/library/yql/public/issue/yql_issue_id.h @@ -1,19 +1,19 @@ #pragma once -#include +#include -#include -#include +#include +#include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef _win_ #ifdef GetMessage diff --git a/ydb/library/yql/public/issue/yql_issue_message.cpp b/src/library/yql/public/issue/yql_issue_message.cpp similarity index 96% rename from ydb/library/yql/public/issue/yql_issue_message.cpp rename to src/library/yql/public/issue/yql_issue_message.cpp index ea27ce97beb..63cd8bbbef2 100644 --- a/ydb/library/yql/public/issue/yql_issue_message.cpp +++ b/src/library/yql/public/issue/yql_issue_message.cpp @@ -1,11 +1,11 @@ #include "yql_issue_message.h" -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/ydb/library/yql/public/issue/yql_issue_message.h b/src/library/yql/public/issue/yql_issue_message.h similarity index 96% rename from ydb/library/yql/public/issue/yql_issue_message.h rename to src/library/yql/public/issue/yql_issue_message.h index 4a7bc613c26..9f10ebe583b 100644 --- a/ydb/library/yql/public/issue/yql_issue_message.h +++ b/src/library/yql/public/issue/yql_issue_message.h @@ -2,7 +2,7 @@ #include "yql_issue.h" -#include +#include namespace NYql { diff --git a/ydb/library/yql/utils/CMakeLists.txt b/src/library/yql/utils/CMakeLists.txt similarity index 72% rename from ydb/library/yql/utils/CMakeLists.txt rename to src/library/yql/utils/CMakeLists.txt index f3dba284185..c9b1448881d 100644 --- a/ydb/library/yql/utils/CMakeLists.txt +++ b/src/library/yql/utils/CMakeLists.txt @@ -1,5 +1,3 @@ -add_subdirectory(ut) - add_library(library-yql-utils) target_link_libraries(library-yql-utils PUBLIC @@ -10,5 +8,5 @@ target_link_libraries(library-yql-utils PUBLIC ) target_sources(library-yql-utils PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/utils/utf8.cpp + utf8.cpp ) diff --git a/ydb/library/yql/utils/utf8.cpp b/src/library/yql/utils/utf8.cpp similarity index 99% rename from ydb/library/yql/utils/utf8.cpp rename to src/library/yql/utils/utf8.cpp index 26817dfeae7..a1b423376d0 100644 --- a/ydb/library/yql/utils/utf8.cpp +++ b/src/library/yql/utils/utf8.cpp @@ -1,6 +1,6 @@ #include "utf8.h" -#include +#include #include #include diff --git a/ydb/library/yql/utils/utf8.h b/src/library/yql/utils/utf8.h similarity index 100% rename from ydb/library/yql/utils/utf8.h rename to src/library/yql/utils/utf8.h diff --git a/src/library/yson/CMakeLists.txt b/src/library/yson/CMakeLists.txt new file mode 100644 index 00000000000..36981dce252 --- /dev/null +++ b/src/library/yson/CMakeLists.txt @@ -0,0 +1,22 @@ +add_subdirectory(json) +add_subdirectory(node) + +add_library(library-cpp-yson) + +target_link_libraries(library-cpp-yson PUBLIC + yutil + cpp-yt-misc + cpp-yt-yson +) + +target_sources(library-cpp-yson PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/yson/consumer.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yson/lexer.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yson/parser.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yson/token.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yson/tokenizer.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yson/varint.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yson/writer.cpp +) + + diff --git a/library/cpp/yson/consumer.cpp b/src/library/yson/consumer.cpp similarity index 100% rename from library/cpp/yson/consumer.cpp rename to src/library/yson/consumer.cpp diff --git a/library/cpp/yson/consumer.h b/src/library/yson/consumer.h similarity index 73% rename from library/cpp/yson/consumer.h rename to src/library/yson/consumer.h index 29b6b17cc59..6b773e17438 100644 --- a/library/cpp/yson/consumer.h +++ b/src/library/yson/consumer.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include namespace NYson { struct TYsonConsumerBase diff --git a/library/cpp/yson/detail.h b/src/library/yson/detail.h similarity index 99% rename from library/cpp/yson/detail.h rename to src/library/yson/detail.h index 27a9b014216..4f62e0d8fb1 100644 --- a/library/cpp/yson/detail.h +++ b/src/library/yson/detail.h @@ -3,10 +3,10 @@ #include "public.h" #include "zigzag.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace NYson { namespace NDetail { diff --git a/library/cpp/yson/format.h b/src/library/yson/format.h similarity index 100% rename from library/cpp/yson/format.h rename to src/library/yson/format.h diff --git a/library/cpp/yson/json/CMakeLists.txt b/src/library/yson/json/CMakeLists.txt similarity index 53% rename from library/cpp/yson/json/CMakeLists.txt rename to src/library/yson/json/CMakeLists.txt index 6998af25941..87645df08c7 100644 --- a/library/cpp/yson/json/CMakeLists.txt +++ b/src/library/yson/json/CMakeLists.txt @@ -6,8 +6,8 @@ target_link_libraries(cpp-yson-json PUBLIC ) target_sources(cpp-yson-json PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/json/json_writer.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yson/json/yson2json_adapter.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yson/json/json_writer.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yson/json/yson2json_adapter.cpp ) diff --git a/library/cpp/yson/json/json_writer.cpp b/src/library/yson/json/json_writer.cpp similarity index 98% rename from library/cpp/yson/json/json_writer.cpp rename to src/library/yson/json/json_writer.cpp index c08881e19df..11200f20287 100644 --- a/library/cpp/yson/json/json_writer.cpp +++ b/src/library/yson/json/json_writer.cpp @@ -1,7 +1,7 @@ #include "json_writer.h" -#include -#include +#include +#include namespace NYT { //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yson/json/json_writer.h b/src/library/yson/json/json_writer.h similarity index 95% rename from library/cpp/yson/json/json_writer.h rename to src/library/yson/json/json_writer.h index 3cbe15c6d8d..9d49aff4d60 100644 --- a/library/cpp/yson/json/json_writer.h +++ b/src/library/yson/json/json_writer.h @@ -1,9 +1,9 @@ #pragma once -#include -#include +#include +#include -#include +#include diff --git a/library/cpp/yson/json/yson2json_adapter.cpp b/src/library/yson/json/yson2json_adapter.cpp similarity index 100% rename from library/cpp/yson/json/yson2json_adapter.cpp rename to src/library/yson/json/yson2json_adapter.cpp diff --git a/library/cpp/yson/json/yson2json_adapter.h b/src/library/yson/json/yson2json_adapter.h similarity index 92% rename from library/cpp/yson/json/yson2json_adapter.h rename to src/library/yson/json/yson2json_adapter.h index 20b7c3c417a..48efa4e6664 100644 --- a/library/cpp/yson/json/yson2json_adapter.h +++ b/src/library/yson/json/yson2json_adapter.h @@ -1,10 +1,10 @@ #pragma once -#include +#include -#include +#include -#include +#include namespace NYT { class TYson2JsonCallbacksAdapter diff --git a/library/cpp/yson/lexer.cpp b/src/library/yson/lexer.cpp similarity index 97% rename from library/cpp/yson/lexer.cpp rename to src/library/yson/lexer.cpp index 15c2e27bef2..82a7c098a09 100644 --- a/library/cpp/yson/lexer.cpp +++ b/src/library/yson/lexer.cpp @@ -2,7 +2,7 @@ #include "lexer_detail.h" #include "token.h" -#include +#include namespace NYson { //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yson/lexer.h b/src/library/yson/lexer.h similarity index 93% rename from library/cpp/yson/lexer.h rename to src/library/yson/lexer.h index 8c93eec3635..72bd0a1a2b3 100644 --- a/library/cpp/yson/lexer.h +++ b/src/library/yson/lexer.h @@ -3,7 +3,7 @@ #include "public.h" #include "token.h" -#include +#include namespace NYson { //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yson/lexer_detail.h b/src/library/yson/lexer_detail.h similarity index 100% rename from library/cpp/yson/lexer_detail.h rename to src/library/yson/lexer_detail.h diff --git a/src/library/yson/node/CMakeLists.txt b/src/library/yson/node/CMakeLists.txt new file mode 100644 index 00000000000..b61c3fe5518 --- /dev/null +++ b/src/library/yson/node/CMakeLists.txt @@ -0,0 +1,24 @@ +add_library(cpp-yson-node) + +target_link_libraries(cpp-yson-node PUBLIC + yutil + tools-enum_parser-enum_serialization_runtime + library-cpp-yson + cpp-yson-json +) + +target_sources(cpp-yson-node PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/yson/node/node.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yson/node/node_io.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yson/node/node_builder.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yson/node/node_visitor.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yson/node/serialize.cpp +) + +generate_enum_serilization(cpp-yson-node + ${YDB_SDK_SOURCE_DIR}/src/library/yson/node/node.h + INCLUDE_HEADERS + src/library/yson/node/node.h +) + + diff --git a/library/cpp/yson/node/benchmark/reserve.cpp b/src/library/yson/node/benchmark/reserve.cpp similarity index 98% rename from library/cpp/yson/node/benchmark/reserve.cpp rename to src/library/yson/node/benchmark/reserve.cpp index d9600e12248..42553b3b993 100644 --- a/library/cpp/yson/node/benchmark/reserve.cpp +++ b/src/library/yson/node/benchmark/reserve.cpp @@ -1,6 +1,6 @@ #include -#include +#include using namespace NYT; diff --git a/library/cpp/yson/node/benchmark/ya.make b/src/library/yson/node/benchmark/ya.make similarity index 73% rename from library/cpp/yson/node/benchmark/ya.make rename to src/library/yson/node/benchmark/ya.make index dd2035b1fa7..db88edcc5b1 100644 --- a/library/cpp/yson/node/benchmark/ya.make +++ b/src/library/yson/node/benchmark/ya.make @@ -5,7 +5,7 @@ SRCS( ) PEERDIR( - library/cpp/yson/node + src/library/yson/node ) SIZE(SMALL) diff --git a/library/cpp/yson/node/node.cpp b/src/library/yson/node/node.cpp similarity index 99% rename from library/cpp/yson/node/node.cpp rename to src/library/yson/node/node.cpp index ba6ef1f90ec..ffb8d3bd2cf 100644 --- a/library/cpp/yson/node/node.cpp +++ b/src/library/yson/node/node.cpp @@ -2,10 +2,10 @@ #include "node_io.h" -#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/yson/node/node.h b/src/library/yson/node/node.h similarity index 98% rename from library/cpp/yson/node/node.h rename to src/library/yson/node/node.h index 9476f313edb..3bc0b2afa2e 100644 --- a/library/cpp/yson/node/node.h +++ b/src/library/yson/node/node.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include - -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include #include #include diff --git a/library/cpp/yson/node/node_builder.cpp b/src/library/yson/node/node_builder.cpp similarity index 100% rename from library/cpp/yson/node/node_builder.cpp rename to src/library/yson/node/node_builder.cpp diff --git a/library/cpp/yson/node/node_builder.h b/src/library/yson/node/node_builder.h similarity index 90% rename from library/cpp/yson/node/node_builder.h rename to src/library/yson/node/node_builder.h index 23eb5f72271..7daf4595702 100644 --- a/library/cpp/yson/node/node_builder.h +++ b/src/library/yson/node/node_builder.h @@ -2,11 +2,11 @@ #include "node.h" -#include +#include -#include +#include -#include +#include namespace NYT { diff --git a/library/cpp/yson/node/node_io.cpp b/src/library/yson/node/node_io.cpp similarity index 92% rename from library/cpp/yson/node/node_io.cpp rename to src/library/yson/node/node_io.cpp index ec4290bdc01..79aa58e5532 100644 --- a/library/cpp/yson/node/node_io.cpp +++ b/src/library/yson/node/node_io.cpp @@ -3,18 +3,18 @@ #include "node_builder.h" #include "node_visitor.h" -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include namespace NYT { diff --git a/library/cpp/yson/node/node_io.h b/src/library/yson/node/node_io.h similarity index 98% rename from library/cpp/yson/node/node_io.h rename to src/library/yson/node/node_io.h index 3d88c0afedd..6a38a1194ba 100644 --- a/library/cpp/yson/node/node_io.h +++ b/src/library/yson/node/node_io.h @@ -1,7 +1,7 @@ #pragma once #include "node.h" -#include +#include namespace NJson { class TJsonValue; diff --git a/library/cpp/yson/node/node_io_ut.cpp b/src/library/yson/node/node_io_ut.cpp similarity index 93% rename from library/cpp/yson/node/node_io_ut.cpp rename to src/library/yson/node/node_io_ut.cpp index 91eb772fe51..23b985ec287 100644 --- a/library/cpp/yson/node/node_io_ut.cpp +++ b/src/library/yson/node/node_io_ut.cpp @@ -1,8 +1,8 @@ #include "node_io.h" -#include +#include -#include +#include using namespace NYson; diff --git a/library/cpp/yson/node/node_ut.cpp b/src/library/yson/node/node_ut.cpp similarity index 99% rename from library/cpp/yson/node/node_ut.cpp rename to src/library/yson/node/node_ut.cpp index ae0e321b672..66dd1d4204e 100644 --- a/library/cpp/yson/node/node_ut.cpp +++ b/src/library/yson/node/node_ut.cpp @@ -1,9 +1,9 @@ #include "node.h" #include "node_io.h" -#include +#include -#include +#include using namespace NYT; diff --git a/library/cpp/yson/node/node_visitor.cpp b/src/library/yson/node/node_visitor.cpp similarity index 99% rename from library/cpp/yson/node/node_visitor.cpp rename to src/library/yson/node/node_visitor.cpp index 01d84362f2c..a08678b8dba 100644 --- a/library/cpp/yson/node/node_visitor.cpp +++ b/src/library/yson/node/node_visitor.cpp @@ -1,6 +1,6 @@ #include "node_visitor.h" -#include +#include namespace NYT { diff --git a/library/cpp/yson/node/node_visitor.h b/src/library/yson/node/node_visitor.h similarity index 95% rename from library/cpp/yson/node/node_visitor.h rename to src/library/yson/node/node_visitor.h index db258323092..57319c5471c 100644 --- a/library/cpp/yson/node/node_visitor.h +++ b/src/library/yson/node/node_visitor.h @@ -2,7 +2,7 @@ #include "node.h" -#include +#include namespace NYT { diff --git a/library/cpp/yson/node/serialize.cpp b/src/library/yson/node/serialize.cpp similarity index 98% rename from library/cpp/yson/node/serialize.cpp rename to src/library/yson/node/serialize.cpp index 77e55a6ea85..b39d147accf 100644 --- a/library/cpp/yson/node/serialize.cpp +++ b/src/library/yson/node/serialize.cpp @@ -2,7 +2,7 @@ #include "node_visitor.h" -#include +#include namespace NYT { diff --git a/library/cpp/yson/node/serialize.h b/src/library/yson/node/serialize.h similarity index 100% rename from library/cpp/yson/node/serialize.h rename to src/library/yson/node/serialize.h diff --git a/library/cpp/yson/node/ut/ya.make b/src/library/yson/node/ut/ya.make similarity index 58% rename from library/cpp/yson/node/ut/ya.make rename to src/library/yson/node/ut/ya.make index 269c167c147..c3d75b6eae1 100644 --- a/library/cpp/yson/node/ut/ya.make +++ b/src/library/yson/node/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/yson/node) +UNITTEST_FOR(src/library/yson/node) SRCS( node_ut.cpp diff --git a/library/cpp/yson/parser.cpp b/src/library/yson/parser.cpp similarity index 98% rename from library/cpp/yson/parser.cpp rename to src/library/yson/parser.cpp index 24e8f59dce1..63c55fc9af5 100644 --- a/library/cpp/yson/parser.cpp +++ b/src/library/yson/parser.cpp @@ -3,8 +3,8 @@ #include "format.h" #include "parser_detail.h" -#include -#include +#include +#include namespace NYson { //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yson/parser.h b/src/library/yson/parser.h similarity index 98% rename from library/cpp/yson/parser.h rename to src/library/yson/parser.h index b2b473c51d0..f41c63651c0 100644 --- a/library/cpp/yson/parser.h +++ b/src/library/yson/parser.h @@ -2,7 +2,7 @@ #include "public.h" -#include +#include class IInputStream; diff --git a/library/cpp/yson/parser_detail.h b/src/library/yson/parser_detail.h similarity index 100% rename from library/cpp/yson/parser_detail.h rename to src/library/yson/parser_detail.h diff --git a/library/cpp/yson/public.h b/src/library/yson/public.h similarity index 75% rename from library/cpp/yson/public.h rename to src/library/yson/public.h index 1ed793592ba..71ab92b07bf 100644 --- a/library/cpp/yson/public.h +++ b/src/library/yson/public.h @@ -1,10 +1,10 @@ #pragma once -#include -#include +#include +#include -#include -#include +#include +#include namespace NYson { diff --git a/library/cpp/yson/token.cpp b/src/library/yson/token.cpp similarity index 99% rename from library/cpp/yson/token.cpp rename to src/library/yson/token.cpp index 5aa67ed6542..c99806fe311 100644 --- a/library/cpp/yson/token.cpp +++ b/src/library/yson/token.cpp @@ -1,6 +1,6 @@ #include "token.h" -#include +#include namespace NYson { //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yson/token.h b/src/library/yson/token.h similarity index 100% rename from library/cpp/yson/token.h rename to src/library/yson/token.h diff --git a/library/cpp/yson/tokenizer.cpp b/src/library/yson/tokenizer.cpp similarity index 100% rename from library/cpp/yson/tokenizer.cpp rename to src/library/yson/tokenizer.cpp diff --git a/library/cpp/yson/tokenizer.h b/src/library/yson/tokenizer.h similarity index 100% rename from library/cpp/yson/tokenizer.h rename to src/library/yson/tokenizer.h diff --git a/library/cpp/yson/ut/ya.make b/src/library/yson/ut/ya.make similarity index 71% rename from library/cpp/yson/ut/ya.make rename to src/library/yson/ut/ya.make index 489735f772e..4601ac1cff3 100644 --- a/library/cpp/yson/ut/ya.make +++ b/src/library/yson/ut/ya.make @@ -5,7 +5,7 @@ SRCS( ) PEERDIR( - library/cpp/yson + src/library/yson ) END() diff --git a/library/cpp/yson/ut/yson_ut.cpp b/src/library/yson/ut/yson_ut.cpp similarity index 69% rename from library/cpp/yson/ut/yson_ut.cpp rename to src/library/yson/ut/yson_ut.cpp index 1813e7772d6..17cec5d5664 100644 --- a/library/cpp/yson/ut/yson_ut.cpp +++ b/src/library/yson/ut/yson_ut.cpp @@ -1,9 +1,9 @@ -#include -#include +#include +#include -#include +#include -#include +#include using namespace NYson; diff --git a/library/cpp/yson/varint.cpp b/src/library/yson/varint.cpp similarity index 96% rename from library/cpp/yson/varint.cpp rename to src/library/yson/varint.cpp index ff451990f9a..316e87a91cb 100644 --- a/library/cpp/yson/varint.cpp +++ b/src/library/yson/varint.cpp @@ -2,8 +2,8 @@ #include "zigzag.h" -#include -#include +#include +#include namespace NYson { //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yson/varint.h b/src/library/yson/varint.h similarity index 86% rename from library/cpp/yson/varint.h rename to src/library/yson/varint.h index 80b1184e57f..830fea4d41a 100644 --- a/library/cpp/yson/varint.h +++ b/src/library/yson/varint.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace NYson { //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yson/writer.cpp b/src/library/yson/writer.cpp similarity index 99% rename from library/cpp/yson/writer.cpp rename to src/library/yson/writer.cpp index f3f36561852..44302e44bc0 100644 --- a/library/cpp/yson/writer.cpp +++ b/src/library/yson/writer.cpp @@ -6,14 +6,14 @@ #include "varint.h" #include "zigzag.h" -#include +#include #include namespace NYson { //////////////////////////////////////////////////////////////////////////////// - // Copied from + // Copied from namespace { inline char HexDigit(char value) { Y_ASSERT(value < 16); diff --git a/library/cpp/yson/writer.h b/src/library/yson/writer.h similarity index 98% rename from library/cpp/yson/writer.h rename to src/library/yson/writer.h index 90815681c4e..8d60e4d5947 100644 --- a/library/cpp/yson/writer.h +++ b/src/library/yson/writer.h @@ -4,7 +4,7 @@ #include "token.h" #include "consumer.h" -#include +#include class IOutputStream; class IZeroCopyInput; diff --git a/library/cpp/yson/zigzag.h b/src/library/yson/zigzag.h similarity index 95% rename from library/cpp/yson/zigzag.h rename to src/library/yson/zigzag.h index 2f1190508fb..1a3084e4143 100644 --- a/library/cpp/yson/zigzag.h +++ b/src/library/yson/zigzag.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NYson { //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yt/CMakeLists.txt b/src/library/yt/CMakeLists.txt similarity index 100% rename from library/cpp/yt/CMakeLists.txt rename to src/library/yt/CMakeLists.txt diff --git a/library/cpp/yt/assert/CMakeLists.txt b/src/library/yt/assert/CMakeLists.txt similarity index 77% rename from library/cpp/yt/assert/CMakeLists.txt rename to src/library/yt/assert/CMakeLists.txt index 32688ca7df2..236479326e4 100644 --- a/library/cpp/yt/assert/CMakeLists.txt +++ b/src/library/yt/assert/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries(cpp-yt-assert PUBLIC ) target_sources(cpp-yt-assert PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/assert/assert.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/assert/assert.cpp ) diff --git a/library/cpp/yt/assert/assert.cpp b/src/library/yt/assert/assert.cpp similarity index 89% rename from library/cpp/yt/assert/assert.cpp rename to src/library/yt/assert/assert.cpp index 98c70f0e070..d73c3494658 100644 --- a/library/cpp/yt/assert/assert.cpp +++ b/src/library/yt/assert/assert.cpp @@ -1,7 +1,7 @@ #include "assert.h" -#include -#include +#include +#include namespace NYT::NDetail { diff --git a/library/cpp/yt/assert/assert.h b/src/library/yt/assert/assert.h similarity index 96% rename from library/cpp/yt/assert/assert.h rename to src/library/yt/assert/assert.h index 6704647098a..d8aa4548dba 100644 --- a/library/cpp/yt/assert/assert.h +++ b/src/library/yt/assert/assert.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/library/cpp/yt/coding/CMakeLists.txt b/src/library/yt/coding/CMakeLists.txt similarity index 75% rename from library/cpp/yt/coding/CMakeLists.txt rename to src/library/yt/coding/CMakeLists.txt index 354404d7b61..d40b0015a7d 100644 --- a/library/cpp/yt/coding/CMakeLists.txt +++ b/src/library/yt/coding/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(cpp-yt-coding INTERFACE cpp-yt-exception ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(cpp-yt-coding INTERFACE ) diff --git a/library/cpp/yt/coding/unittests/varint_ut.cpp b/src/library/yt/coding/unittests/varint_ut.cpp similarity index 96% rename from library/cpp/yt/coding/unittests/varint_ut.cpp rename to src/library/yt/coding/unittests/varint_ut.cpp index 82470361caa..bd23301a840 100644 --- a/library/cpp/yt/coding/unittests/varint_ut.cpp +++ b/src/library/yt/coding/unittests/varint_ut.cpp @@ -1,10 +1,10 @@ -#include +#include -#include +#include -#include +#include -#include +#include #include diff --git a/src/library/yt/coding/unittests/ya.make b/src/library/yt/coding/unittests/ya.make new file mode 100644 index 00000000000..6ba1caa27ee --- /dev/null +++ b/src/library/yt/coding/unittests/ya.make @@ -0,0 +1,15 @@ +GTEST() + +INCLUDE(${ARCADIA_ROOT}/src/library/yt/ya_cpp.make.inc) + +SRCS( + zig_zag_ut.cpp + varint_ut.cpp +) + +PEERDIR( + src/library/yt/coding + src/library/testing/gtest +) + +END() diff --git a/library/cpp/yt/coding/unittests/zig_zag_ut.cpp b/src/library/yt/coding/unittests/zig_zag_ut.cpp similarity index 95% rename from library/cpp/yt/coding/unittests/zig_zag_ut.cpp rename to src/library/yt/coding/unittests/zig_zag_ut.cpp index fae4e63064e..fe15fda6be4 100644 --- a/library/cpp/yt/coding/unittests/zig_zag_ut.cpp +++ b/src/library/yt/coding/unittests/zig_zag_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include namespace NYT { namespace { diff --git a/library/cpp/yt/coding/varint-inl.h b/src/library/yt/coding/varint-inl.h similarity index 99% rename from library/cpp/yt/coding/varint-inl.h rename to src/library/yt/coding/varint-inl.h index ed0bfc508ce..10dd9e3a105 100644 --- a/library/cpp/yt/coding/varint-inl.h +++ b/src/library/yt/coding/varint-inl.h @@ -6,7 +6,7 @@ #include "zig_zag.h" -#include +#include #include diff --git a/library/cpp/yt/coding/varint.h b/src/library/yt/coding/varint.h similarity index 94% rename from library/cpp/yt/coding/varint.h rename to src/library/yt/coding/varint.h index 69a8cb95ffc..20eda676b93 100644 --- a/library/cpp/yt/coding/varint.h +++ b/src/library/yt/coding/varint.h @@ -1,9 +1,9 @@ #pragma once -#include +#include -#include -#include +#include +#include namespace NYT { diff --git a/library/cpp/yt/coding/zig_zag-inl.h b/src/library/yt/coding/zig_zag-inl.h similarity index 100% rename from library/cpp/yt/coding/zig_zag-inl.h rename to src/library/yt/coding/zig_zag-inl.h diff --git a/library/cpp/yt/coding/zig_zag.h b/src/library/yt/coding/zig_zag.h similarity index 93% rename from library/cpp/yt/coding/zig_zag.h rename to src/library/yt/coding/zig_zag.h index aa6d425a1c0..14c18df15db 100644 --- a/library/cpp/yt/coding/zig_zag.h +++ b/src/library/yt/coding/zig_zag.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NYT { diff --git a/library/cpp/yt/exception/CMakeLists.txt b/src/library/yt/exception/CMakeLists.txt similarity index 77% rename from library/cpp/yt/exception/CMakeLists.txt rename to src/library/yt/exception/CMakeLists.txt index fa2fa089beb..2e9f9bfc57a 100644 --- a/library/cpp/yt/exception/CMakeLists.txt +++ b/src/library/yt/exception/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(cpp-yt-exception PUBLIC ) target_sources(cpp-yt-exception PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/exception/exception.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/exception/exception.cpp ) diff --git a/library/cpp/yt/exception/exception.cpp b/src/library/yt/exception/exception.cpp similarity index 100% rename from library/cpp/yt/exception/exception.cpp rename to src/library/yt/exception/exception.cpp diff --git a/library/cpp/yt/exception/exception.h b/src/library/yt/exception/exception.h similarity index 100% rename from library/cpp/yt/exception/exception.h rename to src/library/yt/exception/exception.h diff --git a/library/cpp/yt/malloc/CMakeLists.txt b/src/library/yt/malloc/CMakeLists.txt similarity index 82% rename from library/cpp/yt/malloc/CMakeLists.txt rename to src/library/yt/malloc/CMakeLists.txt index 3b83ba1c910..0ed25b7dfc6 100644 --- a/library/cpp/yt/malloc/CMakeLists.txt +++ b/src/library/yt/malloc/CMakeLists.txt @@ -5,7 +5,7 @@ target_link_libraries(cpp-yt-malloc PUBLIC ) target_sources(cpp-yt-malloc PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/malloc/malloc.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/malloc/malloc.cpp ) if (NOT (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")) diff --git a/library/cpp/yt/malloc/malloc.cpp b/src/library/yt/malloc/malloc.cpp similarity index 90% rename from library/cpp/yt/malloc/malloc.cpp rename to src/library/yt/malloc/malloc.cpp index de45aa37fa4..8b672c0d42f 100644 --- a/library/cpp/yt/malloc/malloc.cpp +++ b/src/library/yt/malloc/malloc.cpp @@ -1,7 +1,7 @@ #include "malloc.h" -#include -#include +#include +#include #include diff --git a/library/cpp/yt/malloc/malloc.h b/src/library/yt/malloc/malloc.h similarity index 100% rename from library/cpp/yt/malloc/malloc.h rename to src/library/yt/malloc/malloc.h diff --git a/src/library/yt/memory/CMakeLists.txt b/src/library/yt/memory/CMakeLists.txt new file mode 100644 index 00000000000..fe5be70b3f8 --- /dev/null +++ b/src/library/yt/memory/CMakeLists.txt @@ -0,0 +1,28 @@ +add_library(cpp-yt-memory) + +target_link_libraries(cpp-yt-memory PUBLIC + yutil + cpp-yt-assert + cpp-yt-misc + cpp-yt-malloc +) + +target_sources(cpp-yt-memory PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/library/yt/memory/blob.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/memory/chunked_input_stream.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/memory/chunked_memory_allocator.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/memory/chunked_memory_pool.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/memory/chunked_memory_pool_output.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/memory/chunked_output_stream.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/memory/memory_tag.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/memory/ref.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/memory/ref_tracked.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/memory/safe_memory_reader.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/memory/shared_range.cpp +) + +if (NOT WIN32) + target_compile_options(cpp-yt-memory PRIVATE + -Wdeprecated-this-capture + ) +endif() diff --git a/library/cpp/yt/memory/atomic_intrusive_ptr-inl.h b/src/library/yt/memory/atomic_intrusive_ptr-inl.h similarity index 99% rename from library/cpp/yt/memory/atomic_intrusive_ptr-inl.h rename to src/library/yt/memory/atomic_intrusive_ptr-inl.h index ae8704ae192..b67972e9faa 100644 --- a/library/cpp/yt/memory/atomic_intrusive_ptr-inl.h +++ b/src/library/yt/memory/atomic_intrusive_ptr-inl.h @@ -5,7 +5,7 @@ #endif #undef ATOMIC_INTRUSIVE_PTR_INL_H_ -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/atomic_intrusive_ptr.h b/src/library/yt/memory/atomic_intrusive_ptr.h similarity index 100% rename from library/cpp/yt/memory/atomic_intrusive_ptr.h rename to src/library/yt/memory/atomic_intrusive_ptr.h diff --git a/library/cpp/yt/memory/blob.cpp b/src/library/yt/memory/blob.cpp similarity index 99% rename from library/cpp/yt/memory/blob.cpp rename to src/library/yt/memory/blob.cpp index 9c17cffad00..bbe287bf884 100644 --- a/library/cpp/yt/memory/blob.cpp +++ b/src/library/yt/memory/blob.cpp @@ -2,7 +2,7 @@ #include "ref.h" -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/blob.h b/src/library/yt/memory/blob.h similarity index 100% rename from library/cpp/yt/memory/blob.h rename to src/library/yt/memory/blob.h diff --git a/library/cpp/yt/memory/chunked_input_stream.cpp b/src/library/yt/memory/chunked_input_stream.cpp similarity index 100% rename from library/cpp/yt/memory/chunked_input_stream.cpp rename to src/library/yt/memory/chunked_input_stream.cpp diff --git a/library/cpp/yt/memory/chunked_input_stream.h b/src/library/yt/memory/chunked_input_stream.h similarity index 93% rename from library/cpp/yt/memory/chunked_input_stream.h rename to src/library/yt/memory/chunked_input_stream.h index baef2a4c66f..6d82a35dcc2 100644 --- a/library/cpp/yt/memory/chunked_input_stream.h +++ b/src/library/yt/memory/chunked_input_stream.h @@ -2,7 +2,7 @@ #include "ref.h" -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/chunked_memory_allocator-inl.h b/src/library/yt/memory/chunked_memory_allocator-inl.h similarity index 97% rename from library/cpp/yt/memory/chunked_memory_allocator-inl.h rename to src/library/yt/memory/chunked_memory_allocator-inl.h index fe66060b2d6..62a46b4707d 100644 --- a/library/cpp/yt/memory/chunked_memory_allocator-inl.h +++ b/src/library/yt/memory/chunked_memory_allocator-inl.h @@ -6,7 +6,7 @@ #include "serialize.h" -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/chunked_memory_allocator.cpp b/src/library/yt/memory/chunked_memory_allocator.cpp similarity index 100% rename from library/cpp/yt/memory/chunked_memory_allocator.cpp rename to src/library/yt/memory/chunked_memory_allocator.cpp diff --git a/library/cpp/yt/memory/chunked_memory_allocator.h b/src/library/yt/memory/chunked_memory_allocator.h similarity index 100% rename from library/cpp/yt/memory/chunked_memory_allocator.h rename to src/library/yt/memory/chunked_memory_allocator.h diff --git a/library/cpp/yt/memory/chunked_memory_pool-inl.h b/src/library/yt/memory/chunked_memory_pool-inl.h similarity index 97% rename from library/cpp/yt/memory/chunked_memory_pool-inl.h rename to src/library/yt/memory/chunked_memory_pool-inl.h index 58a0cefcc2f..13c81f3c42c 100644 --- a/library/cpp/yt/memory/chunked_memory_pool-inl.h +++ b/src/library/yt/memory/chunked_memory_pool-inl.h @@ -6,9 +6,9 @@ #include "serialize.h" -#include +#include -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/chunked_memory_pool.cpp b/src/library/yt/memory/chunked_memory_pool.cpp similarity index 100% rename from library/cpp/yt/memory/chunked_memory_pool.cpp rename to src/library/yt/memory/chunked_memory_pool.cpp diff --git a/library/cpp/yt/memory/chunked_memory_pool.h b/src/library/yt/memory/chunked_memory_pool.h similarity index 99% rename from library/cpp/yt/memory/chunked_memory_pool.h rename to src/library/yt/memory/chunked_memory_pool.h index a22e2ec27c4..b4cce43814e 100644 --- a/library/cpp/yt/memory/chunked_memory_pool.h +++ b/src/library/yt/memory/chunked_memory_pool.h @@ -3,7 +3,7 @@ #include "public.h" #include "ref.h" -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/chunked_memory_pool_allocator-inl.h b/src/library/yt/memory/chunked_memory_pool_allocator-inl.h similarity index 97% rename from library/cpp/yt/memory/chunked_memory_pool_allocator-inl.h rename to src/library/yt/memory/chunked_memory_pool_allocator-inl.h index 8c221c82da0..46ecee8812b 100644 --- a/library/cpp/yt/memory/chunked_memory_pool_allocator-inl.h +++ b/src/library/yt/memory/chunked_memory_pool_allocator-inl.h @@ -4,7 +4,7 @@ #include "chunked_memory_pool_allocator.h" #endif -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/chunked_memory_pool_allocator.h b/src/library/yt/memory/chunked_memory_pool_allocator.h similarity index 100% rename from library/cpp/yt/memory/chunked_memory_pool_allocator.h rename to src/library/yt/memory/chunked_memory_pool_allocator.h diff --git a/library/cpp/yt/memory/chunked_memory_pool_output.cpp b/src/library/yt/memory/chunked_memory_pool_output.cpp similarity index 97% rename from library/cpp/yt/memory/chunked_memory_pool_output.cpp rename to src/library/yt/memory/chunked_memory_pool_output.cpp index 332096445ab..28ef064c38a 100644 --- a/library/cpp/yt/memory/chunked_memory_pool_output.cpp +++ b/src/library/yt/memory/chunked_memory_pool_output.cpp @@ -2,7 +2,7 @@ #include "chunked_memory_pool.h" -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/chunked_memory_pool_output.h b/src/library/yt/memory/chunked_memory_pool_output.h similarity index 90% rename from library/cpp/yt/memory/chunked_memory_pool_output.h rename to src/library/yt/memory/chunked_memory_pool_output.h index 774b21788e7..c69c19d39b6 100644 --- a/library/cpp/yt/memory/chunked_memory_pool_output.h +++ b/src/library/yt/memory/chunked_memory_pool_output.h @@ -3,9 +3,9 @@ #include "public.h" #include "ref.h" -#include +#include -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/chunked_output_stream.cpp b/src/library/yt/memory/chunked_output_stream.cpp similarity index 98% rename from library/cpp/yt/memory/chunked_output_stream.cpp rename to src/library/yt/memory/chunked_output_stream.cpp index 90ec36fe23f..de3f992df9a 100644 --- a/library/cpp/yt/memory/chunked_output_stream.cpp +++ b/src/library/yt/memory/chunked_output_stream.cpp @@ -1,6 +1,6 @@ #include "chunked_output_stream.h" -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/chunked_output_stream.h b/src/library/yt/memory/chunked_output_stream.h similarity index 92% rename from library/cpp/yt/memory/chunked_output_stream.h rename to src/library/yt/memory/chunked_output_stream.h index 57bf6c318df..babf1e97ec6 100644 --- a/library/cpp/yt/memory/chunked_output_stream.h +++ b/src/library/yt/memory/chunked_output_stream.h @@ -2,11 +2,11 @@ #include "blob.h" -#include +#include -#include +#include -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/free_list-inl.h b/src/library/yt/memory/free_list-inl.h similarity index 100% rename from library/cpp/yt/memory/free_list-inl.h rename to src/library/yt/memory/free_list-inl.h diff --git a/library/cpp/yt/memory/free_list.h b/src/library/yt/memory/free_list.h similarity index 100% rename from library/cpp/yt/memory/free_list.h rename to src/library/yt/memory/free_list.h diff --git a/library/cpp/yt/memory/intrusive_ptr.h b/src/library/yt/memory/intrusive_ptr.h similarity index 99% rename from library/cpp/yt/memory/intrusive_ptr.h rename to src/library/yt/memory/intrusive_ptr.h index 1da3b06966f..c555eaad4f4 100644 --- a/library/cpp/yt/memory/intrusive_ptr.h +++ b/src/library/yt/memory/intrusive_ptr.h @@ -2,8 +2,8 @@ #include "ref_counted.h" -#include -#include +#include +#include #include #include diff --git a/library/cpp/yt/memory/leaky_ref_counted_singleton-inl.h b/src/library/yt/memory/leaky_ref_counted_singleton-inl.h similarity index 92% rename from library/cpp/yt/memory/leaky_ref_counted_singleton-inl.h rename to src/library/yt/memory/leaky_ref_counted_singleton-inl.h index 1fba63c427a..d8d3ec97f52 100644 --- a/library/cpp/yt/memory/leaky_ref_counted_singleton-inl.h +++ b/src/library/yt/memory/leaky_ref_counted_singleton-inl.h @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/leaky_ref_counted_singleton.h b/src/library/yt/memory/leaky_ref_counted_singleton.h similarity index 100% rename from library/cpp/yt/memory/leaky_ref_counted_singleton.h rename to src/library/yt/memory/leaky_ref_counted_singleton.h diff --git a/library/cpp/yt/memory/leaky_singleton-inl.h b/src/library/yt/memory/leaky_singleton-inl.h similarity index 100% rename from library/cpp/yt/memory/leaky_singleton-inl.h rename to src/library/yt/memory/leaky_singleton-inl.h diff --git a/library/cpp/yt/memory/leaky_singleton.h b/src/library/yt/memory/leaky_singleton.h similarity index 100% rename from library/cpp/yt/memory/leaky_singleton.h rename to src/library/yt/memory/leaky_singleton.h diff --git a/library/cpp/yt/memory/memory_tag-inl.h b/src/library/yt/memory/memory_tag-inl.h similarity index 96% rename from library/cpp/yt/memory/memory_tag-inl.h rename to src/library/yt/memory/memory_tag-inl.h index 42065b4899a..ca7e974c8bc 100644 --- a/library/cpp/yt/memory/memory_tag-inl.h +++ b/src/library/yt/memory/memory_tag-inl.h @@ -5,7 +5,7 @@ #include "memory_tag.h" #endif -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/memory_tag.cpp b/src/library/yt/memory/memory_tag.cpp similarity index 89% rename from library/cpp/yt/memory/memory_tag.cpp rename to src/library/yt/memory/memory_tag.cpp index ebb0b433700..0c425dc2298 100644 --- a/library/cpp/yt/memory/memory_tag.cpp +++ b/src/library/yt/memory/memory_tag.cpp @@ -1,8 +1,8 @@ #include "memory_tag.h" -#include +#include -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/memory_tag.h b/src/library/yt/memory/memory_tag.h similarity index 100% rename from library/cpp/yt/memory/memory_tag.h rename to src/library/yt/memory/memory_tag.h diff --git a/library/cpp/yt/memory/new-inl.h b/src/library/yt/memory/new-inl.h similarity index 99% rename from library/cpp/yt/memory/new-inl.h rename to src/library/yt/memory/new-inl.h index 53adaecdc06..45643c18ede 100644 --- a/library/cpp/yt/memory/new-inl.h +++ b/src/library/yt/memory/new-inl.h @@ -6,7 +6,7 @@ #include "ref_tracked.h" -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/new.h b/src/library/yt/memory/new.h similarity index 97% rename from library/cpp/yt/memory/new.h rename to src/library/yt/memory/new.h index a9591724edc..9f685b69008 100644 --- a/library/cpp/yt/memory/new.h +++ b/src/library/yt/memory/new.h @@ -2,9 +2,9 @@ #include "intrusive_ptr.h" -#include +#include -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/public.h b/src/library/yt/memory/public.h similarity index 100% rename from library/cpp/yt/memory/public.h rename to src/library/yt/memory/public.h diff --git a/library/cpp/yt/memory/range.h b/src/library/yt/memory/range.h similarity index 99% rename from library/cpp/yt/memory/range.h rename to src/library/yt/memory/range.h index 5881fc3fbfb..40b45307a5c 100644 --- a/library/cpp/yt/memory/range.h +++ b/src/library/yt/memory/range.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include #include #include diff --git a/library/cpp/yt/memory/ref-inl.h b/src/library/yt/memory/ref-inl.h similarity index 100% rename from library/cpp/yt/memory/ref-inl.h rename to src/library/yt/memory/ref-inl.h diff --git a/library/cpp/yt/memory/ref.cpp b/src/library/yt/memory/ref.cpp similarity index 99% rename from library/cpp/yt/memory/ref.cpp rename to src/library/yt/memory/ref.cpp index fef210dde11..9b399ca3da5 100644 --- a/library/cpp/yt/memory/ref.cpp +++ b/src/library/yt/memory/ref.cpp @@ -2,10 +2,10 @@ #include "blob.h" -#include +#include -#include -#include +#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/ref.h b/src/library/yt/memory/ref.h similarity index 99% rename from library/cpp/yt/memory/ref.h rename to src/library/yt/memory/ref.h index 37c33275b45..10588c8b046 100644 --- a/library/cpp/yt/memory/ref.h +++ b/src/library/yt/memory/ref.h @@ -401,6 +401,6 @@ size_t GetByteSize(const std::vector& parts); #include "ref-inl.h" #undef REF_INL_H_ -//! Serialize TSharedRef like vector. Useful for ::Save, ::Load serialization/deserialization. See util/ysaveload.h. +//! Serialize TSharedRef like vector. Useful for ::Save, ::Load serialization/deserialization. See src/util/ysaveload.h. template <> class TSerializer: public TVectorSerializer> {}; diff --git a/library/cpp/yt/memory/ref_counted-inl.h b/src/library/yt/memory/ref_counted-inl.h similarity index 99% rename from library/cpp/yt/memory/ref_counted-inl.h rename to src/library/yt/memory/ref_counted-inl.h index 451bcaa67bd..3230a24dbf2 100644 --- a/library/cpp/yt/memory/ref_counted-inl.h +++ b/src/library/yt/memory/ref_counted-inl.h @@ -6,7 +6,7 @@ #include "tagged_ptr.h" -#include +#include #include #include diff --git a/library/cpp/yt/memory/ref_counted.h b/src/library/yt/memory/ref_counted.h similarity index 98% rename from library/cpp/yt/memory/ref_counted.h rename to src/library/yt/memory/ref_counted.h index 6ef546de0df..38f81fdbd7e 100644 --- a/library/cpp/yt/memory/ref_counted.h +++ b/src/library/yt/memory/ref_counted.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include #include diff --git a/library/cpp/yt/memory/ref_tracked-inl.h b/src/library/yt/memory/ref_tracked-inl.h similarity index 100% rename from library/cpp/yt/memory/ref_tracked-inl.h rename to src/library/yt/memory/ref_tracked-inl.h diff --git a/library/cpp/yt/memory/ref_tracked.cpp b/src/library/yt/memory/ref_tracked.cpp similarity index 100% rename from library/cpp/yt/memory/ref_tracked.cpp rename to src/library/yt/memory/ref_tracked.cpp diff --git a/library/cpp/yt/memory/ref_tracked.h b/src/library/yt/memory/ref_tracked.h similarity index 93% rename from library/cpp/yt/memory/ref_tracked.h rename to src/library/yt/memory/ref_tracked.h index df6a06fcf07..992ead4e3e2 100644 --- a/library/cpp/yt/memory/ref_tracked.h +++ b/src/library/yt/memory/ref_tracked.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include +#include +#include +#include -#include +#include #include #include diff --git a/library/cpp/yt/memory/safe_memory_reader-inl.h b/src/library/yt/memory/safe_memory_reader-inl.h similarity index 100% rename from library/cpp/yt/memory/safe_memory_reader-inl.h rename to src/library/yt/memory/safe_memory_reader-inl.h diff --git a/library/cpp/yt/memory/safe_memory_reader.cpp b/src/library/yt/memory/safe_memory_reader.cpp similarity index 95% rename from library/cpp/yt/memory/safe_memory_reader.cpp rename to src/library/yt/memory/safe_memory_reader.cpp index 49d88b3ba1b..6e28587eef7 100644 --- a/library/cpp/yt/memory/safe_memory_reader.cpp +++ b/src/library/yt/memory/safe_memory_reader.cpp @@ -5,7 +5,7 @@ #include #endif -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/safe_memory_reader.h b/src/library/yt/memory/safe_memory_reader.h similarity index 100% rename from library/cpp/yt/memory/safe_memory_reader.h rename to src/library/yt/memory/safe_memory_reader.h diff --git a/library/cpp/yt/memory/serialize-inl.h b/src/library/yt/memory/serialize-inl.h similarity index 100% rename from library/cpp/yt/memory/serialize-inl.h rename to src/library/yt/memory/serialize-inl.h diff --git a/library/cpp/yt/memory/serialize.h b/src/library/yt/memory/serialize.h similarity index 94% rename from library/cpp/yt/memory/serialize.h rename to src/library/yt/memory/serialize.h index 1f7dec38c00..b2d378c8b34 100644 --- a/library/cpp/yt/memory/serialize.h +++ b/src/library/yt/memory/serialize.h @@ -2,7 +2,7 @@ #include "intrusive_ptr.h" -#include +#include //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yt/memory/shared_range.cpp b/src/library/yt/memory/shared_range.cpp similarity index 100% rename from library/cpp/yt/memory/shared_range.cpp rename to src/library/yt/memory/shared_range.cpp diff --git a/library/cpp/yt/memory/shared_range.h b/src/library/yt/memory/shared_range.h similarity index 99% rename from library/cpp/yt/memory/shared_range.h rename to src/library/yt/memory/shared_range.h index de5fc354eaa..3d04ef51d02 100644 --- a/library/cpp/yt/memory/shared_range.h +++ b/src/library/yt/memory/shared_range.h @@ -5,9 +5,9 @@ #include "range.h" #include "ref_counted.h" -#include +#include -#include +#include #include diff --git a/library/cpp/yt/memory/tagged_ptr-inl.h b/src/library/yt/memory/tagged_ptr-inl.h similarity index 93% rename from library/cpp/yt/memory/tagged_ptr-inl.h rename to src/library/yt/memory/tagged_ptr-inl.h index 99da61ada6c..0db4fd08980 100644 --- a/library/cpp/yt/memory/tagged_ptr-inl.h +++ b/src/library/yt/memory/tagged_ptr-inl.h @@ -4,9 +4,9 @@ #include "tagged_ptr.h" #endif -#include +#include -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/tagged_ptr.h b/src/library/yt/memory/tagged_ptr.h similarity index 96% rename from library/cpp/yt/memory/tagged_ptr.h rename to src/library/yt/memory/tagged_ptr.h index 65747fa4de7..22fcb8aee9a 100644 --- a/library/cpp/yt/memory/tagged_ptr.h +++ b/src/library/yt/memory/tagged_ptr.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NYT { diff --git a/library/cpp/yt/memory/unittests/atomic_intrusive_ptr_ut.cpp b/src/library/yt/memory/unittests/atomic_intrusive_ptr_ut.cpp similarity index 97% rename from library/cpp/yt/memory/unittests/atomic_intrusive_ptr_ut.cpp rename to src/library/yt/memory/unittests/atomic_intrusive_ptr_ut.cpp index 4811d208824..fea0ddbb13f 100644 --- a/library/cpp/yt/memory/unittests/atomic_intrusive_ptr_ut.cpp +++ b/src/library/yt/memory/unittests/atomic_intrusive_ptr_ut.cpp @@ -1,8 +1,8 @@ -#include +#include -#include -#include -#include +#include +#include +#include namespace NYT { namespace { diff --git a/library/cpp/yt/memory/unittests/chunked_memory_pool_allocator_ut.cpp b/src/library/yt/memory/unittests/chunked_memory_pool_allocator_ut.cpp similarity index 96% rename from library/cpp/yt/memory/unittests/chunked_memory_pool_allocator_ut.cpp rename to src/library/yt/memory/unittests/chunked_memory_pool_allocator_ut.cpp index 214ee80643f..c500a3df0c1 100644 --- a/library/cpp/yt/memory/unittests/chunked_memory_pool_allocator_ut.cpp +++ b/src/library/yt/memory/unittests/chunked_memory_pool_allocator_ut.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include #include #include diff --git a/library/cpp/yt/memory/unittests/chunked_memory_pool_output_ut.cpp b/src/library/yt/memory/unittests/chunked_memory_pool_output_ut.cpp similarity index 84% rename from library/cpp/yt/memory/unittests/chunked_memory_pool_output_ut.cpp rename to src/library/yt/memory/unittests/chunked_memory_pool_output_ut.cpp index 69f2df5203c..230e8708ca5 100644 --- a/library/cpp/yt/memory/unittests/chunked_memory_pool_output_ut.cpp +++ b/src/library/yt/memory/unittests/chunked_memory_pool_output_ut.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include namespace NYT { namespace { diff --git a/library/cpp/yt/memory/unittests/chunked_memory_pool_ut.cpp b/src/library/yt/memory/unittests/chunked_memory_pool_ut.cpp similarity index 94% rename from library/cpp/yt/memory/unittests/chunked_memory_pool_ut.cpp rename to src/library/yt/memory/unittests/chunked_memory_pool_ut.cpp index 18105e60e52..e26ebe2724b 100644 --- a/library/cpp/yt/memory/unittests/chunked_memory_pool_ut.cpp +++ b/src/library/yt/memory/unittests/chunked_memory_pool_ut.cpp @@ -1,8 +1,8 @@ -#include +#include -#include +#include -#include +#include namespace NYT { namespace { diff --git a/library/cpp/yt/memory/unittests/free_list_ut.cpp b/src/library/yt/memory/unittests/free_list_ut.cpp similarity index 96% rename from library/cpp/yt/memory/unittests/free_list_ut.cpp rename to src/library/yt/memory/unittests/free_list_ut.cpp index fedf5f1a10a..ba500c8ba6f 100644 --- a/library/cpp/yt/memory/unittests/free_list_ut.cpp +++ b/src/library/yt/memory/unittests/free_list_ut.cpp @@ -1,8 +1,8 @@ -#include +#include -#include +#include -#include +#include #include #include diff --git a/library/cpp/yt/memory/unittests/intrusive_ptr_ut.cpp b/src/library/yt/memory/unittests/intrusive_ptr_ut.cpp similarity index 97% rename from library/cpp/yt/memory/unittests/intrusive_ptr_ut.cpp rename to src/library/yt/memory/unittests/intrusive_ptr_ut.cpp index a4ed2bdac20..8528d94fb6c 100644 --- a/library/cpp/yt/memory/unittests/intrusive_ptr_ut.cpp +++ b/src/library/yt/memory/unittests/intrusive_ptr_ut.cpp @@ -1,14 +1,14 @@ -#include +#include -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include -#include +#include namespace NYT { namespace { diff --git a/library/cpp/yt/memory/unittests/ref_ut.cpp b/src/library/yt/memory/unittests/ref_ut.cpp similarity index 76% rename from library/cpp/yt/memory/unittests/ref_ut.cpp rename to src/library/yt/memory/unittests/ref_ut.cpp index f26f0dbcb1e..5800e4c5642 100644 --- a/library/cpp/yt/memory/unittests/ref_ut.cpp +++ b/src/library/yt/memory/unittests/ref_ut.cpp @@ -1,8 +1,8 @@ -#include +#include -#include +#include -#include +#include namespace NYT::NYson { namespace { diff --git a/library/cpp/yt/memory/unittests/safe_memory_reader_ut.cpp b/src/library/yt/memory/unittests/safe_memory_reader_ut.cpp similarity index 82% rename from library/cpp/yt/memory/unittests/safe_memory_reader_ut.cpp rename to src/library/yt/memory/unittests/safe_memory_reader_ut.cpp index 9873dd80bea..c8847ff54b3 100644 --- a/library/cpp/yt/memory/unittests/safe_memory_reader_ut.cpp +++ b/src/library/yt/memory/unittests/safe_memory_reader_ut.cpp @@ -1,7 +1,7 @@ -#include +#include -#include +#include namespace NYT { namespace { diff --git a/library/cpp/yt/memory/unittests/shared_range_ut.cpp b/src/library/yt/memory/unittests/shared_range_ut.cpp similarity index 85% rename from library/cpp/yt/memory/unittests/shared_range_ut.cpp rename to src/library/yt/memory/unittests/shared_range_ut.cpp index 7b86a1eb15d..6c9b78eecec 100644 --- a/library/cpp/yt/memory/unittests/shared_range_ut.cpp +++ b/src/library/yt/memory/unittests/shared_range_ut.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include namespace NYT { namespace { diff --git a/library/cpp/yt/memory/unittests/weak_ptr_ut.cpp b/src/library/yt/memory/unittests/weak_ptr_ut.cpp similarity index 98% rename from library/cpp/yt/memory/unittests/weak_ptr_ut.cpp rename to src/library/yt/memory/unittests/weak_ptr_ut.cpp index f19809100fe..98c0b32bbdd 100644 --- a/library/cpp/yt/memory/unittests/weak_ptr_ut.cpp +++ b/src/library/yt/memory/unittests/weak_ptr_ut.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/yt/memory/unittests/ya.make b/src/library/yt/memory/unittests/ya.make similarity index 79% rename from library/cpp/yt/memory/unittests/ya.make rename to src/library/yt/memory/unittests/ya.make index 3658eefce1f..5dc883414db 100644 --- a/library/cpp/yt/memory/unittests/ya.make +++ b/src/library/yt/memory/unittests/ya.make @@ -1,6 +1,6 @@ GTEST(unittester-library-memory) -INCLUDE(${ARCADIA_ROOT}/library/cpp/yt/ya_cpp.make.inc) +INCLUDE(${ARCADIA_ROOT}/src/library/yt/ya_cpp.make.inc) IF (NOT OS_WINDOWS) ALLOCATOR(YT) @@ -25,8 +25,8 @@ IF (NOT OS_WINDOWS) ENDIF() PEERDIR( - library/cpp/testing/gtest - library/cpp/yt/memory + src/library/testing/gtest + src/library/yt/memory ) END() diff --git a/library/cpp/yt/memory/weak_ptr.h b/src/library/yt/memory/weak_ptr.h similarity index 99% rename from library/cpp/yt/memory/weak_ptr.h rename to src/library/yt/memory/weak_ptr.h index a5a7f0a525e..24c5375994f 100644 --- a/library/cpp/yt/memory/weak_ptr.h +++ b/src/library/yt/memory/weak_ptr.h @@ -2,7 +2,7 @@ #include "ref_counted.h" -#include +#include namespace NYT { diff --git a/library/cpp/yt/misc/CMakeLists.txt b/src/library/yt/misc/CMakeLists.txt similarity index 54% rename from library/cpp/yt/misc/CMakeLists.txt rename to src/library/yt/misc/CMakeLists.txt index 2b3a2d099f4..6bb26e8c840 100644 --- a/library/cpp/yt/misc/CMakeLists.txt +++ b/src/library/yt/misc/CMakeLists.txt @@ -12,10 +12,10 @@ target_link_libraries(cpp-yt-misc PUBLIC ) target_sources(cpp-yt-misc PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/misc/guid.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/misc/source_location.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/misc/thread_name.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/misc/variant.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/misc/guid.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/misc/source_location.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/misc/thread_name.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/misc/variant.cpp ) diff --git a/library/cpp/yt/misc/arcadia_enum-inl.h b/src/library/yt/misc/arcadia_enum-inl.h similarity index 97% rename from library/cpp/yt/misc/arcadia_enum-inl.h rename to src/library/yt/misc/arcadia_enum-inl.h index 59590832a72..33e4c5eb49d 100644 --- a/library/cpp/yt/misc/arcadia_enum-inl.h +++ b/src/library/yt/misc/arcadia_enum-inl.h @@ -5,7 +5,7 @@ #include "arcadia_enum.h" #endif -#include +#include namespace NYT::NDetail { diff --git a/library/cpp/yt/misc/arcadia_enum.h b/src/library/yt/misc/arcadia_enum.h similarity index 100% rename from library/cpp/yt/misc/arcadia_enum.h rename to src/library/yt/misc/arcadia_enum.h diff --git a/library/cpp/yt/misc/cast-inl.h b/src/library/yt/misc/cast-inl.h similarity index 97% rename from library/cpp/yt/misc/cast-inl.h rename to src/library/yt/misc/cast-inl.h index 4c18e88b129..4ed61304581 100644 --- a/library/cpp/yt/misc/cast-inl.h +++ b/src/library/yt/misc/cast-inl.h @@ -6,9 +6,9 @@ #include "enum.h" -#include +#include -#include +#include #include #include diff --git a/library/cpp/yt/misc/cast.h b/src/library/yt/misc/cast.h similarity index 92% rename from library/cpp/yt/misc/cast.h rename to src/library/yt/misc/cast.h index c7565c9e6d3..50cf207466d 100644 --- a/library/cpp/yt/misc/cast.h +++ b/src/library/yt/misc/cast.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NYT { diff --git a/library/cpp/yt/misc/enum-inl.h b/src/library/yt/misc/enum-inl.h similarity index 99% rename from library/cpp/yt/misc/enum-inl.h rename to src/library/yt/misc/enum-inl.h index 34aeb34650f..c118eda6072 100644 --- a/library/cpp/yt/misc/enum-inl.h +++ b/src/library/yt/misc/enum-inl.h @@ -5,10 +5,10 @@ #include "enum.h" #endif -#include -#include +#include +#include -#include +#include #include #include diff --git a/library/cpp/yt/misc/enum.h b/src/library/yt/misc/enum.h similarity index 99% rename from library/cpp/yt/misc/enum.h rename to src/library/yt/misc/enum.h index 29f4de2fc1e..458881a17ba 100644 --- a/library/cpp/yt/misc/enum.h +++ b/src/library/yt/misc/enum.h @@ -9,7 +9,7 @@ #include #include -#include +#include namespace NYT { diff --git a/library/cpp/yt/misc/guid-inl.h b/src/library/yt/misc/guid-inl.h similarity index 100% rename from library/cpp/yt/misc/guid-inl.h rename to src/library/yt/misc/guid-inl.h diff --git a/library/cpp/yt/misc/guid.cpp b/src/library/yt/misc/guid.cpp similarity index 98% rename from library/cpp/yt/misc/guid.cpp rename to src/library/yt/misc/guid.cpp index 923dc9222ce..8c2111eb6b5 100644 --- a/library/cpp/yt/misc/guid.cpp +++ b/src/library/yt/misc/guid.cpp @@ -1,7 +1,7 @@ #include "guid.h" -#include -#include +#include +#include #include #include diff --git a/library/cpp/yt/misc/guid.h b/src/library/yt/misc/guid.h similarity index 96% rename from library/cpp/yt/misc/guid.h rename to src/library/yt/misc/guid.h index 4a2a279256c..68efedb3a1e 100644 --- a/library/cpp/yt/misc/guid.h +++ b/src/library/yt/misc/guid.h @@ -1,9 +1,9 @@ #pragma once -#include -#include +#include +#include -#include +#include #include #include diff --git a/library/cpp/yt/misc/hash-inl.h b/src/library/yt/misc/hash-inl.h similarity index 100% rename from library/cpp/yt/misc/hash-inl.h rename to src/library/yt/misc/hash-inl.h diff --git a/library/cpp/yt/misc/hash.h b/src/library/yt/misc/hash.h similarity index 92% rename from library/cpp/yt/misc/hash.h rename to src/library/yt/misc/hash.h index 2fecf895061..addfa1afa73 100644 --- a/library/cpp/yt/misc/hash.h +++ b/src/library/yt/misc/hash.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include namespace NYT { diff --git a/library/cpp/yt/misc/port.h b/src/library/yt/misc/port.h similarity index 98% rename from library/cpp/yt/misc/port.h rename to src/library/yt/misc/port.h index 7cfb8257087..8c69e599182 100644 --- a/library/cpp/yt/misc/port.h +++ b/src/library/yt/misc/port.h @@ -1,6 +1,6 @@ #pragma once -#include +#include // Check platform bitness. #if !defined(_64_) diff --git a/library/cpp/yt/misc/preprocessor-gen.h b/src/library/yt/misc/preprocessor-gen.h similarity index 100% rename from library/cpp/yt/misc/preprocessor-gen.h rename to src/library/yt/misc/preprocessor-gen.h diff --git a/library/cpp/yt/misc/preprocessor.h b/src/library/yt/misc/preprocessor.h similarity index 100% rename from library/cpp/yt/misc/preprocessor.h rename to src/library/yt/misc/preprocessor.h diff --git a/library/cpp/yt/misc/property.h b/src/library/yt/misc/property.h similarity index 99% rename from library/cpp/yt/misc/property.h rename to src/library/yt/misc/property.h index d172fcdcfb0..9708e69db0c 100644 --- a/library/cpp/yt/misc/property.h +++ b/src/library/yt/misc/property.h @@ -1,6 +1,6 @@ #pragma once -#include +#include //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yt/misc/source_location.cpp b/src/library/yt/misc/source_location.cpp similarity index 100% rename from library/cpp/yt/misc/source_location.cpp rename to src/library/yt/misc/source_location.cpp diff --git a/library/cpp/yt/misc/source_location.h b/src/library/yt/misc/source_location.h similarity index 100% rename from library/cpp/yt/misc/source_location.h rename to src/library/yt/misc/source_location.h diff --git a/library/cpp/yt/misc/strong_typedef-inl.h b/src/library/yt/misc/strong_typedef-inl.h similarity index 98% rename from library/cpp/yt/misc/strong_typedef-inl.h rename to src/library/yt/misc/strong_typedef-inl.h index 7963a60b216..c2a7e647b31 100644 --- a/library/cpp/yt/misc/strong_typedef-inl.h +++ b/src/library/yt/misc/strong_typedef-inl.h @@ -4,8 +4,8 @@ #include "strong_typedef.h" #endif -#include -#include +#include +#include #include "wrapper_traits.h" diff --git a/library/cpp/yt/misc/strong_typedef.h b/src/library/yt/misc/strong_typedef.h similarity index 100% rename from library/cpp/yt/misc/strong_typedef.h rename to src/library/yt/misc/strong_typedef.h diff --git a/library/cpp/yt/misc/thread_name.cpp b/src/library/yt/misc/thread_name.cpp similarity index 94% rename from library/cpp/yt/misc/thread_name.cpp rename to src/library/yt/misc/thread_name.cpp index 4bf4ae08e65..d02e6b75d5e 100644 --- a/library/cpp/yt/misc/thread_name.cpp +++ b/src/library/yt/misc/thread_name.cpp @@ -1,9 +1,9 @@ #include "thread_name.h" -#include +#include #include -#include +#include #include #include diff --git a/library/cpp/yt/misc/thread_name.h b/src/library/yt/misc/thread_name.h similarity index 100% rename from library/cpp/yt/misc/thread_name.h rename to src/library/yt/misc/thread_name.h diff --git a/library/cpp/yt/misc/tls-inl.h b/src/library/yt/misc/tls-inl.h similarity index 100% rename from library/cpp/yt/misc/tls-inl.h rename to src/library/yt/misc/tls-inl.h diff --git a/library/cpp/yt/misc/tls.h b/src/library/yt/misc/tls.h similarity index 93% rename from library/cpp/yt/misc/tls.h rename to src/library/yt/misc/tls.h index d1bda8ac684..d9385c8db00 100644 --- a/library/cpp/yt/misc/tls.h +++ b/src/library/yt/misc/tls.h @@ -1,6 +1,6 @@ #pragma once -#include +#include // Workaround for fiber (un)friendly TLS. // Volatile qualifier prevents caching access to thread local variables. diff --git a/library/cpp/yt/misc/unittests/enum_ut.cpp b/src/library/yt/misc/unittests/enum_ut.cpp similarity index 98% rename from library/cpp/yt/misc/unittests/enum_ut.cpp rename to src/library/yt/misc/unittests/enum_ut.cpp index 63b8666ae1e..27c090a1b3b 100644 --- a/library/cpp/yt/misc/unittests/enum_ut.cpp +++ b/src/library/yt/misc/unittests/enum_ut.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include namespace NYT { namespace { diff --git a/library/cpp/yt/misc/unittests/guid_ut.cpp b/src/library/yt/misc/unittests/guid_ut.cpp similarity index 91% rename from library/cpp/yt/misc/unittests/guid_ut.cpp rename to src/library/yt/misc/unittests/guid_ut.cpp index b0ec7effbfb..4cbc3e6692e 100644 --- a/library/cpp/yt/misc/unittests/guid_ut.cpp +++ b/src/library/yt/misc/unittests/guid_ut.cpp @@ -1,8 +1,8 @@ -#include +#include -#include +#include -#include +#include namespace NYT { namespace { diff --git a/library/cpp/yt/misc/unittests/preprocessor_ut.cpp b/src/library/yt/misc/unittests/preprocessor_ut.cpp similarity index 97% rename from library/cpp/yt/misc/unittests/preprocessor_ut.cpp rename to src/library/yt/misc/unittests/preprocessor_ut.cpp index b712d8a48f5..0535bb814fd 100644 --- a/library/cpp/yt/misc/unittests/preprocessor_ut.cpp +++ b/src/library/yt/misc/unittests/preprocessor_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include namespace NYT { namespace { diff --git a/library/cpp/yt/misc/unittests/ya.make b/src/library/yt/misc/unittests/ya.make similarity index 59% rename from library/cpp/yt/misc/unittests/ya.make rename to src/library/yt/misc/unittests/ya.make index bc985812eda..228d9acb2d7 100644 --- a/library/cpp/yt/misc/unittests/ya.make +++ b/src/library/yt/misc/unittests/ya.make @@ -1,6 +1,6 @@ GTEST(unittester-library-misc) -INCLUDE(${ARCADIA_ROOT}/library/cpp/yt/ya_cpp.make.inc) +INCLUDE(${ARCADIA_ROOT}/src/library/yt/ya_cpp.make.inc) SRCS( enum_ut.cpp @@ -9,7 +9,7 @@ SRCS( ) PEERDIR( - library/cpp/yt/misc + src/library/yt/misc ) END() diff --git a/library/cpp/yt/misc/variant-inl.h b/src/library/yt/misc/variant-inl.h similarity index 100% rename from library/cpp/yt/misc/variant-inl.h rename to src/library/yt/misc/variant-inl.h diff --git a/library/cpp/yt/misc/variant.cpp b/src/library/yt/misc/variant.cpp similarity index 88% rename from library/cpp/yt/misc/variant.cpp rename to src/library/yt/misc/variant.cpp index 30e3eb1899a..a2cb77c214d 100644 --- a/library/cpp/yt/misc/variant.cpp +++ b/src/library/yt/misc/variant.cpp @@ -1,6 +1,6 @@ #include "variant.h" -#include +#include namespace NYT { diff --git a/library/cpp/yt/misc/variant.h b/src/library/yt/misc/variant.h similarity index 98% rename from library/cpp/yt/misc/variant.h rename to src/library/yt/misc/variant.h index 97b79eb9b5b..57f2550bcaf 100644 --- a/library/cpp/yt/misc/variant.h +++ b/src/library/yt/misc/variant.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace NYT { diff --git a/library/cpp/yt/misc/wrapper_traits-inl.h b/src/library/yt/misc/wrapper_traits-inl.h similarity index 98% rename from library/cpp/yt/misc/wrapper_traits-inl.h rename to src/library/yt/misc/wrapper_traits-inl.h index 7ab7699641e..92eabb838c1 100644 --- a/library/cpp/yt/misc/wrapper_traits-inl.h +++ b/src/library/yt/misc/wrapper_traits-inl.h @@ -4,7 +4,7 @@ #include "wrapper_traits.h" #endif -#include +#include #include diff --git a/library/cpp/yt/misc/wrapper_traits.h b/src/library/yt/misc/wrapper_traits.h similarity index 100% rename from library/cpp/yt/misc/wrapper_traits.h rename to src/library/yt/misc/wrapper_traits.h diff --git a/library/cpp/yt/small_containers/CMakeLists.txt b/src/library/yt/small_containers/CMakeLists.txt similarity index 100% rename from library/cpp/yt/small_containers/CMakeLists.txt rename to src/library/yt/small_containers/CMakeLists.txt diff --git a/library/cpp/yt/small_containers/compact_flat_map-inl.h b/src/library/yt/small_containers/compact_flat_map-inl.h similarity index 100% rename from library/cpp/yt/small_containers/compact_flat_map-inl.h rename to src/library/yt/small_containers/compact_flat_map-inl.h diff --git a/library/cpp/yt/small_containers/compact_flat_map.h b/src/library/yt/small_containers/compact_flat_map.h similarity index 100% rename from library/cpp/yt/small_containers/compact_flat_map.h rename to src/library/yt/small_containers/compact_flat_map.h diff --git a/library/cpp/yt/small_containers/compact_heap-inl.h b/src/library/yt/small_containers/compact_heap-inl.h similarity index 98% rename from library/cpp/yt/small_containers/compact_heap-inl.h rename to src/library/yt/small_containers/compact_heap-inl.h index 2c6b3507ba5..111dd01971a 100644 --- a/library/cpp/yt/small_containers/compact_heap-inl.h +++ b/src/library/yt/small_containers/compact_heap-inl.h @@ -4,7 +4,7 @@ #include "compact_heap.h" #endif -#include +#include #include diff --git a/library/cpp/yt/small_containers/compact_heap.h b/src/library/yt/small_containers/compact_heap.h similarity index 100% rename from library/cpp/yt/small_containers/compact_heap.h rename to src/library/yt/small_containers/compact_heap.h diff --git a/library/cpp/yt/small_containers/compact_queue-inl.h b/src/library/yt/small_containers/compact_queue-inl.h similarity index 100% rename from library/cpp/yt/small_containers/compact_queue-inl.h rename to src/library/yt/small_containers/compact_queue-inl.h diff --git a/library/cpp/yt/small_containers/compact_queue.h b/src/library/yt/small_containers/compact_queue.h similarity index 100% rename from library/cpp/yt/small_containers/compact_queue.h rename to src/library/yt/small_containers/compact_queue.h diff --git a/library/cpp/yt/small_containers/compact_set-inl.h b/src/library/yt/small_containers/compact_set-inl.h similarity index 99% rename from library/cpp/yt/small_containers/compact_set-inl.h rename to src/library/yt/small_containers/compact_set-inl.h index e93d11f126f..e6dd7dc922f 100644 --- a/library/cpp/yt/small_containers/compact_set-inl.h +++ b/src/library/yt/small_containers/compact_set-inl.h @@ -4,7 +4,7 @@ #include "compact_set.h" #endif -#include +#include namespace NYT { diff --git a/library/cpp/yt/small_containers/compact_set.h b/src/library/yt/small_containers/compact_set.h similarity index 100% rename from library/cpp/yt/small_containers/compact_set.h rename to src/library/yt/small_containers/compact_set.h diff --git a/library/cpp/yt/small_containers/compact_vector-inl.h b/src/library/yt/small_containers/compact_vector-inl.h similarity index 99% rename from library/cpp/yt/small_containers/compact_vector-inl.h rename to src/library/yt/small_containers/compact_vector-inl.h index 3bb9576d3ea..2dae7922cf5 100644 --- a/library/cpp/yt/small_containers/compact_vector-inl.h +++ b/src/library/yt/small_containers/compact_vector-inl.h @@ -5,13 +5,13 @@ #endif #undef COMPACT_VECTOR_INL_H_ -#include +#include -#include +#include -#include +#include -#include +#include #include #include diff --git a/library/cpp/yt/small_containers/compact_vector.h b/src/library/yt/small_containers/compact_vector.h similarity index 99% rename from library/cpp/yt/small_containers/compact_vector.h rename to src/library/yt/small_containers/compact_vector.h index 23a0ac3fd01..0a85487f75a 100644 --- a/library/cpp/yt/small_containers/compact_vector.h +++ b/src/library/yt/small_containers/compact_vector.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/library/cpp/yt/small_containers/unittests/compact_flat_map_ut.cpp b/src/library/yt/small_containers/unittests/compact_flat_map_ut.cpp similarity index 98% rename from library/cpp/yt/small_containers/unittests/compact_flat_map_ut.cpp rename to src/library/yt/small_containers/unittests/compact_flat_map_ut.cpp index c4b3508652e..9207ed9205c 100644 --- a/library/cpp/yt/small_containers/unittests/compact_flat_map_ut.cpp +++ b/src/library/yt/small_containers/unittests/compact_flat_map_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include #include #include diff --git a/library/cpp/yt/small_containers/unittests/compact_heap_ut.cpp b/src/library/yt/small_containers/unittests/compact_heap_ut.cpp similarity index 95% rename from library/cpp/yt/small_containers/unittests/compact_heap_ut.cpp rename to src/library/yt/small_containers/unittests/compact_heap_ut.cpp index 259c576e87c..18e4420500d 100644 --- a/library/cpp/yt/small_containers/unittests/compact_heap_ut.cpp +++ b/src/library/yt/small_containers/unittests/compact_heap_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include #include diff --git a/library/cpp/yt/small_containers/unittests/compact_queue_ut.cpp b/src/library/yt/small_containers/unittests/compact_queue_ut.cpp similarity index 95% rename from library/cpp/yt/small_containers/unittests/compact_queue_ut.cpp rename to src/library/yt/small_containers/unittests/compact_queue_ut.cpp index acea1c5c714..d3813b85dad 100644 --- a/library/cpp/yt/small_containers/unittests/compact_queue_ut.cpp +++ b/src/library/yt/small_containers/unittests/compact_queue_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include #include #include diff --git a/library/cpp/yt/small_containers/unittests/compact_set_ut.cpp b/src/library/yt/small_containers/unittests/compact_set_ut.cpp similarity index 97% rename from library/cpp/yt/small_containers/unittests/compact_set_ut.cpp rename to src/library/yt/small_containers/unittests/compact_set_ut.cpp index 17b96a21954..8a8697a6901 100644 --- a/library/cpp/yt/small_containers/unittests/compact_set_ut.cpp +++ b/src/library/yt/small_containers/unittests/compact_set_ut.cpp @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -#include +#include -#include +#include #include diff --git a/library/cpp/yt/small_containers/unittests/compact_vector_ut.cpp b/src/library/yt/small_containers/unittests/compact_vector_ut.cpp similarity index 99% rename from library/cpp/yt/small_containers/unittests/compact_vector_ut.cpp rename to src/library/yt/small_containers/unittests/compact_vector_ut.cpp index d5eae506421..3c2681c52c5 100644 --- a/library/cpp/yt/small_containers/unittests/compact_vector_ut.cpp +++ b/src/library/yt/small_containers/unittests/compact_vector_ut.cpp @@ -12,11 +12,11 @@ // //===----------------------------------------------------------------------===// -#include +#include -#include +#include -#include +#include #include #include diff --git a/library/cpp/yt/small_containers/unittests/ya.make b/src/library/yt/small_containers/unittests/ya.make similarity index 60% rename from library/cpp/yt/small_containers/unittests/ya.make rename to src/library/yt/small_containers/unittests/ya.make index b09ef44f8dc..b337566f6ec 100644 --- a/library/cpp/yt/small_containers/unittests/ya.make +++ b/src/library/yt/small_containers/unittests/ya.make @@ -1,6 +1,6 @@ GTEST(unittester-small-containers) -INCLUDE(${ARCADIA_ROOT}/library/cpp/yt/ya_cpp.make.inc) +INCLUDE(${ARCADIA_ROOT}/src/library/yt/ya_cpp.make.inc) SRCS( compact_flat_map_ut.cpp @@ -11,8 +11,8 @@ SRCS( ) PEERDIR( - library/cpp/yt/small_containers - library/cpp/testing/gtest + src/library/yt/small_containers + src/library/testing/gtest ) END() diff --git a/library/cpp/yt/string/CMakeLists.txt b/src/library/yt/string/CMakeLists.txt similarity index 57% rename from library/cpp/yt/string/CMakeLists.txt rename to src/library/yt/string/CMakeLists.txt index f49735dde45..828d4e980f7 100644 --- a/library/cpp/yt/string/CMakeLists.txt +++ b/src/library/yt/string/CMakeLists.txt @@ -15,10 +15,10 @@ target_link_libraries(cpp-yt-string PUBLIC ) target_sources(cpp-yt-string PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/string/enum.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/string/guid.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/string/string.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/string/format.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/string/enum.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/string/guid.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/string/string.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/string/format.cpp ) diff --git a/library/cpp/yt/string/enum-inl.h b/src/library/yt/string/enum-inl.h similarity index 97% rename from library/cpp/yt/string/enum-inl.h rename to src/library/yt/string/enum-inl.h index b5885038c82..4fc9b591300 100644 --- a/library/cpp/yt/string/enum-inl.h +++ b/src/library/yt/string/enum-inl.h @@ -6,8 +6,8 @@ #include "format.h" -#include -#include +#include +#include namespace NYT { diff --git a/library/cpp/yt/string/enum.cpp b/src/library/yt/string/enum.cpp similarity index 100% rename from library/cpp/yt/string/enum.cpp rename to src/library/yt/string/enum.cpp diff --git a/library/cpp/yt/string/enum.h b/src/library/yt/string/enum.h similarity index 95% rename from library/cpp/yt/string/enum.h rename to src/library/yt/string/enum.h index 7ab32b53027..1b1bf705255 100644 --- a/library/cpp/yt/string/enum.h +++ b/src/library/yt/string/enum.h @@ -2,7 +2,7 @@ #include "string.h" -#include +#include #include diff --git a/library/cpp/yt/string/format-inl.h b/src/library/yt/string/format-inl.h similarity index 99% rename from library/cpp/yt/string/format-inl.h rename to src/library/yt/string/format-inl.h index caa440a3134..ae3148affb2 100644 --- a/library/cpp/yt/string/format-inl.h +++ b/src/library/yt/string/format-inl.h @@ -7,13 +7,13 @@ #include "enum.h" #include "string.h" -#include +#include -#include +#include -#include +#include -#include +#include #include #include diff --git a/library/cpp/yt/string/format.cpp b/src/library/yt/string/format.cpp similarity index 100% rename from library/cpp/yt/string/format.cpp rename to src/library/yt/string/format.cpp diff --git a/library/cpp/yt/string/format.h b/src/library/yt/string/format.h similarity index 100% rename from library/cpp/yt/string/format.h rename to src/library/yt/string/format.h diff --git a/library/cpp/yt/string/guid.cpp b/src/library/yt/string/guid.cpp similarity index 100% rename from library/cpp/yt/string/guid.cpp rename to src/library/yt/string/guid.cpp diff --git a/library/cpp/yt/string/guid.h b/src/library/yt/string/guid.h similarity index 82% rename from library/cpp/yt/string/guid.h rename to src/library/yt/string/guid.h index ad7f5acee88..668f411358d 100644 --- a/library/cpp/yt/string/guid.h +++ b/src/library/yt/string/guid.h @@ -1,6 +1,6 @@ -#include +#include -#include +#include #include "format.h" diff --git a/library/cpp/yt/string/raw_formatter.h b/src/library/yt/string/raw_formatter.h similarity index 100% rename from library/cpp/yt/string/raw_formatter.h rename to src/library/yt/string/raw_formatter.h diff --git a/library/cpp/yt/string/string.cpp b/src/library/yt/string/string.cpp similarity index 98% rename from library/cpp/yt/string/string.cpp rename to src/library/yt/string/string.cpp index a26412bbf2f..2b2631ea3b5 100644 --- a/library/cpp/yt/string/string.cpp +++ b/src/library/yt/string/string.cpp @@ -1,11 +1,11 @@ #include "string.h" #include "format.h" -#include +#include -#include +#include -#include +#include namespace NYT { diff --git a/library/cpp/yt/string/string.h b/src/library/yt/string/string.h similarity index 98% rename from library/cpp/yt/string/string.h rename to src/library/yt/string/string.h index 772a7d26c03..133fd76ffd1 100644 --- a/library/cpp/yt/string/string.h +++ b/src/library/yt/string/string.h @@ -2,13 +2,13 @@ #include "string_builder.h" -#include +#include -#include +#include #include -#include +#include #include #include diff --git a/library/cpp/yt/string/string_builder-inl.h b/src/library/yt/string/string_builder-inl.h similarity index 98% rename from library/cpp/yt/string/string_builder-inl.h rename to src/library/yt/string/string_builder-inl.h index 818806943d6..368529a0ef9 100644 --- a/library/cpp/yt/string/string_builder-inl.h +++ b/src/library/yt/string/string_builder-inl.h @@ -4,7 +4,7 @@ #include "string_builder.h" #endif -#include +#include #include diff --git a/library/cpp/yt/string/string_builder.h b/src/library/yt/string/string_builder.h similarity index 98% rename from library/cpp/yt/string/string_builder.h rename to src/library/yt/string/string_builder.h index 541d4c86aba..a883c6fd8d4 100644 --- a/library/cpp/yt/string/string_builder.h +++ b/src/library/yt/string/string_builder.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/library/cpp/yt/string/unittests/enum_ut.cpp b/src/library/yt/string/unittests/enum_ut.cpp similarity index 95% rename from library/cpp/yt/string/unittests/enum_ut.cpp rename to src/library/yt/string/unittests/enum_ut.cpp index 4059b3d2e63..690ad030f83 100644 --- a/library/cpp/yt/string/unittests/enum_ut.cpp +++ b/src/library/yt/string/unittests/enum_ut.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include #include diff --git a/library/cpp/yt/string/unittests/format_ut.cpp b/src/library/yt/string/unittests/format_ut.cpp similarity index 98% rename from library/cpp/yt/string/unittests/format_ut.cpp rename to src/library/yt/string/unittests/format_ut.cpp index a00a6b31cde..f385bf16f2f 100644 --- a/library/cpp/yt/string/unittests/format_ut.cpp +++ b/src/library/yt/string/unittests/format_ut.cpp @@ -1,8 +1,8 @@ -#include +#include -#include +#include -#include +#include #include diff --git a/library/cpp/yt/string/unittests/guid_ut.cpp b/src/library/yt/string/unittests/guid_ut.cpp similarity index 89% rename from library/cpp/yt/string/unittests/guid_ut.cpp rename to src/library/yt/string/unittests/guid_ut.cpp index ec0843b26e5..870a773ac6c 100644 --- a/library/cpp/yt/string/unittests/guid_ut.cpp +++ b/src/library/yt/string/unittests/guid_ut.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include +#include +#include -#include +#include #include diff --git a/library/cpp/yt/string/unittests/string_ut.cpp b/src/library/yt/string/unittests/string_ut.cpp similarity index 93% rename from library/cpp/yt/string/unittests/string_ut.cpp rename to src/library/yt/string/unittests/string_ut.cpp index f26e0c08fcf..6a5a1570d19 100644 --- a/library/cpp/yt/string/unittests/string_ut.cpp +++ b/src/library/yt/string/unittests/string_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include namespace NYT { namespace { diff --git a/library/cpp/yt/string/unittests/ya.make b/src/library/yt/string/unittests/ya.make similarity index 53% rename from library/cpp/yt/string/unittests/ya.make rename to src/library/yt/string/unittests/ya.make index 8fd64d36627..1dceefe9198 100644 --- a/library/cpp/yt/string/unittests/ya.make +++ b/src/library/yt/string/unittests/ya.make @@ -1,6 +1,6 @@ GTEST(unittester-library-string) -INCLUDE(${ARCADIA_ROOT}/library/cpp/yt/ya_cpp.make.inc) +INCLUDE(${ARCADIA_ROOT}/src/library/yt/ya_cpp.make.inc) SRCS( enum_ut.cpp @@ -10,8 +10,8 @@ SRCS( ) PEERDIR( - library/cpp/yt/string - library/cpp/testing/gtest + src/library/yt/string + src/library/testing/gtest ) END() diff --git a/library/cpp/yt/yson/CMakeLists.txt b/src/library/yt/yson/CMakeLists.txt similarity index 78% rename from library/cpp/yt/yson/CMakeLists.txt rename to src/library/yt/yson/CMakeLists.txt index a95d0a67904..c4574ef5993 100644 --- a/library/cpp/yt/yson/CMakeLists.txt +++ b/src/library/yt/yson/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries(cpp-yt-yson PUBLIC ) target_sources(cpp-yt-yson PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/yson/consumer.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/yson/consumer.cpp ) diff --git a/library/cpp/yt/yson/consumer.cpp b/src/library/yt/yson/consumer.cpp similarity index 87% rename from library/cpp/yt/yson/consumer.cpp rename to src/library/yt/yson/consumer.cpp index 9b68ee8a223..d105716f160 100644 --- a/library/cpp/yt/yson/consumer.cpp +++ b/src/library/yt/yson/consumer.cpp @@ -1,6 +1,6 @@ #include "consumer.h" -#include +#include namespace NYT::NYson { diff --git a/library/cpp/yt/yson/consumer.h b/src/library/yt/yson/consumer.h similarity index 97% rename from library/cpp/yt/yson/consumer.h rename to src/library/yt/yson/consumer.h index 3d2d222aee7..c051913a2ae 100644 --- a/library/cpp/yt/yson/consumer.h +++ b/src/library/yt/yson/consumer.h @@ -2,9 +2,9 @@ #include -#include +#include -#include +#include namespace NYT::NYson { diff --git a/library/cpp/yt/yson/public.h b/src/library/yt/yson/public.h similarity index 100% rename from library/cpp/yt/yson/public.h rename to src/library/yt/yson/public.h diff --git a/library/cpp/yt/yson_string/CMakeLists.txt b/src/library/yt/yson_string/CMakeLists.txt similarity index 75% rename from library/cpp/yt/yson_string/CMakeLists.txt rename to src/library/yt/yson_string/CMakeLists.txt index fbad51b9ca3..cfcca2c839f 100644 --- a/library/cpp/yt/yson_string/CMakeLists.txt +++ b/src/library/yt/yson_string/CMakeLists.txt @@ -11,8 +11,8 @@ target_link_libraries(cpp-yt-yson_string PUBLIC ) target_sources(cpp-yt-yson_string PRIVATE - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/yson_string/convert.cpp - ${YDB_SDK_SOURCE_DIR}/library/cpp/yt/yson_string/string.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/yson_string/convert.cpp + ${YDB_SDK_SOURCE_DIR}/src/library/yt/yson_string/string.cpp ) if (NOT (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")) diff --git a/library/cpp/yt/yson_string/convert.cpp b/src/library/yt/yson_string/convert.cpp similarity index 98% rename from library/cpp/yt/yson_string/convert.cpp rename to src/library/yt/yson_string/convert.cpp index 85d87289191..d8b7de06bff 100644 --- a/library/cpp/yt/yson_string/convert.cpp +++ b/src/library/yt/yson_string/convert.cpp @@ -1,17 +1,17 @@ #include "convert.h" #include "format.h" -#include +#include -#include +#include -#include +#include -#include +#include #include -#include +#include namespace NYT::NYson { diff --git a/library/cpp/yt/yson_string/convert.h b/src/library/yt/yson_string/convert.h similarity index 96% rename from library/cpp/yt/yson_string/convert.h rename to src/library/yt/yson_string/convert.h index 8cd53cd475b..0c3d514e614 100644 --- a/library/cpp/yt/yson_string/convert.h +++ b/src/library/yt/yson_string/convert.h @@ -2,13 +2,13 @@ #include "string.h" -#include +#include -#include +#include #include -#include +#include namespace NYT::NYson { diff --git a/library/cpp/yt/yson_string/format.h b/src/library/yt/yson_string/format.h similarity index 100% rename from library/cpp/yt/yson_string/format.h rename to src/library/yt/yson_string/format.h diff --git a/library/cpp/yt/yson_string/public.h b/src/library/yt/yson_string/public.h similarity index 95% rename from library/cpp/yt/yson_string/public.h rename to src/library/yt/yson_string/public.h index 42c1ce80bb4..6627cea084f 100644 --- a/library/cpp/yt/yson_string/public.h +++ b/src/library/yt/yson_string/public.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NYT::NYson { diff --git a/library/cpp/yt/yson_string/string-inl.h b/src/library/yt/yson_string/string-inl.h similarity index 100% rename from library/cpp/yt/yson_string/string-inl.h rename to src/library/yt/yson_string/string-inl.h diff --git a/library/cpp/yt/yson_string/string.cpp b/src/library/yt/yson_string/string.cpp similarity index 97% rename from library/cpp/yt/yson_string/string.cpp rename to src/library/yt/yson_string/string.cpp index b2ad242eeba..78ecad19ff5 100644 --- a/library/cpp/yt/yson_string/string.cpp +++ b/src/library/yt/yson_string/string.cpp @@ -1,10 +1,10 @@ #include "string.h" -#include +#include -#include +#include -#include +#include namespace NYT::NYson { diff --git a/library/cpp/yt/yson_string/string.h b/src/library/yt/yson_string/string.h similarity index 98% rename from library/cpp/yt/yson_string/string.h rename to src/library/yt/yson_string/string.h index a838867c8a5..475291660e5 100644 --- a/library/cpp/yt/yson_string/string.h +++ b/src/library/yt/yson_string/string.h @@ -2,7 +2,7 @@ #include "public.h" -#include +#include #include @@ -107,7 +107,7 @@ class TYsonString //! Computes the hash code. size_t ComputeHash() const; - //! Allow to serialize/deserialize using the ::Save ::Load functions. See util/ysaveload.h. + //! Allow to serialize/deserialize using the ::Save ::Load functions. See src/util/ysaveload.h. void Save(IOutputStream* s) const; void Load(IInputStream* s); diff --git a/library/cpp/yt/yson_string/unittests/convert_ut.cpp b/src/library/yt/yson_string/unittests/convert_ut.cpp similarity index 93% rename from library/cpp/yt/yson_string/unittests/convert_ut.cpp rename to src/library/yt/yson_string/unittests/convert_ut.cpp index 6125562e1cd..27483716a1e 100644 --- a/library/cpp/yt/yson_string/unittests/convert_ut.cpp +++ b/src/library/yt/yson_string/unittests/convert_ut.cpp @@ -1,8 +1,8 @@ -#include +#include -#include +#include -#include +#include #include diff --git a/library/cpp/yt/yson_string/unittests/saveload_ut.cpp b/src/library/yt/yson_string/unittests/saveload_ut.cpp similarity index 86% rename from library/cpp/yt/yson_string/unittests/saveload_ut.cpp rename to src/library/yt/yson_string/unittests/saveload_ut.cpp index 27f18fc5c76..0dfb9da5234 100644 --- a/library/cpp/yt/yson_string/unittests/saveload_ut.cpp +++ b/src/library/yt/yson_string/unittests/saveload_ut.cpp @@ -1,8 +1,8 @@ -#include +#include -#include +#include -#include +#include namespace NYT::NYson { namespace { diff --git a/src/library/yt/yson_string/unittests/ya.make b/src/library/yt/yson_string/unittests/ya.make new file mode 100644 index 00000000000..b97c305dafd --- /dev/null +++ b/src/library/yt/yson_string/unittests/ya.make @@ -0,0 +1,16 @@ +GTEST() + +INCLUDE(${ARCADIA_ROOT}/src/library/yt/ya_cpp.make.inc) + +SRCS( + convert_ut.cpp + saveload_ut.cpp +) + +PEERDIR( + src/library/yt/yson_string + src/library/testing/gtest + src/library/testing/gtest_extensions +) + +END() diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt new file mode 100644 index 00000000000..e3d8b478313 --- /dev/null +++ b/src/util/CMakeLists.txt @@ -0,0 +1,314 @@ +add_subdirectory(charset) + +add_library(yutil) +target_compile_options(yutil PRIVATE + -Wnarrowing +) +target_link_libraries(yutil PUBLIC + util-charset + ZLIB::ZLIB + double-conversion::double-conversion + contrib-libs-libc_compat + cpp-string_utils-helpers +) + +target_joined_source(yutil + all_datetime.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/datetime/base.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/datetime/constants.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/datetime/cputimer.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/datetime/systime.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/datetime/uptime.cpp +) +target_joined_source(yutil + all_digest.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/digest/fnv.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/digest/multi.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/digest/murmur.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/digest/numeric.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/digest/sequence.cpp +) +target_joined_source(yutil + all_util.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/ysafeptr.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/ysaveload.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/str_stl.cpp +) +target_joined_source(yutil + all_folder.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/folder/dirut.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/folder/filelist.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/folder/fts.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/folder/fwd.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/folder/iterator.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/folder/path.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/folder/pathsplit.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/folder/tempdir.cpp +) +target_joined_source(yutil + all_generic.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/adaptor.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/algorithm.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/array_size.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/bitmap.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/bitops.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/bt_exception.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/buffer.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/cast.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/explicit_type.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/fastqueue.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/flags.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/function.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/function_ref.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/fwd.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/guid.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/hash.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/hash_multi_map.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/hash_table.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/hash_primes.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/hide_ptr.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/intrlist.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/is_in.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/iterator.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/iterator_range.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/lazy_value.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/mapfindptr.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/mem_copy.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/noncopyable.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/object_counter.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/overloaded.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/ptr.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/refcount.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/scope.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/set.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/singleton.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/size_literals.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/stack.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/store_policy.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/strfcpy.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/typelist.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/typetraits.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/utility.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/va_args.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/variant.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/xrange.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/yexception.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/ylimits.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/generic/ymath.cpp +) +target_joined_source(yutil + all_memory.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/memory/addstorage.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/memory/alloc.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/memory/blob.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/memory/mmapalloc.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/memory/pool.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/memory/segmented_string_pool.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/memory/segpool_alloc.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/memory/smallobj.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/memory/tempbuf.cpp +) +target_joined_source(yutil + all_network.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/address.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/endpoint.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/hostip.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/init.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/interface.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/iovec.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/ip.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/nonblock.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/pair.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/poller.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/pollerimpl.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/sock.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/network/socket.cpp +) +target_joined_source(yutil + all_random.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/random/common_ops.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/random/easy.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/random/entropy.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/random/fast.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/random/lcg_engine.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/random/mersenne32.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/random/mersenne64.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/random/mersenne.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/random/normal.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/random/shuffle.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/random/init_atfork.cpp +) +target_joined_source(yutil + all_stream.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/buffer.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/buffered.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/debug.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/file.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/format.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/fwd.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/hex.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/input.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/length.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/mem.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/multi.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/null.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/output.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/str.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/tee.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/tempbuf.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/walk.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/zerocopy.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/zerocopy_output.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/stream/zlib.cpp +) +target_joined_source(yutil + all_string.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/ascii.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/builder.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/cstriter.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/escape.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/hex.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/join.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/reverse.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/split.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/strip.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/strspn.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/subst.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/type.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/util.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/vector.cpp +) +target_joined_source(yutil + all_system_1.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/atexit.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/backtrace.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/compat.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/context.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/daemon.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/datetime.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/defaults.c + ${YDB_SDK_SOURCE_DIR}/src/util/system/direct_io.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/dynlib.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/error.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/event.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/execpath.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/fasttime.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/file.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/file_lock.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/filemap.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/flock.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/fs.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/fstat.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/getpid.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/hi_lo.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/hostname.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/hp_timer.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/info.cpp +) +target_joined_source(yutil + all_system_2.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/align.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/byteorder.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/cpu_id.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/fhandle.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/guard.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/interrupt_signals.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/madvise.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/maxlen.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/mem_info.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/mincore.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/mktemp.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/mlock.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/fake_mutex.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/nice.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/pipe.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/platform.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/progname.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/protect.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/rusage.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/rwlock.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/sanitizers.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/sem.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/shellcommand.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/shmat.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/sigset.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/spinlock.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/spin_wait.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/src_location.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/sys_alloc.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/sysstat.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/tempfile.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/thread.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/tls.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/types.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/type_name.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/unaligned_mem.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/user.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/utime.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/yassert.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/yield.cpp +) +target_joined_source(yutil + all_thread.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/thread/factory.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/thread/fwd.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/thread/pool.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/thread/singleton.cpp +) + +target_sources(yutil PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/util/system/compiler.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/digest/city.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/random/random.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/string/cast.cpp +) + +if (NOT WIN32) + target_ragel_lexers(yutil + PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/util/datetime/parser.rl6 + -CG2 + ) +endif () + +if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + target_yasm_source(yutil + PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/util/system/context_x86.asm + -I + ${YDB_SDK_BINARY_DIR} + -I + ${YDB_SDK_SOURCE_DIR} + ) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") + target_sources(yutil PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/util/system/context_aarch64.S + ) +endif () + +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + target_sources(yutil PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/util/system/valgrind.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/mktemp_system.cpp + ) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") + target_sources(yutil PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/util/datetime/strptime.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/folder/lstat_win.c + ${YDB_SDK_SOURCE_DIR}/src/util/folder/dirent_win.c + ${YDB_SDK_SOURCE_DIR}/src/util/system/err.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/fs_win.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/winint.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/system/mktemp_system.cpp + ) + target_ragel_lexers(yutil + PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/util/datetime/parser.rl6 + -CT0 + ) +endif() + +target_compile_definitions(yutil PUBLIC + ARCADIA_ROOT_CMAKE_HELPER=${YDB_SDK_SOURCE_DIR} + ARCADIA_BUILD_ROOT_CMAKE_HELPER=${YDB_SDK_BINARY_DIR} +) \ No newline at end of file diff --git a/util/README.md b/src/util/README.md similarity index 100% rename from util/README.md rename to src/util/README.md diff --git a/src/util/charset/CMakeLists.txt b/src/util/charset/CMakeLists.txt new file mode 100644 index 00000000000..ca441cacd45 --- /dev/null +++ b/src/util/charset/CMakeLists.txt @@ -0,0 +1,33 @@ +add_library(util-charset) + +target_joined_source(util-charset + all_charset.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/charset/generated/unidata.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/charset/recode_result.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/charset/unicode_table.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/charset/unidata.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/charset/utf8.cpp + ${YDB_SDK_SOURCE_DIR}/src/util/charset/wide.cpp +) + +if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") + target_sources_custom(util-charset + .sse41 + SRCS + ${YDB_SDK_SOURCE_DIR}/src/util/charset/wide_sse41.cpp + CUSTOM_FLAGS + -msse4.1 + ) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") + target_sources(util-charset PRIVATE + ${YDB_SDK_SOURCE_DIR}/src/util/charset/wide_sse41.cpp + ) + set_property( + SOURCE + ${YDB_SDK_SOURCE_DIR}/src/util/charset/wide_sse41.cpp + APPEND + PROPERTY + COMPILE_OPTIONS + -DSSE41_STUB + ) +endif() diff --git a/util/charset/generated/unidata.cpp b/src/util/charset/generated/unidata.cpp similarity index 99% rename from util/charset/generated/unidata.cpp rename to src/util/charset/generated/unidata.cpp index 6f5adbbc0aa..30669183af5 100644 --- a/util/charset/generated/unidata.cpp +++ b/src/util/charset/generated/unidata.cpp @@ -1,4 +1,4 @@ -#include +#include namespace { namespace NUnidataTableGenerated { using TV = const NUnicode::NPrivate::TUnidataTable::TStored; diff --git a/util/charset/recode_result.cpp b/src/util/charset/recode_result.cpp similarity index 100% rename from util/charset/recode_result.cpp rename to src/util/charset/recode_result.cpp diff --git a/util/charset/recode_result.h b/src/util/charset/recode_result.h similarity index 100% rename from util/charset/recode_result.h rename to src/util/charset/recode_result.h diff --git a/util/charset/unicode_table.cpp b/src/util/charset/unicode_table.cpp similarity index 100% rename from util/charset/unicode_table.cpp rename to src/util/charset/unicode_table.cpp diff --git a/util/charset/unicode_table.h b/src/util/charset/unicode_table.h similarity index 96% rename from util/charset/unicode_table.h rename to src/util/charset/unicode_table.h index 9e171b25832..9cafd186347 100644 --- a/util/charset/unicode_table.h +++ b/src/util/charset/unicode_table.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace NUnicodeTable { template diff --git a/util/charset/unidata.cpp b/src/util/charset/unidata.cpp similarity index 100% rename from util/charset/unidata.cpp rename to src/util/charset/unidata.cpp diff --git a/util/charset/unidata.h b/src/util/charset/unidata.h similarity index 99% rename from util/charset/unidata.h rename to src/util/charset/unidata.h index 400d3141868..df040019010 100644 --- a/util/charset/unidata.h +++ b/src/util/charset/unidata.h @@ -2,7 +2,7 @@ #include "unicode_table.h" -#include // wchar32, ui64, ULL() +#include // wchar32, ui64, ULL() enum WC_TYPE { // TODO move no NUnicode Lu_UPPER = 1, // 'Ъ' diff --git a/util/charset/ut/utf8/invalid_UTF8.bin b/src/util/charset/ut/utf8/invalid_UTF8.bin similarity index 100% rename from util/charset/ut/utf8/invalid_UTF8.bin rename to src/util/charset/ut/utf8/invalid_UTF8.bin diff --git a/util/charset/ut/utf8/test1.txt b/src/util/charset/ut/utf8/test1.txt similarity index 100% rename from util/charset/ut/utf8/test1.txt rename to src/util/charset/ut/utf8/test1.txt diff --git a/src/util/charset/ut/ya.make b/src/util/charset/ut/ya.make new file mode 100644 index 00000000000..d14b05f2564 --- /dev/null +++ b/src/util/charset/ut/ya.make @@ -0,0 +1,16 @@ +UNITTEST_FOR(src/util/charset) + +SUBSCRIBER(g:util-subscribers) + +DATA(arcadia/src/util/charset/ut/utf8) + +SRCS( + utf8_ut.cpp + wide_ut.cpp +) + +INCLUDE(${ARCADIA_ROOT}/src/util/tests/ya_util_tests.inc) + +REQUIREMENTS(ram:17) + +END() diff --git a/util/charset/utf8.cpp b/src/util/charset/utf8.cpp similarity index 100% rename from util/charset/utf8.cpp rename to src/util/charset/utf8.cpp diff --git a/util/charset/utf8.h b/src/util/charset/utf8.h similarity index 98% rename from util/charset/utf8.h rename to src/util/charset/utf8.h index 26aa9c7fe58..d06ca4076ec 100644 --- a/util/charset/utf8.h +++ b/src/util/charset/utf8.h @@ -2,10 +2,10 @@ #include "recode_result.h" -#include -#include -#include -#include +#include +#include +#include +#include extern const wchar32 BROKEN_RUNE; diff --git a/util/charset/utf8_ut.cpp b/src/util/charset/utf8_ut.cpp similarity index 91% rename from util/charset/utf8_ut.cpp rename to src/util/charset/utf8_ut.cpp index 7f3002501b6..4106fa86def 100644 --- a/util/charset/utf8_ut.cpp +++ b/src/util/charset/utf8_ut.cpp @@ -1,11 +1,11 @@ #include "utf8.h" #include "wide.h" -#include -#include +#include +#include -#include -#include +#include +#include Y_UNIT_TEST_SUITE(TUtfUtilTest) { Y_UNIT_TEST(TestUTF8Len) { @@ -93,7 +93,7 @@ Y_UNIT_TEST_SUITE(TUtfUtilTest) { } Y_UNIT_TEST(TestUTF8ToWide) { - TFileInput in(ArcadiaSourceRoot() + std::string_view("/util/charset/ut/utf8/test1.txt")); + TFileInput in(ArcadiaSourceRoot() + std::string_view("/src/util/charset/ut/utf8/test1.txt")); std::string text = in.ReadAll(); UNIT_ASSERT(WideToUTF8(UTF8ToWide(text)) == text); @@ -101,7 +101,7 @@ Y_UNIT_TEST_SUITE(TUtfUtilTest) { Y_UNIT_TEST(TestInvalidUTF8) { std::vector testData; - TFileInput input(ArcadiaSourceRoot() + std::string_view("/util/charset/ut/utf8/invalid_UTF8.bin")); + TFileInput input(ArcadiaSourceRoot() + std::string_view("/src/util/charset/ut/utf8/invalid_UTF8.bin")); Load(&input, testData); for (const auto& text : testData) { @@ -110,7 +110,7 @@ Y_UNIT_TEST_SUITE(TUtfUtilTest) { } Y_UNIT_TEST(TestUTF8ToWideScalar) { - TFileInput in(ArcadiaSourceRoot() + std::string_view("/util/charset/ut/utf8/test1.txt")); + TFileInput in(ArcadiaSourceRoot() + std::string_view("/src/util/charset/ut/utf8/test1.txt")); std::string text = in.ReadAll(); std::u16string wtextSSE = UTF8ToWide(text); diff --git a/util/charset/wide.cpp b/src/util/charset/wide.cpp similarity index 99% rename from util/charset/wide.cpp rename to src/util/charset/wide.cpp index dacb527f5dc..e9b9625db09 100644 --- a/util/charset/wide.cpp +++ b/src/util/charset/wide.cpp @@ -1,7 +1,7 @@ #include "wide.h" -#include -#include +#include +#include namespace { //! the constants are not zero-terminated diff --git a/util/charset/wide.h b/src/util/charset/wide.h similarity index 99% rename from util/charset/wide.h rename to src/util/charset/wide.h index ddffb312420..6870696f845 100644 --- a/util/charset/wide.h +++ b/src/util/charset/wide.h @@ -5,13 +5,13 @@ #include "utf8.h" #include "wide_specific.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/util/charset/wide_specific.h b/src/util/charset/wide_specific.h similarity index 86% rename from util/charset/wide_specific.h rename to src/util/charset/wide_specific.h index 4ea765b94b6..17518652288 100644 --- a/util/charset/wide_specific.h +++ b/src/util/charset/wide_specific.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include inline constexpr bool IsW16SurrogateLead(wchar16 c) noexcept { return 0xD800 <= c && c <= 0xDBFF; diff --git a/util/charset/wide_sse41.cpp b/src/util/charset/wide_sse41.cpp similarity index 98% rename from util/charset/wide_sse41.cpp rename to src/util/charset/wide_sse41.cpp index d1f2a74851e..1712b4f1a96 100644 --- a/util/charset/wide_sse41.cpp +++ b/src/util/charset/wide_sse41.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #ifdef SSE41_STUB @@ -12,7 +12,7 @@ namespace NDetail { #else - #include + #include #include #include diff --git a/util/charset/wide_ut.cpp b/src/util/charset/wide_ut.cpp similarity index 99% rename from util/charset/wide_ut.cpp rename to src/util/charset/wide_ut.cpp index 15710b51f40..2f35c1d5b0d 100644 --- a/util/charset/wide_ut.cpp +++ b/src/util/charset/wide_ut.cpp @@ -1,9 +1,9 @@ #include "utf8.h" #include "wide.h" -#include +#include -#include +#include #include diff --git a/util/datetime/base.cpp b/src/util/datetime/base.cpp similarity index 97% rename from util/datetime/base.cpp rename to src/util/datetime/base.cpp index 6b87b6e98e6..84980eaa470 100644 --- a/util/datetime/base.cpp +++ b/src/util/datetime/base.cpp @@ -1,11 +1,11 @@ #include "base.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include std::string Strftime(const char* format, const struct tm* tm) { size_t size = Max(strlen(format) * 2 + 1, 107); diff --git a/util/datetime/base.h b/src/util/datetime/base.h similarity index 98% rename from util/datetime/base.h rename to src/util/datetime/base.h index a3394517128..7d3b0e34475 100644 --- a/util/datetime/base.h +++ b/src/util/datetime/base.h @@ -2,13 +2,13 @@ #include "systime.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/util/datetime/base_ut.cpp b/src/util/datetime/base_ut.cpp similarity index 98% rename from util/datetime/base_ut.cpp rename to src/util/datetime/base_ut.cpp index cf13538afa8..fd556ef3018 100644 --- a/util/datetime/base_ut.cpp +++ b/src/util/datetime/base_ut.cpp @@ -1,14 +1,14 @@ #include "base.h" -#include - -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include #include diff --git a/util/datetime/benchmark/gmtime_r/main.cpp b/src/util/datetime/benchmark/gmtime_r/main.cpp similarity index 83% rename from util/datetime/benchmark/gmtime_r/main.cpp rename to src/util/datetime/benchmark/gmtime_r/main.cpp index a649ab3ccfe..9cfca641c67 100644 --- a/util/datetime/benchmark/gmtime_r/main.cpp +++ b/src/util/datetime/benchmark/gmtime_r/main.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include Y_CPU_BENCHMARK(GmTimeR, iface) { time_t now = TInstant::Now().TimeT(); diff --git a/util/datetime/benchmark/gmtime_r/ya.make b/src/util/datetime/benchmark/gmtime_r/ya.make similarity index 82% rename from util/datetime/benchmark/gmtime_r/ya.make rename to src/util/datetime/benchmark/gmtime_r/ya.make index 32acd7c1c05..a784f10025e 100644 --- a/util/datetime/benchmark/gmtime_r/ya.make +++ b/src/util/datetime/benchmark/gmtime_r/ya.make @@ -3,7 +3,7 @@ SUBSCRIBER(g:util-subscribers) Y_BENCHMARK() PEERDIR( - util/draft + src/util/draft ) SRCS( diff --git a/util/datetime/benchmark/ya.make b/src/util/datetime/benchmark/ya.make similarity index 100% rename from util/datetime/benchmark/ya.make rename to src/util/datetime/benchmark/ya.make diff --git a/util/datetime/constants.cpp b/src/util/datetime/constants.cpp similarity index 100% rename from util/datetime/constants.cpp rename to src/util/datetime/constants.cpp diff --git a/util/datetime/constants.h b/src/util/datetime/constants.h similarity index 100% rename from util/datetime/constants.h rename to src/util/datetime/constants.h diff --git a/util/datetime/cputimer.cpp b/src/util/datetime/cputimer.cpp similarity index 78% rename from util/datetime/cputimer.cpp rename to src/util/datetime/cputimer.cpp index 04f95341f7a..505f701200c 100644 --- a/util/datetime/cputimer.cpp +++ b/src/util/datetime/cputimer.cpp @@ -1,9 +1,9 @@ #include "cputimer.h" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/util/datetime/cputimer.h b/src/util/datetime/cputimer.h similarity index 100% rename from util/datetime/cputimer.h rename to src/util/datetime/cputimer.h diff --git a/util/datetime/cputimer_ut.cpp b/src/util/datetime/cputimer_ut.cpp similarity index 83% rename from util/datetime/cputimer_ut.cpp rename to src/util/datetime/cputimer_ut.cpp index 21a657d5c74..7f6f0e4b210 100644 --- a/util/datetime/cputimer_ut.cpp +++ b/src/util/datetime/cputimer_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #include "cputimer.h" diff --git a/util/datetime/parser.h b/src/util/datetime/parser.h similarity index 99% rename from util/datetime/parser.h rename to src/util/datetime/parser.h index f0c1b4a0c78..6f87915b183 100644 --- a/util/datetime/parser.h +++ b/src/util/datetime/parser.h @@ -1,6 +1,6 @@ #pragma once -// probably you do not need to include this file directly, use "util/datetime/base.h" +// probably you do not need to include this file directly, use "src/util/datetime/base.h" #include "base.h" diff --git a/util/datetime/parser.rl6 b/src/util/datetime/parser.rl6 similarity index 99% rename from util/datetime/parser.rl6 rename to src/util/datetime/parser.rl6 index a8ef5401d67..0a40a22ceb4 100644 --- a/util/datetime/parser.rl6 +++ b/src/util/datetime/parser.rl6 @@ -5,8 +5,8 @@ #include #include -#include -#include +#include +#include %%{ diff --git a/util/datetime/parser_deprecated_ut.cpp b/src/util/datetime/parser_deprecated_ut.cpp similarity index 99% rename from util/datetime/parser_deprecated_ut.cpp rename to src/util/datetime/parser_deprecated_ut.cpp index fcb6e76e4f6..ea9cef16070 100644 --- a/util/datetime/parser_deprecated_ut.cpp +++ b/src/util/datetime/parser_deprecated_ut.cpp @@ -1,6 +1,6 @@ #include "parser.h" -#include +#include static const time_t SECONDS_PER_HOUR = 3600; static const time_t SECONDS_PER_MINUTE = 60; @@ -325,7 +325,7 @@ Y_UNIT_TEST_SUITE(TDateTimeParseTestDeprecated) { #if 0 // these tests are disabled, because time zones are handled differently - // in old util/ parser and agalakhov@ parser + // in old src/util/ parser and agalakhov@ parser ret = ParseISO8601DateTimeDeprecated("1970-01-01", t); UNIT_ASSERT(ret); UNIT_ASSERT_VALUES_EQUAL(t, -4 * 3600); diff --git a/util/datetime/parser_ut.cpp b/src/util/datetime/parser_ut.cpp similarity index 99% rename from util/datetime/parser_ut.cpp rename to src/util/datetime/parser_ut.cpp index 507fe3debca..c64f2051813 100644 --- a/util/datetime/parser_ut.cpp +++ b/src/util/datetime/parser_ut.cpp @@ -1,6 +1,6 @@ #include "parser.h" -#include +#include static const time_t SECONDS_PER_HOUR = 3600; static const time_t SECONDS_PER_MINUTE = 60; @@ -332,7 +332,7 @@ Y_UNIT_TEST_SUITE(TDateTimeParseTest) { #if 0 // these tests are disabled, because time zones are handled differently - // in old util/ parser and agalakhov@ parser + // in old src/util/ parser and agalakhov@ parser ret = ParseISO8601DateTime("1970-01-01", t); UNIT_ASSERT(ret); UNIT_ASSERT_VALUES_EQUAL(t, -4 * 3600); diff --git a/util/datetime/strptime.cpp b/src/util/datetime/strptime.cpp similarity index 99% rename from util/datetime/strptime.cpp rename to src/util/datetime/strptime.cpp index f0d4ec333e8..f1ef2566fb0 100644 --- a/util/datetime/strptime.cpp +++ b/src/util/datetime/strptime.cpp @@ -54,7 +54,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "systime.h" #ifdef _win32_ #ifndef lint diff --git a/util/datetime/systime.cpp b/src/util/datetime/systime.cpp similarity index 99% rename from util/datetime/systime.cpp rename to src/util/datetime/systime.cpp index f0cf7bd70a0..53a5b4cf119 100644 --- a/util/datetime/systime.cpp +++ b/src/util/datetime/systime.cpp @@ -1,7 +1,7 @@ #include "systime.h" -#include -#include +#include +#include #ifdef _win_ diff --git a/util/datetime/systime.h b/src/util/datetime/systime.h similarity index 95% rename from util/datetime/systime.h rename to src/util/datetime/systime.h index 612b2758d0d..b11ac0489a8 100644 --- a/util/datetime/systime.h +++ b/src/util/datetime/systime.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include @@ -12,7 +12,7 @@ struct tm* GmTimeR(const time_t* timer, struct tm* tmbuf); std::string CTimeR(const time_t* timer); #ifdef _win_ - #include + #include #include void FileTimeToTimeval(const FILETIME* ft, struct timeval* tv); diff --git a/util/datetime/uptime.cpp b/src/util/datetime/uptime.cpp similarity index 92% rename from util/datetime/uptime.cpp rename to src/util/datetime/uptime.cpp index fe01610d66c..68f3b8575f5 100644 --- a/util/datetime/uptime.cpp +++ b/src/util/datetime/uptime.cpp @@ -1,10 +1,10 @@ #include "uptime.h" #if defined(_win_) - #include + #include #elif defined(_linux_) - #include - #include + #include + #include #elif defined(_darwin_) #include #endif diff --git a/util/datetime/uptime.h b/src/util/datetime/uptime.h similarity index 100% rename from util/datetime/uptime.h rename to src/util/datetime/uptime.h diff --git a/util/datetime/uptime_ut.cpp b/src/util/datetime/uptime_ut.cpp similarity index 84% rename from util/datetime/uptime_ut.cpp rename to src/util/datetime/uptime_ut.cpp index 7f5ecc482c8..86a6d82cef4 100644 --- a/util/datetime/uptime_ut.cpp +++ b/src/util/datetime/uptime_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #include "uptime.h" diff --git a/util/datetime/ut/ya.make b/src/util/datetime/ut/ya.make similarity index 78% rename from util/datetime/ut/ya.make rename to src/util/datetime/ut/ya.make index 70f63305d57..7ef47c95c57 100644 --- a/util/datetime/ut/ya.make +++ b/src/util/datetime/ut/ya.make @@ -10,6 +10,6 @@ SRCS( datetime/uptime_ut.cpp ) -INCLUDE(${ARCADIA_ROOT}/util/tests/ya_util_tests.inc) +INCLUDE(${ARCADIA_ROOT}/src/util/tests/ya_util_tests.inc) END() diff --git a/util/digest/benchmark/murmur/main.cpp b/src/util/digest/benchmark/murmur/main.cpp similarity index 81% rename from util/digest/benchmark/murmur/main.cpp rename to src/util/digest/benchmark/murmur/main.cpp index ee916bece76..b8e063c830d 100644 --- a/util/digest/benchmark/murmur/main.cpp +++ b/src/util/digest/benchmark/murmur/main.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include #include diff --git a/util/digest/benchmark/murmur/ya.make b/src/util/digest/benchmark/murmur/ya.make similarity index 100% rename from util/digest/benchmark/murmur/ya.make rename to src/util/digest/benchmark/murmur/ya.make diff --git a/util/digest/benchmark/ya.make b/src/util/digest/benchmark/ya.make similarity index 100% rename from util/digest/benchmark/ya.make rename to src/util/digest/benchmark/ya.make diff --git a/util/digest/city.cpp b/src/util/digest/city.cpp similarity index 99% rename from util/digest/city.cpp rename to src/util/digest/city.cpp index c0c7c1a2e93..bf5d1ac6cc1 100644 --- a/util/digest/city.cpp +++ b/src/util/digest/city.cpp @@ -33,8 +33,8 @@ using uint8 = ui8; using uint32 = ui32; using uint64 = ui64; -#include -#include +#include +#include using namespace std; diff --git a/util/digest/city.h b/src/util/digest/city.h similarity index 98% rename from util/digest/city.h rename to src/util/digest/city.h index 95ea515d74c..2f5d6ffa888 100644 --- a/util/digest/city.h +++ b/src/util/digest/city.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/util/digest/city_ut.cpp b/src/util/digest/city_ut.cpp similarity index 86% rename from util/digest/city_ut.cpp rename to src/util/digest/city_ut.cpp index 36ee94b508b..fce4b82c836 100644 --- a/util/digest/city_ut.cpp +++ b/src/util/digest/city_ut.cpp @@ -1,6 +1,6 @@ #include "city.h" -#include +#include Y_UNIT_TEST_SUITE(TCityTest) { Y_UNIT_TEST(TestTemplatesCompiling) { diff --git a/util/digest/fnv.cpp b/src/util/digest/fnv.cpp similarity index 100% rename from util/digest/fnv.cpp rename to src/util/digest/fnv.cpp diff --git a/util/digest/fnv.h b/src/util/digest/fnv.h similarity index 98% rename from util/digest/fnv.h rename to src/util/digest/fnv.h index 87b41a3de7e..7eb545e3a19 100644 --- a/util/digest/fnv.h +++ b/src/util/digest/fnv.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #define FNV32INIT 2166136261U #define FNV32PRIME 16777619U diff --git a/util/digest/fnv_ut.cpp b/src/util/digest/fnv_ut.cpp similarity index 93% rename from util/digest/fnv_ut.cpp rename to src/util/digest/fnv_ut.cpp index 3dec86f397d..126fde2092f 100644 --- a/util/digest/fnv_ut.cpp +++ b/src/util/digest/fnv_ut.cpp @@ -1,6 +1,6 @@ #include "fnv.h" -#include +#include Y_UNIT_TEST_SUITE(TFnvTest) { Y_UNIT_TEST(TestFnv32) { diff --git a/util/digest/multi.cpp b/src/util/digest/multi.cpp similarity index 100% rename from util/digest/multi.cpp rename to src/util/digest/multi.cpp diff --git a/util/digest/multi.h b/src/util/digest/multi.h similarity index 91% rename from util/digest/multi.h rename to src/util/digest/multi.h index 8e73fbbbe98..9ff57f72dae 100644 --- a/util/digest/multi.h +++ b/src/util/digest/multi.h @@ -1,7 +1,7 @@ #pragma once #include "numeric.h" -#include +#include template constexpr size_t MultiHash(const TOne& one) noexcept { diff --git a/src/util/digest/multi.pxd b/src/util/digest/multi.pxd new file mode 100644 index 00000000000..ab064933515 --- /dev/null +++ b/src/util/digest/multi.pxd @@ -0,0 +1,2 @@ +cdef extern from "" nogil: + size_t MultiHash(...); diff --git a/util/digest/multi_ut.cpp b/src/util/digest/multi_ut.cpp similarity index 93% rename from util/digest/multi_ut.cpp rename to src/util/digest/multi_ut.cpp index b56d30c97bd..29ef04b43a9 100644 --- a/util/digest/multi_ut.cpp +++ b/src/util/digest/multi_ut.cpp @@ -1,8 +1,8 @@ #include "multi.h" -#include +#include -#include +#include class TMultiHashTest: public TTestBase { UNIT_TEST_SUITE(TMultiHashTest); diff --git a/util/digest/multi_ut.pyx b/src/util/digest/multi_ut.pyx similarity index 100% rename from util/digest/multi_ut.pyx rename to src/util/digest/multi_ut.pyx diff --git a/util/digest/murmur.cpp b/src/util/digest/murmur.cpp similarity index 98% rename from util/digest/murmur.cpp rename to src/util/digest/murmur.cpp index ebaad592203..f73936005ea 100644 --- a/util/digest/murmur.cpp +++ b/src/util/digest/murmur.cpp @@ -1,6 +1,6 @@ #include "murmur.h" -#include +#include namespace NMurmurPrivate { //----------------------------------------------------------------------------- diff --git a/util/digest/murmur.h b/src/util/digest/murmur.h similarity index 97% rename from util/digest/murmur.h rename to src/util/digest/murmur.h index ddd2f3cc4f7..105068edc38 100644 --- a/util/digest/murmur.h +++ b/src/util/digest/murmur.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include /* diff --git a/util/digest/murmur_ut.cpp b/src/util/digest/murmur_ut.cpp similarity index 97% rename from util/digest/murmur_ut.cpp rename to src/util/digest/murmur_ut.cpp index a3204f01302..2eb37412869 100644 --- a/util/digest/murmur_ut.cpp +++ b/src/util/digest/murmur_ut.cpp @@ -1,7 +1,7 @@ #include "murmur.h" -#include +#include class TMurmurHashTest: public TTestBase { UNIT_TEST_SUITE(TMurmurHashTest); diff --git a/util/digest/numeric.cpp b/src/util/digest/numeric.cpp similarity index 100% rename from util/digest/numeric.cpp rename to src/util/digest/numeric.cpp diff --git a/util/digest/numeric.h b/src/util/digest/numeric.h similarity index 95% rename from util/digest/numeric.h rename to src/util/digest/numeric.h index e20bd908e4c..b9892add403 100644 --- a/util/digest/numeric.h +++ b/src/util/digest/numeric.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include /* * original url (now dead): http://www.cris.com/~Ttwang/tech/inthash.htm diff --git a/util/digest/sequence.cpp b/src/util/digest/sequence.cpp similarity index 100% rename from util/digest/sequence.cpp rename to src/util/digest/sequence.cpp diff --git a/util/digest/sequence.h b/src/util/digest/sequence.h similarity index 97% rename from util/digest/sequence.h rename to src/util/digest/sequence.h index 308320904b1..4e27526a01d 100644 --- a/util/digest/sequence.h +++ b/src/util/digest/sequence.h @@ -1,7 +1,7 @@ #pragma once #include "numeric.h" -#include +#include #include diff --git a/util/digest/sequence_ut.cpp b/src/util/digest/sequence_ut.cpp similarity index 95% rename from util/digest/sequence_ut.cpp rename to src/util/digest/sequence_ut.cpp index 9f840b7ec88..1e89356dab3 100644 --- a/util/digest/sequence_ut.cpp +++ b/src/util/digest/sequence_ut.cpp @@ -1,7 +1,7 @@ #include "sequence.h" -#include -#include +#include +#include class TRangeHashTest: public TTestBase { UNIT_TEST_SUITE(TRangeHashTest); diff --git a/util/digest/ut/ya.make b/src/util/digest/ut/ya.make similarity index 76% rename from util/digest/ut/ya.make rename to src/util/digest/ut/ya.make index b6e56efeec4..f23b2f21de2 100644 --- a/util/digest/ut/ya.make +++ b/src/util/digest/ut/ya.make @@ -10,6 +10,6 @@ SRCS( digest/sequence_ut.cpp ) -INCLUDE(${ARCADIA_ROOT}/util/tests/ya_util_tests.inc) +INCLUDE(${ARCADIA_ROOT}/src/util/tests/ya_util_tests.inc) END() diff --git a/util/digest/ut_cython/test_digest.py b/src/util/digest/ut_cython/test_digest.py similarity index 100% rename from util/digest/ut_cython/test_digest.py rename to src/util/digest/ut_cython/test_digest.py diff --git a/util/digest/ut_cython/ya.make b/src/util/digest/ut_cython/ya.make similarity index 85% rename from util/digest/ut_cython/ya.make rename to src/util/digest/ut_cython/ya.make index 7a17a589cfa..6f3fc9c6c18 100644 --- a/util/digest/ut_cython/ya.make +++ b/src/util/digest/ut_cython/ya.make @@ -2,7 +2,7 @@ PY23_TEST() SUBSCRIBER(g:util-subscribers) -SRCDIR(util/digest) +SRCDIR(src/util/digest) PY_SRCS( NAMESPACE util.digest diff --git a/util/folder/dirent_win.c b/src/util/folder/dirent_win.c similarity index 98% rename from util/folder/dirent_win.c rename to src/util/folder/dirent_win.c index 7e6db74ce53..1a5b340f54e 100644 --- a/util/folder/dirent_win.c +++ b/src/util/folder/dirent_win.c @@ -1,4 +1,4 @@ -#include +#include #ifdef _win_ diff --git a/util/folder/dirent_win.h b/src/util/folder/dirent_win.h similarity index 93% rename from util/folder/dirent_win.h rename to src/util/folder/dirent_win.h index ac11a64c047..6eba63a9227 100644 --- a/util/folder/dirent_win.h +++ b/src/util/folder/dirent_win.h @@ -1,10 +1,10 @@ #pragma once -#include +#include #ifdef _win_ - #include + #include #ifdef __cplusplus extern "C" { diff --git a/util/folder/dirut.cpp b/src/util/folder/dirut.cpp similarity index 98% rename from util/folder/dirut.cpp rename to src/util/folder/dirut.cpp index e35b4fcaaeb..d2e71f6d794 100644 --- a/util/folder/dirut.cpp +++ b/src/util/folder/dirut.cpp @@ -5,11 +5,11 @@ #include "pathsplit.h" #include "path.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace NStringPrivate { template diff --git a/util/folder/dirut.h b/src/util/folder/dirut.h similarity index 93% rename from util/folder/dirut.h rename to src/util/folder/dirut.h index d1649d83e3d..bfc276105b3 100644 --- a/util/folder/dirut.h +++ b/src/util/folder/dirut.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -11,7 +11,7 @@ #include #ifdef _win32_ - #include + #include #include #include #include diff --git a/util/folder/dirut_ut.cpp b/src/util/folder/dirut_ut.cpp similarity index 97% rename from util/folder/dirut_ut.cpp rename to src/util/folder/dirut_ut.cpp index a133d9f9a65..47d1d7a0c09 100644 --- a/util/folder/dirut_ut.cpp +++ b/src/util/folder/dirut_ut.cpp @@ -1,10 +1,10 @@ #include "dirut.h" #include "tempdir.h" -#include +#include -#include -#include +#include +#include Y_UNIT_TEST_SUITE(TDirutTest) { Y_UNIT_TEST(TestRealPath) { diff --git a/util/folder/filelist.cpp b/src/util/folder/filelist.cpp similarity index 96% rename from util/folder/filelist.cpp rename to src/util/folder/filelist.cpp index c2713137298..199d1487208 100644 --- a/util/folder/filelist.cpp +++ b/src/util/folder/filelist.cpp @@ -2,7 +2,7 @@ #include "filelist.h" #include "iterator.h" -#include +#include void TFileEntitiesList::Fill(const std::string& dirname, std::string_view prefix, std::string_view suffix, int depth, bool sort) { TDirIterator::TOptions opts; diff --git a/util/folder/filelist.h b/src/util/folder/filelist.h similarity index 95% rename from util/folder/filelist.h rename to src/util/folder/filelist.h index cf3210b9b6c..28c3d9d4e5d 100644 --- a/util/folder/filelist.h +++ b/src/util/folder/filelist.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/util/folder/filelist_ut.cpp b/src/util/folder/filelist_ut.cpp similarity index 95% rename from util/folder/filelist_ut.cpp rename to src/util/folder/filelist_ut.cpp index 8fa3e9c8f3c..bacff7a92a1 100644 --- a/util/folder/filelist_ut.cpp +++ b/src/util/folder/filelist_ut.cpp @@ -2,9 +2,9 @@ #include "filelist.h" #include "tempdir.h" -#include +#include -#include +#include class TFileListTest: public TTestBase { UNIT_TEST_SUITE(TFileListTest); diff --git a/util/folder/fts.cpp b/src/util/folder/fts.cpp similarity index 99% rename from util/folder/fts.cpp rename to src/util/folder/fts.cpp index b2e75c8eca3..4f22a26051e 100644 --- a/util/folder/fts.cpp +++ b/src/util/folder/fts.cpp @@ -33,11 +33,11 @@ * $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $ */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #ifndef _win_ diff --git a/util/folder/fts.h b/src/util/folder/fts.h similarity index 98% rename from util/folder/fts.h rename to src/util/folder/fts.h index f3c799e8c88..72c56eee4a4 100644 --- a/util/folder/fts.h +++ b/src/util/folder/fts.h @@ -2,14 +2,14 @@ #include -#include +#include #ifndef _win32_ typedef int dird; typedef struct stat stat_struct; #define STAT_FUNC stat #else - #include + #include typedef WCHAR* dird; typedef unsigned short u_short; typedef unsigned int nlink_t; diff --git a/util/folder/fts_ut.cpp b/src/util/folder/fts_ut.cpp similarity index 96% rename from util/folder/fts_ut.cpp rename to src/util/folder/fts_ut.cpp index b6514bfd86a..a98b852a9f0 100644 --- a/util/folder/fts_ut.cpp +++ b/src/util/folder/fts_ut.cpp @@ -2,11 +2,11 @@ #include "dirut.h" #include "tempdir.h" -#include -#include +#include +#include -#include -#include +#include +#include class TFtsTest: public TTestBase { UNIT_TEST_SUITE(TFtsTest); diff --git a/util/folder/fwd.cpp b/src/util/folder/fwd.cpp similarity index 100% rename from util/folder/fwd.cpp rename to src/util/folder/fwd.cpp diff --git a/util/folder/fwd.h b/src/util/folder/fwd.h similarity index 100% rename from util/folder/fwd.h rename to src/util/folder/fwd.h diff --git a/util/folder/iterator.cpp b/src/util/folder/iterator.cpp similarity index 100% rename from util/folder/iterator.cpp rename to src/util/folder/iterator.cpp diff --git a/util/folder/iterator.h b/src/util/folder/iterator.h similarity index 92% rename from util/folder/iterator.h rename to src/util/folder/iterator.h index 8ee690eb016..8f67e0f3a67 100644 --- a/util/folder/iterator.h +++ b/src/util/folder/iterator.h @@ -2,11 +2,11 @@ #include "fts.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/util/folder/iterator_ut.cpp b/src/util/folder/iterator_ut.cpp similarity index 96% rename from util/folder/iterator_ut.cpp rename to src/util/folder/iterator_ut.cpp index 3d3d288f27a..150f16a2fed 100644 --- a/util/folder/iterator_ut.cpp +++ b/src/util/folder/iterator_ut.cpp @@ -1,13 +1,13 @@ #include "dirut.h" #include "iterator.h" -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static std::string JoinWithNewline(const std::vector& strings) { TStringStream ss; diff --git a/util/folder/lstat_win.c b/src/util/folder/lstat_win.c similarity index 92% rename from util/folder/lstat_win.c rename to src/util/folder/lstat_win.c index cf94cec01ae..289bbda07b3 100644 --- a/util/folder/lstat_win.c +++ b/src/util/folder/lstat_win.c @@ -1,7 +1,7 @@ -#include +#include #ifdef _win_ - #include + #include #include "lstat_win.h" int lstat(const char* fileName, stat_struct* fileStat) { diff --git a/util/folder/lstat_win.h b/src/util/folder/lstat_win.h similarity index 87% rename from util/folder/lstat_win.h rename to src/util/folder/lstat_win.h index 0bf7c19055b..eaa67c28cbe 100644 --- a/util/folder/lstat_win.h +++ b/src/util/folder/lstat_win.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "fts.h" #ifdef _win_ diff --git a/util/folder/path.cpp b/src/util/folder/path.cpp similarity index 97% rename from util/folder/path.cpp rename to src/util/folder/path.cpp index b4fa69d3771..a996eb4d391 100644 --- a/util/folder/path.cpp +++ b/src/util/folder/path.cpp @@ -2,12 +2,12 @@ #include "path.h" #include "pathsplit.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include struct TFsPath::TSplit: public TAtomicRefCount, public TPathSplit { inline TSplit(const std::string_view path) @@ -353,7 +353,7 @@ void TFsPath::Touch() const { } } -// XXX: move implementation to util/somewhere. +// XXX: move implementation to src/util/somewhere. TFsPath TFsPath::RealPath() const { CheckDefined(); return ::RealPath(*this); diff --git a/util/folder/path.h b/src/util/folder/path.h similarity index 96% rename from util/folder/path.h rename to src/util/folder/path.h index ec2e40f3c62..981feb66732 100644 --- a/util/folder/path.h +++ b/src/util/folder/path.h @@ -3,12 +3,12 @@ #include "fwd.h" #include "pathsplit.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/util/folder/path.pxd b/src/util/folder/path.pxd similarity index 98% rename from util/folder/path.pxd rename to src/util/folder/path.pxd index e7dfba6a8f4..6e048430314 100644 --- a/util/folder/path.pxd +++ b/src/util/folder/path.pxd @@ -3,7 +3,7 @@ from util.generic.vector cimport TVector # NOTE (danila-eremin) Currently not possible to use `const` and `except +` at the same time, so some function not marked const -cdef extern from "util/folder/path.h" nogil: +cdef extern from "src/util/folder/path.h" nogil: cdef cppclass TFsPath: TFsPath() except + TFsPath(const std::string&) except + diff --git a/util/folder/path_ut.cpp b/src/util/folder/path_ut.cpp similarity index 99% rename from util/folder/path_ut.cpp rename to src/util/folder/path_ut.cpp index 3a24c11c67f..36a6d48e3e2 100644 --- a/util/folder/path_ut.cpp +++ b/src/util/folder/path_ut.cpp @@ -3,14 +3,14 @@ #include "dirut.h" #include "tempdir.h" -#include - -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include #include diff --git a/util/folder/path_ut.pyx b/src/util/folder/path_ut.pyx similarity index 100% rename from util/folder/path_ut.pyx rename to src/util/folder/path_ut.pyx diff --git a/util/folder/pathsplit.cpp b/src/util/folder/pathsplit.cpp similarity index 96% rename from util/folder/pathsplit.cpp rename to src/util/folder/pathsplit.cpp index f6f06e48744..e7c216dbbaa 100644 --- a/util/folder/pathsplit.cpp +++ b/src/util/folder/pathsplit.cpp @@ -1,9 +1,9 @@ #include "pathsplit.h" -#include +#include -#include -#include +#include +#include template static inline size_t ToReserve(const T& t) { diff --git a/util/folder/pathsplit.h b/src/util/folder/pathsplit.h similarity index 98% rename from util/folder/pathsplit.h rename to src/util/folder/pathsplit.h index d24940dc0d4..d282cde5504 100644 --- a/util/folder/pathsplit.h +++ b/src/util/folder/pathsplit.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/util/folder/pathsplit_ut.cpp b/src/util/folder/pathsplit_ut.cpp similarity index 98% rename from util/folder/pathsplit_ut.cpp rename to src/util/folder/pathsplit_ut.cpp index 1310ba15d08..d7c912f0718 100644 --- a/util/folder/pathsplit_ut.cpp +++ b/src/util/folder/pathsplit_ut.cpp @@ -5,7 +5,7 @@ #include "pathsplit.h" - #include + #include #define VAR(NAME) Y_CAT(NAME, __LINE__) @@ -20,7 +20,7 @@ #define PSUF(NAME) NAME #define PSUF_LOCAL(NAME) NAME##Local - #include + #include #undef PSUF #undef PSUF_LOCAL @@ -30,7 +30,7 @@ #undef _win_ #define REVERT_WIN #endif - #include + #include #ifdef REVERT_WIN #define _win_ #undef REVERT_WIN @@ -44,7 +44,7 @@ #define _win_ #define REVERT_WIN #endif - #include + #include #ifdef REVERT_WIN #undef _win_ #undef REVERT_WIN diff --git a/util/folder/tempdir.cpp b/src/util/folder/tempdir.cpp similarity index 92% rename from util/folder/tempdir.cpp rename to src/util/folder/tempdir.cpp index 399e70ebe5e..a2b5789d814 100644 --- a/util/folder/tempdir.cpp +++ b/src/util/folder/tempdir.cpp @@ -2,8 +2,8 @@ #include "dirut.h" -#include -#include +#include +#include TTempDir::TTempDir() : TTempDir(nullptr, TCreationToken{}) diff --git a/util/folder/tempdir.h b/src/util/folder/tempdir.h similarity index 100% rename from util/folder/tempdir.h rename to src/util/folder/tempdir.h diff --git a/util/folder/ut/ya.make b/src/util/folder/ut/ya.make similarity index 71% rename from util/folder/ut/ya.make rename to src/util/folder/ut/ya.make index 2ffaa8a2ec2..93667639b90 100644 --- a/util/folder/ut/ya.make +++ b/src/util/folder/ut/ya.make @@ -12,9 +12,9 @@ SRCS( ) PEERDIR( - library/cpp/threading/future + src/library/threading/future ) -INCLUDE(${ARCADIA_ROOT}/util/tests/ya_util_tests.inc) +INCLUDE(${ARCADIA_ROOT}/src/util/tests/ya_util_tests.inc) END() diff --git a/util/folder/ut_cython/test_folder.py b/src/util/folder/ut_cython/test_folder.py similarity index 100% rename from util/folder/ut_cython/test_folder.py rename to src/util/folder/ut_cython/test_folder.py diff --git a/util/folder/ut_cython/ya.make b/src/util/folder/ut_cython/ya.make similarity index 85% rename from util/folder/ut_cython/ya.make rename to src/util/folder/ut_cython/ya.make index 5cc8534a585..1e52780901c 100644 --- a/util/folder/ut_cython/ya.make +++ b/src/util/folder/ut_cython/ya.make @@ -2,7 +2,7 @@ PY23_TEST() SUBSCRIBER(g:util-subscribers) -SRCDIR(util/folder) +SRCDIR(src/util/folder) PY_SRCS( NAMESPACE util.folder diff --git a/util/generic/adaptor.cpp b/src/util/generic/adaptor.cpp similarity index 100% rename from util/generic/adaptor.cpp rename to src/util/generic/adaptor.cpp diff --git a/util/generic/adaptor.h b/src/util/generic/adaptor.h similarity index 100% rename from util/generic/adaptor.h rename to src/util/generic/adaptor.h diff --git a/util/generic/adaptor_ut.cpp b/src/util/generic/adaptor_ut.cpp similarity index 98% rename from util/generic/adaptor_ut.cpp rename to src/util/generic/adaptor_ut.cpp index dd29173427f..2a013e974d6 100644 --- a/util/generic/adaptor_ut.cpp +++ b/src/util/generic/adaptor_ut.cpp @@ -1,7 +1,7 @@ #include "adaptor.h" #include "yexception.h" -#include +#include struct TOnCopy: yexception { }; diff --git a/util/generic/algorithm.cpp b/src/util/generic/algorithm.cpp similarity index 100% rename from util/generic/algorithm.cpp rename to src/util/generic/algorithm.cpp diff --git a/util/generic/algorithm.h b/src/util/generic/algorithm.h similarity index 99% rename from util/generic/algorithm.h rename to src/util/generic/algorithm.h index 70efc506092..9a48ad91411 100644 --- a/util/generic/algorithm.h +++ b/src/util/generic/algorithm.h @@ -3,8 +3,8 @@ #include "is_in.h" #include "utility.h" -#include -#include +#include +#include #include #include diff --git a/util/generic/algorithm_ut.cpp b/src/util/generic/algorithm_ut.cpp similarity index 99% rename from util/generic/algorithm_ut.cpp rename to src/util/generic/algorithm_ut.cpp index eee086731f5..15d6d4741c5 100644 --- a/util/generic/algorithm_ut.cpp +++ b/src/util/generic/algorithm_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #include "algorithm.h" #include "hash.h" diff --git a/util/generic/array_size.cpp b/src/util/generic/array_size.cpp similarity index 100% rename from util/generic/array_size.cpp rename to src/util/generic/array_size.cpp diff --git a/util/generic/array_size.h b/src/util/generic/array_size.h similarity index 100% rename from util/generic/array_size.h rename to src/util/generic/array_size.h diff --git a/util/generic/array_size_ut.cpp b/src/util/generic/array_size_ut.cpp similarity index 88% rename from util/generic/array_size_ut.cpp rename to src/util/generic/array_size_ut.cpp index 13f45903c51..6ff3a33f5c6 100644 --- a/util/generic/array_size_ut.cpp +++ b/src/util/generic/array_size_ut.cpp @@ -1,6 +1,6 @@ #include "array_size.h" -#include +#include Y_UNIT_TEST_SUITE(ArraySizeTest) { Y_UNIT_TEST(Test1) { diff --git a/util/generic/bitmap.cpp b/src/util/generic/bitmap.cpp similarity index 100% rename from util/generic/bitmap.cpp rename to src/util/generic/bitmap.cpp diff --git a/util/generic/bitmap.h b/src/util/generic/bitmap.h similarity index 99% rename from util/generic/bitmap.h rename to src/util/generic/bitmap.h index dfac88e4b8d..16600c0b20d 100644 --- a/util/generic/bitmap.h +++ b/src/util/generic/bitmap.h @@ -7,10 +7,10 @@ #include "algorithm.h" #include "utility.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace NBitMapPrivate { // Returns number of bits set; result is in most significatnt byte diff --git a/util/generic/bitmap_ut.cpp b/src/util/generic/bitmap_ut.cpp similarity index 99% rename from util/generic/bitmap_ut.cpp rename to src/util/generic/bitmap_ut.cpp index 087d34a8dcc..14947d766b4 100644 --- a/util/generic/bitmap_ut.cpp +++ b/src/util/generic/bitmap_ut.cpp @@ -1,6 +1,6 @@ #include "bitmap.h" -#include +#include #define INIT_BITMAP(bitmap, bits) \ for (size_t i = 0; i < sizeof(bits) / sizeof(size_t); ++i) { \ diff --git a/util/generic/bitops.cpp b/src/util/generic/bitops.cpp similarity index 100% rename from util/generic/bitops.cpp rename to src/util/generic/bitops.cpp diff --git a/util/generic/bitops.h b/src/util/generic/bitops.h similarity index 99% rename from util/generic/bitops.h rename to src/util/generic/bitops.h index 2db15fc59b6..3b2a9191d75 100644 --- a/util/generic/bitops.h +++ b/src/util/generic/bitops.h @@ -3,8 +3,8 @@ #include "ylimits.h" #include "typelist.h" -#include -#include +#include +#include #ifdef _MSC_VER #include diff --git a/util/generic/bitops_ut.cpp b/src/util/generic/bitops_ut.cpp similarity index 99% rename from util/generic/bitops_ut.cpp rename to src/util/generic/bitops_ut.cpp index 13925460d2c..3a02a0c43bf 100644 --- a/util/generic/bitops_ut.cpp +++ b/src/util/generic/bitops_ut.cpp @@ -1,8 +1,8 @@ #include "bitops.h" -#include +#include -#include +#include template static void TestCTZ() { diff --git a/util/generic/bt_exception.cpp b/src/util/generic/bt_exception.cpp similarity index 100% rename from util/generic/bt_exception.cpp rename to src/util/generic/bt_exception.cpp diff --git a/util/generic/bt_exception.h b/src/util/generic/bt_exception.h similarity index 90% rename from util/generic/bt_exception.h rename to src/util/generic/bt_exception.h index 018d2bc89a1..538015c958f 100644 --- a/util/generic/bt_exception.h +++ b/src/util/generic/bt_exception.h @@ -3,7 +3,7 @@ #include #include "yexception.h" -#include +#include template class TWithBackTrace: public T { diff --git a/util/generic/buffer.cpp b/src/util/generic/buffer.cpp similarity index 95% rename from util/generic/buffer.cpp rename to src/util/generic/buffer.cpp index d43460af52f..e15ffc3a402 100644 --- a/util/generic/buffer.cpp +++ b/src/util/generic/buffer.cpp @@ -3,8 +3,8 @@ #include "string.h" #include "ymath.h" -#include -#include +#include +#include TBuffer::TBuffer(size_t len) : Data_(nullptr) diff --git a/util/generic/buffer.h b/src/util/generic/buffer.h similarity index 97% rename from util/generic/buffer.h rename to src/util/generic/buffer.h index 2378724b0fe..4fe726ad0bd 100644 --- a/util/generic/buffer.h +++ b/src/util/generic/buffer.h @@ -2,10 +2,10 @@ #include "utility.h" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/util/generic/buffer_ut.cpp b/src/util/generic/buffer_ut.cpp similarity index 98% rename from util/generic/buffer_ut.cpp rename to src/util/generic/buffer_ut.cpp index dc02f48dee6..3631b4c6e40 100644 --- a/util/generic/buffer_ut.cpp +++ b/src/util/generic/buffer_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include #include "string.h" #include "vector.h" #include "buffer.h" diff --git a/util/generic/cast.cpp b/src/util/generic/cast.cpp similarity index 100% rename from util/generic/cast.cpp rename to src/util/generic/cast.cpp diff --git a/util/generic/cast.h b/src/util/generic/cast.h similarity index 97% rename from util/generic/cast.h rename to src/util/generic/cast.h index f827bde5cb4..d5b5a0075da 100644 --- a/util/generic/cast.h +++ b/src/util/generic/cast.h @@ -3,10 +3,10 @@ #include "typetraits.h" #include "yexception.h" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/util/generic/cast_ut.cpp b/src/util/generic/cast_ut.cpp similarity index 98% rename from util/generic/cast_ut.cpp rename to src/util/generic/cast_ut.cpp index 718a8de79de..6a50cb4a2e8 100644 --- a/util/generic/cast_ut.cpp +++ b/src/util/generic/cast_ut.cpp @@ -1,6 +1,6 @@ #include "cast.h" -#include +#include class TGenericCastsTest: public TTestBase { UNIT_TEST_SUITE(TGenericCastsTest); diff --git a/util/generic/explicit_type.cpp b/src/util/generic/explicit_type.cpp similarity index 100% rename from util/generic/explicit_type.cpp rename to src/util/generic/explicit_type.cpp diff --git a/util/generic/explicit_type.h b/src/util/generic/explicit_type.h similarity index 100% rename from util/generic/explicit_type.h rename to src/util/generic/explicit_type.h diff --git a/util/generic/explicit_type_ut.cpp b/src/util/generic/explicit_type_ut.cpp similarity index 97% rename from util/generic/explicit_type_ut.cpp rename to src/util/generic/explicit_type_ut.cpp index 50a745f090e..0898dcfad95 100644 --- a/util/generic/explicit_type_ut.cpp +++ b/src/util/generic/explicit_type_ut.cpp @@ -1,6 +1,6 @@ #include "explicit_type.h" -#include +#include struct TCallableBase { public: diff --git a/util/generic/fastqueue.cpp b/src/util/generic/fastqueue.cpp similarity index 100% rename from util/generic/fastqueue.cpp rename to src/util/generic/fastqueue.cpp diff --git a/util/generic/fastqueue.h b/src/util/generic/fastqueue.h similarity index 96% rename from util/generic/fastqueue.h rename to src/util/generic/fastqueue.h index 1fee5b86f6e..76d598a418e 100644 --- a/util/generic/fastqueue.h +++ b/src/util/generic/fastqueue.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "ptr.h" template diff --git a/util/generic/flags.cpp b/src/util/generic/flags.cpp similarity index 91% rename from util/generic/flags.cpp rename to src/util/generic/flags.cpp index ced510d4fb7..ae923eb33c2 100644 --- a/util/generic/flags.cpp +++ b/src/util/generic/flags.cpp @@ -1,7 +1,7 @@ #include "flags.h" -#include -#include +#include +#include void ::NPrivate::PrintFlags(IOutputStream& stream, ui64 value, size_t size) { /* Note that this function is in cpp because we need to break circular diff --git a/util/generic/flags.h b/src/util/generic/flags.h similarity index 98% rename from util/generic/flags.h rename to src/util/generic/flags.h index 80e2f17b7fb..5ffca27871f 100644 --- a/util/generic/flags.h +++ b/src/util/generic/flags.h @@ -2,9 +2,9 @@ #include -#include -#include -#include +#include +#include +#include class IOutputStream; namespace NPrivate { diff --git a/util/generic/flags_ut.cpp b/src/util/generic/flags_ut.cpp similarity index 98% rename from util/generic/flags_ut.cpp rename to src/util/generic/flags_ut.cpp index fa2d4464c94..eb249ab3fa2 100644 --- a/util/generic/flags_ut.cpp +++ b/src/util/generic/flags_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #include "flags.h" diff --git a/util/generic/function.cpp b/src/util/generic/function.cpp similarity index 100% rename from util/generic/function.cpp rename to src/util/generic/function.cpp diff --git a/util/generic/function.h b/src/util/generic/function.h similarity index 100% rename from util/generic/function.h rename to src/util/generic/function.h diff --git a/util/generic/function_ref.cpp b/src/util/generic/function_ref.cpp similarity index 100% rename from util/generic/function_ref.cpp rename to src/util/generic/function_ref.cpp diff --git a/util/generic/function_ref.h b/src/util/generic/function_ref.h similarity index 98% rename from util/generic/function_ref.h rename to src/util/generic/function_ref.h index 814f0745bfd..f20307c023f 100644 --- a/util/generic/function_ref.h +++ b/src/util/generic/function_ref.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/util/generic/function_ref_ut.cpp b/src/util/generic/function_ref_ut.cpp similarity index 98% rename from util/generic/function_ref_ut.cpp rename to src/util/generic/function_ref_ut.cpp index ac1a34975c2..41155742e1e 100644 --- a/util/generic/function_ref_ut.cpp +++ b/src/util/generic/function_ref_ut.cpp @@ -1,6 +1,6 @@ #include "function_ref.h" -#include +#include Y_UNIT_TEST_SUITE(TestFunctionRef) { template diff --git a/util/generic/function_ut.cpp b/src/util/generic/function_ut.cpp similarity index 98% rename from util/generic/function_ut.cpp rename to src/util/generic/function_ut.cpp index f46188aa2a2..97eb5072808 100644 --- a/util/generic/function_ut.cpp +++ b/src/util/generic/function_ut.cpp @@ -1,7 +1,7 @@ #include "function.h" #include "typetraits.h" -#include +#include Y_UNIT_TEST_SUITE(TestFunctionSignature) { int FF(double x) { diff --git a/util/generic/fwd.cpp b/src/util/generic/fwd.cpp similarity index 100% rename from util/generic/fwd.cpp rename to src/util/generic/fwd.cpp diff --git a/util/generic/fwd.h b/src/util/generic/fwd.h similarity index 98% rename from util/generic/fwd.h rename to src/util/generic/fwd.h index ce42463681f..4f548b42f89 100644 --- a/util/generic/fwd.h +++ b/src/util/generic/fwd.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/util/generic/guid.cpp b/src/util/generic/guid.cpp similarity index 96% rename from util/generic/guid.cpp rename to src/util/generic/guid.cpp index 08d820f58bd..90876d02027 100644 --- a/util/generic/guid.cpp +++ b/src/util/generic/guid.cpp @@ -2,11 +2,11 @@ #include "ylimits.h" #include "string.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace { inline void LowerCaseHex(std::string& s) { diff --git a/util/generic/guid.h b/src/util/generic/guid.h similarity index 98% rename from util/generic/guid.h rename to src/util/generic/guid.h index 0bb2b332ccf..269b326a2f9 100644 --- a/util/generic/guid.h +++ b/src/util/generic/guid.h @@ -2,7 +2,7 @@ #include "fwd.h" -#include +#include /** * UUID generation diff --git a/util/generic/guid_ut.cpp b/src/util/generic/guid_ut.cpp similarity index 98% rename from util/generic/guid_ut.cpp rename to src/util/generic/guid_ut.cpp index fc0ccac6428..7bde4be302b 100644 --- a/util/generic/guid_ut.cpp +++ b/src/util/generic/guid_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #include "guid.h" diff --git a/util/generic/hash.cpp b/src/util/generic/hash.cpp similarity index 100% rename from util/generic/hash.cpp rename to src/util/generic/hash.cpp diff --git a/util/generic/hash.h b/src/util/generic/hash.h similarity index 100% rename from util/generic/hash.h rename to src/util/generic/hash.h diff --git a/util/generic/hash.pxd b/src/util/generic/hash.pxd similarity index 97% rename from util/generic/hash.pxd rename to src/util/generic/hash.pxd index 385c10d805f..85065bbf523 100644 --- a/util/generic/hash.pxd +++ b/src/util/generic/hash.pxd @@ -1,6 +1,6 @@ from libcpp.pair cimport pair -cdef extern from "util/generic/hash.h" nogil: +cdef extern from "src/util/generic/hash.h" nogil: cdef cppclass THashMap[T, U]: cppclass iterator: pair[T, U]& operator*() diff --git a/util/generic/hash_multi_map.cpp b/src/util/generic/hash_multi_map.cpp similarity index 100% rename from util/generic/hash_multi_map.cpp rename to src/util/generic/hash_multi_map.cpp diff --git a/util/generic/hash_multi_map.h b/src/util/generic/hash_multi_map.h similarity index 100% rename from util/generic/hash_multi_map.h rename to src/util/generic/hash_multi_map.h diff --git a/util/generic/hash_primes.cpp b/src/util/generic/hash_primes.cpp similarity index 100% rename from util/generic/hash_primes.cpp rename to src/util/generic/hash_primes.cpp diff --git a/util/generic/hash_primes.h b/src/util/generic/hash_primes.h similarity index 98% rename from util/generic/hash_primes.h rename to src/util/generic/hash_primes.h index 4dc2da0b8f0..2963abf7fbc 100644 --- a/util/generic/hash_primes.h +++ b/src/util/generic/hash_primes.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #if defined(_MSC_VER) && defined(_M_X64) #include diff --git a/util/generic/hash_primes_ut.cpp b/src/util/generic/hash_primes_ut.cpp similarity index 93% rename from util/generic/hash_primes_ut.cpp rename to src/util/generic/hash_primes_ut.cpp index 0fef409cb5d..bbd85c7553f 100644 --- a/util/generic/hash_primes_ut.cpp +++ b/src/util/generic/hash_primes_ut.cpp @@ -1,10 +1,10 @@ #include "hash_primes.h" -#include +#include -#include -#include -#include +#include +#include +#include Y_UNIT_TEST_SUITE(TestHashPrimes) { Y_UNIT_TEST(Test1) { diff --git a/util/generic/hash_table.cpp b/src/util/generic/hash_table.cpp similarity index 94% rename from util/generic/hash_table.cpp rename to src/util/generic/hash_table.cpp index 2b27972d7c9..0aa2589200c 100644 --- a/util/generic/hash_table.cpp +++ b/src/util/generic/hash_table.cpp @@ -1,7 +1,7 @@ #include "hash_table.h" -#include -#include +#include +#include const void* const _yhashtable_empty_data[] = {(void*)3, nullptr, (void*)1}; diff --git a/util/generic/hash_table.h b/src/util/generic/hash_table.h similarity index 99% rename from util/generic/hash_table.h rename to src/util/generic/hash_table.h index abfe0f229e4..86a566b9b28 100644 --- a/util/generic/hash_table.h +++ b/src/util/generic/hash_table.h @@ -3,11 +3,11 @@ #include "fwd.h" #include "mapfindptr.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "yexception.h" #include "typetraits.h" #include "utility.h" diff --git a/util/generic/hash_ut.cpp b/src/util/generic/hash_ut.cpp similarity index 99% rename from util/generic/hash_ut.cpp rename to src/util/generic/hash_ut.cpp index a89c8b409f0..cf64e54180e 100644 --- a/util/generic/hash_ut.cpp +++ b/src/util/generic/hash_ut.cpp @@ -2,12 +2,12 @@ #include "hash_multi_map.h" #include "vector.h" -#include -#include +#include +#include #include -#include -#include +#include +#include static const char star = 42; diff --git a/util/generic/hash_ut.pyx b/src/util/generic/hash_ut.pyx similarity index 100% rename from util/generic/hash_ut.pyx rename to src/util/generic/hash_ut.pyx diff --git a/util/generic/hide_ptr.cpp b/src/util/generic/hide_ptr.cpp similarity index 100% rename from util/generic/hide_ptr.cpp rename to src/util/generic/hide_ptr.cpp diff --git a/util/generic/hide_ptr.h b/src/util/generic/hide_ptr.h similarity index 100% rename from util/generic/hide_ptr.h rename to src/util/generic/hide_ptr.h diff --git a/util/generic/intrlist.cpp b/src/util/generic/intrlist.cpp similarity index 100% rename from util/generic/intrlist.cpp rename to src/util/generic/intrlist.cpp diff --git a/util/generic/intrlist.h b/src/util/generic/intrlist.h similarity index 99% rename from util/generic/intrlist.h rename to src/util/generic/intrlist.h index b5d3f2051b5..46ea944e024 100644 --- a/util/generic/intrlist.h +++ b/src/util/generic/intrlist.h @@ -2,7 +2,7 @@ #include "utility.h" -#include +#include #include struct TIntrusiveListDefaultTag {}; diff --git a/util/generic/intrlist_ut.cpp b/src/util/generic/intrlist_ut.cpp similarity index 99% rename from util/generic/intrlist_ut.cpp rename to src/util/generic/intrlist_ut.cpp index eff7cdf2eee..84f0bca4afe 100644 --- a/util/generic/intrlist_ut.cpp +++ b/src/util/generic/intrlist_ut.cpp @@ -1,8 +1,8 @@ #include "intrlist.h" -#include +#include -#include +#include class TListTest: public TTestBase { UNIT_TEST_SUITE(TListTest); diff --git a/util/generic/is_in.cpp b/src/util/generic/is_in.cpp similarity index 100% rename from util/generic/is_in.cpp rename to src/util/generic/is_in.cpp diff --git a/util/generic/is_in.h b/src/util/generic/is_in.h similarity index 100% rename from util/generic/is_in.h rename to src/util/generic/is_in.h diff --git a/util/generic/is_in_ut.cpp b/src/util/generic/is_in_ut.cpp similarity index 98% rename from util/generic/is_in_ut.cpp rename to src/util/generic/is_in_ut.cpp index 0b71872d218..0e08e768cb5 100644 --- a/util/generic/is_in_ut.cpp +++ b/src/util/generic/is_in_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #include "algorithm.h" #include "hash.h" diff --git a/util/generic/iterator.cpp b/src/util/generic/iterator.cpp similarity index 100% rename from util/generic/iterator.cpp rename to src/util/generic/iterator.cpp diff --git a/util/generic/iterator.h b/src/util/generic/iterator.h similarity index 100% rename from util/generic/iterator.h rename to src/util/generic/iterator.h diff --git a/util/generic/iterator_range.cpp b/src/util/generic/iterator_range.cpp similarity index 100% rename from util/generic/iterator_range.cpp rename to src/util/generic/iterator_range.cpp diff --git a/util/generic/iterator_range.h b/src/util/generic/iterator_range.h similarity index 98% rename from util/generic/iterator_range.h rename to src/util/generic/iterator_range.h index 9f4d02da295..19e9a2add7f 100644 --- a/util/generic/iterator_range.h +++ b/src/util/generic/iterator_range.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/util/generic/iterator_range_ut.cpp b/src/util/generic/iterator_range_ut.cpp similarity index 95% rename from util/generic/iterator_range_ut.cpp rename to src/util/generic/iterator_range_ut.cpp index b032962fbe9..b42878ea82b 100644 --- a/util/generic/iterator_range_ut.cpp +++ b/src/util/generic/iterator_range_ut.cpp @@ -1,8 +1,8 @@ #include "iterator_range.h" -#include -#include -#include +#include +#include +#include Y_UNIT_TEST_SUITE(IteratorRange) { Y_UNIT_TEST(DefaultConstructor) { diff --git a/util/generic/iterator_ut.cpp b/src/util/generic/iterator_ut.cpp similarity index 97% rename from util/generic/iterator_ut.cpp rename to src/util/generic/iterator_ut.cpp index 9bdc2ba3a54..8fdd2283b1f 100644 --- a/util/generic/iterator_ut.cpp +++ b/src/util/generic/iterator_ut.cpp @@ -1,6 +1,6 @@ #include "iterator.h" -#include +#include Y_UNIT_TEST_SUITE(TIterator) { Y_UNIT_TEST(ToForwardIteratorTest) { diff --git a/util/generic/join.h b/src/util/generic/join.h similarity index 100% rename from util/generic/join.h rename to src/util/generic/join.h diff --git a/util/generic/lazy_value.cpp b/src/util/generic/lazy_value.cpp similarity index 100% rename from util/generic/lazy_value.cpp rename to src/util/generic/lazy_value.cpp diff --git a/util/generic/lazy_value.h b/src/util/generic/lazy_value.h similarity index 100% rename from util/generic/lazy_value.h rename to src/util/generic/lazy_value.h diff --git a/util/generic/lazy_value_ut.cpp b/src/util/generic/lazy_value_ut.cpp similarity index 98% rename from util/generic/lazy_value_ut.cpp rename to src/util/generic/lazy_value_ut.cpp index 73c58f35d2d..39eb6906a50 100644 --- a/util/generic/lazy_value_ut.cpp +++ b/src/util/generic/lazy_value_ut.cpp @@ -1,6 +1,6 @@ #include "lazy_value.h" -#include +#include Y_UNIT_TEST_SUITE(TLazyValueTestSuite) { Y_UNIT_TEST(TestLazyValue) { diff --git a/util/generic/mapfindptr.cpp b/src/util/generic/mapfindptr.cpp similarity index 100% rename from util/generic/mapfindptr.cpp rename to src/util/generic/mapfindptr.cpp diff --git a/util/generic/mapfindptr.h b/src/util/generic/mapfindptr.h similarity index 97% rename from util/generic/mapfindptr.h rename to src/util/generic/mapfindptr.h index 1dc61625bf0..e3ab4fbdb44 100644 --- a/util/generic/mapfindptr.h +++ b/src/util/generic/mapfindptr.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/util/generic/mapfindptr_ut.cpp b/src/util/generic/mapfindptr_ut.cpp similarity index 97% rename from util/generic/mapfindptr_ut.cpp rename to src/util/generic/mapfindptr_ut.cpp index 8b7ec831df5..a7a355380e1 100644 --- a/util/generic/mapfindptr_ut.cpp +++ b/src/util/generic/mapfindptr_ut.cpp @@ -1,7 +1,7 @@ #include "string.h" #include "hash.h" -#include +#include #include diff --git a/util/generic/mem_copy.cpp b/src/util/generic/mem_copy.cpp similarity index 100% rename from util/generic/mem_copy.cpp rename to src/util/generic/mem_copy.cpp diff --git a/util/generic/mem_copy.h b/src/util/generic/mem_copy.h similarity index 96% rename from util/generic/mem_copy.h rename to src/util/generic/mem_copy.h index b68c852953a..cb8245f54a3 100644 --- a/util/generic/mem_copy.h +++ b/src/util/generic/mem_copy.h @@ -2,7 +2,7 @@ #include "typetraits.h" -#include +#include #include diff --git a/util/generic/mem_copy_ut.cpp b/src/util/generic/mem_copy_ut.cpp similarity index 97% rename from util/generic/mem_copy_ut.cpp rename to src/util/generic/mem_copy_ut.cpp index 8b55a11cf68..7c145959bd9 100644 --- a/util/generic/mem_copy_ut.cpp +++ b/src/util/generic/mem_copy_ut.cpp @@ -1,6 +1,6 @@ #include "mem_copy.h" -#include +#include namespace { class TAssignBCalled: public yexception { diff --git a/util/generic/noncopyable.cpp b/src/util/generic/noncopyable.cpp similarity index 100% rename from util/generic/noncopyable.cpp rename to src/util/generic/noncopyable.cpp diff --git a/util/generic/noncopyable.h b/src/util/generic/noncopyable.h similarity index 100% rename from util/generic/noncopyable.h rename to src/util/generic/noncopyable.h diff --git a/util/generic/object_counter.cpp b/src/util/generic/object_counter.cpp similarity index 100% rename from util/generic/object_counter.cpp rename to src/util/generic/object_counter.cpp diff --git a/util/generic/object_counter.h b/src/util/generic/object_counter.h similarity index 100% rename from util/generic/object_counter.h rename to src/util/generic/object_counter.h diff --git a/util/generic/objects_counter_ut.cpp b/src/util/generic/objects_counter_ut.cpp similarity index 94% rename from util/generic/objects_counter_ut.cpp rename to src/util/generic/objects_counter_ut.cpp index e6c387af613..44eacb31f31 100644 --- a/util/generic/objects_counter_ut.cpp +++ b/src/util/generic/objects_counter_ut.cpp @@ -1,6 +1,6 @@ #include "object_counter.h" -#include +#include Y_UNIT_TEST_SUITE(ObjectsCounter) { struct TObject: public TObjectCounter { diff --git a/util/generic/overloaded.cpp b/src/util/generic/overloaded.cpp similarity index 100% rename from util/generic/overloaded.cpp rename to src/util/generic/overloaded.cpp diff --git a/util/generic/overloaded.h b/src/util/generic/overloaded.h similarity index 100% rename from util/generic/overloaded.h rename to src/util/generic/overloaded.h diff --git a/util/generic/overloaded_ut.cpp b/src/util/generic/overloaded_ut.cpp similarity index 93% rename from util/generic/overloaded_ut.cpp rename to src/util/generic/overloaded_ut.cpp index fb165ee162e..ed0761e9147 100644 --- a/util/generic/overloaded_ut.cpp +++ b/src/util/generic/overloaded_ut.cpp @@ -1,9 +1,9 @@ -#include +#include -#include +#include -#include -#include +#include +#include #include diff --git a/util/generic/ptr.cpp b/src/util/generic/ptr.cpp similarity index 75% rename from util/generic/ptr.cpp rename to src/util/generic/ptr.cpp index b29baebc175..79eaef6fc0a 100644 --- a/util/generic/ptr.cpp +++ b/src/util/generic/ptr.cpp @@ -1,7 +1,7 @@ #include "ptr.h" -#include -#include +#include +#include #include #include diff --git a/util/generic/ptr.h b/src/util/generic/ptr.h similarity index 99% rename from util/generic/ptr.h rename to src/util/generic/ptr.h index cc2e3c0f519..9a74bc9eb26 100644 --- a/util/generic/ptr.h +++ b/src/util/generic/ptr.h @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include template using TGuardConversion = typename std::enable_if_t::value>; diff --git a/util/generic/ptr.pxd b/src/util/generic/ptr.pxd similarity index 94% rename from util/generic/ptr.pxd rename to src/util/generic/ptr.pxd index 16e8d191443..b11e2923b21 100644 --- a/util/generic/ptr.pxd +++ b/src/util/generic/ptr.pxd @@ -1,4 +1,4 @@ -cdef extern from "" nogil: +cdef extern from "" nogil: cdef cppclass THolder[T]: THolder(...) T* Get() diff --git a/util/generic/ptr_ut.cpp b/src/util/generic/ptr_ut.cpp similarity index 99% rename from util/generic/ptr_ut.cpp rename to src/util/generic/ptr_ut.cpp index 6a57b7cd3be..6f690dc14fc 100644 --- a/util/generic/ptr_ut.cpp +++ b/src/util/generic/ptr_ut.cpp @@ -2,11 +2,11 @@ #include "vector.h" #include "noncopyable.h" -#include -#include +#include +#include -#include -#include +#include +#include class TPointerTest: public TTestBase { UNIT_TEST_SUITE(TPointerTest); diff --git a/util/generic/ptr_ut.pyx b/src/util/generic/ptr_ut.pyx similarity index 100% rename from util/generic/ptr_ut.pyx rename to src/util/generic/ptr_ut.pyx diff --git a/util/generic/refcount.cpp b/src/util/generic/refcount.cpp similarity index 100% rename from util/generic/refcount.cpp rename to src/util/generic/refcount.cpp diff --git a/util/generic/refcount.h b/src/util/generic/refcount.h similarity index 95% rename from util/generic/refcount.h rename to src/util/generic/refcount.h index 01300752aaa..f42f7a743ad 100644 --- a/util/generic/refcount.h +++ b/src/util/generic/refcount.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include @@ -65,7 +65,7 @@ class TNoCheckPolicy { #if defined(SIMPLE_COUNTER_THREAD_CHECK) - #include + #include class TCheckPolicy { public: diff --git a/util/generic/reserve.h b/src/util/generic/reserve.h similarity index 100% rename from util/generic/reserve.h rename to src/util/generic/reserve.h diff --git a/util/generic/scope.cpp b/src/util/generic/scope.cpp similarity index 100% rename from util/generic/scope.cpp rename to src/util/generic/scope.cpp diff --git a/util/generic/scope.h b/src/util/generic/scope.h similarity index 95% rename from util/generic/scope.h rename to src/util/generic/scope.h index b2c33af61e7..ef6e7d61b52 100644 --- a/util/generic/scope.h +++ b/src/util/generic/scope.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/util/generic/scope_ut.cpp b/src/util/generic/scope_ut.cpp similarity index 89% rename from util/generic/scope_ut.cpp rename to src/util/generic/scope_ut.cpp index bdb434d4875..93c43bf823d 100644 --- a/util/generic/scope_ut.cpp +++ b/src/util/generic/scope_ut.cpp @@ -1,7 +1,7 @@ #include "scope.h" -#include -#include +#include +#include Y_UNIT_TEST_SUITE(ScopeToolsTest) { Y_UNIT_TEST(OnScopeExitTest) { diff --git a/util/generic/set.cpp b/src/util/generic/set.cpp similarity index 100% rename from util/generic/set.cpp rename to src/util/generic/set.cpp diff --git a/util/generic/set.h b/src/util/generic/set.h similarity index 91% rename from util/generic/set.h rename to src/util/generic/set.h index 418928f94ce..aa401cdfcee 100644 --- a/util/generic/set.h +++ b/src/util/generic/set.h @@ -2,8 +2,8 @@ #include "fwd.h" -#include -#include +#include +#include #include #include diff --git a/util/generic/set_ut.cpp b/src/util/generic/set_ut.cpp similarity index 99% rename from util/generic/set_ut.cpp rename to src/util/generic/set_ut.cpp index d2769d327f7..5ade23cedbc 100644 --- a/util/generic/set_ut.cpp +++ b/src/util/generic/set_ut.cpp @@ -1,6 +1,6 @@ #include "set.h" -#include +#include #include diff --git a/util/generic/singleton.cpp b/src/util/generic/singleton.cpp similarity index 92% rename from util/generic/singleton.cpp rename to src/util/generic/singleton.cpp index df89d0a5791..5ef4405d96a 100644 --- a/util/generic/singleton.cpp +++ b/src/util/generic/singleton.cpp @@ -1,8 +1,8 @@ #include "singleton.h" -#include -#include -#include +#include +#include +#include #include diff --git a/util/generic/singleton.h b/src/util/generic/singleton.h similarity index 97% rename from util/generic/singleton.h rename to src/util/generic/singleton.h index ed01efb213e..a06d8293741 100644 --- a/util/generic/singleton.h +++ b/src/util/generic/singleton.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/util/generic/singleton_ut.cpp b/src/util/generic/singleton_ut.cpp similarity index 96% rename from util/generic/singleton_ut.cpp rename to src/util/generic/singleton_ut.cpp index c8cf1625e1e..ec26a250e4b 100644 --- a/util/generic/singleton_ut.cpp +++ b/src/util/generic/singleton_ut.cpp @@ -1,6 +1,6 @@ #include "singleton.h" -#include +#include Y_UNIT_TEST_SUITE(TestSingleton) { struct THuge { diff --git a/util/generic/size_literals.cpp b/src/util/generic/size_literals.cpp similarity index 100% rename from util/generic/size_literals.cpp rename to src/util/generic/size_literals.cpp diff --git a/util/generic/size_literals.h b/src/util/generic/size_literals.h similarity index 98% rename from util/generic/size_literals.h rename to src/util/generic/size_literals.h index 273fffcce5a..df6e6c3c069 100644 --- a/util/generic/size_literals.h +++ b/src/util/generic/size_literals.h @@ -1,7 +1,7 @@ #pragma once #include "yexception.h" -#include +#include #include // Unsigned literals diff --git a/util/generic/size_literals_ut.cpp b/src/util/generic/size_literals_ut.cpp similarity index 100% rename from util/generic/size_literals_ut.cpp rename to src/util/generic/size_literals_ut.cpp diff --git a/util/generic/stack.cpp b/src/util/generic/stack.cpp similarity index 100% rename from util/generic/stack.cpp rename to src/util/generic/stack.cpp diff --git a/util/generic/stack.h b/src/util/generic/stack.h similarity index 100% rename from util/generic/stack.h rename to src/util/generic/stack.h diff --git a/util/generic/stack_ut.cpp b/src/util/generic/stack_ut.cpp similarity index 84% rename from util/generic/stack_ut.cpp rename to src/util/generic/stack_ut.cpp index 248127d3260..6cff62d5878 100644 --- a/util/generic/stack_ut.cpp +++ b/src/util/generic/stack_ut.cpp @@ -1,6 +1,6 @@ #include "stack.h" -#include +#include Y_UNIT_TEST_SUITE(TYStackTest) { Y_UNIT_TEST(ExplicitBool) { diff --git a/util/generic/store_policy.cpp b/src/util/generic/store_policy.cpp similarity index 100% rename from util/generic/store_policy.cpp rename to src/util/generic/store_policy.cpp diff --git a/util/generic/store_policy.h b/src/util/generic/store_policy.h similarity index 100% rename from util/generic/store_policy.h rename to src/util/generic/store_policy.h diff --git a/util/generic/store_policy_ut.cpp b/src/util/generic/store_policy_ut.cpp similarity index 97% rename from util/generic/store_policy_ut.cpp rename to src/util/generic/store_policy_ut.cpp index ee36fe95a77..e5a4c91c936 100644 --- a/util/generic/store_policy_ut.cpp +++ b/src/util/generic/store_policy_ut.cpp @@ -1,7 +1,7 @@ #include "store_policy.h" -#include -#include +#include +#include Y_UNIT_TEST_SUITE(StorePolicy) { Y_UNIT_TEST(Compileability) { diff --git a/util/generic/strfcpy.cpp b/src/util/generic/strfcpy.cpp similarity index 100% rename from util/generic/strfcpy.cpp rename to src/util/generic/strfcpy.cpp diff --git a/util/generic/strfcpy.h b/src/util/generic/strfcpy.h similarity index 100% rename from util/generic/strfcpy.h rename to src/util/generic/strfcpy.h diff --git a/util/generic/string_hash.h b/src/util/generic/string_hash.h similarity index 100% rename from util/generic/string_hash.h rename to src/util/generic/string_hash.h diff --git a/util/generic/string_transparent_hash_ut.cpp b/src/util/generic/string_transparent_hash_ut.cpp similarity index 80% rename from util/generic/string_transparent_hash_ut.cpp rename to src/util/generic/string_transparent_hash_ut.cpp index aeecf1b8543..b919fb3141f 100644 --- a/util/generic/string_transparent_hash_ut.cpp +++ b/src/util/generic/string_transparent_hash_ut.cpp @@ -1,10 +1,10 @@ #include "string.h" #include "vector.h" -#include -#include +#include +#include -#include +#include Y_UNIT_TEST_SUITE(StringHashFunctorTests) { Y_UNIT_TEST(TestTransparencyWithUnorderedSet) { diff --git a/util/generic/typelist.cpp b/src/util/generic/typelist.cpp similarity index 100% rename from util/generic/typelist.cpp rename to src/util/generic/typelist.cpp diff --git a/util/generic/typelist.h b/src/util/generic/typelist.h similarity index 97% rename from util/generic/typelist.h rename to src/util/generic/typelist.h index 5ce26ab97c7..bf61b40e364 100644 --- a/util/generic/typelist.h +++ b/src/util/generic/typelist.h @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include #include diff --git a/util/generic/typelist_ut.cpp b/src/util/generic/typelist_ut.cpp similarity index 96% rename from util/generic/typelist_ut.cpp rename to src/util/generic/typelist_ut.cpp index 955ebb1f1bf..1f825a7b662 100644 --- a/util/generic/typelist_ut.cpp +++ b/src/util/generic/typelist_ut.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "typelist.h" #include "vector.h" diff --git a/util/generic/typetraits.cpp b/src/util/generic/typetraits.cpp similarity index 100% rename from util/generic/typetraits.cpp rename to src/util/generic/typetraits.cpp diff --git a/util/generic/typetraits.h b/src/util/generic/typetraits.h similarity index 99% rename from util/generic/typetraits.h rename to src/util/generic/typetraits.h index 6695531eb28..4a02ab6c61a 100644 --- a/util/generic/typetraits.h +++ b/src/util/generic/typetraits.h @@ -2,7 +2,7 @@ #include "va_args.h" -#include +#include #include #include diff --git a/util/generic/typetraits_ut.cpp b/src/util/generic/typetraits_ut.cpp similarity index 99% rename from util/generic/typetraits_ut.cpp rename to src/util/generic/typetraits_ut.cpp index fe96e3a42b3..b6938b88898 100644 --- a/util/generic/typetraits_ut.cpp +++ b/src/util/generic/typetraits_ut.cpp @@ -1,6 +1,6 @@ #include "typetraits.h" -#include +#include #include #include diff --git a/util/generic/ut/ya.make b/src/util/generic/ut/ya.make similarity index 93% rename from util/generic/ut/ya.make rename to src/util/generic/ut/ya.make index 1bbec6e7df8..bbd7836b373 100644 --- a/util/generic/ut/ya.make +++ b/src/util/generic/ut/ya.make @@ -52,13 +52,13 @@ SRCS( generic/ymath_ut.cpp ) -INCLUDE(${ARCADIA_ROOT}/util/tests/ya_util_tests.inc) +INCLUDE(${ARCADIA_ROOT}/src/util/tests/ya_util_tests.inc) IF (NOT OS_IOS AND NOT ARCH_PPC64LE) # Abseil fails to build (with linkage error) on ios and with compilation error on PowerPC # (somewhere in unscaledcycleclock.cc). PEERDIR( - library/cpp/containers/absl_flat_hash + src/library/containers/absl_flat_hash ) SRCS( diff --git a/util/generic/ut_cython/test_generic.py b/src/util/generic/ut_cython/test_generic.py similarity index 100% rename from util/generic/ut_cython/test_generic.py rename to src/util/generic/ut_cython/test_generic.py diff --git a/util/generic/ut_cython/ya.make b/src/util/generic/ut_cython/ya.make similarity index 91% rename from util/generic/ut_cython/ya.make rename to src/util/generic/ut_cython/ya.make index 35115efee5d..a3ee51c83e4 100644 --- a/util/generic/ut_cython/ya.make +++ b/src/util/generic/ut_cython/ya.make @@ -2,7 +2,7 @@ PY23_TEST() SUBSCRIBER(g:util-subscribers) -SRCDIR(util/generic) +SRCDIR(src/util/generic) PY_SRCS( NAMESPACE util.generic diff --git a/util/generic/utility.cpp b/src/util/generic/utility.cpp similarity index 100% rename from util/generic/utility.cpp rename to src/util/generic/utility.cpp diff --git a/util/generic/utility.h b/src/util/generic/utility.h similarity index 98% rename from util/generic/utility.h rename to src/util/generic/utility.h index 5362fd4e42c..1938a26e295 100644 --- a/util/generic/utility.h +++ b/src/util/generic/utility.h @@ -2,7 +2,7 @@ #include "typetraits.h" -#include +#include #include diff --git a/util/generic/utility_ut.cpp b/src/util/generic/utility_ut.cpp similarity index 99% rename from util/generic/utility_ut.cpp rename to src/util/generic/utility_ut.cpp index 316f0a3e1f7..98e133de097 100644 --- a/util/generic/utility_ut.cpp +++ b/src/util/generic/utility_ut.cpp @@ -1,7 +1,7 @@ #include "utility.h" #include "ymath.h" -#include +#include // DO_NOT_STYLE diff --git a/util/generic/va_args.cpp b/src/util/generic/va_args.cpp similarity index 100% rename from util/generic/va_args.cpp rename to src/util/generic/va_args.cpp diff --git a/util/generic/va_args.h b/src/util/generic/va_args.h similarity index 99% rename from util/generic/va_args.h rename to src/util/generic/va_args.h index 2265941c1d1..d1b54396305 100644 --- a/util/generic/va_args.h +++ b/src/util/generic/va_args.h @@ -8,7 +8,7 @@ // DO_NOT_STYLE -#include +#include /** * Triggers another level of macro expansion, use whenever passing __VA_ARGS__ to another macro. diff --git a/util/generic/va_args_ut.cpp b/src/util/generic/va_args_ut.cpp similarity index 98% rename from util/generic/va_args_ut.cpp rename to src/util/generic/va_args_ut.cpp index e3691d4c4a3..de2ea997fcc 100644 --- a/util/generic/va_args_ut.cpp +++ b/src/util/generic/va_args_ut.cpp @@ -1,6 +1,6 @@ #include "va_args.h" -#include +#include Y_UNIT_TEST_SUITE(TMacroVarargMapTest) { Y_UNIT_TEST(TestMapArgs) { diff --git a/util/generic/variant.cpp b/src/util/generic/variant.cpp similarity index 100% rename from util/generic/variant.cpp rename to src/util/generic/variant.cpp diff --git a/util/generic/variant.h b/src/util/generic/variant.h similarity index 100% rename from util/generic/variant.h rename to src/util/generic/variant.h diff --git a/util/generic/xrange.cpp b/src/util/generic/xrange.cpp similarity index 100% rename from util/generic/xrange.cpp rename to src/util/generic/xrange.cpp diff --git a/util/generic/xrange.h b/src/util/generic/xrange.h similarity index 99% rename from util/generic/xrange.h rename to src/util/generic/xrange.h index 3d440bc54c0..7358f92be60 100644 --- a/util/generic/xrange.h +++ b/src/util/generic/xrange.h @@ -2,7 +2,7 @@ #include "typetraits.h" #include "utility.h" -#include +#include #include /** @file diff --git a/util/generic/xrange_ut.cpp b/src/util/generic/xrange_ut.cpp similarity index 98% rename from util/generic/xrange_ut.cpp rename to src/util/generic/xrange_ut.cpp index 90eb38620bc..da35caf665e 100644 --- a/util/generic/xrange_ut.cpp +++ b/src/util/generic/xrange_ut.cpp @@ -2,8 +2,8 @@ #include "algorithm.h" #include "vector.h" -#include -#include +#include +#include Y_UNIT_TEST_SUITE(XRange) { void TestXRangeImpl(size_t begin, size_t end) { diff --git a/util/generic/yexception.cpp b/src/util/generic/yexception.cpp similarity index 96% rename from util/generic/yexception.cpp rename to src/util/generic/yexception.cpp index 641e8947c23..0fe29053558 100644 --- a/util/generic/yexception.cpp +++ b/src/util/generic/yexception.cpp @@ -1,11 +1,11 @@ #include "bt_exception.h" #include "yexception.h" -#include +#include -#include -#include -#include +#include +#include +#include #if defined(_linux_) || defined(_android_) || defined(_darwin_) #include diff --git a/util/generic/yexception.h b/src/util/generic/yexception.h similarity index 96% rename from util/generic/yexception.h rename to src/util/generic/yexception.h index 2ce3dd8aadf..905d024fc3a 100644 --- a/util/generic/yexception.h +++ b/src/util/generic/yexception.h @@ -6,13 +6,13 @@ #include "va_args.h" #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/util/generic/yexception_ut.c b/src/util/generic/yexception_ut.c similarity index 100% rename from util/generic/yexception_ut.c rename to src/util/generic/yexception_ut.c diff --git a/util/generic/yexception_ut.cpp b/src/util/generic/yexception_ut.cpp similarity index 96% rename from util/generic/yexception_ut.cpp rename to src/util/generic/yexception_ut.cpp index ddb00c59e2e..7e6cabbe70f 100644 --- a/util/generic/yexception_ut.cpp +++ b/src/util/generic/yexception_ut.cpp @@ -8,14 +8,14 @@ static inline void Throw2DontMove() { ythrow yexception() << 1 << " qw " << 12.1; // don't move this line } -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "yexception_ut.h" #include "bt_exception.h" @@ -235,7 +235,7 @@ class TExceptionTest: public TTestBase { Throw2DontMove(); UNIT_ASSERT(false); } catch (...) { - CheckCurrentExceptionContains("util/generic/yexception_ut.cpp:8: 1 qw 12.1"); + CheckCurrentExceptionContains("src/util/generic/yexception_ut.cpp:8: 1 qw 12.1"); } } @@ -248,7 +248,7 @@ class TExceptionTest: public TTestBase { Throw1DontMove(); UNIT_ASSERT(false); } catch (...) { - CheckCurrentExceptionContains("util/generic/yexception_ut.cpp:4: blabla"); + CheckCurrentExceptionContains("src/util/generic/yexception_ut.cpp:4: blabla"); throw; } diff --git a/util/generic/yexception_ut.h b/src/util/generic/yexception_ut.h similarity index 100% rename from util/generic/yexception_ut.h rename to src/util/generic/yexception_ut.h diff --git a/util/generic/ylimits.cpp b/src/util/generic/ylimits.cpp similarity index 100% rename from util/generic/ylimits.cpp rename to src/util/generic/ylimits.cpp diff --git a/util/generic/ylimits.h b/src/util/generic/ylimits.h similarity index 100% rename from util/generic/ylimits.h rename to src/util/generic/ylimits.h diff --git a/util/generic/ylimits_ut.cpp b/src/util/generic/ylimits_ut.cpp similarity index 98% rename from util/generic/ylimits_ut.cpp rename to src/util/generic/ylimits_ut.cpp index 7b339ba80c7..4d9836c3e3c 100644 --- a/util/generic/ylimits_ut.cpp +++ b/src/util/generic/ylimits_ut.cpp @@ -1,9 +1,9 @@ #include "cast.h" #include "ylimits.h" -#include +#include -#include +#include class TLimitTest: public TTestBase { UNIT_TEST_SUITE(TLimitTest); diff --git a/util/generic/ymath.cpp b/src/util/generic/ymath.cpp similarity index 100% rename from util/generic/ymath.cpp rename to src/util/generic/ymath.cpp diff --git a/util/generic/ymath.h b/src/util/generic/ymath.h similarity index 98% rename from util/generic/ymath.h rename to src/util/generic/ymath.h index 6736c73d34b..a5f502d8bf6 100644 --- a/util/generic/ymath.h +++ b/src/util/generic/ymath.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/util/generic/ymath_ut.cpp b/src/util/generic/ymath_ut.cpp similarity index 98% rename from util/generic/ymath_ut.cpp rename to src/util/generic/ymath_ut.cpp index de733b57f56..fb91f163cd6 100644 --- a/util/generic/ymath_ut.cpp +++ b/src/util/generic/ymath_ut.cpp @@ -1,10 +1,10 @@ #include "bitops.h" #include "ymath.h" -#include +#include -#include -#include +#include +#include #include #include diff --git a/util/memory/addstorage.cpp b/src/util/memory/addstorage.cpp similarity index 100% rename from util/memory/addstorage.cpp rename to src/util/memory/addstorage.cpp diff --git a/util/memory/addstorage.h b/src/util/memory/addstorage.h similarity index 97% rename from util/memory/addstorage.h rename to src/util/memory/addstorage.h index 597c73a988e..c0e35266600 100644 --- a/util/memory/addstorage.h +++ b/src/util/memory/addstorage.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/util/memory/addstorage_ut.cpp b/src/util/memory/addstorage_ut.cpp similarity index 90% rename from util/memory/addstorage_ut.cpp rename to src/util/memory/addstorage_ut.cpp index 9b0c4989ab6..479c6e361de 100644 --- a/util/memory/addstorage_ut.cpp +++ b/src/util/memory/addstorage_ut.cpp @@ -1,6 +1,6 @@ #include "addstorage.h" -#include +#include class TAddStorageTest: public TTestBase { UNIT_TEST_SUITE(TAddStorageTest); diff --git a/util/memory/alloc.cpp b/src/util/memory/alloc.cpp similarity index 82% rename from util/memory/alloc.cpp rename to src/util/memory/alloc.cpp index 49f012d8575..cc4f3ad2b0c 100644 --- a/util/memory/alloc.cpp +++ b/src/util/memory/alloc.cpp @@ -1,7 +1,7 @@ #include "alloc.h" -#include -#include +#include +#include using TBlock = TDefaultAllocator::TBlock; diff --git a/util/memory/alloc.h b/src/util/memory/alloc.h similarity index 100% rename from util/memory/alloc.h rename to src/util/memory/alloc.h diff --git a/util/memory/blob.cpp b/src/util/memory/blob.cpp similarity index 97% rename from util/memory/blob.cpp rename to src/util/memory/blob.cpp index 9a59aff9115..c9bb6109607 100644 --- a/util/memory/blob.cpp +++ b/src/util/memory/blob.cpp @@ -1,15 +1,15 @@ #include "blob.h" #include "addstorage.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include template class TDynamicBlobBase: public TBlob::TBase, diff --git a/util/memory/blob.h b/src/util/memory/blob.h similarity index 99% rename from util/memory/blob.h rename to src/util/memory/blob.h index 51d2c8f5b2a..116a44c7f03 100644 --- a/util/memory/blob.h +++ b/src/util/memory/blob.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/util/memory/blob.pxd b/src/util/memory/blob.pxd similarity index 95% rename from util/memory/blob.pxd rename to src/util/memory/blob.pxd index 9e224a549fc..40512aa42b9 100644 --- a/util/memory/blob.pxd +++ b/src/util/memory/blob.pxd @@ -3,7 +3,7 @@ from libcpp cimport bool as bool_t from util.system.types cimport ui8 -cdef extern from "util/memory/blob.h" nogil: +cdef extern from "src/util/memory/blob.h" nogil: cdef cppclass TBlob: TBlob() TBlob(const TBlob&) diff --git a/util/memory/blob_ut.cpp b/src/util/memory/blob_ut.cpp similarity index 90% rename from util/memory/blob_ut.cpp rename to src/util/memory/blob_ut.cpp index a17d338e1ac..977f82c6479 100644 --- a/util/memory/blob_ut.cpp +++ b/src/util/memory/blob_ut.cpp @@ -1,12 +1,12 @@ #include "blob.h" -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/util/memory/blob_ut.pyx b/src/util/memory/blob_ut.pyx similarity index 100% rename from util/memory/blob_ut.pyx rename to src/util/memory/blob_ut.pyx diff --git a/util/memory/mmapalloc.cpp b/src/util/memory/mmapalloc.cpp similarity index 90% rename from util/memory/mmapalloc.cpp rename to src/util/memory/mmapalloc.cpp index ec618cc8084..bb0eb79ae9d 100644 --- a/util/memory/mmapalloc.cpp +++ b/src/util/memory/mmapalloc.cpp @@ -1,8 +1,8 @@ #include "alloc.h" #include "mmapalloc.h" -#include -#include +#include +#include namespace { class TMmapAllocator: public IAllocator { diff --git a/util/memory/mmapalloc.h b/src/util/memory/mmapalloc.h similarity index 100% rename from util/memory/mmapalloc.h rename to src/util/memory/mmapalloc.h diff --git a/util/memory/pool.cpp b/src/util/memory/pool.cpp similarity index 100% rename from util/memory/pool.cpp rename to src/util/memory/pool.cpp diff --git a/util/memory/pool.h b/src/util/memory/pool.h similarity index 97% rename from util/memory/pool.h rename to src/util/memory/pool.h index 63cecb6d3ad..05f14683b4f 100644 --- a/util/memory/pool.h +++ b/src/util/memory/pool.h @@ -2,12 +2,12 @@ #include "alloc.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/util/memory/pool_ut.cpp b/src/util/memory/pool_ut.cpp similarity index 98% rename from util/memory/pool_ut.cpp rename to src/util/memory/pool_ut.cpp index 7ea5eb71568..919adc31962 100644 --- a/util/memory/pool_ut.cpp +++ b/src/util/memory/pool_ut.cpp @@ -1,8 +1,8 @@ #include "pool.h" -#include +#include -#include +#include class TCheckedAllocator: public TDefaultAllocator { public: diff --git a/util/memory/segmented_string_pool.cpp b/src/util/memory/segmented_string_pool.cpp similarity index 100% rename from util/memory/segmented_string_pool.cpp rename to src/util/memory/segmented_string_pool.cpp diff --git a/util/memory/segmented_string_pool.h b/src/util/memory/segmented_string_pool.h similarity index 97% rename from util/memory/segmented_string_pool.h rename to src/util/memory/segmented_string_pool.h index a4913aeec69..7e4ecb36904 100644 --- a/util/memory/segmented_string_pool.h +++ b/src/util/memory/segmented_string_pool.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/util/memory/segpool_alloc.cpp b/src/util/memory/segpool_alloc.cpp similarity index 100% rename from util/memory/segpool_alloc.cpp rename to src/util/memory/segpool_alloc.cpp diff --git a/util/memory/segpool_alloc.h b/src/util/memory/segpool_alloc.h similarity index 100% rename from util/memory/segpool_alloc.h rename to src/util/memory/segpool_alloc.h diff --git a/util/memory/smallobj.cpp b/src/util/memory/smallobj.cpp similarity index 100% rename from util/memory/smallobj.cpp rename to src/util/memory/smallobj.cpp diff --git a/util/memory/smallobj.h b/src/util/memory/smallobj.h similarity index 97% rename from util/memory/smallobj.h rename to src/util/memory/smallobj.h index 63de666bae0..a5e4e414770 100644 --- a/util/memory/smallobj.h +++ b/src/util/memory/smallobj.h @@ -3,8 +3,8 @@ #include "pool.h" #include "alloc.h" -#include -#include +#include +#include class TFixedSizeAllocator { struct TAlloc: public TIntrusiveSListItem { diff --git a/util/memory/smallobj_ut.cpp b/src/util/memory/smallobj_ut.cpp similarity index 97% rename from util/memory/smallobj_ut.cpp rename to src/util/memory/smallobj_ut.cpp index 7f8ede6df72..71339a0ed72 100644 --- a/util/memory/smallobj_ut.cpp +++ b/src/util/memory/smallobj_ut.cpp @@ -1,6 +1,6 @@ #include "smallobj.h" -#include +#include class TSmallObjAllocTest: public TTestBase { diff --git a/util/memory/tempbuf.cpp b/src/util/memory/tempbuf.cpp similarity index 95% rename from util/memory/tempbuf.cpp rename to src/util/memory/tempbuf.cpp index 27b45dea482..e8bfa2ea2a7 100644 --- a/util/memory/tempbuf.cpp +++ b/src/util/memory/tempbuf.cpp @@ -1,13 +1,13 @@ #include "tempbuf.h" #include "addstorage.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #ifndef TMP_BUF_LEN #define TMP_BUF_LEN (64 * 1024) @@ -274,7 +274,7 @@ bool TTempBuf::IsNull() const noexcept { } #if 0 - #include + #include #define LEN (1024) diff --git a/util/memory/tempbuf.h b/src/util/memory/tempbuf.h similarity index 97% rename from util/memory/tempbuf.h rename to src/util/memory/tempbuf.h index 334670eb1e5..3ae0a2faa6d 100644 --- a/util/memory/tempbuf.h +++ b/src/util/memory/tempbuf.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include /* * This is really fast buffer for temporary data. diff --git a/util/memory/tempbuf_ut.cpp b/src/util/memory/tempbuf_ut.cpp similarity index 97% rename from util/memory/tempbuf_ut.cpp rename to src/util/memory/tempbuf_ut.cpp index f501710ee4b..91b1ecb124c 100644 --- a/util/memory/tempbuf_ut.cpp +++ b/src/util/memory/tempbuf_ut.cpp @@ -2,7 +2,7 @@ #include -#include +#include class TTempBufTest: public TTestBase { UNIT_TEST_SUITE(TTempBufTest); diff --git a/util/memory/ut/ya.make b/src/util/memory/ut/ya.make similarity index 77% rename from util/memory/ut/ya.make rename to src/util/memory/ut/ya.make index fbddc4ca4e4..b9c2eacc00a 100644 --- a/util/memory/ut/ya.make +++ b/src/util/memory/ut/ya.make @@ -10,6 +10,6 @@ SRCS( memory/tempbuf_ut.cpp ) -INCLUDE(${ARCADIA_ROOT}/util/tests/ya_util_tests.inc) +INCLUDE(${ARCADIA_ROOT}/src/util/tests/ya_util_tests.inc) END() diff --git a/util/memory/ut_cython/test_memory.py b/src/util/memory/ut_cython/test_memory.py similarity index 100% rename from util/memory/ut_cython/test_memory.py rename to src/util/memory/ut_cython/test_memory.py diff --git a/util/memory/ut_cython/ya.make b/src/util/memory/ut_cython/ya.make similarity index 85% rename from util/memory/ut_cython/ya.make rename to src/util/memory/ut_cython/ya.make index d8a06845b16..2ea5a5946b3 100644 --- a/util/memory/ut_cython/ya.make +++ b/src/util/memory/ut_cython/ya.make @@ -2,7 +2,7 @@ PY23_TEST() SUBSCRIBER(g:util-subscribers) -SRCDIR(util/memory) +SRCDIR(src/util/memory) PY_SRCS( NAMESPACE util.memory diff --git a/util/network/address.cpp b/src/util/network/address.cpp similarity index 99% rename from util/network/address.cpp rename to src/util/network/address.cpp index f10377a49f7..fa2596f685c 100644 --- a/util/network/address.cpp +++ b/src/util/network/address.cpp @@ -1,4 +1,4 @@ -#include +#include #include "address.h" diff --git a/util/network/address.h b/src/util/network/address.h similarity index 97% rename from util/network/address.h rename to src/util/network/address.h index c444d09d01b..1da84544a63 100644 --- a/util/network/address.h +++ b/src/util/network/address.h @@ -3,8 +3,8 @@ #include "ip.h" #include "socket.h" -#include -#include +#include +#include namespace NAddr { class IRemoteAddr { diff --git a/util/network/address_ut.cpp b/src/util/network/address_ut.cpp similarity index 95% rename from util/network/address_ut.cpp rename to src/util/network/address_ut.cpp index 94bb07dfcaa..c9bfc2fcead 100644 --- a/util/network/address_ut.cpp +++ b/src/util/network/address_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #include "address.h" diff --git a/util/network/endpoint.cpp b/src/util/network/endpoint.cpp similarity index 100% rename from util/network/endpoint.cpp rename to src/util/network/endpoint.cpp diff --git a/util/network/endpoint.h b/src/util/network/endpoint.h similarity index 97% rename from util/network/endpoint.h rename to src/util/network/endpoint.h index 47a67824e19..0c06f64e212 100644 --- a/util/network/endpoint.h +++ b/src/util/network/endpoint.h @@ -2,7 +2,7 @@ #include "address.h" -#include +#include //some equivalent boost::asio::ip::endpoint (easy for using pair ip:port) class TEndpoint { diff --git a/util/network/endpoint_ut.cpp b/src/util/network/endpoint_ut.cpp similarity index 98% rename from util/network/endpoint_ut.cpp rename to src/util/network/endpoint_ut.cpp index 1b31fe12212..ec2ceefa878 100644 --- a/util/network/endpoint_ut.cpp +++ b/src/util/network/endpoint_ut.cpp @@ -1,6 +1,6 @@ #include "endpoint.h" -#include +#include #include diff --git a/util/network/hostip.cpp b/src/util/network/hostip.cpp similarity index 95% rename from util/network/hostip.cpp rename to src/util/network/hostip.cpp index cb8d43bf903..67e34960dce 100644 --- a/util/network/hostip.cpp +++ b/src/util/network/hostip.cpp @@ -1,8 +1,8 @@ #include "socket.h" #include "hostip.h" -#include -#include +#include +#include #if defined(_unix_) || defined(_cygwin_) #include diff --git a/util/network/hostip.h b/src/util/network/hostip.h similarity index 91% rename from util/network/hostip.h rename to src/util/network/hostip.h index cf63e4846ad..442093e8d9c 100644 --- a/util/network/hostip.h +++ b/src/util/network/hostip.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NResolver { // resolve hostname and fills up to *slots slots in ip array; diff --git a/util/network/init.cpp b/src/util/network/init.cpp similarity index 86% rename from util/network/init.cpp rename to src/util/network/init.cpp index 430b25c2fce..b98d8d3242a 100644 --- a/util/network/init.cpp +++ b/src/util/network/init.cpp @@ -1,7 +1,7 @@ #include "init.h" -#include -#include +#include +#include namespace { class TNetworkInit { diff --git a/util/network/init.h b/src/util/network/init.h similarity index 93% rename from util/network/init.h rename to src/util/network/init.h index 08a79c0fcaa..9cec4b75b13 100644 --- a/util/network/init.h +++ b/src/util/network/init.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #if defined(_unix_) #include @@ -25,7 +25,7 @@ using SOCKET = int; #define INVALID_SOCKET -1 #define WSAGetLastError() errno #elif defined(_win_) - #include + #include #include #include #include diff --git a/util/network/interface.cpp b/src/util/network/interface.cpp similarity index 98% rename from util/network/interface.cpp rename to src/util/network/interface.cpp index 23e09c5e47f..2b2387d3408 100644 --- a/util/network/interface.cpp +++ b/src/util/network/interface.cpp @@ -1,6 +1,6 @@ #include "interface.h" -#include +#include #if defined(_unix_) #include diff --git a/util/network/interface.h b/src/util/network/interface.h similarity index 100% rename from util/network/interface.h rename to src/util/network/interface.h diff --git a/util/network/iovec.cpp b/src/util/network/iovec.cpp similarity index 100% rename from util/network/iovec.cpp rename to src/util/network/iovec.cpp diff --git a/util/network/iovec.h b/src/util/network/iovec.h similarity index 91% rename from util/network/iovec.h rename to src/util/network/iovec.h index ac15a41f545..5719d4e209b 100644 --- a/util/network/iovec.h +++ b/src/util/network/iovec.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include class TContIOVector { using TPart = IOutputStream::TPart; diff --git a/util/network/ip.cpp b/src/util/network/ip.cpp similarity index 100% rename from util/network/ip.cpp rename to src/util/network/ip.cpp diff --git a/util/network/ip.h b/src/util/network/ip.h similarity index 95% rename from util/network/ip.h rename to src/util/network/ip.h index 8e79ea59f55..5d21ff90549 100644 --- a/util/network/ip.h +++ b/src/util/network/ip.h @@ -3,9 +3,9 @@ #include "socket.h" #include "hostip.h" -#include -#include -#include +#include +#include +#include #include diff --git a/util/network/ip_ut.cpp b/src/util/network/ip_ut.cpp similarity index 94% rename from util/network/ip_ut.cpp rename to src/util/network/ip_ut.cpp index 6716c6a6999..0f35814cbcd 100644 --- a/util/network/ip_ut.cpp +++ b/src/util/network/ip_ut.cpp @@ -1,8 +1,8 @@ #include "ip.h" -#include +#include -#include +#include class TSysIpTest: public TTestBase { UNIT_TEST_SUITE(TSysIpTest); diff --git a/util/network/nonblock.cpp b/src/util/network/nonblock.cpp similarity index 97% rename from util/network/nonblock.cpp rename to src/util/network/nonblock.cpp index e515c27cc51..1f7248edf91 100644 --- a/util/network/nonblock.cpp +++ b/src/util/network/nonblock.cpp @@ -1,8 +1,8 @@ #include "nonblock.h" -#include +#include -#include +#include #if defined(_unix_) #include diff --git a/util/network/nonblock.h b/src/util/network/nonblock.h similarity index 100% rename from util/network/nonblock.h rename to src/util/network/nonblock.h diff --git a/util/network/pair.cpp b/src/util/network/pair.cpp similarity index 100% rename from util/network/pair.cpp rename to src/util/network/pair.cpp diff --git a/util/network/pair.h b/src/util/network/pair.h similarity index 100% rename from util/network/pair.h rename to src/util/network/pair.h diff --git a/util/network/poller.cpp b/src/util/network/poller.cpp similarity index 98% rename from util/network/poller.cpp rename to src/util/network/poller.cpp index 6018628c570..a319eeeddae 100644 --- a/util/network/poller.cpp +++ b/src/util/network/poller.cpp @@ -1,7 +1,7 @@ #include "poller.h" #include "pollerimpl.h" -#include +#include #include diff --git a/util/network/poller.h b/src/util/network/poller.h similarity index 95% rename from util/network/poller.h rename to src/util/network/poller.h index 8dccd731407..aec6a1439c7 100644 --- a/util/network/poller.h +++ b/src/util/network/poller.h @@ -2,8 +2,8 @@ #include "socket.h" -#include -#include +#include +#include class TSocketPoller { public: diff --git a/util/network/poller_ut.cpp b/src/util/network/poller_ut.cpp similarity index 99% rename from util/network/poller_ut.cpp rename to src/util/network/poller_ut.cpp index e5914b7df3a..8a901448b90 100644 --- a/util/network/poller_ut.cpp +++ b/src/util/network/poller_ut.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "pair.h" #include "poller.h" diff --git a/util/network/pollerimpl.cpp b/src/util/network/pollerimpl.cpp similarity index 100% rename from util/network/pollerimpl.cpp rename to src/util/network/pollerimpl.cpp diff --git a/util/network/pollerimpl.h b/src/util/network/pollerimpl.h similarity index 98% rename from util/network/pollerimpl.h rename to src/util/network/pollerimpl.h index a4fff8a7fa5..8bfaeb60eba 100644 --- a/util/network/pollerimpl.h +++ b/src/util/network/pollerimpl.h @@ -2,13 +2,13 @@ #include "socket.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include @@ -319,8 +319,8 @@ class TEpollPoller { #endif #if defined(HAVE_SELECT_POLLER) - #include - #include + #include + #include #include "pair.h" diff --git a/util/network/sock.cpp b/src/util/network/sock.cpp similarity index 100% rename from util/network/sock.cpp rename to src/util/network/sock.cpp diff --git a/util/network/sock.h b/src/util/network/sock.h similarity index 98% rename from util/network/sock.h rename to src/util/network/sock.h index 1bd5948dda9..c3a0d95c571 100644 --- a/util/network/sock.h +++ b/src/util/network/sock.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #if defined(_win_) || defined(_cygwin_) - #include + #include #else #include #include diff --git a/util/network/sock_ut.cpp b/src/util/network/sock_ut.cpp similarity index 97% rename from util/network/sock_ut.cpp rename to src/util/network/sock_ut.cpp index b59bdf2a84c..d199e0bd205 100644 --- a/util/network/sock_ut.cpp +++ b/src/util/network/sock_ut.cpp @@ -1,10 +1,10 @@ #include "sock.h" -#include -#include +#include +#include -#include -#include +#include +#include Y_UNIT_TEST_SUITE(TSocketTest) { Y_UNIT_TEST(InetDgramTest) { diff --git a/util/network/socket.cpp b/src/util/network/socket.cpp similarity index 98% rename from util/network/socket.cpp rename to src/util/network/socket.cpp index 35ebd7edcb8..084dc01bc47 100644 --- a/util/network/socket.cpp +++ b/src/util/network/socket.cpp @@ -4,8 +4,8 @@ #include "pollerimpl.h" #include "iovec.h" -#include -#include +#include +#include #include #if defined(_unix_) @@ -31,17 +31,17 @@ #include #include - #include + #include #endif -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/util/network/socket.h b/src/util/network/socket.h similarity index 96% rename from util/network/socket.h rename to src/util/network/socket.h index e80b2c7fd16..94ddcd08365 100644 --- a/util/network/socket.h +++ b/src/util/network/socket.h @@ -2,15 +2,15 @@ #include "init.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/util/network/socket_ut.cpp b/src/util/network/socket_ut.cpp similarity index 98% rename from util/network/socket_ut.cpp rename to src/util/network/socket_ut.cpp index cf368de3fa6..a7fbb237e94 100644 --- a/util/network/socket_ut.cpp +++ b/src/util/network/socket_ut.cpp @@ -2,10 +2,10 @@ #include "pair.h" -#include +#include -#include -#include +#include +#include #include diff --git a/util/network/ut/ya.make b/src/util/network/ut/ya.make similarity index 74% rename from util/network/ut/ya.make rename to src/util/network/ut/ya.make index f62c9198529..1adc0ea2cb1 100644 --- a/util/network/ut/ya.make +++ b/src/util/network/ut/ya.make @@ -5,7 +5,7 @@ REQUIREMENTS(network:full) SUBSCRIBER(g:util-subscribers) PEERDIR( - library/cpp/threading/future + src/library/threading/future ) SRCS( @@ -17,6 +17,6 @@ SRCS( network/socket_ut.cpp ) -INCLUDE(${ARCADIA_ROOT}/util/tests/ya_util_tests.inc) +INCLUDE(${ARCADIA_ROOT}/src/util/tests/ya_util_tests.inc) END() diff --git a/util/random/common_ops.cpp b/src/util/random/common_ops.cpp similarity index 100% rename from util/random/common_ops.cpp rename to src/util/random/common_ops.cpp diff --git a/util/random/common_ops.h b/src/util/random/common_ops.h similarity index 97% rename from util/random/common_ops.h rename to src/util/random/common_ops.h index 209e8dbb48e..8f843354463 100644 --- a/util/random/common_ops.h +++ b/src/util/random/common_ops.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace NPrivate { constexpr double ToRandReal1(const ui32 x) noexcept { diff --git a/util/random/common_ops_ut.cpp b/src/util/random/common_ops_ut.cpp similarity index 94% rename from util/random/common_ops_ut.cpp rename to src/util/random/common_ops_ut.cpp index 905912bd1ed..06f5206c00e 100644 --- a/util/random/common_ops_ut.cpp +++ b/src/util/random/common_ops_ut.cpp @@ -1,9 +1,9 @@ #include "common_ops.h" #include "random.h" -#include +#include -#include +#include #include diff --git a/util/random/easy.cpp b/src/util/random/easy.cpp similarity index 100% rename from util/random/easy.cpp rename to src/util/random/easy.cpp diff --git a/util/random/easy.h b/src/util/random/easy.h similarity index 100% rename from util/random/easy.h rename to src/util/random/easy.h diff --git a/util/random/easy_ut.cpp b/src/util/random/easy_ut.cpp similarity index 90% rename from util/random/easy_ut.cpp rename to src/util/random/easy_ut.cpp index d1d024a91fe..157f83ec8d6 100644 --- a/util/random/easy_ut.cpp +++ b/src/util/random/easy_ut.cpp @@ -1,6 +1,6 @@ #include "easy.h" -#include +#include Y_UNIT_TEST_SUITE(TEasyRndInterface) { Y_UNIT_TEST(Test1) { diff --git a/util/random/entropy.cpp b/src/util/random/entropy.cpp similarity index 86% rename from util/random/entropy.cpp rename to src/util/random/entropy.cpp index d0a163caf44..a255423f176 100644 --- a/util/random/entropy.cpp +++ b/src/util/random/entropy.cpp @@ -5,31 +5,31 @@ #include "shuffle.h" #include "init_atfork.h" -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include - -#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include namespace { inline void Permute(char* buf, size_t len, ui32 seed) noexcept { diff --git a/util/random/entropy.h b/src/util/random/entropy.h similarity index 100% rename from util/random/entropy.h rename to src/util/random/entropy.h diff --git a/util/random/entropy_ut.cpp b/src/util/random/entropy_ut.cpp similarity index 80% rename from util/random/entropy_ut.cpp rename to src/util/random/entropy_ut.cpp index 1ff27203f04..919ff9e8df3 100644 --- a/util/random/entropy_ut.cpp +++ b/src/util/random/entropy_ut.cpp @@ -1,6 +1,6 @@ #include "entropy.h" -#include +#include Y_UNIT_TEST_SUITE(TestEntropy) { Y_UNIT_TEST(TestSeed) { diff --git a/util/random/fast.cpp b/src/util/random/fast.cpp similarity index 96% rename from util/random/fast.cpp rename to src/util/random/fast.cpp index 2f98dfc5d35..5f857fcebcc 100644 --- a/util/random/fast.cpp +++ b/src/util/random/fast.cpp @@ -1,6 +1,6 @@ #include "fast.h" -#include +#include static inline ui32 FixSeq(ui32 seq1, ui32 seq2) noexcept { const ui32 mask = (~(ui32)(0)) >> 1; diff --git a/util/random/fast.h b/src/util/random/fast.h similarity index 96% rename from util/random/fast.h rename to src/util/random/fast.h index ddc57116416..9e7c8edd151 100644 --- a/util/random/fast.h +++ b/src/util/random/fast.h @@ -3,8 +3,8 @@ #include "lcg_engine.h" #include "common_ops.h" -#include -#include +#include +#include // based on http://www.pcg-random.org/. See T*FastRng* family below. diff --git a/util/random/fast_ut.cpp b/src/util/random/fast_ut.cpp similarity index 98% rename from util/random/fast_ut.cpp rename to src/util/random/fast_ut.cpp index 60994a98b06..de4bc481c9f 100644 --- a/util/random/fast_ut.cpp +++ b/src/util/random/fast_ut.cpp @@ -1,6 +1,6 @@ #include "fast.h" -#include +#include Y_UNIT_TEST_SUITE(TTestFastRng) { Y_UNIT_TEST(Test1) { diff --git a/util/random/init_atfork.cpp b/src/util/random/init_atfork.cpp similarity index 86% rename from util/random/init_atfork.cpp rename to src/util/random/init_atfork.cpp index 4c9a7778d2d..5ab54d2cbc4 100644 --- a/util/random/init_atfork.cpp +++ b/src/util/random/init_atfork.cpp @@ -1,8 +1,8 @@ #include "init_atfork.h" #include "random.h" -#include -#include +#include +#include #if defined(_unix_) #include diff --git a/util/random/init_atfork.h b/src/util/random/init_atfork.h similarity index 100% rename from util/random/init_atfork.h rename to src/util/random/init_atfork.h diff --git a/util/random/lcg_engine.cpp b/src/util/random/lcg_engine.cpp similarity index 100% rename from util/random/lcg_engine.cpp rename to src/util/random/lcg_engine.cpp diff --git a/util/random/lcg_engine.h b/src/util/random/lcg_engine.h similarity index 97% rename from util/random/lcg_engine.h rename to src/util/random/lcg_engine.h index 4347b1a5ed8..8be00753cc7 100644 --- a/util/random/lcg_engine.h +++ b/src/util/random/lcg_engine.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include // common engine for lcg-based RNG's // http://en.wikipedia.org/wiki/Linear_congruential_generator diff --git a/util/random/mersenne.cpp b/src/util/random/mersenne.cpp similarity index 100% rename from util/random/mersenne.cpp rename to src/util/random/mersenne.cpp diff --git a/util/random/mersenne.h b/src/util/random/mersenne.h similarity index 100% rename from util/random/mersenne.h rename to src/util/random/mersenne.h diff --git a/util/random/mersenne32.cpp b/src/util/random/mersenne32.cpp similarity index 96% rename from util/random/mersenne32.cpp rename to src/util/random/mersenne32.cpp index cb8aad8b039..547bdd140f4 100644 --- a/util/random/mersenne32.cpp +++ b/src/util/random/mersenne32.cpp @@ -1,7 +1,7 @@ #include "mersenne32.h" -#include -#include +#include +#include using namespace NPrivate; diff --git a/util/random/mersenne32.h b/src/util/random/mersenne32.h similarity index 96% rename from util/random/mersenne32.h rename to src/util/random/mersenne32.h index 861f3a3d387..7cecb586f19 100644 --- a/util/random/mersenne32.h +++ b/src/util/random/mersenne32.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class IInputStream; diff --git a/util/random/mersenne64.cpp b/src/util/random/mersenne64.cpp similarity index 96% rename from util/random/mersenne64.cpp rename to src/util/random/mersenne64.cpp index 4ede2c6dca4..417d5e21731 100644 --- a/util/random/mersenne64.cpp +++ b/src/util/random/mersenne64.cpp @@ -1,7 +1,7 @@ #include "mersenne64.h" -#include -#include +#include +#include #define MM 156 #define MATRIX_A ULL(0xB5026F5AA96619E9) diff --git a/util/random/mersenne64.h b/src/util/random/mersenne64.h similarity index 96% rename from util/random/mersenne64.h rename to src/util/random/mersenne64.h index 12ca43b6afc..07509bfd573 100644 --- a/util/random/mersenne64.h +++ b/src/util/random/mersenne64.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class IInputStream; diff --git a/util/random/mersenne_ut.cpp b/src/util/random/mersenne_ut.cpp similarity index 95% rename from util/random/mersenne_ut.cpp rename to src/util/random/mersenne_ut.cpp index a4b84efa3d1..6f12429ae97 100644 --- a/util/random/mersenne_ut.cpp +++ b/src/util/random/mersenne_ut.cpp @@ -1,8 +1,8 @@ #include "mersenne.h" -#include +#include -#include +#include #define UI32(x) x##ul diff --git a/util/random/normal.cpp b/src/util/random/normal.cpp similarity index 100% rename from util/random/normal.cpp rename to src/util/random/normal.cpp diff --git a/util/random/normal.h b/src/util/random/normal.h similarity index 100% rename from util/random/normal.h rename to src/util/random/normal.h diff --git a/util/random/normal_ut.cpp b/src/util/random/normal_ut.cpp similarity index 95% rename from util/random/normal_ut.cpp rename to src/util/random/normal_ut.cpp index 146a94e4ea5..002eabaa653 100644 --- a/util/random/normal_ut.cpp +++ b/src/util/random/normal_ut.cpp @@ -1,9 +1,9 @@ #include "normal.h" #include "fast.h" -#include +#include -#include +#include #include diff --git a/util/random/random.cpp b/src/util/random/random.cpp similarity index 93% rename from util/random/random.cpp rename to src/util/random/random.cpp index 71f93238568..33b5d0ef95c 100644 --- a/util/random/random.cpp +++ b/src/util/random/random.cpp @@ -2,11 +2,11 @@ #include "entropy.h" #include "mersenne.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace { struct TProcStream { diff --git a/util/random/random.h b/src/util/random/random.h similarity index 100% rename from util/random/random.h rename to src/util/random/random.h diff --git a/util/random/random_ut.cpp b/src/util/random/random_ut.cpp similarity index 97% rename from util/random/random_ut.cpp rename to src/util/random/random_ut.cpp index 30427676f36..ab4ddbafa73 100644 --- a/util/random/random_ut.cpp +++ b/src/util/random/random_ut.cpp @@ -1,8 +1,8 @@ #include "random.h" -#include +#include -#include +#include template static inline void AssertRange(T v, T r1, T r2) { diff --git a/util/random/shuffle.cpp b/src/util/random/shuffle.cpp similarity index 100% rename from util/random/shuffle.cpp rename to src/util/random/shuffle.cpp diff --git a/util/random/shuffle.h b/src/util/random/shuffle.h similarity index 97% rename from util/random/shuffle.h rename to src/util/random/shuffle.h index 218695696be..85b374d83d1 100644 --- a/util/random/shuffle.h +++ b/src/util/random/shuffle.h @@ -3,8 +3,8 @@ #include "fast.h" #include "entropy.h" -#include -#include +#include +#include // some kind of https://en.wikipedia.org/wiki/Fisher–Yates_shuffle#The_modern_algorithm diff --git a/util/random/shuffle_ut.cpp b/src/util/random/shuffle_ut.cpp similarity index 96% rename from util/random/shuffle_ut.cpp rename to src/util/random/shuffle_ut.cpp index ca85667c4bf..e14b6030af5 100644 --- a/util/random/shuffle_ut.cpp +++ b/src/util/random/shuffle_ut.cpp @@ -2,9 +2,9 @@ #include "shuffle.h" #include "mersenne.h" -#include +#include -#include +#include Y_UNIT_TEST_SUITE(TRandUtilsTest) { template diff --git a/util/random/ut/ya.make b/src/util/random/ut/ya.make similarity index 82% rename from util/random/ut/ya.make rename to src/util/random/ut/ya.make index 66c9078fbdc..656d90acff5 100644 --- a/util/random/ut/ya.make +++ b/src/util/random/ut/ya.make @@ -13,6 +13,6 @@ SRCS( random/shuffle_ut.cpp ) -INCLUDE(${ARCADIA_ROOT}/util/tests/ya_util_tests.inc) +INCLUDE(${ARCADIA_ROOT}/src/util/tests/ya_util_tests.inc) END() diff --git a/util/str_stl.cpp b/src/util/str_stl.cpp similarity index 100% rename from util/str_stl.cpp rename to src/util/str_stl.cpp diff --git a/util/str_stl.h b/src/util/str_stl.h similarity index 97% rename from util/str_stl.h rename to src/util/str_stl.h index ec1acdf7c63..ef4c88ce6a3 100644 --- a/util/str_stl.h +++ b/src/util/str_stl.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/util/stream/buffer.cpp b/src/util/stream/buffer.cpp similarity index 98% rename from util/stream/buffer.cpp rename to src/util/stream/buffer.cpp index 25469ed8901..e25ed4bad3d 100644 --- a/util/stream/buffer.cpp +++ b/src/util/stream/buffer.cpp @@ -1,5 +1,5 @@ #include "buffer.h" -#include +#include #include diff --git a/util/stream/buffer.h b/src/util/stream/buffer.h similarity index 98% rename from util/stream/buffer.h rename to src/util/stream/buffer.h index 9dc99dbe49f..e7982eaf06e 100644 --- a/util/stream/buffer.h +++ b/src/util/stream/buffer.h @@ -3,7 +3,7 @@ #include "zerocopy.h" #include "zerocopy_output.h" -#include +#include class TBuffer; diff --git a/util/stream/buffer_ut.cpp b/src/util/stream/buffer_ut.cpp similarity index 96% rename from util/stream/buffer_ut.cpp rename to src/util/stream/buffer_ut.cpp index aa60c133a34..8ed9f80305b 100644 --- a/util/stream/buffer_ut.cpp +++ b/src/util/stream/buffer_ut.cpp @@ -1,8 +1,8 @@ #include "buffer.h" -#include +#include -#include +#include #include diff --git a/util/stream/buffered.cpp b/src/util/stream/buffered.cpp similarity index 98% rename from util/stream/buffered.cpp rename to src/util/stream/buffered.cpp index 9124b428df2..9e09d1c5eda 100644 --- a/util/stream/buffered.cpp +++ b/src/util/stream/buffered.cpp @@ -1,9 +1,9 @@ #include "mem.h" #include "buffered.h" -#include -#include -#include +#include +#include +#include #include diff --git a/util/stream/buffered.h b/src/util/stream/buffered.h similarity index 98% rename from util/stream/buffered.h rename to src/util/stream/buffered.h index 1a799fd57b8..14df004ccc4 100644 --- a/util/stream/buffered.h +++ b/src/util/stream/buffered.h @@ -4,9 +4,9 @@ #include "zerocopy_output.h" #include -#include -#include -#include +#include +#include +#include /** * @addtogroup Streams_Buffered diff --git a/util/stream/buffered_ut.cpp b/src/util/stream/buffered_ut.cpp similarity index 97% rename from util/stream/buffered_ut.cpp rename to src/util/stream/buffered_ut.cpp index d560959913e..0e1399e56b2 100644 --- a/util/stream/buffered_ut.cpp +++ b/src/util/stream/buffered_ut.cpp @@ -1,8 +1,8 @@ #include "buffered.h" -#include +#include -#include +#include Y_UNIT_TEST_SUITE(TestBufferedIO) { template diff --git a/util/stream/debug.cpp b/src/util/stream/debug.cpp similarity index 86% rename from util/stream/debug.cpp rename to src/util/stream/debug.cpp index dc6c84e0e12..90845156abb 100644 --- a/util/stream/debug.cpp +++ b/src/util/stream/debug.cpp @@ -1,9 +1,9 @@ #include "null.h" #include "debug.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/util/stream/debug.h b/src/util/stream/debug.h similarity index 100% rename from util/stream/debug.h rename to src/util/stream/debug.h diff --git a/util/stream/file.cpp b/src/util/stream/file.cpp similarity index 96% rename from util/stream/file.cpp rename to src/util/stream/file.cpp index 8893ce9165f..58c25415fab 100644 --- a/util/stream/file.cpp +++ b/src/util/stream/file.cpp @@ -1,7 +1,7 @@ #include "file.h" -#include -#include +#include +#include TUnbufferedFileInput::TUnbufferedFileInput(const char* path) : TUnbufferedFileInput(TFile(path, OPEN_MODE)) diff --git a/util/stream/file.h b/src/util/stream/file.h similarity index 98% rename from util/stream/file.h rename to src/util/stream/file.h index 7762de880f8..0709d8a671f 100644 --- a/util/stream/file.h +++ b/src/util/stream/file.h @@ -6,7 +6,7 @@ #include "buffered.h" #include "mem.h" -#include +#include #include diff --git a/util/stream/file_ut.cpp b/src/util/stream/file_ut.cpp similarity index 94% rename from util/stream/file_ut.cpp rename to src/util/stream/file_ut.cpp index 7abcc441588..cebcea28068 100644 --- a/util/stream/file_ut.cpp +++ b/src/util/stream/file_ut.cpp @@ -1,8 +1,8 @@ #include "file.h" -#include +#include -#include +#include static const char* TmpFileName = "./fileio"; static const char* TmpFileContents = "To do good to Mankind is the chivalrous plan"; diff --git a/util/stream/format.cpp b/src/util/stream/format.cpp similarity index 98% rename from util/stream/format.cpp rename to src/util/stream/format.cpp index 3996130df5d..6027b4c1f60 100644 --- a/util/stream/format.cpp +++ b/src/util/stream/format.cpp @@ -1,8 +1,8 @@ #include "format.h" #include "output.h" -#include -#include +#include +#include namespace NFormatPrivate { static inline i64 Round(double value) { diff --git a/util/stream/format.h b/src/util/stream/format.h similarity index 99% rename from util/stream/format.h rename to src/util/stream/format.h index 9a8ffafdcbe..b7bd542c4c7 100644 --- a/util/stream/format.h +++ b/src/util/stream/format.h @@ -3,10 +3,10 @@ #include "mem.h" #include "output.h" -#include -#include -#include -#include +#include +#include +#include +#include enum ENumberFormatFlag { HF_FULL = 0x01, /**< Output number with leading zeros. */ diff --git a/util/stream/format_std_ut.cpp b/src/util/stream/format_std_ut.cpp similarity index 97% rename from util/stream/format_std_ut.cpp rename to src/util/stream/format_std_ut.cpp index d2296c4909d..4ecde4b9c26 100644 --- a/util/stream/format_std_ut.cpp +++ b/src/util/stream/format_std_ut.cpp @@ -1,6 +1,6 @@ #include "format.h" -#include +#include #include diff --git a/util/stream/format_ut.cpp b/src/util/stream/format_ut.cpp similarity index 99% rename from util/stream/format_ut.cpp rename to src/util/stream/format_ut.cpp index 84e35c7b914..1340d9c0822 100644 --- a/util/stream/format_ut.cpp +++ b/src/util/stream/format_ut.cpp @@ -1,7 +1,7 @@ #include "format.h" -#include -#include +#include +#include Y_UNIT_TEST_SUITE(TOutputStreamFormattingTest) { Y_UNIT_TEST(TestLeftPad) { diff --git a/util/stream/fwd.cpp b/src/util/stream/fwd.cpp similarity index 100% rename from util/stream/fwd.cpp rename to src/util/stream/fwd.cpp diff --git a/util/stream/fwd.h b/src/util/stream/fwd.h similarity index 97% rename from util/stream/fwd.h rename to src/util/stream/fwd.h index 12d5014e633..2c8613d5971 100644 --- a/util/stream/fwd.h +++ b/src/util/stream/fwd.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class IInputStream; class IOutputStream; diff --git a/util/stream/hex.cpp b/src/util/stream/hex.cpp similarity index 96% rename from util/stream/hex.cpp rename to src/util/stream/hex.cpp index 6a51ab6b4b5..0f7ccd7f44c 100644 --- a/util/stream/hex.cpp +++ b/src/util/stream/hex.cpp @@ -1,7 +1,7 @@ #include "hex.h" #include "output.h" -#include +#include void HexEncode(const void* in, size_t len, IOutputStream& out) { static const size_t NUM_OF_BYTES = 32; diff --git a/util/stream/hex.h b/src/util/stream/hex.h similarity index 82% rename from util/stream/hex.h rename to src/util/stream/hex.h index a018933b1b3..a1ea56d9644 100644 --- a/util/stream/hex.h +++ b/src/util/stream/hex.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class IOutputStream; diff --git a/util/stream/hex_ut.cpp b/src/util/stream/hex_ut.cpp similarity index 93% rename from util/stream/hex_ut.cpp rename to src/util/stream/hex_ut.cpp index 350190d2f71..835806b7575 100644 --- a/util/stream/hex_ut.cpp +++ b/src/util/stream/hex_ut.cpp @@ -1,6 +1,6 @@ #include "hex.h" -#include +#include #include "str.h" Y_UNIT_TEST_SUITE(THexCodingTest) { diff --git a/util/stream/input.cpp b/src/util/stream/input.cpp similarity index 96% rename from util/stream/input.cpp rename to src/util/stream/input.cpp index 599364efbba..8b6dd6326c0 100644 --- a/util/stream/input.cpp +++ b/src/util/stream/input.cpp @@ -2,13 +2,13 @@ #include "output.h" #include "str.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/util/stream/input.h b/src/util/stream/input.h similarity index 98% rename from util/stream/input.h rename to src/util/stream/input.h index 7e21f56aa36..e211f5b2576 100644 --- a/util/stream/input.h +++ b/src/util/stream/input.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include class IOutputStream; diff --git a/util/stream/input_ut.cpp b/src/util/stream/input_ut.cpp similarity index 96% rename from util/stream/input_ut.cpp rename to src/util/stream/input_ut.cpp index 1e262b5111a..fc07012fb38 100644 --- a/util/stream/input_ut.cpp +++ b/src/util/stream/input_ut.cpp @@ -1,10 +1,10 @@ #include "input.h" #include "output.h" -#include +#include -#include -#include +#include +#include #ifdef _win_ #include diff --git a/util/stream/ios_ut.cpp b/src/util/stream/ios_ut.cpp similarity index 98% rename from util/stream/ios_ut.cpp rename to src/util/stream/ios_ut.cpp index a249c30ea15..14aa05cf8c5 100644 --- a/util/stream/ios_ut.cpp +++ b/src/util/stream/ios_ut.cpp @@ -4,11 +4,11 @@ #include "buffered.h" #include "walk.h" -#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/util/stream/length.cpp b/src/util/stream/length.cpp similarity index 100% rename from util/stream/length.cpp rename to src/util/stream/length.cpp diff --git a/util/stream/length.h b/src/util/stream/length.h similarity index 95% rename from util/stream/length.h rename to src/util/stream/length.h index e30a746fbdd..399cf97ae5e 100644 --- a/util/stream/length.h +++ b/src/util/stream/length.h @@ -3,7 +3,7 @@ #include "input.h" #include "output.h" -#include +#include /** * Proxy input stream that can read a limited number of characters from a slave diff --git a/util/stream/length_ut.cpp b/src/util/stream/length_ut.cpp similarity index 85% rename from util/stream/length_ut.cpp rename to src/util/stream/length_ut.cpp index 9881d606f57..10c02ea3676 100644 --- a/util/stream/length_ut.cpp +++ b/src/util/stream/length_ut.cpp @@ -1,6 +1,6 @@ #include "length.h" -#include +#include Y_UNIT_TEST_SUITE(TestLengthIO) { diff --git a/util/stream/mem.cpp b/src/util/stream/mem.cpp similarity index 96% rename from util/stream/mem.cpp rename to src/util/stream/mem.cpp index d342226cfe2..ed4375012c2 100644 --- a/util/stream/mem.cpp +++ b/src/util/stream/mem.cpp @@ -1,6 +1,6 @@ #include "mem.h" -#include +#include TMemoryInput::TMemoryInput() noexcept : Buf_(nullptr) diff --git a/util/stream/mem.h b/src/util/stream/mem.h similarity index 100% rename from util/stream/mem.h rename to src/util/stream/mem.h diff --git a/util/stream/mem_ut.cpp b/src/util/stream/mem_ut.cpp similarity index 97% rename from util/stream/mem_ut.cpp rename to src/util/stream/mem_ut.cpp index 199fc8c8d04..4dd7728eeeb 100644 --- a/util/stream/mem_ut.cpp +++ b/src/util/stream/mem_ut.cpp @@ -1,6 +1,6 @@ #include "mem.h" -#include +#include Y_UNIT_TEST_SUITE(TestMemIO) { Y_UNIT_TEST(TestReadTo) { diff --git a/util/stream/multi.cpp b/src/util/stream/multi.cpp similarity index 100% rename from util/stream/multi.cpp rename to src/util/stream/multi.cpp diff --git a/util/stream/multi.h b/src/util/stream/multi.h similarity index 90% rename from util/stream/multi.h rename to src/util/stream/multi.h index 322876b8578..3fbdc6b2d6e 100644 --- a/util/stream/multi.h +++ b/src/util/stream/multi.h @@ -26,7 +26,7 @@ class TMultiInput: public IInputStream { }; /** - * See also "util/stream/tee.h" for multi output. + * See also "src/util/stream/tee.h" for multi output. */ /** @} */ diff --git a/util/stream/multi_ut.cpp b/src/util/stream/multi_ut.cpp similarity index 97% rename from util/stream/multi_ut.cpp rename to src/util/stream/multi_ut.cpp index 361ff65b059..636423e5787 100644 --- a/util/stream/multi_ut.cpp +++ b/src/util/stream/multi_ut.cpp @@ -1,6 +1,6 @@ #include "mem.h" #include "multi.h" -#include +#include Y_UNIT_TEST_SUITE(TestMultiInput) { struct TTestCase { diff --git a/util/stream/null.cpp b/src/util/stream/null.cpp similarity index 95% rename from util/stream/null.cpp rename to src/util/stream/null.cpp index 1c350567e90..54578339e12 100644 --- a/util/stream/null.cpp +++ b/src/util/stream/null.cpp @@ -1,6 +1,6 @@ #include "null.h" -#include +#include TNullIO& NPrivate::UtilNullStream() noexcept { return *SingletonWithPriority(); diff --git a/util/stream/null.h b/src/util/stream/null.h similarity index 100% rename from util/stream/null.h rename to src/util/stream/null.h diff --git a/util/stream/output.cpp b/src/util/stream/output.cpp similarity index 97% rename from util/stream/output.cpp rename to src/util/stream/output.cpp index 9e507ec10c8..47d8f59e0ba 100644 --- a/util/stream/output.cpp +++ b/src/util/stream/output.cpp @@ -1,16 +1,16 @@ #include "output.h" -#include +#include #include "format.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #if defined(_android_) - #include - #include + #include + #include #include #include #endif diff --git a/util/stream/output.h b/src/util/stream/output.h similarity index 98% rename from util/stream/output.h rename to src/util/stream/output.h index 486b9ab6903..b802987f4df 100644 --- a/util/stream/output.h +++ b/src/util/stream/output.h @@ -2,8 +2,8 @@ #include "fwd.h" -#include -#include +#include +#include #include #include diff --git a/util/stream/output.pxd b/src/util/stream/output.pxd similarity index 85% rename from util/stream/output.pxd rename to src/util/stream/output.pxd index 029ac355f7e..7a56699ebaa 100644 --- a/util/stream/output.pxd +++ b/src/util/stream/output.pxd @@ -1,7 +1,7 @@ from util.generic.string cimport std::string_view -cdef extern from "" nogil: +cdef extern from "" nogil: cdef cppclass IOutputStream: IOutputStream() void Flush() except+ diff --git a/util/stream/str.cpp b/src/util/stream/str.cpp similarity index 96% rename from util/stream/str.cpp rename to src/util/stream/str.cpp index c3608eb9e7d..30fa1bbaf57 100644 --- a/util/stream/str.cpp +++ b/src/util/stream/str.cpp @@ -1,6 +1,6 @@ #include "str.h" -#include +#include static constexpr size_t MIN_BUFFER_GROW_SIZE = 16; diff --git a/util/stream/str.h b/src/util/stream/str.h similarity index 97% rename from util/stream/str.h rename to src/util/stream/str.h index 7e6fa1537fd..de2288e2e85 100644 --- a/util/stream/str.h +++ b/src/util/stream/str.h @@ -3,8 +3,8 @@ #include "zerocopy.h" #include "zerocopy_output.h" -#include -#include +#include +#include #include @@ -26,7 +26,7 @@ class TStringInput: public IZeroCopyInputFastReadTo { * up to the user to make sure that the string doesn't get destroyed while * this stream is in use. * - * For reading data from `std::string_view`s, see `TMemoryInput` (`util/stream/mem.h`). + * For reading data from `std::string_view`s, see `TMemoryInput` (`src/util/stream/mem.h`). * * @param s String to read from. */ diff --git a/util/stream/str.pxd b/src/util/stream/str.pxd similarity index 87% rename from util/stream/str.pxd rename to src/util/stream/str.pxd index 312b83b0ff5..30066acb8ff 100644 --- a/util/stream/str.pxd +++ b/src/util/stream/str.pxd @@ -3,7 +3,7 @@ from util.generic.string cimport std::string, std::string_view from util.stream.output cimport IOutputStream -cdef extern from "" nogil: +cdef extern from "" nogil: cdef cppclass TStringOutput(IOutputStream): TStringOutput() except+ TStringOutput(std::string&) except+ diff --git a/util/stream/str_ut.cpp b/src/util/stream/str_ut.cpp similarity index 97% rename from util/stream/str_ut.cpp rename to src/util/stream/str_ut.cpp index a9d497f7613..b791f5b7ade 100644 --- a/util/stream/str_ut.cpp +++ b/src/util/stream/str_ut.cpp @@ -1,7 +1,7 @@ #include "str.h" -#include -#include +#include +#include template const T ReturnConstTemp(); diff --git a/util/stream/str_ut.pyx b/src/util/stream/str_ut.pyx similarity index 100% rename from util/stream/str_ut.pyx rename to src/util/stream/str_ut.pyx diff --git a/util/stream/tee.cpp b/src/util/stream/tee.cpp similarity index 100% rename from util/stream/tee.cpp rename to src/util/stream/tee.cpp diff --git a/util/stream/tee.h b/src/util/stream/tee.h similarity index 100% rename from util/stream/tee.h rename to src/util/stream/tee.h diff --git a/util/stream/tempbuf.cpp b/src/util/stream/tempbuf.cpp similarity index 100% rename from util/stream/tempbuf.cpp rename to src/util/stream/tempbuf.cpp diff --git a/util/stream/tempbuf.h b/src/util/stream/tempbuf.h similarity index 91% rename from util/stream/tempbuf.h rename to src/util/stream/tempbuf.h index a6dc001025a..8b5d965fbb2 100644 --- a/util/stream/tempbuf.h +++ b/src/util/stream/tempbuf.h @@ -2,7 +2,7 @@ #include "output.h" -#include +#include class TTempBufOutput: public IOutputStream, public TTempBuf { public: diff --git a/util/stream/ut/ya.make b/src/util/stream/ut/ya.make similarity index 90% rename from util/stream/ut/ya.make rename to src/util/stream/ut/ya.make index c2e268cb024..d2d9f4dbd76 100644 --- a/util/stream/ut/ya.make +++ b/src/util/stream/ut/ya.make @@ -25,6 +25,6 @@ SRCS( stream/zlib_ut.cpp ) -INCLUDE(${ARCADIA_ROOT}/util/tests/ya_util_tests.inc) +INCLUDE(${ARCADIA_ROOT}/src/util/tests/ya_util_tests.inc) END() diff --git a/util/stream/ut_cython/test_stream.py b/src/util/stream/ut_cython/test_stream.py similarity index 100% rename from util/stream/ut_cython/test_stream.py rename to src/util/stream/ut_cython/test_stream.py diff --git a/util/stream/ut_cython/ya.make b/src/util/stream/ut_cython/ya.make similarity index 85% rename from util/stream/ut_cython/ya.make rename to src/util/stream/ut_cython/ya.make index 841a8fb0bae..76cea2bb55d 100644 --- a/util/stream/ut_cython/ya.make +++ b/src/util/stream/ut_cython/ya.make @@ -2,7 +2,7 @@ PY23_TEST() SUBSCRIBER(g:util-subscribers) -SRCDIR(util/stream) +SRCDIR(src/util/stream) PY_SRCS( NAMESPACE util.stream diff --git a/util/stream/walk.cpp b/src/util/stream/walk.cpp similarity index 100% rename from util/stream/walk.cpp rename to src/util/stream/walk.cpp diff --git a/util/stream/walk.h b/src/util/stream/walk.h similarity index 100% rename from util/stream/walk.h rename to src/util/stream/walk.h diff --git a/util/stream/walk_ut.cpp b/src/util/stream/walk_ut.cpp similarity index 96% rename from util/stream/walk_ut.cpp rename to src/util/stream/walk_ut.cpp index 7528e58b230..d154769b71f 100644 --- a/util/stream/walk_ut.cpp +++ b/src/util/stream/walk_ut.cpp @@ -1,6 +1,6 @@ #include "walk.h" -#include +#include class TStringListInput: public IWalkInput { public: diff --git a/util/stream/zerocopy.cpp b/src/util/stream/zerocopy.cpp similarity index 100% rename from util/stream/zerocopy.cpp rename to src/util/stream/zerocopy.cpp diff --git a/util/stream/zerocopy.h b/src/util/stream/zerocopy.h similarity index 95% rename from util/stream/zerocopy.h rename to src/util/stream/zerocopy.h index 23ff04a2443..92675cfbd22 100644 --- a/util/stream/zerocopy.h +++ b/src/util/stream/zerocopy.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "input.h" diff --git a/util/stream/zerocopy_output.cpp b/src/util/stream/zerocopy_output.cpp similarity index 93% rename from util/stream/zerocopy_output.cpp rename to src/util/stream/zerocopy_output.cpp index 23600ef6e18..cb7fb6f5b2c 100644 --- a/util/stream/zerocopy_output.cpp +++ b/src/util/stream/zerocopy_output.cpp @@ -1,6 +1,6 @@ #include "zerocopy_output.h" -#include +#include void IZeroCopyOutput::DoWrite(const void* buf, size_t len) { void* ptr = nullptr; diff --git a/util/stream/zerocopy_output.h b/src/util/stream/zerocopy_output.h similarity index 97% rename from util/stream/zerocopy_output.h rename to src/util/stream/zerocopy_output.h index a388be04b04..07b1bd30a03 100644 --- a/util/stream/zerocopy_output.h +++ b/src/util/stream/zerocopy_output.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "output.h" diff --git a/util/stream/zerocopy_output_ut.cpp b/src/util/stream/zerocopy_output_ut.cpp similarity index 95% rename from util/stream/zerocopy_output_ut.cpp rename to src/util/stream/zerocopy_output_ut.cpp index 9798302ec4f..3d9cf054334 100644 --- a/util/stream/zerocopy_output_ut.cpp +++ b/src/util/stream/zerocopy_output_ut.cpp @@ -1,6 +1,6 @@ #include "zerocopy_output.h" -#include +#include // This version of string output stream is written here only diff --git a/util/stream/zlib.cpp b/src/util/stream/zlib.cpp similarity index 98% rename from util/stream/zlib.cpp rename to src/util/stream/zlib.cpp index ce69ba62b61..4a076a0304f 100644 --- a/util/stream/zlib.cpp +++ b/src/util/stream/zlib.cpp @@ -1,8 +1,8 @@ #include "zlib.h" -#include -#include -#include +#include +#include +#include #include diff --git a/util/stream/zlib.h b/src/util/stream/zlib.h similarity index 97% rename from util/stream/zlib.h rename to src/util/stream/zlib.h index 9c19fa2e761..105b265f681 100644 --- a/util/stream/zlib.h +++ b/src/util/stream/zlib.h @@ -5,9 +5,9 @@ #include "output.h" #include "buffered.h" -#include -#include -#include +#include +#include +#include /** * @addtogroup Streams_Archs diff --git a/util/stream/zlib_ut.cpp b/src/util/stream/zlib_ut.cpp similarity index 98% rename from util/stream/zlib_ut.cpp rename to src/util/stream/zlib_ut.cpp index bdbc642983e..6645a7bf944 100644 --- a/util/stream/zlib_ut.cpp +++ b/src/util/stream/zlib_ut.cpp @@ -1,10 +1,10 @@ #include "zlib.h" -#include +#include #include "file.h" -#include -#include +#include +#include #define ZDATA "./zdata" diff --git a/util/string/ascii.cpp b/src/util/string/ascii.cpp similarity index 97% rename from util/string/ascii.cpp rename to src/util/string/ascii.cpp index f930865bb9c..fe24395ead0 100644 --- a/util/string/ascii.cpp +++ b/src/util/string/ascii.cpp @@ -1,7 +1,7 @@ #include "ascii.h" -#include -#include +#include +#include // clang-format off extern const unsigned char NPrivate::ASCII_CLASS[256] = { diff --git a/util/string/ascii.h b/src/util/string/ascii.h similarity index 93% rename from util/string/ascii.h rename to src/util/string/ascii.h index 21b1e66c7b5..1ea4b38d1c1 100644 --- a/util/string/ascii.h +++ b/src/util/string/ascii.h @@ -2,8 +2,8 @@ #include -#include -#include +#include +#include #include @@ -148,7 +148,7 @@ inline ::NPrivate::TDereferenced AsciiToUpper(T c) noexcept { /** * ASCII case-insensitive string comparison (for proper UTF8 strings - * case-insensitive comparison consider using @c library/cpp/charset). + * case-insensitive comparison consider using @c src/library/charset). * * BUGS: Currently will NOT work properly with strings that contain * 0-terminator character inside. See IGNIETFERRO-1641 for details. @@ -161,7 +161,7 @@ static inline bool AsciiEqualsIgnoreCase(const char* s1, const char* s2) noexcep /** * ASCII case-insensitive string comparison (for proper UTF8 strings - * case-insensitive comparison consider using @c library/cpp/charset). + * case-insensitive comparison consider using @c src/library/charset). * * BUGS: Currently will NOT work properly with strings that contain * 0-terminator character inside. See IGNIETFERRO-1641 for details. @@ -180,7 +180,7 @@ static inline bool AsciiEqualsIgnoreCase(const std::string_view s1, const std::s /** * ASCII case-insensitive string comparison (for proper UTF8 strings - * case-insensitive comparison consider using @c library/cpp/charset). + * case-insensitive comparison consider using @c src/library/charset). * * BUGS: Currently will NOT work properly with strings that contain * 0-terminator character inside. See IGNIETFERRO-1641 for details. @@ -195,7 +195,7 @@ static inline int AsciiCompareIgnoreCase(const char* s1, const char* s2) noexcep /** * ASCII case-insensitive string comparison (for proper UTF8 strings - * case-insensitive comparison consider using @c library/cpp/charset). + * case-insensitive comparison consider using @c src/library/charset). * * BUGS: Currently will NOT work properly with strings that contain * 0-terminator character inside. See IGNIETFERRO-1641 for details. @@ -210,7 +210,7 @@ Y_PURE_FUNCTION int AsciiCompareIgnoreCase(const std::string_view s1, const std: /** * ASCII case-sensitive string comparison (for proper UTF8 strings - * case-sensitive comparison consider using @c library/cpp/charset). + * case-sensitive comparison consider using @c src/library/charset). * * BUGS: Currently will NOT work properly with strings that contain * 0-terminator character inside. See IGNIETFERRO-1641 for details. @@ -223,7 +223,7 @@ static inline bool AsciiHasPrefix(const std::string_view s1, const std::string_v /** * ASCII case-insensitive string comparison (for proper UTF8 strings - * case-insensitive comparison consider using @c library/cpp/charset). + * case-insensitive comparison consider using @c src/library/charset). * * @return true iff @c s2 are case-insensitively prefix of @c s1. */ @@ -233,7 +233,7 @@ static inline bool AsciiHasPrefixIgnoreCase(const std::string_view s1, const std /** * ASCII case-insensitive string comparison (for proper UTF8 strings - * case-insensitive comparison consider using @c library/cpp/charset). + * case-insensitive comparison consider using @c src/library/charset). * * @return true iff @c s2 are case-insensitively suffix of @c s1. */ diff --git a/util/string/ascii_ut.cpp b/src/util/string/ascii_ut.cpp similarity index 98% rename from util/string/ascii_ut.cpp rename to src/util/string/ascii_ut.cpp index f2bd0c7945b..76dd954e1c6 100644 --- a/util/string/ascii_ut.cpp +++ b/src/util/string/ascii_ut.cpp @@ -1,7 +1,7 @@ #include "ascii.h" #include -#include +#include Y_UNIT_TEST_SUITE(TAsciiTest) { Y_UNIT_TEST(TestAscii) { diff --git a/util/string/builder.cpp b/src/util/string/builder.cpp similarity index 81% rename from util/string/builder.cpp rename to src/util/string/builder.cpp index 33e53456396..9e5c94ef48e 100644 --- a/util/string/builder.cpp +++ b/src/util/string/builder.cpp @@ -1,6 +1,6 @@ #include "builder.h" -#include +#include template <> void Out(IOutputStream& os, const TStringBuilder& sb) { diff --git a/util/string/builder.h b/src/util/string/builder.h similarity index 96% rename from util/string/builder.h rename to src/util/string/builder.h index e5668fd1a31..68ab87b7b7b 100644 --- a/util/string/builder.h +++ b/src/util/string/builder.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include namespace NPrivateStringBuilder { diff --git a/util/string/builder_ut.cpp b/src/util/string/builder_ut.cpp similarity index 97% rename from util/string/builder_ut.cpp rename to src/util/string/builder_ut.cpp index 563a088ce7e..bd4a36d0252 100644 --- a/util/string/builder_ut.cpp +++ b/src/util/string/builder_ut.cpp @@ -1,6 +1,6 @@ #include "builder.h" -#include +#include static void TestEquals(const std::string& expected, const std::string& actual) { UNIT_ASSERT_VALUES_EQUAL(expected, actual); diff --git a/util/string/cast.cpp b/src/util/string/cast.cpp similarity index 98% rename from util/string/cast.cpp rename to src/util/string/cast.cpp index aff29f7306d..daafc9f0640 100644 --- a/util/string/cast.cpp +++ b/src/util/string/cast.cpp @@ -1,4 +1,4 @@ -#include +#include #if defined(_freebsd_) && !defined(__LONG_LONG_SUPPORTED) #define __LONG_LONG_SUPPORTED @@ -9,18 +9,18 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include using double_conversion::DoubleToStringConverter; using double_conversion::StringBuilder; diff --git a/util/string/cast.h b/src/util/string/cast.h similarity index 98% rename from util/string/cast.h rename to src/util/string/cast.h index 53f987d1eb1..5ba63a85d76 100644 --- a/util/string/cast.h +++ b/src/util/string/cast.h @@ -1,11 +1,11 @@ #pragma once -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/util/string/cast.pxd b/src/util/string/cast.pxd similarity index 83% rename from util/string/cast.pxd rename to src/util/string/cast.pxd index a49fcaab8ac..f4f04401a15 100644 --- a/util/string/cast.pxd +++ b/src/util/string/cast.pxd @@ -1,6 +1,6 @@ from libcpp cimport bool as bool_t -cdef extern from "" nogil: +cdef extern from "" nogil: T FromString[T](const std::string&) except + bool_t TryFromString[T](const std::string&, T&) except + std::string ToString[T](const T&) except + diff --git a/util/string/cast_ut.cpp b/src/util/string/cast_ut.cpp similarity index 99% rename from util/string/cast_ut.cpp rename to src/util/string/cast_ut.cpp index 31ff719c225..b5d46eb5ffe 100644 --- a/util/string/cast_ut.cpp +++ b/src/util/string/cast_ut.cpp @@ -1,9 +1,9 @@ #include "cast.h" -#include +#include -#include -#include +#include +#include #include diff --git a/util/string/cast_ut.pyx b/src/util/string/cast_ut.pyx similarity index 100% rename from util/string/cast_ut.pyx rename to src/util/string/cast_ut.pyx diff --git a/util/string/cstriter.cpp b/src/util/string/cstriter.cpp similarity index 100% rename from util/string/cstriter.cpp rename to src/util/string/cstriter.cpp diff --git a/util/string/cstriter.h b/src/util/string/cstriter.h similarity index 100% rename from util/string/cstriter.h rename to src/util/string/cstriter.h diff --git a/util/string/escape.cpp b/src/util/string/escape.cpp similarity index 99% rename from util/string/escape.cpp rename to src/util/string/escape.cpp index 559f6848edf..09cbc478390 100644 --- a/util/string/escape.cpp +++ b/src/util/string/escape.cpp @@ -1,9 +1,9 @@ #include "escape.h" #include "cast.h" -#include -#include -#include +#include +#include +#include /// @todo: escape trigraphs (eg "??/" is "\") diff --git a/util/string/escape.h b/src/util/string/escape.h similarity index 98% rename from util/string/escape.h rename to src/util/string/escape.h index d340b4a3086..6f5e74efbcd 100644 --- a/util/string/escape.h +++ b/src/util/string/escape.h @@ -1,6 +1,6 @@ #pragma once -#include +#include template std::basic_string& EscapeCImpl(const TChar* str, size_t len, std::basic_string&); diff --git a/util/string/escape_ut.cpp b/src/util/string/escape_ut.cpp similarity index 98% rename from util/string/escape_ut.cpp rename to src/util/string/escape_ut.cpp index c24c4133436..e862adbcf6e 100644 --- a/util/string/escape_ut.cpp +++ b/src/util/string/escape_ut.cpp @@ -1,8 +1,8 @@ #include "escape.h" -#include +#include -#include +#include using namespace std::string_view_literals; diff --git a/util/string/hex.cpp b/src/util/string/hex.cpp similarity index 100% rename from util/string/hex.cpp rename to src/util/string/hex.cpp diff --git a/util/string/hex.h b/src/util/string/hex.h similarity index 96% rename from util/string/hex.h rename to src/util/string/hex.h index d882872daeb..449fcb72546 100644 --- a/util/string/hex.h +++ b/src/util/string/hex.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include inline static char DigitToChar(unsigned char digit) { if (digit < 10) { diff --git a/util/string/hex_ut.cpp b/src/util/string/hex_ut.cpp similarity index 92% rename from util/string/hex_ut.cpp rename to src/util/string/hex_ut.cpp index 39a83d5e62b..0b4aa9e69dd 100644 --- a/util/string/hex_ut.cpp +++ b/src/util/string/hex_ut.cpp @@ -1,6 +1,6 @@ #include "hex.h" -#include +#include Y_UNIT_TEST_SUITE(THexCodingTest) { Y_UNIT_TEST(TestEncode) { diff --git a/util/string/join.cpp b/src/util/string/join.cpp similarity index 100% rename from util/string/join.cpp rename to src/util/string/join.cpp diff --git a/util/string/join.h b/src/util/string/join.h similarity index 99% rename from util/string/join.h rename to src/util/string/join.h index eb834e75132..ba02e1729e6 100644 --- a/util/string/join.h +++ b/src/util/string/join.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include "cast.h" /* diff --git a/util/string/join_ut.cpp b/src/util/string/join_ut.cpp similarity index 98% rename from util/string/join_ut.cpp rename to src/util/string/join_ut.cpp index c4818da5c16..6617518206b 100644 --- a/util/string/join_ut.cpp +++ b/src/util/string/join_ut.cpp @@ -1,9 +1,9 @@ #include "join.h" -#include -#include +#include +#include -#include +#include struct TCustomData { std::vector Ints; diff --git a/util/string/reverse.cpp b/src/util/string/reverse.cpp similarity index 94% rename from util/string/reverse.cpp rename to src/util/string/reverse.cpp index ee2dd3677ea..67d5ecd8e69 100644 --- a/util/string/reverse.cpp +++ b/src/util/string/reverse.cpp @@ -1,6 +1,6 @@ #include "reverse.h" -#include +#include #include #include diff --git a/util/string/reverse.h b/src/util/string/reverse.h similarity index 92% rename from util/string/reverse.h rename to src/util/string/reverse.h index cddfc54f089..e439dd132de 100644 --- a/util/string/reverse.h +++ b/src/util/string/reverse.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/util/string/split.cpp b/src/util/string/split.cpp similarity index 100% rename from util/string/split.cpp rename to src/util/string/split.cpp diff --git a/util/string/split.h b/src/util/string/split.h similarity index 98% rename from util/string/split.h rename to src/util/string/split.h index 3ad6bb8457b..05c91904057 100644 --- a/util/string/split.h +++ b/src/util/string/split.h @@ -3,17 +3,17 @@ #include "strspn.h" #include "cast.h" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/util/string/split_ut.cpp b/src/util/string/split_ut.cpp similarity index 99% rename from util/string/split_ut.cpp rename to src/util/string/split_ut.cpp index aee860d1c5d..b1412042ac7 100644 --- a/util/string/split_ut.cpp +++ b/src/util/string/split_ut.cpp @@ -1,10 +1,10 @@ #include "split.h" -#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/util/string/strip.cpp b/src/util/string/strip.cpp similarity index 92% rename from util/string/strip.cpp rename to src/util/string/strip.cpp index e6610ff76f7..c9c9d6e46fe 100644 --- a/util/string/strip.cpp +++ b/src/util/string/strip.cpp @@ -1,7 +1,7 @@ #include "strip.h" #include "ascii.h" -#include +#include void CollapseText(const std::string& from, std::string& to, size_t maxLen) { Collapse(from, to, maxLen); diff --git a/util/string/strip.h b/src/util/string/strip.h similarity index 99% rename from util/string/strip.h rename to src/util/string/strip.h index 1b0643dcded..53fb3d91fbc 100644 --- a/util/string/strip.h +++ b/src/util/string/strip.h @@ -2,7 +2,7 @@ #include "ascii.h" -#include +#include #include template diff --git a/util/string/strip_ut.cpp b/src/util/string/strip_ut.cpp similarity index 98% rename from util/string/strip_ut.cpp rename to src/util/string/strip_ut.cpp index 16c6541dc30..498a297bb98 100644 --- a/util/string/strip_ut.cpp +++ b/src/util/string/strip_ut.cpp @@ -1,8 +1,8 @@ #include "strip.h" -#include +#include -#include +#include Y_UNIT_TEST_SUITE(TStripStringTest) { struct TStripTest { diff --git a/util/string/strspn.cpp b/src/util/string/strspn.cpp similarity index 100% rename from util/string/strspn.cpp rename to src/util/string/strspn.cpp diff --git a/util/string/strspn.h b/src/util/string/strspn.h similarity index 97% rename from util/string/strspn.h rename to src/util/string/strspn.h index c33b980d252..449c72ca673 100644 --- a/util/string/strspn.h +++ b/src/util/string/strspn.h @@ -2,7 +2,7 @@ #include "cstriter.h" -#include +#include template class TStrSpnImpl { diff --git a/util/string/strspn_ut.cpp b/src/util/string/strspn_ut.cpp similarity index 98% rename from util/string/strspn_ut.cpp rename to src/util/string/strspn_ut.cpp index c672f8d3ba1..a6fe5d1b8b2 100644 --- a/util/string/strspn_ut.cpp +++ b/src/util/string/strspn_ut.cpp @@ -1,6 +1,6 @@ #include "strspn.h" -#include +#include Y_UNIT_TEST_SUITE(TStrSpnTest) { Y_UNIT_TEST(FindFirstOf) { diff --git a/util/string/subst.cpp b/src/util/string/subst.cpp similarity index 99% rename from util/string/subst.cpp rename to src/util/string/subst.cpp index ecf6c2892b8..2f75567e0b0 100644 --- a/util/string/subst.cpp +++ b/src/util/string/subst.cpp @@ -1,6 +1,6 @@ #include "subst.h" -#include +#include #include #include diff --git a/util/string/subst.h b/src/util/string/subst.h similarity index 98% rename from util/string/subst.h rename to src/util/string/subst.h index c4da05f4ad9..0f263c8ed20 100644 --- a/util/string/subst.h +++ b/src/util/string/subst.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/util/string/subst_ut.cpp b/src/util/string/subst_ut.cpp similarity index 99% rename from util/string/subst_ut.cpp rename to src/util/string/subst_ut.cpp index 8bc030a1e77..f8461dd023c 100644 --- a/util/string/subst_ut.cpp +++ b/src/util/string/subst_ut.cpp @@ -2,7 +2,7 @@ #include "subst.h" #include -#include +#include Y_UNIT_TEST_SUITE(TStringSubst) { static const size_t MIN_FROM_CTX = 4; diff --git a/util/string/type.cpp b/src/util/string/type.cpp similarity index 100% rename from util/string/type.cpp rename to src/util/string/type.cpp diff --git a/util/string/type.h b/src/util/string/type.h similarity index 96% rename from util/string/type.h rename to src/util/string/type.h index bb97f5a6607..8a29023ddde 100644 --- a/util/string/type.h +++ b/src/util/string/type.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/util/string/type_ut.cpp b/src/util/string/type_ut.cpp similarity index 96% rename from util/string/type_ut.cpp rename to src/util/string/type_ut.cpp index 779da13be55..eae18974234 100644 --- a/util/string/type_ut.cpp +++ b/src/util/string/type_ut.cpp @@ -1,8 +1,8 @@ #include "type.h" -#include +#include -#include +#include Y_UNIT_TEST_SUITE(TStringClassify) { Y_UNIT_TEST(TestIsSpace) { diff --git a/util/string/ut/ya.make b/src/util/string/ut/ya.make similarity index 87% rename from util/string/ut/ya.make rename to src/util/string/ut/ya.make index d3377a40a1c..9cb9d6fa81b 100644 --- a/util/string/ut/ya.make +++ b/src/util/string/ut/ya.make @@ -19,6 +19,6 @@ SRCS( string/ascii_ut.cpp ) -INCLUDE(${ARCADIA_ROOT}/util/tests/ya_util_tests.inc) +INCLUDE(${ARCADIA_ROOT}/src/util/tests/ya_util_tests.inc) END() diff --git a/util/string/ut_cython/test_string.py b/src/util/string/ut_cython/test_string.py similarity index 100% rename from util/string/ut_cython/test_string.py rename to src/util/string/ut_cython/test_string.py diff --git a/util/string/ut_cython/ya.make b/src/util/string/ut_cython/ya.make similarity index 85% rename from util/string/ut_cython/ya.make rename to src/util/string/ut_cython/ya.make index 99a29c96cec..e28914fdee1 100644 --- a/util/string/ut_cython/ya.make +++ b/src/util/string/ut_cython/ya.make @@ -2,7 +2,7 @@ PY23_TEST() SUBSCRIBER(g:util-subscribers) -SRCDIR(util/string) +SRCDIR(src/util/string) PY_SRCS( NAMESPACE util.string diff --git a/util/string/util.cpp b/src/util/string/util.cpp similarity index 97% rename from util/string/util.cpp rename to src/util/string/util.cpp index 40f42670541..1254d767d0d 100644 --- a/util/string/util.cpp +++ b/src/util/string/util.cpp @@ -1,6 +1,6 @@ #include "util.h" -#include +#include #include #include diff --git a/util/string/util.h b/src/util/string/util.h similarity index 99% rename from util/string/util.h rename to src/util/string/util.h index 9e8bc9737d8..4c1eb317b74 100644 --- a/util/string/util.h +++ b/src/util/string/util.h @@ -6,7 +6,7 @@ #include #include -#include +#include /// @addtogroup Strings_Miscellaneous /// @{ diff --git a/util/string/util_ut.cpp b/src/util/string/util_ut.cpp similarity index 96% rename from util/string/util_ut.cpp rename to src/util/string/util_ut.cpp index d000e4a1ee6..0004c16509f 100644 --- a/util/string/util_ut.cpp +++ b/src/util/string/util_ut.cpp @@ -1,6 +1,6 @@ #include "util.h" -#include +#include class TStrUtilTest: public TTestBase { UNIT_TEST_SUITE(TStrUtilTest); diff --git a/util/string/vector.cpp b/src/util/string/vector.cpp similarity index 98% rename from util/string/vector.cpp rename to src/util/string/vector.cpp index 9967815fef3..10d18b0c5d7 100644 --- a/util/string/vector.cpp +++ b/src/util/string/vector.cpp @@ -2,7 +2,7 @@ #include "split.h" #include "vector.h" -#include +#include template static inline void DoSplit2(TConsumer& c, TDelim& d, const std::basic_string_view str, int) { diff --git a/util/string/vector.h b/src/util/string/vector.h similarity index 98% rename from util/string/vector.h rename to src/util/string/vector.h index bd4dc967855..f46d22a4546 100644 --- a/util/string/vector.h +++ b/src/util/string/vector.h @@ -3,8 +3,8 @@ #include "cast.h" #include "split.h" -#include -#include +#include +#include #define KEEP_EMPTY_TOKENS 0x01 diff --git a/util/string/vector_ut.cpp b/src/util/string/vector_ut.cpp similarity index 94% rename from util/string/vector_ut.cpp rename to src/util/string/vector_ut.cpp index a095b7320f2..55a924044d9 100644 --- a/util/string/vector_ut.cpp +++ b/src/util/string/vector_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #include "cast.h" #include "vector.h" diff --git a/util/system/align.cpp b/src/util/system/align.cpp similarity index 100% rename from util/system/align.cpp rename to src/util/system/align.cpp diff --git a/util/system/align.h b/src/util/system/align.h similarity index 97% rename from util/system/align.h rename to src/util/system/align.h index ea0bbc5b466..47ff41970dc 100644 --- a/util/system/align.h +++ b/src/util/system/align.h @@ -2,7 +2,7 @@ #include "yassert.h" #include "defaults.h" -#include +#include template static inline T AlignDown(T len, T align) noexcept { diff --git a/util/system/align_ut.cpp b/src/util/system/align_ut.cpp similarity index 94% rename from util/system/align_ut.cpp rename to src/util/system/align_ut.cpp index 3ba3a3442b9..2251745d3e0 100644 --- a/util/system/align_ut.cpp +++ b/src/util/system/align_ut.cpp @@ -1,6 +1,6 @@ #include "align.h" -#include +#include class TAlignTest: public TTestBase { UNIT_TEST_SUITE(TAlignTest); diff --git a/util/system/atexit.cpp b/src/util/system/atexit.cpp similarity index 97% rename from util/system/atexit.cpp rename to src/util/system/atexit.cpp index 3eb64aaa9af..a2581accabd 100644 --- a/util/system/atexit.cpp +++ b/src/util/system/atexit.cpp @@ -4,8 +4,8 @@ #include "thread.h" #include -#include -#include +#include +#include #include #include diff --git a/util/system/atexit.h b/src/util/system/atexit.h similarity index 100% rename from util/system/atexit.h rename to src/util/system/atexit.h diff --git a/util/system/atexit_ut.cpp b/src/util/system/atexit_ut.cpp similarity index 95% rename from util/system/atexit_ut.cpp rename to src/util/system/atexit_ut.cpp index f093c2b86b4..680eeb213ba 100644 --- a/util/system/atexit_ut.cpp +++ b/src/util/system/atexit_ut.cpp @@ -1,7 +1,7 @@ -#include +#include #include "atexit.h" -#include +#include #include diff --git a/util/system/backtrace.cpp b/src/util/system/backtrace.cpp similarity index 97% rename from util/system/backtrace.cpp rename to src/util/system/backtrace.cpp index 4bca42b1830..6994a0161b5 100644 --- a/util/system/backtrace.cpp +++ b/src/util/system/backtrace.cpp @@ -2,8 +2,8 @@ #include "platform.h" #include "backtrace.h" -#include -#include +#include +#include #ifdef _win_ #include @@ -114,7 +114,7 @@ size_t BackTrace(void**, size_t) { #endif #if defined(_unix_) && !defined(_cygwin_) - #include + #include #include @@ -146,7 +146,7 @@ TResolvedSymbol ResolveSymbol(void* sym, char* buf, size_t len) { return ret; } #elif defined(_win_) - #include + #include namespace { struct TWinSymbolResolverImpl { diff --git a/util/system/backtrace.h b/src/util/system/backtrace.h similarity index 93% rename from util/system/backtrace.h rename to src/util/system/backtrace.h index 14d87eb1dc8..2840919bbea 100644 --- a/util/system/backtrace.h +++ b/src/util/system/backtrace.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include class IOutputStream; diff --git a/util/system/backtrace_ut.cpp b/src/util/system/backtrace_ut.cpp similarity index 95% rename from util/system/backtrace_ut.cpp rename to src/util/system/backtrace_ut.cpp index 51871c94238..580c83586ee 100644 --- a/util/system/backtrace_ut.cpp +++ b/src/util/system/backtrace_ut.cpp @@ -1,8 +1,8 @@ #include "backtrace.h" -#include +#include -#include +#include using PFunc = int (*)(void**, size_t); diff --git a/util/system/byteorder.cpp b/src/util/system/byteorder.cpp similarity index 100% rename from util/system/byteorder.cpp rename to src/util/system/byteorder.cpp diff --git a/util/system/byteorder.h b/src/util/system/byteorder.h similarity index 98% rename from util/system/byteorder.h rename to src/util/system/byteorder.h index 94b9fea5152..9a5123b0a57 100644 --- a/util/system/byteorder.h +++ b/src/util/system/byteorder.h @@ -13,7 +13,7 @@ #include #endif #else - #include + #include #endif #if defined(_linux_) && !defined(USE_GENERIC_ENDIAN_CVT) diff --git a/util/system/byteorder_ut.cpp b/src/util/system/byteorder_ut.cpp similarity index 92% rename from util/system/byteorder_ut.cpp rename to src/util/system/byteorder_ut.cpp index 39b8603d3f9..1cd8b9c7b37 100644 --- a/util/system/byteorder_ut.cpp +++ b/src/util/system/byteorder_ut.cpp @@ -1,6 +1,6 @@ #include "byteorder.h" -#include +#include class TByteOrderTest: public TTestBase { UNIT_TEST_SUITE(TByteOrderTest); diff --git a/util/system/compat.cpp b/src/util/system/compat.cpp similarity index 100% rename from util/system/compat.cpp rename to src/util/system/compat.cpp diff --git a/util/system/compat.h b/src/util/system/compat.h similarity index 100% rename from util/system/compat.h rename to src/util/system/compat.h diff --git a/util/system/compat_ut.cpp b/src/util/system/compat_ut.cpp similarity index 54% rename from util/system/compat_ut.cpp rename to src/util/system/compat_ut.cpp index dbd9289c17c..ca38b8c196a 100644 --- a/util/system/compat_ut.cpp +++ b/src/util/system/compat_ut.cpp @@ -1,9 +1,9 @@ #include "compat.h" -#include +#include -#include -#include +#include +#include Y_UNIT_TEST_SUITE(TCompatTest) { Y_UNIT_TEST(TestGetprogname) { diff --git a/util/system/compiler.cpp b/src/util/system/compiler.cpp similarity index 100% rename from util/system/compiler.cpp rename to src/util/system/compiler.cpp diff --git a/util/system/compiler.h b/src/util/system/compiler.h similarity index 100% rename from util/system/compiler.h rename to src/util/system/compiler.h diff --git a/util/system/compiler_ut.cpp b/src/util/system/compiler_ut.cpp similarity index 97% rename from util/system/compiler_ut.cpp rename to src/util/system/compiler_ut.cpp index f93b1c08507..775104dea75 100644 --- a/util/system/compiler_ut.cpp +++ b/src/util/system/compiler_ut.cpp @@ -1,6 +1,6 @@ #include "compiler.h" -#include +#include Y_UNIT_TEST_SUITE(TCompilerTest) { Y_UNIT_TEST(TestPragmaNoWshadow) { diff --git a/util/system/context.cpp b/src/util/system/context.cpp similarity index 99% rename from util/system/context.cpp rename to src/util/system/context.cpp index 593a7e581f6..134e3ff75e3 100644 --- a/util/system/context.cpp +++ b/src/util/system/context.cpp @@ -25,8 +25,8 @@ namespace __cxxabiv1 { #endif #endif -#include -#include +#include +#include #define FROM_CONTEXT_IMPL #include "context.h" diff --git a/util/system/context.h b/src/util/system/context.h similarity index 98% rename from util/system/context.h rename to src/util/system/context.h index 78b26368b13..d442d4bad78 100644 --- a/util/system/context.h +++ b/src/util/system/context.h @@ -6,8 +6,8 @@ #include "sanitizers.h" #include -#include -#include +#include +#include #define STACK_ALIGN (8 * PLATFORM_DATA_ALIGN) diff --git a/util/system/context_aarch64.S b/src/util/system/context_aarch64.S similarity index 100% rename from util/system/context_aarch64.S rename to src/util/system/context_aarch64.S diff --git a/util/system/context_aarch64.h b/src/util/system/context_aarch64.h similarity index 100% rename from util/system/context_aarch64.h rename to src/util/system/context_aarch64.h diff --git a/util/system/context_i686.asm b/src/util/system/context_i686.asm similarity index 100% rename from util/system/context_i686.asm rename to src/util/system/context_i686.asm diff --git a/util/system/context_i686.h b/src/util/system/context_i686.h similarity index 100% rename from util/system/context_i686.h rename to src/util/system/context_i686.h diff --git a/util/system/context_ut.cpp b/src/util/system/context_ut.cpp similarity index 93% rename from util/system/context_ut.cpp rename to src/util/system/context_ut.cpp index bf98b81b29b..77f450d2156 100644 --- a/util/system/context_ut.cpp +++ b/src/util/system/context_ut.cpp @@ -1,8 +1,8 @@ #include "context.h" -#include +#include -#include +#include Y_UNIT_TEST_SUITE(TestContext) { template diff --git a/util/system/context_x86.asm b/src/util/system/context_x86.asm similarity index 100% rename from util/system/context_x86.asm rename to src/util/system/context_x86.asm diff --git a/util/system/context_x86.h b/src/util/system/context_x86.h similarity index 100% rename from util/system/context_x86.h rename to src/util/system/context_x86.h diff --git a/util/system/context_x86_64.asm b/src/util/system/context_x86_64.asm similarity index 100% rename from util/system/context_x86_64.asm rename to src/util/system/context_x86_64.asm diff --git a/util/system/context_x86_64.h b/src/util/system/context_x86_64.h similarity index 100% rename from util/system/context_x86_64.h rename to src/util/system/context_x86_64.h diff --git a/util/system/cpu_id.cpp b/src/util/system/cpu_id.cpp similarity index 99% rename from util/system/cpu_id.cpp rename to src/util/system/cpu_id.cpp index 598c71f4d91..4adc9e51467 100644 --- a/util/system/cpu_id.cpp +++ b/src/util/system/cpu_id.cpp @@ -2,7 +2,7 @@ #include "types.h" #include "platform.h" -#include +#include #if defined(_win_) #include diff --git a/util/system/cpu_id.h b/src/util/system/cpu_id.h similarity index 99% rename from util/system/cpu_id.h rename to src/util/system/cpu_id.h index 3c49e728a7d..7296ee8d426 100644 --- a/util/system/cpu_id.h +++ b/src/util/system/cpu_id.h @@ -2,7 +2,7 @@ #include "types.h" #include "compiler.h" -#include +#include #define Y_CPU_ID_ENUMERATE(F) \ F(SSE) \ diff --git a/util/system/cpu_id_ut.cpp b/src/util/system/cpu_id_ut.cpp similarity index 99% rename from util/system/cpu_id_ut.cpp rename to src/util/system/cpu_id_ut.cpp index eef0958321b..f1f23324087 100644 --- a/util/system/cpu_id_ut.cpp +++ b/src/util/system/cpu_id_ut.cpp @@ -2,7 +2,7 @@ #include "platform.h" -#include +#include // There are no tests yet for instructions that use 512-bit wide registers because they are not // supported by some compilers yet. diff --git a/util/system/daemon.cpp b/src/util/system/daemon.cpp similarity index 98% rename from util/system/daemon.cpp rename to src/util/system/daemon.cpp index 13e739f3854..38a869a70d8 100644 --- a/util/system/daemon.cpp +++ b/src/util/system/daemon.cpp @@ -1,7 +1,7 @@ -#include +#include #include -#include +#include #if defined(_win_) #include diff --git a/util/system/daemon.h b/src/util/system/daemon.h similarity index 100% rename from util/system/daemon.h rename to src/util/system/daemon.h diff --git a/util/system/daemon_ut.cpp b/src/util/system/daemon_ut.cpp similarity index 95% rename from util/system/daemon_ut.cpp rename to src/util/system/daemon_ut.cpp index f93b9a96458..92af78dae26 100644 --- a/util/system/daemon_ut.cpp +++ b/src/util/system/daemon_ut.cpp @@ -1,10 +1,10 @@ #include "daemon.h" -#include +#include -#include -#include -#include +#include +#include +#include Y_UNIT_TEST_SUITE(TDaemonTest) { #ifdef _unix_ diff --git a/util/system/datetime.cpp b/src/util/system/datetime.cpp similarity index 98% rename from util/system/datetime.cpp rename to src/util/system/datetime.cpp index b07b50679a6..0deee4eda2a 100644 --- a/util/system/datetime.cpp +++ b/src/util/system/datetime.cpp @@ -3,7 +3,7 @@ #include "platform.h" #include "cpu_id.h" -#include +#include #include #include diff --git a/util/system/datetime.h b/src/util/system/datetime.h similarity index 95% rename from util/system/datetime.h rename to src/util/system/datetime.h index aa009974e09..a260b7ee1b6 100644 --- a/util/system/datetime.h +++ b/src/util/system/datetime.h @@ -12,8 +12,8 @@ #include #endif -/// util/system/datetime.h contains only system time providers -/// for handy datetime utilities include util/datetime/base.h +/// src/util/system/datetime.h contains only system time providers +/// for handy datetime utilities include src/util/datetime/base.h /// Current time in microseconds since epoch ui64 MicroSeconds() noexcept; diff --git a/util/system/datetime_ut.cpp b/src/util/system/datetime_ut.cpp similarity index 100% rename from util/system/datetime_ut.cpp rename to src/util/system/datetime_ut.cpp diff --git a/util/system/defaults.c b/src/util/system/defaults.c similarity index 100% rename from util/system/defaults.c rename to src/util/system/defaults.c diff --git a/util/system/defaults.h b/src/util/system/defaults.h similarity index 98% rename from util/system/defaults.h rename to src/util/system/defaults.h index dcd7abea38e..b05191704bb 100644 --- a/util/system/defaults.h +++ b/src/util/system/defaults.h @@ -121,7 +121,7 @@ constexpr bool Y_IS_DEBUG_BUILD = true; * falsefully accept pointers to types of sizes that are divisors of 8 (1, 2, 4 and 8). */ #if defined(__cplusplus) - #include + #include #else #undef Y_ARRAY_SIZE #define Y_ARRAY_SIZE(arr) \ diff --git a/util/system/demangle_impl.h b/src/util/system/demangle_impl.h similarity index 91% rename from util/system/demangle_impl.h rename to src/util/system/demangle_impl.h index d3e44c571bf..9360c8bd277 100644 --- a/util/system/demangle_impl.h +++ b/src/util/system/demangle_impl.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NPrivate { diff --git a/util/system/direct_io.cpp b/src/util/system/direct_io.cpp similarity index 97% rename from util/system/direct_io.cpp rename to src/util/system/direct_io.cpp index e0069a10501..80b125efff7 100644 --- a/util/system/direct_io.cpp +++ b/src/util/system/direct_io.cpp @@ -1,14 +1,14 @@ #include "direct_io.h" -#include +#include -#include -#include -#include +#include +#include +#include #include "align.h" #ifdef _linux_ - #include + #include #include #include #endif diff --git a/util/system/direct_io.h b/src/util/system/direct_io.h similarity index 98% rename from util/system/direct_io.h rename to src/util/system/direct_io.h index 46829a55fe8..8dcebc755a4 100644 --- a/util/system/direct_io.h +++ b/src/util/system/direct_io.h @@ -3,7 +3,7 @@ #include "align.h" #include "file.h" -#include +#include // Supports Linux Direct-IO: // - Simple buffering logic. diff --git a/util/system/direct_io_ut.cpp b/src/util/system/direct_io_ut.cpp similarity index 95% rename from util/system/direct_io_ut.cpp rename to src/util/system/direct_io_ut.cpp index e26f76e1de4..503c5d60567 100644 --- a/util/system/direct_io_ut.cpp +++ b/src/util/system/direct_io_ut.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include "direct_io.h" diff --git a/util/system/dynlib.cpp b/src/util/system/dynlib.cpp similarity index 97% rename from util/system/dynlib.cpp rename to src/util/system/dynlib.cpp index f7742c8921d..d5919e34003 100644 --- a/util/system/dynlib.cpp +++ b/src/util/system/dynlib.cpp @@ -1,8 +1,8 @@ #include "dynlib.h" #include "guard.h" -#include -#include +#include +#include #include diff --git a/util/system/dynlib.h b/src/util/system/dynlib.h similarity index 98% rename from util/system/dynlib.h rename to src/util/system/dynlib.h index 782a8cccc81..a8ee6215b4e 100644 --- a/util/system/dynlib.h +++ b/src/util/system/dynlib.h @@ -2,7 +2,7 @@ #include "defaults.h" -#include +#include #define Y_GET_FUNC(dll, name) FUNC_##name((dll).Sym(#name)) #define Y_GET_FUNC_OPTIONAL(dll, name) FUNC_##name((dll).SymOptional(#name)) diff --git a/util/system/err.cpp b/src/util/system/err.cpp similarity index 96% rename from util/system/err.cpp rename to src/util/system/err.cpp index 366a84ac056..b6662aa5d15 100644 --- a/util/system/err.cpp +++ b/src/util/system/err.cpp @@ -3,9 +3,9 @@ #include "compat.h" #include "error.h" -#include +#include -#include +#include #include diff --git a/util/system/error.cpp b/src/util/system/error.cpp similarity index 91% rename from util/system/error.cpp rename to src/util/system/error.cpp index b5fd974812d..1219d81afbd 100644 --- a/util/system/error.cpp +++ b/src/util/system/error.cpp @@ -1,14 +1,14 @@ #include "error.h" -#include +#include #include #include #if defined(_win_) - #include - #include - #include + #include + #include + #include #include "winint.h" #endif diff --git a/util/system/error.h b/src/util/system/error.h similarity index 100% rename from util/system/error.h rename to src/util/system/error.h diff --git a/util/system/error_ut.cpp b/src/util/system/error_ut.cpp similarity index 88% rename from util/system/error_ut.cpp rename to src/util/system/error_ut.cpp index 763b0dddb79..eb57767be23 100644 --- a/util/system/error_ut.cpp +++ b/src/util/system/error_ut.cpp @@ -1,8 +1,8 @@ #include "error.h" -#include +#include -#include +#include #ifdef _win_ #include "winint.h" diff --git a/util/system/event.cpp b/src/util/system/event.cpp similarity index 100% rename from util/system/event.cpp rename to src/util/system/event.cpp diff --git a/util/system/event.h b/src/util/system/event.h similarity index 97% rename from util/system/event.h rename to src/util/system/event.h index cab2fc478ab..e67ffaebcdd 100644 --- a/util/system/event.h +++ b/src/util/system/event.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include struct TEventResetType { enum ResetMode { diff --git a/util/system/event_ut.cpp b/src/util/system/event_ut.cpp similarity index 97% rename from util/system/event_ut.cpp rename to src/util/system/event_ut.cpp index ce023cf756e..ab275610a77 100644 --- a/util/system/event_ut.cpp +++ b/src/util/system/event_ut.cpp @@ -1,8 +1,8 @@ #include "event.h" -#include +#include -#include +#include #include diff --git a/util/system/execpath.cpp b/src/util/system/execpath.cpp similarity index 98% rename from util/system/execpath.cpp rename to src/util/system/execpath.cpp index 0b63bfa56f2..3f0a76a3d87 100644 --- a/util/system/execpath.cpp +++ b/src/util/system/execpath.cpp @@ -4,7 +4,7 @@ #include #elif defined(_darwin_) #include - #include + #include #elif defined(_win_) #include "winint.h" #include @@ -16,7 +16,7 @@ #include #endif -#include +#include #include "execpath.h" #include "fs.h" diff --git a/util/system/execpath.h b/src/util/system/execpath.h similarity index 93% rename from util/system/execpath.h rename to src/util/system/execpath.h index 9375d1556ba..d75444e32f0 100644 --- a/util/system/execpath.h +++ b/src/util/system/execpath.h @@ -1,6 +1,6 @@ #pragma once -#include +#include // NOTE: This function has rare sporadic failures (throws exceptions) on FreeBSD. See REVIEW:54297 const std::string& GetExecPath(); diff --git a/util/system/execpath_ut.cpp b/src/util/system/execpath_ut.cpp similarity index 83% rename from util/system/execpath_ut.cpp rename to src/util/system/execpath_ut.cpp index 88b1983cbdf..efd87f34400 100644 --- a/util/system/execpath_ut.cpp +++ b/src/util/system/execpath_ut.cpp @@ -1,8 +1,8 @@ #include "execpath.h" -#include +#include -#include +#include #include diff --git a/util/system/fake_mutex.cpp b/src/util/system/fake_mutex.cpp similarity index 100% rename from util/system/fake_mutex.cpp rename to src/util/system/fake_mutex.cpp diff --git a/util/system/fake_mutex.h b/src/util/system/fake_mutex.h similarity index 91% rename from util/system/fake_mutex.h rename to src/util/system/fake_mutex.h index 328783b68c1..4ab8d60b137 100644 --- a/util/system/fake_mutex.h +++ b/src/util/system/fake_mutex.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class TFakeMutex: public TNonCopyable { public: diff --git a/util/system/fasttime.cpp b/src/util/system/fasttime.cpp similarity index 94% rename from util/system/fasttime.cpp rename to src/util/system/fasttime.cpp index 83378da552d..b12e5dc86e9 100644 --- a/util/system/fasttime.cpp +++ b/src/util/system/fasttime.cpp @@ -1,11 +1,11 @@ #include "dynlib.h" #include "fasttime.h" -#include -#include +#include +#include #include -#include +#include #if defined(_win_) || defined(_arm32_) || defined(_cygwin_) ui64 InterpolatedMicroSeconds() { @@ -17,8 +17,8 @@ ui64 InterpolatedMicroSeconds() { #include #if defined(_musl_) - #include - #include + #include + #include #include #endif @@ -32,7 +32,7 @@ namespace { inline TSymbols() : Func(nullptr) { - // not DEFAULT, cause library/cpp/gettimeofday + // not DEFAULT, cause src/library/gettimeofday Func = reinterpret_cast(dlsym(RTLD_NEXT, "gettimeofday")); #if defined(_musl_) diff --git a/util/system/fasttime.h b/src/util/system/fasttime.h similarity index 100% rename from util/system/fasttime.h rename to src/util/system/fasttime.h diff --git a/util/system/fhandle.cpp b/src/util/system/fhandle.cpp similarity index 100% rename from util/system/fhandle.cpp rename to src/util/system/fhandle.cpp diff --git a/util/system/fhandle.h b/src/util/system/fhandle.h similarity index 100% rename from util/system/fhandle.h rename to src/util/system/fhandle.h diff --git a/util/system/file.cpp b/src/util/system/file.cpp similarity index 98% rename from util/system/file.cpp rename to src/util/system/file.cpp index 66fec31a089..510388c500e 100644 --- a/util/system/file.cpp +++ b/src/util/system/file.cpp @@ -8,21 +8,21 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include -#include +#include -#include -#include -#include +#include +#include +#include -#include +#include #include diff --git a/util/system/file.h b/src/util/system/file.h similarity index 98% rename from util/system/file.h rename to src/util/system/file.h index dc9778a8b9d..a3e51131d59 100644 --- a/util/system/file.h +++ b/src/util/system/file.h @@ -3,10 +3,10 @@ #include "fhandle.h" #include "flock.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/util/system/file_lock.cpp b/src/util/system/file_lock.cpp similarity index 95% rename from util/system/file_lock.cpp rename to src/util/system/file_lock.cpp index 3989180888e..e6c3c110ef0 100644 --- a/util/system/file_lock.cpp +++ b/src/util/system/file_lock.cpp @@ -1,7 +1,7 @@ #include "file_lock.h" #include "flock.h" -#include +#include #include diff --git a/util/system/file_lock.h b/src/util/system/file_lock.h similarity index 81% rename from util/system/file_lock.h rename to src/util/system/file_lock.h index cefc3dc8a6d..dcfabad0cd3 100644 --- a/util/system/file_lock.h +++ b/src/util/system/file_lock.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include enum class EFileLockType { Exclusive, diff --git a/util/system/file_ut.cpp b/src/util/system/file_ut.cpp similarity index 98% rename from util/system/file_ut.cpp rename to src/util/system/file_ut.cpp index 84e836a70fc..b921b6b46e7 100644 --- a/util/system/file_ut.cpp +++ b/src/util/system/file_ut.cpp @@ -2,10 +2,10 @@ #include "fs.h" #include "tempfile.h" -#include +#include -#include -#include +#include +#include class TFileTest: public TTestBase { UNIT_TEST_SUITE(TFileTest); diff --git a/util/system/filemap.cpp b/src/util/system/filemap.cpp similarity index 98% rename from util/system/filemap.cpp rename to src/util/system/filemap.cpp index 2adb27f9dd4..aabbbcdc8d0 100644 --- a/util/system/filemap.cpp +++ b/src/util/system/filemap.cpp @@ -3,8 +3,8 @@ #include "defaults.h" #include "hi_lo.h" -#include -#include +#include +#include #if defined(_win_) #include "winint.h" @@ -29,8 +29,8 @@ #error todo #endif -#include -#include +#include +#include #include "filemap.h" #undef PAGE_SIZE diff --git a/util/system/filemap.h b/src/util/system/filemap.h similarity index 97% rename from util/system/filemap.h rename to src/util/system/filemap.h index 6515da7254e..2a1980f5e64 100644 --- a/util/system/filemap.h +++ b/src/util/system/filemap.h @@ -4,12 +4,12 @@ #include "align.h" #include "yassert.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/util/system/filemap_ut.cpp b/src/util/system/filemap_ut.cpp similarity index 99% rename from util/system/filemap_ut.cpp rename to src/util/system/filemap_ut.cpp index aab34cc2167..89d6db363d7 100644 --- a/util/system/filemap_ut.cpp +++ b/src/util/system/filemap_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #ifdef _unix_ #include @@ -6,7 +6,7 @@ #include "filemap.h" -#include +#include #include #include diff --git a/util/system/flock.cpp b/src/util/system/flock.cpp similarity index 97% rename from util/system/flock.cpp rename to src/util/system/flock.cpp index fe88fecaff9..e35023bcade 100644 --- a/util/system/flock.cpp +++ b/src/util/system/flock.cpp @@ -2,7 +2,7 @@ #ifndef _unix_ - #include + #include #include "winint.h" #include diff --git a/util/system/flock.h b/src/util/system/flock.h similarity index 100% rename from util/system/flock.h rename to src/util/system/flock.h diff --git a/util/system/flock_ut.cpp b/src/util/system/flock_ut.cpp similarity index 97% rename from util/system/flock_ut.cpp rename to src/util/system/flock_ut.cpp index 937653765c1..26361947e2c 100644 --- a/util/system/flock_ut.cpp +++ b/src/util/system/flock_ut.cpp @@ -3,7 +3,7 @@ #include "guard.h" #include "tempfile.h" -#include +#include #include diff --git a/util/system/fs.cpp b/src/util/system/fs.cpp similarity index 95% rename from util/system/fs.cpp rename to src/util/system/fs.cpp index b910fec07af..978af1f43bb 100644 --- a/util/system/fs.cpp +++ b/src/util/system/fs.cpp @@ -8,13 +8,13 @@ #include #endif -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include bool NFs::Remove(const std::string& path) { #if defined(_win_) diff --git a/util/system/fs.h b/src/util/system/fs.h similarity index 98% rename from util/system/fs.h rename to src/util/system/fs.h index f1801892b5d..4ed2f90d976 100644 --- a/util/system/fs.h +++ b/src/util/system/fs.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/util/system/fs_ut.cpp b/src/util/system/fs_ut.cpp similarity index 99% rename from util/system/fs_ut.cpp rename to src/util/system/fs_ut.cpp index 489eeb48951..1efaaba1ed6 100644 --- a/util/system/fs_ut.cpp +++ b/src/util/system/fs_ut.cpp @@ -1,10 +1,10 @@ #include "fs.h" -#include +#include #include "file.h" #include "fstat.h" -#include +#include //WARNING: on windows the test must be run with administative rules diff --git a/util/system/fs_win.cpp b/src/util/system/fs_win.cpp similarity index 99% rename from util/system/fs_win.cpp rename to src/util/system/fs_win.cpp index e2ff40c48e9..acd65af3b74 100644 --- a/util/system/fs_win.cpp +++ b/src/util/system/fs_win.cpp @@ -2,8 +2,8 @@ #include "defaults.h" #include "maxlen.h" -#include -#include +#include +#include #include "file.h" #include diff --git a/util/system/fs_win.h b/src/util/system/fs_win.h similarity index 100% rename from util/system/fs_win.h rename to src/util/system/fs_win.h diff --git a/util/system/fs_win_ut.cpp b/src/util/system/fs_win_ut.cpp similarity index 94% rename from util/system/fs_win_ut.cpp rename to src/util/system/fs_win_ut.cpp index 5260afe1622..1ffa93df8fa 100644 --- a/util/system/fs_win_ut.cpp +++ b/src/util/system/fs_win_ut.cpp @@ -1,15 +1,15 @@ #include "fs.h" #include "fs_win.h" -#include +#include #include "fileapi.h" #include "file.h" #include "fstat.h" #include "win_undef.h" -#include -#include +#include +#include static void Touch(const TFsPath& path) { TFile file(path, CreateAlways | WrOnly); diff --git a/util/system/fstat.cpp b/src/util/system/fstat.cpp similarity index 99% rename from util/system/fstat.cpp rename to src/util/system/fstat.cpp index f50c8e076f9..79cf41965cf 100644 --- a/util/system/fstat.cpp +++ b/src/util/system/fstat.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include diff --git a/util/system/fstat.h b/src/util/system/fstat.h similarity index 95% rename from util/system/fstat.h rename to src/util/system/fstat.h index c5d50e74f18..1d49f5d3621 100644 --- a/util/system/fstat.h +++ b/src/util/system/fstat.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include class TFile; class TFsPath; diff --git a/util/system/fstat_ut.cpp b/src/util/system/fstat_ut.cpp similarity index 98% rename from util/system/fstat_ut.cpp rename to src/util/system/fstat_ut.cpp index 48ad6827504..ee4175fc119 100644 --- a/util/system/fstat_ut.cpp +++ b/src/util/system/fstat_ut.cpp @@ -3,10 +3,10 @@ #include "sysstat.h" #include "fs.h" -#include -#include +#include +#include -#include +#include Y_UNIT_TEST_SUITE(TestFileStat) { Y_UNIT_TEST(FileTest) { diff --git a/util/system/getpid.cpp b/src/util/system/getpid.cpp similarity index 100% rename from util/system/getpid.cpp rename to src/util/system/getpid.cpp diff --git a/util/system/getpid.h b/src/util/system/getpid.h similarity index 100% rename from util/system/getpid.h rename to src/util/system/getpid.h diff --git a/util/system/getpid_ut.cpp b/src/util/system/getpid_ut.cpp similarity index 85% rename from util/system/getpid_ut.cpp rename to src/util/system/getpid_ut.cpp index e7122a2971a..6ae95aecb36 100644 --- a/util/system/getpid_ut.cpp +++ b/src/util/system/getpid_ut.cpp @@ -1,6 +1,6 @@ #include "getpid.h" -#include +#include class TGetPidTest: public TTestBase { UNIT_TEST_SUITE(TGetPidTest); diff --git a/util/system/guard.cpp b/src/util/system/guard.cpp similarity index 100% rename from util/system/guard.cpp rename to src/util/system/guard.cpp diff --git a/util/system/guard.h b/src/util/system/guard.h similarity index 97% rename from util/system/guard.h rename to src/util/system/guard.h index 8677dacd8d7..157b1602b51 100644 --- a/util/system/guard.h +++ b/src/util/system/guard.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include template struct TCommonLockOps { diff --git a/util/system/guard_ut.cpp b/src/util/system/guard_ut.cpp similarity index 97% rename from util/system/guard_ut.cpp rename to src/util/system/guard_ut.cpp index 404ede99ab9..86170fa9ad7 100644 --- a/util/system/guard_ut.cpp +++ b/src/util/system/guard_ut.cpp @@ -1,9 +1,9 @@ #include "guard.h" #include "rwlock.h" -#include +#include -#include +#include struct TTestGuard: public TTestBase { UNIT_TEST_SUITE(TTestGuard); diff --git a/util/system/hi_lo.cpp b/src/util/system/hi_lo.cpp similarity index 100% rename from util/system/hi_lo.cpp rename to src/util/system/hi_lo.cpp diff --git a/util/system/hi_lo.h b/src/util/system/hi_lo.h similarity index 100% rename from util/system/hi_lo.h rename to src/util/system/hi_lo.h diff --git a/util/system/hi_lo_ut.cpp b/src/util/system/hi_lo_ut.cpp similarity index 95% rename from util/system/hi_lo_ut.cpp rename to src/util/system/hi_lo_ut.cpp index 850c12327db..98bdcfe19b3 100644 --- a/util/system/hi_lo_ut.cpp +++ b/src/util/system/hi_lo_ut.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include #include "defaults.h" diff --git a/util/system/hostname.cpp b/src/util/system/hostname.cpp similarity index 94% rename from util/system/hostname.cpp rename to src/util/system/hostname.cpp index 1f3e08098d0..2dc65aa0adc 100644 --- a/util/system/hostname.cpp +++ b/src/util/system/hostname.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #if defined(_unix_) #include diff --git a/util/system/hostname.h b/src/util/system/hostname.h similarity index 83% rename from util/system/hostname.h rename to src/util/system/hostname.h index b714f89367b..afd53179168 100644 --- a/util/system/hostname.h +++ b/src/util/system/hostname.h @@ -1,6 +1,6 @@ #pragma once -#include +#include const char* GetHostName(); const std::string& HostName(); diff --git a/util/system/hostname_ut.cpp b/src/util/system/hostname_ut.cpp similarity index 90% rename from util/system/hostname_ut.cpp rename to src/util/system/hostname_ut.cpp index 507e54abcbe..251f4446426 100644 --- a/util/system/hostname_ut.cpp +++ b/src/util/system/hostname_ut.cpp @@ -1,6 +1,6 @@ #include "hostname.h" -#include +#include #include diff --git a/util/system/hp_timer.cpp b/src/util/system/hp_timer.cpp similarity index 95% rename from util/system/hp_timer.cpp rename to src/util/system/hp_timer.cpp index e4c3f21e6b4..29fad1554ad 100644 --- a/util/system/hp_timer.cpp +++ b/src/util/system/hp_timer.cpp @@ -1,8 +1,8 @@ #include "hp_timer.h" -#include -#include -#include +#include +#include +#include using namespace NHPTimer; diff --git a/util/system/hp_timer.h b/src/util/system/hp_timer.h similarity index 100% rename from util/system/hp_timer.h rename to src/util/system/hp_timer.h diff --git a/util/system/info.cpp b/src/util/system/info.cpp similarity index 97% rename from util/system/info.cpp rename to src/util/system/info.cpp index cf13f1d207c..9241f7f4b5a 100644 --- a/util/system/info.cpp +++ b/src/util/system/info.cpp @@ -36,12 +36,12 @@ static int getloadavg(double* loadavg, int nelem) { #include #endif -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #if defined(_linux_) /* diff --git a/util/system/info.h b/src/util/system/info.h similarity index 100% rename from util/system/info.h rename to src/util/system/info.h diff --git a/util/system/info_ut.cpp b/src/util/system/info_ut.cpp similarity index 91% rename from util/system/info_ut.cpp rename to src/util/system/info_ut.cpp index ad7449f8f49..edbe87a20f5 100644 --- a/util/system/info_ut.cpp +++ b/src/util/system/info_ut.cpp @@ -1,6 +1,6 @@ #include "info.h" -#include +#include class TSysInfoTest: public TTestBase { UNIT_TEST_SUITE(TSysInfoTest); diff --git a/util/system/interrupt_signals.cpp b/src/util/system/interrupt_signals.cpp similarity index 97% rename from util/system/interrupt_signals.cpp rename to src/util/system/interrupt_signals.cpp index b6751342af1..4b88f8e3811 100644 --- a/util/system/interrupt_signals.cpp +++ b/src/util/system/interrupt_signals.cpp @@ -1,6 +1,6 @@ #include "interrupt_signals.h" -#include +#include #include diff --git a/util/system/interrupt_signals.h b/src/util/system/interrupt_signals.h similarity index 100% rename from util/system/interrupt_signals.h rename to src/util/system/interrupt_signals.h diff --git a/util/system/interrupt_signals_ut.cpp b/src/util/system/interrupt_signals_ut.cpp similarity index 93% rename from util/system/interrupt_signals_ut.cpp rename to src/util/system/interrupt_signals_ut.cpp index 2a7f0bddd7d..af4392b9f0b 100644 --- a/util/system/interrupt_signals_ut.cpp +++ b/src/util/system/interrupt_signals_ut.cpp @@ -1,8 +1,8 @@ #include "interrupt_signals.h" -#include +#include -#include +#include #include diff --git a/util/system/madvise.cpp b/src/util/system/madvise.cpp similarity index 97% rename from util/system/madvise.cpp rename to src/util/system/madvise.cpp index 5138c92b464..82f119fb7f6 100644 --- a/util/system/madvise.cpp +++ b/src/util/system/madvise.cpp @@ -2,12 +2,12 @@ #include "align.h" #include "info.h" -#include +#include #include #if defined(_win_) - #include + #include #else #include #endif diff --git a/util/system/madvise.h b/src/util/system/madvise.h similarity index 100% rename from util/system/madvise.h rename to src/util/system/madvise.h diff --git a/util/system/maxlen.cpp b/src/util/system/maxlen.cpp similarity index 100% rename from util/system/maxlen.cpp rename to src/util/system/maxlen.cpp diff --git a/util/system/maxlen.h b/src/util/system/maxlen.h similarity index 100% rename from util/system/maxlen.h rename to src/util/system/maxlen.h diff --git a/util/system/mem_info.cpp b/src/util/system/mem_info.cpp similarity index 97% rename from util/system/mem_info.cpp rename to src/util/system/mem_info.cpp index 1d7f93dde13..efa2e8d3caf 100644 --- a/util/system/mem_info.cpp +++ b/src/util/system/mem_info.cpp @@ -1,10 +1,10 @@ #include "mem_info.h" -#include +#include -#include -#include -#include +#include +#include +#include #include "error.h" #include "info.h" @@ -20,7 +20,7 @@ #endif #elif defined(_win_) #include - #include + #include using NTSTATUS = LONG; #define STATUS_INFO_LENGTH_MISMATCH 0xC0000004 diff --git a/util/system/mem_info.h b/src/util/system/mem_info.h similarity index 100% rename from util/system/mem_info.h rename to src/util/system/mem_info.h diff --git a/util/system/mem_info_ut.cpp b/src/util/system/mem_info_ut.cpp similarity index 89% rename from util/system/mem_info_ut.cpp rename to src/util/system/mem_info_ut.cpp index a1100ba6468..aed2131f373 100644 --- a/util/system/mem_info_ut.cpp +++ b/src/util/system/mem_info_ut.cpp @@ -1,6 +1,6 @@ #include "mem_info.h" -#include +#include #include "info.h" diff --git a/util/system/mincore.cpp b/src/util/system/mincore.cpp similarity index 95% rename from util/system/mincore.cpp rename to src/util/system/mincore.cpp index b9a72515516..3a156e39d73 100644 --- a/util/system/mincore.cpp +++ b/src/util/system/mincore.cpp @@ -2,7 +2,7 @@ #include "info.h" #include "mincore.h" -#include +#include #include diff --git a/util/system/mincore.h b/src/util/system/mincore.h similarity index 100% rename from util/system/mincore.h rename to src/util/system/mincore.h diff --git a/util/system/mincore_ut.cpp b/src/util/system/mincore_ut.cpp similarity index 92% rename from util/system/mincore_ut.cpp rename to src/util/system/mincore_ut.cpp index 6bf6e0e26b6..28e459600a2 100644 --- a/util/system/mincore_ut.cpp +++ b/src/util/system/mincore_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #include "filemap.h" #include "info.h" @@ -6,7 +6,7 @@ #include "mlock.h" #include "tempfile.h" -#include +#include Y_UNIT_TEST_SUITE(MincoreSuite) { static const char* FileName_("./mappped_file"); diff --git a/util/system/mktemp.cpp b/src/util/system/mktemp.cpp similarity index 95% rename from util/system/mktemp.cpp rename to src/util/system/mktemp.cpp index 6af54888862..87004132151 100644 --- a/util/system/mktemp.cpp +++ b/src/util/system/mktemp.cpp @@ -1,7 +1,7 @@ #include "tempfile.h" -#include -#include +#include +#include #include diff --git a/util/system/mktemp_system.cpp b/src/util/system/mktemp_system.cpp similarity index 98% rename from util/system/mktemp_system.cpp rename to src/util/system/mktemp_system.cpp index 601fc67500c..3b2d5cfb547 100644 --- a/util/system/mktemp_system.cpp +++ b/src/util/system/mktemp_system.cpp @@ -39,10 +39,10 @@ #ifdef _win32_ #include "winint.h" - #include + #include #endif -#include +#include #include "sysstat.h" static const unsigned char padchar[] = diff --git a/util/system/mlock.cpp b/src/util/system/mlock.cpp similarity index 98% rename from util/system/mlock.cpp rename to src/util/system/mlock.cpp index 27895bbacc4..c3eefea47f0 100644 --- a/util/system/mlock.cpp +++ b/src/util/system/mlock.cpp @@ -1,4 +1,4 @@ -#include +#include #include "align.h" #include "error.h" #include "info.h" diff --git a/util/system/mlock.h b/src/util/system/mlock.h similarity index 97% rename from util/system/mlock.h rename to src/util/system/mlock.h index 41a9e4457e0..67f0e8c3b54 100644 --- a/util/system/mlock.h +++ b/src/util/system/mlock.h @@ -2,7 +2,7 @@ #include "defaults.h" -#include +#include //on some systems (not win, freebd, linux, but darwin (Mac OS X) //multiple mlock calls on the same address range diff --git a/util/system/nice.cpp b/src/util/system/nice.cpp similarity index 100% rename from util/system/nice.cpp rename to src/util/system/nice.cpp diff --git a/util/system/nice.h b/src/util/system/nice.h similarity index 100% rename from util/system/nice.h rename to src/util/system/nice.h diff --git a/util/system/nice_ut.cpp b/src/util/system/nice_ut.cpp similarity index 94% rename from util/system/nice_ut.cpp rename to src/util/system/nice_ut.cpp index ae0051f285a..2f201c46730 100644 --- a/util/system/nice_ut.cpp +++ b/src/util/system/nice_ut.cpp @@ -2,7 +2,7 @@ #include "platform.h" -#include +#include #ifdef _unix_ #include diff --git a/util/system/pipe.cpp b/src/util/system/pipe.cpp similarity index 98% rename from util/system/pipe.cpp rename to src/util/system/pipe.cpp index 5def63898f3..43e5792f818 100644 --- a/util/system/pipe.cpp +++ b/src/util/system/pipe.cpp @@ -1,6 +1,6 @@ #include "pipe.h" -#include +#include ssize_t TPipeHandle::Read(void* buffer, size_t byteCount) const noexcept { #ifdef _win_ diff --git a/util/system/pipe.h b/src/util/system/pipe.h similarity index 94% rename from util/system/pipe.h rename to src/util/system/pipe.h index 75d03600492..dc9152ebde1 100644 --- a/util/system/pipe.h +++ b/src/util/system/pipe.h @@ -7,9 +7,9 @@ #include "defaults.h" #include "file.h" -#include -#include -#include +#include +#include +#include using PIPEHANDLE = SOCKET; #define INVALID_PIPEHANDLE INVALID_SOCKET diff --git a/util/system/pipe_ut.cpp b/src/util/system/pipe_ut.cpp similarity index 85% rename from util/system/pipe_ut.cpp rename to src/util/system/pipe_ut.cpp index 6d53432de8d..c5d70d8722a 100644 --- a/util/system/pipe_ut.cpp +++ b/src/util/system/pipe_ut.cpp @@ -1,6 +1,6 @@ #include "pipe.h" -#include +#include Y_UNIT_TEST_SUITE(TPipeTest) { Y_UNIT_TEST(TestPipe) { diff --git a/util/system/platform.cpp b/src/util/system/platform.cpp similarity index 100% rename from util/system/platform.cpp rename to src/util/system/platform.cpp diff --git a/util/system/platform.h b/src/util/system/platform.h similarity index 100% rename from util/system/platform.h rename to src/util/system/platform.h diff --git a/util/system/platform_ut.cpp b/src/util/system/platform_ut.cpp similarity index 94% rename from util/system/platform_ut.cpp rename to src/util/system/platform_ut.cpp index 559a6219aa1..cdaca3ed1ff 100644 --- a/util/system/platform_ut.cpp +++ b/src/util/system/platform_ut.cpp @@ -1,6 +1,6 @@ #include "platform.h" -#include +#include class TPlatformTest: public TTestBase { UNIT_TEST_SUITE(TPlatformTest); diff --git a/util/system/progname.cpp b/src/util/system/progname.cpp similarity index 85% rename from util/system/progname.cpp rename to src/util/system/progname.cpp index 5466c2f58e6..b412a3a3f2c 100644 --- a/util/system/progname.cpp +++ b/src/util/system/progname.cpp @@ -1,8 +1,8 @@ #include "execpath.h" #include "progname.h" -#include -#include +#include +#include static const char* Argv0; diff --git a/util/system/progname.h b/src/util/system/progname.h similarity index 89% rename from util/system/progname.h rename to src/util/system/progname.h index e423774586c..b1b585f1a3c 100644 --- a/util/system/progname.h +++ b/src/util/system/progname.h @@ -1,6 +1,6 @@ #pragma once -#include +#include void SetProgramName(const char* argv0); diff --git a/util/system/progname_ut.cpp b/src/util/system/progname_ut.cpp similarity index 90% rename from util/system/progname_ut.cpp rename to src/util/system/progname_ut.cpp index 33e2b8f53ae..5b5dfb7c4da 100644 --- a/util/system/progname_ut.cpp +++ b/src/util/system/progname_ut.cpp @@ -1,6 +1,6 @@ #include "progname.h" -#include +#include #include diff --git a/util/system/protect.cpp b/src/util/system/protect.cpp similarity index 98% rename from util/system/protect.cpp rename to src/util/system/protect.cpp index fb7e550fc1c..606fc19ca24 100644 --- a/util/system/protect.cpp +++ b/src/util/system/protect.cpp @@ -1,6 +1,6 @@ #include "protect.h" -#include +#include #include "yassert.h" diff --git a/util/system/protect.h b/src/util/system/protect.h similarity index 95% rename from util/system/protect.h rename to src/util/system/protect.h index 16859a2cc40..0a1cd37312b 100644 --- a/util/system/protect.h +++ b/src/util/system/protect.h @@ -2,7 +2,7 @@ #include "defaults.h" -#include +#include enum EProtectMemoryMode { PM_NONE = 0x00, // no access allowed diff --git a/util/system/rusage.cpp b/src/util/system/rusage.cpp similarity index 98% rename from util/system/rusage.cpp rename to src/util/system/rusage.cpp index 8bcaade7e39..a95d25221d2 100644 --- a/util/system/rusage.cpp +++ b/src/util/system/rusage.cpp @@ -15,7 +15,7 @@ #endif -#include +#include #include "info.h" diff --git a/util/system/rusage.h b/src/util/system/rusage.h similarity index 83% rename from util/system/rusage.h rename to src/util/system/rusage.h index 61aeca83f25..4e8b31bc8c3 100644 --- a/util/system/rusage.h +++ b/src/util/system/rusage.h @@ -1,8 +1,8 @@ #pragma once #include "defaults.h" -#include -#include +#include +#include /// portable getrusage diff --git a/util/system/rusage_ut.cpp b/src/util/system/rusage_ut.cpp similarity index 77% rename from util/system/rusage_ut.cpp rename to src/util/system/rusage_ut.cpp index 0d4e0fe54b4..a49174a75e9 100644 --- a/util/system/rusage_ut.cpp +++ b/src/util/system/rusage_ut.cpp @@ -1,6 +1,6 @@ #include "rusage.h" -#include +#include Y_UNIT_TEST_SUITE(TRusageTest) { Y_UNIT_TEST(TestRusage) { diff --git a/util/system/rwlock.cpp b/src/util/system/rwlock.cpp similarity index 99% rename from util/system/rwlock.cpp rename to src/util/system/rwlock.cpp index 355a2295663..c3da4c4a4ad 100644 --- a/util/system/rwlock.cpp +++ b/src/util/system/rwlock.cpp @@ -1,6 +1,6 @@ #include "rwlock.h" -#include +#include #if defined(_unix_) #include diff --git a/util/system/rwlock.h b/src/util/system/rwlock.h similarity index 98% rename from util/system/rwlock.h rename to src/util/system/rwlock.h index 0bb9b3fe1c8..0028afb2327 100644 --- a/util/system/rwlock.h +++ b/src/util/system/rwlock.h @@ -3,7 +3,7 @@ #include "guard.h" #include "defaults.h" -#include +#include class TRWMutex { public: diff --git a/util/system/rwlock_ut.cpp b/src/util/system/rwlock_ut.cpp similarity index 96% rename from util/system/rwlock_ut.cpp rename to src/util/system/rwlock_ut.cpp index 5dd225af678..83a2566e5b4 100644 --- a/util/system/rwlock_ut.cpp +++ b/src/util/system/rwlock_ut.cpp @@ -1,9 +1,9 @@ #include "rwlock.h" -#include +#include -#include -#include +#include +#include #include diff --git a/util/system/sanitizers.cpp b/src/util/system/sanitizers.cpp similarity index 100% rename from util/system/sanitizers.cpp rename to src/util/system/sanitizers.cpp diff --git a/util/system/sanitizers.h b/src/util/system/sanitizers.h similarity index 100% rename from util/system/sanitizers.h rename to src/util/system/sanitizers.h diff --git a/util/system/sanitizers_ut.cpp b/src/util/system/sanitizers_ut.cpp similarity index 86% rename from util/system/sanitizers_ut.cpp rename to src/util/system/sanitizers_ut.cpp index 5de096e14b1..d764aa21533 100644 --- a/util/system/sanitizers_ut.cpp +++ b/src/util/system/sanitizers_ut.cpp @@ -1,7 +1,7 @@ #include "sanitizers.h" #include "sys_alloc.h" -#include +#include Y_UNIT_TEST_SUITE(Sanitizers) { Y_UNIT_TEST(MarkAsIntentionallyLeaked) { diff --git a/util/system/sem.cpp b/src/util/system/sem.cpp similarity index 98% rename from util/system/sem.cpp rename to src/util/system/sem.cpp index b1e466ed507..113f31edbee 100644 --- a/util/system/sem.cpp +++ b/src/util/system/sem.cpp @@ -37,12 +37,12 @@ union semun arg; #endif #endif -#include -#include -#include +#include +#include +#include #if !defined(_unix_) || defined(_darwin_) - #include + #include #endif namespace { diff --git a/util/system/sem.h b/src/util/system/sem.h similarity index 96% rename from util/system/sem.h rename to src/util/system/sem.h index 0c964ad6b60..f50ddbe8147 100644 --- a/util/system/sem.h +++ b/src/util/system/sem.h @@ -2,7 +2,7 @@ #include "defaults.h" -#include +#include //named sempahore class TSemaphore { diff --git a/util/system/shellcommand.cpp b/src/util/system/shellcommand.cpp similarity index 98% rename from util/system/shellcommand.cpp rename to src/util/system/shellcommand.cpp index 8a335b48ae0..bf56d138148 100644 --- a/util/system/shellcommand.cpp +++ b/src/util/system/shellcommand.cpp @@ -3,18 +3,18 @@ #include "nice.h" #include "sigset.h" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/util/system/shellcommand.h b/src/util/system/shellcommand.h similarity index 98% rename from util/system/shellcommand.h rename to src/util/system/shellcommand.h index fe578974fa6..233c34d2e82 100644 --- a/util/system/shellcommand.h +++ b/src/util/system/shellcommand.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include "file.h" #include "getpid.h" #include "thread.h" diff --git a/util/system/shellcommand_ut.cpp b/src/util/system/shellcommand_ut.cpp similarity index 97% rename from util/system/shellcommand_ut.cpp rename to src/util/system/shellcommand_ut.cpp index 9d8e53aada5..b3de3c88568 100644 --- a/util/system/shellcommand_ut.cpp +++ b/src/util/system/shellcommand_ut.cpp @@ -6,15 +6,15 @@ #include "sigset.h" #include "spinlock.h" -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include @@ -370,7 +370,7 @@ Y_UNIT_TEST_SUITE(TShellCommandTest) { TShellCommandOptions options; options.SetErrorStream(&Cerr); - TShellCommand cmd(BinaryPath("util/system/ut/stdin_osfhandle/stdin_osfhandle"), options); + TShellCommand cmd(BinaryPath("src/util/system/ut/stdin_osfhandle/stdin_osfhandle"), options); cmd.Run().Wait(); UNIT_ASSERT(TShellCommand::SHELL_FINISHED == cmd.GetStatus()); UNIT_ASSERT(cmd.GetExitCode().Defined() && 0 == cmd.GetExitCode()); diff --git a/util/system/shmat.cpp b/src/util/system/shmat.cpp similarity index 99% rename from util/system/shmat.cpp rename to src/util/system/shmat.cpp index f10a1268e7c..338567fdfd4 100644 --- a/util/system/shmat.cpp +++ b/src/util/system/shmat.cpp @@ -1,6 +1,6 @@ #include "shmat.h" -#include +#include #if defined(_win_) #include diff --git a/util/system/shmat.h b/src/util/system/shmat.h similarity index 86% rename from util/system/shmat.h rename to src/util/system/shmat.h index d9da3c151a8..7e9268b288b 100644 --- a/util/system/shmat.h +++ b/src/util/system/shmat.h @@ -2,8 +2,8 @@ #include "fhandle.h" -#include -#include +#include +#include class TSharedMemory: public TThrRefBase { TGUID Id; diff --git a/util/system/shmat_ut.cpp b/src/util/system/shmat_ut.cpp similarity index 86% rename from util/system/shmat_ut.cpp rename to src/util/system/shmat_ut.cpp index 9d92243ae7f..901793b9f48 100644 --- a/util/system/shmat_ut.cpp +++ b/src/util/system/shmat_ut.cpp @@ -1,6 +1,6 @@ #include "shmat.h" -#include +#include Y_UNIT_TEST_SUITE(TTestSharedMemory) { Y_UNIT_TEST(TestInProc) { diff --git a/util/system/sigset.cpp b/src/util/system/sigset.cpp similarity index 100% rename from util/system/sigset.cpp rename to src/util/system/sigset.cpp diff --git a/util/system/sigset.h b/src/util/system/sigset.h similarity index 100% rename from util/system/sigset.h rename to src/util/system/sigset.h diff --git a/util/system/spin_wait.cpp b/src/util/system/spin_wait.cpp similarity index 91% rename from util/system/spin_wait.cpp rename to src/util/system/spin_wait.cpp index ba125291110..421cbd94101 100644 --- a/util/system/spin_wait.cpp +++ b/src/util/system/spin_wait.cpp @@ -3,8 +3,8 @@ #include "compat.h" #include "spinlock.h" -#include -#include +#include +#include #include diff --git a/util/system/spin_wait.h b/src/util/system/spin_wait.h similarity index 100% rename from util/system/spin_wait.h rename to src/util/system/spin_wait.h diff --git a/util/system/spinlock.cpp b/src/util/system/spinlock.cpp similarity index 100% rename from util/system/spinlock.cpp rename to src/util/system/spinlock.cpp diff --git a/util/system/spinlock.h b/src/util/system/spinlock.h similarity index 100% rename from util/system/spinlock.h rename to src/util/system/spinlock.h diff --git a/util/system/spinlock_ut.cpp b/src/util/system/spinlock_ut.cpp similarity index 94% rename from util/system/spinlock_ut.cpp rename to src/util/system/spinlock_ut.cpp index e8639a6404c..b71f3299fc5 100644 --- a/util/system/spinlock_ut.cpp +++ b/src/util/system/spinlock_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #include "spinlock.h" diff --git a/util/system/src_location.cpp b/src/util/system/src_location.cpp similarity index 88% rename from util/system/src_location.cpp rename to src/util/system/src_location.cpp index fb18bc0f097..c93a93ecee7 100644 --- a/util/system/src_location.cpp +++ b/src/util/system/src_location.cpp @@ -1,6 +1,6 @@ #include "src_location.h" -#include +#include template <> void Out(IOutputStream& o, const TSourceLocation& t) { diff --git a/util/system/src_location.h b/src/util/system/src_location.h similarity index 100% rename from util/system/src_location.h rename to src/util/system/src_location.h diff --git a/util/system/src_location_ut.cpp b/src/util/system/src_location_ut.cpp similarity index 66% rename from util/system/src_location_ut.cpp rename to src/util/system/src_location_ut.cpp index e7a7dc4c234..f31c36dadcf 100644 --- a/util/system/src_location_ut.cpp +++ b/src/util/system/src_location_ut.cpp @@ -1,8 +1,8 @@ #include "src_location.h" -#include +#include -#include +#include static inline std::string GenLoc() { return TStringBuilder() << __LOCATION__; @@ -10,7 +10,7 @@ static inline std::string GenLoc() { Y_UNIT_TEST_SUITE(TestLocation) { Y_UNIT_TEST(Test1) { - UNIT_ASSERT_VALUES_EQUAL(GenLoc(), "util/system/src_location_ut.cpp:8"); + UNIT_ASSERT_VALUES_EQUAL(GenLoc(), "src/util/system/src_location_ut.cpp:8"); static constexpr TSourceLocation location = __LOCATION__; static_assert(location.Line >= 0, "__LOCATION__ can be used at compile time expressions"); diff --git a/util/system/src_root.h b/src/util/system/src_root.h similarity index 100% rename from util/system/src_root.h rename to src/util/system/src_root.h diff --git a/util/system/src_root_ut.cpp b/src/util/system/src_root_ut.cpp similarity index 95% rename from util/system/src_root_ut.cpp rename to src/util/system/src_root_ut.cpp index dd012dc6d71..4182523e65e 100644 --- a/util/system/src_root_ut.cpp +++ b/src/util/system/src_root_ut.cpp @@ -1,7 +1,7 @@ #include "src_root.h" -#include -#include +#include +#include Y_UNIT_TEST_SUITE(TestSourceRoot) { Y_UNIT_TEST(TestStrip) { diff --git a/util/system/sys_alloc.cpp b/src/util/system/sys_alloc.cpp similarity index 100% rename from util/system/sys_alloc.cpp rename to src/util/system/sys_alloc.cpp diff --git a/util/system/sys_alloc.h b/src/util/system/sys_alloc.h similarity index 95% rename from util/system/sys_alloc.h rename to src/util/system/sys_alloc.h index 4221a28f8cc..f4f9a481617 100644 --- a/util/system/sys_alloc.h +++ b/src/util/system/sys_alloc.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/util/system/sysstat.cpp b/src/util/system/sysstat.cpp similarity index 100% rename from util/system/sysstat.cpp rename to src/util/system/sysstat.cpp diff --git a/util/system/sysstat.h b/src/util/system/sysstat.h similarity index 100% rename from util/system/sysstat.h rename to src/util/system/sysstat.h diff --git a/util/system/tempfile.cpp b/src/util/system/tempfile.cpp similarity index 100% rename from util/system/tempfile.cpp rename to src/util/system/tempfile.cpp diff --git a/util/system/tempfile.h b/src/util/system/tempfile.h similarity index 97% rename from util/system/tempfile.h rename to src/util/system/tempfile.h index fb4df793442..da6d386641e 100644 --- a/util/system/tempfile.h +++ b/src/util/system/tempfile.h @@ -3,7 +3,7 @@ #include "fs.h" #include "file.h" -#include +#include class TTempFile { public: diff --git a/util/system/tempfile_ut.cpp b/src/util/system/tempfile_ut.cpp similarity index 96% rename from util/system/tempfile_ut.cpp rename to src/util/system/tempfile_ut.cpp index 104b128a91f..6e4cf6fb8a2 100644 --- a/util/system/tempfile_ut.cpp +++ b/src/util/system/tempfile_ut.cpp @@ -1,10 +1,10 @@ #include "tempfile.h" -#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/util/system/thread.cpp b/src/util/system/thread.cpp similarity index 98% rename from util/system/thread.cpp rename to src/util/system/thread.cpp index aa0d591d85d..87515af904a 100644 --- a/util/system/thread.cpp +++ b/src/util/system/thread.cpp @@ -4,10 +4,10 @@ #include "thread.h" #include "thread.i" -#include -#include -#include -#include +#include +#include +#include +#include #include "yassert.h" #include @@ -26,8 +26,8 @@ #include #elif defined(_win_) #include "dynlib.h" - #include - #include + #include + #include #else #error "FIXME" #endif diff --git a/util/system/thread.h b/src/util/system/thread.h similarity index 97% rename from util/system/thread.h rename to src/util/system/thread.h index ca48520ed8a..447066edbb7 100644 --- a/util/system/thread.h +++ b/src/util/system/thread.h @@ -1,10 +1,10 @@ #pragma once /// This code should not be used directly unless you really understand what you do. -/// If you need threads, use thread pool functionality in +/// If you need threads, use thread pool functionality in /// @see SystemThreadFactory() -#include +#include #include diff --git a/util/system/thread.i b/src/util/system/thread.i similarity index 96% rename from util/system/thread.i rename to src/util/system/thread.i index bb906614023..573256e06bc 100644 --- a/util/system/thread.i +++ b/src/util/system/thread.i @@ -17,7 +17,7 @@ #include #endif -#include +#include static inline size_t SystemCurrentThreadIdImpl() noexcept { #if defined(_unix_) diff --git a/util/system/thread_ut.cpp b/src/util/system/thread_ut.cpp similarity index 99% rename from util/system/thread_ut.cpp rename to src/util/system/thread_ut.cpp index 4e6766b793d..5408d44f1e3 100644 --- a/util/system/thread_ut.cpp +++ b/src/util/system/thread_ut.cpp @@ -1,6 +1,6 @@ #include "thread.h" -#include +#include #include diff --git a/util/system/tls.cpp b/src/util/system/tls.cpp similarity index 98% rename from util/system/tls.cpp rename to src/util/system/tls.cpp index 7968c56310f..8e42fe66aca 100644 --- a/util/system/tls.cpp +++ b/src/util/system/tls.cpp @@ -1,8 +1,8 @@ #include "tls.h" -#include -#include -#include +#include +#include +#include #include diff --git a/util/system/tls.h b/src/util/system/tls.h similarity index 99% rename from util/system/tls.h rename to src/util/system/tls.h index 3c4f56dbeb7..c84d3b9a98c 100644 --- a/util/system/tls.h +++ b/src/util/system/tls.h @@ -2,8 +2,8 @@ #include "defaults.h" -#include -#include +#include +#include #include diff --git a/util/system/tls_ut.cpp b/src/util/system/tls_ut.cpp similarity index 95% rename from util/system/tls_ut.cpp rename to src/util/system/tls_ut.cpp index e84d34b42a3..13067db255f 100644 --- a/util/system/tls_ut.cpp +++ b/src/util/system/tls_ut.cpp @@ -1,7 +1,7 @@ #include "tls.h" #include "thread.h" -#include +#include Y_UNIT_TEST_SUITE(TTestTLS) { struct X { diff --git a/util/system/type_name.cpp b/src/util/system/type_name.cpp similarity index 100% rename from util/system/type_name.cpp rename to src/util/system/type_name.cpp diff --git a/util/system/type_name.h b/src/util/system/type_name.h similarity index 95% rename from util/system/type_name.h rename to src/util/system/type_name.h index d4347369449..ede463423d0 100644 --- a/util/system/type_name.h +++ b/src/util/system/type_name.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/util/system/type_name_ut.cpp b/src/util/system/type_name_ut.cpp similarity index 98% rename from util/system/type_name_ut.cpp rename to src/util/system/type_name_ut.cpp index d5167b4362e..f5009a79338 100644 --- a/util/system/type_name_ut.cpp +++ b/src/util/system/type_name_ut.cpp @@ -1,9 +1,9 @@ #include "type_name.h" -#include +#include -#include -#include +#include +#include #include #include diff --git a/util/system/types.cpp b/src/util/system/types.cpp similarity index 88% rename from util/system/types.cpp rename to src/util/system/types.cpp index 11cc72aee37..2c465a43e64 100644 --- a/util/system/types.cpp +++ b/src/util/system/types.cpp @@ -1,7 +1,7 @@ #include "types.h" -#include -#include +#include +#include static_assert(sizeof(ui8) == 1, "incorrect ui8 type"); static_assert(sizeof(ui16) == 2, "incorrect ui16 type"); diff --git a/util/system/types.h b/src/util/system/types.h similarity index 100% rename from util/system/types.h rename to src/util/system/types.h diff --git a/util/system/types.pxd b/src/util/system/types.pxd similarity index 86% rename from util/system/types.pxd rename to src/util/system/types.pxd index cc916f6e704..74b4e26c1b0 100644 --- a/util/system/types.pxd +++ b/src/util/system/types.pxd @@ -1,7 +1,7 @@ from libc.stdint cimport int8_t, int16_t, int32_t, int64_t from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t -cdef extern from "" nogil: +cdef extern from "" nogil: ctypedef int8_t i8 ctypedef int16_t i16 ctypedef int32_t i32 diff --git a/util/system/types_ut.cpp b/src/util/system/types_ut.cpp similarity index 92% rename from util/system/types_ut.cpp rename to src/util/system/types_ut.cpp index 19e40cef460..89c1f52dd0a 100644 --- a/util/system/types_ut.cpp +++ b/src/util/system/types_ut.cpp @@ -1,6 +1,6 @@ #include "types.h" -#include +#include Y_UNIT_TEST_SUITE(TestTypes) { Y_UNIT_TEST(TestScanf) { diff --git a/util/system/types_ut.pyx b/src/util/system/types_ut.pyx similarity index 100% rename from util/system/types_ut.pyx rename to src/util/system/types_ut.pyx diff --git a/util/system/unaligned_mem.cpp b/src/util/system/unaligned_mem.cpp similarity index 100% rename from util/system/unaligned_mem.cpp rename to src/util/system/unaligned_mem.cpp diff --git a/util/system/unaligned_mem.h b/src/util/system/unaligned_mem.h similarity index 100% rename from util/system/unaligned_mem.h rename to src/util/system/unaligned_mem.h diff --git a/util/system/unaligned_mem_ut.cpp b/src/util/system/unaligned_mem_ut.cpp similarity index 95% rename from util/system/unaligned_mem_ut.cpp rename to src/util/system/unaligned_mem_ut.cpp index 9de3f3e9311..06f6f98733c 100644 --- a/util/system/unaligned_mem_ut.cpp +++ b/src/util/system/unaligned_mem_ut.cpp @@ -1,9 +1,9 @@ #include "unaligned_mem.h" -#include -#include +#include +#include -#include +#include #ifdef Y_HAVE_INT128 namespace { diff --git a/util/system/user.cpp b/src/util/system/user.cpp similarity index 97% rename from util/system/user.cpp rename to src/util/system/user.cpp index 18baabcc497..5640b4a0db7 100644 --- a/util/system/user.cpp +++ b/src/util/system/user.cpp @@ -1,6 +1,6 @@ #include "user.h" -#include +#include #ifdef _win_ #include "winint.h" diff --git a/util/system/user.h b/src/util/system/user.h similarity index 55% rename from util/system/user.h rename to src/util/system/user.h index e25c808c305..07197a5dc2a 100644 --- a/util/system/user.h +++ b/src/util/system/user.h @@ -1,5 +1,5 @@ #pragma once -#include +#include std::string GetUsername(); diff --git a/util/system/user_ut.cpp b/src/util/system/user_ut.cpp similarity index 71% rename from util/system/user_ut.cpp rename to src/util/system/user_ut.cpp index 4f8a5ce2efc..7b948789fb5 100644 --- a/util/system/user_ut.cpp +++ b/src/util/system/user_ut.cpp @@ -1,6 +1,6 @@ #include "user.h" -#include +#include Y_UNIT_TEST_SUITE(TestUser) { Y_UNIT_TEST(TestNotEmpty) { diff --git a/util/system/ut/stdin_osfhandle/main.cpp b/src/util/system/ut/stdin_osfhandle/main.cpp similarity index 100% rename from util/system/ut/stdin_osfhandle/main.cpp rename to src/util/system/ut/stdin_osfhandle/main.cpp diff --git a/util/system/ut/stdin_osfhandle/ya.make b/src/util/system/ut/stdin_osfhandle/ya.make similarity index 100% rename from util/system/ut/stdin_osfhandle/ya.make rename to src/util/system/ut/stdin_osfhandle/ya.make diff --git a/util/system/ut/ya.make b/src/util/system/ut/ya.make similarity index 95% rename from util/system/ut/ya.make rename to src/util/system/ut/ya.make index f69ca701e50..206e2d6d2a0 100644 --- a/util/system/ut/ya.make +++ b/src/util/system/ut/ya.make @@ -21,7 +21,7 @@ IF (OS_DARWIN) ENDIF() PEERDIR( - library/cpp/testing/benchmark + src/library/testing/benchmark ) SRCS( @@ -82,7 +82,7 @@ IF (OS_WINDOWS) system/fs_win_ut.cpp ) DEPENDS( - util/system/ut/stdin_osfhandle + src/util/system/ut/stdin_osfhandle ) ENDIF() diff --git a/util/system/ut_cython/test_system.py b/src/util/system/ut_cython/test_system.py similarity index 100% rename from util/system/ut_cython/test_system.py rename to src/util/system/ut_cython/test_system.py diff --git a/util/system/ut_cython/ya.make b/src/util/system/ut_cython/ya.make similarity index 85% rename from util/system/ut_cython/ya.make rename to src/util/system/ut_cython/ya.make index 62128e231da..85ab0835841 100644 --- a/util/system/ut_cython/ya.make +++ b/src/util/system/ut_cython/ya.make @@ -2,7 +2,7 @@ PY23_TEST() SUBSCRIBER(g:util-subscribers) -SRCDIR(util/system) +SRCDIR(src/util/system) PY_SRCS( NAMESPACE util.system diff --git a/util/system/utime.cpp b/src/util/system/utime.cpp similarity index 100% rename from util/system/utime.cpp rename to src/util/system/utime.cpp diff --git a/util/system/utime.h b/src/util/system/utime.h similarity index 100% rename from util/system/utime.h rename to src/util/system/utime.h diff --git a/util/system/valgrind.cpp b/src/util/system/valgrind.cpp similarity index 100% rename from util/system/valgrind.cpp rename to src/util/system/valgrind.cpp diff --git a/util/system/valgrind.h b/src/util/system/valgrind.h similarity index 100% rename from util/system/valgrind.h rename to src/util/system/valgrind.h diff --git a/util/system/win_undef.h b/src/util/system/win_undef.h similarity index 95% rename from util/system/win_undef.h rename to src/util/system/win_undef.h index 43f3d5c73d2..5157f5a875e 100644 --- a/util/system/win_undef.h +++ b/src/util/system/win_undef.h @@ -3,7 +3,7 @@ * as the user might need to include this header multiple times. */ -#include +#include #if defined(_win_) #undef GetFreeSpace diff --git a/util/system/winint.cpp b/src/util/system/winint.cpp similarity index 100% rename from util/system/winint.cpp rename to src/util/system/winint.cpp diff --git a/util/system/winint.h b/src/util/system/winint.h similarity index 55% rename from util/system/winint.h rename to src/util/system/winint.h index 4f6659b40c1..7f20e4f9c62 100644 --- a/util/system/winint.h +++ b/src/util/system/winint.h @@ -4,13 +4,13 @@ * WARN: * including this header does not make a lot of sense. * You should just #include all necessary headers from Windows SDK, - * and then #include in order to undefine some common macros. + * and then #include in order to undefine some common macros. */ -#include +#include #if defined(_win_) #include #endif -#include +#include diff --git a/util/system/yassert.cpp b/src/util/system/yassert.cpp similarity index 95% rename from util/system/yassert.cpp rename to src/util/system/yassert.cpp index 9294943af59..7a3da118951 100644 --- a/util/system/yassert.cpp +++ b/src/util/system/yassert.cpp @@ -5,10 +5,10 @@ #include "spinlock.h" #include "src_root.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/util/system/yassert.h b/src/util/system/yassert.h similarity index 100% rename from util/system/yassert.h rename to src/util/system/yassert.h diff --git a/util/system/yassert_ut.cpp b/src/util/system/yassert_ut.cpp similarity index 95% rename from util/system/yassert_ut.cpp rename to src/util/system/yassert_ut.cpp index 701da9bf6c2..d04530d413f 100644 --- a/util/system/yassert_ut.cpp +++ b/src/util/system/yassert_ut.cpp @@ -2,7 +2,7 @@ // yassert.h must be included before all headers #include "yassert.h" -#include +#include Y_UNIT_TEST_SUITE(YassertTest) { Y_UNIT_TEST(TestAcsLikeFunctionCall) { diff --git a/util/system/yield.cpp b/src/util/system/yield.cpp similarity index 100% rename from util/system/yield.cpp rename to src/util/system/yield.cpp diff --git a/util/system/yield.h b/src/util/system/yield.h similarity index 100% rename from util/system/yield.h rename to src/util/system/yield.h diff --git a/util/thread/factory.cpp b/src/util/thread/factory.cpp similarity index 96% rename from util/thread/factory.cpp rename to src/util/thread/factory.cpp index b71d9972bb1..5e968766b92 100644 --- a/util/thread/factory.cpp +++ b/src/util/thread/factory.cpp @@ -1,7 +1,7 @@ #include "factory.h" -#include -#include +#include +#include using IThread = IThreadFactory::IThread; diff --git a/util/thread/factory.h b/src/util/thread/factory.h similarity index 97% rename from util/thread/factory.h rename to src/util/thread/factory.h index d0520bf4350..5e43ce1db17 100644 --- a/util/thread/factory.h +++ b/src/util/thread/factory.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include class IThreadFactory { diff --git a/util/thread/factory_ut.cpp b/src/util/thread/factory_ut.cpp similarity index 95% rename from util/thread/factory_ut.cpp rename to src/util/thread/factory_ut.cpp index 647d96c9011..171bf61dcb4 100644 --- a/util/thread/factory_ut.cpp +++ b/src/util/thread/factory_ut.cpp @@ -1,7 +1,7 @@ #include "factory.h" #include "pool.h" -#include +#include class TThrPoolTest: public TTestBase { UNIT_TEST_SUITE(TThrPoolTest); diff --git a/util/thread/fwd.cpp b/src/util/thread/fwd.cpp similarity index 100% rename from util/thread/fwd.cpp rename to src/util/thread/fwd.cpp diff --git a/util/thread/fwd.h b/src/util/thread/fwd.h similarity index 100% rename from util/thread/fwd.h rename to src/util/thread/fwd.h diff --git a/util/thread/pool.cpp b/src/util/thread/pool.cpp similarity index 97% rename from util/thread/pool.cpp rename to src/util/thread/pool.cpp index a1fca1ec0e9..02499c217bd 100644 --- a/util/thread/pool.cpp +++ b/src/util/thread/pool.cpp @@ -1,24 +1,24 @@ #include -#include +#include #if defined(_unix_) #include #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include -#include -#include +#include +#include -#include +#include #include "factory.h" #include "pool.h" diff --git a/util/thread/pool.h b/src/util/thread/pool.h similarity index 98% rename from util/thread/pool.h rename to src/util/thread/pool.h index b7585efc467..bcaadb9ff81 100644 --- a/util/thread/pool.h +++ b/src/util/thread/pool.h @@ -3,11 +3,11 @@ #include "fwd.h" #include "factory.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/util/thread/pool_ut.cpp b/src/util/thread/pool_ut.cpp similarity index 97% rename from util/thread/pool_ut.cpp rename to src/util/thread/pool_ut.cpp index 0003ccb988e..f137c9ef380 100644 --- a/util/thread/pool_ut.cpp +++ b/src/util/thread/pool_ut.cpp @@ -1,10 +1,10 @@ #include "pool.h" -#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/util/thread/singleton.cpp b/src/util/thread/singleton.cpp similarity index 100% rename from util/thread/singleton.cpp rename to src/util/thread/singleton.cpp diff --git a/util/thread/singleton.h b/src/util/thread/singleton.h similarity index 90% rename from util/thread/singleton.h rename to src/util/thread/singleton.h index dc9ee5a4eb7..48bd5777d86 100644 --- a/util/thread/singleton.h +++ b/src/util/thread/singleton.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace NPrivate { template diff --git a/util/thread/singleton_ut.cpp b/src/util/thread/singleton_ut.cpp similarity index 87% rename from util/thread/singleton_ut.cpp rename to src/util/thread/singleton_ut.cpp index 164b1cc184d..7472857d2ba 100644 --- a/util/thread/singleton_ut.cpp +++ b/src/util/thread/singleton_ut.cpp @@ -1,4 +1,4 @@ -#include +#include #include "singleton.h" diff --git a/util/thread/ut/ya.make b/src/util/thread/ut/ya.make similarity index 86% rename from util/thread/ut/ya.make rename to src/util/thread/ut/ya.make index ade94fb4059..76d9f7031be 100644 --- a/util/thread/ut/ya.make +++ b/src/util/thread/ut/ya.make @@ -11,7 +11,7 @@ SRCS( ) PEERDIR( - library/cpp/threading/future + src/library/threading/future ) END() diff --git a/util/ysafeptr.cpp b/src/util/ysafeptr.cpp similarity index 100% rename from util/ysafeptr.cpp rename to src/util/ysafeptr.cpp diff --git a/util/ysafeptr.h b/src/util/ysafeptr.h similarity index 98% rename from util/ysafeptr.h rename to src/util/ysafeptr.h index c33f66db842..ead2f2c48fb 100644 --- a/util/ysafeptr.h +++ b/src/util/ysafeptr.h @@ -1,10 +1,10 @@ #pragma once #include -#include -#include -#include -#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////////////////////////// // There are different templates of pointers: @@ -22,7 +22,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #if defined(_MSC_VER) && defined(_DEBUG) - #include + #include #define CHECK_YPTR2 #endif diff --git a/util/ysaveload.cpp b/src/util/ysaveload.cpp similarity index 95% rename from util/ysaveload.cpp rename to src/util/ysaveload.cpp index cbbcc3a885d..5b8cb0cb2c7 100644 --- a/util/ysaveload.cpp +++ b/src/util/ysaveload.cpp @@ -1,6 +1,6 @@ #include "ysaveload.h" -#include +#include void TSerializer::Save(IOutputStream* rh, const TBuffer& buf) { ::SaveSize(rh, buf.Size()); diff --git a/util/ysaveload.h b/src/util/ysaveload.h similarity index 98% rename from util/ysaveload.h rename to src/util/ysaveload.h index b12b16fda0d..b1151d25b5a 100644 --- a/util/ysaveload.h +++ b/src/util/ysaveload.h @@ -1,13 +1,13 @@ #pragma once #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/util/ysaveload_ut.cpp b/src/util/ysaveload_ut.cpp similarity index 98% rename from util/ysaveload_ut.cpp rename to src/util/ysaveload_ut.cpp index 949318326cb..6cbe428d814 100644 --- a/util/ysaveload_ut.cpp +++ b/src/util/ysaveload_ut.cpp @@ -1,14 +1,14 @@ #include "ysaveload.h" -#include +#include -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include static inline char* AllocateFromPool(TMemoryPool& pool, size_t len) { return (char*)pool.Allocate(len); diff --git a/src/yson_value/CMakeLists.txt b/src/yson_value/CMakeLists.txt new file mode 100644 index 00000000000..5824f00935d --- /dev/null +++ b/src/yson_value/CMakeLists.txt @@ -0,0 +1,16 @@ +add_library(public-lib-yson_value) + +target_link_libraries(public-lib-yson_value PUBLIC + yutil + library-cpp-yson + cpp-yson-node + cpp-client-ydb_result + cpp-client-ydb_value + library-uuid +) + +target_sources(public-lib-yson_value PRIVATE + ydb_yson_value.cpp +) + +add_library(YDB-CPP-SDK::YsonValue ALIAS public-lib-yson_value) diff --git a/ydb/public/lib/yson_value/ydb_yson_value.cpp b/src/yson_value/ydb_yson_value.cpp similarity index 98% rename from ydb/public/lib/yson_value/ydb_yson_value.cpp rename to src/yson_value/ydb_yson_value.cpp index 0634cab788e..b36fc11f25b 100644 --- a/ydb/public/lib/yson_value/ydb_yson_value.cpp +++ b/src/yson_value/ydb_yson_value.cpp @@ -1,11 +1,11 @@ #include "ydb_yson_value.h" -#include +#include -#include -#include +#include +#include -#include +#include namespace NYdb { diff --git a/ydb/public/lib/yson_value/ydb_yson_value.h b/src/yson_value/ydb_yson_value.h similarity index 65% rename from ydb/public/lib/yson_value/ydb_yson_value.h rename to src/yson_value/ydb_yson_value.h index 90bbee035c3..d809e54bc7d 100644 --- a/ydb/public/lib/yson_value/ydb_yson_value.h +++ b/src/yson_value/ydb_yson_value.h @@ -1,12 +1,12 @@ #pragma once -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include namespace NYdb { diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ca1489c7599..3b07d22f746 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,2 +1,3 @@ add_subdirectory(client) add_subdirectory(json_value) +add_subdirectory(library) diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index 786f59f5193..67ff8a6f508 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -1,6 +1,6 @@ add_ydb_test(NAME client-ydb_coordination-ut INCLUDE_DIRS - ${YDB_SDK_SOURCE_DIR}/client/ydb_coordination + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_coordination SOURCES coordination_ut.cpp LINK_LIBRARIES @@ -12,7 +12,7 @@ add_ydb_test(NAME client-ydb_coordination-ut add_ydb_test(NAME client-extensions-discovery_mutator-ut INCLUDE_DIRS - ${YDB_SDK_SOURCE_DIR}/client/extensions/discovery_mutator + ${YDB_SDK_SOURCE_DIR}/src/client/extensions/discovery_mutator SOURCES discovery_mutator_ut.cpp LINK_LIBRARIES @@ -24,7 +24,7 @@ add_ydb_test(NAME client-extensions-discovery_mutator-ut add_ydb_test(NAME client-ydb_driver-ut INCLUDE_DIRS - ${YDB_SDK_SOURCE_DIR}/client/ydb_driver + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_driver SOURCES driver_ut.cpp LINK_LIBRARIES @@ -36,7 +36,7 @@ add_ydb_test(NAME client-ydb_driver-ut add_ydb_test(NAME client-impl-ydb_endpoints-ut INCLUDE_DIRS - ${YDB_SDK_SOURCE_DIR}/client/impl/ydb_endpoints + ${YDB_SDK_SOURCE_DIR}/src/client/impl/ydb_endpoints SOURCES endpoints_ut.cpp LINK_LIBRARIES @@ -47,19 +47,19 @@ add_ydb_test(NAME client-impl-ydb_endpoints-ut add_ydb_test(NAME client-ydb_params-ut INCLUDE_DIRS - ${YDB_SDK_SOURCE_DIR}/client/ydb_params + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_params SOURCES params_ut.cpp LINK_LIBRARIES yutil cpp-testing-unittest_main YDB-CPP-SDK::Params - public-lib-yson_value + YDB-CPP-SDK::YsonValue ) add_ydb_test(NAME client-ydb_result-ut INCLUDE_DIRS - ${YDB_SDK_SOURCE_DIR}/client/ydb_result + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_result SOURCES result_ut.cpp LINK_LIBRARIES @@ -71,21 +71,21 @@ add_ydb_test(NAME client-ydb_result-ut add_ydb_test(NAME client-ydb_value-ut INCLUDE_DIRS - ${YDB_SDK_SOURCE_DIR}/client/ydb_value + ${YDB_SDK_SOURCE_DIR}/src/client/ydb_value SOURCES value_ut.cpp LINK_LIBRARIES yutil cpp-testing-unittest_main YDB-CPP-SDK::Value - public-lib-json_value - public-lib-yson_value + YDB-CPP-SDK::JsonValue + YDB-CPP-SDK::YsonValue YDB-CPP-SDK::Params ) add_ydb_test(NAME client-draft-ut INCLUDE_DIRS - ${YDB_SDK_SOURCE_DIR}/client/draft + ${YDB_SDK_SOURCE_DIR}/src/client/draft SOURCES ydb_scripting_response_headers_ut.cpp LINK_LIBRARIES diff --git a/tests/client/coordination_ut.cpp b/tests/client/coordination_ut.cpp index b2092045925..d5842cb501b 100644 --- a/tests/client/coordination_ut.cpp +++ b/tests/client/coordination_ut.cpp @@ -1,14 +1,14 @@ -#include +#include -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include using namespace NYdb; using namespace NYdb::NCoordination; diff --git a/tests/client/discovery_mutator_ut.cpp b/tests/client/discovery_mutator_ut.cpp index f39c29f8e55..635f5afcbc5 100644 --- a/tests/client/discovery_mutator_ut.cpp +++ b/tests/client/discovery_mutator_ut.cpp @@ -1,10 +1,11 @@ -#include -#include -#include -#include +#include -#include -#include +#include +#include +#include + +#include +#include using namespace NYdb; using namespace NDiscoveryMutator; diff --git a/tests/client/driver_ut.cpp b/tests/client/driver_ut.cpp index e0d50d13b1a..3429b7c18c8 100644 --- a/tests/client/driver_ut.cpp +++ b/tests/client/driver_ut.cpp @@ -1,15 +1,15 @@ -#include -#include +#include +#include -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include #include diff --git a/tests/client/endpoints_ut.cpp b/tests/client/endpoints_ut.cpp index 3137f43063f..d8ba052a5e7 100644 --- a/tests/client/endpoints_ut.cpp +++ b/tests/client/endpoints_ut.cpp @@ -1,11 +1,11 @@ -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #include diff --git a/tests/client/params_ut.cpp b/tests/client/params_ut.cpp index 6ad19f66d8b..bff0a12cec2 100644 --- a/tests/client/params_ut.cpp +++ b/tests/client/params_ut.cpp @@ -1,8 +1,9 @@ -#include -#include +#include -#include -#include +#include + +#include +#include using namespace NYdb; diff --git a/tests/client/result_ut.cpp b/tests/client/result_ut.cpp index 9b929fc3b01..0a530e0fdd5 100644 --- a/tests/client/result_ut.cpp +++ b/tests/client/result_ut.cpp @@ -1,9 +1,10 @@ -#include -#include -#include +#include -#include -#include +#include +#include + +#include +#include #include diff --git a/tests/client/value_ut.cpp b/tests/client/value_ut.cpp index f529d58cfe8..243054fbc70 100644 --- a/tests/client/value_ut.cpp +++ b/tests/client/value_ut.cpp @@ -1,12 +1,12 @@ #include "value.h" -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include #include diff --git a/tests/client/ydb_scripting_response_headers_ut.cpp b/tests/client/ydb_scripting_response_headers_ut.cpp index 4003affb4aa..b1953367f22 100644 --- a/tests/client/ydb_scripting_response_headers_ut.cpp +++ b/tests/client/ydb_scripting_response_headers_ut.cpp @@ -1,14 +1,14 @@ +#include -#include -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include using namespace NYdb; using namespace NYdb::NScripting; diff --git a/tests/json_value/CMakeLists.txt b/tests/json_value/CMakeLists.txt index 5b8852e3e2e..a2093ab4f12 100644 --- a/tests/json_value/CMakeLists.txt +++ b/tests/json_value/CMakeLists.txt @@ -1,12 +1,10 @@ add_ydb_test(NAME json_value-ut - INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/ydb/public/lib/json_value SOURCES ydb_json_value_ut.cpp LINK_LIBRARIES yutil cpp-testing-unittest_main - public-lib-json_value + YDB-CPP-SDK::JsonValue library-cpp-json cpp-testing-unittest YDB-CPP-SDK::Proto diff --git a/tests/json_value/ydb_json_value_ut.cpp b/tests/json_value/ydb_json_value_ut.cpp index 75adb86b38d..ff777b40485 100644 --- a/tests/json_value/ydb_json_value_ut.cpp +++ b/tests/json_value/ydb_json_value_ut.cpp @@ -1,10 +1,10 @@ -#include "ydb_json_value.h" +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace NYdb { diff --git a/tests/library/CMakeLists.txt b/tests/library/CMakeLists.txt new file mode 100644 index 00000000000..65300560f41 --- /dev/null +++ b/tests/library/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory(login) +add_subdirectory(operation_id) +add_subdirectory(yql) diff --git a/tests/library/login/CMakeLists.txt b/tests/library/login/CMakeLists.txt new file mode 100644 index 00000000000..a5c8848a5dd --- /dev/null +++ b/tests/library/login/CMakeLists.txt @@ -0,0 +1,10 @@ +add_ydb_test(NAME library-login-ut + INCLUDE_DIRS + ${YDB_SDK_SOURCE_DIR}/src/library/login + SOURCES + login_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + library-login +) \ No newline at end of file diff --git a/ydb/library/login/login_ut.cpp b/tests/library/login/login_ut.cpp similarity index 99% rename from ydb/library/login/login_ut.cpp rename to tests/library/login/login_ut.cpp index fcd0d9aaa4c..05551190e85 100644 --- a/ydb/library/login/login_ut.cpp +++ b/tests/library/login/login_ut.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "login.h" using namespace NLogin; diff --git a/tests/library/operation_id/CMakeLists.txt b/tests/library/operation_id/CMakeLists.txt new file mode 100644 index 00000000000..4caa05c33f8 --- /dev/null +++ b/tests/library/operation_id/CMakeLists.txt @@ -0,0 +1,11 @@ +add_ydb_test(NAME operation_id-ut + INCLUDE_DIRS + ${CMAKE_SOURCE_DIR}/src/library/operation_id + SOURCES + operation_id_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + library-operation_id + cpp-testing-unittest +) diff --git a/ydb/public/lib/operation_id/operation_id_ut.cpp b/tests/library/operation_id/operation_id_ut.cpp similarity index 97% rename from ydb/public/lib/operation_id/operation_id_ut.cpp rename to tests/library/operation_id/operation_id_ut.cpp index def91ddcf4d..701a7b9b486 100644 --- a/ydb/public/lib/operation_id/operation_id_ut.cpp +++ b/tests/library/operation_id/operation_id_ut.cpp @@ -1,7 +1,7 @@ #include "operation_id.h" -#include -#include +#include +#include namespace NKikimr { namespace NOperationId { diff --git a/tests/library/yql/CMakeLists.txt b/tests/library/yql/CMakeLists.txt new file mode 100644 index 00000000000..0bd775fcfa8 --- /dev/null +++ b/tests/library/yql/CMakeLists.txt @@ -0,0 +1,22 @@ +add_ydb_test(NAME library-yql-utils-ut + INCLUDE_DIRS + ${YDB_SDK_SOURCE_DIR}/src/library/yql/utils + SOURCES + utf8_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + library-yql-utils +) + +add_ydb_test(NAME yql-public-issue-ut + INCLUDE_DIRS + ${YDB_SDK_SOURCE_DIR}/src/library/yql/public/issue + SOURCES + yql_issue_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + yql-public-issue + cpp-unicode_normalization +) diff --git a/ydb/library/yql/utils/utf8_ut.cpp b/tests/library/yql/utf8_ut.cpp similarity index 98% rename from ydb/library/yql/utils/utf8_ut.cpp rename to tests/library/yql/utf8_ut.cpp index 7479acd7a11..3cec306c9c8 100644 --- a/ydb/library/yql/utils/utf8_ut.cpp +++ b/tests/library/yql/utf8_ut.cpp @@ -1,6 +1,6 @@ #include "utf8.h" -#include +#include Y_UNIT_TEST_SUITE(TUtf8Tests) { Y_UNIT_TEST(Simple) { diff --git a/ydb/library/yql/public/issue/yql_issue_ut.cpp b/tests/library/yql/yql_issue_ut.cpp similarity index 96% rename from ydb/library/yql/public/issue/yql_issue_ut.cpp rename to tests/library/yql/yql_issue_ut.cpp index ed5d931ab8c..17db33f381d 100644 --- a/ydb/library/yql/public/issue/yql_issue_ut.cpp +++ b/tests/library/yql/yql_issue_ut.cpp @@ -1,16 +1,16 @@ #include "yql_issue.h" #include "yql_issue_message.h" -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/tools/enum_parser/enum_parser/main.cpp b/tools/enum_parser/enum_parser/main.cpp index 875a6b53a38..28b30571462 100644 --- a/tools/enum_parser/enum_parser/main.cpp +++ b/tools/enum_parser/enum_parser/main.cpp @@ -1,27 +1,27 @@ -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -30,14 +30,14 @@ void WriteHeader(const std::string& headerName, std::ostream& out, std::ostream* out << "#include " << headerName << "\n"; out << "#include \n\n"; out << "#include \n\n"; - out << "#include \n"; - out << "#include \n"; + out << "#include \n"; + out << "#include \n"; out << "#include \n"; out << "#include \n"; out << "#include \n"; out << "#include \n"; - out << "#include \n"; - out << "#include \n\n"; + out << "#include \n"; + out << "#include \n\n"; if (headerOutPtr) { auto& outHeader = *headerOutPtr; diff --git a/tools/enum_parser/enum_serialization_runtime/README.md b/tools/enum_parser/enum_serialization_runtime/README.md index b8b4dd92cf6..cef551cfdfb 100644 --- a/tools/enum_parser/enum_serialization_runtime/README.md +++ b/tools/enum_parser/enum_serialization_runtime/README.md @@ -23,4 +23,4 @@ Use `GENERATE_ENUM_SERIALIZATION_WITH_HEADER` and `GENERATE_ENUM_SERIALIZATION` Преобразование между `enum` и `int` выносится в пользовательский код (в шаблонные `inline` функции), и производится только в момент непосредственного использования (первым действием в семействе функций `ToString`, последним действием в семуйстве функций `FromString`), где оптимизирующий компилятор обычно может заменить их на no-op или на простые операции со значениями в регистрах. -А контейнеры вида `TVector` и `TMap`, которые возвращаются из функций `util/generic/serialized_enum.h`, заменяются на специальные классы `TArrayView` и `TMappedDictView`. Они также поддерживают быстрое и преобразование из перечислений в целочисленные типы и обратно в момент использования, и не требуют создавать специализации для каждого из возможных типов-перечислений. +А контейнеры вида `TVector` и `TMap`, которые возвращаются из функций `src/util/generic/serialized_enum.h`, заменяются на специальные классы `TArrayView` и `TMappedDictView`. Они также поддерживают быстрое и преобразование из перечислений в целочисленные типы и обратно в момент использования, и не требуют создавать специализации для каждого из возможных типов-перечислений. diff --git a/tools/enum_parser/enum_serialization_runtime/enum_runtime.cpp b/tools/enum_parser/enum_serialization_runtime/enum_runtime.cpp index 7440b1dc68e..345abc4d677 100644 --- a/tools/enum_parser/enum_serialization_runtime/enum_runtime.cpp +++ b/tools/enum_parser/enum_serialization_runtime/enum_runtime.cpp @@ -1,8 +1,8 @@ #include "enum_runtime.h" -#include +#include -#include +#include namespace NEnumSerializationRuntime { template diff --git a/tools/enum_parser/enum_serialization_runtime/ordered_pairs.h b/tools/enum_parser/enum_serialization_runtime/ordered_pairs.h index 116faa99acb..9c273e47628 100644 --- a/tools/enum_parser/enum_serialization_runtime/ordered_pairs.h +++ b/tools/enum_parser/enum_serialization_runtime/ordered_pairs.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/tools/enum_parser/enum_serialization_runtime/serialized_enum.h b/tools/enum_parser/enum_serialization_runtime/serialized_enum.h index 80f7f307157..5241de3036b 100644 --- a/tools/enum_parser/enum_serialization_runtime/serialized_enum.h +++ b/tools/enum_parser/enum_serialization_runtime/serialized_enum.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/tools/enum_parser/enum_serialization_runtime/serialized_enum_ut.cpp b/tools/enum_parser/enum_serialization_runtime/serialized_enum_ut.cpp index 76c61f9c6b8..80c86facdce 100644 --- a/tools/enum_parser/enum_serialization_runtime/serialized_enum_ut.cpp +++ b/tools/enum_parser/enum_serialization_runtime/serialized_enum_ut.cpp @@ -1,9 +1,9 @@ #include "serialized_enum.h" -#include +#include -#include -#include +#include +#include #include diff --git a/tools/enum_parser/parse_enum/benchmark/main.cpp b/tools/enum_parser/parse_enum/benchmark/main.cpp index d462d8e6e69..714242f0b32 100644 --- a/tools/enum_parser/parse_enum/benchmark/main.cpp +++ b/tools/enum_parser/parse_enum/benchmark/main.cpp @@ -1,10 +1,10 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/tools/enum_parser/parse_enum/benchmark_build/ut/huge_enums_fallback_ut.cpp b/tools/enum_parser/parse_enum/benchmark_build/ut/huge_enums_fallback_ut.cpp index 8d6800946f0..2b9847cc787 100644 --- a/tools/enum_parser/parse_enum/benchmark_build/ut/huge_enums_fallback_ut.cpp +++ b/tools/enum_parser/parse_enum/benchmark_build/ut/huge_enums_fallback_ut.cpp @@ -1,8 +1,8 @@ #include #include -#include -#include -#include +#include +#include +#include namespace { diff --git a/tools/enum_parser/parse_enum/parse_enum.cpp b/tools/enum_parser/parse_enum/parse_enum.cpp index 959df74674e..4a94e0f63d1 100644 --- a/tools/enum_parser/parse_enum/parse_enum.cpp +++ b/tools/enum_parser/parse_enum/parse_enum.cpp @@ -1,10 +1,10 @@ #include "parse_enum.h" -#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/tools/enum_parser/parse_enum/parse_enum.h b/tools/enum_parser/parse_enum/parse_enum.h index 31e5071cd19..7f8f84258b6 100644 --- a/tools/enum_parser/parse_enum/parse_enum.h +++ b/tools/enum_parser/parse_enum/parse_enum.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/tools/enum_parser/parse_enum/parse_enum_ut.cpp b/tools/enum_parser/parse_enum/parse_enum_ut.cpp index 21ed6a2fc4a..b8b5de7a578 100644 --- a/tools/enum_parser/parse_enum/parse_enum_ut.cpp +++ b/tools/enum_parser/parse_enum/parse_enum_ut.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include diff --git a/tools/enum_parser/parse_enum/ut/enums.cpp b/tools/enum_parser/parse_enum/ut/enums.cpp index 05795c104ae..c2dfcae0038 100644 --- a/tools/enum_parser/parse_enum/ut/enums.cpp +++ b/tools/enum_parser/parse_enum/ut/enums.cpp @@ -5,11 +5,11 @@ #include "including_header.h" // just to test that generated stuff works -#include -#include +#include +#include -#include -#include +#include +#include void FunctionUsingEFwdEnum(EFwdEnum) { diff --git a/tools/enum_parser/parse_enum/ut/enums.h b/tools/enum_parser/parse_enum/ut/enums.h index 93d835c78db..4e573d978c1 100644 --- a/tools/enum_parser/parse_enum/ut/enums.h +++ b/tools/enum_parser/parse_enum/ut/enums.h @@ -1,8 +1,8 @@ #pragma once // Sample file for parse_enum unittests -#include -#include +#include +#include // Test template declarations template @@ -103,7 +103,7 @@ static inline void f() { (void)(f); } -// buggy case taken from library/cpp/html/face/parstypes.h +// buggy case taken from src/library/html/face/parstypes.h enum TEXT_WEIGHT { WEIGHT_ZERO=-1,// NOINDEX_RELEV WEIGHT_LOW, // LOW_RELEV diff --git a/tools/enum_parser/parse_enum/ut/including_header.h b/tools/enum_parser/parse_enum/ut/including_header.h index b3b2a2129f6..36341b8fcb7 100644 --- a/tools/enum_parser/parse_enum/ut/including_header.h +++ b/tools/enum_parser/parse_enum/ut/including_header.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include int TestEnumWithHeader() { diff --git a/tools/enum_parser/parse_enum/ut/ya.make b/tools/enum_parser/parse_enum/ut/ya.make index eee686134a5..4c2dcb1ce46 100644 --- a/tools/enum_parser/parse_enum/ut/ya.make +++ b/tools/enum_parser/parse_enum/ut/ya.make @@ -2,7 +2,7 @@ UNITTEST() PEERDIR( ADDINCL tools/enum_parser/parse_enum - library/cpp/resource + src/library/resource ) SRCDIR(tools/enum_parser/parse_enum) diff --git a/tools/rescompiler/main.cpp b/tools/rescompiler/main.cpp index 6f002c1272f..45704a76c52 100644 --- a/tools/rescompiler/main.cpp +++ b/tools/rescompiler/main.cpp @@ -1,12 +1,12 @@ -#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include @@ -44,7 +44,7 @@ int main(int argc, char** argv) { argv = argv + 2; - out << "#include \n\n"; + out << "#include \n\n"; while (*argv) { if (std::string_view{"-"} == *argv) { diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt deleted file mode 100644 index af9fd348386..00000000000 --- a/util/CMakeLists.txt +++ /dev/null @@ -1,314 +0,0 @@ -add_subdirectory(charset) - -add_library(yutil) -target_compile_options(yutil PRIVATE - -Wnarrowing -) -target_link_libraries(yutil PUBLIC - util-charset - ZLIB::ZLIB - double-conversion::double-conversion - contrib-libs-libc_compat - cpp-string_utils-helpers -) - -target_joined_source(yutil - all_datetime.cpp - ${YDB_SDK_SOURCE_DIR}/util/datetime/base.cpp - ${YDB_SDK_SOURCE_DIR}/util/datetime/constants.cpp - ${YDB_SDK_SOURCE_DIR}/util/datetime/cputimer.cpp - ${YDB_SDK_SOURCE_DIR}/util/datetime/systime.cpp - ${YDB_SDK_SOURCE_DIR}/util/datetime/uptime.cpp -) -target_joined_source(yutil - all_digest.cpp - ${YDB_SDK_SOURCE_DIR}/util/digest/fnv.cpp - ${YDB_SDK_SOURCE_DIR}/util/digest/multi.cpp - ${YDB_SDK_SOURCE_DIR}/util/digest/murmur.cpp - ${YDB_SDK_SOURCE_DIR}/util/digest/numeric.cpp - ${YDB_SDK_SOURCE_DIR}/util/digest/sequence.cpp -) -target_joined_source(yutil - all_util.cpp - ${YDB_SDK_SOURCE_DIR}/util/ysafeptr.cpp - ${YDB_SDK_SOURCE_DIR}/util/ysaveload.cpp - ${YDB_SDK_SOURCE_DIR}/util/str_stl.cpp -) -target_joined_source(yutil - all_folder.cpp - ${YDB_SDK_SOURCE_DIR}/util/folder/dirut.cpp - ${YDB_SDK_SOURCE_DIR}/util/folder/filelist.cpp - ${YDB_SDK_SOURCE_DIR}/util/folder/fts.cpp - ${YDB_SDK_SOURCE_DIR}/util/folder/fwd.cpp - ${YDB_SDK_SOURCE_DIR}/util/folder/iterator.cpp - ${YDB_SDK_SOURCE_DIR}/util/folder/path.cpp - ${YDB_SDK_SOURCE_DIR}/util/folder/pathsplit.cpp - ${YDB_SDK_SOURCE_DIR}/util/folder/tempdir.cpp -) -target_joined_source(yutil - all_generic.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/adaptor.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/algorithm.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/array_size.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/bitmap.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/bitops.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/bt_exception.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/buffer.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/cast.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/explicit_type.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/fastqueue.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/flags.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/function.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/function_ref.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/fwd.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/guid.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/hash.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/hash_multi_map.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/hash_table.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/hash_primes.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/hide_ptr.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/intrlist.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/is_in.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/iterator.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/iterator_range.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/lazy_value.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/mapfindptr.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/mem_copy.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/noncopyable.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/object_counter.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/overloaded.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/ptr.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/refcount.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/scope.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/set.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/singleton.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/size_literals.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/stack.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/store_policy.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/strfcpy.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/typelist.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/typetraits.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/utility.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/va_args.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/variant.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/xrange.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/yexception.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/ylimits.cpp - ${YDB_SDK_SOURCE_DIR}/util/generic/ymath.cpp -) -target_joined_source(yutil - all_memory.cpp - ${YDB_SDK_SOURCE_DIR}/util/memory/addstorage.cpp - ${YDB_SDK_SOURCE_DIR}/util/memory/alloc.cpp - ${YDB_SDK_SOURCE_DIR}/util/memory/blob.cpp - ${YDB_SDK_SOURCE_DIR}/util/memory/mmapalloc.cpp - ${YDB_SDK_SOURCE_DIR}/util/memory/pool.cpp - ${YDB_SDK_SOURCE_DIR}/util/memory/segmented_string_pool.cpp - ${YDB_SDK_SOURCE_DIR}/util/memory/segpool_alloc.cpp - ${YDB_SDK_SOURCE_DIR}/util/memory/smallobj.cpp - ${YDB_SDK_SOURCE_DIR}/util/memory/tempbuf.cpp -) -target_joined_source(yutil - all_network.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/address.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/endpoint.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/hostip.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/init.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/interface.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/iovec.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/ip.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/nonblock.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/pair.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/poller.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/pollerimpl.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/sock.cpp - ${YDB_SDK_SOURCE_DIR}/util/network/socket.cpp -) -target_joined_source(yutil - all_random.cpp - ${YDB_SDK_SOURCE_DIR}/util/random/common_ops.cpp - ${YDB_SDK_SOURCE_DIR}/util/random/easy.cpp - ${YDB_SDK_SOURCE_DIR}/util/random/entropy.cpp - ${YDB_SDK_SOURCE_DIR}/util/random/fast.cpp - ${YDB_SDK_SOURCE_DIR}/util/random/lcg_engine.cpp - ${YDB_SDK_SOURCE_DIR}/util/random/mersenne32.cpp - ${YDB_SDK_SOURCE_DIR}/util/random/mersenne64.cpp - ${YDB_SDK_SOURCE_DIR}/util/random/mersenne.cpp - ${YDB_SDK_SOURCE_DIR}/util/random/normal.cpp - ${YDB_SDK_SOURCE_DIR}/util/random/shuffle.cpp - ${YDB_SDK_SOURCE_DIR}/util/random/init_atfork.cpp -) -target_joined_source(yutil - all_stream.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/buffer.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/buffered.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/debug.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/file.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/format.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/fwd.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/hex.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/input.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/length.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/mem.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/multi.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/null.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/output.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/str.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/tee.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/tempbuf.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/walk.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/zerocopy.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/zerocopy_output.cpp - ${YDB_SDK_SOURCE_DIR}/util/stream/zlib.cpp -) -target_joined_source(yutil - all_string.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/ascii.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/builder.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/cstriter.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/escape.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/hex.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/join.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/reverse.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/split.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/strip.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/strspn.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/subst.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/type.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/util.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/vector.cpp -) -target_joined_source(yutil - all_system_1.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/atexit.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/backtrace.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/compat.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/context.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/daemon.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/datetime.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/defaults.c - ${YDB_SDK_SOURCE_DIR}/util/system/direct_io.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/dynlib.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/error.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/event.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/execpath.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/fasttime.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/file.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/file_lock.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/filemap.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/flock.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/fs.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/fstat.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/getpid.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/hi_lo.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/hostname.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/hp_timer.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/info.cpp -) -target_joined_source(yutil - all_system_2.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/align.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/byteorder.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/cpu_id.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/fhandle.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/guard.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/interrupt_signals.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/madvise.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/maxlen.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/mem_info.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/mincore.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/mktemp.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/mlock.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/fake_mutex.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/nice.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/pipe.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/platform.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/progname.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/protect.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/rusage.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/rwlock.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/sanitizers.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/sem.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/shellcommand.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/shmat.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/sigset.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/spinlock.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/spin_wait.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/src_location.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/sys_alloc.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/sysstat.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/tempfile.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/thread.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/tls.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/types.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/type_name.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/unaligned_mem.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/user.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/utime.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/yassert.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/yield.cpp -) -target_joined_source(yutil - all_thread.cpp - ${YDB_SDK_SOURCE_DIR}/util/thread/factory.cpp - ${YDB_SDK_SOURCE_DIR}/util/thread/fwd.cpp - ${YDB_SDK_SOURCE_DIR}/util/thread/pool.cpp - ${YDB_SDK_SOURCE_DIR}/util/thread/singleton.cpp -) - -target_sources(yutil PRIVATE - ${YDB_SDK_SOURCE_DIR}/util/system/compiler.cpp - ${YDB_SDK_SOURCE_DIR}/util/digest/city.cpp - ${YDB_SDK_SOURCE_DIR}/util/random/random.cpp - ${YDB_SDK_SOURCE_DIR}/util/string/cast.cpp -) - -if (NOT WIN32) - target_ragel_lexers(yutil - PRIVATE - ${YDB_SDK_SOURCE_DIR}/util/datetime/parser.rl6 - -CG2 - ) -endif () - -if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - target_yasm_source(yutil - PRIVATE - ${YDB_SDK_SOURCE_DIR}/util/system/context_x86.asm - -I - ${YDB_SDK_BINARY_DIR} - -I - ${YDB_SDK_SOURCE_DIR} - ) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - target_sources(yutil PRIVATE - ${YDB_SDK_SOURCE_DIR}/util/system/context_aarch64.S - ) -endif () - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - target_sources(yutil PRIVATE - ${YDB_SDK_SOURCE_DIR}/util/system/valgrind.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/mktemp_system.cpp - ) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - target_sources(yutil PRIVATE - ${YDB_SDK_SOURCE_DIR}/util/datetime/strptime.cpp - ${YDB_SDK_SOURCE_DIR}/util/folder/lstat_win.c - ${YDB_SDK_SOURCE_DIR}/util/folder/dirent_win.c - ${YDB_SDK_SOURCE_DIR}/util/system/err.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/fs_win.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/winint.cpp - ${YDB_SDK_SOURCE_DIR}/util/system/mktemp_system.cpp - ) - target_ragel_lexers(yutil - PRIVATE - ${YDB_SDK_SOURCE_DIR}/util/datetime/parser.rl6 - -CT0 - ) -endif() - -target_compile_definitions(yutil PUBLIC - ARCADIA_ROOT_CMAKE_HELPER=${YDB_SDK_SOURCE_DIR} - ARCADIA_BUILD_ROOT_CMAKE_HELPER=${YDB_SDK_BINARY_DIR} -) \ No newline at end of file diff --git a/util/charset/CMakeLists.txt b/util/charset/CMakeLists.txt deleted file mode 100644 index 86d35b1ace0..00000000000 --- a/util/charset/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -add_library(util-charset) - -target_joined_source(util-charset - all_charset.cpp - ${YDB_SDK_SOURCE_DIR}/util/charset/generated/unidata.cpp - ${YDB_SDK_SOURCE_DIR}/util/charset/recode_result.cpp - ${YDB_SDK_SOURCE_DIR}/util/charset/unicode_table.cpp - ${YDB_SDK_SOURCE_DIR}/util/charset/unidata.cpp - ${YDB_SDK_SOURCE_DIR}/util/charset/utf8.cpp - ${YDB_SDK_SOURCE_DIR}/util/charset/wide.cpp -) - -if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") - target_sources_custom(util-charset - .sse41 - SRCS - ${YDB_SDK_SOURCE_DIR}/util/charset/wide_sse41.cpp - CUSTOM_FLAGS - -msse4.1 - ) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - target_sources(util-charset PRIVATE - ${YDB_SDK_SOURCE_DIR}/util/charset/wide_sse41.cpp - ) - set_property( - SOURCE - ${YDB_SDK_SOURCE_DIR}/util/charset/wide_sse41.cpp - APPEND - PROPERTY - COMPILE_OPTIONS - -DSSE41_STUB - ) -endif() diff --git a/util/charset/ut/ya.make b/util/charset/ut/ya.make deleted file mode 100644 index e9a3e2ffa67..00000000000 --- a/util/charset/ut/ya.make +++ /dev/null @@ -1,16 +0,0 @@ -UNITTEST_FOR(util/charset) - -SUBSCRIBER(g:util-subscribers) - -DATA(arcadia/util/charset/ut/utf8) - -SRCS( - utf8_ut.cpp - wide_ut.cpp -) - -INCLUDE(${ARCADIA_ROOT}/util/tests/ya_util_tests.inc) - -REQUIREMENTS(ram:17) - -END() diff --git a/util/digest/multi.pxd b/util/digest/multi.pxd deleted file mode 100644 index 8b4fae5016c..00000000000 --- a/util/digest/multi.pxd +++ /dev/null @@ -1,2 +0,0 @@ -cdef extern from "" nogil: - size_t MultiHash(...); diff --git a/ydb/CMakeLists.txt b/ydb/CMakeLists.txt deleted file mode 100644 index 5b581742a32..00000000000 --- a/ydb/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(library) -add_subdirectory(public) diff --git a/ydb/library/CMakeLists.txt b/ydb/library/CMakeLists.txt deleted file mode 100644 index f9c0282d660..00000000000 --- a/ydb/library/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ - -# 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(grpc) -add_subdirectory(login) -add_subdirectory(persqueue) -add_subdirectory(security) -add_subdirectory(uuid) -add_subdirectory(yql) -add_subdirectory(yverify_stream) diff --git a/ydb/library/login/CMakeLists.txt b/ydb/library/login/CMakeLists.txt deleted file mode 100644 index 8104b6c8cdf..00000000000 --- a/ydb/library/login/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_subdirectory(protos) -add_subdirectory(ut) - -add_library(ydb-library-login) - -target_link_libraries(ydb-library-login PUBLIC - yutil - jwt-cpp::jwt-cpp - protobuf::libprotobuf - cpp-digest-argonish - library-cpp-json - cpp-string_utils-base64 - library-login-protos -) - -target_sources(ydb-library-login PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/library/login/login.cpp -) - diff --git a/ydb/library/login/ut/CMakeLists.txt b/ydb/library/login/ut/CMakeLists.txt deleted file mode 100644 index 243f0c94a7c..00000000000 --- a/ydb/library/login/ut/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_ydb_test(NAME library-login-ut - INCLUDE_DIRS - ${YDB_SDK_SOURCE_DIR}/ydb/library/login - SOURCES - ${YDB_SDK_SOURCE_DIR}/ydb/library/login/login_ut.cpp - LINK_LIBRARIES - yutil - cpp-testing-unittest_main - ydb-library-login -) diff --git a/ydb/library/security/CMakeLists.txt b/ydb/library/security/CMakeLists.txt deleted file mode 100644 index 2b0f0d26d43..00000000000 --- a/ydb/library/security/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_library(ydb-library-security INTERFACE) - -target_link_libraries(ydb-library-security INTERFACE - yutil -) diff --git a/ydb/library/uuid/CMakeLists.txt b/ydb/library/uuid/CMakeLists.txt deleted file mode 100644 index 2f81a2117d3..00000000000 --- a/ydb/library/uuid/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -add_library(ydb-library-uuid) - -target_link_libraries(ydb-library-uuid PUBLIC - yutil -) - -target_sources(ydb-library-uuid PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/library/uuid/uuid.cpp -) diff --git a/ydb/library/yql/public/decimal/ut/CMakeLists.txt b/ydb/library/yql/public/decimal/ut/CMakeLists.txt deleted file mode 100644 index bf856f81b06..00000000000 --- a/ydb/library/yql/public/decimal/ut/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_ydb_test(NAME yql-public-decimal_ut - INCLUDE_DIRS - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/public/decimal - SOURCES - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/public/decimal/ut/yql_decimal_ut.cpp - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/public/decimal/ut/yql_wide_int_ut.cpp - LINK_LIBRARIES - yutil - cpp-testing-unittest_main - yql-public-decimal -) diff --git a/ydb/library/yql/public/issue/ut/CMakeLists.txt b/ydb/library/yql/public/issue/ut/CMakeLists.txt deleted file mode 100644 index 621887f0101..00000000000 --- a/ydb/library/yql/public/issue/ut/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_ydb_test(NAME yql-public-issue-ut - INCLUDE_DIRS - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/public/issue - SOURCES - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/public/issue/yql_issue_ut.cpp - LINK_LIBRARIES - yutil - cpp-testing-unittest_main - yql-public-issue - cpp-unicode_normalization -) diff --git a/ydb/library/yql/utils/ut/CMakeLists.txt b/ydb/library/yql/utils/ut/CMakeLists.txt deleted file mode 100644 index f65ccf7d528..00000000000 --- a/ydb/library/yql/utils/ut/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_ydb_test(NAME library-yql-utils-ut - INCLUDE_DIRS - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/utils - SOURCES - ${YDB_SDK_SOURCE_DIR}/ydb/library/yql/utils/utf8_ut.cpp - LINK_LIBRARIES - yutil - cpp-testing-unittest_main - library-yql-utils -) diff --git a/ydb/library/yverify_stream/CMakeLists.txt b/ydb/library/yverify_stream/CMakeLists.txt deleted file mode 100644 index 5da1a1013f1..00000000000 --- a/ydb/library/yverify_stream/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_library(ydb-library-yverify_stream INTERFACE) - -target_link_libraries(ydb-library-yverify_stream INTERFACE - yutil -) - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) - target_link_libraries(ydb-library-yverify_stream INTERFACE - - ) -endif() diff --git a/ydb/library/yverify_stream/yverify_stream.h b/ydb/library/yverify_stream/yverify_stream.h deleted file mode 100644 index 7afaf54b521..00000000000 --- a/ydb/library/yverify_stream/yverify_stream.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include -#include - -#define Y_VERIFY(...) Y_ABORT_UNLESS(__VA_ARGS__) -#define Y_FAIL(...) Y_ABORT(__VA_ARGS__) -#define Y_VERIFY_DEBUG(...) Y_DEBUG_ABORT_UNLESS(__VA_ARGS__) - -#define Y_VERIFY_S(expr, msg) Y_VERIFY(expr, "%s", (TYdbStringBuilder() << msg).c_str()) -#define Y_FAIL_S(msg) Y_FAIL("%s", (TYdbStringBuilder() << msg).c_str()) -#define Y_VERIFY_DEBUG_S(expr, msg) Y_VERIFY_DEBUG(expr, "%s", (TYdbStringBuilder() << msg).c_str()) diff --git a/ydb/public/CMakeLists.txt b/ydb/public/CMakeLists.txt deleted file mode 100644 index 76051a30dd7..00000000000 --- a/ydb/public/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(api) -add_subdirectory(lib) diff --git a/ydb/public/api/client/yc_private/iam/CMakeLists.txt b/ydb/public/api/client/yc_private/iam/CMakeLists.txt deleted file mode 100644 index 0fbab31e70e..00000000000 --- a/ydb/public/api/client/yc_private/iam/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -add_library(client-yc_private-iam) -set_property(TARGET client-yc_private-iam PROPERTY - PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h -) -target_link_libraries(client-yc_private-iam PUBLIC - api-common-protos - yutil - gRPC::grpc++ - client-yc_private-operation - protobuf::libprotobuf -) -target_proto_messages(client-yc_private-iam PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/iam/iam_token_service_subject.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/iam/iam_token_service.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/iam/iam_token.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/iam/oauth_request.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/iam/reference.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/iam/service_account_service.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/iam/service_account.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/iam/user_account_service.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/iam/user_account.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/client/yc_private/iam/yandex_passport_cookie.proto -) -target_proto_addincls(client-yc_private-iam - ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} - ${YDB_SDK_SOURCE_DIR}/third_party/api-common-protos -) -target_proto_outs(client-yc_private-iam - --cpp_out=${YDB_SDK_BINARY_DIR}/ -) -target_proto_plugin(client-yc_private-iam - grpc_cpp - gRPC::grpc_cpp_plugin -) - - diff --git a/ydb/public/api/grpc/CMakeLists.txt b/ydb/public/api/grpc/CMakeLists.txt deleted file mode 100644 index c89c0e83449..00000000000 --- a/ydb/public/api/grpc/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -add_subdirectory(draft) - -add_library(api-grpc) -set_property(TARGET api-grpc PROPERTY - PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h -) -target_link_libraries(api-grpc PUBLIC - yutil - gRPC::grpc++ - api-protos - protobuf::libprotobuf -) -target_proto_messages(api-grpc PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_federation_discovery_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_auth_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_cms_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_coordination_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_discovery_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_export_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_import_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_monitoring_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_operation_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_query_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_rate_limiter_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_scheme_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_scripting_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_table_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_topic_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/ydb_keyvalue_v1.proto -) -target_proto_addincls(api-grpc - ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} - ${YDB_SDK_SOURCE_DIR} - ${YDB_SDK_BINARY_DIR} -) -target_proto_outs(api-grpc - --cpp_out=${YDB_SDK_BINARY_DIR}/ -) -target_proto_plugin(api-grpc - grpc_cpp - gRPC::grpc_cpp_plugin -) - - diff --git a/ydb/public/api/grpc/draft/CMakeLists.txt b/ydb/public/api/grpc/draft/CMakeLists.txt deleted file mode 100644 index 606112820b9..00000000000 --- a/ydb/public/api/grpc/draft/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -add_library(api-grpc-draft) -set_property(TARGET api-grpc-draft PROPERTY - PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h -) -target_link_libraries(api-grpc-draft PUBLIC - yutil - gRPC::grpc++ - api-protos - protobuf::libprotobuf -) -target_proto_messages(api-grpc-draft PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/draft/dummy.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/draft/fq_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_clickhouse_internal_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_persqueue_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_datastreams_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_long_tx_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_maintenance_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_logstore_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_dynamic_config_v1.proto -) -target_proto_addincls(api-grpc-draft - ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} - ${YDB_SDK_SOURCE_DIR} - ${YDB_SDK_BINARY_DIR} -) -target_proto_outs(api-grpc-draft - --cpp_out=${YDB_SDK_BINARY_DIR}/ -) -target_proto_plugin(api-grpc-draft - grpc_cpp - gRPC::grpc_cpp_plugin -) - - diff --git a/ydb/public/api/proto_output/CMakeLists.txt b/ydb/public/api/proto_output/CMakeLists.txt deleted file mode 100644 index 5fbc5c77795..00000000000 --- a/ydb/public/api/proto_output/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -add_library(proto_output) - -target_link_libraries(proto_output PUBLIC - yutil - api-protos - protobuf::libprotobuf -) - -target_sources(proto_output PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/proto_output/proto_output.cpp -) - diff --git a/ydb/public/api/protos/CMakeLists.txt b/ydb/public/api/protos/CMakeLists.txt deleted file mode 100644 index 37427f86836..00000000000 --- a/ydb/public/api/protos/CMakeLists.txt +++ /dev/null @@ -1,81 +0,0 @@ -add_subdirectory(annotations) - -add_library(api-protos) -target_link_libraries(api-protos PUBLIC - yutil - api-protos-annotations - tools-enum_parser-enum_serialization_runtime - protobuf::libprotobuf -) -target_proto_messages(api-protos PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/draft/datastreams.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/draft/fq.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/draft/persqueue_common.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/draft/persqueue_error_codes.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/draft/ydb_long_tx.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/draft/ydb_maintenance.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/draft/ydb_logstore.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/draft/ydb_dynamic_config.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_federation_discovery.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/persqueue_error_codes_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_auth.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_persqueue_v1.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_persqueue_cluster_discovery.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_clickhouse_internal.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_cms.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_common.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_coordination.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_discovery.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_export.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_formats.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_import.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_issue_message.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_monitoring.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_operation.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_query_stats.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_query.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_rate_limiter.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_scheme.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_scripting.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_status_codes.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_table.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_topic.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_value.proto - ${YDB_SDK_SOURCE_DIR}/ydb/public/api/protos/ydb_keyvalue.proto -) -generate_enum_serilization(api-protos - ${YDB_SDK_BINARY_DIR}/ydb/public/api/protos/draft/persqueue_common.pb.h - INCLUDE_HEADERS - ydb/public/api/protos/draft/persqueue_common.pb.h -) -generate_enum_serilization(api-protos - ${YDB_SDK_BINARY_DIR}/ydb/public/api/protos/ydb_persqueue_cluster_discovery.pb.h - INCLUDE_HEADERS - ydb/public/api/protos/ydb_persqueue_cluster_discovery.pb.h -) -generate_enum_serilization(api-protos - ${YDB_SDK_BINARY_DIR}/ydb/public/api/protos/draft/datastreams.pb.h - INCLUDE_HEADERS - ydb/public/api/protos/draft/datastreams.pb.h -) -generate_enum_serilization(api-protos - ${YDB_SDK_BINARY_DIR}/ydb/public/api/protos/ydb_topic.pb.h - INCLUDE_HEADERS - ydb/public/api/protos/ydb_topic.pb.h -) -target_proto_addincls(api-protos - ./ - ${YDB_SDK_SOURCE_DIR}/ - ${YDB_SDK_BINARY_DIR} - ${YDB_SDK_SOURCE_DIR} - ${YDB_SDK_BINARY_DIR} -) -target_proto_outs(api-protos - --cpp_out=${YDB_SDK_BINARY_DIR}/ -) -target_proto_plugin(api-protos - grpc_cpp - gRPC::grpc_cpp_plugin -) - - diff --git a/ydb/public/api/protos/annotations/ya.make b/ydb/public/api/protos/annotations/ya.make deleted file mode 100644 index 7cf7d764e19..00000000000 --- a/ydb/public/api/protos/annotations/ya.make +++ /dev/null @@ -1,10 +0,0 @@ -PROTO_LIBRARY() - -SRCS( - sensitive.proto - validation.proto -) - -EXCLUDE_TAGS(GO_PROTO) - -END() diff --git a/ydb/public/lib/CMakeLists.txt b/ydb/public/lib/CMakeLists.txt deleted file mode 100644 index 85a7767b8e9..00000000000 --- a/ydb/public/lib/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(json_value) -add_subdirectory(jwt) -add_subdirectory(operation_id) -add_subdirectory(yson_value) diff --git a/ydb/public/lib/README.md b/ydb/public/lib/README.md deleted file mode 100644 index 3fed4b75af6..00000000000 --- a/ydb/public/lib/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Internal library for Yandex Database (YDB) sdk. DO NOT USE IT DIRECTLY !!! - -- If you need YDB sdk see kikimr/public/sdk diff --git a/ydb/public/lib/jwt/CMakeLists.txt b/ydb/public/lib/jwt/CMakeLists.txt deleted file mode 100644 index 89374229f70..00000000000 --- a/ydb/public/lib/jwt/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -add_library(public-lib-jwt) -target_link_libraries(public-lib-jwt PUBLIC - yutil - jwt-cpp::jwt-cpp - library-cpp-json - impl-ydb_internal-common -) - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) - target_link_libraries(public-lib-jwt PUBLIC - - ) -endif() - -target_sources(public-lib-jwt PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/lib/jwt/jwt.cpp -) - diff --git a/ydb/public/lib/operation_id/CMakeLists.txt b/ydb/public/lib/operation_id/CMakeLists.txt deleted file mode 100644 index 59e9e783067..00000000000 --- a/ydb/public/lib/operation_id/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -add_subdirectory(protos) -add_subdirectory(ut) - -add_library(public-lib-operation_id) - -target_link_libraries(public-lib-operation_id PUBLIC - yutil - protobuf::libprotobuf - library-cpp-cgiparam - library-cpp-uri - lib-operation_id-protos -) - -target_sources(public-lib-operation_id PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/lib/operation_id/operation_id.cpp -) - - diff --git a/ydb/public/lib/operation_id/ut/CMakeLists.txt b/ydb/public/lib/operation_id/ut/CMakeLists.txt deleted file mode 100644 index b8d446665b3..00000000000 --- a/ydb/public/lib/operation_id/ut/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_ydb_test(NAME operation_id-ut - INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/ydb/public/lib/operation_id - SOURCES - ${CMAKE_SOURCE_DIR}/ydb/public/lib/operation_id/operation_id_ut.cpp - LINK_LIBRARIES - yutil - cpp-testing-unittest_main - public-lib-operation_id - cpp-testing-unittest -) diff --git a/ydb/public/lib/yson_value/CMakeLists.txt b/ydb/public/lib/yson_value/CMakeLists.txt deleted file mode 100644 index cae5668a316..00000000000 --- a/ydb/public/lib/yson_value/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -add_library(public-lib-yson_value) -target_link_libraries(public-lib-yson_value PUBLIC - yutil - library-cpp-yson - cpp-yson-node - cpp-client-ydb_result - cpp-client-ydb_value - ydb-library-uuid - ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) - target_link_libraries(public-lib-json_value PUBLIC - - ) -endif() - -target_sources(public-lib-yson_value PRIVATE - ${YDB_SDK_SOURCE_DIR}/ydb/public/lib/yson_value/ydb_yson_value.cpp -)