flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-09 05:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T308, using an optimized (faster) function for YYYYmmdd string parsing

Browse Source 
Ref T309, found that QDateTime::fromString returns a QDateTime object with local timestamp. Using a optimized version returns UTC objects now.

- The bug was found writing a unit test for Ref T308
- Slack: https://swift-project.slack.com/archives/G7GD2UP9C/p1534848725000100
This commit is contained in:
Klaus Basan
2018-08-21 15:19:16 +02:00
parent d3c3fe2566
commit 183280fa75
13 changed files with 167 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackmisc/db/artifact.cpp
View File

@@ -229,8 +229,8 @@ namespace BlackMisc
return v;
}
const QString versionTimestampString = BlackMisc::digitOnlyString(ts1Match.captured(0));
const QDateTime versionTimestamp = QDateTime::fromString(versionTimestampString, "yyyyMMddHHmmss");
const QString versionTimestampString = digitOnlyString(ts1Match.captured(0));
const QDateTime versionTimestamp = fromStringUtc(versionTimestampString, "yyyyMMddHHmmss");
const QString lastSegment = QString::number(CBuildConfig::buildTimestampAsVersionSegment(versionTimestamp));
v += lastSegment;
@@ -262,7 +262,7 @@ namespace BlackMisc
{
// yyyyMMddHHmmss (14): offset is 2010xxxxx
if (seg.length() <= 13) { return seg; }
const int fs = CBuildConfig::buildTimestampAsVersionSegment(QDateTime::fromString(seg, "yyyyMMddHHmmss"));
const int fs = CBuildConfig::buildTimestampAsVersionSegment(fromStringUtc(seg, "yyyyMMddHHmmss"));
return QString::number(fs);
}
} // ns

4
src/blackmisc/json.cpp
View File

@@ -76,7 +76,7 @@ const QJsonValue &operator >>(const QJsonValue &json, bool &value)
const QJsonValue &operator >>(const QJsonValue &json, QDateTime &value)
{
value = QDateTime::fromString(json.toString());
value = fromStringUtc(json.toString());
return json;
}
@@ -150,7 +150,7 @@ QJsonValueRef operator >>(QJsonValueRef json, bool &value)
QJsonValueRef operator >>(QJsonValueRef json, QDateTime &value)
{
value = QDateTime::fromString(json.toString());
value = fromStringUtc(json.toString());
return json;
}

2
src/blackmisc/simulation/fscommon/vpilotrulesreader.cpp
View File

@@ -247,7 +247,7 @@ namespace BlackMisc
// "2/1/2014 12:00:00 AM", "5/26/2014 2:00:00 PM"
const QString updated = attributes.namedItem("UpdatedOn").nodeValue();
QDateTime qt = QDateTime::fromString(updated, "M/d/yyyy h:mm:ss AP");
QDateTime qt = fromStringUtc(updated, "M/d/yyyy h:mm:ss AP");
qint64 updatedTimestamp = qt.toMSecsSinceEpoch();
int rulesSize = rules.size();

72
src/blackmisc/stringutils.cpp
View File

