fix handling of schema elements in .sys directory (ydb-platform#7429)

Author: adameat

ydb/core/viewer/viewer_acl.h

@@ -158,19 +158,21 @@ class TJsonACL : public TViewerPipeClient {
         NKikimrViewer::TMetaInfo metaInfo;
         NKikimrViewer::TMetaCommonInfo& pbCommon = *metaInfo.MutableCommon();
         pbCommon.SetPath(CanonizePath(entry.Path));
-        pbCommon.SetOwner(entry.Self->Info.GetOwner());
-        if (entry.Self->Info.HasACL()) {
-            NACLib::TACL acl(entry.Self->Info.GetACL());
-            for (const NACLibProto::TACE& ace : acl.GetACE()) {
-                auto& pbAce = *pbCommon.AddACL();
-                FillACE(ace, pbAce);
+        if (entry.Self) {
+            pbCommon.SetOwner(entry.Self->Info.GetOwner());
+            if (entry.Self->Info.HasACL()) {
+                NACLib::TACL acl(entry.Self->Info.GetACL());
+                for (const NACLibProto::TACE& ace : acl.GetACE()) {
+                    auto& pbAce = *pbCommon.AddACL();
+                    FillACE(ace, pbAce);
+                }
             }
-        }
-        if (entry.Self->Info.HasEffectiveACL()) {
-            NACLib::TACL acl(entry.Self->Info.GetEffectiveACL());
-            for (const NACLibProto::TACE& ace : acl.GetACE()) {
-                auto& pbAce = *pbCommon.AddEffectiveACL();
-                FillACE(ace, pbAce);
+            if (entry.Self->Info.HasEffectiveACL()) {
+                NACLib::TACL acl(entry.Self->Info.GetEffectiveACL());
+                for (const NACLibProto::TACE& ace : acl.GetACE()) {
+                    auto& pbAce = *pbCommon.AddEffectiveACL();
+                    FillACE(ace, pbAce);
+                }
             }
         }
 

ydb/core/viewer/viewer_describe.h

@@ -117,8 +117,6 @@ class TJsonDescribe : public TViewerPipeClient {
 
     void FillDescription(NKikimrSchemeOp::TDirEntry* descr, ui64 schemeShardId) {
         descr->SetSchemeshardId(schemeShardId);
-        descr->SetPathId(InvalidLocalPathId);
-        descr->SetParentPathId(InvalidLocalPathId);
         descr->SetCreateFinished(true);
         descr->SetCreateTxId(0);
         descr->SetCreateStep(0);
@@ -177,11 +175,21 @@ class TJsonDescribe : public TViewerPipeClient {
         result->SetReason(record.GetReason());
         result->SetPath(record.GetPath());
         result->MutablePathDescription()->CopyFrom(record.GetPathDescription());
-        result->SetPathId(record.GetPathId());
+        if (record.GetPathId() != 0 && record.GetPathId() != InvalidLocalPathId) {
+            result->SetPathId(record.GetPathId());
+        }
+        if (result->MutablePathDescription()->GetSelf().GetPathId() == 0 || result->MutablePathDescription()->GetSelf().GetPathId() == InvalidLocalPathId) {
+            result->MutablePathDescription()->MutableSelf()->ClearPathId();
+        }
+        if (result->MutablePathDescription()->GetSelf().GetParentPathId() == 0 || result->MutablePathDescription()->GetSelf().GetParentPathId() == InvalidLocalPathId) {
+            result->MutablePathDescription()->MutableSelf()->ClearParentPathId();
+        }
         result->SetLastExistedPrefixPath(record.GetLastExistedPrefixPath());
         result->SetLastExistedPrefixPathId(record.GetLastExistedPrefixPathId());
         result->MutableLastExistedPrefixDescription()->CopyFrom(record.GetLastExistedPrefixDescription());
-        result->SetPathOwnerId(record.GetPathOwnerId());
+        if (record.GetPathOwnerId() != 0 && record.GetPathOwnerId() != InvalidOwnerId) {
+            result->SetPathOwnerId(record.GetPathOwnerId());
+        }
         result->SetSource(NKikimrViewer::TEvDescribeSchemeInfo::SchemeShard);
 
         return result;
@@ -194,13 +202,23 @@ class TJsonDescribe : public TViewerPipeClient {
 
         TAutoPtr<NKikimrViewer::TEvDescribeSchemeInfo> result(new NKikimrViewer::TEvDescribeSchemeInfo());
         result->SetPath(path);
-        result->SetPathId(entry.Self->Info.GetPathId());
-        result->SetPathOwnerId(entry.Self->Info.GetSchemeshardId());
-
         auto* pathDescription = result->MutablePathDescription();
         auto* self = pathDescription->MutableSelf();
-
-        self->CopyFrom(entry.Self->Info);
+        if (entry.Self) {
+            self->CopyFrom(entry.Self->Info);
+            if (self->GetPathId() == 0 || self->GetPathId() == InvalidLocalPathId) {
+                self->ClearPathId();
+            }
+            if (self->GetParentPathId() == 0 || self->GetParentPathId() == InvalidLocalPathId) {
+                self->ClearParentPathId();
+            }
+            if (entry.Self->Info.GetPathId() != 0 && entry.Self->Info.GetPathId() != InvalidLocalPathId) {
+                result->SetPathId(entry.Self->Info.GetPathId());
+            }
+            if (entry.Self->Info.GetSchemeshardId() != 0 && entry.Self->Info.GetSchemeshardId() != InvalidOwnerId) {
+                result->SetPathOwnerId(entry.Self->Info.GetSchemeshardId());
+            }
+        }
         FillDescription(self, schemeShardId);
 
         if (entry.ListNodeEntry) {
@@ -255,6 +273,14 @@ class TJsonDescribe : public TViewerPipeClient {
                 PassAway();
                 return;
             }
+            for (auto& child : *DescribeResult->MutablePathDescription()->MutableChildren()) {
+                if (child.GetPathId() == InvalidLocalPathId) {
+                    child.ClearPathId();
+                }
+                if (child.GetParentPathId() == InvalidLocalPathId) {
+                    child.ClearParentPathId();
+                }
+            }
             TProtoToJson::ProtoToJson(json, *DescribeResult, JsonSettings);
             DecodeExternalTableContent(json);
         } else {

ydb/core/viewer/viewer_hotkeys.h

@@ -71,6 +71,7 @@ class TJsonHotkeys : public TViewerPipeClient {
             const auto& pathDescription = pbRecord.GetPathDescription();
             const auto& partitions = pathDescription.GetTablePartitions();
             const auto& metrics = pathDescription.GetTablePartitionMetrics();
+
             if (!metrics.empty()) {
                 TVector<std::pair<ui64, int>> tabletsOrder;