Browse Source

Use own copy of actorlib. KIKIMR-20294

dcherednik 1 year ago
parent
commit
e33befc2c5

+ 97 - 0
.mapping.json

@@ -7646,6 +7646,103 @@
   "ydb/library/aclib/ut/CMakeLists.linux-x86_64.txt":"",
   "ydb/library/aclib/ut/CMakeLists.txt":"",
   "ydb/library/aclib/ut/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/CMakeLists.txt":"",
+  "ydb/library/actors/actor_type/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/actor_type/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/actor_type/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/actor_type/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/actor_type/CMakeLists.txt":"",
+  "ydb/library/actors/actor_type/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/core/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/core/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/core/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/core/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/core/CMakeLists.txt":"",
+  "ydb/library/actors/core/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/dnscachelib/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/dnscachelib/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/dnscachelib/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/dnscachelib/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/dnscachelib/CMakeLists.txt":"",
+  "ydb/library/actors/dnscachelib/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/dnsresolver/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/dnsresolver/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/dnsresolver/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/dnsresolver/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/dnsresolver/CMakeLists.txt":"",
+  "ydb/library/actors/dnsresolver/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/helpers/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/helpers/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/helpers/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/helpers/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/helpers/CMakeLists.txt":"",
+  "ydb/library/actors/helpers/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/http/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/http/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/http/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/http/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/http/CMakeLists.txt":"",
+  "ydb/library/actors/http/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/interconnect/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/interconnect/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/interconnect/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/interconnect/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/interconnect/CMakeLists.txt":"",
+  "ydb/library/actors/interconnect/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/interconnect/mock/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/interconnect/mock/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/interconnect/mock/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/interconnect/mock/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/interconnect/mock/CMakeLists.txt":"",
+  "ydb/library/actors/interconnect/mock/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/log_backend/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/log_backend/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/log_backend/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/log_backend/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/log_backend/CMakeLists.txt":"",
+  "ydb/library/actors/log_backend/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/memory_log/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/memory_log/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/memory_log/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/memory_log/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/memory_log/CMakeLists.txt":"",
+  "ydb/library/actors/memory_log/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/prof/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/prof/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/prof/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/prof/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/prof/CMakeLists.txt":"",
+  "ydb/library/actors/prof/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/protos/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/protos/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/protos/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/protos/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/protos/CMakeLists.txt":"",
+  "ydb/library/actors/protos/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/testlib/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/testlib/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/testlib/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/testlib/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/testlib/CMakeLists.txt":"",
+  "ydb/library/actors/testlib/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/util/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/util/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/util/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/util/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/util/CMakeLists.txt":"",
+  "ydb/library/actors/util/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/wilson/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/wilson/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/wilson/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/wilson/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/wilson/CMakeLists.txt":"",
+  "ydb/library/actors/wilson/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/actors/wilson/protos/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/actors/wilson/protos/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/actors/wilson/protos/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/actors/wilson/protos/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/actors/wilson/protos/CMakeLists.txt":"",
+  "ydb/library/actors/wilson/protos/CMakeLists.windows-x86_64.txt":"",
   "ydb/library/arrow_clickhouse/CMakeLists.darwin-arm64.txt":"",
   "ydb/library/arrow_clickhouse/CMakeLists.darwin-x86_64.txt":"",
   "ydb/library/arrow_clickhouse/CMakeLists.linux-aarch64.txt":"",

+ 1 - 1
generate_cmake

@@ -110,7 +110,7 @@ def generate_graph_for_platform(generate_graph_for_platform):
         "in $B/library/cpp/config/",
         "in $S/tools/rescompiler/bin/",
         # Fix
-        "in $B/library/cpp/actors/dnsresolver/ut/library-cpp-actors-dnsresolver-ut",
+        "in $B/ydb/library/actors/dnsresolver/ut/library-cpp-actors-dnsresolver-ut",
         "in $B/ydb/library/pdisk_io/libydb-library-pdisk_io",
     ]
 

+ 1 - 1
ydb/apps/dstool/setup.py

