test/hikyuu2
1
0
Fork 0
mirror of https://gitee.com/fasiondog/hikyuu.git synced 2024-11-30 19:08:48 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
fasiondog 2020-10-13 01:57:48 +08:00
parent 2b673f070b
commit 1b9d9081c9
2 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
hikyuu_cpp/hikyuu/data_driver/kdata/mysql/MySQLKDataDriver.cpp
View File

@ -46,7 +46,8 @@ KRecordList MySQLKDataDriver::getKRecordList(const string& market, const string&
if (query.queryType() == KQuery::INDEX) {
result = _getKRecordList(market, code, query.kType(), query.start(), query.end());
} else {
HKU_INFO("Query by date are not supported!");
result =
_getKRecordList(market, code, query.kType(), query.startDatetime(), query.endDatetime());
}
return result;
}
@ -54,15 +55,8 @@ KRecordList MySQLKDataDriver::getKRecordList(const string& market, const string&
KRecordList MySQLKDataDriver::_getKRecordList(const string& market, const string& code,
KQuery::KType kType, size_t start_ix, size_t end_ix) {
KRecordList result;
if (!m_pool) {
HKU_ERROR("The connection pool is not initialized.");
if (start_ix >= end_ix)
return result;
};
if (start_ix >= end_ix) {
HKU_ERROR("start_ix({}) >= endix({})", start_ix, end_ix);
return result;
}
auto con = m_pool->getConnect();
if (!con) {
@ -95,13 +89,46 @@ KRecordList MySQLKDataDriver::_getKRecordList(const string& market, const string
return result;
}
KRecordList MySQLKDataDriver::_getKRecordList(const string& market, const string& code,
KQuery::KType ktype, Datetime start_date,
Datetime end_date) {
KRecordList result;
if (start_date >= end_date)
return result;
auto con = m_pool->getConnect();
if (!con) {
HKU_ERROR("The acquisition connection failed.");
return result;
};
KRecordTable r(market, code, ktype);
SQLStatementPtr st =
con->getStatement(fmt::format("{} order by date where date >= {} and date < {}",
r.getSelectSQL(), start_date.number(), end_date.number()));
st->exec();
while (st->moveNext()) {
KRecordTable record;
try {
record.load(st);
KRecord k;
k.datetime = record.date();
k.openPrice = record.open();
k.highPrice = record.high();
k.lowPrice = record.low();
k.closePrice = record.close();
k.transAmount = record.amount();
k.transCount = record.count();
result.push_back(k);
} catch (...) {
HKU_ERROR("Failed get record: {}", record.str());
}
}
return result;
}
size_t MySQLKDataDriver::getCount(const string& market, const string& code, KQuery::KType kType) {
size_t result = 0;
if (!m_pool) {
HKU_ERROR("The connection pool is not initialized.");
return result;
}
auto con = m_pool->getConnect();
if (!con) {
HKU_ERROR("The acquisition connection failed.");
@ -136,11 +163,6 @@ bool MySQLKDataDriver::getIndexRangeByDate(const string& market, const string& c
return false;
}
if (!m_pool) {
HKU_ERROR("The connection pool is not initialized.");
return false;
}
auto con = m_pool->getConnect();
if (!con) {
HKU_ERROR("The acquisition connection failed.");

2
hikyuu_cpp/hikyuu/data_driver/kdata/mysql/MySQLKDataDriver.h
View File

@ -45,6 +45,8 @@ private:
string _getTableName(const string& market, const string& code, KQuery::KType ktype);
KRecordList _getKRecordList(const string& market, const string& code, KQuery::KType kType,
size_t start_ix, size_t end_ix);
KRecordList _getKRecordList(const string& market, const string& code, KQuery::KType ktype,
Datetime start_date, Datetime end_date);
private:
ConnectPool<MySQLConnect>* m_pool;