Skip to content

Show RuntimeFeatures on portion_stats sys-view #7673

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

Merged
merged 7 commits into from
Aug 16, 2024
Merged

Show RuntimeFeatures on portion_stats sys-view #7673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7bed654
Add RuntimeFeatures on portion_stats sys-view
swalrus1 Aug 12, 2024
3d02a2f
Bool -> Uint8 in sys_views
swalrus1 Aug 15, 2024
e90289b
fix ut
swalrus1 Aug 15, 2024
b6edb00
fix tests
swalrus1 Aug 15, 2024
cbc56d0
fix tests
swalrus1 Aug 15, 2024
729f44f
VERIFY -> AFL_CRIT
swalrus1 Aug 15, 2024
f360ce5
Another Bool -> Uint8
swalrus1 Aug 16, 2024
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
5 changes: 5 additions & 0 deletions ydb/core/kqp/ut/olap/helpers/get_value.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ void PrintValue(IOutputStream& out, const NYdb::TValue& v) {
out << value.GetInt64();
break;
}
case NYdb::EPrimitiveType::Uint8:
{
out << value.GetUint8();
break;
}
case NYdb::EPrimitiveType::Utf8:
{
out << value.GetUtf8();
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/kqp/ut/olap/helpers/typed_local.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ NKikimr::NKqp::TTypedLocalHelper::TDistribution TTypedLocalHelper::GetDistributi
}

