confilct
This commit is contained in:
parent
7540c92f01
commit
44a099b5ab
|
@ -115,7 +115,6 @@ typedef struct tExtMemBuffer {
|
||||||
EXT_BUFFER_FLUSH_MODEL flushModel;
|
EXT_BUFFER_FLUSH_MODEL flushModel;
|
||||||
} tExtMemBuffer;
|
} tExtMemBuffer;
|
||||||
|
|
||||||
<<<<<<< HEAD:src/util/inc/textbuffer.h
|
|
||||||
typedef struct tTagSchema {
|
typedef struct tTagSchema {
|
||||||
struct SSchema *pSchema;
|
struct SSchema *pSchema;
|
||||||
int32_t numOfCols;
|
int32_t numOfCols;
|
||||||
|
@ -128,17 +127,15 @@ typedef struct tSidSet {
|
||||||
SMeterSidExtInfo **pSids;
|
SMeterSidExtInfo **pSids;
|
||||||
int32_t * starterPos; // position of each subgroup, generated according to
|
int32_t * starterPos; // position of each subgroup, generated according to
|
||||||
|
|
||||||
tTagSchema *pTagSchema;
|
SColumnModel *pColumnModel;
|
||||||
tOrderIdx orderIdx;
|
SColumnOrderInfo orderIdx;
|
||||||
} tSidSet;
|
} tSidSet;
|
||||||
|
|
||||||
=======
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param fileNamePattern
|
* @param fileNamePattern
|
||||||
* @param dstPath
|
* @param dstPath
|
||||||
*/
|
*/
|
||||||
>>>>>>> develop:src/inc/textbuffer.h
|
|
||||||
void getTmpfilePath(const char *fileNamePattern, char *dstPath);
|
void getTmpfilePath(const char *fileNamePattern, char *dstPath);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -32,15 +32,6 @@ extern "C" {
|
||||||
* Note:
|
* Note:
|
||||||
* 1. we implement a quick sort algorithm, may remove it later.
|
* 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);
|
typedef int32_t (*__ext_compar_fn_t)(const void *p1, const void *p2, void *param);
|
||||||
|
|
||||||
|
|
|
@ -4562,11 +4562,7 @@ int32_t vnodeMultiMeterQueryPrepare(SQInfo *pQInfo, SQuery *pQuery, void *param)
|
||||||
tsBufSetTraverseOrder(pRuntimeEnv->pTSBuf, order);
|
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);
|
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) {
|
if (ret != TSDB_CODE_SUCCESS) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue