From bd08e777057943b63248bfffc01e04c0529f56ca Mon Sep 17 00:00:00 2001 From: StoneT2000 Date: Tue, 15 Oct 2019 12:01:02 -0700 Subject: [PATCH] Fixed time conversion bug - Fixed bug when the least significant bits of timestamp may cause time to be converted to 0 - Fixed small display bug with time and sig figs. --- src/connector/nodejs/nodetaos/cinterface.js | 3 --- src/connector/nodejs/nodetaos/taosobjects.js | 10 ++++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/connector/nodejs/nodetaos/cinterface.js b/src/connector/nodejs/nodetaos/cinterface.js index a8183e1d45..2b409268d9 100644 --- a/src/connector/nodejs/nodetaos/cinterface.js +++ b/src/connector/nodejs/nodetaos/cinterface.js @@ -33,9 +33,6 @@ function convertTimestamp(data, num_of_rows, nbytes = 0, offset = 0, micro=false let time = 0; for (let i = currOffset; i < currOffset + nbytes; i++) { queue.push(data[i]); - if (data[i] == 0) { - break; - } } for (let i = queue.length - 1; i >= 0; i--) { time += queue[i] * Math.pow(16, i * 2); diff --git a/src/connector/nodejs/nodetaos/taosobjects.js b/src/connector/nodejs/nodetaos/taosobjects.js index 42d9f8407c..809d17a016 100644 --- a/src/connector/nodejs/nodetaos/taosobjects.js +++ b/src/connector/nodejs/nodetaos/taosobjects.js @@ -59,6 +59,12 @@ class TaosTimestamp extends Date { pad = function(num) { var norm = Math.floor(Math.abs(num)); return (norm < 10 ? '0' : '') + norm; + }, + pad2 = function(num) { + var norm = Math.floor(Math.abs(num)); + if (norm < 10) return '00' + norm; + if (norm < 100) return '0' + norm; + if (norm < 1000) return norm; }; return this.getFullYear() + '-' + pad(this.getMonth() + 1) + @@ -66,8 +72,8 @@ class TaosTimestamp extends Date { ' ' + pad(this.getHours()) + ':' + pad(this.getMinutes()) + ':' + pad(this.getSeconds()) + - '.' + pad(this.getMilliseconds()) + - '' + (this.microTime ? this.microTime.toFixed(3) : '').substr(2); + '.' + pad2(this.getMilliseconds()) + + '' + (this.microTime ? pad2(Math.round(this.microTime * 1000)) : ''); } } -- GitLab