wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1344 from satherton/fix-parsetime-linux 

Stopped using %z to parse timezone offset with strptime()...
This commit is contained in:
A.J. Beamon 2019-03-22 11:04:04 -07:00 committed by GitHub
parent 91019712dd 76e6a3f56d
commit fd30969139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fdbclient/BackupAgentBase.actor.cpp
View File

@ -37,17 +37,24 @@ std::string BackupAgentBase::formatTime(int64_t epochs) {
int64_t BackupAgentBase::parseTime(std::string timestamp) {
struct tm out;
std::string timeOnly = timestamp.substr(0, 19);
// TODO: Use std::get_time implementation for all platforms once supported
// It would be nice to read the timezone using %z, but it seems not all get_time()
// or strptime() implementations handle it correctly in all environments so we
// will read the date and time independent of timezone at first and then adjust it.
#ifdef _WIN32
// TODO: Use this implementation for all platforms
// Windows does not support strptime, so we will use std::get_time
// Unfortunately, std::get_time() does not support %z (as strptime does) so we must read
// the date/time part separately from the timezone and then adjust the epoch seconds result.
std::istringstream s(timestamp.substr(0, 19));
std::istringstream s(timeOnly);
s.imbue(std::locale(setlocale(LC_TIME, nullptr)));
s >> std::get_time(&out, "%Y/%m/%d.%H:%M:%S");
if (s.fail()) {
return -1;
}
#else
if(strptime(timeOnly.c_str(), "%Y/%m/%d.%H:%M:%S", &out) == nullptr) {
return -1;
}
#endif
// Read timezone offset in +/-HHMM format then convert to seconds
int tzHH;
@ -83,13 +90,6 @@ int64_t BackupAgentBase::parseTime(std::string timestamp) {
// Add back the difference between the local timezone assumed by mktime() and the intended timezone from the input string
ts += (localTZOffset - tzOffset);
return ts;
#else
// strptime is able to read a timezone offset from the input string (which is required) and process it correctly.
if(strptime(timestamp.c_str(), "%Y/%m/%d.%H:%M:%S%z", &out) == nullptr) {
return -1;
}
return (int64_t) mktime(&out);
#endif
}
const Key BackupAgentBase::keyFolderId = LiteralStringRef("config_folderid");

7
fdbclient/BackupContainer.actor.cpp
View File

@ -1915,8 +1915,11 @@ TEST_CASE("/backup/containers_list") {
};
TEST_CASE("/backup/time") {
ASSERT(BackupAgentBase::formatTime(BackupAgentBase::parseTime("2019/03/18.17:51:11-0600")) == "2019/03/18.16:51:11-0700");
ASSERT(BackupAgentBase::formatTime(BackupAgentBase::parseTime("2019/03/18.16:51:11-0700")) == "2019/03/18.16:51:11-0700");
// test formatTime()
for(int i = 0; i < 1000; ++i) {
int64_t ts = g_random->randomInt64(0, std::numeric_limits<int32_t>::max());
ASSERT(BackupAgentBase::parseTime(BackupAgentBase::formatTime(ts)) == ts);
}
ASSERT(BackupAgentBase::parseTime("2019/03/18.17:51:11-0600") == BackupAgentBase::parseTime("2019/03/18.16:51:11-0700"));
ASSERT(BackupAgentBase::parseTime("2019/03/31.22:45:07-0700") == BackupAgentBase::parseTime("2019/04/01.03:45:07-0200"));