KIKIMR-19091: prepare reusing timeout actor

13 files changed, 53 insertions, 36 deletions

diff --git a/ydb/services/metadata/abstract/CMakeLists.darwin-x86_64.txt b/ydb/services/metadata/abstract/CMakeLists.darwin-x86_64.txt
index a6d838e7a9..da308a309e 100644
--- a/ydb/services/metadata/abstract/CMakeLists.darwin-x86_64.txt
+++ b/ydb/services/metadata/abstract/CMakeLists.darwin-x86_64.txt
@@ -28,6 +28,7 @@ target_link_libraries(services-metadata-abstract PUBLIC
 target_sources(services-metadata-abstract PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/common.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/decoder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/events.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/fetcher.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/kqp_common.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/initialization.cpp
diff --git a/ydb/services/metadata/abstract/CMakeLists.linux-aarch64.txt b/ydb/services/metadata/abstract/CMakeLists.linux-aarch64.txt
index 8f7886ef57..04504e08c7 100644
--- a/ydb/services/metadata/abstract/CMakeLists.linux-aarch64.txt
+++ b/ydb/services/metadata/abstract/CMakeLists.linux-aarch64.txt
@@ -29,6 +29,7 @@ target_link_libraries(services-metadata-abstract PUBLIC
 target_sources(services-metadata-abstract PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/common.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/decoder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/events.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/fetcher.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/kqp_common.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/initialization.cpp
diff --git a/ydb/services/metadata/abstract/CMakeLists.linux-x86_64.txt b/ydb/services/metadata/abstract/CMakeLists.linux-x86_64.txt
index 8f7886ef57..04504e08c7 100644
--- a/ydb/services/metadata/abstract/CMakeLists.linux-x86_64.txt
+++ b/ydb/services/metadata/abstract/CMakeLists.linux-x86_64.txt
@@ -29,6 +29,7 @@ target_link_libraries(services-metadata-abstract PUBLIC
 target_sources(services-metadata-abstract PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/common.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/decoder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/events.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/fetcher.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/kqp_common.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/initialization.cpp
diff --git a/ydb/services/metadata/abstract/CMakeLists.windows-x86_64.txt b/ydb/services/metadata/abstract/CMakeLists.windows-x86_64.txt
index a6d838e7a9..da308a309e 100644
--- a/ydb/services/metadata/abstract/CMakeLists.windows-x86_64.txt
+++ b/ydb/services/metadata/abstract/CMakeLists.windows-x86_64.txt
@@ -28,6 +28,7 @@ target_link_libraries(services-metadata-abstract PUBLIC
 target_sources(services-metadata-abstract PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/common.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/decoder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/events.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/fetcher.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/kqp_common.cpp
   ${CMAKE_SOURCE_DIR}/ydb/services/metadata/abstract/initialization.cpp
diff --git a/ydb/services/metadata/abstract/common.h b/ydb/services/metadata/abstract/common.h
index 8801b9e91c..541bc13b0e 100644
--- a/ydb/services/metadata/abstract/common.h
+++ b/ydb/services/metadata/abstract/common.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "fetcher.h"
+#include "events.h"
 
 #include <library/cpp/actors/core/actor.h>
 #include <library/cpp/actors/core/actorid.h>
@@ -13,37 +14,6 @@
 
 namespace NKikimr::NMetadata::NProvider {
 
-enum EEvents {
-    EvRefreshSubscriberData = EventSpaceBegin(TKikimrEvents::ES_METADATA_PROVIDER),
-    EvRefresh,
-    EvEnrichSnapshotResult,
-    EvEnrichSnapshotProblem,
-    EvAskLocal,
-    EvSubscribeLocal,
-    EvUnsubscribeLocal,
-    EvAskExternal,
-    EvSubscribeExternal,
-    EvUnsubscribeExternal,
-    EvYQLResponse,
-    EvAlterObjects,
-    EvPrepareManager,
-    EvManagerPrepared,
-    EvTimeout,
-    EvTableDescriptionFailed,
-    EvTableDescriptionSuccess,
-    EvAccessorSimpleResult,
-    EvAccessorSimpleError,
-    EvAccessorSimpleTableAbsent,
-    EvPathExistsCheckFailed,
-    EvPathExistsCheckResult,
-    EvStartMetadataService,
-    EvStartRegistration,
-    EvRecheckExistence,
-    EvEnd
-};
-
-static_assert(EEvents::EvEnd < EventSpaceEnd(TKikimrEvents::ES_METADATA_PROVIDER), "expect EvEnd < EventSpaceEnd(TKikimrEvents::ES_METADATA_PROVIDER)");
-
 class TEvRefreshSubscriberData: public NActors::TEventLocal<TEvRefreshSubscriberData, EvRefreshSubscriberData> {
 private:
     YDB_READONLY_DEF(NFetcher::ISnapshot::TPtr, Snapshot);
diff --git a/ydb/services/metadata/abstract/events.cpp b/ydb/services/metadata/abstract/events.cpp
new file mode 100644
index 0000000000..120de0f2d0
--- /dev/null
+++ b/ydb/services/metadata/abstract/events.cpp
@@ -0,0 +1,5 @@
+#include "events.h"
+
+namespace NKikimr::NMetadata::NProvider {
+
+}
diff --git a/ydb/services/metadata/abstract/events.h b/ydb/services/metadata/abstract/events.h
new file mode 100644
index 0000000000..5cdd320086
--- /dev/null
+++ b/ydb/services/metadata/abstract/events.h
@@ -0,0 +1,38 @@
+#pragma once
+#include <ydb/core/base/events.h>
+#include <library/cpp/actors/core/events.h>
+
+namespace NKikimr::NMetadata::NProvider {
+
+enum EEvents {
+    EvRefreshSubscriberData = EventSpaceBegin(TKikimrEvents::ES_METADATA_PROVIDER),
+    EvRefresh,
+    EvEnrichSnapshotResult,
+    EvEnrichSnapshotProblem,
+    EvAskLocal,
+    EvSubscribeLocal,
+    EvUnsubscribeLocal,
+    EvAskExternal,
+    EvSubscribeExternal,
+    EvUnsubscribeExternal,
+    EvYQLResponse,
+    EvAlterObjects,
+    EvPrepareManager,
+    EvManagerPrepared,
+    EvTimeout,
+    EvTableDescriptionFailed,
+    EvTableDescriptionSuccess,
+    EvAccessorSimpleResult,
+    EvAccessorSimpleError,
+    EvAccessorSimpleTableAbsent,
+    EvPathExistsCheckFailed,
+    EvPathExistsCheckResult,
+    EvStartMetadataService,
+    EvStartRegistration,
+    EvRecheckExistence,
+    EvEnd
+};
+
+static_assert(EEvents::EvEnd < EventSpaceEnd(TKikimrEvents::ES_METADATA_PROVIDER), "expect EvEnd < EventSpaceEnd(TKikimrEvents::ES_METADATA_PROVIDER)");
+
+}
diff --git a/ydb/services/metadata/abstract/fetcher.h b/ydb/services/metadata/abstract/fetcher.h
index 7761f63cf5..5d4bc2c63c 100644
--- a/ydb/services/metadata/abstract/fetcher.h
+++ b/ydb/services/metadata/abstract/fetcher.h
@@ -8,8 +8,6 @@
 #include <library/cpp/object_factory/object_factory.h>
 #include <ydb/core/base/events.h>
 #include <ydb/library/accessor/accessor.h>
-#include <ydb/library/yql/core/expr_nodes/yql_expr_nodes.h>
-#include <ydb/public/api/protos/ydb_table.pb.h>
 #include <ydb/services/metadata/initializer/common.h>
 #include <ydb/services/metadata/manager/common.h>
 #include <ydb/services/metadata/manager/table_record.h>
diff --git a/ydb/services/metadata/abstract/ya.make b/ydb/services/metadata/abstract/ya.make
index 892e9b3f44..e32927ec65 100644
--- a/ydb/services/metadata/abstract/ya.make
+++ b/ydb/services/metadata/abstract/ya.make
@@ -3,6 +3,7 @@ LIBRARY()
 SRCS(
     common.cpp
     decoder.cpp
+    events.cpp
     fetcher.cpp
     kqp_common.cpp
     initialization.cpp
diff --git a/ydb/services/metadata/common/timeout.h b/ydb/services/metadata/common/timeout.h
index 170dda6855..d696b8135d 100644
--- a/ydb/services/metadata/common/timeout.h
+++ b/ydb/services/metadata/common/timeout.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb/core/base/appdata.h>
-#include <ydb/services/metadata/abstract/common.h>
+#include <ydb/services/metadata/abstract/events.h>
 
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 #include <library/cpp/actors/core/events.h>
diff --git a/ydb/services/metadata/ds_table/scheme_describe.h b/ydb/services/metadata/ds_table/scheme_describe.h
index 7f0e776a25..fcc224ad91 100644
--- a/ydb/services/metadata/ds_table/scheme_describe.h
+++ b/ydb/services/metadata/ds_table/scheme_describe.h
@@ -2,6 +2,8 @@
 
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/services/metadata/common/ss_dialog.h>
+#include <ydb/library/accessor/accessor.h>
+#include <ydb/services/metadata/manager/abstract.h>
 
 namespace NKikimr::NMetadata::NProvider {
 
diff --git a/ydb/services/metadata/ds_table/table_exists.h b/ydb/services/metadata/ds_table/table_exists.h
index bbf0667460..bec2684193 100644
--- a/ydb/services/metadata/ds_table/table_exists.h
+++ b/ydb/services/metadata/ds_table/table_exists.h
@@ -2,6 +2,7 @@
 
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/services/metadata/common/ss_dialog.h>
+#include <ydb/library/accessor/accessor.h>
 
 namespace NKikimr::NMetadata::NProvider {
 
diff --git a/ydb/services/metadata/manager/abstract.h b/ydb/services/metadata/manager/abstract.h
index b03cc8bbb2..0d59dd5e6e 100644
--- a/ydb/services/metadata/manager/abstract.h
+++ b/ydb/services/metadata/manager/abstract.h
@@ -7,8 +7,6 @@
 #include <ydb/library/aclib/aclib.h>
 #include <ydb/library/conclusion/status.h>
 #include <ydb/library/conclusion/result.h>
-#include <ydb/library/yql/ast/yql_expr_builder.h>
-#include <ydb/library/yql/core/expr_nodes/yql_expr_nodes.h>
 
 #include <ydb/services/metadata/abstract/kqp_common.h>
 #include <ydb/services/metadata/abstract/parsing.h>