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

negative add unit has been fixed #4772

Merged
merged 2 commits into from
May 23, 2024
Merged

negative add unit has been fixed #4772

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
35ec5b6
negative add unit has been fixed (#4481)
dorooleg May 16, 2024
de8f43b
abs to ui64 function has been added (#4705)
dorooleg May 21, 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
32 changes: 32 additions & 0 deletions ydb/library/yql/providers/s3/path_generator/ut/yql_generate_partitioning_rules_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,38 @@ Y_UNIT_TEST_SUITE(TGenerateTests) {
}
)", {"year"}), yexception, "Location path 1971/ is composed by different projection value sets { ${year} = 1971-01-01 } and { ${year} = 1971-01-02 }");;
}

Y_UNIT_TEST(SuccessGenerateDateWithNegativeNow) {
auto generator = CreatePathGenerator(R"(
{
"projection.enabled" : true,
"projection.city.type" : "enum",
"projection.city.values" : "MSK,SPB",
"projection.code.type" : "date",
"projection.code.min" : "NOW - 3 DAYS",
"projection.code.max" : "NOW",
"projection.code.format" : "%F",
"projection.code.interval" : 1,
"projection.code.unit" : "DAYS",
"storage.location.template" : "/${city}/${code}/"
}
)", {"city", "code"});
auto nowBefore = TInstant::Now();
auto rules = generator->GetRules();
auto nowAfter = TInstant::Now();

TSet<TString> items;
for (auto from = std::min(nowBefore, nowAfter) - TDuration::Days(3); from <= std::max(nowBefore, nowAfter); from += TDuration::Days(1)) {
items.insert("MSK/" + from.FormatLocalTime("%F") + "/");
items.insert("SPB/" + from.FormatLocalTime("%F") + "/");
}

UNIT_ASSERT_VALUES_EQUAL(rules.size(), 8);
for (const auto& rule: rules) {
UNIT_ASSERT(items.contains(rule.Path));
UNIT_ASSERT_VALUES_EQUAL(rule.ColumnValues.size(), 2);
}
}
}

}
24 changes: 21 additions & 3 deletions ydb/library/yql/providers/s3/path_generator/yql_s3_path_generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,20 @@ bool IsOverflow(ui64 a, ui64 b) {
return b > diff;
}

ui64 AbsToUi64(i64 value) {
if (value >= 0) {
return value;
}
if (value == std::numeric_limits<i64>::min()) {
return (ui64)std::numeric_limits<i64>::max() + 1;
}
return -value;
}

bool IsOverflow(ui64 a, i64 b) {
return b > 0 ? IsOverflow(a, (ui64)b) : a < AbsToUi64(b);
}

TDuration FromUnit(int64_t interval, IPathGenerator::EIntervalUnit unit) {
switch (unit) {
case IPathGenerator::EIntervalUnit::MILLISECONDS:
Expand Down Expand Up @@ -203,13 +217,17 @@ TInstant AddUnit(TInstant current, int64_t interval, IPathGenerator::EIntervalUn
return DoAddYears(current, interval);
}

const TDuration delta = FromUnit(abs(interval), unit);
if (delta.GetValue() > std::numeric_limits<i64>::max()) {
ythrow yexception() << "Interval is overflowed";
}

const TDuration delta = FromUnit(interval, unit);
if (IsOverflow(current.GetValue(), delta.GetValue())) {
const i64 deltaValue = (interval > 0 ? 1LL : -1LL) * delta.GetValue();
if (IsOverflow(current.GetValue(), deltaValue)) {
ythrow yexception() << "Timestamp is overflowed";
}

return current + delta;
return interval > 0 ? current + delta : current - delta;
}

TInstant ParseDate(const TString& dateStr, const TInstant& now) {
Expand Down
Loading