Skip to content

Commit

Permalink
Fix randomly build failed because mpp.pb.h not found (#4331)
Browse files Browse the repository at this point in the history 
close #4318
  • Loading branch information
@guo-shaoge
guo-shaoge authored Mar 17, 2022
1 parent a2d3fcf commit 0d51eec
Show file tree
Hide file tree
Showing 4 changed files with 169 additions and 161 deletions.
1 change: 0 additions & 1 deletion dbms/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ target_link_libraries (clickhouse_common_io
cpptoml
)
target_include_directories (clickhouse_common_io BEFORE PRIVATE ${kvClient_SOURCE_DIR}/include)
target_include_directories (clickhouse_common_io BEFORE PUBLIC ${kvproto_SOURCE_DIR} ${tipb_SOURCE_DIR} ${Protobuf_INCLUDE_DIR} ${gRPC_INCLUDE_DIRS})

target_link_libraries (dbms
clickhouse_parsers
Expand Down
163 changes: 156 additions & 7 deletions dbms/src/Common/MyTime.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <Common/MyTime.h>
#include <Common/StringUtils/StringRefUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Functions/FunctionsDateTime.h>
#include <IO/WriteHelpers.h>
#include <Poco/String.h>
#include <common/StringRef.h>
#include <common/logger_useful.h>
Expand All @@ -33,6 +33,18 @@ extern const int BAD_ARGUMENTS;
extern const int NOT_IMPLEMENTED;
} // namespace ErrorCodes

// day number per 400 years, from the year that year % 400 = 1
static constexpr int DAY_NUM_PER_400_YEARS = 365 * 400 + 97;
// day number per 100 years in every 400 years, from the year that year % 100 = 1
// note the day number of the last 100 years should be DAY_NUM_PER_100_YEARS + 1
static constexpr int DAY_NUM_PER_100_YEARS = 365 * 100 + 24;
// day number per 4 years in every 100 years, from the year that year % 4 = 1
// note the day number of the last 4 years should be DAY_NUM_PER_4_YEARS - 1
static constexpr int DAY_NUM_PER_4_YEARS = 365 * 4 + 1;
// day number per years in every 4 years
// note the day number of the last 1 years maybe DAY_NUM_PER_YEARS + 1
static constexpr int DAY_NUM_PER_YEARS = 365;

// adjustYear adjusts year according to y.
// See https://dev.mysql.com/doc/refman/5.7/en/two-digit-years.html
int32_t adjustYear(int32_t year)
Expand Down Expand Up @@ -542,10 +554,6 @@ bool checkTimeValid(Int32 year, Int32 month, Int32 day, Int32 hour, Int32 minute

std::pair<Field, bool> parseMyDateTimeAndJudgeIsDate(const String & str, int8_t fsp, bool needCheckTimeValid)
{
// Since we only use DateLUTImpl as parameter placeholder of AddSecondsImpl::execute
// and it's costly to construct a DateLUTImpl, a shared static instance is enough.
static const DateLUTImpl & lut = DateLUT::instance("UTC");

Int32 year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0, delta_hour = 0, delta_minute = 0;

bool is_date = false;
Expand Down Expand Up @@ -782,7 +790,7 @@ std::pair<Field, bool> parseMyDateTimeAndJudgeIsDate(const String & str, int8_t
if (micro_second >= std::pow(10, fsp))
{
MyDateTime datetime(year, month, day, hour, minute, second, 0);
UInt64 result = AddSecondsImpl::execute(datetime.toPackedUInt(), 1, lut);
UInt64 result = addSeconds(datetime.toPackedUInt(), 1);
MyDateTime result_datetime(result);
year = result_datetime.year;
month = result_datetime.month;
Expand Down Expand Up @@ -834,7 +842,7 @@ std::pair<Field, bool> parseMyDateTimeAndJudgeIsDate(const String & str, int8_t
{
offset = -offset;
}
auto tmp = AddSecondsImpl::execute(result.toPackedUInt(), -offset, lut);
auto tmp = addSeconds(result.toPackedUInt(), -offset);
result = MyDateTime(tmp);
}

Expand Down Expand Up @@ -1126,6 +1134,147 @@ bool toCoreTimeChecked(const UInt64 & year, const UInt64 & month, const UInt64 &
return false;
}

UInt64 addSeconds(UInt64 t, Int64 delta)
{
// todo support zero date
if (t == 0)
{
return t;
}
MyDateTime my_time(t);
Int64 current_second = my_time.hour * 3600 + my_time.minute * 60 + my_time.second;
current_second += delta;
if (current_second >= 0)
{
Int64 days = current_second / MyTimeBase::SECOND_IN_ONE_DAY;
current_second = current_second % MyTimeBase::SECOND_IN_ONE_DAY;
if (days != 0)
addDays(my_time, days);
}
else
{
Int64 days = (-current_second) / MyTimeBase::SECOND_IN_ONE_DAY;
if ((-current_second) % MyTimeBase::SECOND_IN_ONE_DAY != 0)
{
days++;
}
current_second += days * MyTimeBase::SECOND_IN_ONE_DAY;
addDays(my_time, -days);
}
my_time.hour = current_second / 3600;
my_time.minute = (current_second % 3600) / 60;
my_time.second = current_second % 60;
return my_time.toPackedUInt();
}

void fillMonthAndDay(int day_num, int & month, int & day, const int * accumulated_days_per_month)
{
month = day_num / 31;
if (accumulated_days_per_month[month] < day_num)
month++;
day = day_num - (month == 0 ? 0 : accumulated_days_per_month[month - 1] + 1);
}

void fromDayNum(MyDateTime & t, int day_num)
{
// day_num is the days from 0000-01-01
if (day_num < 0)
throw Exception("MyDate/MyDateTime only support date after 0000-01-01");
int year = 0, month = 0, day = 0;
if (likely(day_num >= 366))
{
// year 0000 is leap year
day_num -= 366;

int num_of_400_years = day_num / DAY_NUM_PER_400_YEARS;
day_num = day_num % DAY_NUM_PER_400_YEARS;

int num_of_100_years = day_num / DAY_NUM_PER_100_YEARS;
// the day number of the last 100 years should be DAY_NUM_PER_100_YEARS + 1
// so can not use day_num % DAY_NUM_PER_100_YEARS
day_num = day_num - (num_of_100_years * DAY_NUM_PER_100_YEARS);

int num_of_4_years = day_num / DAY_NUM_PER_4_YEARS;
// can not use day_num % DAY_NUM_PER_4_YEARS
day_num = day_num - (num_of_4_years * DAY_NUM_PER_4_YEARS);

int num_of_years = day_num / DAY_NUM_PER_YEARS;
// can not use day_num % DAY_NUM_PER_YEARS
day_num = day_num - (num_of_years * DAY_NUM_PER_YEARS);

year = 1 + num_of_400_years * 400 + num_of_100_years * 100 + num_of_4_years * 4 + num_of_years;
}
static const int ACCUMULATED_DAYS_PER_MONTH[] = {30, 58, 89, 119, 150, 180, 211, 242, 272, 303, 333, 364};
static const int ACCUMULATED_DAYS_PER_MONTH_LEAP_YEAR[] = {30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
bool is_leap_year = year % 400 == 0 || (year % 4 == 0 && year % 100 != 0);
fillMonthAndDay(day_num, month, day, is_leap_year ? ACCUMULATED_DAYS_PER_MONTH_LEAP_YEAR : ACCUMULATED_DAYS_PER_MONTH);
if (year < 0 || year > 9999)
{
throw Exception("datetime overflow");
}
else if (year == 0)
{
t.year = 0;
t.month = 0;
t.day = 0;
return;
}
t.year = year;
t.month = month + 1;
t.day = day + 1;
}

void addDays(MyDateTime & t, Int64 days)
{
Int32 current_days = calcDayNum(t.year, t.month, t.day);
current_days += days;
fromDayNum(t, current_days);
}

void addMonths(MyDateTime & t, Int64 months)
{
// month in my_time start from 1
Int64 current_month = t.month - 1;
current_month += months;
Int64 current_year = 0;
Int64 year = static_cast<Int64>(t.year);
if (current_month >= 0)
{
current_year = current_month / 12;
current_month = current_month % 12;
year += current_year;
}
else
{
current_year = (-current_month) / 12;
if ((-current_month) % 12 != 0)
current_year++;
current_month += current_year * 12;
year -= current_year;
}
if (year < 0 || year > 9999)
{
throw Exception("datetime overflow");
}
else if (year == 0)
{
t.year = 0;
t.month = 0;
t.day = 0;
return;
}
t.year = year;
static const int day_num_in_month[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
static const int day_num_in_month_leap_year[] = {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
int max_day = 0;
if (t.year % 400 == 0 || (t.year % 100 != 0 && t.year % 4 == 0))
max_day = day_num_in_month_leap_year[current_month];
else
max_day = day_num_in_month[current_month];
t.month = current_month + 1;
t.day = t.day > max_day ? max_day : t.day;
}

MyDateTimeFormatter::MyDateTimeFormatter(const String & layout)
{
bool in_pattern_match = false;
Expand Down
6 changes: 6 additions & 0 deletions dbms/src/Common/MyTime.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ namespace DB
{
struct MyTimeBase
{
static constexpr Int64 SECOND_IN_ONE_DAY = 86400;

// copied from https://github.com/pingcap/tidb/blob/master/types/time.go
// Core time bit fields.
static const UInt64 YEAR_BIT_FIELD_OFFSET = 50, YEAR_BIT_FIELD_WIDTH = 14;
Expand Down Expand Up @@ -223,4 +225,8 @@ inline UInt8 getLastDay(UInt16 year, UInt8 month)
return last_day;
}

UInt64 addSeconds(UInt64 t, Int64 delta);
void addDays(MyDateTime & t, Int64 days);
void addMonths(MyDateTime & t, Int64 months);

} // namespace DB
Loading

0 comments on commit 0d51eec

Please sign in to comment.