aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorilnaz <ilnaz@ydb.tech>2023-01-17 19:47:43 +0300
committerilnaz <ilnaz@ydb.tech>2023-01-17 19:47:43 +0300
commitde2d8cecd95fea59200d342c690dce4b0357176e (patch)
tree2163e9423aac5c86db0ae937e7ca941a32a82649
parent0b2d4231352a0cf83215039b65fb3a70a563fd3c (diff)
downloadydb-de2d8cecd95fea59200d342c690dce4b0357176e.tar.gz
(refactoring) TGlobalTimestamp -> TVirtualTimestamp
-rw-r--r--ydb/core/tx/schemeshard/schemeshard_impl.cpp4
-rw-r--r--ydb/core/tx/schemeshard/schemeshard_path_element.cpp8
-rw-r--r--ydb/core/tx/schemeshard/schemeshard_path_element.h4
-rw-r--r--ydb/core/tx/schemeshard/schemeshard_types.h8
4 files changed, 12 insertions, 12 deletions
diff --git a/ydb/core/tx/schemeshard/schemeshard_impl.cpp b/ydb/core/tx/schemeshard/schemeshard_impl.cpp
index 33db4e272a6..3bd0d5d39e8 100644
--- a/ydb/core/tx/schemeshard/schemeshard_impl.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard_impl.cpp
@@ -139,8 +139,8 @@ ui64 TSchemeShard::Generation() const {
}
struct TAttachOrder {
- TGlobalTimestamp DropAt;
- TGlobalTimestamp CreateAt;
+ TVirtualTimestamp DropAt;
+ TVirtualTimestamp CreateAt;
TPathId PathId;
explicit TAttachOrder(TPathElement::TPtr path)
diff --git a/ydb/core/tx/schemeshard/schemeshard_path_element.cpp b/ydb/core/tx/schemeshard/schemeshard_path_element.cpp
index a3172874128..3deab09737c 100644
--- a/ydb/core/tx/schemeshard/schemeshard_path_element.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard_path_element.cpp
@@ -156,12 +156,12 @@ bool TPathElement::IsCreateFinished() const {
return (IsRoot() && CreateTxId) || StepCreated;
}
-TGlobalTimestamp TPathElement::GetCreateTS() const {
- return TGlobalTimestamp(StepCreated, CreateTxId);
+TVirtualTimestamp TPathElement::GetCreateTS() const {
+ return TVirtualTimestamp(StepCreated, CreateTxId);
}
-TGlobalTimestamp TPathElement::GetDropTS() const {
- return TGlobalTimestamp(StepDropped, DropTxId);
+TVirtualTimestamp TPathElement::GetDropTS() const {
+ return TVirtualTimestamp(StepDropped, DropTxId);
}
void TPathElement::SetDropped(TStepId step, TTxId txId) {
diff --git a/ydb/core/tx/schemeshard/schemeshard_path_element.h b/ydb/core/tx/schemeshard/schemeshard_path_element.h
index f18bb9eca6d..0ad50bd3dd2 100644
--- a/ydb/core/tx/schemeshard/schemeshard_path_element.h
+++ b/ydb/core/tx/schemeshard/schemeshard_path_element.h
@@ -378,8 +378,8 @@ public:
bool IsLikeDirectory() const;
bool HasActiveChanges() const;
bool IsCreateFinished() const;
- TGlobalTimestamp GetCreateTS() const;
- TGlobalTimestamp GetDropTS() const;
+ TVirtualTimestamp GetCreateTS() const;
+ TVirtualTimestamp GetDropTS() const;
void SetDropped(TStepId step, TTxId txId);
bool NormalState() const;
bool Dropped() const;
diff --git a/ydb/core/tx/schemeshard/schemeshard_types.h b/ydb/core/tx/schemeshard/schemeshard_types.h
index aff80a216fe..a7d9a76fdf9 100644
--- a/ydb/core/tx/schemeshard/schemeshard_types.h
+++ b/ydb/core/tx/schemeshard/schemeshard_types.h
@@ -39,11 +39,11 @@ struct TSchemeLimits {
using ETabletType = TTabletTypes;
-struct TGlobalTimestamp {
+struct TVirtualTimestamp {
TStepId Step = InvalidStepId;
TTxId TxId = InvalidTxId;
- TGlobalTimestamp(TStepId step, TTxId txId)
+ TVirtualTimestamp(TStepId step, TTxId txId)
: Step(step)
, TxId(txId)
{}
@@ -56,13 +56,13 @@ struct TGlobalTimestamp {
return !Empty();
}
- bool operator < (const TGlobalTimestamp& ts) const {
+ bool operator < (const TVirtualTimestamp& ts) const {
Y_VERIFY_DEBUG(Step, "Comparing with unset timestamp");
Y_VERIFY_DEBUG(ts.Step, "Comparing with unset timestamp");
return Step < ts.Step || Step == ts.Step && TxId < ts.TxId;
}
- bool operator == (const TGlobalTimestamp& ts) const {
+ bool operator == (const TVirtualTimestamp& ts) const {
return Step == ts.Step && TxId == ts.TxId;
}