@@ -38,7 +38,7 @@ setuptools.setup(
     license="Apache 2.0",
     package_dir={"": "."},
     packages=[
-        'library/cpp/actors/protos',
+        'ydb/library/actors/protos',
         'ydb/core/protos',
         'ydb/core/fq/libs/config/protos',
         'ydb/library/folder_service/proto',

+ 3 - 3
ydb/apps/pgwire/appdata.h

@@ -1,7 +1,7 @@
 #pragma once
-#include <library/cpp/actors/core/actorsystem.h>
-#include <library/cpp/actors/core/actor.h>
-#include <library/cpp/actors/core/executor_thread.h>
+#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/actor.h>
+#include <ydb/library/actors/core/executor_thread.h>
 #include <library/cpp/monlib/metrics/metric_registry.h>
 
 namespace NPGW {

+ 2 - 2
ydb/apps/pgwire/log_impl.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <library/cpp/actors/core/actorsystem.h>
-#include <library/cpp/actors/core/log.h>
+#include <ydb/library/actors/core/actorsystem.h>
+#include <ydb/library/actors/core/log.h>
 #include <ydb/library/services/services.pb.h>
 
 #define BLOG_D(stream) LOG_DEBUG_S(*NActors::TlsActivationContext, NKikimrServices::PGYDB, stream)

+ 1 - 1
ydb/apps/pgwire/pg_ydb_connection.cpp

@@ -6,7 +6,7 @@
 #include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
 #include <ydb/public/sdk/cpp/client/ydb_table/table.h>
 #include <ydb/public/sdk/cpp/client/draft/ydb_scripting.h>
-#include <library/cpp/actors/core/actor_bootstrapped.h>
+#include <ydb/library/actors/core/actor_bootstrapped.h>
 
 // temporarry borrowed from postgresql/src/backend/catalog/pg_type_d.h
 

+ 1 - 1
ydb/apps/pgwire/pg_ydb_connection.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <library/cpp/actors/core/actor.h>
+#include <ydb/library/actors/core/actor.h>
 #include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
 #include <ydb/public/sdk/cpp/client/ydb_common_client/settings.h>
 

+ 1 - 1
ydb/apps/pgwire/pg_ydb_proxy.cpp

@@ -3,7 +3,7 @@
 #include "log_impl.h"
 #include <ydb/core/pgproxy/pg_proxy_events.h>
 #include <ydb/public/api/grpc/ydb_auth_v1.grpc.pb.h>
-#include <library/cpp/actors/core/actor.h>
+#include <ydb/library/actors/core/actor.h>
 #define INCLUDE_YDB_INTERNAL_H
 #include <ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/grpc_connections.h>
 

+ 1 - 1
ydb/apps/pgwire/pg_ydb_proxy.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <library/cpp/actors/core/actor.h>
+#include <ydb/library/actors/core/actor.h>
 #include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
 
 namespace NPGW {

+ 6 - 6
ydb/apps/pgwire/pgwire.cpp

@@ -4,12 +4,12 @@
 #include <util/system/mlock.h>
 #include <util/stream/file.h>
 #include <library/cpp/getopt/last_getopt.h>
-#include <library/cpp/actors/core/log.h>
-#include <library/cpp/actors/core/executor_pool_basic.h>
-#include <library/cpp/actors/core/scheduler_basic.h>
-#include <library/cpp/actors/core/process_stats.h>
-#include <library/cpp/actors/protos/services_common.pb.h>
-#include <library/cpp/actors/interconnect/poller_actor.h>
+#include <ydb/library/actors/core/log.h>
+#include <ydb/library/actors/core/executor_pool_basic.h>
+#include <ydb/library/actors/core/scheduler_basic.h>
+#include <ydb/library/actors/core/process_stats.h>
+#include <ydb/library/actors/protos/services_common.pb.h>
+#include <ydb/library/actors/interconnect/poller_actor.h>
 #include "pgwire.h"
 #include "log_impl.h"
 #include "pg_ydb_proxy.h"

Some files were not shown because too many files changed in this diff