From dce8ec169eaab9571216e0c719824c823567aa48 Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Fri, 14 Aug 2020 13:28:10 +0800
Subject: [PATCH] fix server&client side crash

in singe table subscription, after consume all data, the next call to consume crash both client and server.

this commit fix the issue.
---
 src/client/src/tscSub.c      | 14 ++++++++------
 tests/examples/c/subscribe.c |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/client/src/tscSub.c b/src/client/src/tscSub.c
index 0e1be926f4..76bce19668 100644
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -405,16 +405,20 @@ TAOS_SUB *taos_subscribe(TAOS *taos, int restart, const char* topic, const char
   return pSub;
 }
 
-void taos_free_result_imp(SSqlObj* pSql, int keepCmd);
-
 TAOS_RES *taos_consume(TAOS_SUB *tsub) {
   SSub *pSub = (SSub *)tsub;
   if (pSub == NULL) return NULL;
 
   tscSaveSubscriptionProgress(pSub);
 
-  SSqlObj* pSql = pSub->pSql;
+  SSqlObj *pSql = pSub->pSql;
   SSqlRes *pRes = &pSql->res;
+  SSqlCmd *pCmd = &pSql->cmd;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  if (taosArrayGetSize(pSub->progress) > 0) { // fix crash in single tabel subscription
+    pQueryInfo->window.skey = ((SSubscriptionProgress*)taosArrayGet(pSub->progress, 0))->key;
+  }
 
   if (pSub->pTimer == NULL) {
     int64_t duration = taosGetTimestampMs() - pSub->lastConsumeTime;
@@ -436,8 +440,6 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
       tscDebug("table synchronization completed");
     }
 
-    SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-    
     uint32_t type = pQueryInfo->type;
     tscFreeSqlResult(pSql);
     pRes->numOfRows = 1;
@@ -445,7 +447,7 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
     pSql->cmd.command = TSDB_SQL_SELECT;
     pQueryInfo->type = type;
 
-    tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0)->vgroupIndex = 0;
+    pTableMetaInfo->vgroupIndex = 0;
 
     pSql->fp = asyncCallback;
     pSql->fetchFp = asyncCallback;
diff --git a/tests/examples/c/subscribe.c b/tests/examples/c/subscribe.c
index db5ad34ee7..8368af18f7 100644
--- a/tests/examples/c/subscribe.c
+++ b/tests/examples/c/subscribe.c
@@ -56,7 +56,7 @@ void check_row_count(int line, TAOS_RES* res, int expected) {
 
 
 void do_query(TAOS* taos, const char* sql) {
-  TAOS_RES* res = taos_query(taos, "drop database if exists test;");
+  TAOS_RES* res = taos_query(taos, sql);
   taos_free_result(res);
 }
 
-- 
GitLab