Skip to content

Commit a178bc5

Browse files
kungakunga
authored
Rename Index -> FlatIndex (#3843)
1 parent 6ad2b02 commit a178bc5

36 files changed

+128
-127
lines changed

‎ydb/core/tablet_flat/benchmark/b_part.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <ydb/core/tablet_flat/test/libs/table/model/large.h>
99
#include <ydb/core/tablet_flat/test/libs/table/test_make.h>
1010
#include <ydb/core/tablet_flat/test/libs/table/test_mixer.h>
11-
#include "ydb/core/tablet_flat/flat_part_btree_index_iter.h"
11+
#include "ydb/core/tablet_flat/flat_part_index_iter_bree_index.h"
1212
#include "ydb/core/tablet_flat/flat_stat_table.h"
1313
#include "ydb/core/tablet_flat/test/libs/table/wrap_iter.h"
1414
#include "ydb/core/tx/datashard/datashard.h"

‎ydb/core/tablet_flat/flat_abi_evol.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ namespace NTable {
6363
---------------------------------------------------------------------
6464
15 Complete support ELargeObj::Outer, values packed in page collection
6565
---------------------------------------------------------------------
66-
16 Read and write final key in EPage::Index
66+
16 Read and write final key in EPage::FlatIndex
6767
---------------------------------------------------------------------
6868
17 Fixed incomplete read support of rooted page collections
6969
---------------------------------------------------------------------

‎ydb/core/tablet_flat/flat_fwd_env.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ namespace NFwd {
258258

259259
private:
260260
static bool IsIndexPage(EPage type) noexcept {
261-
return type == EPage::Index || type == EPage::BTreeIndex;
261+
return type == EPage::FlatIndex || type == EPage::BTreeIndex;
262262
}
263263

264264
const TSharedData* TryGetIndexPage(TSlot slot, TPageId pageId, EPage type) noexcept

‎ydb/core/tablet_flat/flat_iterator.h

+36-37
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#pragma once
22
#include "flat_iterator_ops.h"
33
#include "flat_mem_iter.h"
4-
#include "flat_part_iter_multi.h"
4+
#include "flat_part_iter.h"
55
#include "flat_row_remap.h"
66
#include "flat_row_state.h"
77
#include "flat_range_cache.h"
8-
#include "util_fmt_cell.h"
98

109
#include <library/cpp/containers/stack_vector/stack_vec.h>
1110

@@ -22,8 +21,8 @@ enum class ENext {
2221
Uncommitted,
2322
};
2423

25-
template<class TIteratorOps>
26-
class TTableItBase : TNonCopyable {
24+
template<class TIterOps>
25+
class TTableIterBase : TNonCopyable {
2726
enum class EType : ui8 {
2827
Mem = 0,
2928
Run = 1,
@@ -39,10 +38,10 @@ class TTableItBase : TNonCopyable {
3938
};
4039

4140
class TEraseCachingState {
42-
using TOps = typename TIteratorOps::TEraseCacheOps;
41+
using TOps = typename TIterOps::TEraseCacheOps;
4342

4443
public:
45-
TEraseCachingState(TTableItBase* it)
44+
TEraseCachingState(TTableIterBase* it)
4645
: It(it)
4746
, Cache(it->ErasedKeysCache.Get())
4847
{ }
@@ -214,7 +213,7 @@ class TTableItBase : TNonCopyable {
214213
}
215214

216215
private:
217-
TTableItBase* It;
216+
TTableIterBase* It;
218217
TOps Cache;
219218
TKeyRangeCache::const_iterator PrevEntry;
220219
TKeyRangeCache::const_iterator NextEntry;
@@ -244,13 +243,13 @@ class TTableItBase : TNonCopyable {
244243
}
245244

246245
public:
247-
TTableItBase(
246+
TTableIterBase(
248247
const TRowScheme* scheme, TTagsRef tags, ui64 lim = Max<ui64>(),
249248
TRowVersion snapshot = TRowVersion::Max(),
250249
NTable::ITransactionMapPtr committedTransactions = nullptr,
251250
NTable::ITransactionObserverPtr transactionObserver = nullptr);
252251

253-
~TTableItBase();
252+
~TTableIterBase();
254253

255254
void Push(TAutoPtr<TMemIter>);
256255
void Push(TAutoPtr<TRunIter>);
@@ -389,7 +388,7 @@ class TTableItBase : TNonCopyable {
389388

390389
int CompareKeys(TArrayRef<const TCell> a, TArrayRef<const TCell> b) const noexcept
391390
{
392-
return TIteratorOps::CompareKeys(Types, a, b);
391+
return TIterOps::CompareKeys(Types, a, b);
393392
}
394393

395394
bool operator() (const TElement& a, const TElement& b) const noexcept
@@ -458,26 +457,26 @@ class TTableItBase : TNonCopyable {
458457
class TTableIter;
459458
class TTableReverseIter;
460459

461-
class TTableIter : public TTableItBase<TTableItOps> {
460+
class TTableIter : public TTableIterBase<TTableIterOps> {
462461
public:
463-
using TTableItBase::TTableItBase;
462+
using TTableIterBase::TTableIterBase;
464463

465464
typedef TTableReverseIter TReverseType;
466465

467466
static constexpr EDirection Direction = EDirection::Forward;
468467
};
469468

470-
class TTableReverseIter : public TTableItBase<TTableItReverseOps> {
469+
class TTableReverseIter : public TTableIterBase<TTableItReverseOps> {
471470
public:
472-
using TTableItBase::TTableItBase;
471+
using TTableIterBase::TTableIterBase;
473472

474473
typedef TTableIter TReverseType;
475474

476475
static constexpr EDirection Direction = EDirection::Reverse;
477476
};
478477

479478
template<class TIteratorOps>
480-
inline TTableItBase<TIteratorOps>::TTableItBase(
479+
inline TTableIterBase<TIteratorOps>::TTableIterBase(
481480
const TRowScheme* scheme, TTagsRef tags, ui64 limit,
482481
TRowVersion snapshot,
483482
NTable::ITransactionMapPtr committedTransactions,
@@ -495,28 +494,28 @@ inline TTableItBase<TIteratorOps>::TTableItBase(
495494
{}
496495

497496
template<class TIteratorOps>
498-
inline TTableItBase<TIteratorOps>::~TTableItBase()
497+
inline TTableIterBase<TIteratorOps>::~TTableIterBase()
499498
{
500499
}
501500

502501
template<class TIteratorOps>
503-
inline void TTableItBase<TIteratorOps>::AddReadyIterator(TArrayRef<const TCell> key, TIteratorId itId) {
502+
inline void TTableIterBase<TIteratorOps>::AddReadyIterator(TArrayRef<const TCell> key, TIteratorId itId) {
504503
Active = Iterators.emplace(Active, TElement({key, itId}));
505504
++Active;
506505
std::push_heap(Iterators.begin(), Active, Comparator);
507506
Inactive = Active;
508507
}
509508

510509
template<class TIteratorOps>
511-
inline void TTableItBase<TIteratorOps>::AddNotReadyIterator(TIteratorId itId) {
510+
inline void TTableIterBase<TIteratorOps>::AddNotReadyIterator(TIteratorId itId) {
512511
size_t actPos = Active - Iterators.begin();
513512
Iterators.emplace_back(TElement({{ }, itId}));
514513
Active = Iterators.begin() + actPos;
515514
Inactive = Active;
516515
}
517516

518517
template<class TIteratorOps>
519-
inline void TTableItBase<TIteratorOps>::Push(TAutoPtr<TMemIter> it)
518+
inline void TTableIterBase<TIteratorOps>::Push(TAutoPtr<TMemIter> it)
520519
{
521520
if (it && it->IsValid()) {
522521
TIteratorId itId = { EType::Mem, IteratorIndexFromSize(MemIters.size()), it->MemTable->Epoch };
@@ -528,7 +527,7 @@ inline void TTableItBase<TIteratorOps>::Push(TAutoPtr<TMemIter> it)
528527
}
529528

530529
template<class TIteratorOps>
531-
inline void TTableItBase<TIteratorOps>::Push(TAutoPtr<TRunIter> it)
530+
inline void TTableIterBase<TIteratorOps>::Push(TAutoPtr<TRunIter> it)
532531
{
533532
TIteratorId itId = { EType::Run, IteratorIndexFromSize(RunIters.size()), it->Epoch() };
534533

@@ -544,7 +543,7 @@ inline void TTableItBase<TIteratorOps>::Push(TAutoPtr<TRunIter> it)
544543
}
545544

546545
template<class TIteratorOps>
547-
inline void TTableItBase<TIteratorOps>::StopBefore(TArrayRef<const TCell> key)
546+
inline void TTableIterBase<TIteratorOps>::StopBefore(TArrayRef<const TCell> key)
548547
{
549548
Y_ABORT_UNLESS(!StopKey, "Using multiple stop keys not allowed");
550549

@@ -561,7 +560,7 @@ inline void TTableItBase<TIteratorOps>::StopBefore(TArrayRef<const TCell> key)
561560
}
562561

563562
template<class TIteratorOps>
564-
inline void TTableItBase<TIteratorOps>::StopAfter(TArrayRef<const TCell> key)
563+
inline void TTableIterBase<TIteratorOps>::StopAfter(TArrayRef<const TCell> key)
565564
{
566565
Y_ABORT_UNLESS(!StopKey, "Using multiple stop keys not allowed");
567566

@@ -578,7 +577,7 @@ inline void TTableItBase<TIteratorOps>::StopAfter(TArrayRef<const TCell> key)
578577
}
579578

580579
template<class TIteratorOps>
581-
inline EReady TTableItBase<TIteratorOps>::Start() noexcept
580+
inline EReady TTableIterBase<TIteratorOps>::Start() noexcept
582581
{
583582
if (Active != Iterators.end()) {
584583
return EReady::Page;
@@ -616,7 +615,7 @@ inline EReady TTableItBase<TIteratorOps>::Start() noexcept
616615
}
617616

618617
template<class TIteratorOps>
619-
inline EReady TTableItBase<TIteratorOps>::Turn() noexcept
618+
inline EReady TTableIterBase<TIteratorOps>::Turn() noexcept
620619
{
621620
if (!Limit) {
622621
// Optimization: avoid calling Next after returning the last row
@@ -684,7 +683,7 @@ inline EReady TTableItBase<TIteratorOps>::Turn() noexcept
684683
}
685684

686685
template<class TIteratorOps>
687-
inline bool TTableItBase<TIteratorOps>::IsUncommitted() const noexcept
686+
inline bool TTableIterBase<TIteratorOps>::IsUncommitted() const noexcept
688687
{
689688
// Must only be called after a fully successful Apply()
690689
Y_DEBUG_ABORT_UNLESS(Stage == EStage::Done && Ready == EReady::Data);
@@ -696,7 +695,7 @@ inline bool TTableItBase<TIteratorOps>::IsUncommitted() const noexcept
696695
}
697696

698697
template<class TIteratorOps>
699-
inline ui64 TTableItBase<TIteratorOps>::GetUncommittedTxId() const noexcept
698+
inline ui64 TTableIterBase<TIteratorOps>::GetUncommittedTxId() const noexcept
700699
{
701700
// Must only be called after a fully successful Apply()
702701
Y_DEBUG_ABORT_UNLESS(Stage == EStage::Done && Ready == EReady::Data);
@@ -711,7 +710,7 @@ inline ui64 TTableItBase<TIteratorOps>::GetUncommittedTxId() const noexcept
711710
}
712711

713712
template<class TIteratorOps>
714-
inline EReady TTableItBase<TIteratorOps>::SkipUncommitted() noexcept
713+
inline EReady TTableIterBase<TIteratorOps>::SkipUncommitted() noexcept
715714
{
716715
// Must only be called after successful Apply() or page fault in SkipUncommitted()
717716
Y_DEBUG_ABORT_UNLESS(Stage == EStage::Done && Ready != EReady::Gone);
@@ -736,7 +735,7 @@ inline EReady TTableItBase<TIteratorOps>::SkipUncommitted() noexcept
736735
}
737736

738737
template<class TIteratorOps>
739-
inline TRowVersion TTableItBase<TIteratorOps>::GetRowVersion() const noexcept
738+
inline TRowVersion TTableIterBase<TIteratorOps>::GetRowVersion() const noexcept
740739
{
741740
// Must only be called after a fully successful Apply()
742741
Y_DEBUG_ABORT_UNLESS(Stage == EStage::Done && Ready == EReady::Data);
@@ -763,7 +762,7 @@ inline TRowVersion TTableItBase<TIteratorOps>::GetRowVersion() const noexcept
763762
}
764763

765764
template<class TIteratorOps>
766-
inline EReady TTableItBase<TIteratorOps>::SkipToRowVersion(TRowVersion rowVersion) noexcept
765+
inline EReady TTableIterBase<TIteratorOps>::SkipToRowVersion(TRowVersion rowVersion) noexcept
767766
{
768767
// Must only be called after successful Apply()
769768
Y_DEBUG_ABORT_UNLESS(Stage == EStage::Done && Ready != EReady::Gone);
@@ -783,7 +782,7 @@ inline EReady TTableItBase<TIteratorOps>::SkipToRowVersion(TRowVersion rowVersio
783782
}
784783

785784
template<class TIteratorOps>
786-
inline EReady TTableItBase<TIteratorOps>::Snap() noexcept
785+
inline EReady TTableIterBase<TIteratorOps>::Snap() noexcept
787786
{
788787
Y_DEBUG_ABORT_UNLESS(Active != Inactive);
789788

@@ -806,7 +805,7 @@ inline EReady TTableItBase<TIteratorOps>::Snap() noexcept
806805
}
807806

808807
template<class TIteratorOps>
809-
inline EReady TTableItBase<TIteratorOps>::Snap(TRowVersion rowVersion) noexcept
808+
inline EReady TTableIterBase<TIteratorOps>::Snap(TRowVersion rowVersion) noexcept
810809
{
811810
for (auto i = TReverseIter(Inactive), e = TReverseIter(Active); i != e; ++i) {
812811
TIteratorId ai = i->IteratorId;
@@ -842,7 +841,7 @@ inline EReady TTableItBase<TIteratorOps>::Snap(TRowVersion rowVersion) noexcept
842841
}
843842

844843
template<class TIteratorOps>
845-
inline EReady TTableItBase<TIteratorOps>::DoSkipUncommitted() noexcept
844+
inline EReady TTableIterBase<TIteratorOps>::DoSkipUncommitted() noexcept
846845
{
847846
Y_DEBUG_ABORT_UNLESS(Delta && Uncommitted);
848847

@@ -885,7 +884,7 @@ inline EReady TTableItBase<TIteratorOps>::DoSkipUncommitted() noexcept
885884
}
886885

887886
template<class TIteratorOps>
888-
inline EReady TTableItBase<TIteratorOps>::Apply() noexcept
887+
inline EReady TTableIterBase<TIteratorOps>::Apply() noexcept
889888
{
890889
State.Reset(Remap.CellDefaults());
891890

@@ -958,7 +957,7 @@ inline EReady TTableItBase<TIteratorOps>::Apply() noexcept
958957
}
959958

960959
template<class TIteratorOps>
961-
inline void TTableItBase<TIteratorOps>::InitLastKey(ERowOp op) noexcept
960+
inline void TTableIterBase<TIteratorOps>::InitLastKey(ERowOp op) noexcept
962961
{
963962
TArrayRef<const TCell> key = Iterators.back().Key;
964963

@@ -988,21 +987,21 @@ inline void TTableItBase<TIteratorOps>::InitLastKey(ERowOp op) noexcept
988987
}
989988

990989
template<class TIteratorOps>
991-
inline TDbTupleRef TTableItBase<TIteratorOps>::GetKey() const noexcept
990+
inline TDbTupleRef TTableIterBase<TIteratorOps>::GetKey() const noexcept
992991
{
993992
return { Scheme->Keys->BasicTypes().data(), LastKey.data(), static_cast<ui32>(LastKey.size()) };
994993
}
995994

996995
template<class TIteratorOps>
997-
inline TDbTupleRef TTableItBase<TIteratorOps>::GetValues() const noexcept
996+
inline TDbTupleRef TTableIterBase<TIteratorOps>::GetValues() const noexcept
998997
{
999998
if (State.GetRowState() == ERowOp::Erase)
1000999
return TDbTupleRef();
10011000
return TDbTupleRef(Remap.Types().begin(), (*State).begin(), (*State).size());
10021001
}
10031002

10041003
template<class TIteratorOps>
1005-
inline bool TTableItBase<TIteratorOps>::SeekInternal(TArrayRef<const TCell> key, ESeek seek) noexcept
1004+
inline bool TTableIterBase<TIteratorOps>::SeekInternal(TArrayRef<const TCell> key, ESeek seek) noexcept
10061005
{
10071006
Stage = EStage::Seek;
10081007

‎ydb/core/tablet_flat/flat_iterator_ops.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#pragma once
22

33
#include "flat_mem_iter.h"
4-
#include "flat_part_iter_multi.h"
4+
#include "flat_part_iter.h"
55
#include "flat_range_cache.h"
66

77
namespace NKikimr {
88
namespace NTable {
99

10-
struct TTableItOps {
10+
struct TTableIterOps {
1111
static inline int CompareKeys(
1212
TArrayRef<const NScheme::TTypeInfoOrder> types,
1313
TArrayRef<const TCell> a,
@@ -162,7 +162,7 @@ struct TTableItReverseOps {
162162
TArrayRef<const TCell> a,
163163
TArrayRef<const TCell> b) noexcept
164164
{
165-
return -TTableItOps::CompareKeys(types, a, b);
165+
return -TTableIterOps::CompareKeys(types, a, b);
166166
}
167167

168168
static void MoveNext(TMemIter& it) {
@@ -181,7 +181,7 @@ struct TTableItReverseOps {
181181
return it.SeekReverse(key, seek);
182182
}
183183

184-
class TEraseCacheOps : public TTableItOps::TEraseCacheOpsCommon {
184+
class TEraseCacheOps : public TTableIterOps::TEraseCacheOpsCommon {
185185
public:
186186
using TEraseCacheOpsCommon::TEraseCacheOpsCommon;
187187

‎ydb/core/tablet_flat/flat_page_index.h renamed to ‎ydb/core/tablet_flat/flat_page_flat_index.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace NKikimr {
99
namespace NTable {
1010
namespace NPage {
1111

12-
struct TIndex {
12+
struct TFlatIndex {
1313
/*
1414
TRecord binary layout v2
1515
.---------.---------------.
@@ -61,10 +61,10 @@ namespace NPage {
6161

6262
static constexpr ui16 Version = 3;
6363

64-
TIndex(TSharedData raw)
64+
TFlatIndex(TSharedData raw)
6565
: Raw(std::move(raw))
6666
{
67-
const auto data = NPage::TLabelWrapper().Read(Raw, EPage::Index);
67+
const auto data = NPage::TLabelWrapper().Read(Raw, EPage::FlatIndex);
6868
Y_ABORT_UNLESS(data == ECodec::Plain && (data.Version == 2 || data.Version == 3));
6969

7070
auto *recordsHeader = TDeref<const TRecordsHeader>::At(data.Page.data(), 0);

‎ydb/core/tablet_flat/flat_page_iface.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ namespace NPage {
6161
enum class EPage : ui16 {
6262
Undef = 0,
6363
Scheme = 2,
64-
Index = 3,
64+
FlatIndex = 3,
6565
DataPage = 4,
6666
Frames = 5, /* Tagged entities to TRowId relation index */
6767
Globs = 6, /* Just enumeration of NPageCollection::TGlobId refs */

0 commit comments

Comments
 (0)