DRAFT: schemeshard build time works

ydb/core/tx/schemeshard/olap/layout/layout.cpp

@@ -1,10 +1,10 @@
 #include "layout.h"
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 #include <ydb/library/actors/core/log.h>
 
 namespace NKikimr::NSchemeShard {
 
-std::vector<ui64> TColumnTablesLayout::ShardIdxToTabletId(const std::vector<TShardIdx>& shards, const TSchemeShard& ss) {
+std::vector<ui64> TColumnTablesLayout::ShardIdxToTabletId(const std::vector<TShardIdx>& shards, const TSchemeshardState& ss) {
     std::vector<ui64> result;
     for (const auto& shardIdx : shards) {
         auto* shardInfo = ss.ShardInfos.FindPtr(shardIdx);

ydb/core/tx/schemeshard/olap/layout/layout.h

@@ -63,7 +63,7 @@ class TLayoutIdSet {
     }
 };
 
-class TSchemeShard;
+struct TSchemeshardState;
 
 class TColumnTablesLayout {
 private:
@@ -107,7 +107,7 @@ class TColumnTablesLayout {
         Groups.erase(std::remove_if(Groups.begin(), Groups.end(), pred), Groups.end());
     }
 
-    static std::vector<ui64> ShardIdxToTabletId(const std::vector<TShardIdx>& shards, const TSchemeShard& ss);
+    static std::vector<ui64> ShardIdxToTabletId(const std::vector<TShardIdx>& shards, const TSchemeshardState& ss);
 
     static TColumnTablesLayout BuildTrivial(const std::vector<ui64>& tabletIds);
 };

ydb/core/tx/schemeshard/olap/operations/alter/abstract/object.cpp

@@ -1,5 +1,5 @@
 #include "object.h"
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 
 namespace NKikimr::NSchemeShard::NOlap::NAlter {
 
@@ -13,4 +13,4 @@ std::shared_ptr<NKikimr::NSchemeShard::NOlap::NAlter::ISSEntity> ISSEntity::GetE
     return nullptr;
 }
 
-}
+}

ydb/core/tx/schemeshard/olap/operations/alter/common/object.cpp

@@ -1,5 +1,5 @@
 #include "object.h"
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 
 namespace NKikimr::NSchemeShard::NOlap::NAlter {
 
@@ -37,4 +37,4 @@ TConclusion<std::shared_ptr<ISSEntityUpdate>> TColumnTableEntity::DoCreateUpdate
     return DoCreateUpdateImpl(context);
 }
 
-}
+}

ydb/core/tx/schemeshard/olap/operations/alter/common/update.cpp

@@ -1,5 +1,5 @@
 #include "update.h"
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 
 namespace NKikimr::NSchemeShard::NOlap::NAlter {
 
@@ -28,4 +28,4 @@ TConclusionStatus TColumnTableUpdate::DoFinish(const TUpdateFinishContext& conte
     return TConclusionStatus::Success();
 }
 
-}
+}

ydb/core/tx/schemeshard/olap/operations/alter/in_store/common/update.cpp

@@ -1,6 +1,6 @@
 #include "update.h"
 #include <ydb/core/tx/schemeshard/olap/operations/alter/in_store/object.h>
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 
 namespace NKikimr::NSchemeShard::NOlap::NAlter {
 
@@ -23,4 +23,4 @@ NKikimr::TConclusionStatus TInStoreTableUpdate::DoStartImpl(const TUpdateStartCo
     return DoStartInStoreImpl(context);
 }
 
-}
+}

ydb/core/tx/schemeshard/olap/operations/alter/in_store/config_shards/update.cpp

@@ -1,6 +1,6 @@
 #include "update.h"
 #include <ydb/core/tx/schemeshard/olap/operations/alter/abstract/converter.h>
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 
 namespace NKikimr::NSchemeShard::NOlap::NAlter {
 
@@ -79,4 +79,4 @@ NKikimr::TConclusionStatus TInStoreShardsUpdate::DoFinishImpl(const TUpdateFinis
     return TConclusionStatus::Success();
 }
 
-}
+}

ydb/core/tx/schemeshard/olap/operations/alter/in_store/object.cpp

@@ -3,7 +3,7 @@
 #include "resharding/update.h"
 #include "schema/update.h"
 #include "transfer/update.h"
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 
 namespace NKikimr::NSchemeShard::NOlap::NAlter {
 
@@ -85,4 +85,4 @@ NKikimr::TConclusion<NKikimrSchemeOp::TColumnTableSchema> TInStoreTable::GetTabl
     return presetProto.GetSchema();
 }
 
