diff options
author | innokentii <innokentii@yandex-team.com> | 2023-07-09 22:03:08 +0300 |
---|---|---|
committer | innokentii <innokentii@yandex-team.com> | 2023-07-09 22:03:08 +0300 |
commit | 648aece41cc3094284440f197e8acedbd3dfbbf7 (patch) | |
tree | 2fa321fbbdbe4979e4b455257430be2b18846d6d | |
parent | 3e97e75d377ea574b12bbdb1f64cfcda5af68354 (diff) | |
download | ydb-648aece41cc3094284440f197e8acedbd3dfbbf7.tar.gz |
Move ui64id to util
move common types
-rw-r--r-- | ydb/core/tx/schemeshard/CMakeLists.darwin-x86_64.txt | 1 | ||||
-rw-r--r-- | ydb/core/tx/schemeshard/CMakeLists.linux-aarch64.txt | 1 | ||||
-rw-r--r-- | ydb/core/tx/schemeshard/CMakeLists.linux-x86_64.txt | 1 | ||||
-rw-r--r-- | ydb/core/tx/schemeshard/CMakeLists.windows-x86_64.txt | 1 | ||||
-rw-r--r-- | ydb/core/tx/schemeshard/schemeshard_identificators.h | 3 | ||||
-rw-r--r-- | ydb/core/tx/schemeshard/schemeshard_ui64id.cpp | 1 | ||||
-rw-r--r-- | ydb/core/tx/schemeshard/ya.make | 1 | ||||
-rw-r--r-- | ydb/core/util/CMakeLists.darwin-x86_64.txt | 1 | ||||
-rw-r--r-- | ydb/core/util/CMakeLists.linux-aarch64.txt | 1 | ||||
-rw-r--r-- | ydb/core/util/CMakeLists.linux-x86_64.txt | 1 | ||||
-rw-r--r-- | ydb/core/util/CMakeLists.windows-x86_64.txt | 1 | ||||
-rw-r--r-- | ydb/core/util/ui64id.cpp | 1 | ||||
-rw-r--r-- | ydb/core/util/ui64id.h (renamed from ydb/core/tx/schemeshard/schemeshard_ui64id.h) | 0 | ||||
-rw-r--r-- | ydb/core/util/ya.make | 2 |
14 files changed, 8 insertions, 8 deletions
diff --git a/ydb/core/tx/schemeshard/CMakeLists.darwin-x86_64.txt b/ydb/core/tx/schemeshard/CMakeLists.darwin-x86_64.txt index 00eb50b58dc..08540cd41c5 100644 --- a/ydb/core/tx/schemeshard/CMakeLists.darwin-x86_64.txt +++ b/ydb/core/tx/schemeshard/CMakeLists.darwin-x86_64.txt @@ -242,7 +242,6 @@ target_sources(core-tx-schemeshard PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_svp_migration.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_tables_storage.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_types.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_ui64id.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_utils.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_export__cancel.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_export__create.cpp diff --git a/ydb/core/tx/schemeshard/CMakeLists.linux-aarch64.txt b/ydb/core/tx/schemeshard/CMakeLists.linux-aarch64.txt index c31bef04001..c495205d90c 100644 --- a/ydb/core/tx/schemeshard/CMakeLists.linux-aarch64.txt +++ b/ydb/core/tx/schemeshard/CMakeLists.linux-aarch64.txt @@ -243,7 +243,6 @@ target_sources(core-tx-schemeshard PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_svp_migration.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_tables_storage.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_types.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_ui64id.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_utils.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_export__cancel.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_export__create.cpp diff --git a/ydb/core/tx/schemeshard/CMakeLists.linux-x86_64.txt b/ydb/core/tx/schemeshard/CMakeLists.linux-x86_64.txt index c31bef04001..c495205d90c 100644 --- a/ydb/core/tx/schemeshard/CMakeLists.linux-x86_64.txt +++ b/ydb/core/tx/schemeshard/CMakeLists.linux-x86_64.txt @@ -243,7 +243,6 @@ target_sources(core-tx-schemeshard PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_svp_migration.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_tables_storage.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_types.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_ui64id.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_utils.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_export__cancel.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_export__create.cpp diff --git a/ydb/core/tx/schemeshard/CMakeLists.windows-x86_64.txt b/ydb/core/tx/schemeshard/CMakeLists.windows-x86_64.txt index 5304d106f7d..63834ed7c0a 100644 --- a/ydb/core/tx/schemeshard/CMakeLists.windows-x86_64.txt +++ b/ydb/core/tx/schemeshard/CMakeLists.windows-x86_64.txt @@ -242,7 +242,6 @@ target_sources(core-tx-schemeshard PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_svp_migration.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_tables_storage.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_types.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_ui64id.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_utils.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_export__cancel.cpp ${CMAKE_SOURCE_DIR}/ydb/core/tx/schemeshard/schemeshard_export__create.cpp diff --git a/ydb/core/tx/schemeshard/schemeshard_identificators.h b/ydb/core/tx/schemeshard/schemeshard_identificators.h index 989716527fa..f734312f844 100644 --- a/ydb/core/tx/schemeshard/schemeshard_identificators.h +++ b/ydb/core/tx/schemeshard/schemeshard_identificators.h @@ -1,8 +1,7 @@ #pragma once -#include "schemeshard_ui64id.h" - #include <ydb/core/base/pathid.h> +#include <ydb/core/util/ui64id.h> #include <util/generic/utility.h> #include <util/stream/output.h> diff --git a/ydb/core/tx/schemeshard/schemeshard_ui64id.cpp b/ydb/core/tx/schemeshard/schemeshard_ui64id.cpp deleted file mode 100644 index b50a3542ddc..00000000000 --- a/ydb/core/tx/schemeshard/schemeshard_ui64id.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "schemeshard_ui64id.h" diff --git a/ydb/core/tx/schemeshard/ya.make b/ydb/core/tx/schemeshard/ya.make index 2a3410b3cbd..54a72e930c1 100644 --- a/ydb/core/tx/schemeshard/ya.make +++ b/ydb/core/tx/schemeshard/ya.make @@ -196,7 +196,6 @@ SRCS( schemeshard_tables_storage.cpp schemeshard_types.cpp schemeshard_types.h - schemeshard_ui64id.cpp schemeshard_user_attr_limits.h schemeshard_utils.cpp schemeshard_utils.h diff --git a/ydb/core/util/CMakeLists.darwin-x86_64.txt b/ydb/core/util/CMakeLists.darwin-x86_64.txt index d3a86230442..78c21f08801 100644 --- a/ydb/core/util/CMakeLists.darwin-x86_64.txt +++ b/ydb/core/util/CMakeLists.darwin-x86_64.txt @@ -47,4 +47,5 @@ target_sources(ydb-core-util PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/util/testactorsys.cpp ${CMAKE_SOURCE_DIR}/ydb/core/util/text.cpp ${CMAKE_SOURCE_DIR}/ydb/core/util/ulid.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/util/ui64id.cpp ) diff --git a/ydb/core/util/CMakeLists.linux-aarch64.txt b/ydb/core/util/CMakeLists.linux-aarch64.txt index 5ce8b72be13..073ab3b33a9 100644 --- a/ydb/core/util/CMakeLists.linux-aarch64.txt +++ b/ydb/core/util/CMakeLists.linux-aarch64.txt @@ -48,4 +48,5 @@ target_sources(ydb-core-util PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/util/testactorsys.cpp ${CMAKE_SOURCE_DIR}/ydb/core/util/text.cpp ${CMAKE_SOURCE_DIR}/ydb/core/util/ulid.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/util/ui64id.cpp ) diff --git a/ydb/core/util/CMakeLists.linux-x86_64.txt b/ydb/core/util/CMakeLists.linux-x86_64.txt index 5ce8b72be13..073ab3b33a9 100644 --- a/ydb/core/util/CMakeLists.linux-x86_64.txt +++ b/ydb/core/util/CMakeLists.linux-x86_64.txt @@ -48,4 +48,5 @@ target_sources(ydb-core-util PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/util/testactorsys.cpp ${CMAKE_SOURCE_DIR}/ydb/core/util/text.cpp ${CMAKE_SOURCE_DIR}/ydb/core/util/ulid.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/util/ui64id.cpp ) diff --git a/ydb/core/util/CMakeLists.windows-x86_64.txt b/ydb/core/util/CMakeLists.windows-x86_64.txt index d3a86230442..78c21f08801 100644 --- a/ydb/core/util/CMakeLists.windows-x86_64.txt +++ b/ydb/core/util/CMakeLists.windows-x86_64.txt @@ -47,4 +47,5 @@ target_sources(ydb-core-util PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/util/testactorsys.cpp ${CMAKE_SOURCE_DIR}/ydb/core/util/text.cpp ${CMAKE_SOURCE_DIR}/ydb/core/util/ulid.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/util/ui64id.cpp ) diff --git a/ydb/core/util/ui64id.cpp b/ydb/core/util/ui64id.cpp new file mode 100644 index 00000000000..82b5768a6a5 --- /dev/null +++ b/ydb/core/util/ui64id.cpp @@ -0,0 +1 @@ +#include "ui64id.h" diff --git a/ydb/core/tx/schemeshard/schemeshard_ui64id.h b/ydb/core/util/ui64id.h index 26965918c8e..26965918c8e 100644 --- a/ydb/core/tx/schemeshard/schemeshard_ui64id.h +++ b/ydb/core/util/ui64id.h diff --git a/ydb/core/util/ya.make b/ydb/core/util/ya.make index d16ffb40ab5..2a1bdd22d1b 100644 --- a/ydb/core/util/ya.make +++ b/ydb/core/util/ya.make @@ -54,6 +54,8 @@ SRCS( type_alias.h ulid.cpp ulid.h + ui64id.cpp + ui64id.h wildcard.h ) |