dolphindb 3.0.40 → 3.0.41

package/README.md

@@ -494,11 +494,11 @@ export interface StreamingMessage <TRows = any> extends StreamingParams {
         /** The establishment of the connection starts offset = 0, and gradually increases as the window moves */
         offset: number
         
-        /** sum of segment.row in segments */
-        rows: number
+        /** Historical data */
+        data: TRows[]
         
-        /** An array of data received each time */
-        segments: DdbTableData<TRows>[]
+        /** An array of obj received each time */
+        objs: DdbObj<DdbVectorObj[]>[]
     }
     
     /** After successfully subscribed, if the subsequently pushed message is parsed incorrectly, the error will be set and the handler will be called. */

package/README.zh.md

@@ -577,11 +577,11 @@ export interface StreamingMessage <TRows = any> extends StreamingParams {
         /** 建立连接开始 offset = 0, 随着 window 的移动逐渐增加 */
         offset: number
         
-        /** segments 中 segment.row 的总和 */
-        rows: number
+        /** 历史数据 */
+        data: TRows[]
         
-        /** 每次接收到的 data 组成的数组 */
-        segments: DdbTableData<TRows>[]
+        /** 每次接收到的 obj 组成的数组 */
+        objs: DdbObj<DdbVectorObj[]>[]
     }
     
     /** 成功订阅后，后续推送过来的 message 解析错误，则会设置 error 并调用 handler */

package/browser.d.ts

@@ -384,7 +384,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 {
@@ -398,6 +398,8 @@ export interface InspectOptions {
     quote?: boolean;
     /** `true` 决定格式化后的数据是否有千分位 */
     grouping?: boolean;
+    /** timestamp 类型转换为字符串表示时显示到秒还是毫秒 */
+    timestamp?: 's' | 'ms';
 }
 /** 根据 DdbType 格式化单个元素 (value) 为字符串 */
 export declare function format(type: DdbType, value: DdbValue, le: boolean, options?: InspectOptions): string;
@@ -406,8 +408,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 | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | Int32Array | DdbDecimal64VectorValue | BigInt64Array | DdbDecimal128VectorValue | BigInt128Array | DdbSymbolExtendedValue | string[] | Int8Array | Int16Array | Float32Array | Float64Array | DdbArrayVectorValue | DdbMatrixValue | Uint8Array[] | DdbObj<DdbValue>[] | DdbDurationVectorValue | number[] | DdbTensorValue | DdbChartValue;
+export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, timestamp }?: ConvertOptions): string | number | bigint | boolean | Uint8Array | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | Int32Array | DdbDecimal64VectorValue | BigInt64Array | DdbDecimal128VectorValue | BigInt128Array | DdbSymbolExtendedValue | string[] | Int8Array | Int16Array | Float32Array | Float64Array | DdbArrayVectorValue | DdbMatrixValue | Uint8Array[] | DdbObj<DdbValue>[] | DdbDurationVectorValue | number[] | 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> {
@@ -571,10 +575,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/browser.js

@@ -1670,7 +1670,7 @@ 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) 为字符串 */
 export function format(type, value, le, options = {}) {
-    const { nullstr = false, colors = false, quote = false, grouping = true } = options;
+    const { nullstr = false, colors = false, quote = false, grouping = true, timestamp = 'ms' } = options;
     const formatter = (() => {
         const decimals = options.decimals ?? _decimals;
         if (decimals !== _decimals || grouping !== _grouping) {
@@ -1698,7 +1698,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)
@@ -1957,7 +1957,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;
@@ -2012,7 +2012,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 对象'));
     }
@@ -3283,8 +3283,7 @@ export class DDB {
         let first = true;
         let win = {
             offset: 0,
-            rows: 0,
-            segments: [],
+            data: [],
             objs: []
         };
         let schema;
@@ -3338,19 +3337,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({