-}
+}

ydb/core/tx/schemeshard/olap/operations/alter/in_store/resharding/update.cpp

@@ -1,7 +1,7 @@
 #include "update.h"
 #include <ydb/core/tx/columnshard/bg_tasks/abstract/task.h>
 #include <ydb/core/tx/schemeshard/olap/bg_tasks/tx_chain/task.h>
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 #include <ydb/core/tx/sharding/sharding.h>
 
 namespace NKikimr::NSchemeShard::NOlap::NAlter {
@@ -60,4 +60,4 @@ TConclusionStatus TInStoreShardingUpdate::DoInitialize(const TUpdateInitializati
     return TConclusionStatus::Success();
 }
 
-}
+}

ydb/core/tx/schemeshard/olap/operations/alter/in_store/transfer/update.cpp

@@ -1,6 +1,6 @@
 #include "update.h"
 #include <ydb/core/tx/columnshard/data_sharing/initiator/controller/schemeshard.h>
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 #include <ydb/core/tx/columnshard/common/snapshot.h>
 
 namespace NKikimr::NSchemeShard::NOlap::NAlter {
@@ -15,7 +15,7 @@ NKikimr::TConclusionStatus TInStoreShardsTransfer::DoInitializeImpl(const TUpdat
         NKikimrColumnShardDataSharingProto::TDestinationSession destinationSession;
         destinationSession.SetSessionId(alter.GetSessionId());
         *destinationSession.MutableInitiatorController() = NKikimr::NOlap::NDataSharing::TInitiatorControllerContainer(
-            std::make_shared<NKikimr::NOlap::NDataSharing::TSSInitiatorController>(context.GetSSOperationContext()->SS->TabletID(), 0)).SerializeToProto();
+            std::make_shared<NKikimr::NOlap::NDataSharing::TSSInitiatorController>(ui64(context.GetSSOperationContext()->SS->SelfTabletId()), 0)).SerializeToProto();
         {
             auto& pathIdRemap = *destinationSession.AddPathIds();
             pathIdRemap.SetSourcePathId(context.GetOriginalEntity().GetPathId().LocalPathId);
@@ -42,4 +42,4 @@ NKikimr::TConclusionStatus TInStoreShardsTransfer::DoInitializeImpl(const TUpdat
     return TConclusionStatus::Success();
 }
 
-}
+}

ydb/core/tx/schemeshard/olap/operations/alter/standalone/object.cpp

@@ -1,6 +1,6 @@
 #include "object.h"
 #include "update.h"
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 
 namespace NKikimr::NSchemeShard::NOlap::NAlter {
 
@@ -40,4 +40,4 @@ NKikimr::TConclusionStatus TStandaloneTable::InitializeFromTableInfo() {
     return TConclusionStatus::Success();
 }
 
-}
+}

ydb/core/tx/schemeshard/olap/operations/alter_store.cpp

@@ -1,7 +1,10 @@
 #include <ydb/core/tx/schemeshard/schemeshard__operation_part.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 #include <ydb/core/tx/schemeshard/schemeshard__operation_common.h>
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
+
 #include <ydb/library/formats/arrow/accessor/common/const.h>
+#include <ydb/core/tx/columnshard/columnshard.h>
+#include <ydb/core/base/hive.h>
 
 #include "checks.h"
 
