mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 16:50:48 +00:00
Merge branch 'master' of github.com:yandex/ClickHouse
This commit is contained in:
commit
6033221198
@ -72,14 +72,14 @@ void MergeTreePartInfo::parseMinMaxDatesFromPartName(const String & dir_name, Da
|
||||
|
||||
const auto & date_lut = DateLUT::instance();
|
||||
|
||||
min_date = date_lut.YYYYMMDDToDayNum(min_yyyymmdd);
|
||||
max_date = date_lut.YYYYMMDDToDayNum(max_yyyymmdd);
|
||||
|
||||
DayNum_t min_month = date_lut.toFirstDayNumOfMonth(min_date);
|
||||
DayNum_t max_month = date_lut.toFirstDayNumOfMonth(max_date);
|
||||
|
||||
if (min_month != max_month)
|
||||
throw Exception("Part name " + dir_name + " contains different months", ErrorCodes::BAD_DATA_PART_NAME);
|
||||
|
||||
min_date = date_lut.YYYYMMDDToDayNum(min_yyyymmdd);
|
||||
max_date = date_lut.YYYYMMDDToDayNum(max_yyyymmdd);
|
||||
}
|
||||
|
||||
|
||||
@ -115,5 +115,4 @@ String MergeTreePartInfo::getPartName(DayNum_t left_date, DayNum_t right_date, I
|
||||
return wb.str();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user