fix bug and merge issue

src/client/src/tscParseLineProtocol.c

@@ -579,10 +579,10 @@ static int32_t retrieveTableMeta(TAOS* taos, char* tableName, STableMeta** pTabl
     char fullTableName[TSDB_TABLE_FNAME_LEN] = {0};
     memset(fullTableName, 0, tListLen(fullTableName));
     tNameExtractFullName(&sname, fullTableName);
-    taosReleaseRef(tscObjRef, pSql->self);
 
     size_t size = 0;
     taosHashGetCloneExt(UTIL_GET_TABLEMETA(pSql), fullTableName, strlen(fullTableName), NULL, (void**)&tableMeta, &size);
+    taosReleaseRef(tscObjRef, pSql->self);
   }
 
   if (tableMeta != NULL) {

src/client/src/tscServer.c

@@ -1018,10 +1018,10 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
       *((int16_t *)pMsg) = htons(pCol->colId);
       pMsg += sizeof(pCol->colId);
 
-      *((int16_t *)pMsg) += htons(pCol->colIndex);
+      *((int16_t *)pMsg) = htons(pCol->colIndex);
       pMsg += sizeof(pCol->colIndex);
 
-      *((int16_t *)pMsg) += htons(pCol->flag);
+      *((int16_t *)pMsg) = htons(pCol->flag);
       pMsg += sizeof(pCol->flag);
 
       memcpy(pMsg, pCol->name, tListLen(pCol->name));

tests/examples/c/makefile

@@ -6,11 +6,9 @@ TARGET=exe
 LFLAGS = '-Wl,-rpath,/usr/local/taos/driver/' -ltaos -lpthread -lm -lrt
 CFLAGS = -O3 -g -Wall -Wno-deprecated -fPIC -Wno-unused-result -Wconversion \
 	-Wno-char-subscripts -D_REENTRANT -Wno-format -D_REENTRANT -DLINUX \
-
 	-Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \
-	-I../../../deps/cJson/inc
-
-	-Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99
+	-I../../../deps/cJson/inc \
+	-Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \
 	-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment
 
 all: $(TARGET)

tests/examples/c/prepare.c

@@ -839,6 +839,11 @@ void verify_prepare3(TAOS* taos) {
   free(double_len);
   free(bin_len);
   free(blob_len);
+  free(u8_len);
+  free(u16_len);
+  free(u32_len);
+  free(u64_len);
+  
 }
 
 int main(int argc, char* argv[]) {

tests/pytest/functions/function_interp.py

@@ -11,14 +11,23 @@
 
 # -*- coding: utf-8 -*-
 
+import sys
+from util.dnodes import *
+import taos
 from util.log import *
 from util.cases import *
 from util.sql import *
+import numpy as np
+
+
 class TDTestCase:
     def init(self, conn, logSql):
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor())
 
+        self.rowNum = 10
+        self.ts = 1537100000000
+
     def run(self):
         tdSql.prepare()
         tdSql.execute("create table ap1 (ts timestamp, pav float)")

tests/script/api/makefile

@@ -7,11 +7,9 @@ LFLAGS = '-Wl,-rpath,/usr/local/taos/driver/' -ltaos -lpthread -lm -lrt
 CFLAGS = -O0 -g -Wall -Wno-deprecated -fPIC -Wno-unused-result -Wconversion \
 	-Wno-char-subscripts -D_REENTRANT -Wno-format -D_REENTRANT -DLINUX \
 	-Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \
-
 	-I../../../deps/cJson/inc\
 	-I../../../src/os/inc/ -I../../../src/inc -I../../../src/util/inc \
-	-I../../../src/common/inc -I../../../deps/cJson/inc
-
+	-I../../../src/common/inc -I../../../deps/cJson/inc \
 	-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment
 
 all: $(TARGET)
@@ -21,9 +19,7 @@ exe:
 	gcc $(CFLAGS) ./stmtBatchTest.c -o $(ROOT)stmtBatchTest $(LFLAGS)
 	gcc $(CFLAGS) ./stmtTest.c -o $(ROOT)stmtTest $(LFLAGS)
 	gcc $(CFLAGS) ./stmt.c -o $(ROOT)stmt $(LFLAGS)
-
 	gcc $(CFLAGS) ./clientcfgtest.c -o $(ROOT)clientcfgtest $(LFLAGS)
-
 	gcc $(CFLAGS) ./openTSDBTest.c -o $(ROOT)openTSDBTest $(LFLAGS)
 
 
@@ -32,10 +28,7 @@ clean:
 	rm $(ROOT)stmtBatchTest
 	rm $(ROOT)stmtTest
 	rm $(ROOT)stmt_function
-
 	rm $(ROOT)clientcfgtest
-
 	rm $(ROOT)openTSDBTest
-
 	rm $(ROOT)stmt