pass db path to pg_tables instead of tenant name. Resolves #7616 (#8061)

qrort · web-flow · commit 76810ca1b417 · 2024-08-22T14:39:17.000+03:00
diff --git a/ydb/core/grpc_services/rpc_read_columns.cpp b/ydb/core/grpc_services/rpc_read_columns.cpp
@@ -317,6 +317,7 @@ class TReadColumnsRPC : public TActorBootstrapped<TReadColumnsRPC> {
             TTableRange range(MinKey.GetCells(), MinKeyInclusive, MaxKey.GetCells(), MaxKeyInclusive);
             auto tableScanActor = NSysView::CreateSystemViewScan(ctx.SelfID, 0,
                 ResolveNamesResult->ResultSet.front().TableId,
+                JoinPath(ResolveNamesResult->ResultSet.front().Path),
                 range,
                 columns);
 
diff --git a/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp b/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp
@@ -108,7 +108,7 @@ void TKqpComputeActor::DoBootstrap() {
         ScanData->TaskId = GetTask().GetId();
         ScanData->TableReader = CreateKqpTableReader(*ScanData);
 
-        auto scanActor = NSysView::CreateSystemViewScan(SelfId(), 0, ScanData->TableId, ranges, columns);
+        auto scanActor = NSysView::CreateSystemViewScan(SelfId(), 0, ScanData->TableId, ScanData->TablePath, ranges, columns);
 
         if (!scanActor) {
             InternalError(TIssuesIds::DEFAULT_ERROR, TStringBuilder()
diff --git a/ydb/core/sys_view/pg_tables/pg_tables.cpp b/ydb/core/sys_view/pg_tables/pg_tables.cpp
@@ -80,9 +80,13 @@ constexpr auto TPgTablesScanBase::ActorActivityType() {
 }
 
 void TPgTablesScanBase::ProceedToScan() {
-    auto request = MakeHolder<NSchemeShard::TEvSchemeShard::TEvDescribeScheme>(AppData()->TenantName);
+    auto request = MakeHolder<NSchemeShard::TEvSchemeShard::TEvDescribeScheme>();
     NKikimrSchemeOp::TDescribePath& record = request->Record;
-    record.SetPath(AppData()->TenantName);
+    auto pathVec = SplitPath(TablePath_);
+    auto sz = pathVec.size();
+    Y_ENSURE(sz > 2 && pathVec[sz - 2] == ".sys");
+    pathVec.pop_back(); pathVec.pop_back();
+    record.SetPath(JoinPath(pathVec));
     record.MutableOptions()->SetReturnPartitioningInfo(false);
     record.MutableOptions()->SetReturnPartitionConfig(false);
     record.MutableOptions()->SetReturnChildren(true);
@@ -158,25 +162,29 @@ void TPgTablesScanBase::StateWork(TAutoPtr<IEventHandle>& ev) {
 
 TPgTablesScanBase::TPgTablesScanBase(
     const NActors::TActorId &ownerId, ui32 scanId, const TTableId &tableId,
+    const TString& tablePath,
     const TTableRange &tableRange,
     const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn> &columns,
     const TVector<Schema::PgColumn>& schemaColumns,
     THashMap<TString, TRowFiller>&& fillers,
     THashMap<TString, TStaticRowFiller>&& staticFillers)
     : NKikimr::NSysView::TScanActorBase<TPgTablesScanBase>(ownerId, scanId, tableId, tableRange, columns),
+      TablePath_(tablePath),
       SchemaColumns_(schemaColumns),
       Fillers_(std::move(fillers)),
       StaticFillers_(std::move(staticFillers)) {}
 
 
 TPgTablesScan::TPgTablesScan(
     const NActors::TActorId &ownerId, ui32 scanId, const TTableId &tableId,
+    const TString& tablePath,
     const TTableRange &tableRange,
     const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn> &columns)
     : TPgTablesScanBase(
         ownerId,
         scanId,
         tableId,
+        tablePath,
         tableRange,
         columns,
         Singleton<Schema::PgTablesSchemaProvider>()->GetColumns(PgTablesName),
@@ -214,12 +222,14 @@ TPgTablesScan::TPgTablesScan(
 
 TInformationSchemaTablesScan::TInformationSchemaTablesScan(
     const NActors::TActorId &ownerId, ui32 scanId, const TTableId &tableId,
+    const TString& tablePath,
     const TTableRange &tableRange,
     const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn> &columns)
     : TPgTablesScanBase(
         ownerId,
         scanId,
         tableId,
+        tablePath,
         tableRange,
         columns,
         Singleton<Schema::PgTablesSchemaProvider>()->GetColumns(InformationSchemaTablesName),
@@ -242,12 +252,14 @@ TInformationSchemaTablesScan::TInformationSchemaTablesScan(
 
 TPgClassScan::TPgClassScan(
     const NActors::TActorId &ownerId, ui32 scanId, const TTableId &tableId,
+    const TString& tablePath,
     const TTableRange &tableRange,
     const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn> &columns)
     : TPgTablesScanBase(
         ownerId,
         scanId,
         tableId,
+        tablePath,
         tableRange,
         columns,
         Singleton<Schema::PgTablesSchemaProvider>()->GetColumns(PgClassName),
@@ -304,22 +316,22 @@ TPgClassScan::TPgClassScan(
     });
 }
 
-THolder<NActors::IActor> CreatePgTablesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreatePgTablesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TString& tablePath,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TPgTablesScan>(ownerId, scanId, tableId, tableRange, columns);
+    return MakeHolder<TPgTablesScan>(ownerId, scanId, tableId, tablePath, tableRange, columns);
 }
 
-THolder<NActors::IActor> CreateInformationSchemaTablesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateInformationSchemaTablesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TString& tablePath,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TInformationSchemaTablesScan>(ownerId, scanId, tableId, tableRange, columns);
+    return MakeHolder<TInformationSchemaTablesScan>(ownerId, scanId, tableId, tablePath, tableRange, columns);
 }
 
-THolder<NActors::IActor> CreatePgClassScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreatePgClassScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TString& tablePath,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TPgClassScan>(ownerId, scanId, tableId, tableRange, columns);
+    return MakeHolder<TPgClassScan>(ownerId, scanId, tableId, tablePath, tableRange, columns);
 }
 
 } // NSysView
diff --git a/ydb/core/sys_view/pg_tables/pg_tables.h b/ydb/core/sys_view/pg_tables/pg_tables.h
@@ -27,6 +27,7 @@ class TPgTablesScanBase : public NKikimr::NSysView::TScanActorBase<TPgTablesScan
         const NActors::TActorId& ownerId,
         ui32 scanId,
         const TTableId& tableId,
+        const TString& tablePath,
         const TTableRange& tableRange,
         const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
         const TVector<Schema::PgColumn>& schemaColumns,
@@ -39,36 +40,37 @@ class TPgTablesScanBase : public NKikimr::NSysView::TScanActorBase<TPgTablesScan
     void StateWork(TAutoPtr<IEventHandle>& ev);
 protected:
     TString ConvertError_;
+    TString TablePath_;
     const TVector<Schema::PgColumn>& SchemaColumns_;
     const THashMap<TString, TRowFiller> Fillers_;
     const THashMap<TString, TStaticRowFiller> StaticFillers_;
 };
 
 class TPgTablesScan : public TPgTablesScanBase {
 public:
-    TPgTablesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+    TPgTablesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TString& tablePath,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 };
 class TInformationSchemaTablesScan : public TPgTablesScanBase {
 public:
-    TInformationSchemaTablesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+    TInformationSchemaTablesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TString& tablePath,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 };
 
 class TPgClassScan : public TPgTablesScanBase {
 public:
-    TPgClassScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+    TPgClassScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TString& tablePath,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 private:
     THashMap<TString, ui32> namespaces;
     ui32 btreeAmOid;
 };
 
-THolder<NActors::IActor> CreatePgTablesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreatePgTablesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TString& tablePath,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
-THolder<NActors::IActor> CreateInformationSchemaTablesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateInformationSchemaTablesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TString& tablePath,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
-THolder<NActors::IActor> CreatePgClassScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreatePgClassScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TString& tablePath,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 
diff --git a/ydb/core/sys_view/scan.cpp b/ydb/core/sys_view/scan.cpp
@@ -33,12 +33,14 @@ class TSysViewRangesReader : public TActor<TSysViewRangesReader> {
         const NActors::TActorId& ownerId,
         ui32 scanId,
         const TTableId& tableId,
+        const TString& tablePath,
         TVector<TSerializedTableRange> ranges,
         const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
         : TBase(&TSysViewRangesReader::ScanState)
         , OwnerId(ownerId)
         , ScanId(scanId)
         , TableId(tableId)
+        , TablePath(tablePath)
         , Ranges(std::move(ranges))
         , Columns(columns.begin(), columns.end())
     {
@@ -74,7 +76,7 @@ class TSysViewRangesReader : public TActor<TSysViewRangesReader> {
         if (!ScanActorId) {
             if (CurrentRange < Ranges.size()) {
                 auto actor = CreateSystemViewScan(
-                    SelfId(), ScanId, TableId, Ranges[CurrentRange].ToTableRange(),
+                    SelfId(), ScanId, TableId, TablePath, Ranges[CurrentRange].ToTableRange(),
                     Columns);
                 ScanActorId = Register(actor.Release());
                 CurrentRange += 1;
@@ -135,26 +137,37 @@ class TSysViewRangesReader : public TActor<TSysViewRangesReader> {
     TActorId OwnerId;
     ui32 ScanId;
     TTableId TableId;
+    TString TablePath;
     TVector<TSerializedTableRange> Ranges;
     TVector<NMiniKQL::TKqpComputeContextBase::TColumn> Columns;
 
     ui64 CurrentRange = 0;
     TMaybe<TActorId> ScanActorId;
 };
 
-THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
-    TVector<TSerializedTableRange> ranges, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
-{
+THolder<NActors::IActor> CreateSystemViewScan(
+    const NActors::TActorId& ownerId,
+    ui32 scanId,
+    const TTableId& tableId,
+    const TString& tablePath,
+    TVector<TSerializedTableRange> ranges,
+    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns
+) {
     if (ranges.size() == 1) {
-        return CreateSystemViewScan(ownerId, scanId, tableId, ranges[0].ToTableRange(), columns);
+        return CreateSystemViewScan(ownerId, scanId, tableId, tablePath, ranges[0].ToTableRange(), columns);
     } else {
-        return MakeHolder<TSysViewRangesReader>(ownerId, scanId, tableId, ranges, columns);
+        return MakeHolder<TSysViewRangesReader>(ownerId, scanId, tableId, tablePath, ranges, columns);
     }
 }
 
-THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
-    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
-{
+THolder<NActors::IActor> CreateSystemViewScan(
+    const NActors::TActorId& ownerId,
+    ui32 scanId,
+    const TTableId& tableId,
+    const TString& tablePath,
+    const TTableRange& tableRange,
+    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns
+) {
     if (tableId.SysViewInfo == PartitionStatsName) {
         return CreatePartitionStatsScan(ownerId, scanId, tableId, tableRange, columns);
     }
@@ -214,14 +227,14 @@ THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId,
     }
 
     if (tableId.SysViewInfo == PgTablesName) {
-        return CreatePgTablesScan(ownerId, scanId, tableId, tableRange, columns);
+        return CreatePgTablesScan(ownerId, scanId, tableId, tablePath, tableRange, columns);
     }
 
     if (tableId.SysViewInfo == InformationSchemaTablesName) {
-        return CreateInformationSchemaTablesScan(ownerId, scanId, tableId, tableRange, columns);
+        return CreateInformationSchemaTablesScan(ownerId, scanId, tableId, tablePath, tableRange, columns);
     }
         if (tableId.SysViewInfo == PgClassName) {
-        return CreatePgClassScan(ownerId, scanId, tableId, tableRange, columns);
+        return CreatePgClassScan(ownerId, scanId, tableId, tablePath, tableRange, columns);
     }
 
     return {};
diff --git a/ydb/core/sys_view/scan.h b/ydb/core/sys_view/scan.h
@@ -8,10 +8,10 @@ namespace NKikimr {
 namespace NSysView {
 
 THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
-    TVector<TSerializedTableRange> ranges, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& tablePath, TVector<TSerializedTableRange> ranges, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
-    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& tablePath, const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
 } // NKikimr
