From 278cf9d3271a76e349c38e52af0f00b39f4a9604 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 11 Nov 2022 17:47:48 +0800 Subject: [PATCH] refact: remove sync ping and pingreply --- include/common/tmsgdef.h | 4 +-- source/dnode/mgmt/mgmt_mnode/src/mmHandle.c | 2 -- source/dnode/mgmt/mgmt_vnode/src/vmHandle.c | 2 -- .../test/syncConfigChangeSnapshotTest.cpp | 24 ++++++++-------- .../libs/sync/test/syncConfigChangeTest.cpp | 20 ++++++------- source/libs/sync/test/syncElectTest.cpp | 18 ++++++------ source/libs/sync/test/syncEnqTest.cpp | 18 ++++++------ source/libs/sync/test/syncIOSendMsgTest.cpp | 18 ++++++------ source/libs/sync/test/syncInitTest.cpp | 16 +++++------ source/libs/sync/test/syncPingSelfTest.cpp | 16 +++++------ source/libs/sync/test/syncPingTimerTest.cpp | 16 +++++------ source/libs/sync/test/syncPingTimerTest2.cpp | 16 +++++------ source/libs/sync/test/syncReplicateTest.cpp | 20 ++++++------- source/libs/sync/test/syncSnapshotTest.cpp | 16 +++++------ source/libs/sync/test/syncTestTool.cpp | 20 ++++++------- .../libs/sync/test/syncVotesGrantedTest.cpp | 16 +++++------ .../libs/sync/test/syncVotesRespondTest.cpp | 16 +++++------ source/libs/sync/test/syncWriteTest.cpp | 16 +++++------ .../libs/sync/test/sync_test_lib/inc/syncIO.h | 4 +++ .../sync/test/sync_test_lib/inc/syncTest.h | 1 - .../test/sync_test_lib/src/syncMainDebug.c | 28 +++++++++---------- 21 files changed, 153 insertions(+), 154 deletions(-) diff --git a/include/common/tmsgdef.h b/include/common/tmsgdef.h index a12a635837..f4890206fe 100644 --- a/include/common/tmsgdef.h +++ b/include/common/tmsgdef.h @@ -250,8 +250,8 @@ enum { TD_NEW_MSG_SEG(TDMT_SYNC_MSG) TD_DEF_MSG_TYPE(TDMT_SYNC_TIMEOUT, "sync-timer", NULL, NULL) - TD_DEF_MSG_TYPE(TDMT_SYNC_PING, "sync-ping", NULL, NULL) - TD_DEF_MSG_TYPE(TDMT_SYNC_PING_REPLY, "sync-ping-reply", NULL, NULL) + TD_DEF_MSG_TYPE(TDMT_SYNC_PING, "sync-ping", NULL, NULL) // no longer used + TD_DEF_MSG_TYPE(TDMT_SYNC_PING_REPLY, "sync-ping-reply", NULL, NULL) // no longer used TD_DEF_MSG_TYPE(TDMT_SYNC_CLIENT_REQUEST, "sync-client-request", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_SYNC_CLIENT_REQUEST_BATCH, "sync-client-request-batch", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_SYNC_CLIENT_REQUEST_REPLY, "sync-client-request-reply", NULL, NULL) diff --git a/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c b/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c index ec4f42c847..a322f76800 100644 --- a/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c +++ b/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c @@ -183,8 +183,6 @@ SArray *mmGetMsgHandles() { if (dmSetMgmtHandle(pArray, TDMT_VND_COMPACT_RSP, mmPutMsgToWriteQueue, 0) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_SYNC_TIMEOUT, mmPutMsgToSyncQueue, 1) == NULL) goto _OVER; - if (dmSetMgmtHandle(pArray, TDMT_SYNC_PING, mmPutMsgToSyncQueue, 1) == NULL) goto _OVER; - if (dmSetMgmtHandle(pArray, TDMT_SYNC_PING_REPLY, mmPutMsgToSyncQueue, 1) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_SYNC_CLIENT_REQUEST, mmPutMsgToSyncQueue, 1) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_SYNC_CLIENT_REQUEST_BATCH, mmPutMsgToSyncQueue, 1) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_SYNC_CLIENT_REQUEST_REPLY, mmPutMsgToSyncQueue, 1) == NULL) goto _OVER; diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c index 2265f58060..e15d7ac3df 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c @@ -450,8 +450,6 @@ SArray *vmGetMsgHandles() { if (dmSetMgmtHandle(pArray, TDMT_DND_DROP_VNODE, vmPutMsgToMgmtQueue, 0) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_SYNC_TIMEOUT, vmPutMsgToSyncQueue, 0) == NULL) goto _OVER; - if (dmSetMgmtHandle(pArray, TDMT_SYNC_PING, vmPutMsgToSyncQueue, 0) == NULL) goto _OVER; - if (dmSetMgmtHandle(pArray, TDMT_SYNC_PING_REPLY, vmPutMsgToSyncQueue, 0) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_SYNC_CLIENT_REQUEST, vmPutMsgToSyncQueue, 0) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_SYNC_CLIENT_REQUEST_BATCH, vmPutMsgToSyncQueue, 0) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_SYNC_CLIENT_REQUEST_REPLY, vmPutMsgToSyncQueue, 0) == NULL) goto _OVER; diff --git a/source/libs/sync/test/syncConfigChangeSnapshotTest.cpp b/source/libs/sync/test/syncConfigChangeSnapshotTest.cpp index c29def9ca3..057f2ea6dd 100644 --- a/source/libs/sync/test/syncConfigChangeSnapshotTest.cpp +++ b/source/libs/sync/test/syncConfigChangeSnapshotTest.cpp @@ -223,18 +223,18 @@ int64_t createSyncNode(int32_t replicaNum, int32_t myIndex, int32_t vgId, SWal* SSyncNode* pSyncNode = (SSyncNode*)syncNodeAcquire(rid); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; - gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; - - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - - gSyncIO->FpOnSyncSnapshot = pSyncNode->FpOnSnapshot; - gSyncIO->FpOnSyncSnapshotReply = pSyncNode->FpOnSnapshotReply; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; + + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + + // gSyncIO->FpOnSyncSnapshot = pSyncNode->FpOnSnapshot; + // gSyncIO->FpOnSyncSnapshotReply = pSyncNode->FpOnSnapshotReply; gSyncIO->pSyncNode = pSyncNode; syncNodeRelease(pSyncNode); diff --git a/source/libs/sync/test/syncConfigChangeTest.cpp b/source/libs/sync/test/syncConfigChangeTest.cpp index 23acadc0cc..bab3d2236f 100644 --- a/source/libs/sync/test/syncConfigChangeTest.cpp +++ b/source/libs/sync/test/syncConfigChangeTest.cpp @@ -146,16 +146,16 @@ int64_t createSyncNode(int32_t replicaNum, int32_t myIndex, int32_t vgId, SWal* SSyncNode* pSyncNode = (SSyncNode*)syncNodeAcquire(rid); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; - gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; gSyncIO->pSyncNode = pSyncNode; syncNodeRelease(pSyncNode); diff --git a/source/libs/sync/test/syncElectTest.cpp b/source/libs/sync/test/syncElectTest.cpp index 59d731c823..58c0e7d13a 100644 --- a/source/libs/sync/test/syncElectTest.cpp +++ b/source/libs/sync/test/syncElectTest.cpp @@ -59,15 +59,15 @@ SSyncNode* createSyncNode(int32_t replicaNum, int32_t myIndex, int32_t vgId, SWa SSyncNode* pSyncNode = syncNodeOpen(&syncInfo); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; gSyncIO->pSyncNode = pSyncNode; syncNodeStart(pSyncNode); diff --git a/source/libs/sync/test/syncEnqTest.cpp b/source/libs/sync/test/syncEnqTest.cpp index 54bfb1b387..d2ae46a443 100644 --- a/source/libs/sync/test/syncEnqTest.cpp +++ b/source/libs/sync/test/syncEnqTest.cpp @@ -38,15 +38,15 @@ SSyncNode* syncNodeInit() { SSyncNode* pSyncNode = syncNodeOpen(&syncInfo); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; gSyncIO->pSyncNode = pSyncNode; return pSyncNode; diff --git a/source/libs/sync/test/syncIOSendMsgTest.cpp b/source/libs/sync/test/syncIOSendMsgTest.cpp index a082f9373a..ae74929b7b 100644 --- a/source/libs/sync/test/syncIOSendMsgTest.cpp +++ b/source/libs/sync/test/syncIOSendMsgTest.cpp @@ -38,15 +38,15 @@ SSyncNode* syncNodeInit() { SSyncNode* pSyncNode = syncNodeOpen(&syncInfo); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; gSyncIO->pSyncNode = pSyncNode; return pSyncNode; diff --git a/source/libs/sync/test/syncInitTest.cpp b/source/libs/sync/test/syncInitTest.cpp index b15a767db5..1e0ff54514 100644 --- a/source/libs/sync/test/syncInitTest.cpp +++ b/source/libs/sync/test/syncInitTest.cpp @@ -38,14 +38,14 @@ SSyncNode* syncNodeInit() { SSyncNode* pSyncNode = syncNodeOpen(&syncInfo); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; gSyncIO->pSyncNode = pSyncNode; return pSyncNode; diff --git a/source/libs/sync/test/syncPingSelfTest.cpp b/source/libs/sync/test/syncPingSelfTest.cpp index 19f377e037..975565770a 100644 --- a/source/libs/sync/test/syncPingSelfTest.cpp +++ b/source/libs/sync/test/syncPingSelfTest.cpp @@ -39,14 +39,14 @@ SSyncNode* syncNodeInit() { SSyncNode* pSyncNode = syncNodeOpen(&syncInfo); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; gSyncIO->pSyncNode = pSyncNode; return pSyncNode; diff --git a/source/libs/sync/test/syncPingTimerTest.cpp b/source/libs/sync/test/syncPingTimerTest.cpp index ded7e22eac..8aa4e9dada 100644 --- a/source/libs/sync/test/syncPingTimerTest.cpp +++ b/source/libs/sync/test/syncPingTimerTest.cpp @@ -39,14 +39,14 @@ SSyncNode* syncNodeInit() { SSyncNode* pSyncNode = syncNodeOpen(&syncInfo); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; gSyncIO->pSyncNode = pSyncNode; return pSyncNode; diff --git a/source/libs/sync/test/syncPingTimerTest2.cpp b/source/libs/sync/test/syncPingTimerTest2.cpp index 4f1bb64798..e77358f375 100644 --- a/source/libs/sync/test/syncPingTimerTest2.cpp +++ b/source/libs/sync/test/syncPingTimerTest2.cpp @@ -39,14 +39,14 @@ SSyncNode* syncNodeInit() { SSyncNode* pSyncNode = syncNodeOpen(&syncInfo); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; gSyncIO->pSyncNode = pSyncNode; return pSyncNode; diff --git a/source/libs/sync/test/syncReplicateTest.cpp b/source/libs/sync/test/syncReplicateTest.cpp index 2419ec0974..4a82bba15d 100644 --- a/source/libs/sync/test/syncReplicateTest.cpp +++ b/source/libs/sync/test/syncReplicateTest.cpp @@ -120,16 +120,16 @@ int64_t createSyncNode(int32_t replicaNum, int32_t myIndex, int32_t vgId, SWal* SSyncNode* pSyncNode = (SSyncNode*)syncNodeAcquire(rid); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; - gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; gSyncIO->pSyncNode = pSyncNode; syncNodeRelease(pSyncNode); diff --git a/source/libs/sync/test/syncSnapshotTest.cpp b/source/libs/sync/test/syncSnapshotTest.cpp index 40eac0b55f..15854eeca6 100644 --- a/source/libs/sync/test/syncSnapshotTest.cpp +++ b/source/libs/sync/test/syncSnapshotTest.cpp @@ -116,14 +116,14 @@ SSyncNode *syncNodeInit() { SSyncNode *pSyncNode = syncNodeOpen(&syncInfo); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; gSyncIO->pSyncNode = pSyncNode; syncNodeStart(pSyncNode); diff --git a/source/libs/sync/test/syncTestTool.cpp b/source/libs/sync/test/syncTestTool.cpp index e8d40d5054..8c486df118 100644 --- a/source/libs/sync/test/syncTestTool.cpp +++ b/source/libs/sync/test/syncTestTool.cpp @@ -257,16 +257,16 @@ int64_t createSyncNode(int32_t replicaNum, int32_t myIndex, int32_t vgId, SWal* SSyncNode* pSyncNode = (SSyncNode*)syncNodeAcquire(rid); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; - gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncSnapshot = pSyncNode->FpOnSnapshot; - gSyncIO->FpOnSyncSnapshotReply = pSyncNode->FpOnSnapshotReply; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncSnapshot = pSyncNode->FpOnSnapshot; + // gSyncIO->FpOnSyncSnapshotReply = pSyncNode->FpOnSnapshotReply; gSyncIO->pSyncNode = pSyncNode; syncNodeRelease(pSyncNode); diff --git a/source/libs/sync/test/syncVotesGrantedTest.cpp b/source/libs/sync/test/syncVotesGrantedTest.cpp index 2d2a12c656..67573a6a37 100644 --- a/source/libs/sync/test/syncVotesGrantedTest.cpp +++ b/source/libs/sync/test/syncVotesGrantedTest.cpp @@ -39,14 +39,14 @@ SSyncNode* syncNodeInit() { pSyncNode = syncNodeOpen(&syncInfo); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; gSyncIO->pSyncNode = pSyncNode; return pSyncNode; diff --git a/source/libs/sync/test/syncVotesRespondTest.cpp b/source/libs/sync/test/syncVotesRespondTest.cpp index 712e97edc9..3a0dac98b0 100644 --- a/source/libs/sync/test/syncVotesRespondTest.cpp +++ b/source/libs/sync/test/syncVotesRespondTest.cpp @@ -40,14 +40,14 @@ SSyncNode* syncNodeInit() { pSyncNode = syncNodeOpen(&syncInfo); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; gSyncIO->pSyncNode = pSyncNode; return pSyncNode; diff --git a/source/libs/sync/test/syncWriteTest.cpp b/source/libs/sync/test/syncWriteTest.cpp index 56dd0a5845..aae1862681 100644 --- a/source/libs/sync/test/syncWriteTest.cpp +++ b/source/libs/sync/test/syncWriteTest.cpp @@ -94,14 +94,14 @@ SSyncNode *syncNodeInit() { SSyncNode *pSyncNode = syncNodeOpen(&syncInfo); assert(pSyncNode != NULL); - gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; - gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; - gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; - gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; - gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; - gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; - gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; - gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; + // gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing; + // gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest; + // gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply; + // gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote; + // gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply; + // gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries; + // gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply; + // gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout; gSyncIO->pSyncNode = pSyncNode; syncNodeStart(pSyncNode); diff --git a/source/libs/sync/test/sync_test_lib/inc/syncIO.h b/source/libs/sync/test/sync_test_lib/inc/syncIO.h index 955a832b68..2c5e19d863 100644 --- a/source/libs/sync/test/sync_test_lib/inc/syncIO.h +++ b/source/libs/sync/test/sync_test_lib/inc/syncIO.h @@ -25,6 +25,7 @@ extern "C" { #include #include "os.h" #include "syncInt.h" +#include "syncTest.h" #include "taosdef.h" #include "tqueue.h" #include "trpc.h" @@ -32,6 +33,9 @@ extern "C" { #define TICK_Q_TIMER_MS 1000 #define TICK_Ping_TIMER_MS 1000 +typedef struct SyncPing SyncPing; +typedef struct SyncPingReply SyncPingReply; + typedef struct SSyncIO { STaosQueue *pMsgQ; STaosQset *pQset; diff --git a/source/libs/sync/test/sync_test_lib/inc/syncTest.h b/source/libs/sync/test/sync_test_lib/inc/syncTest.h index c02e3013d1..f531304178 100644 --- a/source/libs/sync/test/sync_test_lib/inc/syncTest.h +++ b/source/libs/sync/test/sync_test_lib/inc/syncTest.h @@ -213,7 +213,6 @@ int32_t syncNodePingSelf(SSyncNode* pSyncNode); int32_t syncNodePingPeers(SSyncNode* pSyncNode); int32_t syncNodePingAll(SSyncNode* pSyncNode); - #ifdef __cplusplus } #endif diff --git a/source/libs/sync/test/sync_test_lib/src/syncMainDebug.c b/source/libs/sync/test/sync_test_lib/src/syncMainDebug.c index b7a9d86ecc..6b461da0e5 100644 --- a/source/libs/sync/test/sync_test_lib/src/syncMainDebug.c +++ b/source/libs/sync/test/sync_test_lib/src/syncMainDebug.c @@ -138,20 +138,20 @@ cJSON* syncNode2Json(const SSyncNode* pSyncNode) { cJSON_AddStringToObject(pRoot, "heartbeatTimerCounter", u64buf); // callback - snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnPing); - cJSON_AddStringToObject(pRoot, "FpOnPing", u64buf); - snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnPingReply); - cJSON_AddStringToObject(pRoot, "FpOnPingReply", u64buf); - snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnRequestVote); - cJSON_AddStringToObject(pRoot, "FpOnRequestVote", u64buf); - snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnRequestVoteReply); - cJSON_AddStringToObject(pRoot, "FpOnRequestVoteReply", u64buf); - snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnAppendEntries); - cJSON_AddStringToObject(pRoot, "FpOnAppendEntries", u64buf); - snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnAppendEntriesReply); - cJSON_AddStringToObject(pRoot, "FpOnAppendEntriesReply", u64buf); - snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnTimeout); - cJSON_AddStringToObject(pRoot, "FpOnTimeout", u64buf); + // snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnPing); + // cJSON_AddStringToObject(pRoot, "FpOnPing", u64buf); + // snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnPingReply); + // cJSON_AddStringToObject(pRoot, "FpOnPingReply", u64buf); + // snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnRequestVote); + // cJSON_AddStringToObject(pRoot, "FpOnRequestVote", u64buf); + // snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnRequestVoteReply); + // cJSON_AddStringToObject(pRoot, "FpOnRequestVoteReply", u64buf); + // snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnAppendEntries); + // cJSON_AddStringToObject(pRoot, "FpOnAppendEntries", u64buf); + // snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnAppendEntriesReply); + // cJSON_AddStringToObject(pRoot, "FpOnAppendEntriesReply", u64buf); + // snprintf(u64buf, sizeof(u64buf), "%p", pSyncNode->FpOnTimeout); + // cJSON_AddStringToObject(pRoot, "FpOnTimeout", u64buf); // restoreFinish cJSON_AddNumberToObject(pRoot, "restoreFinish", pSyncNode->restoreFinish); -- GitLab