dolphindb 3.0.39 → 3.0.41

package/docs.d.ts

@@ -32,7 +32,7 @@ export declare class DocsAnalyser {
         @returns  */
     search_completion_items(query: string): {
         keywords: string[];
-        constants: ("DFLT" | "NULL" | "true" | "false" | "pi" | "e" | "SCALAR" | "VECTOR" | "PAIR" | "MATRIX" | "SET" | "DICT" | "TABLE" | "VOID" | "BOOL" | "CHAR" | "SHORT" | "INT" | "INDEX" | "LONG" | "DATE" | "MONTH" | "TIME" | "MINUTE" | "SECOND" | "DATETIME" | "TIMESTAMP" | "NANOTIME" | "NANOTIMESTAMP" | "FLOAT" | "DOUBLE" | "SYMBOL" | "STRING" | "UUID" | "FUNCTIONDEF" | "HANDLE" | "CODE" | "DATASOURCE" | "RESOURCE" | "ANY" | "DICTIONARY" | "DATEHOUR" | "IPADDR" | "INT128" | "BLOB" | "COMPLEX" | "POINT" | "DURATION" | "OBJECT" | "DECIMAL32" | "DECIMAL64" | "DECIMAL128" | "SEQ" | "RANGE" | "HASH" | "VALUE" | "LIST" | "COMPO" | "VAR" | "SHARED" | "DEF" | "GLOBAL" | "TABLE_READ" | "TABLE_WRITE" | "TABLE_INSERT" | "TABLE_UPDATE" | "TABLE_DELETE" | "DBOBJ_CREATE" | "DBOBJ_DELETE" | "DB_DELETE" | "DB_INSERT" | "DB_MANAGE" | "DB_OWNER" | "DB_READ" | "DB_UPDATE" | "DB_WRITE" | "SCRIPT_EXEC" | "TASK_GROUP_MEM_LIMIT" | "TEST_EXEC" | "VIEW_EXEC" | "VIEW_OWNER" | "QUERY_RESULT_MEM_LIMIT" | "HINT_HASH" | "HINT_SNAPSHOT" | "HINT_KEEPORDER" | "HINT_SEQ" | "HINT_EXPLAIN" | "HINT_VECTORIZED" | "HEAD" | "CURRENT" | "TAIL" | "LINE" | "PIE" | "COLUMN" | "BAR" | "AREA" | "SCATTER" | "HISTOGRAM" | "KLINE" | "DEBUG" | "INFO" | "WARNING" | "ERROR" | "FIRST" | "LAST" | "ALL" | "NONE" | "HASH_PTN" | "True" | "False" | "None")[];
+        constants: ("true" | "false" | "DFLT" | "NULL" | "pi" | "e" | "SCALAR" | "VECTOR" | "PAIR" | "MATRIX" | "SET" | "DICT" | "TABLE" | "VOID" | "BOOL" | "CHAR" | "SHORT" | "INT" | "INDEX" | "LONG" | "DATE" | "MONTH" | "TIME" | "MINUTE" | "SECOND" | "DATETIME" | "TIMESTAMP" | "NANOTIME" | "NANOTIMESTAMP" | "FLOAT" | "DOUBLE" | "SYMBOL" | "STRING" | "UUID" | "FUNCTIONDEF" | "HANDLE" | "CODE" | "DATASOURCE" | "RESOURCE" | "ANY" | "DICTIONARY" | "DATEHOUR" | "IPADDR" | "INT128" | "BLOB" | "COMPLEX" | "POINT" | "DURATION" | "OBJECT" | "DECIMAL32" | "DECIMAL64" | "DECIMAL128" | "SEQ" | "RANGE" | "HASH" | "VALUE" | "LIST" | "COMPO" | "VAR" | "SHARED" | "DEF" | "GLOBAL" | "TABLE_READ" | "TABLE_WRITE" | "TABLE_INSERT" | "TABLE_UPDATE" | "TABLE_DELETE" | "DBOBJ_CREATE" | "DBOBJ_DELETE" | "DB_DELETE" | "DB_INSERT" | "DB_MANAGE" | "DB_OWNER" | "DB_READ" | "DB_UPDATE" | "DB_WRITE" | "SCRIPT_EXEC" | "TASK_GROUP_MEM_LIMIT" | "TEST_EXEC" | "VIEW_EXEC" | "VIEW_OWNER" | "QUERY_RESULT_MEM_LIMIT" | "HINT_HASH" | "HINT_SNAPSHOT" | "HINT_KEEPORDER" | "HINT_SEQ" | "HINT_EXPLAIN" | "HINT_VECTORIZED" | "HEAD" | "CURRENT" | "TAIL" | "LINE" | "PIE" | "COLUMN" | "BAR" | "AREA" | "SCATTER" | "HISTOGRAM" | "KLINE" | "DEBUG" | "INFO" | "WARNING" | "ERROR" | "FIRST" | "LAST" | "ALL" | "NONE" | "HASH_PTN" | "True" | "False" | "None")[];
         functions: string[];
     };
 }

