Merge pull request #1110 from taosdata/beta/v1.6.5.3

[dump sql]

src/client/src/tscAsync.c

@@ -95,7 +95,7 @@ void taos_query_a(TAOS *taos, const char *sqlstr, void (*fp)(void *, TAOS_RES *,
   pRes->numOfRows = 1;
 
   strtolower(pSql->sqlstr, sqlstr);
-  tscTrace("%p Async SQL: %s, pObj:%p", pSql, pSql->sqlstr, pObj);
+  tscDump("%p pObj:%p, Async SQL: %s", pSql, pObj, pSql->sqlstr);
 
   int32_t code = tsParseSql(pSql, pObj->acctId, pObj->db, true);
   if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;

src/client/src/tscSql.c

@@ -207,7 +207,7 @@ int taos_query_imp(STscObj *pObj, SSqlObj *pSql) {
     pSql->pTableHashList = NULL;
   }
   
-  tscTrace("%p SQL: %s pObj:%p", pSql, pSql->sqlstr, pObj);
+  tscDump("%p pObj:%p, SQL: %s", pSql, pObj, pSql->sqlstr);
 
   pRes->code = (uint8_t)tsParseSql(pSql, pObj->acctId, pObj->db, false);
 

src/client/src/tscUtil.c

@@ -692,8 +692,10 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockLi
     SShellSubmitBlock* pBlocks = (SShellSubmitBlock*)pOneTableBlock->pData;
     sortRemoveDuplicates(pOneTableBlock);
 
-    tscTrace("%p meterId:%s, sid:%d, rows:%d, sversion:%d", pSql, pOneTableBlock->meterId, pBlocks->sid,
-             pBlocks->numOfRows, pBlocks->sversion);
+    char* e = (char*)pBlocks->payLoad + pOneTableBlock->rowSize*(pBlocks->numOfRows-1);
+    
+    tscTrace("%p meterId:%s, sid:%d rows:%d sversion:%d skey:%" PRId64 ", ekey:%" PRId64, pSql, pOneTableBlock->meterId, pBlocks->sid,
+             pBlocks->numOfRows, pBlocks->sversion, GET_INT64_VAL(pBlocks->payLoad), GET_INT64_VAL(e));
 
     pBlocks->sid = htonl(pBlocks->sid);
     pBlocks->uid = htobe64(pBlocks->uid);

src/inc/tlog.h

@@ -113,7 +113,10 @@ extern uint32_t cdebugFlag;
   }
 #define tscPrint(...) \
   { tprintf("TSC ", 255, __VA_ARGS__); }
-
+#define tscDump(...)                                        \
+    if (cdebugFlag & DEBUG_TRACE) {                         \
+      taosPrintLongString("TSC ", cdebugFlag, __VA_ARGS__); \
+    }
 #define jniError(...)                                 \
   if (jnidebugFlag & DEBUG_ERROR) {                   \
     tprintf("ERROR JNI ", jnidebugFlag, __VA_ARGS__); \