Skip to content

Filled database name in SchemeCache requests from SysViews #26697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Filled database name in SchemeCache requests from SysViews #26697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ydb/core/grpc_services/rpc_read_columns.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,13 +325,13 @@ class TReadColumnsRPC : public TActorBootstrapped<TReadColumnsRPC> {
*sysViewInfo->MutableSourceObject() = entry.SysViewInfo->Description.GetSourceObject();
}
auto tableScanActor = NSysView::CreateSystemViewScan(ctx.SelfID, 0,
Request->GetDatabaseName().GetOrElse({}),
sysViewInfo,
entry.TableId,
JoinPath(entry.Path),
sysViewInfo,
range,
columns,
Request->GetInternalToken(),
Request->GetDatabaseName().GetOrElse({}),
false);

if (!tableScanActor) {
Expand Down
5 changes: 3 additions & 2 deletions ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,9 @@ void TKqpComputeActor::DoBootstrap() {
if (Meta->GetTable().HasSysViewDescription()) {
SysViewInfo = Meta->GetTable().GetSysViewDescription();
}
auto scanActor = NSysView::CreateSystemViewScan(SelfId(), 0, ScanData->TableId, ScanData->TablePath, SysViewInfo,
ranges, columns, UserToken, Database, reverse);
auto scanActor = NSysView::CreateSystemViewScan(SelfId(), 0, Database, SysViewInfo,
ScanData->TableId, ScanData->TablePath,
ranges, columns, UserToken, reverse);

if (!scanActor) {
ErrorFromIssue(TIssuesIds::DEFAULT_ERROR, TStringBuilder()
Expand Down
5 changes: 3 additions & 2 deletions ydb/core/sys_view/auth/auth_scan_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ class TAuthScanBase : public TScanActorBase<TDerived> {
}

TAuthScanBase(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken,
bool requireUserAdministratorAccess, bool applyPathTableRange)
: TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
: TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
, UserToken(std::move(userToken))
, RequireUserAdministratorAccess(requireUserAdministratorAccess)
{
Expand Down Expand Up @@ -198,6 +198,7 @@ class TAuthScanBase : public TScanActorBase<TDerived> {

void NavigatePath(TPath path) {
auto request = MakeHolder<NSchemeCache::TSchemeCacheNavigate>();
request->DatabaseName = this->DatabaseName;

auto& entry = request->ResultSet.emplace_back();
entry.RequestType = TSchemeCacheNavigate::TEntry::ERequestType::ByPath;
Expand Down
10 changes: 5 additions & 5 deletions ydb/core/sys_view/auth/group_members.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ class TGroupMembersScan : public TAuthScanBase<TGroupMembersScan> {
using TAuthBase = TAuthScanBase<TGroupMembersScan>;

TGroupMembersScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken)
: TAuthBase(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken), true, false)
: TAuthBase(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken), true, false)
{
}

Expand Down Expand Up @@ -71,11 +71,11 @@ class TGroupMembersScan : public TAuthScanBase<TGroupMembersScan> {
};

THolder<NActors::IActor> CreateGroupMembersScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken)
{
return MakeHolder<TGroupMembersScan>(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken));
return MakeHolder<TGroupMembersScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken));
}

}
4 changes: 2 additions & 2 deletions ydb/core/sys_view/auth/group_members.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
namespace NKikimr::NSysView::NAuth {

THolder<NActors::IActor> CreateGroupMembersScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken);

}
10 changes: 5 additions & 5 deletions ydb/core/sys_view/auth/groups.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ class TGroupsScan : public TAuthScanBase<TGroupsScan> {
using TAuthBase = TAuthScanBase<TGroupsScan>;

TGroupsScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken)
: TAuthBase(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken), true, false)
: TAuthBase(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken), true, false)
{
}

Expand Down Expand Up @@ -65,11 +65,11 @@ class TGroupsScan : public TAuthScanBase<TGroupsScan> {
};

