Merge remote-tracking branch 'origin/develop' into feature/wal

Jenkinsfile

@@ -87,6 +87,7 @@ pipeline {
             pre_test()
             sh '''
             cd ${WKC}/tests
+            find pytest -name '*'sql|xargs rm -rf
             ./test-all.sh p1
             date'''
           }
@@ -98,6 +99,7 @@ pipeline {
             pre_test()
             sh '''
             cd ${WKC}/tests
+            find pytest -name '*'sql|xargs rm -rf
             ./test-all.sh p2
             date'''
           }

src/connector/nodejs/nodetaos/cinterface.js

@@ -144,18 +144,9 @@ function convertBinary(data, num_of_rows, nbytes = 0, offset = 0, micro=false) {
 function convertNchar(data, num_of_rows, nbytes = 0, offset = 0, micro=false) {
   data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
   let res = [];
-  let currOffset = 0;
+  let dataEntry = data.slice(0, nbytes); //one entry in a row under a column;
-  // every 4 bytes, a character is encoded;
+  //TODO: should use the correct character encoding 
-  while (currOffset < data.length) {
+  res.push(dataEntry.toString("utf-8"));
-    let dataEntry = data.slice(currOffset, currOffset + nbytes); //one entry in a row under a column;
-    if (dataEntry.readInt64LE(0) == FieldTypes.C_NCHAR_NULL) {
-      res.push(null);
-    }
-    else {
-      res.push(dataEntry.toString("utf16le").replace(/\u0000/g, ""));
-    }
-    currOffset += nbytes;
-  }
   return res;
 }
 
@@ -351,7 +342,8 @@ CTaosInterface.prototype.useResult = function useResult(result) {
 CTaosInterface.prototype.fetchBlock = function fetchBlock(result, fields) {
   //let pblock = ref.ref(ref.ref(ref.NULL)); // equal to our raw data
   let pblock = this.libtaos.taos_fetch_row(result);
-  if (pblock == null) {
+  let num_of_rows = 1;
+  if (ref.isNull(pblock) == true) {
     return {block:null, num_of_rows:0};
   }
 
@@ -363,17 +355,16 @@ CTaosInterface.prototype.fetchBlock = function fetchBlock(result, fields) {
   
   if (ref.isNull(fieldL) == false) {
     for (let i = 0; i < fields.length; i ++) {
-      let plen = ref.reinterpret(fieldL, 4, i*4);
+	  let plen = ref.reinterpret(fieldL, 4, i*4);
       let len = plen.readInt32LE(0);
-       fieldlens.push(len);
+      fieldlens.push(len);
     }
   }
 
   let blocks = new Array(fields.length);
   blocks.fill(null);
-  num_of_rows = Math.abs(num_of_rows);
+  //num_of_rows = Math.abs(num_of_rows);
   let offset = 0;
-  pblock = pblock.deref();
   for (let i = 0; i < fields.length; i++) {
     pdata = ref.reinterpret(pblock,8,i*8);
     pdata = ref.ref(pdata.readPointer());

src/connector/nodejs/nodetaos/taosresult.js

@@ -25,6 +25,7 @@ function TaosResult(data, fields) {
  * @function pretty
  * @since 1.0.6
  */
+
 TaosResult.prototype.pretty = function pretty() {
   let fieldsStr = "";
   let sizing = [];
@@ -46,8 +47,7 @@ TaosResult.prototype.pretty = function pretty() {
     row.data.forEach((entry, i) => {
       if (this.fields[i]._field.type == 9) {
         entry = entry.toTaosString();
-      }
+      } else {
-      else {
         entry = entry == null ? 'null' : entry.toString();
       }
       rowStr += entry

src/connector/nodejs/test/test.js

@@ -48,6 +48,7 @@ for (let i = 0; i < 10000; i++) {
 // Select
 console.log('select * from td_connector_test.all_types limit 3 offset 100;');
 c1.execute('select * from td_connector_test.all_types limit 2 offset 100;');
+
 var d = c1.fetchall();
 console.log(c1.fields);
 console.log(d);
@@ -77,13 +78,24 @@ c1.query('select stddev(_double), stddev(_bigint), stddev(_float) from all_types
 })
 
 // Binding arguments, and then using promise
-var q = c1.query('select * from td_connector_test.all_types where ts >= ? and _int > ? limit 100 offset 40;').bind(new Date(1231), 100)
+var q = c1.query('select _nchar from td_connector_test.all_types where ts >= ? and _int > ? limit 100 offset 40;').bind(new Date(1231), 100)
 console.log(q.query);
 q.execute().then(function(r) {
   r.pretty();
 });
 
+var q = c1.query('select * from td_connector_test.weather');
+console.log(q.query);
+q.execute().then(function(r) {
+	//console.log(r);
+  	r.pretty();
+});
 
+function sleep(sleepTime) {
+    for(var start = +new Date; +new Date - start <= sleepTime; ) { }
+}
+
+sleep(10000);
 
 // Raw Async Testing (Callbacks, not promises)
 function cb2(param, result, rowCount, rd) {
@@ -129,16 +141,21 @@ setTimeout(function(){
   c1.fetchall_a(thisRes, cb4, param);
 },100);
 
+
 // Async through promises
 var aq = c1.query('select count(*) from td_connector_test.all_types;',false);
 aq.execute_a().then(function(data) {
   data.pretty();
 });
-c1.query('describe td_connector_test.stabletest;').execute_a().then(r=> r.pretty());
+
+c1.query('describe td_connector_test.stabletest').execute_a().then(function(r){
+	r.pretty()
+});
+
 setTimeout(function(){
   c1.query('drop database td_connector_test;');
 },200);
+
 setTimeout(function(){
   conn.close();
 },2000);
-

src/tsdb/src/tsdbMemTable.c

@@ -207,10 +207,10 @@ void *tsdbAllocBytes(STsdbRepo *pRepo, int bytes) {
 int tsdbAsyncCommit(STsdbRepo *pRepo) {
   if (pRepo->mem == NULL) return 0;
 
-  ASSERT(pRepo->imem == NULL);
-
   sem_wait(&(pRepo->readyToCommit));
 
+  ASSERT(pRepo->imem == NULL);
+
   if (pRepo->code != TSDB_CODE_SUCCESS) {
     tsdbWarn("vgId:%d try to commit when TSDB not in good state: %s", REPO_ID(pRepo), tstrerror(terrno));
   }

tests/Jenkinsfile

@@ -42,6 +42,7 @@ pipeline {
             pre_test()
             sh '''
             cd ${WKC}/tests
+            find pytest -name '*'sql|xargs rm -rf
             ./test-all.sh pytest
             date'''
           }

tests/pytest/functions/function_twa_test2.py

@@ -120,6 +120,19 @@ class TDTestCase:
         tdSql.checkData(2, 1, -1.5)
         tdSql.checkData(3, 1, -2)
 
+        #TD-2533 twa+interval with large records 
+        tdSql.execute("create table t4(ts timestamp, c int)") 
+        sql = 'insert into t4 values '       
+        for i in range(20000):
+            sql = sql + '(%d, %d)' % (self.ts + i * 500, i + 1)
+            if i % 2000 == 0:
+                tdSql.execute(sql)
+                sql = 'insert into t4 values ' 
+        tdSql.execute(sql)
+        tdSql.query('select twa(c) from t4 interval(10s)')
+        tdSql.checkData(0,1,10.999)
+
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/pytest/handle_crash_gen_val_log.sh

@@ -5,14 +5,24 @@ GREEN='\033[1;32m'
 GREEN_DARK='\033[0;32m'
 GREEN_UNDERLINE='\033[4;32m'
 NC='\033[0m'
-#nohup /var/lib/jenkins/workspace/TDinternal/debug/build/bin/taosd -c /var/lib/jenkins/workspace/TDinternal/community/sim/dnode1/cfg >/dev/null &
+IN_TDINTERNAL="community"
-nohup /root/TDinternal/debug/build/bin/taosd -c /root/TDinternal/community/sim/dnode1/cfg >/dev/null &
+TDIR=`pwd`
+if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]]; then
+  cd ../..
+else
+  cd ../../..
+fi
+TOP_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep -v community|head -n1`
+nohup $TAOSD_DIR >/dev/null &
+cd -
 ./crash_gen.sh --valgrind -p -t 10 -s 250 -b 4
 pidof taosd|xargs kill -9
 grep 'start to execute\|ERROR SUMMARY' valgrind.err|grep -v 'grep'|uniq|tee crash_gen_mem_err.log
 
 for memError in `grep 'ERROR SUMMARY' crash_gen_mem_err.log | awk '{print $4}'`
 do
+memError=(${memError//,/})
 if [ -n "$memError" ]; then
     if [ "$memError" -gt 12 ]; then
     echo -e "${RED} ## Memory errors number valgrind reports is $memError.\
@@ -24,7 +34,7 @@ done
 grep 'start to execute\|definitely lost:' valgrind.err|grep -v 'grep'|uniq|tee crash_gen-definitely-lost-out.log
 for defiMemError in `grep 'definitely lost:' crash_gen-definitely-lost-out.log | awk '{print $7}'`
 do
-
+defiMemError=(${defiMemError//,/})
 if [ -n "$defiMemError" ]; then
     if [ "$defiMemError" -gt 3 ]; then
     echo -e "${RED} ## Memory errors number valgrind reports \

tests/pytest/pytest_1.sh

@@ -230,7 +230,7 @@ python3 test.py -f tools/lowaTest.py
 python3 test.py -f tools/taosdemoTest2.py
 
 # subscribe
-#python3 test.py -f subscribe/singlemeter.py
+python3 test.py -f subscribe/singlemeter.py
-#python3 test.py -f subscribe/stability.py
+#python3 test.py -f subscribe/stability.py  
-#python3 test.py -f subscribe/supertable.py
+python3 test.py -f subscribe/supertable.py