thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 17:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: OLAP compatibility: fixed error with some date-time attributes [#METRIKASUPP-2361].

Browse Source
This commit is contained in:
Alexey Milovidov 2013-08-20 17:54:08 +00:00
parent a70573aeba
commit ece838895f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dbms/src/Server/OLAPAttributesMetadata.h
View File

@ -76,7 +76,8 @@ struct AttributeDateTimeBase : public IAttributeMetadata
tm.tm_year -= 1900;
tm.tm_isdst = -1;
return mktime(&tm);
time_t res = mktime(&tm);
return res >= 0 ? res : 0;
}
};
@ -94,7 +95,8 @@ struct AttributeDateBase : public IAttributeMetadata
tm.tm_year -= 1900;
tm.tm_isdst = -1;
return mktime(&tm);
time_t res = mktime(&tm);
return res >= 0 ? res : 0;
}
};
@ -109,7 +111,8 @@ struct AttributeTimeBase : public IAttributeMetadata
sscanf(s.c_str(), "%02d:%02d:%02d",
&tm.tm_hour, &tm.tm_min, &tm.tm_sec);
return mktime(&tm);
time_t res = mktime(&tm);
return res >= 0 ? res : 0;
}
};