Skip to content
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

statistic requests fix #813

Merged
merged 5 commits into from
Dec 30, 2023
Merged

statistic requests fix #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31fbe8a
fix statistic calculation
ivanmorozov333 Dec 29, 2023
a818bd6
fix
ivanmorozov333 Dec 29, 2023
541868a
stats calculation fix
ivanmorozov333 Dec 30, 2023
eb20068
fix formatting
ivanmorozov333 Dec 30, 2023
a733d8c
fix pk
ivanmorozov333 Dec 30, 2023
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
7 changes: 1 addition & 6 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 @@ -401,12 +401,7 @@ struct Schema : NIceDb::Schema {
struct Activity : Column<13, NScheme::NTypeIds::Bool> {};
struct TierName : Column<14, NScheme::NTypeIds::Utf8> {};

using TKey = TableKey<
PathId,
TabletId,
PortionId,
ChunkIdx
>;
using TKey = TableKey<PathId, TabletId, PortionId, InternalColumnId, ChunkIdx>;
using TColumns = TableColumns<
PathId,
Kind,
Expand Down
36 changes: 22 additions & 14 deletions ydb/core/tx/columnshard/columnshard__scan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,33 @@
#include "engines/reader/read_context.h"
#include "blobs_reader/actor.h"
#include "blobs_reader/events.h"
#include "blobs_reader/read_coordinator.h"
#include "blobs_reader/actor.h"
#include "engines/reader/read_context.h"
#include "resource_subscriber/actor.h"

#include <ydb/core/tx/columnshard/columnshard__scan.h>
#include <ydb/core/actorlib_impl/long_timer.h>
#include <ydb/core/formats/arrow/converter.h>
#include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
#include <ydb/core/tablet_flat/flat_row_celled.h>
#include <ydb/core/tx/columnshard/blob_cache.h>
#include <ydb/core/tx/columnshard/columnshard__index_scan.h>
#include <ydb/core/tx/columnshard/columnshard__stats_scan.h>
#include <ydb/core/tx/columnshard/columnshard__read_base.h>
#include <ydb/core/tx/columnshard/blob_cache.h>
#include <ydb/core/tx/columnshard/columnshard__scan.h>
#include <ydb/core/tx/columnshard/columnshard__stats_scan.h>
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/columnshard_private_events.h>
#include <ydb/core/formats/arrow/converter.h>
#include <ydb/core/tablet_flat/flat_row_celled.h>
#include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h>
#include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
#include <ydb/core/actorlib_impl/long_timer.h>
#include <ydb/core/tx/conveyor/usage/service.h>
#include <ydb/core/tx/columnshard/engines/column_engine_logs.h>
#include <ydb/core/tx/conveyor/usage/events.h>
#include <ydb/core/tx/conveyor/usage/service.h>
#include <ydb/core/tx/tracing/usage/tracing.h>

#include <util/generic/noncopyable.h>
#include <ydb/library/chunks_limiter/chunks_limiter.h>
#include <ydb/library/yql/core/issue/yql_issue.h>
#include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h>
#include <ydb/library/yql/public/issue/yql_issue_message.h>
#include <ydb/services/metadata/request/common.h>
#include <ydb/core/tx/columnshard/engines/column_engine_logs.h>
#include <util/generic/noncopyable.h>

#include <tuple>

namespace NKikimr::NColumnShard {

Expand Down Expand Up @@ -253,7 +256,7 @@ class TColumnShardScan : public TActorBootstrapped<TColumnShardScan>, NArrow::IR
if (CurrentLastReadKey) {
NOlap::NIndexedReader::TSortableBatchPosition pNew(result.GetLastReadKey(), 0, result.GetLastReadKey()->schema()->field_names(), {}, false);
NOlap::NIndexedReader::TSortableBatchPosition pOld(CurrentLastReadKey, 0, CurrentLastReadKey->schema()->field_names(), {}, false);
AFL_VERIFY(pOld < pNew);
AFL_VERIFY(pOld < pNew)("old", pOld.DebugJson().GetStringRobust())("new", pNew.DebugJson().GetStringRobust());
}
CurrentLastReadKey = result.GetLastReadKey();

Expand Down Expand Up @@ -656,6 +659,9 @@ PrepareStatsReadMetadata(ui64 tabletId, const NOlap::TReadDescription& read, con
return out;
}
THashMap<ui64, THashSet<ui64>> portionsInUse;
const auto predStatSchema = [](const std::shared_ptr<NOlap::TPortionInfo>& l, const std::shared_ptr<NOlap::TPortionInfo>& r) {
return std::tuple(l->GetPathId(), l->GetPortionId()) < std::tuple(r->GetPathId(), r->GetPortionId());
};
for (auto&& filter : read.PKRangesFilter) {
const ui64 fromPathId = *filter.GetPredicateFrom().Get<arrow::UInt64Array>(0, 0, 1);
const ui64 toPathId = *filter.GetPredicateTo().Get<arrow::UInt64Array>(0, 0, Max<ui64>());
Expand All @@ -671,6 +677,7 @@ PrepareStatsReadMetadata(ui64 tabletId, const NOlap::TReadDescription& read, con
}
}
}
std::sort(out->IndexPortions.begin(), out->IndexPortions.end(), predStatSchema);
} else if (read.TableName.EndsWith(NOlap::TIndexInfo::STORE_INDEX_STATS_TABLE)) {
auto pathInfos = logsIndex->GetTables(fromPathId, toPathId);
for (auto&& pathInfo: pathInfos) {
Expand All @@ -680,6 +687,7 @@ PrepareStatsReadMetadata(ui64 tabletId, const NOlap::TReadDescription& read, con
}
}
}
std::sort(out->IndexPortions.begin(), out->IndexPortions.end(), predStatSchema);
}
}

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/columnshard__stats_scan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void TStatsIterator::AppendStats(const std::vector<std::unique_ptr<arrow::ArrayB
NArrow::Append<arrow::UInt64Type>(*builders[6], r->GetChunkIdx());
NArrow::Append<arrow::StringType>(*builders[7], ReadMetadata->GetColumnNameDef(r->GetColumnId()).value_or("undefined"));
NArrow::Append<arrow::UInt32Type>(*builders[8], r->GetColumnId());
std::string blobIdString = r->BlobRange.ToString();
std::string blobIdString = r->BlobRange.BlobId.ToStringLegacy();
NArrow::Append<arrow::StringType>(*builders[9], blobIdString);
NArrow::Append<arrow::UInt64Type>(*builders[10], r->BlobRange.Offset);
NArrow::Append<arrow::UInt64Type>(*builders[11], r->BlobRange.Size);
Expand Down
Loading