Skip to content

dont create delete flag column in indexation #7082

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
Jul 26, 2024
Merged

dont create delete flag column in indexation #7082

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
c94e8b1
dont create delete flag column in indexation
ivanmorozov333 Jul 25, 2024
96778b4
fix
ivanmorozov333 Jul 25, 2024
7373848
fix
ivanmorozov333 Jul 25, 2024
c8b77a8
fix
ivanmorozov333 Jul 26, 2024
7b3e845
improve and fix test
ivanmorozov333 Jul 26, 2024
bbc0cd0
fix test
ivanmorozov333 Jul 26, 2024
3bc5ebc
fix test
ivanmorozov333 Jul 26, 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
2 changes: 1 addition & 1 deletion ydb/core/kqp/ut/olap/helpers/typed_local.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class TTypedLocalHelper: public Tests::NCS::THelper {
void GetCount(ui64& count);

template <class TFiller>
void FillTable(const TFiller& fillPolicy, const ui32 pkKff = 0, const ui32 numRows = 800000) const {
void FillTable(const TFiller& fillPolicy, const double pkKff = 0, const ui32 numRows = 800000) const {
std::vector<NArrow::NConstruction::IArrayBuilder::TPtr> builders;
builders.emplace_back(NArrow::NConstruction::TSimpleArrayConstructor<NArrow::NConstruction::TIntSeqFiller<arrow::Int64Type>>::BuildNotNullable("pk_int", numRows * pkKff));
builders.emplace_back(std::make_shared<NArrow::NConstruction::TSimpleArrayConstructor<TFiller>>("field", fillPolicy));
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/kqp/ut/olap/kqp_olap_stats_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ using namespace NYdb::NTable;
Y_UNIT_TEST_SUITE(KqpOlapStats) {
constexpr size_t inserted_rows = 1000;
constexpr size_t tables_in_store = 1000;
constexpr size_t size_single_table = 13352;
constexpr size_t size_single_table = 13152;

const TVector<TTestHelper::TColumnSchema> schema = {
TTestHelper::TColumnSchema().SetName("id").SetType(NScheme::NTypeIds::Int32).SetNullable(false),
Expand Down
11 changes: 7 additions & 4 deletions 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 @@ -5,6 +5,7 @@
#include "helpers/get_value.h"

#include <library/cpp/testing/unittest/registar.h>
#include <ydb/core/tx/columnshard/engines/scheme/abstract/index_info.h>
#include <ydb/core/tx/columnshard/hooks/testing/controller.h>
#include <ydb/core/tx/columnshard/test_helper/controllers.h>

Expand Down Expand Up @@ -229,7 +230,9 @@ Y_UNIT_TEST_SUITE(KqpOlapSysView) {
helper.CreateTestOlapTable();
NArrow::NConstruction::TStringPoolFiller sPool(3, 52);
helper.FillTable(sPool, 0, 800000);
csController->WaitCompactions(TDuration::Seconds(10));
csController->WaitCompactions(TDuration::Seconds(5));
helper.FillTable(sPool, 0.5, 800000);
csController->WaitCompactions(TDuration::Seconds(5));

helper.GetVolumes(rawBytes1, bytes1, false, {"new_column_ui64"});
AFL_VERIFY(rawBytes1 == 0);
Expand All @@ -241,9 +244,9 @@ Y_UNIT_TEST_SUITE(KqpOlapSysView) {
csController->WaitActualization(TDuration::Seconds(10));
ui64 rawBytes2;
ui64 bytes2;
helper.GetVolumes(rawBytes2, bytes2, false, {"new_column_ui64"});
AFL_VERIFY(rawBytes2 == 6500023)("real", rawBytes2);
AFL_VERIFY(bytes2 == 38880)("b", bytes2);
helper.GetVolumes(rawBytes2, bytes2, false, { "new_column_ui64", NOlap::IIndexInfo::SPEC_COL_DELETE_FLAG });
AFL_VERIFY(rawBytes2 == 0)("real", rawBytes2);
AFL_VERIFY(bytes2 == 0)("b", bytes2);
}
}

Expand Down
7 changes: 5 additions & 2 deletions ydb/core/tx/columnshard/engines/changes/compaction/merger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ std::vector<NKikimr::NOlap::TWritePortionInfoWithBlobsResult> TMerger::Execute(c
arrow::FieldVector indexFields;
indexFields.emplace_back(IColumnMerger::PortionIdField);
indexFields.emplace_back(IColumnMerger::PortionRecordIndexField);
IIndexInfo::AddSpecialFields(indexFields);
if (resultFiltered->HasColumnId((ui32)IIndexInfo::ESpecialColumn::DELETE_FLAG)) {
IIndexInfo::AddDeleteFields(indexFields);
}
IIndexInfo::AddSnapshotFields(indexFields);
auto dataSchema = std::make_shared<arrow::Schema>(indexFields);
NArrow::NMerger::TMergePartialStream mergeStream(
resultFiltered->GetIndexInfo().GetReplaceKey(), dataSchema, false, IIndexInfo::GetSnapshotColumnNames());
Expand Down Expand Up @@ -137,7 +140,7 @@ std::vector<NKikimr::NOlap::TWritePortionInfoWithBlobsResult> TMerger::Execute(c
TGeneralSerializedSlice slice(dataWithSecondary.GetExternalData(), schemaDetails, Context.Counters.SplitterCounters);

auto b = batchResult->Slice(recordIdx, slice.GetRecordsCount());
const ui32 deletionsCount = IIndexInfo::CalcDeletions(b, true);
const ui32 deletionsCount = IIndexInfo::CalcDeletions(b, false);
auto constructor = TWritePortionInfoWithBlobsConstructor::BuildByBlobs(slice.GroupChunksByBlobs(groups),
dataWithSecondary.GetSecondaryInplaceData(), pathId, resultFiltered->GetVersion(), resultFiltered->GetSnapshot(),
SaverContext.GetStoragesManager());
Expand Down
11 changes: 8 additions & 3 deletions ydb/core/tx/columnshard/engines/changes/indexation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,11 @@ TConclusionStatus TInsertColumnEngineChanges::DoConstructBlobs(TConstructionCont

for (auto& inserted : DataToIndex) {
auto blobSchema = context.SchemaVersions.GetSchemaVerified(inserted.GetSchemaVersion());
std::vector<ui32> filteredIds = inserted.GetMeta().GetSchemaSubset().Apply(blobSchema->GetIndexInfo().GetColumnIds(true));
std::vector<ui32> filteredIds = inserted.GetMeta().GetSchemaSubset().Apply(blobSchema->GetIndexInfo().GetColumnIds(false));
usageColumnIds.insert(filteredIds.begin(), filteredIds.end());
if (inserted.GetMeta().GetModificationType() == NEvWrite::EModificationType::Delete) {
usageColumnIds.emplace((ui32)IIndexInfo::ESpecialColumn::DELETE_FLAG);
}
if (usageColumnIds.size() == resultSchema->GetIndexInfo().GetColumnIds(true).size()) {
break;
}
Expand All @@ -179,8 +182,10 @@ TConclusionStatus TInsertColumnEngineChanges::DoConstructBlobs(TConstructionCont
}

IIndexInfo::AddSnapshotColumns(*batch, inserted.GetSnapshot());
IIndexInfo::AddDeleteFlagsColumn(*batch, inserted.GetMeta().GetModificationType() == NEvWrite::EModificationType::Delete);
usageColumnIds.insert(IIndexInfo::GetSystemColumnIds().begin(), IIndexInfo::GetSystemColumnIds().end());
if (usageColumnIds.contains((ui32)IIndexInfo::ESpecialColumn::DELETE_FLAG)) {
IIndexInfo::AddDeleteFlagsColumn(*batch, inserted.GetMeta().GetModificationType() == NEvWrite::EModificationType::Delete);
}
usageColumnIds.insert(IIndexInfo::GetSnapshotColumnIds().begin(), IIndexInfo::GetSnapshotColumnIds().end());

batch = resultSchema->NormalizeBatch(*blobSchema, batch, usageColumnIds).DetachResult();
pathBatches.Add(inserted, shardingFilterCommit, batch);
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/tx/columnshard/engines/portions/read_with_blobs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ std::optional<TWritePortionInfoWithBlobsResult> TReadPortionInfoWithBlobs::SyncP
std::vector<std::shared_ptr<IPortionDataChunk>> newChunks;
if (it != columnChunks.end()) {
newChunks = to->GetIndexInfo().ActualizeColumnData(it->second, from->GetIndexInfo(), i);
} else {
newChunks = to->GetIndexInfo().MakeEmptyChunks(i, pageSizes, to->GetIndexInfo().GetColumnFeaturesVerified(i));
}
AFL_VERIFY(entityChunksNew.emplace(i, std::move(newChunks)).second);
}
Expand Down
4 changes: 4 additions & 0 deletions ydb/core/tx/columnshard/engines/scheme/abstract/index_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ class IIndexInfo {
fields.push_back(arrow::field(SPEC_COL_TX_ID, arrow::uint64()));
}

static void AddDeleteFields(std::vector<std::shared_ptr<arrow::Field>>& fields) {
fields.push_back(arrow::field(SPEC_COL_DELETE_FLAG, arrow::boolean()));
}

static const std::set<ui32>& GetSnapshotColumnIdsSet() {
static const std::set<ui32> result = { (ui32)ESpecialColumn::PLAN_STEP, (ui32)ESpecialColumn::TX_ID };
return result;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/engines/ut/ut_logs_engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ Y_UNIT_TEST_SUITE(TColumnEngineTestLogs) {
ui64 txId = 1;
auto selectInfo = engine.Select(paths[0], TSnapshot(planStep, txId), NOlap::TPKRangesFilter(false));
UNIT_ASSERT_VALUES_EQUAL(selectInfo->PortionsOrderedPK.size(), 1);
UNIT_ASSERT_VALUES_EQUAL(selectInfo->PortionsOrderedPK[0]->NumChunks(), columnIds.size() + TIndexInfo::GetSystemColumnNames().size());
UNIT_ASSERT_VALUES_EQUAL(selectInfo->PortionsOrderedPK[0]->NumChunks(), columnIds.size() + TIndexInfo::GetSnapshotColumnIdsSet().size());
}

{ // select another pathId
Expand Down