void TTypedLocalHelper::GetVolumes(ui64& rawBytes, ui64& bytes, const bool verbose /*= false*/, const std::vector<TString> columnNames /*= {}*/) {
TString selectQuery = "SELECT * FROM `" + TablePath + "/.sys/primary_index_stats` WHERE Activity = true";
TString selectQuery = "SELECT * FROM `" + TablePath + "/.sys/primary_index_stats` WHERE Activity == 1";
if (columnNames.size()) {
selectQuery += " AND EntityName IN ('" + JoinSeq("','", columnNames) + "')";
}
Expand Down Expand Up @@ -144,7 +144,7 @@ void TTypedLocalHelper::FillPKOnly(const double pkKff /*= 0*/, const ui32 numRow
}

void TTypedLocalHelper::GetStats(std::vector<NJson::TJsonValue>& stats, const bool verbose /*= false*/) {
TString selectQuery = "SELECT * FROM `" + TablePath + "/.sys/primary_index_portion_stats` WHERE Activity = true";
TString selectQuery = "SELECT * FROM `" + TablePath + "/.sys/primary_index_portion_stats` WHERE Activity == 1";
auto tableClient = KikimrRunner.GetTableClient();
auto rows = ExecuteScanQuery(tableClient, selectQuery, verbose);
for (auto&& r : rows) {
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/kqp/ut/olap/sys_view_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ Y_UNIT_TEST_SUITE(KqpOlapSysView) {
SELECT PathId, Kind, TabletId
FROM `/Root/olapStore/.sys/store_primary_index_stats`
WHERE
PathId == UInt64("3") AND Activity = true
PathId == UInt64("3") AND Activity == 1
GROUP BY TabletId, PathId, Kind
ORDER BY TabletId, Kind
)");
Expand Down
8 changes: 5 additions & 3 deletions ydb/core/sys_view/common/schema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ struct Schema : NIceDb::Schema {
struct BlobId : Column<10, NScheme::NTypeIds::Utf8> {};
struct BlobRangeOffset : Column<11, NScheme::NTypeIds::Uint64> {};
struct BlobRangeSize : Column<12, NScheme::NTypeIds::Uint64> {};
struct Activity : Column<13, NScheme::NTypeIds::Bool> {};
struct Activity : Column<13, NScheme::NTypeIds::Uint8> {};
struct TierName: Column<14, NScheme::NTypeIds::Utf8> {};
struct EntityType: Column<15, NScheme::NTypeIds::Utf8> {};

Expand Down Expand Up @@ -528,9 +528,10 @@ struct Schema : NIceDb::Schema {
struct ColumnBlobBytes: Column<7, NScheme::NTypeIds::Uint64> {};
struct IndexBlobBytes: Column<8, NScheme::NTypeIds::Uint64> {};
struct PortionId: Column<9, NScheme::NTypeIds::Uint64> {};
struct Activity: Column<10, NScheme::NTypeIds::Bool> {};
struct Activity: Column<10, NScheme::NTypeIds::Uint8> {};
struct TierName: Column<11, NScheme::NTypeIds::Utf8> {};
struct Stats: Column<12, NScheme::NTypeIds::Utf8> {};
struct Optimized: Column<13, NScheme::NTypeIds::Uint8> {};

using TKey = TableKey<PathId, TabletId, PortionId>;
using TColumns = TableColumns<
Expand All @@ -545,7 +546,8 @@ struct Schema : NIceDb::Schema {
PortionId,
Activity,
TierName,
Stats
Stats,
Optimized
>;
};

Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/columnshard/engines/reader/sys_view/chunks/chunks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void TStatsIterator::AppendStats(const std::vector<std::unique_ptr<arrow::ArrayB
}
NArrow::Append<arrow::UInt64Type>(*builders[10], r->BlobRange.Offset);
NArrow::Append<arrow::UInt64Type>(*builders[11], r->BlobRange.Size);
NArrow::Append<arrow::BooleanType>(*builders[12], activity);
NArrow::Append<arrow::UInt8Type>(*builders[12], activity);

NArrow::Append<arrow::StringType>(*builders[13], arrow::util::string_view(lastTierName.data(), lastTierName.size()));
NArrow::Append<arrow::StringType>(*builders[14], ConstantEntityIsColumnView);
Expand Down Expand Up @@ -105,7 +105,7 @@ void TStatsIterator::AppendStats(const std::vector<std::unique_ptr<arrow::ArrayB
NArrow::Append<arrow::UInt64Type>(*builders[10], 0);
NArrow::Append<arrow::UInt64Type>(*builders[11], bData->size());
}
NArrow::Append<arrow::BooleanType>(*builders[12], activity);
NArrow::Append<arrow::UInt8Type>(*builders[12], activity);
const auto tierName = portionSchema->GetIndexInfo().GetEntityStorageId(r->GetIndexId(), portion.GetMeta().GetTierName());
std::string strTierName(tierName.data(), tierName.size());
NArrow::Append<arrow::StringType>(*builders[13], strTierName);
Expand Down
4 changes: 3 additions & 1 deletion ydb/core/tx/columnshard/engines/reader/sys_view/portions/portions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ void TStatsIterator::AppendStats(const std::vector<std::unique_ptr<arrow::ArrayB
NArrow::Append<arrow::UInt64Type>(*builders[6], portion.GetColumnBlobBytes());
NArrow::Append<arrow::UInt64Type>(*builders[7], portion.GetIndexBlobBytes());
NArrow::Append<arrow::UInt64Type>(*builders[8], portion.GetPortionId());
NArrow::Append<arrow::BooleanType>(*builders[9], !portion.IsRemovedFor(ReadMetadata->GetRequestSnapshot()));
NArrow::Append<arrow::UInt8Type>(*builders[9], !portion.IsRemovedFor(ReadMetadata->GetRequestSnapshot()));

auto tierName = portion.GetTierNameDef(NBlobOperations::TGlobal::DefaultStorageId);
NArrow::Append<arrow::StringType>(*builders[10], arrow::util::string_view(tierName.data(), tierName.size()));
Expand All @@ -31,6 +31,8 @@ void TStatsIterator::AppendStats(const std::vector<std::unique_ptr<arrow::ArrayB
}
auto statInfo = statReport.GetStringRobust();
NArrow::Append<arrow::StringType>(*builders[11], arrow::util::string_view(statInfo.data(), statInfo.size()));

NArrow::Append<arrow::UInt8Type>(*builders[12], portion.HasRuntimeFeature(TPortionInfo::ERuntimeFeature::Optimized));
}

ui32 TStatsIterator::PredictRecordsCount(const NAbstract::TGranuleMetaView& granule) const {
Expand Down
9 changes: 6 additions & 3 deletions ydb/core/tx/columnshard/engines/scheme/indexes/abstract/program.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,12 +401,15 @@ class TNormalForm {
public:
TNormalForm() = default;

bool Add(const NSsa::TAssign& assign) {
bool Add(const NSsa::TAssign& assign, const TProgramContainer& program) {
std::vector<std::shared_ptr<IRequestNode>> argNodes;
for (auto&& arg : assign.GetArguments()) {
if (arg.IsGenerated()) {
auto it = Nodes.find(arg.GetColumnName());
AFL_VERIFY(it != Nodes.end());
if (it == Nodes.end()) {
AFL_CRIT(NKikimrServices::TX_COLUMNSHARD)("event", "program_arg_is_missing")("program", program.DebugString());
return false;
}
argNodes.emplace_back(it->second);
} else {
argNodes.emplace_back(std::make_shared<TOriginalColumn>(arg.GetColumnName()));
Expand Down Expand Up @@ -443,7 +446,7 @@ std::shared_ptr<TDataForIndexesCheckers> TDataForIndexesCheckers::Build(const TP
auto fStep = program.GetSteps().front();
TNormalForm nForm;
for (auto&& s : fStep->GetAssignes()) {
if (!nForm.Add(s)) {
if (!nForm.Add(s, program)) {
return nullptr;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/ut_rw/ut_columnshard_read_write.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2436,7 +2436,7 @@ Y_UNIT_TEST_SUITE(TColumnShardTestReadWrite) {
ui64 numRows = static_cast<arrow::UInt64Array&>(*rows).Value(i);
ui64 numBytes = static_cast<arrow::UInt64Array&>(*bytes).Value(i);
ui64 numRawBytes = static_cast<arrow::UInt64Array&>(*rawBytes).Value(i);
bool activity = static_cast<arrow::BooleanArray&>(*activities).Value(i);
bool activity = static_cast<arrow::UInt8Array&>(*activities).Value(i);
if (!activity) {
continue;
}
Expand Down
Loading