dolphindb 3.0.119 → 3.0.121

package/i18n/dict.json

@@ -100,5 +100,8 @@
     },
     "iife 执行的脚本行数应该至少为 2 行": {
         "en": "The number of script lines executed by iife should be at least 2"
+    },
+    "iotany sub vector 不支持非 vector 类型": {
+        "en": "iotany sub vector does not support non-vector types"
     }
 }

package/index.d.ts

@@ -69,7 +69,7 @@ export declare enum DdbType {
     decimal64 = 38,
     decimal128 = 39,
     object = 40,
-    pynone = 41,
+    iotany = 41,
     symbol_extended = 145
 }
 export declare enum DdbFunctionType {
@@ -235,7 +235,7 @@ DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value |
 export type DdbVectorValue = null | Uint8Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | BigInt128Array | string[] | // string[]
 Uint8Array[] | // blob
 DdbObj[] | // any
-DdbSymbolExtendedValue | DdbArrayVectorValue | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | DdbDurationVectorValue;
+IotVectorItemValue | DdbSymbolExtendedValue | DdbArrayVectorValue | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | DdbDurationVectorValue;
 export type DdbValue = DdbScalarValue | DdbVectorValue | DdbMatrixValue | DdbDictValue | DdbChartValue | DdbTensorValue;
 export type DdbStringObj = DdbObj<string>;
 export type DdbVectorObj<TValue extends DdbVectorValue = DdbVectorValue> = DdbObj<TValue>;
@@ -277,6 +277,8 @@ export interface DdbMatrixData {
     /** 数据， data[0][1] 为第 0 行第 1 列数据 */
     data: any[][];
 }
+export type IotVectorItemValue = [number | string | bigint | boolean][];
+export type DdbIotAnyVector = DdbObj<IotVectorItemValue>;
 /** 可以表示所有 DolphinDB 数据库中的数据类型  Can represent data types in all DolphinDB databases */
 export declare class DdbObj<TValue extends DdbValue = DdbValue> {
     static dec: TextDecoder;
@@ -400,7 +402,7 @@ export interface ConvertOptions {
     /** timestamp 类型转换为字符串表示时显示到秒还是毫秒 */
     timestamp?: 's' | 'ms';
 }
-export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, timestamp }?: ConvertOptions): string | number | bigint | boolean | Uint8Array | number[] | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | string[] | Uint8Array[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | BigInt128Array | DdbObj<DdbValue>[] | DdbSymbolExtendedValue | DdbArrayVectorValue | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | DdbDurationVectorValue | DdbMatrixValue | DdbChartValue | DdbTensorValue;
+export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, timestamp }?: ConvertOptions): string | number | bigint | boolean | Uint8Array | number[] | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | string[] | Uint8Array[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | BigInt128Array | DdbObj<DdbValue>[] | IotVectorItemValue | DdbSymbolExtendedValue | DdbArrayVectorValue | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | DdbDurationVectorValue | DdbMatrixValue | DdbChartValue | DdbTensorValue;
 /** 转换一个向量到 js 原生数组 */
 export declare function converts(type: DdbType, value: DdbVectorValue, rows: number, le: boolean, options?: ConvertOptions): any[];
 export declare class DdbVoid extends DdbObj<undefined> {

package/index.js

@@ -76,7 +76,7 @@ export var DdbType;
     DdbType[DdbType["decimal64"] = 38] = "decimal64";
     DdbType[DdbType["decimal128"] = 39] = "decimal128";
     DdbType[DdbType["object"] = 40] = "object";
-    DdbType[DdbType["pynone"] = 41] = "pynone";
+    DdbType[DdbType["iotany"] = 41] = "iotany";
     DdbType[DdbType["symbol_extended"] = 145] = "symbol_extended";
 })(DdbType || (DdbType = {}));
 export var DdbFunctionType;
@@ -557,6 +557,7 @@ export class DdbObj {
                 cols: 1,
                 rows,
                 value,
+                ...type === DdbType.iotany ? { buffer: buf } : {}
             });
         }
         else { // array vector
@@ -820,6 +821,43 @@ export class DdbObj {
                     values
                 ];
             }
+            case DdbType.iotany: {
+                // 构造 indexes
+                const dv = new DataView(buf.buffer, buf.byteOffset);
+                let i_value_start = 0;
+                const size = Number(dv.getUint32(i_value_start, le));
+                i_value_start += 4;
+                const indexes = new Array(size * 2);
+                for (let i = 0; i < size; i++) {
+                    const type = dv.getUint32(i_value_start, le);
+                    i_value_start += 4;
+                    const idx = dv.getUint32(i_value_start, le);
+                    i_value_start += 4;
+                    indexes[i * 2] = type;
+                    indexes[i * 2 + 1] = idx;
+                }
+                // 构造 sub vector
+                const type_size = dv.getUint32(i_value_start, le);
+                i_value_start += 4;
+                const sub_vec = new Map();
+                for (let i = 0; i < type_size; i++) {
+                    const flag = dv.getUint16(i_value_start, le);
+                    i_value_start += 2;
+                    const form = flag >> 8;
+                    const sub_type = flag & 0xff;
+                    assert(form === DdbForm.vector, t('iotany sub vector 不支持非 vector 类型'));
+                    const sub_size = dv.getUint32(i_value_start, le);
+                    i_value_start += 8; // 同时跳过 sub_size 和 cols
+                    const [len, vector] = this.parse_vector_items(buf.subarray(i_value_start), le, sub_type, sub_size);
+                    i_value_start += len;
+                    sub_vec.set(sub_type, vector);
+                }
+                return [
+                    i_value_start,
+                    // 根据 indexes 数组构建最终的 value 数组
+                    seq(size, i => (sub_vec.get(indexes[i * 2]))[indexes[i * 2 + 1]])
+                ];
+            }
             // 25 01 type = decimal32, form = vector
             // 02 00 00 00 01 00 00 00
             // 00 00 00 00 scale = 0
@@ -1021,6 +1059,8 @@ export class DdbObj {
                                 block.data
                             ])).flat()
                         ];
+                    if (form === DdbForm.vector && type === DdbType.iotany)
+                        return [this.buffer];
                     return [
                         Uint32Array.of(this.rows, 1),
                         ...DdbObj.pack_vector_body(value, type, this.rows)
@@ -2058,6 +2098,8 @@ export function converts(type, value, rows, le, options) {
             }
             case DdbType.any:
                 return value.map(x => x.data(options));
+            case DdbType.iotany:
+                return value;
             default:
                 throw new Error(String(DdbType[type] || type) + '[]' + t(' 暂时不支持转换为 js 对象'));
         }
@@ -3189,7 +3231,7 @@ export class DDB {
         let simple = true;
         let has_ddbobj = false;
         if (args)
-            for (const arg of args) {
+            for (const arg of args)
                 if (arg && arg instanceof DdbObj)
                     has_ddbobj = true;
                 else {
@@ -3200,7 +3242,6 @@ export class DDB {
                         break;
                     }
                 }
-            }
         if (!simple) {
             if (has_ddbobj)
                 throw new Error(t('调用 ddb.invoke 的参数中不能同时有 DdbObj 与复杂 js 原生对象'));
@@ -3361,7 +3402,7 @@ export class DDB {
                                 data: seq(rows, i => zip_object(columns, seq(columns.length, j => _data[j][i])))
                             };
                         }
-                        data.data.forEach(row => { win.data.push(row); });
+                        win.data.push(...data.data);
                         win.objs.push(obj);
                         if (win.data.length >= winsize * 2 && win.objs.length >= 2) {
                             let winsize_ = 0;