Skip to content

Commit

Permalink
Revert "Reader iterator unification (ydb-platform#12387)"
Browse files Browse the repository at this point in the history
This reverts commit ed0816f.
  • Loading branch information
iddqdex committed Dec 11, 2024
1 parent e329c1b commit 2872a24
Show file tree
Hide file tree
Showing 28 changed files with 1,174 additions and 767 deletions.
9 changes: 3 additions & 6 deletions ydb/core/tx/columnshard/engines/column_engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,13 @@ TSelectInfo::TStats TSelectInfo::Stats() const {
return out;
}

TString TSelectInfo::DebugString() const {
TStringBuilder result;
result << "count:" << PortionsOrderedPK.size() << ";";
void TSelectInfo::DebugStream(IOutputStream& out) {
if (PortionsOrderedPK.size()) {
result << "portions:";
out << "portions:";
for (auto& portionInfo : PortionsOrderedPK) {
result << portionInfo->DebugString();
out << portionInfo->DebugString();
}
}
return result;
}

} // namespace NKikimr::NOlap
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/engines/column_engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct TSelectInfo {

TStats Stats() const;

TString DebugString() const;
void DebugStream(IOutputStream& out);
};

class TColumnEngineStats {
Expand Down
12 changes: 9 additions & 3 deletions ydb/core/tx/columnshard/engines/reader/abstract/read_metadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class TDataStorageAccessor {
};

// Holds all metadata that is needed to perform read/scan
class TReadMetadataBase {
struct TReadMetadataBase {
public:
enum class ESorting {
NONE = 0 /* "not_sorted" */,
Expand Down Expand Up @@ -149,8 +149,8 @@ class TReadMetadataBase {

ui64 Limit = 0;

virtual TString DebugString() const {
return TStringBuilder() << " predicate{" << (PKRangesFilter ? PKRangesFilter->DebugString() : "no_initialized") << "}"
virtual void Dump(IOutputStream& out) const {
out << " predicate{" << (PKRangesFilter ? PKRangesFilter->DebugString() : "no_initialized") << "}"
<< " " << Sorting << " sorted";
}

Expand All @@ -175,6 +175,12 @@ class TReadMetadataBase {
virtual std::unique_ptr<TScanIteratorBase> StartScan(const std::shared_ptr<TReadContext>& readContext) const = 0;
virtual std::vector<TNameTypeInfo> GetKeyYqlSchema() const = 0;

// TODO: can this only be done for base class?
friend IOutputStream& operator<<(IOutputStream& out, const TReadMetadataBase& meta) {
meta.Dump(out);
return out;
}

const TProgramContainer& GetProgram() const {
return Program;
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2872a24

Please sign in to comment.