thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-04 21:42:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into local-date-time-comparison

Browse Source
This commit is contained in:
Alexey Milovidov 2018-07-18 21:39:56 +03:00
commit e41c716427
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/src/IO/ReadHelpers.h
View File

@ -640,7 +640,6 @@ inline void readBinary(String & x, ReadBuffer & buf) { readStringBinary(x, buf);
inline void readBinary(UInt128 & x, ReadBuffer & buf) { readPODBinary(x, buf); } inline void readBinary(UInt128 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
inline void readBinary(UInt256 & x, ReadBuffer & buf) { readPODBinary(x, buf); } inline void readBinary(UInt256 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
inline void readBinary(LocalDate & x, ReadBuffer & buf) { readPODBinary(x, buf); } inline void readBinary(LocalDate & x, ReadBuffer & buf) { readPODBinary(x, buf); }
inline void readBinary(LocalDateTime & x, ReadBuffer & buf) { readPODBinary(x, buf); }
/// Generic methods to read value in text tab-separated format. /// Generic methods to read value in text tab-separated format.

4
libs/libcommon/include/common/LocalDateTime.h
View File

@ -27,7 +27,7 @@ private:
/// For struct to fill 8 bytes and for safe invocation of memcmp. /// For struct to fill 8 bytes and for safe invocation of memcmp.
/// NOTE We may use attribute packed instead, but it is less portable. /// NOTE We may use attribute packed instead, but it is less portable.
unsigned char pad [[maybe_unused]] = 0; unsigned char pad = 0;
void init(time_t time) void init(time_t time)
{ {
@ -88,7 +88,7 @@ public:
init(s.data(), s.size()); init(s.data(), s.size());
} }
LocalDateTime() : m_year(0), m_month(0), m_day(0), m_hour(0), m_minute(0), m_second(0) LocalDateTime() : m_year(0), m_month(0), m_day(0), m_hour(0), m_minute(0), m_second(0), pad(0)
{ {
} }