From 992a449ed6167c3144b990accd4626d415def36d Mon Sep 17 00:00:00 2001
From: hjxilinx <hjxilinx@163.com>
Date: Wed, 11 Dec 2019 15:30:54 +0800
Subject: [PATCH] [tbase-1327]

---
 src/client/src/tscServer.c        | 18 ++++++++----------
 src/system/detail/src/mgmtMeter.c |  7 +++++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 17d870fcb2..e10865b642 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -1507,7 +1507,6 @@ int tscBuildQueryMsg(SSqlObj *pSql) {
     pQueryMsg->uid = pMeterMeta->uid;
     pQueryMsg->numOfTagsCols = 0;
   } else {  // query on metric
-    SMetricMeta *pMetricMeta = pMeterMetaInfo->pMetricMeta;
     if (pMeterMetaInfo->vnodeIndex < 0) {
       tscError("%p error vnodeIdx:%d", pSql, pMeterMetaInfo->vnodeIndex);
       return -1;
@@ -2872,15 +2871,14 @@ int tscBuildMetricMetaMsg(SSqlObj *pSql) {
         pElem->groupbyTagColumnList = htonl(offset);
         for (int32_t j = 0; j < pCmd->groupbyExpr.numOfGroupCols; ++j) {
           SColIndexEx *pCol = &pCmd->groupbyExpr.columnInfo[j];
-
-          *((int16_t *)pMsg) = pCol->colId;
-          pMsg += sizeof(pCol->colId);
-
-          *((int16_t *)pMsg) += pCol->colIdx;
-          pMsg += sizeof(pCol->colIdx);
-
-          *((int16_t *)pMsg) += pCol->flag;
-          pMsg += sizeof(pCol->flag);
+          SColIndexEx* pDestCol = (SColIndexEx*) pMsg;
+          
+          pDestCol->colIdxInBuf = 0;
+          pDestCol->colIdx = htons(pCol->colIdx);
+          pDestCol->colId = htons(pDestCol->colId);
+          pDestCol->flag = htons(pDestCol->flag);
+          
+          pMsg += sizeof(SColIndexEx);
         }
       }
     }
diff --git a/src/system/detail/src/mgmtMeter.c b/src/system/detail/src/mgmtMeter.c
index 5ef9f61b0b..be141f278d 100644
--- a/src/system/detail/src/mgmtMeter.c
+++ b/src/system/detail/src/mgmtMeter.c
@@ -1094,9 +1094,12 @@ static SMetricMetaElemMsg *doConvertMetricMetaMsg(SMetricMetaMsg *pMetricMetaMsg
 
   pElem->groupbyTagColumnList = htonl(pElem->groupbyTagColumnList);
 
-  int16_t *groupColIds = (int16_t*) (((char *)pMetricMetaMsg) + pElem->groupbyTagColumnList);
+  SColIndexEx *groupColIds = (SColIndexEx*) (((char *)pMetricMetaMsg) + pElem->groupbyTagColumnList);
   for (int32_t i = 0; i < pElem->numOfGroupCols; ++i) {
-    groupColIds[i] = htons(groupColIds[i]);
+    groupColIds[i].colId = htons(groupColIds[i].colId);
+    groupColIds[i].colIdx = htons(groupColIds[i].colIdx);
+    groupColIds[i].flag = htons(groupColIds[i].flag);
+    groupColIds[i].colIdxInBuf = 0;
   }
 
   return pElem;