diff --git a/ydb/core/protos/flat_tx_scheme.proto b/ydb/core/protos/flat_tx_scheme.proto index 0ee8122cd057..6569086eb40e 100644 --- a/ydb/core/protos/flat_tx_scheme.proto +++ b/ydb/core/protos/flat_tx_scheme.proto @@ -106,7 +106,7 @@ message TEvDescribeSchemeResult { optional string Reason = 2; optional string Path = 3; optional NKikimrSchemeOp.TPathDescription PathDescription = 4; - optional fixed64 PathOwner = 5; + optional fixed64 DEPRECATED_PathOwner = 5; // replaced by PathOwnerId optional fixed64 PathId = 6; optional string LastExistedPrefixPath = 7; diff --git a/ydb/core/tx/scheme_board/load_test.cpp b/ydb/core/tx/scheme_board/load_test.cpp index 1e2b0f6a88f3..f534e464ffe9 100644 --- a/ydb/core/tx/scheme_board/load_test.cpp +++ b/ydb/core/tx/scheme_board/load_test.cpp @@ -57,14 +57,14 @@ class TLoadProducer: public TActorBootstrapped { TDescription& dirDesc = dirDescTwoPart.Record; dirDesc.SetStatus(NKikimrScheme::StatusSuccess); - dirDesc.SetPathOwner(owner); + dirDesc.SetPathOwnerId(owner); dirDesc.SetPathId(nextPathId++); dirDesc.SetPath(dirPath); auto& dirSelf = *dirDesc.MutablePathDescription()->MutableSelf(); dirSelf.SetName(dirName); dirSelf.SetPathId(dirDesc.GetPathId()); - dirSelf.SetSchemeshardId(dirDesc.GetPathOwner()); + dirSelf.SetSchemeshardId(dirDesc.GetPathOwnerId()); dirSelf.SetPathType(NKikimrSchemeOp::EPathTypeDir); dirSelf.SetCreateFinished(true); dirSelf.SetCreateTxId(1); @@ -84,7 +84,7 @@ class TLoadProducer: public TActorBootstrapped { TDescription& objDesc = objDescTwoPart.Record; objDesc.SetStatus(NKikimrScheme::StatusSuccess); - objDesc.SetPathOwner(owner); + objDesc.SetPathOwnerId(owner); objDesc.SetPathId(nextPathId++); objDesc.SetPath(objPath); @@ -94,7 +94,7 @@ class TLoadProducer: public TActorBootstrapped { dirChildren.Add()->CopyFrom(objSelf); objSelf.SetPathId(objDesc.GetPathId()); - objSelf.SetSchemeshardId(objDesc.GetPathOwner()); + objSelf.SetSchemeshardId(objDesc.GetPathOwnerId()); objSelf.SetCreateFinished(true); objSelf.SetCreateTxId(1); objSelf.SetCreateStep(1); diff --git a/ydb/core/tx/schemeshard/schemeshard.h b/ydb/core/tx/schemeshard/schemeshard.h index d86d17ffe9ad..f8aeb16ea5bf 100644 --- a/ydb/core/tx/schemeshard/schemeshard.h +++ b/ydb/core/tx/schemeshard/schemeshard.h @@ -331,10 +331,9 @@ struct TEvSchemeShard { EvDescribeSchemeResult> { TEvDescribeSchemeResult() = default; - TEvDescribeSchemeResult(const TString& path, ui64 pathOwner, TPathId pathId) + TEvDescribeSchemeResult(const TString& path, TPathId pathId) { Record.SetPath(path); - Record.SetPathOwner(pathOwner); Record.SetPathId(pathId.LocalPathId); Record.SetPathOwnerId(pathId.OwnerId); } @@ -345,8 +344,8 @@ struct TEvSchemeShard { TEvDescribeSchemeResultBuilder() = default; - TEvDescribeSchemeResultBuilder(const TString& path, ui64 pathOwner, TPathId pathId) - : TEvDescribeSchemeResult(path, pathOwner, pathId) + TEvDescribeSchemeResultBuilder(const TString& path, TPathId pathId) + : TEvDescribeSchemeResult(path, pathId) { } }; diff --git a/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp b/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp index 943844615294..234706bba62c 100644 --- a/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp @@ -944,11 +944,7 @@ THolder TPathDescriber::Describe pathStr = path.PathString(); } - Result.Reset(new TEvSchemeShard::TEvDescribeSchemeResultBuilder( - pathStr, - Self->TabletID(), - pathId - )); + Result.Reset(new TEvSchemeShard::TEvDescribeSchemeResultBuilder(pathStr, pathId)); Result->Record.SetStatus(checks.GetStatus()); Result->Record.SetReason(checks.GetError()); @@ -963,7 +959,7 @@ THolder TPathDescriber::Describe } } - Result = MakeHolder(pathStr, Self->TabletID(), pathId); + Result = MakeHolder(pathStr, pathId); auto descr = Result->Record.MutablePathDescription()->MutableSelf(); FillPathDescr(descr, path); diff --git a/ydb/core/tx/tx_proxy/describe.cpp b/ydb/core/tx/tx_proxy/describe.cpp index aed5e9c91d8c..980cebb18c8c 100644 --- a/ydb/core/tx/tx_proxy/describe.cpp +++ b/ydb/core/tx/tx_proxy/describe.cpp @@ -83,7 +83,7 @@ class TDescribeReq : public TActor { auto schemeShardId = entry.DomainInfo->DomainKey.OwnerId; auto result = MakeHolder( - path, schemeShardId, TPathId()); + path, TPathId()); auto* pathDescription = result->Record.MutablePathDescription(); auto* self = pathDescription->MutableSelf(); @@ -151,7 +151,7 @@ class TDescribeReq : public TActor { auto schemeShardId = entry.DomainInfo->DomainKey.OwnerId; auto result = MakeHolder( - path, schemeShardId, TPathId()); + path, TPathId()); auto* pathDescription = result->Record.MutablePathDescription(); auto* self = pathDescription->MutableSelf(); @@ -237,7 +237,7 @@ void TDescribeReq::Handle(TEvTxProxyReq::TEvNavigateScheme::TPtr &ev, const TAct if (record.GetDescribePath().GetPath() == "/") { // Special handling for enumerating roots TAutoPtr result = - new NSchemeShard::TEvSchemeShard::TEvDescribeSchemeResultBuilder("/", NSchemeShard::RootSchemeShardId, TPathId(NSchemeShard::RootSchemeShardId, NSchemeShard::RootPathId)); + new NSchemeShard::TEvSchemeShard::TEvDescribeSchemeResultBuilder("/", TPathId(NSchemeShard::RootSchemeShardId, NSchemeShard::RootPathId)); auto descr = result->Record.MutablePathDescription(); FillRootDescr(descr->MutableSelf(), "/", NSchemeShard::RootSchemeShardId); for (const auto& domain : domainsInfo->Domains) { diff --git a/ydb/core/viewer/json_describe.h b/ydb/core/viewer/json_describe.h index 36a03a8daca4..41de09e1c2d4 100644 --- a/ydb/core/viewer/json_describe.h +++ b/ydb/core/viewer/json_describe.h @@ -187,7 +187,6 @@ class TJsonDescribe : public TViewerPipeClient { result->SetReason(record.GetReason()); result->SetPath(record.GetPath()); result->MutablePathDescription()->CopyFrom(record.GetPathDescription()); - result->SetPathOwner(record.GetPathOwner()); result->SetPathId(record.GetPathId()); result->SetLastExistedPrefixPath(record.GetLastExistedPrefixPath()); result->SetLastExistedPrefixPathId(record.GetLastExistedPrefixPathId()); @@ -206,7 +205,6 @@ class TJsonDescribe : public TViewerPipeClient { TAutoPtr result(new NKikimrViewer::TEvDescribeSchemeInfo()); result->SetPath(path); - result->SetPathOwner(schemeShardId); result->SetPathId(pathId.LocalPathId); result->SetPathOwnerId(pathId.OwnerId); diff --git a/ydb/core/viewer/protos/viewer.proto b/ydb/core/viewer/protos/viewer.proto index e5c8fa93a60d..73f57cf09b8d 100644 --- a/ydb/core/viewer/protos/viewer.proto +++ b/ydb/core/viewer/protos/viewer.proto @@ -564,7 +564,7 @@ message TEvDescribeSchemeInfo { optional string Reason = 2; optional string Path = 3; optional NKikimrSchemeOp.TPathDescription PathDescription = 4; - optional fixed64 PathOwner = 5; + optional fixed64 DEPRECATED_PathOwner = 5; // replaced by PathOwnerId optional fixed64 PathId = 6; optional string LastExistedPrefixPath = 7;