@@ -17,6 +17,14 @@
namespace BlackMisc
{
QString removeDateTimeSeparators(const QString &s)
{
return removeChars(s, [](QChar c)
{
return c == ' ' || c == ':' || c == '_' || c == '-' || c == '.';
});
}
QList<QStringRef> splitLinesRefs(const QString &s)
{
return splitStringRefs(s, [](QChar c) { return c == '\n' || c == '\r'; });
@@ -251,6 +259,20 @@ namespace BlackMisc
return removeChars(name.toUpper(), [](QChar c) { return !c.isUpper(); });
}
QDateTime fromStringUtc(const QString &dateTimeString, const QString &format)
{
QDateTime dt = QDateTime::fromString(dateTimeString, format);
dt.setUtcOffset(0);
return dt;
}
QDateTime fromStringUtc(const QString &dateTimeString, Qt::DateFormat format)
{
QDateTime dt = QDateTime::fromString(dateTimeString, format);
dt.setUtcOffset(0);
return dt;
}
QDateTime parseMultipleDateTimeFormats(const QString &dateTimeString)
{
if (dateTimeString.isEmpty()) { return QDateTime(); }
@@ -259,47 +281,44 @@ namespace BlackMisc
// 2017 0301 124421 321
if (dateTimeString.length() == 17)
{
return QDateTime::fromString(dateTimeString, "yyyyMMddHHmmsszzz");
return fromStringUtc(dateTimeString, "yyyyMMddHHmmsszzz");
}
if (dateTimeString.length() == 14)
{
return QDateTime::fromString(dateTimeString, "yyyyMMddHHmmss");
return fromStringUtc(dateTimeString, "yyyyMMddHHmmss");
}
if (dateTimeString.length() == 12)
{
return QDateTime::fromString(dateTimeString, "yyyyMMddHHmm");
return fromStringUtc(dateTimeString, "yyyyMMddHHmm");
}
if (dateTimeString.length() == 8)
{
return QDateTime::fromString(dateTimeString, "yyyyMMdd");
return fromStringUtc(dateTimeString, "yyyyMMdd");
}
return QDateTime();
}
// remove simple separators and check if digits only again
const QString simpleSeparatorsRemoved = removeChars(dateTimeString, [](QChar c)
{
return c == ' ' || c == ':' || c == '_' || c == '-';
});
const QString simpleSeparatorsRemoved = removeDateTimeSeparators(dateTimeString);
if (isDigitsOnlyString(simpleSeparatorsRemoved))
{
return parseMultipleDateTimeFormats(simpleSeparatorsRemoved);
}
// stupid trial and error
QDateTime ts = QDateTime::fromString(dateTimeString, Qt::ISODateWithMs);
QDateTime ts = fromStringUtc(dateTimeString, Qt::ISODateWithMs);
if (ts.isValid()) return ts;
ts = QDateTime::fromString(dateTimeString, Qt::ISODate);
ts = fromStringUtc(dateTimeString, Qt::ISODate);
if (ts.isValid()) return ts;
ts = QDateTime::fromString(dateTimeString, Qt::TextDate);
ts = fromStringUtc(dateTimeString, Qt::TextDate);
if (ts.isValid()) return ts;
ts = QDateTime::fromString(dateTimeString, Qt::DefaultLocaleLongDate);
ts = fromStringUtc(dateTimeString, Qt::DefaultLocaleLongDate);
if (ts.isValid()) return ts;
ts = QDateTime::fromString(dateTimeString, Qt::DefaultLocaleShortDate);
ts = fromStringUtc(dateTimeString, Qt::DefaultLocaleShortDate);
if (ts.isValid()) return ts;
// SystemLocaleShortDate,
@@ -307,6 +326,31 @@ namespace BlackMisc
return QDateTime();
}
QDateTime parseDateTimeStringOptimized(const QString &dateTimeString)
{
// yyyyMMddHHmmsszzz
// 01234567890123456
int year(dateTimeString.leftRef(4).toInt());
int month(dateTimeString.midRef(4, 2).toInt());
int day(dateTimeString.midRef(6, 2).toInt());
QDate date;
date.setDate(year, month, day);
QDateTime dt;
dt.setOffsetFromUtc(0);
dt.setDate(date);
if (dateTimeString.length() < 12) { return dt; }
QTime t;
const int hour(dateTimeString.midRef(8, 2).toInt());
const int minute(dateTimeString.midRef(10, 2).toInt());
const int second(dateTimeString.length() < 14 ? 0 : dateTimeString.midRef(12, 2).toInt());
const int ms(dateTimeString.length() < 17 ? 0 : dateTimeString.rightRef(3).toInt());
t.setHMS(hour, minute, second, ms);
dt.setTime(t);
return dt;
}
QString dotToLocaleDecimalPoint(QString &input)
{
return input.replace('.', QLocale::system().decimalPoint());
@@ -343,7 +387,7 @@ namespace BlackMisc
QString withQUestionMark(const QString &question)
{
if (question.endsWith("?")) { return question; }
return question + "?";
return question % QStringLiteral("?");
}
} // ns

17
src/blackmisc/stringutils.h
View File

