hikyuu 2.6.5__py3-none-win_amd64.whl → 2.6.7__py3-none-win_amd64.whl

hikyuu/gui/data/UsePytdxImportToH5Thread.py

@@ -48,6 +48,12 @@ from hikyuu.data.common_mysql import create_database as mysql_create_database
 from hikyuu.data.common_mysql import import_new_holidays as mysql_import_new_holidays
 from hikyuu.data.pytdx_to_mysql import import_index_name as mysql_import_index_name
 from hikyuu.data.pytdx_to_mysql import import_stock_name as mysql_import_stock_name
+
+from hikyuu.data.common_clickhouse import create_database as clickhouse_create_database
+from hikyuu.data.common_clickhouse import import_new_holidays as clickhouse_import_new_holidays
+from hikyuu.data.pytdx_to_clickhouse import import_index_name as clickhouse_import_index_name
+from hikyuu.data.pytdx_to_clickhouse import import_stock_name as clickhouse_import_stock_name
+
 from hikyuu.util.mylog import class_logger
 
 
@@ -140,6 +146,32 @@ class UsePytdxImportToH5Thread(QThread):
         cur_host = 0
 
         # 以下按数据量从大到小依次使用速度从高到低的TDX服务器
+        if self.config.getboolean('ktype', 'min5', fallback=False):
+            start_date = datetime.datetime.strptime(
+                config['ktype']['min5_start_date'], '%Y-%m-%d').date()
+            for market in g_market_list:
+                self.tasks.append(
+                    ImportPytdxToH5(
+                        self.log_queue, self.queue, self.config, market,
+                        '5MIN', self.quotations, use_hosts[cur_host][0],
+                        use_hosts[cur_host][1], dest_dir,
+                        start_date.year * 100000000 +
+                        start_date.month * 1000000 + start_date.day * 10000))
+                cur_host += 1
+
+        if self.config.getboolean('ktype', 'day', fallback=False):
+            start_date = datetime.datetime.strptime(
+                config['ktype']['day_start_date'], '%Y-%m-%d').date()
+            for market in g_market_list:
+                self.tasks.append(
+                    ImportPytdxToH5(
+                        self.log_queue, self.queue, self.config, market, 'DAY',
+                        self.quotations, use_hosts[cur_host][0],
+                        use_hosts[cur_host][1], dest_dir,
+                        start_date.year * 100000000 +
+                        start_date.month * 1000000 + start_date.day * 10000))
+                cur_host += 1
+
         if self.config.getboolean('ktype', 'trans', fallback=False):
             today = datetime.date.today()
             trans_start_date = datetime.datetime.strptime(
@@ -182,32 +214,6 @@ class UsePytdxImportToH5Thread(QThread):
                                         time_max_days))
                 cur_host += 1
 
