aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstanly <stanly@yandex-team.com>2023-05-16 13:54:13 +0300
committerstanly <stanly@yandex-team.com>2023-05-16 13:54:13 +0300
commitc6500a4c991881a561bf4e2c7187b410f3b5fbbd (patch)
treebda640375052d323d564cf67a0f27bed05ca59eb
parentc9df7fc86be0b15adc1e812144c41ab5c057baef (diff)
downloadydb-c6500a4c991881a561bf4e2c7187b410f3b5fbbd.tar.gz
wrap actors into private namespace
-rw-r--r--ydb/core/tx/columnshard/blob_cache.cpp3
-rw-r--r--ydb/core/tx/columnshard/columnshard_impl.h3
-rw-r--r--ydb/core/tx/columnshard/compaction_actor.cpp3
-rw-r--r--ydb/core/tx/columnshard/eviction_actor.cpp5
-rw-r--r--ydb/core/tx/columnshard/export_actor.cpp3
-rw-r--r--ydb/core/tx/columnshard/indexing_actor.cpp3
-rw-r--r--ydb/core/tx/columnshard/read_actor.cpp3
-rw-r--r--ydb/core/tx/columnshard/write_actor.cpp3
8 files changed, 22 insertions, 4 deletions
diff --git a/ydb/core/tx/columnshard/blob_cache.cpp b/ydb/core/tx/columnshard/blob_cache.cpp
index 2382079d4ff..71824d10abf 100644
--- a/ydb/core/tx/columnshard/blob_cache.cpp
+++ b/ydb/core/tx/columnshard/blob_cache.cpp
@@ -13,6 +13,7 @@
#include <tuple>
namespace NKikimr::NBlobCache {
+namespace {
using namespace NActors;
@@ -728,6 +729,8 @@ private:
}
};
+} // namespace
+
NActors::IActor* CreateBlobCache(ui64 maxBytes, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) {
return new TBlobCache(maxBytes, counters);
}
diff --git a/ydb/core/tx/columnshard/columnshard_impl.h b/ydb/core/tx/columnshard/columnshard_impl.h
index 9a5c0e8ccfe..90636d89855 100644
--- a/ydb/core/tx/columnshard/columnshard_impl.h
+++ b/ydb/core/tx/columnshard/columnshard_impl.h
@@ -116,9 +116,6 @@ class TColumnShard
: public TActor<TColumnShard>
, public NTabletFlatExecutor::TTabletExecutedFlat
{
- friend class TIndexingActor;
- friend class TCompactionActor;
- friend class TEvictionActor;
friend class TTxInit;
friend class TTxInitSchema;
friend class TTxUpdateSchema;
diff --git a/ydb/core/tx/columnshard/compaction_actor.cpp b/ydb/core/tx/columnshard/compaction_actor.cpp
index 1c6e132e76c..bbd3dd33b66 100644
--- a/ydb/core/tx/columnshard/compaction_actor.cpp
+++ b/ydb/core/tx/columnshard/compaction_actor.cpp
@@ -4,6 +4,7 @@
#include "blob_cache.h"
namespace NKikimr::NColumnShard {
+namespace {
using NOlap::TBlobRange;
@@ -146,6 +147,8 @@ private:
}
};
+} // namespace
+
IActor* CreateCompactionActor(ui64 tabletId, const TActorId& parent) {
return new TCompactionActor(tabletId, parent);
}
diff --git a/ydb/core/tx/columnshard/eviction_actor.cpp b/ydb/core/tx/columnshard/eviction_actor.cpp
index 69cd682b6fd..b9ea3e2d8d5 100644
--- a/ydb/core/tx/columnshard/eviction_actor.cpp
+++ b/ydb/core/tx/columnshard/eviction_actor.cpp
@@ -4,6 +4,7 @@
#include "blob_cache.h"
namespace NKikimr::NColumnShard {
+namespace {
using NOlap::TBlobRange;
@@ -129,7 +130,7 @@ private:
TxEvent->IndexChanges->SetBlobs(std::move(Blobs));
NOlap::TEvictionLogic evictionLogic(TxEvent->IndexInfo, TxEvent->Tiering);
TxEvent->Blobs = evictionLogic.Apply(TxEvent->IndexChanges);
-
+
if (TxEvent->Blobs.empty()) {
TxEvent->PutStatus = NKikimrProto::OK;
}
@@ -142,6 +143,8 @@ private:
}
};
+} // namespace
+
IActor* CreateEvictionActor(ui64 tabletId, const TActorId& parent) {
return new TEvictionActor(tabletId, parent);
}
diff --git a/ydb/core/tx/columnshard/export_actor.cpp b/ydb/core/tx/columnshard/export_actor.cpp
index f019aac4bf6..679987efcdd 100644
--- a/ydb/core/tx/columnshard/export_actor.cpp
+++ b/ydb/core/tx/columnshard/export_actor.cpp
@@ -5,6 +5,7 @@
#include <library/cpp/actors/core/actor_bootstrapped.h>
namespace NKikimr::NColumnShard {
+namespace {
class TExportActor : public TActorBootstrapped<TExportActor> {
public:
@@ -109,6 +110,8 @@ private:
}
};
+} // namespace
+
IActor* CreateExportActor(const ui64 tabletId, const TActorId& dstActor, TAutoPtr<TEvPrivate::TEvExport> ev) {
return new TExportActor(tabletId, dstActor, ev);
}
diff --git a/ydb/core/tx/columnshard/indexing_actor.cpp b/ydb/core/tx/columnshard/indexing_actor.cpp
index 2c45bb7e562..8ebd6c558aa 100644
--- a/ydb/core/tx/columnshard/indexing_actor.cpp
+++ b/ydb/core/tx/columnshard/indexing_actor.cpp
@@ -4,6 +4,7 @@
#include "blob_cache.h"
namespace NKikimr::NColumnShard {
+namespace {
class TIndexingActor : public TActorBootstrapped<TIndexingActor> {
public:
@@ -137,6 +138,8 @@ private:
}
};
+} // namespace
+
IActor* CreateIndexingActor(ui64 tabletId, const TActorId& parent) {
return new TIndexingActor(tabletId, parent);
}
diff --git a/ydb/core/tx/columnshard/read_actor.cpp b/ydb/core/tx/columnshard/read_actor.cpp
index b9aa58f2d48..f3bb215b8dc 100644
--- a/ydb/core/tx/columnshard/read_actor.cpp
+++ b/ydb/core/tx/columnshard/read_actor.cpp
@@ -4,6 +4,7 @@
#include <library/cpp/actors/core/actor_bootstrapped.h>
namespace NKikimr::NColumnShard {
+namespace {
class TReadActor : public TActorBootstrapped<TReadActor> {
private:
@@ -286,6 +287,8 @@ private:
}
};
+} // namespace
+
IActor* CreateReadActor(ui64 tabletId,
const TActorId& dstActor,
std::unique_ptr<TEvColumnShard::TEvReadResult>&& event,
diff --git a/ydb/core/tx/columnshard/write_actor.cpp b/ydb/core/tx/columnshard/write_actor.cpp
index 4b3e675d212..df5f91931ed 100644
--- a/ydb/core/tx/columnshard/write_actor.cpp
+++ b/ydb/core/tx/columnshard/write_actor.cpp
@@ -4,6 +4,7 @@
#include <library/cpp/actors/core/actor_bootstrapped.h>
namespace NKikimr::NColumnShard {
+namespace {
class TWriteActor : public TActorBootstrapped<TWriteActor> {
public:
@@ -321,6 +322,8 @@ private:
}
};
+} // namespace
+
IActor* CreateWriteActor(ui64 tabletId, const NOlap::TIndexInfo& indexTable,
const TActorId& dstActor, TBlobBatch&& blobBatch, bool blobGrouppingEnabled,
TAutoPtr<TEvColumnShard::TEvWrite> ev, const TInstant& deadline) {