From eb2e0b958e1946fe1d2f2870e0087a7cd8844cfa Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 30 Oct 2020 14:35:43 +0800
Subject: [PATCH] [TD-225] fix bugs

---
 src/client/src/tscSubquery.c | 1 +
 src/client/src/tscUtil.c     | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 3e907e5d77..c747eb2fe8 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -1449,6 +1449,7 @@ void tscHandleMasterJoinQuery(SSqlObj* pSql) {
 
   tscDebug("%p start subquery, total:%d", pSql, pQueryInfo->numOfTables);
   for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
+
     SJoinSupporter *pSupporter = tscCreateJoinSupporter(pSql, i);
     
     if (pSupporter == NULL) {  // failed to create support struct, abort current query
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index e2cc440335..7946214d4a 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -2158,7 +2158,7 @@ int16_t tscGetJoinTagColIdByUid(STagCond* pTagCond, uint64_t uid) {
 }
 
 int16_t tscGetTagColIndexById(STableMeta* pTableMeta, int16_t colId) {
-  int32_t numOfTags = tscGetNumOfColumns(pTableMeta);
+  int32_t numOfTags = tscGetNumOfTags(pTableMeta);
 
   SSchema* pSchema = tscGetTableTagSchema(pTableMeta);
   for(int32_t i = 0; i < numOfTags; ++i) {
@@ -2167,7 +2167,8 @@ int16_t tscGetTagColIndexById(STableMeta* pTableMeta, int16_t colId) {
     }
   }
 
-  return -1;
+  // can not reach here
+  assert(0);
 }
 
 bool tscIsUpdateQuery(SSqlObj* pSql) {
-- 
GitLab