From 2da85fb9dc8ac505c2fa0757badea2acf5fd749a Mon Sep 17 00:00:00 2001 From: Liu Jicong Date: Sat, 29 Jan 2022 20:14:33 +0800 Subject: [PATCH] clear unused code in tq --- source/dnode/vnode/inc/tq.h | 123 ------------------------------------ 1 file changed, 123 deletions(-) diff --git a/source/dnode/vnode/inc/tq.h b/source/dnode/vnode/inc/tq.h index faaf769e1a..2aceaeb016 100644 --- a/source/dnode/vnode/inc/tq.h +++ b/source/dnode/vnode/inc/tq.h @@ -35,71 +35,8 @@ extern "C" { #endif -typedef struct STqMsgHead { - int32_t protoVer; - int32_t msgType; - int64_t cgId; - int64_t clientId; -} STqMsgHead; - -typedef struct STqOneAck { - int64_t topicId; - int64_t consumeOffset; -} STqOneAck; - -typedef struct STqAcks { - int32_t ackNum; - // should be sorted - STqOneAck acks[]; -} STqAcks; - -typedef struct STqSetCurReq { - STqMsgHead head; - int64_t topicId; - int64_t offset; -} STqSetCurReq; - -typedef struct STqConsumeReq { - STqMsgHead head; - int64_t blockingTime; // milisec - STqAcks acks; -} STqConsumeReq; - -typedef struct STqMsgContent { - int64_t topicId; - int64_t msgLen; - char msg[]; -} STqMsgContent; - -typedef struct STqConsumeRsp { - STqMsgHead head; - int64_t bodySize; - STqMsgContent msgs[]; -} STqConsumeRsp; - -typedef struct STqSubscribeReq { - STqMsgHead head; - int32_t topicNum; - int64_t topic[]; -} STqSubscribeReq; - -typedef struct STqHeartbeatReq { -} STqHeartbeatReq; - -typedef struct STqHeartbeatRsp { -} STqHeartbeatRsp; - #define TQ_BUFFER_SIZE 8 -typedef struct STqExec { - void* runtimeEnv; - SSDataBlock* (*exec)(void* runtimeEnv); - void* (*assign)(void* runtimeEnv, void* inputData); - void (*clear)(void* runtimeEnv); - char* (*serialize)(struct STqExec*); - struct STqExec* (*deserialize)(char*); -} STqExec; - typedef struct STqRspHandle { void* handle; void* ahandle; @@ -107,47 +44,6 @@ typedef struct STqRspHandle { typedef enum { TQ_ITEM_READY, TQ_ITEM_PROCESS, TQ_ITEM_EMPTY } STqItemStatus; -typedef struct STqTopic STqTopic; - -typedef struct STqBufferItem { - int64_t offset; - // executors are identical but not concurrent - // so there must be a copy in each item - STqExec* executor; - int32_t status; - int64_t size; - void* content; - STqTopic* pTopic; -} STqMsgItem; - -struct STqTopic { - // char* topic; //c style, end with '\0' - // int64_t cgId; - // void* ahandle; - // int32_t head; - // int32_t tail; - int64_t nextConsumeOffset; - int64_t floatingCursor; - int64_t topicId; - void* logReader; - STqMsgItem buffer[TQ_BUFFER_SIZE]; -}; - -typedef struct STqListHandle { - STqTopic topic; - struct STqListHandle* next; -} STqList; - -typedef struct STqGroup { - int64_t clientId; - int64_t cgId; - void* ahandle; - int32_t topicNum; - STqList* head; - SList* topicList; // SList - STqRspHandle rspHandle; -} STqGroup; - typedef struct STqTaskItem { int8_t status; int64_t offset; @@ -182,11 +78,6 @@ typedef struct STqConsumerHandle { SArray* topics; // SArray } STqConsumerHandle; -typedef struct STqQueryMsg { - STqMsgItem* item; - struct STqQueryMsg* next; -} STqQueryMsg; - typedef struct STqMemRef { SMemAllocatorFactory* pAllocatorFactory; SMemAllocator* pAllocator; @@ -305,20 +196,6 @@ void tqClose(STQ*); int tqPushMsg(STQ*, void* msg, int64_t version); int tqCommit(STQ*); -int tqSetCursor(STQ*, STqSetCurReq* pMsg); - -#if 0 -int tqConsume(STQ*, SRpcMsg* pReq, SRpcMsg** pRsp); -int tqSetCursor(STQ*, STqSetCurReq* pMsg); -int tqBufferSetOffset(STqTopic*, int64_t offset); -STqTopic* tqFindTopic(STqGroup*, int64_t topicId); -STqGroup* tqGetGroup(STQ*, int64_t clientId); -STqGroup* tqOpenGroup(STQ*, int64_t topicId, int64_t cgId, int64_t cId); -int tqCloseGroup(STQ*, int64_t topicId, int64_t cgId, int64_t cId); -int tqRegisterContext(STqGroup*, void* ahandle); -int tqSendLaunchQuery(STqMsgItem*, int64_t offset); -#endif - int32_t tqProcessConsumeReq(STQ* pTq, SRpcMsg* pMsg); int32_t tqProcessSetConnReq(STQ* pTq, char* msg); -- GitLab