Skip to content
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

minor fixes of TTL in SDK #12152

Merged
merged 2 commits into from
Dec 2, 2024
Merged

minor fixes of TTL in SDK #12152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73761b3
minor fixes of TTL in SDK
swalrus1 Nov 29, 2024
e0dbeda
nit
swalrus1 Dec 2, 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/public/lib/experimental/ydb_logstore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace NYdb {
namespace NLogStore {

TMaybe<TTtlSettings> TtlSettingsFromProto(const Ydb::Table::TtlSettings& proto) {
if (auto settings = TTtlSettings::DeserializeFromProto(proto)) {
if (auto settings = TTtlSettings::FromProto(proto)) {
return *settings;
}
return Nothing();
Expand Down
75 changes: 46 additions & 29 deletions ydb/public/sdk/cpp/client/ydb_table/table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ class TTableDescription::TImpl {
}

// ttl settings
if (auto ttlSettings = TTtlSettings::DeserializeFromProto(proto.ttl_settings())) {
if (auto ttlSettings = TTtlSettings::FromProto(proto.ttl_settings())) {
TtlSettings_ = std::move(*ttlSettings);
}

Expand Down Expand Up @@ -2927,13 +2927,13 @@ bool operator!=(const TChangefeedDescription& lhs, const TChangefeedDescription&

////////////////////////////////////////////////////////////////////////////////

TTtlTierSettings::TTtlTierSettings(TDuration evictionDelay, const TAction& action)
: EvictAfter_(evictionDelay)
, Action_(action) {
}
TTtlTierSettings::TTtlTierSettings(TDuration applyAfter, const TAction& action)
: ApplyAfter_(applyAfter)
, Action_(action)
{ }

TTtlTierSettings::TTtlTierSettings(const Ydb::Table::TtlTier& tier)
: EvictAfter_(TDuration::Seconds(tier.apply_after_seconds())) {
: ApplyAfter_(TDuration::Seconds(tier.apply_after_seconds())) {
switch (tier.action_case()) {
case Ydb::Table::TtlTier::kDelete:
Action_ = TTtlDeleteAction();
Expand All @@ -2947,7 +2947,7 @@ TTtlTierSettings::TTtlTierSettings(const Ydb::Table::TtlTier& tier)
}

void TTtlTierSettings::SerializeTo(Ydb::Table::TtlTier& proto) const {
proto.set_apply_after_seconds(EvictAfter_.Seconds());
proto.set_apply_after_seconds(ApplyAfter_.Seconds());

std::visit(TOverloaded{
[&proto](const TTtlDeleteAction&) { proto.mutable_delete_(); },
Expand All @@ -2959,8 +2959,8 @@ void TTtlTierSettings::SerializeTo(Ydb::Table::TtlTier& proto) const {
Action_);
}

TDuration TTtlTierSettings::GetEvictAfter() const {
return EvictAfter_;
TDuration TTtlTierSettings::GetApplyAfter() const {
return ApplyAfter_;
}

const TTtlTierSettings::TAction& TTtlTierSettings::GetAction() const {
Expand Down Expand Up @@ -3094,42 +3094,55 @@ const TValueSinceUnixEpochModeSettings& TTtlSettings::GetValueSinceUnixEpoch() c
return std::get<TValueSinceUnixEpochModeSettings>(Mode_);
}

std::optional<TTtlSettings> TTtlSettings::DeserializeFromProto(const Ydb::Table::TtlSettings& proto) {
TDuration legacyExpireAfter = TDuration::Max();
std::optional<TTtlSettings> TTtlSettings::FromProto(const Ydb::Table::TtlSettings& proto) {
TVector<TTtlTierSettings> tiers;
for (const auto& tier : proto.tiers()) {
if (tier.has_delete_()) {
legacyExpireAfter = TDuration::Seconds(tier.apply_after_seconds());
break;
}
tiers.emplace_back(tier);
}
TDuration legacyExpireAfter = GetExpireAfterFrom(tiers).value_or(TDuration::Max());

switch(proto.mode_case()) {
case Ydb::Table::TtlSettings::kDateTypeColumn:
return TTtlSettings(proto.date_type_column(), proto.run_interval_seconds());
case Ydb::Table::TtlSettings::kValueSinceUnixEpoch:
return TTtlSettings(proto.value_since_unix_epoch(), proto.run_interval_seconds());
case Ydb::Table::TtlSettings::kDateTypeColumnV1:
return TTtlSettings(TDateTypeColumnModeSettings(proto.date_type_column_v1().column_name(), legacyExpireAfter), proto.run_interval_seconds());
return TTtlSettings(
TDateTypeColumnModeSettings(proto.date_type_column_v1().column_name(), legacyExpireAfter), tiers, proto.run_interval_seconds());
case Ydb::Table::TtlSettings::kValueSinceUnixEpochV1:
return TTtlSettings(TValueSinceUnixEpochModeSettings(proto.value_since_unix_epoch_v1().column_name(), TProtoAccessor::FromProto(proto.value_since_unix_epoch_v1().column_unit()), legacyExpireAfter), proto.run_interval_seconds());
return TTtlSettings(TValueSinceUnixEpochModeSettings(proto.value_since_unix_epoch_v1().column_name(),
TProtoAccessor::FromProto(proto.value_since_unix_epoch_v1().column_unit()), legacyExpireAfter),
tiers, proto.run_interval_seconds());
case Ydb::Table::TtlSettings::MODE_NOT_SET:
return std::nullopt;
break;
}
}

void TTtlSettings::SerializeTo(Ydb::Table::TtlSettings& proto) const {
switch (GetMode()) {
case EMode::DateTypeColumn:
GetDateTypeColumn().SerializeTo(*proto.mutable_date_type_column_v1());
break;
case EMode::ValueSinceUnixEpoch:
GetValueSinceUnixEpoch().SerializeTo(*proto.mutable_value_since_unix_epoch_v1());
break;
}
if (Tiers_.size() == 1 && std::holds_alternative<TTtlDeleteAction>(Tiers_.back().GetAction())) {
// serialize DELETE-only TTL to legacy format for backwards-compatibility
switch (GetMode()) {
case EMode::DateTypeColumn:
GetDateTypeColumn().SerializeTo(*proto.mutable_date_type_column());
break;
case EMode::ValueSinceUnixEpoch:
GetValueSinceUnixEpoch().SerializeTo(*proto.mutable_value_since_unix_epoch());
break;
}
} else {
switch (GetMode()) {
case EMode::DateTypeColumn:
GetDateTypeColumn().SerializeTo(*proto.mutable_date_type_column_v1());
break;
case EMode::ValueSinceUnixEpoch:
GetValueSinceUnixEpoch().SerializeTo(*proto.mutable_value_since_unix_epoch_v1());
break;
}

for (const auto& tier : Tiers_) {
tier.SerializeTo(*proto.add_tiers());
for (const auto& tier : Tiers_) {
tier.SerializeTo(*proto.add_tiers());
}
}

if (RunInterval_) {
Expand Down Expand Up @@ -3161,13 +3174,17 @@ std::optional<TDuration> TTtlSettings::GetExpireAfter() const {
std::optional<TDuration> TTtlSettings::GetExpireAfterFrom(const TVector<TTtlTierSettings>& tiers) {
for (const auto& tier : tiers) {
if (std::holds_alternative<TTtlDeleteAction>(tier.GetAction())) {
return tier.GetEvictAfter();
return tier.GetApplyAfter();
}
}
return std::nullopt;
}

TTtlSettings::TTtlSettings(TMode mode, ui32 runIntervalSeconds) : Mode_(std::move(mode)), RunInterval_(TDuration::Seconds(runIntervalSeconds)) {}
TTtlSettings::TTtlSettings(TMode mode, const TVector<TTtlTierSettings>& tiers, ui32 runIntervalSeconds)
: Mode_(std::move(mode))
, Tiers_(tiers)
, RunInterval_(TDuration::Seconds(runIntervalSeconds))
{}

TAlterTtlSettings::EAction TAlterTtlSettings::GetAction() const {
return static_cast<EAction>(Action_.index());
Expand Down
14 changes: 7 additions & 7 deletions ydb/public/sdk/cpp/client/ydb_table/table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,15 +439,15 @@ class TTtlTierSettings {
>;

public:
explicit TTtlTierSettings(TDuration evictionDelay, const TAction& action);
explicit TTtlTierSettings(TDuration applyAfter, const TAction& action);
explicit TTtlTierSettings(const Ydb::Table::TtlTier& tier);
void SerializeTo(Ydb::Table::TtlTier& proto) const;

TDuration GetEvictAfter() const;
TDuration GetApplyAfter() const;
const TAction& GetAction() const;

private:
TDuration EvictAfter_;
TDuration ApplyAfter_;
TAction Action_;
};

Expand Down Expand Up @@ -516,16 +516,16 @@ class TTtlSettings {
explicit TTtlSettings(const TString& columnName, const TVector<TTtlTierSettings>& tiers);
explicit TTtlSettings(const TString& columnName, const TDuration& expireAfter);
const TDateTypeColumnModeSettings& GetDateTypeColumn() const;
// Deprecated. Use DeserializeFromProto()
// Deprecated. Use FromProto()
explicit TTtlSettings(const Ydb::Table::DateTypeColumnModeSettings& mode, ui32 runIntervalSeconds);

explicit TTtlSettings(const TString& columnName, EUnit columnUnit, const TVector<TTtlTierSettings>& tiers);
explicit TTtlSettings(const TString& columnName, EUnit columnUnit, const TDuration& expireAfter);
const TValueSinceUnixEpochModeSettings& GetValueSinceUnixEpoch() const;
// Deprecated. Use DeserializeFromProto()
// Deprecated. Use FromProto()
explicit TTtlSettings(const Ydb::Table::ValueSinceUnixEpochModeSettings& mode, ui32 runIntervalSeconds);

static std::optional<TTtlSettings> DeserializeFromProto(const Ydb::Table::TtlSettings& proto);
static std::optional<TTtlSettings> FromProto(const Ydb::Table::TtlSettings& proto);
void SerializeTo(Ydb::Table::TtlSettings& proto) const;
EMode GetMode() const;

Expand All @@ -536,7 +536,7 @@ class TTtlSettings {
std::optional<TDuration> GetExpireAfter() const;

private:
explicit TTtlSettings(TMode mode, ui32 runIntervalSeconds);
explicit TTtlSettings(TMode mode, const TVector<TTtlTierSettings>& tiers, ui32 runIntervalSeconds);
static std::optional<TDuration> GetExpireAfterFrom(const TVector<TTtlTierSettings>& tiers);

private:
Expand Down
Loading