package/i18n/index.d.ts

@@ -1,9 +1,9 @@
 import { I18N } from 'xshell/i18n/index.js';
 export declare let i18n: I18N;
 declare const t: (text: string, options?: {
-    [key: string]: any;
     language?: import("xshell/i18n/index.js").Language;
     context?: string;
     count?: number;
+    [key: string]: any;
 }) => string, language: import("xshell/i18n/index.js").Language;
 export { t, language };

package/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { InspectOptions as UtilInspectOptions } from 'util';
 import { inspect, Lock, type WebSocket, type WebSocketConnectionError } from 'xshell';
 export declare const nulls: {
@@ -330,7 +329,7 @@ export declare class DdbObj<TValue extends DdbValue = DdbValue> {
     pack(): Uint8Array;
     static pack_vector_body(value: DdbVectorValue, type: DdbType, length: number): ArrayBufferView[];
     /** 将 DdbObj 转换为 js 原生数据类型
-        - 标量对应 number, bigint 或者字符串
+        - 标量对应 number, bigint 或者字符串 (其中时间类型转换为常用的字符串表示)
         - 数组对应 js 原生数组
         - 表格对应 DdbTableData
         - 矩阵对应 DdbMatrixData
@@ -378,7 +377,7 @@ export declare class DdbObj<TValue extends DdbValue = DdbValue> {
 }
 /** 根据 DdbType 获取其名称，array vector type 自动在后面加上 [] */
 export declare function get_type_name(type: DdbType): string;
-export declare function is_decimal_type(type: DdbType): boolean;
+export declare function is_decimal_type(type: DdbType): type is DdbType.decimal32 | DdbType.decimal64 | DdbType.decimal128;
 export declare function is_decimal_null_value(type: DdbType, value: number | bigint): boolean;
 export declare function get_duration_unit(code: number): string;
 export interface InspectOptions extends UtilInspectOptions {
@@ -388,6 +387,8 @@ export interface InspectOptions extends UtilInspectOptions {
     decimals?: number;
     /** `true` 决定格式化后的数据是否有千分位 */
     grouping?: boolean;
+    /** timestamp 类型转换为字符串表示时显示到秒还是毫秒 */
+    timestamp?: 's' | 'ms';
 }
 /** 根据 DdbType 格式化单个元素 (value) 为字符串，空值返回 'null' 字符串 */
 export declare function format(type: DdbType, value: DdbValue, le: boolean, options?: InspectOptions): string;
@@ -396,8 +397,10 @@ export declare function formati(obj: DdbVectorObj, index: number, options?: Insp
 export interface ConvertOptions {
     /** `'string'` blob 类型数据的格式 */
     blob?: 'string' | 'binary';
+    /** timestamp 类型转换为字符串表示时显示到秒还是毫秒 */
+    timestamp?: 's' | 'ms';
 }
-export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob }?: ConvertOptions): string | number | bigint | boolean | Uint8Array | Int32Array | BigInt64Array | string[] | Int8Array | Int16Array | Float32Array | Float64Array | Uint8Array[] | number[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | BigInt128Array | DdbSymbolExtendedValue | DdbArrayVectorValue | DdbMatrixValue | DdbObj<DdbValue>[] | DdbDurationVectorValue | DdbTensorValue | DdbChartValue;
+export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, timestamp }?: ConvertOptions): string | number | bigint | boolean | Uint8Array | Int32Array | BigInt64Array | string[] | Int8Array | Int16Array | Float32Array | Float64Array | Uint8Array[] | number[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | BigInt128Array | DdbSymbolExtendedValue | DdbArrayVectorValue | DdbMatrixValue | DdbObj<DdbValue>[] | DdbDurationVectorValue | DdbTensorValue | DdbChartValue;
 /** 转换一个向量到 js 原生数组 */
 export declare function converts(type: DdbType, value: DdbVectorValue, rows: number, le: boolean, options?: ConvertOptions): any[];
 export declare class DdbVoid extends DdbObj<undefined> {
@@ -561,10 +564,8 @@ export interface StreamingMessage<TRows = any> extends StreamingParams {
     window: {
         /** 建立连接开始 offset = 0, 随着 window 的移动逐渐增加  The establishment of the connection starts offset = 0, and gradually increases as the window moves */
         offset: number;
-        /** segments 中 segment.row 的总和  sum of segment.row in segments */
-        rows: number;
-        /** 每次接收到的 data 组成的数组  An array of data received each time */
-        segments: DdbTableData<TRows>[];
+        /** 历史数据  Historical data */
+        data: TRows[];
         /** 每次接收到的 obj 组成的数组  An array of obj received each time */
         objs: DdbObj<DdbVectorObj[]>[];
     };

package/index.js

@@ -1065,6 +1065,38 @@ export class DdbObj {
                         ...DdbObj.pack_vector_body(data, this.type, this.rows * this.cols)
                     ];
                 }
+                case DdbForm.tensor: {
+                    const { le, value } = this;
+                    const { tensor_type, device_type, tensor_flags, dimensions, shape, strides, preserve_value, elem_count, data } = value;
+                    // 计算总的字节长度
+                    const totalLength = 10 + dimensions * 8 * 2 + 8 + 8 + data.length; // 12 字节元数据 + 维度信息 + 保留值和元素数量 + 数据部分
+                    const buffer = new ArrayBuffer(totalLength);
+                    const dv = new DataView(buffer);
+                    const uint8Array = new Uint8Array(buffer);
+                    // 写入元数据
+                    // uint8Array[0] = type;
+                    // uint8Array[1] = form;
+                    uint8Array[0] = tensor_type;
+                    uint8Array[1] = device_type;
+                    dv.setUint32(2, tensor_flags, le);
+                    dv.setInt32(6, dimensions, le);
+                    // 写入形状和步长
+                    const shapeStart = 10;
+                    const stridesStart = shapeStart + dimensions * 8;
+                    for (let d = 0; d < dimensions; d++) {
+                        dv.setBigInt64(shapeStart + d * 8, BigInt(shape[d]), le);
+                        dv.setBigInt64(stridesStart + d * 8, BigInt(strides[d]), le);
+                    }
+                    // 写入保留值和元素数量
+                    const preserveValueStart = stridesStart + dimensions * 8;
+                    dv.setBigInt64(preserveValueStart, preserve_value, le);
+                    const storageStart = preserveValueStart + 8;
+                    dv.setBigInt64(storageStart, BigInt(elem_count), le);
+                    // 写入数据
+                    const dataStart = storageStart + 8;
+                    uint8Array.set(data, dataStart);
+                    return [uint8Array];
+                }
                 default:
                     throw new Error(t('vector {{type}} 暂不支持序列化', { type: get_type_name(type) }));
             }
@@ -1628,8 +1660,8 @@ let _formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
 let _datetime_formatter = new Intl.DateTimeFormat('zh-CN', { dateStyle: 'short', timeStyle: 'medium', timeZone: 'UTC', hour12: false });
 /** 根据 DdbType 格式化单个元素 (value) 为字符串，空值返回 'null' 字符串 */
 export function format(type, value, le, options = {}) {
+    const { grouping = true, timestamp = 'ms' } = options;
     const formatter = (() => {
-        const { grouping = true } = options;
         const decimals = options.decimals ?? _decimals;
         if (decimals !== _decimals || grouping !== _grouping) {
             _decimals = decimals;
@@ -1649,7 +1681,7 @@ export function format(type, value, le, options = {}) {
         let str;
         // formatter 可能会在 value 不属于 new Date() 有效值时，调用  抛出错误，这里统一处理
         try {
-            str = formatter(value);
+            str = formatter(value, (type === DdbType.timestamp && timestamp === 's') ? 'YYYY.MM.DD HH:mm:ss' : undefined);
         }
         catch (error) {
             if (error instanceof RangeError)
@@ -1899,7 +1931,7 @@ export function formati(obj, index, options = {}) {
         }
     }
 }
-export function convert(type, value, le, { blob = 'string' } = {}) {
+export function convert(type, value, le, { blob = 'string', timestamp = 'ms' } = {}) {
     switch (type) {
         case DdbType.void:
             return value === DdbVoidType.null ? null : undefined;
@@ -1954,7 +1986,7 @@ export function convert(type, value, le, { blob = 'string' } = {}) {
         case DdbType.decimal32:
         case DdbType.decimal64:
         case DdbType.decimal128:
-            return format(type, value, le, { colors: false });
+            return format(type, value, le, { colors: false, timestamp });
         default:
             throw new Error(String(DdbType[type] || type) + t(' 暂时不支持转换为 js 对象'));
     }
@@ -3229,8 +3261,7 @@ export class DDB {
         let first = true;
         let win = {
             offset: 0,
-            rows: 0,
-            segments: [],
+            data: [],
             objs: []
         };
         let schema;
@@ -3284,19 +3315,17 @@ export class DDB {
                                 data: seq(rows, i => zip_object(columns, seq(columns.length, j => _data[j][i])))
                             };
                         }
-                        win.rows += rows;
-                        win.segments.push(data);
+                        data.data.forEach(row => { win.data.push(row); });
                         win.objs.push(obj);
-                        if (win.rows >= winsize * 2 && win.segments.length >= 2) {
+                        if (win.data.length >= winsize * 2 && win.objs.length >= 2) {
                             let winsize_ = 0;
-                            let i = win.segments.length - 1;
+                            let i = win.objs.length - 1;
                             // 往前移动至首个累计 winsize_ 超过 winsize 的位置
                             for (; winsize_ < winsize; i--)
-                                winsize_ += win.segments[i].data.length;
-                            win.segments = win.segments.slice(i);
+                                winsize_ += win.objs[i].value[0].rows;
+                            win.offset += win.data.length - winsize_;
+                            win.data = win.data.slice(-winsize_);
                             win.objs = win.objs.slice(i);
-                            win.offset += win.rows - winsize_;
-                            win.rows = winsize_;
                         }
                     }
                     this.streaming.handler({