diff options
author | uzhas <uzhas@ydb.tech> | 2022-08-15 21:17:10 +0300 |
---|---|---|
committer | uzhas <uzhas@ydb.tech> | 2022-08-15 21:17:10 +0300 |
commit | 7a392c977a198d4bf975393edd99ef939a94a8ba (patch) | |
tree | e1e083a14836576c486a31030fc72d07c6e5931b | |
parent | 66c9420a79e6d27eeef6fc7ff7b0c37b9eae69a3 (diff) | |
download | ydb-7a392c977a198d4bf975393edd99ef939a94a8ba.tar.gz |
fix build for darwin
-rw-r--r-- | ydb/library/yql/providers/s3/path_generator/yql_s3_path_generator.cpp | 16 | ||||
-rw-r--r-- | ydb/library/yql/providers/s3/path_generator/yql_s3_path_generator.h | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ydb/library/yql/providers/s3/path_generator/yql_s3_path_generator.cpp b/ydb/library/yql/providers/s3/path_generator/yql_s3_path_generator.cpp index 8a869acd9d0..a0a6a876da7 100644 --- a/ydb/library/yql/providers/s3/path_generator/yql_s3_path_generator.cpp +++ b/ydb/library/yql/providers/s3/path_generator/yql_s3_path_generator.cpp @@ -121,7 +121,7 @@ IPathGenerator::EType ToType(const TString& type) { ythrow yexception() << "Invalid projection scheme: type " << type << " must be one of " << to_lower(GetEnumAllNames<IPathGenerator::EType>()); } -std::string fmtInteger(int32_t width, int64_t value) +std::string fmtInteger(int32_t width, i64 value) { if (width > 64) { ythrow yexception() << "Digits cannot exceed 64, but received " << width; @@ -130,22 +130,22 @@ std::string fmtInteger(int32_t width, int64_t value) return std::to_string(value); } char buf[65]; - snprintf(buf, 64, "%0*ld", width, value); + snprintf(buf, sizeof(buf), "%0*lld", width, static_cast<long long>(value)); return buf; } -bool IsOverflow(int64_t a, int64_t b) { +bool IsOverflow(i64 a, i64 b) { if (a ^ b < 0) { return false; } if (a > 0) { - return b > std::numeric_limits<int64_t>::max() - a; + return b > std::numeric_limits<i64>::max() - a; } - return b < std::numeric_limits<int64_t>::min() - a; + return b < std::numeric_limits<i64>::min() - a; } -bool IsOverflow(uint64_t a, uint64_t b) { - uint64_t diff = std::numeric_limits<int64_t>::max() - a; +bool IsOverflow(ui64 a, ui64 b) { + uint64_t diff = std::numeric_limits<ui64>::max() - a; return b > diff; } @@ -233,7 +233,7 @@ public: return TString{dataValue}; } case IPathGenerator::EType::INTEGER: { - int64_t value = 0; + i64 value = 0; if (!TryFromString(dataValue.Data(), dataValue.size(), value)) { ythrow yexception() << dataValue << " data is not a int64"; } diff --git a/ydb/library/yql/providers/s3/path_generator/yql_s3_path_generator.h b/ydb/library/yql/providers/s3/path_generator/yql_s3_path_generator.h index 449d4c7d19e..e8ae05b2789 100644 --- a/ydb/library/yql/providers/s3/path_generator/yql_s3_path_generator.h +++ b/ydb/library/yql/providers/s3/path_generator/yql_s3_path_generator.h @@ -33,11 +33,11 @@ struct IPathGenerator { TString Format; TString From; TString To; - int64_t Min = 0; - int64_t Max = 0; + i64 Min = 0; + i64 Max = 0; EIntervalUnit IntervalUnit = EIntervalUnit::DAYS; - int64_t Interval = 1; - int32_t Digits = 0; + i64 Interval = 1; + i32 Digits = 0; std::vector<TString> Values; }; |