THolder<NActors::IActor> CreateGroupsScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken)
{
return MakeHolder<TGroupsScan>(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken));
return MakeHolder<TGroupsScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken));
}

}
4 changes: 2 additions & 2 deletions ydb/core/sys_view/auth/groups.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
namespace NKikimr::NSysView::NAuth {

THolder<NActors::IActor> CreateGroupsScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken);

}
10 changes: 5 additions & 5 deletions ydb/core/sys_view/auth/owners.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ class TOwnersScan : public TAuthScanBase<TOwnersScan> {
using TAuthBase = TAuthScanBase<TOwnersScan>;

TOwnersScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken)
: TAuthBase(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken), false, true)
: TAuthBase(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken), false, true)
{
}

Expand Down Expand Up @@ -63,11 +63,11 @@ class TOwnersScan : public TAuthScanBase<TOwnersScan> {
};

THolder<NActors::IActor> CreateOwnersScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken)
{
return MakeHolder<TOwnersScan>(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken));
return MakeHolder<TOwnersScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken));
}

}
4 changes: 2 additions & 2 deletions ydb/core/sys_view/auth/owners.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
namespace NKikimr::NSysView::NAuth {

THolder<NActors::IActor> CreateOwnersScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken);

}
10 changes: 5 additions & 5 deletions ydb/core/sys_view/auth/permissions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ class TPermissionsScan : public TAuthScanBase<TPermissionsScan> {
using TAuthBase = TAuthScanBase<TPermissionsScan>;

TPermissionsScan(bool effective, const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken)
: TAuthBase(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken), false, true)
: TAuthBase(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken), false, true)
, Effective(effective)
{
}
Expand Down Expand Up @@ -101,11 +101,11 @@ class TPermissionsScan : public TAuthScanBase<TPermissionsScan> {
};

THolder<NActors::IActor> CreatePermissionsScan(bool effective, const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken)
{
return MakeHolder<TPermissionsScan>(effective, ownerId, scanId, sysViewInfo, tableRange, columns,
return MakeHolder<TPermissionsScan>(effective, ownerId, scanId, database, sysViewInfo, tableRange, columns,
std::move(userToken));
}

Expand Down
4 changes: 2 additions & 2 deletions ydb/core/sys_view/auth/permissions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
namespace NKikimr::NSysView::NAuth {

THolder<NActors::IActor> CreatePermissionsScan(bool effective, const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken);

}
10 changes: 5 additions & 5 deletions ydb/core/sys_view/auth/users.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ class TUsersScan : public TScanActorBase<TUsersScan> {
using TBase = TScanActorBase<TUsersScan>;

TUsersScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken)
: TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
: TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
, UserToken(std::move(userToken))
{
}
Expand Down Expand Up @@ -176,11 +176,11 @@ class TUsersScan : public TScanActorBase<TUsersScan> {
};

THolder<NActors::IActor> CreateUsersScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken)
{
return MakeHolder<TUsersScan>(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken));
return MakeHolder<TUsersScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken));
}

}
4 changes: 2 additions & 2 deletions ydb/core/sys_view/auth/users.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
namespace NKikimr::NSysView::NAuth {

THolder<NActors::IActor> CreateUsersScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
TIntrusiveConstPtr<NACLib::TUserToken> userToken);

}
4 changes: 2 additions & 2 deletions ydb/core/sys_view/common/processor_scan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ class TProcessorScan : public TScanActorBase<
}

TProcessorScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
NKikimrSysView::EStatsType type)
: TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
: TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
{
ConvertKeyRange<TRequest, T...>(Request, this->TableRange);
Request.SetType(type);
Expand Down
11 changes: 8 additions & 3 deletions ydb/core/sys_view/common/scan_actor_base_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ class TScanActorBase : public TActorBootstrapped<TDerived> {
using TBase = TActorBootstrapped<TDerived>;

TScanActorBase(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
: OwnerActorId(ownerId)
, ScanId(scanId)
, DatabaseName(database)
, SysViewInfo(sysViewInfo)
, TableRange(tableRange)
, Columns(columns.begin(), columns.end())
Expand Down Expand Up @@ -257,9 +258,10 @@ class TScanActorBase : public TActorBootstrapped<TDerived> {
using TNavigate = NSchemeCache::TSchemeCacheNavigate;

auto request = MakeHolder<TNavigate>();
request->DatabaseName = DatabaseName;
request->ResultSet.push_back({});
auto& entry = request->ResultSet.back();

auto& entry = request->ResultSet.back();
entry.TableId = TPathId::FromProto(SysViewInfo.GetSourceObject());
entry.Operation = TNavigate::EOp::OpPath;
entry.RequestType = TNavigate::TEntry::ERequestType::ByTableId;
Expand Down Expand Up @@ -295,9 +297,9 @@ class TScanActorBase : public TActorBootstrapped<TDerived> {
HiveId = AppData()->DomainsInfo->GetHive();
}

TenantName = CanonizePath(entry.Path);
DomainKey = entry.DomainInfo->DomainKey;

TenantName = CanonizePath(entry.Path);
DatabaseOwner = entry.Self->Info.GetOwner();
Y_ABORT_UNLESS(entry.Self->Info.GetOwner() == entry.SecurityObject->GetOwnerSID());

Expand Down Expand Up @@ -367,7 +369,10 @@ class TScanActorBase : public TActorBootstrapped<TDerived> {

const NActors::TActorId OwnerActorId;
const ui32 ScanId;

const TString DatabaseName;
const NKikimrSysView::TSysViewDescription SysViewInfo;

TSerializedTableRange TableRange;
TSmallVec<NMiniKQL::TKqpComputeContextBase::TColumn> Columns;

Expand Down
8 changes: 4 additions & 4 deletions ydb/core/sys_view/compile_cache/compile_cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ class TCompileCacheQueriesScan : public NKikimr::NSysView::TScanActorBase<TCompi
};

TCompileCacheQueriesScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
: TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
: TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
{
const auto& cellsFrom = TableRange.From.GetCells();
if (cellsFrom.size() > 1 && !cellsFrom[1].IsNull()) {
Expand Down Expand Up @@ -289,10 +289,10 @@ class TCompileCacheQueriesScan : public NKikimr::NSysView::TScanActorBase<TCompi
NKikimrKqp::TEvListCompileCacheQueriesResponse LastResponse;
};
THolder<NActors::IActor> CreateCompileCacheQueriesScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
{
return MakeHolder<TCompileCacheQueriesScan>(ownerId, scanId, sysViewInfo, tableRange, columns);
return MakeHolder<TCompileCacheQueriesScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns);
}

} // NKikimr::NSysView
4 changes: 2 additions & 2 deletions ydb/core/sys_view/compile_cache/compile_cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
namespace NKikimr::NSysView {

THolder<NActors::IActor> CreateCompileCacheQueriesScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);

} // NKikimr::NSysView
8 changes: 4 additions & 4 deletions ydb/core/sys_view/nodes/nodes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ class TNodesScan : public TScanActorBase<TNodesScan> {
}

TNodesScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
: TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
: TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
{
const auto& cellsFrom = TableRange.From.GetCells();
if (cellsFrom.size() == 1 && !cellsFrom[0].IsNull()) {
Expand Down Expand Up @@ -276,10 +276,10 @@ class TNodesScan : public TScanActorBase<TNodesScan> {
};

THolder<NActors::IActor> CreateNodesScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
{
return MakeHolder<TNodesScan>(ownerId, scanId, sysViewInfo, tableRange, columns);
return MakeHolder<TNodesScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns);
}

} // NSysView
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/sys_view/nodes/nodes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ namespace NKikimr {
namespace NSysView {

THolder<NActors::IActor> CreateNodesScan(const NActors::TActorId& ownerId, ui32 scanId,
const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);

} // NSysView
} // NKikimr
Loading
Loading