xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix:[TS-5776]add raw type from consumer

This commit is contained in:
wangmm0220 2025-01-24 16:55:53 +08:00
parent 9074a999d0
commit b5edb79d48
9 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/CMakeLists.txt
View File

@ -74,7 +74,6 @@ endif()
# jemalloc # jemalloc
if(${JEMALLOC_ENABLED}) if(${JEMALLOC_ENABLED})
cat("${TD_SUPPORT_DIR}/jemalloc_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) cat("${TD_SUPPORT_DIR}/jemalloc_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
MESSAGE("JEMALLOC_ENABLED is on")
endif() endif()
# msvc regex # msvc regex

5
include/libs/qcom/query.h
View File

@ -222,10 +222,7 @@ typedef struct STableDataCxt {
STSchema* pSchema; STSchema* pSchema;
SBoundColInfo boundColsInfo; SBoundColInfo boundColsInfo;
SArray* pValues; SArray* pValues;
union { SSubmitTbData* pData;
SSubmitTbData* pData;
void* raw;
};
SRowKey lastKey; SRowKey lastKey;
bool ordered; bool ordered;
bool duplicateTs; bool duplicateTs;

2
source/client/src/clientMain.c
View File

@ -253,7 +253,7 @@ void taos_cleanup(void) {
taosCloseRef(id); taosCloseRef(id);
nodesDestroyAllocatorSet(); nodesDestroyAllocatorSet();
cleanupAppInfo(); // cleanupAppInfo();
rpcCleanup(); rpcCleanup();
tscDebug("rpc cleanup"); tscDebug("rpc cleanup");

2
source/client/src/clientRawBlockWrite.c
View File

@ -1020,7 +1020,7 @@ static int32_t taosCreateStb(TAOS* taos, void* meta, uint32_t metaLen) {
return TSDB_CODE_INVALID_PARA; return TSDB_CODE_INVALID_PARA;
} }
SVCreateStbReq req = {0}; SVCreateStbReq req = {0};
SDecoder coder; SDecoder coder = {0};
SMCreateStbReq pReq = {0}; SMCreateStbReq pReq = {0};
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
SRequestObj* pRequest = NULL; SRequestObj* pRequest = NULL;

6
source/client/src/clientTmq.c
View File

@ -286,7 +286,7 @@ typedef struct {
} SVgroupSaveInfo; } SVgroupSaveInfo;
static TdThreadOnce tmqInit = PTHREAD_ONCE_INIT; // initialize only once static TdThreadOnce tmqInit = PTHREAD_ONCE_INIT; // initialize only once
volatile int32_t tmqInitRes = -1; // initialize rsp code volatile int32_t tmqInitRes = 0; // initialize rsp code
static SMqMgmt tmqMgmt = {0}; static SMqMgmt tmqMgmt = {0};
tmq_conf_t* tmq_conf_new() { tmq_conf_t* tmq_conf_new() {
@ -2364,10 +2364,6 @@ static SMqRspObj* buildRsp(SMqPollRspWrapper* pollRspWrapper){
SMqDataRsp dataRsp; SMqDataRsp dataRsp;
SMqMetaRsp metaRsp; SMqMetaRsp metaRsp;
SMqBatchMetaRsp batchMetaRsp; SMqBatchMetaRsp batchMetaRsp;
struct{
int32_t len;
void* rawData;
};
} MEMSIZE; } MEMSIZE;
SMqRspObj* pRspObj = taosMemoryCalloc(1, sizeof(SMqRspObj)); SMqRspObj* pRspObj = taosMemoryCalloc(1, sizeof(SMqRspObj));

3
source/common/src/msg/tmsg.c
View File

@ -11416,9 +11416,6 @@ int32_t tDecodeMqDataRspCommon(SDecoder *pDecoder, SMqDataRsp *pRsp) {
if (taosArrayPush(pRsp->blockData, &data) == NULL) { if (taosArrayPush(pRsp->blockData, &data) == NULL) {
TAOS_CHECK_EXIT(terrno); TAOS_CHECK_EXIT(terrno);
} }
// for (int m= 0; m < 56; m++){
// printf("decode data[%d] = %d\n", m, *((int8_t *)data+18+m));
// }
int32_t len = bLen; int32_t len = bLen;
if (taosArrayPush(pRsp->blockDataLen, &len) == NULL) { if (taosArrayPush(pRsp->blockDataLen, &len) == NULL) {
TAOS_CHECK_EXIT(terrno); TAOS_CHECK_EXIT(terrno);

2
source/dnode/vnode/src/tq/tqScan.c
View File

@ -352,7 +352,7 @@ static void tqProcessSubData(STQ* pTq, STqHandle* pHandle, SMqDataRsp* pRsp, int
} }
// this submit data is metadata and previous data is data // this submit data is metadata and previous data is data
if (rawList != NULL && *totalRows > 0 && pSubmitTbData->pCreateTbReq != NULL && taosArrayGetSize(pBlocks) > 0){ if (rawList != NULL && *totalRows > 0 && pSubmitTbData->pCreateTbReq != NULL && taosArrayGetSize(pBlocks) > 0 && pRsp->createTableNum <= 1){
tqDebug("poll rawdata split,vgId:%d, uid:%" PRId64 ", this submit data is metadata and previous data is data", pTq->pVnode->config.vgId, pExec->pTqReader->lastBlkUid); tqDebug("poll rawdata split,vgId:%d, uid:%" PRId64 ", this submit data is metadata and previous data is data", pTq->pVnode->config.vgId, pExec->pTqReader->lastBlkUid);
terrno = TSDB_CODE_TMQ_DUPLICATE_UID; terrno = TSDB_CODE_TMQ_DUPLICATE_UID;
pRsp->createTableNum = 0; pRsp->createTableNum = 0;

4
tests/system-test/7-tmq/tmq_taosx.py
View File

@ -67,7 +67,7 @@ class TDTestCase:
tdSql.checkData(1, 5, "sttb4") tdSql.checkData(1, 5, "sttb4")
tdSql.query("select * from stt order by ts") tdSql.query("select * from stt order by ts")
tdSql.checkRows(3) tdSql.checkRows(5)
tdSql.checkData(0, 1, 1) tdSql.checkData(0, 1, 1)
tdSql.checkData(2, 1, 21) tdSql.checkData(2, 1, 21)
tdSql.checkData(0, 2, 2) tdSql.checkData(0, 2, 2)
@ -98,7 +98,7 @@ class TDTestCase:
tdSql.checkData(1, 5, "sttb4") tdSql.checkData(1, 5, "sttb4")
tdSql.query("select * from stt order by ts") tdSql.query("select * from stt order by ts")
tdSql.checkRows(3) tdSql.checkRows(5)
tdSql.checkData(0, 1, 1) tdSql.checkData(0, 1, 1)
tdSql.checkData(2, 1, 21) tdSql.checkData(2, 1, 21)
tdSql.checkData(0, 2, 2) tdSql.checkData(0, 2, 2)

2
utils/test/c/tmq_taosx_ci.c
View File

@ -427,7 +427,7 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes) {
pRes = pRes =
taos_query(pConn, taos_query(pConn,
"insert into stt1 values(now - 2s, 3, 2, 'stt1')"); "insert into stt1 values(now + 322s, 3, 2, 'stt1')");
if (taos_errno(pRes) != 0) { if (taos_errno(pRes) != 0) {
printf("failed to create child table stt1, reason:%s\n", taos_errstr(pRes)); printf("failed to create child table stt1, reason:%s\n", taos_errstr(pRes));
return -1; return -1;