@@ -149,7 +152,7 @@ class TConfigureParts: public TSubOperationState {
             if (shard.TabletType == ETabletType::ColumnShard) {
                 auto event = std::make_unique<TEvColumnShard::TEvProposeTransaction>(
                     NKikimrTxColumnShard::TX_KIND_SCHEMA,
-                    context.SS->TabletID(),
+                    ui64(context.SS->SelfTabletId()),
                     context.Ctx.SelfID,
                     ui64(OperationId.GetTxId()),
                     columnShardTxBody, seqNo,
@@ -594,7 +597,7 @@ class TAlterOlapStore: public TSubOperation {
                      "TAlterOlapStore AbortUnsafe"
                          << ", opId: " << OperationId
                          << ", forceDropId: " << forceDropTxId
-                         << ", at schemeshard: " << context.SS->TabletID());
+                         << ", at schemeshard: " << context.SS->SelfTabletId());
 
         context.OnComplete.DoneOperation(OperationId);
     }

ydb/core/tx/schemeshard/olap/operations/alter_table.cpp

@@ -1,10 +1,13 @@
 #include "alter/abstract/object.h"
 #include "alter/abstract/update.h"
 #include <ydb/core/tx/schemeshard/schemeshard__operation_part.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 #include <ydb/core/tx/schemeshard/schemeshard__operation_common.h>
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
 
 #include <ydb/core/scheme/scheme_types_proto.h>
+#include <ydb/core/tx/columnshard/columnshard.h>
+#include <ydb/core/base/hive.h>
+
 
 namespace NKikimr::NSchemeShard::NOlap::NAlter {
 
@@ -59,7 +62,7 @@ class TConfigureParts: public TSubOperationState {
             auto txShardString = update->GetShardTxBodyString((ui64)tabletId, seqNo);
             auto event = std::make_unique<TEvColumnShard::TEvProposeTransaction>(
                 update->GetShardTransactionKind(),
-                context.SS->TabletID(),
+                ui64(context.SS->SelfTabletId()),
                 context.Ctx.SelfID,
                 ui64(OperationId.GetTxId()),
                 txShardString, seqNo,
@@ -106,7 +109,7 @@ class TPropose: public TSubOperationState {
                      << " at tablet: " << ssId
                      << ", stepId: " << step);
 
-        TTxState* txState = context.SS->FindTxSafe(OperationId, TTxState::TxAlterColumnTable); 
+        TTxState* txState = context.SS->FindTxSafe(OperationId, TTxState::TxAlterColumnTable);
 
         TPathId pathId = txState->TargetPathId;
         TPathElement::TPtr path = context.SS->PathsById.at(pathId);
@@ -142,10 +145,10 @@ class TPropose: public TSubOperationState {
         TTabletId ssId = context.SS->SelfTabletId();
 
         LOG_INFO_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
-                     DebugHint() << " HandleReply ProgressState"
+                     DebugHint() << " ProgressState"
                      << " at tablet: " << ssId);
 
-        TTxState* txState = context.SS->FindTxSafe(OperationId, TTxState::TxAlterColumnTable); 
+        TTxState* txState = context.SS->FindTxSafe(OperationId, TTxState::TxAlterColumnTable);
 
         TSet<TTabletId> shardSet;
         for (const auto& shard : txState->Shards) {
@@ -394,7 +397,7 @@ class TAlterColumnTable: public TSubOperation {
                      "TAlterColumnTable AbortUnsafe"
                          << ", opId: " << OperationId
                          << ", forceDropId: " << forceDropTxId
-                         << ", at schemeshard: " << context.SS->TabletID());
+                         << ", at schemeshard: " << context.SS->SelfTabletId());
 
         context.OnComplete.DoneOperation(OperationId);
     }

ydb/core/tx/schemeshard/olap/operations/create_store.cpp

@@ -1,6 +1,6 @@
 #include <ydb/core/tx/schemeshard/schemeshard__operation_part.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 #include <ydb/core/tx/schemeshard/schemeshard__operation_common.h>
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
 #include <ydb/core/tx/schemeshard/schemeshard__op_traits.h>
 
 #include <ydb/core/base/subdomain.h>
@@ -17,7 +17,7 @@ namespace {
 
 void ApplySharding(TTxId txId, TPathId pathId, TOlapStoreInfo::TPtr storeInfo,
                    const TChannelsBindings& channelsBindings,
-                   TTxState& txState, TSchemeShard* ss)
+                   TTxState& txState, TSchemeshardState* ss)
 {
     ui32 numShards = storeInfo->GetColumnShards().size();
     txState.Shards.reserve(numShards);
@@ -96,7 +96,7 @@ class TConfigureParts: public TSubOperationState {
             if (shard.TabletType == ETabletType::ColumnShard) {
                 auto event = std::make_unique<TEvColumnShard::TEvProposeTransaction>(
                     NKikimrTxColumnShard::TX_KIND_SCHEMA,
-                    context.SS->TabletID(),
+                    ui64(context.SS->SelfTabletId()),
                     context.Ctx.SelfID,
                     ui64(OperationId.GetTxId()),
                     columnShardTxBody, seqNo,
@@ -518,7 +518,7 @@ class TCreateOlapStore: public TSubOperation {
                      "TCreateOlapStore AbortUnsafe"
                          << ", opId: " << OperationId
                          << ", forceDropId: " << forceDropTxId
-                         << ", at schemeshard: " << context.SS->TabletID());
+                         << ", at schemeshard: " << context.SS->SelfTabletId());
 
         context.OnComplete.DoneOperation(OperationId);
     }

ydb/core/tx/schemeshard/olap/operations/create_table.cpp

@@ -1,6 +1,6 @@
 #include <ydb/core/tx/schemeshard/schemeshard__operation_part.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 #include <ydb/core/tx/schemeshard/schemeshard__operation_common.h>
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
 #include <ydb/core/tx/schemeshard/schemeshard__op_traits.h>
 
 #include <ydb/core/base/subdomain.h>
@@ -313,7 +313,7 @@ class TConfigureParts: public TSubOperationState {
             if (shard.TabletType == ETabletType::ColumnShard) {
                 auto event = std::make_unique<TEvColumnShard::TEvProposeTransaction>(
                     NKikimrTxColumnShard::TX_KIND_SCHEMA,
-                    context.SS->TabletID(),
+                    ui64(context.SS->SelfTabletId()),
                     context.Ctx.SelfID,
                     ui64(OperationId.GetTxId()),
                     columnShardTxBody, seqNo,
@@ -404,7 +404,7 @@ class TPropose: public TSubOperationState {
         TTabletId ssId = context.SS->SelfTabletId();
 
         LOG_INFO_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
-                     DebugHint() << " HandleReply ProgressState"
+                     DebugHint() << " ProgressState"
                      << " at tablet: " << ssId);
 
         TTxState* txState = context.SS->FindTx(OperationId);
@@ -875,7 +875,7 @@ class TCreateColumnTable: public TSubOperation {
                      "TCreateColumnTable AbortUnsafe"
                          << ", opId: " << OperationId
                          << ", forceDropId: " << forceDropTxId
-                         << ", at schemeshard: " << context.SS->TabletID());
+                         << ", at schemeshard: " << context.SS->SelfTabletId());
 
         context.OnComplete.DoneOperation(OperationId);
     }

ydb/core/tx/schemeshard/olap/operations/drop_store.cpp

@@ -1,8 +1,9 @@
 #include <ydb/core/tx/schemeshard/schemeshard__operation_part.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 #include <ydb/core/tx/schemeshard/schemeshard__operation_common.h>
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
 
 #include <ydb/core/base/subdomain.h>
+#include <ydb/core/tx/columnshard/columnshard.h>
 
 namespace NKikimr::NSchemeShard {
 
@@ -389,7 +390,7 @@ class TDropOlapStore: public TSubOperation {
                      "TDropOlapStore AbortUnsafe"
                          << ", opId: " << OperationId
                          << ", forceDropId: " << forceDropTxId
-                         << ", at schemeshard: " << context.SS->TabletID());
+                         << ", at schemeshard: " << context.SS->SelfTabletId());
 
         TTxState* txState = context.SS->FindTx(OperationId);
         Y_ABORT_UNLESS(txState);

ydb/core/tx/schemeshard/olap/operations/drop_table.cpp

@@ -1,8 +1,9 @@
 #include <ydb/core/tx/schemeshard/schemeshard__operation_part.h>
+#include <ydb/core/tx/schemeshard/schemeshard__operation_iface.h>
 #include <ydb/core/tx/schemeshard/schemeshard__operation_common.h>
-#include <ydb/core/tx/schemeshard/schemeshard_impl.h>
 
 #include <ydb/core/base/subdomain.h>
+#include <ydb/core/tx/columnshard/columnshard.h>
 
 namespace NKikimr::NSchemeShard {
 
@@ -66,7 +67,7 @@ class TDropParts: public TSubOperationState {
             {
                 auto event = std::make_unique<TEvColumnShard::TEvProposeTransaction>(
                     NKikimrTxColumnShard::TX_KIND_SCHEMA,
-                    context.SS->TabletID(),
+                    ui64(context.SS->SelfTabletId()),
                     context.Ctx.SelfID,
                     ui64(OperationId.GetTxId()),
                     columnShardTxBody, seqNo,
@@ -479,7 +480,7 @@ class TDropColumnTable: public TSubOperation {
                      "TDropColumnTable AbortUnsafe"
                          << ", opId: " << OperationId
                          << ", forceDropId: " << forceDropTxId
-                         << ", at schemeshard: " << context.SS->TabletID());
+                         << ", at schemeshard: " << context.SS->SelfTabletId());
 
         TTxState* txState = context.SS->FindTx(OperationId);
         Y_ABORT_UNLESS(txState);

ydb/core/tx/schemeshard/schemeshard__backup_collection_common.h

@@ -1,7 +1,9 @@
 #pragma once
 
-#include "schemeshard__operation_common.h"
-#include "schemeshard_impl.h"
+#include "schemeshard__operation_part.h"
+#include "schemeshard__operation_iface.h"
+
+#include "schemeshard_path.h"
 
 #include <util/generic/string.h>