add ut

Author: swalrus1

ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.cpp

@@ -72,11 +72,11 @@ TConclusion<bool> TFetchingScriptCursor::Execute(const std::shared_ptr<IDataSour
     return true;
 }
 
-TString TFetchingScript::DebugString() const {
+TString TFetchingScript::DebugString(const bool onlyLongSteps) const {
     TStringBuilder sb;
     TStringBuilder sbBranch;
     for (auto&& i : Steps) {
-        if (i->GetSumDuration() > TDuration::MilliSeconds(10)) {
+        if (!onlyLongSteps || i->GetSumDuration() > TDuration::MilliSeconds(10)) {
             sbBranch << "{" << i->DebugString() << "};";
         }
     }
@@ -128,8 +128,7 @@ TString IFetchingStep::DebugString() const {
 }
 
 TFetchingScriptBuilder::TFetchingScriptBuilder(const TSpecialReadContext& context)
-    : GuaranteeNotOptional(context.GetMergeColumns())
-    , FullSchema(context.GetReadMetadata()->GetResultSchema()) {
+    : TFetchingScriptBuilder(context.GetReadMetadata()->GetResultSchema(), context.GetMergeColumns()) {
 }
 
 void TFetchingScriptBuilder::AddFetchingStep(const TColumnsSetIds& columns, const EStageFeaturesIndexes stage) {

ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.h

@@ -139,7 +139,7 @@ class TFetchingScript {
         AtomicCas(&StartInstant, TMonotonic::Now().MicroSeconds(), 0);
     }
 
-    TString DebugString() const;
+    TString DebugString(const bool onlyLongSteps = true) const;
 
     const std::shared_ptr<IFetchingStep>& GetStep(const ui32 index) const {
         AFL_VERIFY(index < Steps.size());
@@ -222,6 +222,11 @@ class TFetchingScriptBuilder {
     YDB_READONLY_DEF(TColumnsSetIds, AddedFetchingColumns);
     YDB_READONLY_DEF(TColumnsSetIds, AddedAssembleColumns);
 
+    TFetchingScriptBuilder(const ISnapshotSchema::TPtr& schema, const std::shared_ptr<TColumnsSetIds>& guaranteeNotOptional)
+        : GuaranteeNotOptional(guaranteeNotOptional)
+        , FullSchema(schema) {
+    }
+
 private:
     void AddAllocation(const std::set<ui32>& entityIds, const EStageFeaturesIndexes stage, const EMemType mType);
 
@@ -247,6 +252,10 @@ class TFetchingScriptBuilder {
 
     void AddFetchingStep(const TColumnsSetIds& columns, const EStageFeaturesIndexes stage);
     void AddAssembleStep(const TColumnsSetIds& columns, const TString& purposeId, const EStageFeaturesIndexes stage, const bool sequential);
+
+    static TFetchingScriptBuilder MakeForTests(ISnapshotSchema::TPtr schema, std::shared_ptr<TColumnsSetIds> guaranteeNotOptional = nullptr) {
+        return TFetchingScriptBuilder(schema, guaranteeNotOptional ? guaranteeNotOptional : std::make_shared<TColumnsSetIds>());
+    }
 };
 
 class TFetchingScriptCursor {

ydb/core/tx/columnshard/engines/ut/ut_script.cpp

@@ -1,60 +1,47 @@
 #include <ydb/core/tx/columnshard/test_helper/helper.h>
 
 #include <library/cpp/testing/unittest/registar.h>
-#include <reader/abstract/read_context.h>
-#include <reader/common_reader/iterator/context.h>
 #include <reader/common_reader/iterator/fetching.h>
-#include <reader/simple_reader/iterator/context.h>
-
-/*
-    TReadContext(const std::shared_ptr<IStoragesManager>& storagesManager,
-        const std::shared_ptr<NDataAccessorControl::IDataAccessorsManager>& dataAccessorsManager,
-        const NColumnShard::TConcreteScanCounters& counters, const TReadMetadataBase::TConstPtr& readMetadata, const TActorId& scanActorId,
-        const TActorId& resourceSubscribeActorId, const TActorId& readCoordinatorActorId, const TComputeShardingPolicy& computeShardingPolicy,
-        const ui64 scanId);
-*/
+#include <scheme/versions/snapshot_scheme.h>
 
 using namespace NKikimr;
 using namespace NKikimr::NOlap;
 using namespace NKikimr::NOlap::NReader;
 
 Y_UNIT_TEST_SUITE(TestScript) {
-    NSimple::TSpecialReadContext MakeTestReadContext(THashMap<ui32, NTable::TColumn> columns, const std::vector<ui32> pkIds = {0}) {
+    std::shared_ptr<ISnapshotSchema> MakeTestSchema(THashMap<ui32, NTable::TColumn> columns, const std::vector<ui32> pkIds = { 0 }) {
         for (ui64 i = 0; i < pkIds.size(); ++i) {
             TValidator::CheckNotNull(columns.FindPtr(pkIds[i]))->KeyOrder = i;
         }
 
-        const auto versionedIndex = std::make_shared<TVersionedIndex>();
         auto cache = std::make_shared<TSchemaObjectsCache>();
         TIndexInfo info = TIndexInfo::BuildDefault(TTestStoragesManager::GetInstance(), columns, pkIds);
-        AFL_VERIFY(info.BuildFromProto({}, nullptr, cache));
-        versionedIndex->AddIndex(TSnapshot::Zero(), cache->UpsertIndexInfo(0, std::move(info)));
-
-        const TReadDescription read(TSnapshot::Max(), false);
-
-        const auto base = std::make_shared<NKikimr::NOlap::NReader::TReadContext>(TTestStoragesManager::GetInstance(), nullptr,
-            NKikimr::NColumnShard::TConcreteScanCounters(NKikimr::NColumnShard::TScanCounters()),
-            std::make_shared<NSimple::TReadMetadata>(versionedIndex, read), NActors::TActorId(), NActors::TActorId(), NActors::TActorId(),
-            NKikimr::NOlap::NReader::TComputeShardingPolicy(), 0);
-        return NSimple::TSpecialReadContext(base);
+        return std::make_shared<TSnapshotSchema>(cache->UpsertIndexInfo(0, std::move(info)), TSnapshot(1, 1));
     }
 
     Y_UNIT_TEST(StepMerging) {
-        NCommon::TFetchingScriptBuilder acc(
-            MakeTestReadContext({ { 0, NTable::TColumn("c0", 0, NScheme::TTypeInfo(NScheme::NTypeIds::Int32), "") },
+        NCommon::TFetchingScriptBuilder acc = NCommon::TFetchingScriptBuilder::MakeForTests(
+            MakeTestSchema({ { 0, NTable::TColumn("c0", 0, NScheme::TTypeInfo(NScheme::NTypeIds::Int32), "") },
                 { 1, NTable::TColumn("c1", 0, NScheme::TTypeInfo(NScheme::NTypeIds::Int32), "") },
                 { 2, NTable::TColumn("c2", 0, NScheme::TTypeInfo(NScheme::NTypeIds::Int32), "") } }));
 
-        acc.AddFetchingStep(std::vector<ui32>({ 0 }), NSimple::EStageFeaturesIndexes::Filter);
-        acc.AddFetchingStep(std::vector<ui32>({ 0 }), NSimple::EStageFeaturesIndexes::Filter);
-        acc.AddAssembleStep(std::vector<ui32>({ 0 }), "", NSimple::EStageFeaturesIndexes::Filter, false);
-
-        acc.AddFetchingStep(std::vector<ui32>({ 0, 1 }), NSimple::EStageFeaturesIndexes::Filter);
-        acc.AddFetchingStep(std::vector<ui32>({ 1, 2 }), NSimple::EStageFeaturesIndexes::Fetching);
-        acc.AddFetchingStep(std::vector<ui32>({ 0 }), NSimple::EStageFeaturesIndexes::Fetching);
-        acc.AddFetchingStep(std::vector<ui32>({ 0 }), NSimple::EStageFeaturesIndexes::Merge);
+        acc.AddFetchingStep(std::vector<ui32>({ 0 }), NCommon::EStageFeaturesIndexes::Filter);
+        acc.AddFetchingStep(std::vector<ui32>({ 0 }), NCommon::EStageFeaturesIndexes::Filter);
+        acc.AddAssembleStep(std::vector<ui32>({ 0 }), "", NCommon::EStageFeaturesIndexes::Filter, false);
+        acc.AddFetchingStep(std::vector<ui32>({ 0, 1 }), NCommon::EStageFeaturesIndexes::Filter);
+        acc.AddFetchingStep(std::vector<ui32>({ 1, 2 }), NCommon::EStageFeaturesIndexes::Fetching);
+        acc.AddFetchingStep(std::vector<ui32>({ 0 }), NCommon::EStageFeaturesIndexes::Fetching);
+        acc.AddAssembleStep(std::vector<ui32>({ 0, 1, 2 }), "", NCommon::EStageFeaturesIndexes::Fetching, false);
+        acc.AddFetchingStep(std::vector<ui32>({ 0 }), NCommon::EStageFeaturesIndexes::Merge);
 
         auto script = std::move(acc).Build();
-        UNIT_ASSERT_STRINGS_EQUAL(script->DebugString(), "");
+        UNIT_ASSERT_STRINGS_EQUAL(script->DebugString(false),
+            "{branch:UNDEFINED;steps_10Ms:["
+            "{name=ALLOCATE_MEMORY::Filter;duration=0.000000s;size=0;details={stage=Filter;};};"
+            "{name=ALLOCATE_MEMORY::Fetching;duration=0.000000s;size=0;details={stage=Fetching;};};"
+            "{name=FETCHING_COLUMNS;duration=0.000000s;size=0;details={columns=0;};};"
+            "{name=ASSEMBLER;duration=0.000000s;size=0;details={columns=(column_ids=0;column_names=c0;);;};};"
+            "{name=FETCHING_COLUMNS;duration=0.000000s;size=0;details={columns=1,2;};};"
+            "{name=ASSEMBLER;duration=0.000000s;size=0;details={columns=(column_ids=1,2;column_names=c1,c2;);;};};]}");
     }
 }