dolphindb 2.0.510 → 2.0.511

package/browser.d.ts

@@ -60,10 +60,28 @@ export declare enum DdbFunctionType {
     JitFunc = 7,
     JitPartialFunc = 8
 }
+export declare enum DdbDurationUnit {
+    ns = 0,
+    us = 1,
+    ms = 2,
+    s = 3,
+    m = 4,
+    H = 5,
+    d = 6,
+    w = 7,
+    M = 8,
+    y = 9,
+    B = 10
+}
 export interface DdbFunctionDefValue {
     type: DdbFunctionType;
     name: string;
 }
+export interface DdbDurationValue {
+    unit: DdbDurationUnit;
+    /** int32 */
+    data: number;
+}
 export interface DdbSymbolExtendedValue {
     base_id: number;
     base: string[];
@@ -85,7 +103,7 @@ export declare type DdbScalarValue = null | boolean | number | bigint | string |
     number,
     number
 ] | // complex, point
-DdbFunctionDefValue;
+DdbFunctionDefValue | DdbDurationValue;
 export declare type DdbVectorValue = Uint8Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | string[] | // string[]
 Uint8Array[] | // blob
 DdbObj[] | // any

package/browser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ddb = exports.DDB = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.str2timestamp = exports.timestamp2str = exports.datetime2str = exports.date2str = exports.DdbTable = exports.DdbSetString = exports.DdbSetDouble = exports.DdbSetInt = exports.DdbVectorSymbol = exports.DdbVectorAny = exports.DdbVectorString = exports.DdbVectorDouble = exports.DdbVectorInt = exports.DdbFunction = exports.DdbPair = exports.DdbNanoTimeStamp = exports.DdbTimeStamp = exports.DdbDateTime = exports.DdbDouble = exports.DdbLong = exports.DdbString = exports.DdbInt = exports.DdbChar = exports.DdbBool = exports.DdbVoid = exports.DdbObj = exports.timezone_offset = exports.nulls = exports.DdbFunctionType = exports.DdbType = exports.DdbForm = void 0;
+exports.ddb = exports.DDB = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.str2timestamp = exports.timestamp2str = exports.datetime2str = exports.date2str = exports.DdbTable = exports.DdbSetString = exports.DdbSetDouble = exports.DdbSetInt = exports.DdbVectorSymbol = exports.DdbVectorAny = exports.DdbVectorString = exports.DdbVectorDouble = exports.DdbVectorInt = exports.DdbFunction = exports.DdbPair = exports.DdbNanoTimeStamp = exports.DdbTimeStamp = exports.DdbDateTime = exports.DdbDouble = exports.DdbLong = exports.DdbString = exports.DdbInt = exports.DdbChar = exports.DdbBool = exports.DdbVoid = exports.DdbObj = exports.timezone_offset = exports.nulls = exports.DdbDurationUnit = exports.DdbFunctionType = exports.DdbType = exports.DdbForm = void 0;
 const tslib_1 = require("tslib");
 const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
 const customParseFormat_js_1 = tslib_1.__importDefault(require("dayjs/plugin/customParseFormat.js"));
@@ -72,6 +72,20 @@ var DdbFunctionType;
     DdbFunctionType[DdbFunctionType["JitFunc"] = 7] = "JitFunc";
     DdbFunctionType[DdbFunctionType["JitPartialFunc"] = 8] = "JitPartialFunc";
 })(DdbFunctionType = exports.DdbFunctionType || (exports.DdbFunctionType = {}));
+var DdbDurationUnit;
+(function (DdbDurationUnit) {
+    DdbDurationUnit[DdbDurationUnit["ns"] = 0] = "ns";
+    DdbDurationUnit[DdbDurationUnit["us"] = 1] = "us";
+    DdbDurationUnit[DdbDurationUnit["ms"] = 2] = "ms";
+    DdbDurationUnit[DdbDurationUnit["s"] = 3] = "s";
+    DdbDurationUnit[DdbDurationUnit["m"] = 4] = "m";
+    DdbDurationUnit[DdbDurationUnit["H"] = 5] = "H";
+    DdbDurationUnit[DdbDurationUnit["d"] = 6] = "d";
+    DdbDurationUnit[DdbDurationUnit["w"] = 7] = "w";
+    DdbDurationUnit[DdbDurationUnit["M"] = 8] = "M";
+    DdbDurationUnit[DdbDurationUnit["y"] = 9] = "y";
+    DdbDurationUnit[DdbDurationUnit["B"] = 10] = "B";
+})(DdbDurationUnit = exports.DdbDurationUnit || (exports.DdbDurationUnit = {}));
 exports.nulls = {
     int8: -0x80,
     int16: -32768,
@@ -369,6 +383,16 @@ class DdbObj {
                     ]
                 ];
             }
+            case DdbType.duration: {
+                const dv = new DataView(buf.buffer, buf.byteOffset);
+                return [
+                    8,
+                    {
+                        unit: dv.getUint32(4, le),
+                        data: dv.getInt32(0, le)
+                    }
+                ];
+            }
             default:
                 return [0, buf];
         }
@@ -602,6 +626,13 @@ class DdbObj {
                     values
                 ];
             }
+            // case DdbType.duration: -> 实际会返回一个 any vector
+            // [2y, 1M, 3d, 7H, 11m, 12s, 15ms, 16us, 17ns]
+            // <Buffer 19 01 type = any, form = vector
+            // 09 00 00 00 01 00 00 00 rows = 9, cols = 1
+            // 24 00 type = DdbType.duration, form = scalar
+            // 02 00 00 00 09 00 00 00 
+            // 24 00 01 00 00 00 08 00 00 00 24 00 03 00 00 00 06 00 00 00 24 00 07 00 00 00 05 00 00 00 ... 50 more bytes>
             default:
                 return [0, buf];
         }
@@ -703,8 +734,10 @@ class DdbObj {
                         case DdbType.complex:
                         case DdbType.point:
                             return [Float64Array.from(this.value)];
-                        case DdbType.duration:
-                            return [value];
+                        case DdbType.duration: {
+                            const { unit, data } = this.value;
+                            return [Int32Array.of(data, unit)];
+                        }
                         case DdbType.handle:
                             throw new Error('DolphinDB Server 不支持 handle 的反序列化');
                         default:
@@ -887,6 +920,10 @@ class DdbObj {
                     switch (this.type) {
                         case DdbType.functiondef:
                             return `'${this.value.name}'`;
+                        case DdbType.duration: {
+                            const { data, unit } = this.value;
+                            return `${data}${DdbDurationUnit[unit]}`;
+                        }
                         case DdbType.string:
                             return `'${this.value}'`;
                     }