From 44a099b5abd2a4fde671ef1f352df5fb839c3396 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Wed, 12 Feb 2020 10:53:54 +0800
Subject: [PATCH] confilct

---
 src/util/inc/textbuffer.h             | 7 ++-----
 src/vnode/detail/inc/vnodeTagMgmt.h   | 9 ---------
 src/vnode/detail/src/vnodeQueryImpl.c | 4 ----
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/util/inc/textbuffer.h b/src/util/inc/textbuffer.h
index 4e31ebfcb8..9690ce2ba8 100644
--- a/src/util/inc/textbuffer.h
+++ b/src/util/inc/textbuffer.h
@@ -115,7 +115,6 @@ typedef struct tExtMemBuffer {
   EXT_BUFFER_FLUSH_MODEL flushModel;
 } tExtMemBuffer;
 
-<<<<<<< HEAD:src/util/inc/textbuffer.h
 typedef struct tTagSchema {
   struct SSchema *pSchema;
   int32_t         numOfCols;
@@ -128,17 +127,15 @@ typedef struct tSidSet {
   SMeterSidExtInfo **pSids;
   int32_t *          starterPos;  // position of each subgroup, generated according to
 
-  tTagSchema *pTagSchema;
-  tOrderIdx   orderIdx;
+  SColumnModel      *pColumnModel;
+  SColumnOrderInfo   orderIdx;
 } tSidSet;
 
-=======
 /**
  *
  * @param fileNamePattern
  * @param dstPath
  */
->>>>>>> develop:src/inc/textbuffer.h
 void getTmpfilePath(const char *fileNamePattern, char *dstPath);
 
 /**
diff --git a/src/vnode/detail/inc/vnodeTagMgmt.h b/src/vnode/detail/inc/vnodeTagMgmt.h
index b801d1c541..88eb7ccb6e 100644
--- a/src/vnode/detail/inc/vnodeTagMgmt.h
+++ b/src/vnode/detail/inc/vnodeTagMgmt.h
@@ -32,15 +32,6 @@ extern "C" {
  * Note:
  * 1. we implement a quick sort algorithm, may remove it later.
  */
-typedef struct tSidSet {
-  int32_t            numOfSids;
-  int32_t            numOfSubSet;
-  SMeterSidExtInfo **pSids;
-  int32_t *          starterPos;  // position of each subgroup, generated according to
-
-  SColumnModel      *pColumnModel;
-  SColumnOrderInfo   orderIdx;
-} tSidSet;
 
 typedef int32_t (*__ext_compar_fn_t)(const void *p1, const void *p2, void *param);
 
diff --git a/src/vnode/detail/src/vnodeQueryImpl.c b/src/vnode/detail/src/vnodeQueryImpl.c
index 166984d25a..109ecb3625 100644
--- a/src/vnode/detail/src/vnodeQueryImpl.c
+++ b/src/vnode/detail/src/vnodeQueryImpl.c
@@ -4562,11 +4562,7 @@ int32_t vnodeMultiMeterQueryPrepare(SQInfo *pQInfo, SQuery *pQuery, void *param)
     tsBufSetTraverseOrder(pRuntimeEnv->pTSBuf, order);
   }
 
-<<<<<<< HEAD:src/vnode/detail/src/vnodeQueryImpl.c
-  int32_t ret = setupQueryRuntimeEnv(pTable, pQuery, &pSupporter->runtimeEnv, pTagSchema, TSQL_SO_ASC, true);
-=======
   int32_t ret = setupQueryRuntimeEnv(pMeter, pQuery, &pSupporter->runtimeEnv, pTagSchemaInfo, TSQL_SO_ASC, true);
->>>>>>> develop:src/system/detail/src/vnodeQueryImpl.c
   if (ret != TSDB_CODE_SUCCESS) {
     return ret;
   }
-- 
GitLab