@@ -42,6 +42,9 @@ namespace BlackMisc
return result;
}
//! Remove the typical separators such as "-", " "
BLACKMISC_EXPORT QString removeDateTimeSeparators(const QString &s);
//! True if any character in the string matches the given predicate.
template <class F> bool containsChar(const QString &s, F predicate)
{
@@ -192,10 +195,24 @@ namespace BlackMisc
//! Add a question mark at the end if not existing
BLACKMISC_EXPORT QString withQUestionMark(const QString &question);
//! Same as QDateTime::fromString but QDateTime will be set to UTC
//! \remark potentially slow, so only to be used when format is unknown
BLACKMISC_EXPORT QDateTime fromStringUtc(const QString &dateTimeString, const QString &format);
//! Same as QDateTime::fromString but QDateTime will be set to UTC
//! \remark potentially slow, so only to be used when format is unknown
BLACKMISC_EXPORT QDateTime fromStringUtc(const QString &dateTimeString, Qt::DateFormat format = Qt::TextDate);
//! Parse multiple date time formats
//! \remark potentially slow, so only to be used when format is unknown
//! \remark TZ is UTC
BLACKMISC_EXPORT QDateTime parseMultipleDateTimeFormats(const QString &dateTimeString);
//! Parse yyyyMMddHHmmsszzz strings optimized
//! \remark string needs to be cleaned up and containing only numbers
//! \remark TZ is UTC
BLACKMISC_EXPORT QDateTime parseDateTimeStringOptimized(const QString &dateTimeString);
namespace Mixin
{
/*!

29
src/blackmisc/timestampbased.cpp
View File

@@ -9,6 +9,7 @@
#include "blackmisc/comparefunctions.h"
#include "blackmisc/timestampbased.h"
#include "blackmisc/stringutils.h"
#include "blackmisc/variant.h"
#include "blackmisc/verify.h"
@@ -45,30 +46,8 @@ namespace BlackMisc
// 0123 45 67 89 01 23 456
// 1234 56 78 90 12 34 567
QString s(yyyyMMddhhmmsszzz);
s.remove(':').remove(' ').remove('-').remove('.'); // plain vanilla string
int year(s.leftRef(4).toInt());
int month(s.midRef(4, 2).toInt());
int day(s.midRef(6, 2).toInt());
QDate date;
date.setDate(year, month, day);
QDateTime dt;
dt.setOffsetFromUtc(0);
dt.setDate(date);
if (s.length() < 12)
{
this->setUtcTimestamp(dt);
return;
}
QTime t;
int hour(s.midRef(8, 2).toInt());
int minute(s.midRef(10, 2).toInt());
int second(s.length() < 14 ? 0 : s.midRef(12, 2).toInt());
int ms(s.length() < 17 ? 0 : s.rightRef(3).toInt());
t.setHMS(hour, minute, second, ms);
dt.setTime(t);
const QString s(removeDateTimeSeparators(yyyyMMddhhmmsszzz));
const QDateTime dt = parseDateTimeStringOptimized(s);
this->setUtcTimestamp(dt);
}
@@ -242,7 +221,7 @@ namespace BlackMisc
case IndexUtcTimestampFormattedHms:
case IndexUtcTimestampFormattedDhms:
{
const QDateTime dt = QDateTime::fromString(variant.toQString());
const QDateTime dt = fromStringUtc(variant.toQString());
m_timestampMSecsSinceEpoch = dt.toMSecsSinceEpoch();
}
return;

4
src/blackmisc/variant.cpp
View File

@@ -180,7 +180,7 @@ namespace BlackMisc
{
case QVariant::Invalid: throw CJsonException("Type not recognized by QMetaType");
case QVariant::Int: m_v.setValue(value.toInt()); break;
case QVariant::UInt: m_v.setValue<uint>(value.toInt()); break;
case QVariant::UInt: m_v.setValue<uint>(static_cast<uint>(value.toInt())); break;
case QVariant::Bool: m_v.setValue(value.toBool()); break;
case QVariant::Double: m_v.setValue(value.toDouble()); break;
case QVariant::LongLong: m_v.setValue(static_cast<qlonglong>(value.toDouble())); break;
@@ -188,7 +188,7 @@ namespace BlackMisc
case QVariant::String: m_v.setValue(value.toString()); break;
case QVariant::Char: m_v.setValue(value.toString().size() > 0 ? value.toString().at(0) : '\0'); break;
case QVariant::ByteArray: m_v.setValue(value.toString().toLatin1()); break;
case QVariant::DateTime: m_v.setValue(QDateTime::fromString(value.toString(), Qt::ISODate)); break;
case QVariant::DateTime: m_v.setValue(fromStringUtc(value.toString(), Qt::ISODate)); break;
case QVariant::Date: m_v.setValue(QDate::fromString(value.toString(), Qt::ISODate)); break;
case QVariant::Time: m_v.setValue(QTime::fromString(value.toString(), Qt::ISODate)); break;
case QVariant::StringList: m_v.setValue(QVariant(value.toArray().toVariantList()).toStringList()); break;