-        if self.config.getboolean('ktype', 'min5', fallback=False):
-            start_date = datetime.datetime.strptime(
-                config['ktype']['min5_start_date'], '%Y-%m-%d').date()
-            for market in g_market_list:
-                self.tasks.append(
-                    ImportPytdxToH5(
-                        self.log_queue, self.queue, self.config, market,
-                        '5MIN', self.quotations, use_hosts[cur_host][0],
-                        use_hosts[cur_host][1], dest_dir,
-                        start_date.year * 100000000 +
-                        start_date.month * 1000000 + start_date.day * 10000))
-                cur_host += 1
-
-        if self.config.getboolean('ktype', 'day', fallback=False):
-            start_date = datetime.datetime.strptime(
-                config['ktype']['day_start_date'], '%Y-%m-%d').date()
-            for market in g_market_list:
-                self.tasks.append(
-                    ImportPytdxToH5(
-                        self.log_queue, self.queue, self.config, market, 'DAY',
-                        self.quotations, use_hosts[cur_host][0],
-                        use_hosts[cur_host][1], dest_dir,
-                        start_date.year * 100000000 +
-                        start_date.month * 1000000 + start_date.day * 10000))
-                cur_host += 1
-
         if self.config.getboolean('weight', 'enable', fallback=False):
             for market in g_market_list:
                 self.tasks.append(
@@ -265,6 +271,19 @@ class UsePytdxImportToH5Thread(QThread):
             import_new_holidays = mysql_import_new_holidays
             import_index_name = mysql_import_index_name
             import_stock_name = mysql_import_stock_name
+        elif self.config.getboolean('clickhouse', 'enable', fallback=True):
+            db_config = {
+                'username': self.config['clickhouse']['usr'],
+                'password': self.config['clickhouse']['pwd'],
+                'host': self.config['clickhouse']['host'],
+                'port': self.config['clickhouse']['http_port']
+            }
+            import clickhouse_connect
+            connect = clickhouse_connect.get_client(**db_config)
+            create_database = clickhouse_create_database
+            import_new_holidays = clickhouse_import_new_holidays
+            import_index_name = clickhouse_import_index_name
+            import_stock_name = clickhouse_import_stock_name
 
         create_database(connect)
 

hikyuu/gui/data/UseTdxImportToH5Thread.py

@@ -47,6 +47,10 @@ from hikyuu.data.common_mysql import create_database as mysql_create_database
 from hikyuu.data.common_mysql import import_new_holidays as mysql_import_new_holidays
 from hikyuu.data.pytdx_to_mysql import import_index_name as mysql_import_index_name
 from hikyuu.data.pytdx_to_mysql import import_stock_name as mysql_import_stock_name
+from hikyuu.data.common_clickhouse import create_database as clickhouse_create_database
+from hikyuu.data.common_clickhouse import import_new_holidays as clickhouse_import_new_holidays
+from hikyuu.data.pytdx_to_clickhouse import import_index_name as clickhouse_import_index_name
+from hikyuu.data.pytdx_to_clickhouse import import_stock_name as clickhouse_import_stock_name
 from hikyuu.util.mylog import class_logger
 
 
@@ -218,7 +222,7 @@ class UseTdxImportToH5Thread(QThread):
             import_new_holidays = sqlite_import_new_holidays
             import_index_name = sqlite_import_index_name
             import_stock_name = sqlite_import_stock_name
-        else:
+        elif self.config.getboolean('mysql', 'enable', fallback=True):
             db_config = {
                 'user': self.config['mysql']['usr'],
                 'password': self.config['mysql']['pwd'],
@@ -231,6 +235,20 @@ class UseTdxImportToH5Thread(QThread):
             import_index_name = mysql_import_index_name
             import_stock_name = mysql_import_stock_name
 
+        elif self.config.getboolean('clickhouse', 'enable', fallback=True):
+            db_config = {
+                'username': self.config['clickhouse']['usr'],
+                'password': self.config['clickhouse']['pwd'],
+                'host': self.config['clickhouse']['host'],
+                'port': self.config['clickhouse']['http_port']
+            }
+            import clickhouse_connect
+            connect = clickhouse_connect.get_client(**db_config)
+            create_database = clickhouse_create_database
+            import_new_holidays = clickhouse_import_new_holidays
+            import_index_name = clickhouse_import_index_name
+            import_stock_name = clickhouse_import_stock_name
+
         create_database(connect)
 
         pytdx_api = TdxHq_API()

hikyuu/gui/dataserver.py

@@ -7,13 +7,17 @@
 from hikyuu import start_data_server, stop_data_server
 import time
 import sys
+import click
 
-if __name__ == "__main__":
-    data_server_addr = "tcp://0.0.0.0:9201" if len(sys.argv) <= 1 else sys.argv[1]
-    work_num = 2 if len(sys.argv) <= 2 else int(sys.argv[2])
 
+@click.command()
+@click.option('--addr', '-addr', default="tcp://127.0.0.1:9201", help='行情接收处理服务地址')
+@click.option('--work_num', '-n', default=2, type=int, help='行情接收处理线程数')
+@click.option('--save', '-save', default=False, type=bool, help='保存行情数据(仅支持clickhouse)')
+@click.option('--buf', '-buf', default=False, type=bool, help='缓存行情数据')
+def main(addr, work_num, save, buf):
     try:
-        start_data_server(data_server_addr, work_num)
+        start_data_server(addr, work_num, save_tick=save, buf_tick=buf)
 
         while True:
             try:
@@ -23,3 +27,7 @@ if __name__ == "__main__":
 
     finally:
         stop_data_server()
+
+
+if __name__ == "__main__":
+    main()

hikyuu/gui/spot_server.py

@@ -29,6 +29,26 @@ def create_fb_spot_record(builder, record):
     name = builder.CreateString(record['name'])
     datetime = builder.CreateString(str(record['datetime']))
 
+    builder.StartVector(8, len(record['bid']), 8)  # 8 字节 = double
+    for value in reversed(record['bid']):  # 必须逆序添加元素
+        builder.PrependFloat64(value)
+    bid = builder.EndVector(len(record['bid']))
+
+    builder.StartVector(8, len(record['bid_amount']), 8)
+    for value in reversed(record['bid_amount']):
+        builder.PrependFloat64(value)
+    bid_amount = builder.EndVector(len(record['bid_amount']))
+
+    builder.StartVector(8, len(record['ask']), 8)
+    for value in reversed(record['ask']):
+        builder.PrependFloat64(value)
+    ask = builder.EndVector(len(record['ask']))
+
+    builder.StartVector(8, len(record['ask_amount']), 8)
+    for value in reversed(record['ask_amount']):
+        builder.PrependFloat64(value)
+    ask_amount = builder.EndVector(len(record['ask_amount']))
+
     fb.SpotStart(builder)
     fb.SpotAddMarket(builder, market)
     fb.SpotAddCode(builder, code)
@@ -41,29 +61,15 @@ def create_fb_spot_record(builder, record):
     fb.SpotAddClose(builder, record['close'])
     fb.SpotAddAmount(builder, record['amount'])
     fb.SpotAddVolume(builder, record['volume'])
-    fb.SpotAddBid1(builder, record['bid1'])
-    fb.SpotAddBid1Amount(builder, record['bid1_amount'])
-    fb.SpotAddBid2(builder, record['bid2'])
-    fb.SpotAddBid2Amount(builder, record['bid2_amount'])
-    fb.SpotAddBid3(builder, record['bid3'])
-    fb.SpotAddBid3Amount(builder, record['bid3_amount'])
-    fb.SpotAddBid4(builder, record['bid4'])
-    fb.SpotAddBid4Amount(builder, record['bid4_amount'])
-    fb.SpotAddBid5(builder, record['bid5'])
-    fb.SpotAddBid5Amount(builder, record['bid5_amount'])
-    fb.SpotAddAsk1(builder, record['ask1'])
-    fb.SpotAddAsk1Amount(builder, record['ask1_amount'])
-    fb.SpotAddAsk2(builder, record['ask2'])
-    fb.SpotAddAsk2Amount(builder, record['ask2_amount'])
-    fb.SpotAddAsk3(builder, record['ask3'])
-    fb.SpotAddAsk3Amount(builder, record['ask3_amount'])
-    fb.SpotAddAsk4(builder, record['ask4'])
-    fb.SpotAddAsk4Amount(builder, record['ask4_amount'])
-    fb.SpotAddAsk5(builder, record['ask5'])
-    fb.SpotAddAsk5Amount(builder, record['ask5_amount'])
+
+    fb.SpotAddBid(builder, bid)
+    fb.SpotAddBidAmount(builder, bid_amount)
+    fb.SpotAddAsk(builder, ask)
+    fb.SpotAddAskAmount(builder, ask_amount)
     return fb.SpotEnd(builder)
 
 
+@hku_catch(trace=True)
 def create_fb_spot(records):
     builder = flatbuffers.Builder(0)
     end = None
@@ -100,26 +106,10 @@ def print_spot(spot):
     print(spot.Close())
     print(spot.Amount())
     print(spot.volume())
-    print(spot.Bid1())
-    print(spot.Bid1Amount())
-    print(spot.Bid2())
-    print(spot.Bid2Amount())
-    print(spot.Bid3())
-    print(spot.Bid3Amount())
-    print(spot.Bid4())
-    print(spot.Bid4Amount())
-    print(spot.Bid5())
-    print(spot.Bid5Amount())
-    print(spot.Ask1())
-    print(spot.Ask1Amount())
-    print(spot.Ask2())
-    print(spot.Ask2Amount())
-    print(spot.Ask3())
-    print(spot.Ask3Amount())
-    print(spot.Ask4())
-    print(spot.Ask4Amount())
-    print(spot.Ask5())
-    print(spot.Ask5Amount())
+    print(spot.Bid())
+    print(spot.BidAmount())
+    print(spot.Ask())
+    print(spot.AskAmount())
 
 
 def print_spot_list(buf):

hikyuu/gui/start_qmt.py

@@ -4,13 +4,14 @@
 
 from hikyuu.fetcher.stock.zh_stock_a_qmt import parse_one_result_qmt, get_spot
 from hikyuu.gui.spot_server import release_nng_senders, start_send_spot, end_send_spot, send_spot
+from hikyuu.util import hku_info
 
 
 def callback(datas):
     records = []
     for stock_code, data in datas.items():
         records.append(parse_one_result_qmt(stock_code, data))
-    # print(len(records))
+    hku_info(f"接收: {len(records)}")
 
     if records:
         start_send_spot()
@@ -38,6 +39,10 @@ if __name__ == "__main__":
     hku_param["datadir"] = ini.get('hikyuu', 'datadir')
     if ini.has_option('hikyuu', 'quotation_server'):
         hku_param["quotation_server"] = ini['hikyuu']['quotation_server']
+    if ini.has_option('hikyuu', 'plugindir'):
+        hku_param["plugindir"] = ini.get('hikyuu', 'plugindir')
+    else:
+        hku_param["plugindir"] = plugin_path
 
     # 不加载历史财务信息及权息数据
     hku_param["load_history_finance"] = False
@@ -75,7 +80,7 @@ if __name__ == "__main__":
     hku_info("waiting all data loaded ...")
     while not sm.data_ready:
         import time
-        time.sleep(100)
+        time.sleep(1)
 
     stk_list = [s for s in sm if s.valid and s.type in (
         constant.STOCKTYPE_A, constant.STOCKTYPE_INDEX, constant.STOCKTYPE_ETF,
@@ -84,7 +89,19 @@ if __name__ == "__main__":
     hku_info("start xtquant")
     code_list = [f'{s.code}.{s.market}' for s in stk_list]
     from xtquant import xtdata
-    xtdata.subscribe_whole_quote(code_list, callback)
+    import time
+    # xtdata.subscribe_whole_quote(['SH', 'SZ', 'BJ'], callback)
+    batch_size = 250
+    n = len(code_list) // batch_size
+    for i in range(n):
+        codes = code_list[i * batch_size: (i + 1) * batch_size]
+        v = xtdata.subscribe_whole_quote(codes, callback)
+        hku_info_if(v < 0, "订阅失败")
+        time.sleep(0.5)
+    codes = code_list[n * batch_size:]
+    if codes:
+        v = xtdata.subscribe_whole_quote(codes, callback)
+        hku_info_if(v < 0, "订阅失败")
 
     # 每日 9:30 时，主动读取行情一次，以便 hikyuu 生成当日首个分钟线
     while True:

hikyuu/hub.pyi

@@ -28,11 +28,11 @@ import sys as sys
 import typing
 __all__: list = ['add_remote_hub', 'add_local_hub', 'update_hub', 'remove_hub', 'build_hub', 'help_part', 'get_part', 'get_part_list', 'get_hub_path', 'get_part_info', 'get_part_module', 'print_part_info', 'get_hub_name_list', 'get_part_name_list', 'get_current_hub', 'search_part']
 class ConfigModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x254a51cdc10; ConfigModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x2b0b2e13af0; ConfigModel>
     __table__: typing.ClassVar[sqlalchemy.sql.schema.Table]  # value = Table('hub_config', MetaData(), Column('id', Integer(), table=<hub_config>, primary_key=True, nullable=False, default=Sequence('config_id_seq', metadata=MetaData())), Column('key', String(), table=<hub_config>), Column('value', String(), table=<hub_config>), schema=None)
     __table_args__: typing.ClassVar[tuple]  # value = (UniqueConstraint(Column('key', String(), table=<hub_config>)))
     __tablename__: typing.ClassVar[str] = 'hub_config'
-    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 254a521fbd0>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 2b0b2e14ef0>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
@@ -109,11 +109,11 @@ class HubManager:
     def print_part_info(self, name):
         ...
 class HubModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x254a5259280; HubModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x2b0b2e13c70; HubModel>
     __table__: typing.ClassVar[sqlalchemy.sql.schema.Table]  # value = Table('hub_repo', MetaData(), Column('id', Integer(), table=<hub_repo>, primary_key=True, nullable=False, default=Sequence('remote_id_seq', metadata=MetaData())), Column('name', String(), table=<hub_repo>), Column('hub_type', String(), table=<hub_repo>), Column('local_base', String(), table=<hub_repo>), Column('local', String(), table=<hub_repo>), Column('url', String(), table=<hub_repo>), Column('branch', String(), table=<hub_repo>), schema=None)
     __table_args__: typing.ClassVar[tuple]  # value = (UniqueConstraint(Column('name', String(), table=<hub_repo>)))
     __tablename__: typing.ClassVar[str] = 'hub_repo'
-    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 254a5254630>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 2b0b2e429a0>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
@@ -146,11 +146,11 @@ class ModuleConflictError(Exception):
     def __str__(self):
         ...
 class PartModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x254a52671f0; PartModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x2b0b2e507c0; PartModel>
     __table__: typing.ClassVar[sqlalchemy.sql.schema.Table]  # value = Table('hub_part', MetaData(), Column('id', Integer(), table=<hub_part>, primary_key=True, nullable=False, default=Sequence('part_id_seq', metadata=MetaData())), Column('hub_name', String(), table=<hub_part>), Column('part', String(), table=<hub_part>), Column('name', String(), table=<hub_part>), Column('author', String(), table=<hub_part>), Column('version', String(), table=<hub_part>), Column('doc', String(), table=<hub_part>), Column('module_name', String(), table=<hub_part>), Column('label', String(), table=<hub_part>), schema=None)
     __table_args__: typing.ClassVar[tuple]  # value = (UniqueConstraint(Column('name', String(), table=<hub_part>)))
     __tablename__: typing.ClassVar[str] = 'hub_part'
-    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 254a52660e0>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 2b0b2e52400>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.

hikyuu/include/hikyuu/DataType.h

@@ -39,6 +39,8 @@
 #include "utilities/Null.h"
 #include "utilities/arithmetic.h"
 #include "utilities/SpendTimer.h"
+#include "utilities/config.h"
+#include "lang.h"
 
 #if HKU_SUPPORT_SERIALIZATION
 #include <boost/serialization/nvp.hpp>

hikyuu/include/hikyuu/KQuery.h

@@ -26,56 +26,50 @@ public:
         INVALID = 2
     };
 
-    /// 查询K线类型：日线/周线等
-    /*enum KType {
-        //notes: 如添加新类型，请注意按大小顺序添加，否则可能出错
-        MIN      = 0,  ///<1分钟线
-        MIN5     = 1,  ///<5分钟线
-        MIN15    = 2,  ///<15分钟线
-        MIN30    = 3,  ///<30分钟线
-        MIN60    = 4,  ///<60分钟线
-        DAY      = 5,  ///<日线
-        WEEK     = 6,  ///<周线
-        MONTH    = 7,  ///<月线
-        QUARTER  = 8,  ///<季线
-        HALFYEAR = 9,  ///<半年线
-        YEAR     = 10, ///<年线
-
-        //BTC扩展
-        MIN3     = 11,  ///<3分钟线
-        HOUR2    = 12,  ///<2小时线
-        HOUR4    = 13,  ///<4小时线
-        HOUR6    = 14,  ///<6小时线
-        HOUR12   = 15,  ///<12小时线
-        INVALID_KTYPE = 16
-    };*/
     typedef string KType;
 
+    // 基础K线类型
     static const string MIN;
     static const string MIN5;
     static const string MIN15;
     static const string MIN30;
     static const string MIN60;
+    static const string HOUR2;
     static const string DAY;
     static const string WEEK;
     static const string MONTH;
     static const string QUARTER;
     static const string HALFYEAR;
     static const string YEAR;
+
+    // 扩展K线类型
+    static const string DAY3;
+    static const string DAY5;
+    static const string DAY7;
     static const string MIN3;
-    static const string HOUR2;
     static const string HOUR4;
     static const string HOUR6;
     static const string HOUR12;
     // static const string INVALID_KTYPE;
 
+    /** 判断指定的K线类型是否有效 */
+    static bool isValidKType(const string& ktype);
+
+    /** 判断是否为有效 ktype */
+    static bool isBaseKType(const string& ktype);
+
+    /** 判断是否为扩展 ktype */
+    static bool isExtraKType(const string& ktype);
+
     /** 获取所有的 KType */
-    static const vector<KType>& getAllKType();
+    static vector<KType> getBaseKTypeList();
 
-    static int32_t getKTypeInMin(KType);
+    /** 获取所有扩展 KType */
+    static vector<KType> getExtraKTypeList();
 
-    /** 判断是否为有效 ktype */
-    static bool isKType(const string& ktype);
+    static int32_t getKTypeInMin(const KType& ktype);
+
+    static int32_t getBaseKTypeInMin(const KType& ktype);
 
     /**
      * 复权类型

hikyuu/include/hikyuu/MarketInfo.h

@@ -41,7 +41,7 @@ public:
     MarketInfo& operator=(const MarketInfo&) = default;
 
     MarketInfo(MarketInfo&&);
-    MarketInfo& operator=(MarketInfo&&);
+    MarketInfo& operator=(MarketInfo&&) noexcept;
 
     /** 获取市场简称 */
     const string& market() const {

hikyuu/include/hikyuu/Stock.h

@@ -230,10 +230,10 @@ public:
      * 将K线数据做自身缓存
      *  @note 一般不主动调用，谨慎
      */
-    void loadKDataToBuffer(KQuery::KType);
+    void loadKDataToBuffer(KQuery::KType) const;
 
     /** 释放对应的K线缓存 */
-    void releaseKDataBuffer(KQuery::KType);
+    void releaseKDataBuffer(KQuery::KType) const;
 
     /** 指定类型的K线数据是否被缓存 */
     bool isBuffer(KQuery::KType) const;
@@ -258,12 +258,19 @@ private:
     bool _getIndexRangeByIndex(const KQuery&, size_t& out_start, size_t& out_end) const;
 
     // 以下函数属于基础操作添加了读锁
-    size_t _getCountFromBuffer(KQuery::KType ktype) const;
+    size_t _getCountFromBuffer(const KQuery::KType& ktype) const;
     KRecord _getKRecordFromBuffer(size_t pos, const KQuery::KType& ktype) const;
     KRecordList _getKRecordListFromBuffer(size_t start_ix, size_t end_ix,
                                           KQuery::KType ktype) const;
     bool _getIndexRangeByDateFromBuffer(const KQuery&, size_t&, size_t&) const;
 
+    KRecordList _getKRecordList(const KQuery& query) const;
+
+    // 仅供 StockManager 初始化时调用
+    void setPreload(vector<KQuery::KType>& preload_ktypes);
+
+    bool isPreload(KQuery::KType ktype) const;
+
 private:
     struct HKU_API Data;
     shared_ptr<Data> m_data;
@@ -295,6 +302,7 @@ struct HKU_API Stock::Data {
     double m_minTradeNumber;
     double m_maxTradeNumber;
 
+    std::unordered_set<string> m_ktype_preload;  // 记录当前证券的K线数据是否需要预加载
     unordered_map<string, KRecordList*> pKData;
     unordered_map<string, std::shared_mutex*> pMutex;
 
@@ -338,6 +346,10 @@ inline bool Stock::operator!=(const Stock& stock) const {
     return !(*this == stock);
 }
 
+inline bool Stock::isNull() const {
+    return !m_data || !m_kdataDriver;
+}
+
 }  // namespace hku
 
 namespace std {

hikyuu/include/hikyuu/StockManager.h

@@ -22,8 +22,6 @@
 
 namespace hku {
 
-typedef vector<string> MarketList;
-
 /**
  * 证券信息统一管理类
  * @ingroup StockManage
@@ -126,8 +124,11 @@ public:
      */
     StockTypeInfo getStockTypeInfo(uint32_t type) const;
 
+    /** 获取所有证券类型信息 */
+    vector<StockTypeInfo> getStockTypeInfoList() const;
+
     /** 获取市场简称列表 */
-    MarketList getAllMarket() const;
+    StringList getAllMarket() const;
 
     /**
      * 获取预定义的板块
@@ -253,6 +254,9 @@ public:
     template <typename PluginInterfaceT>
     PluginInterfaceT* getPlugin(const std::string& pluginname) noexcept;
 
+    /** 设置多语言支持路径（仅在初始化之前有效） */
+    void setLanguagePath(const std::string& path);
+
 public:
     typedef StockMapIterator const_iterator;
     const_iterator begin() const {
@@ -332,6 +336,7 @@ private:
     std::unique_ptr<ThreadPool> m_load_tg;  // 异步数据加载辅助线程组
 
     PluginManager m_plugin_manager;
+    std::string m_i18n_path;
 };
 
 inline size_t StockManager::size() const {
@@ -396,6 +401,10 @@ inline PluginInterfaceT* StockManager::getPlugin(const std::string& pluginname)
     return m_plugin_manager.getPlugin<PluginInterfaceT>(pluginname);
 }
 
+inline void StockManager::setLanguagePath(const std::string& path) {
+    m_i18n_path = path;
+}
+
 }  // namespace hku
 
 #endif /* STOCKMANAGER_H_ */

hikyuu/include/hikyuu/StockTypeInfo.h

@@ -38,6 +38,12 @@ public:
     StockTypeInfo();
     StockTypeInfo(uint32_t, const string&, price_t, price_t, int, double, double);
 
+    StockTypeInfo(const StockTypeInfo&) = default;
+    StockTypeInfo& operator=(const StockTypeInfo&) = default;
+
+    StockTypeInfo(StockTypeInfo&&);
+    StockTypeInfo& operator=(StockTypeInfo&&) noexcept;
+
     /** 获取证券类型 */
     uint32_t type() const {
         return m_type;

hikyuu/include/hikyuu/TransRecord.h

@@ -19,19 +19,13 @@ namespace hku {
  */
 class HKU_API TransRecord {
 public:
-    enum DIRECT {
-        BUY = 0,    /**< 买盘 */
-        SELL = 1,   /**< 卖盘 */
-        AUCTION = 2 /**< 集合竞价 */
-    };
-
     Datetime datetime;  // 时间
     price_t price;      // 成交均价
     price_t vol;        // 成交量
-    DIRECT direct;      // 买卖盘性质：1--sell 0--buy 2--集合竞价
+    int direct;         // 买卖盘性质：1--sell 0--buy 2--集合竞价 其他未知
 
     TransRecord();
-    TransRecord(const Datetime& datetime, price_t price, price_t vol, DIRECT);
+    TransRecord(const Datetime& datetime, price_t price, price_t vol, int direct);
 
     bool isValid() const;
 };

hikyuu/include/hikyuu/data_driver/kdata/mysql/KRecordTable.h

@@ -68,6 +68,7 @@ public:
             m_low = rhs.m_low;
             m_close = rhs.m_close;
             m_amount = rhs.m_amount;
+            m_count = rhs.m_count;
         }
         return *this;
     }

hikyuu/include/hikyuu/doc.h

@@ -156,6 +156,10 @@
  *
  * @defgroup ThreadPool Thread Pool 线程池
  * @ingroup Utilities
+ *
+ * @defgroup View View数据视图
+ * 数据视图, 属于用于显示、打印数据
+ * @ingroup View
  */
 
 /**

hikyuu/include/hikyuu/global/GlobalSpotAgent.h

@@ -26,7 +26,7 @@ void HKU_API startSpotAgent(bool print = true, size_t worker_num = 1,
  */
 void HKU_API stopSpotAgent();
 
-SpotAgent* getGlobalSpotAgent();
+HKU_API SpotAgent* getGlobalSpotAgent();
 
 void HKU_API releaseGlobalSpotAgent();