From d031a77b58d87184299c1435e51a1333becdfd64 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Thu, 20 Jul 2023 15:40:41 +0800 Subject: [PATCH 1/2] fix:[TD-25300]dead loop if getchar return EOF in arm64 --- tools/shell/src/shellCommand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/shell/src/shellCommand.c b/tools/shell/src/shellCommand.c index 0e305f57e9..8c91ff53e2 100644 --- a/tools/shell/src/shellCommand.c +++ b/tools/shell/src/shellCommand.c @@ -501,7 +501,7 @@ int32_t shellReadCommand(char *command) { while (1) { c = taosGetConsoleChar(); - if (c == EOF) { + if (c == (char)EOF) { return c; } From 10ebf1f43823f0b694bed7ab69f7276f168a9135 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Fri, 21 Jul 2023 11:07:34 +0800 Subject: [PATCH 2/2] fix:subscribeStb.py maybe failed --- source/dnode/vnode/src/tq/tq.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c index 03d6932578..8c9eead414 100644 --- a/source/dnode/vnode/src/tq/tq.c +++ b/source/dnode/vnode/src/tq/tq.c @@ -307,9 +307,6 @@ int32_t tqProcessOffsetCommitReq(STQ* pTq, int64_t sversion, char* msg, int32_t } else if (pOffset->val.type == TMQ_OFFSET__LOG) { tqInfo("receive offset commit msg to %s on vgId:%d, offset(type:log) version:%" PRId64, pOffset->subKey, vgId, pOffset->val.version); - if (pOffset->val.version + 1 == sversion) { - pOffset->val.version += 1; - } } else { tqError("invalid commit offset type:%d", pOffset->val.type); return -1;