Compare commits

...

7 Commits

Author SHA1 Message Date
dongming chen 319ffbcd57
fix: TD-34444-memery-access-error (#30664) 2025-04-09 14:47:03 +08:00
dongming chen 712cb6652b
fix: TS-6276-grant-format (#30701) 2025-04-09 14:40:24 +08:00
Zhixiao Bao be606f5a12
fix: change the default value of the option shareConnlimit from 10 to… (#30706) 2025-04-09 13:55:59 +08:00
dongming chen c5c86af7b5
fix/TS-6226-send-check-when-not-sync (#30588) 2025-04-09 11:18:53 +08:00
huohong 1a697d34ed
feat: fix install.sh taosudf name (#30703) 2025-04-09 11:02:56 +08:00
WANG Xu 3497e31f11
Merge pull request #30708 from taosdata/fix/ctest
enh: refine ctest command to exclude specific tests
2025-04-09 10:32:36 +08:00
chenhaoran c27461734b enh: refine ctest command to exclude specific tests 2025-04-09 10:28:52 +08:00
9 changed files with 35 additions and 22 deletions

View File

@ -155,7 +155,7 @@ taosd 命令行参数如下:
#### shareConnLimit
- 说明:一个链接可以共享的请求的数目
- 类型:整数
- 默认值10
- 默认值10 (Linux/macOS)1 (Windows)
- 最小值1
- 最大值512
- 动态修改:支持通过 SQL 修改,重启后生效。

View File

@ -170,6 +170,7 @@ int32_t nodesNodeToMsg(const SNode* pNode, char** pMsg, int32_t* pLen);
int32_t nodesMsgToNode(const char* pStr, int32_t len, SNode** pNode);
int32_t nodesNodeToSQL(SNode* pNode, char* buf, int32_t bufSize, int32_t* len);
int32_t nodesNodeToSQLFormat(SNode* pNode, char* buf, int32_t bufSize, int32_t* len, bool longFormat);
char* nodesGetNameFromColumnNode(SNode* pNode);
int32_t nodesGetOutputNumFromSlotList(SNodeList* pSlots);
void nodesSortList(SNodeList** pList, int32_t (*)(SNode* pNode1, SNode* pNode2));

View File

@ -19,7 +19,7 @@ script_dir=$(dirname $(readlink -f "$0"))
PREFIX="taos"
clientName="${PREFIX}"
serverName="${PREFIX}d"
udfdName="taosudf"
udfdName="${PREFIX}udf"
configFile="${PREFIX}.cfg"
productName="TDengine"
emailName="taosdata.com"
@ -157,13 +157,13 @@ done
#echo "verType=${verType} interactiveFqdn=${interactiveFqdn}"
tools=(${clientName} ${benchmarkName} ${dumpName} ${demoName} ${inspect_name} remove.sh taosudf set_core.sh TDinsight.sh start_pre.sh start-all.sh stop-all.sh)
tools=(${clientName} ${benchmarkName} ${dumpName} ${demoName} ${inspect_name} remove.sh ${udfdName} set_core.sh TDinsight.sh start_pre.sh start-all.sh stop-all.sh)
if [ "${verMode}" == "cluster" ]; then
services=(${serverName} ${adapterName} ${xname} ${explorerName} ${keeperName})
elif [ "${verMode}" == "edge" ]; then
if [ "${pagMode}" == "full" ]; then
services=(${serverName} ${adapterName} ${keeperName} ${explorerName})
tools=(${clientName} ${benchmarkName} ${dumpName} ${demoName} remove.sh taosudf set_core.sh TDinsight.sh start_pre.sh start-all.sh stop-all.sh)
tools=(${clientName} ${benchmarkName} ${dumpName} ${demoName} remove.sh ${udfdName} set_core.sh TDinsight.sh start_pre.sh start-all.sh stop-all.sh)
else
services=(${serverName})
tools=(${clientName} ${benchmarkName} remove.sh start_pre.sh)

View File

@ -81,7 +81,12 @@ int32_t tsQueryNoFetchTimeoutSec = 3600 * 5;
int32_t tsNumOfRpcThreads = 1;
int32_t tsNumOfRpcSessions = 30000;
#ifdef WINDOWS
int32_t tsShareConnLimit = 1;
#else
int32_t tsShareConnLimit = 10;
#endif
int32_t tsReadTimeout = 900;
int32_t tsTimeToGetAvailableConn = 500000;
@ -122,7 +127,7 @@ bool tsEnableWhiteList = false; // ip white list cfg
// arbitrator
int32_t tsArbHeartBeatIntervalSec = 2;
int32_t tsArbCheckSyncIntervalSec = 3;
int32_t tsArbSetAssignedTimeoutSec = 10;
int32_t tsArbSetAssignedTimeoutSec = 14;
// dnode
int64_t tsDndStart = 0;

View File

@ -645,7 +645,7 @@ void mndArbCheckSync(SArbGroup *pArbGroup, int64_t nowMs, ECheckSyncOp *pOp, SAr
mInfo("arb skip to set assigned leader to vgId:%d dnodeId:%d, arb group is not sync", vgId,
pMember->info.dnodeId);
}
//*pOp = CHECK_SYNC_CHECK_SYNC;
*pOp = CHECK_SYNC_CHECK_SYNC;
return;
}

View File

@ -2931,14 +2931,8 @@ static int32_t mndLoopHash(SHashObj *hash, char *priType, SSDataBlock *pBlock, i
}
if (nodesStringToNode(value, &pAst) == 0) {
if (pAst && pAst->type == QUERY_NODE_VALUE &&
((SValueNode *)pAst)->node.resType.type == TSDB_DATA_TYPE_VARCHAR) {
sqlLen = tsnprintf(*sql, bufSz, "'%s'", varDataVal(((SValueNode *)pAst)->datum.p));
(*sql)[bufSz - 1] = '\'';
} else {
if (nodesNodeToSQL(pAst, *sql, bufSz, &sqlLen) != 0) {
sqlLen = tsnprintf(*sql, bufSz, "error");
}
if (nodesNodeToSQLFormat(pAst, *sql, bufSz, &sqlLen, true) != 0) {
sqlLen = tsnprintf(*sql, bufSz, "error");
}
nodesDestroyNode(pAst);
}

View File

@ -106,6 +106,10 @@ const char *logicConditionTypeStr(ELogicConditionType type) {
}
int32_t nodesNodeToSQL(SNode *pNode, char *buf, int32_t bufSize, int32_t *len) {
return nodesNodeToSQLFormat(pNode, buf, bufSize, len, false);
}
int32_t nodesNodeToSQLFormat(SNode *pNode, char *buf, int32_t bufSize, int32_t *len, bool longFormat) {
switch (pNode->type) {
case QUERY_NODE_COLUMN: {
SColumnNode *colNode = (SColumnNode *)pNode;
@ -136,11 +140,16 @@ int32_t nodesNodeToSQL(SNode *pNode, char *buf, int32_t bufSize, int32_t *len) {
}
int32_t tlen = strlen(t);
if (tlen > 32) {
*len += tsnprintf(buf + *len, bufSize - *len, "%.*s...%s", 32, t, t + tlen - 1);
} else {
if (longFormat) {
*len += tsnprintf(buf + *len, bufSize - *len, "%s", t);
} else {
if (tlen > 32) {
*len += tsnprintf(buf + *len, bufSize - *len, "%.*s...%s", 32, t, t + tlen - 1);
} else {
*len += tsnprintf(buf + *len, bufSize - *len, "%s", t);
}
}
taosMemoryFree(t);
return TSDB_CODE_SUCCESS;
@ -211,9 +220,11 @@ int32_t nodesNodeToSQL(SNode *pNode, char *buf, int32_t bufSize, int32_t *len) {
FOREACH(node, pListNode->pNodeList) {
if (!first) {
*len += tsnprintf(buf + *len, bufSize - *len, ", ");
if (++num >= 10) {
*len += tsnprintf(buf + *len, bufSize - *len, "...");
break;
if (!longFormat) {
if (++num >= 10) {
*len += tsnprintf(buf + *len, bufSize - *len, "...");
break;
}
}
}
NODES_ERR_RET(nodesNodeToSQL(node, buf, bufSize, len));

View File

@ -86,6 +86,7 @@ int64_t syncOpen(SSyncInfo* pSyncInfo, int32_t vnodeVersion) {
int32_t syncStart(int64_t rid) {
int32_t code = 0;
int32_t vgId = 0;
SSyncNode* pSyncNode = syncNodeAcquire(rid);
if (pSyncNode == NULL) {
code = TSDB_CODE_SYN_RETURN_VALUE_NULL;
@ -93,6 +94,7 @@ int32_t syncStart(int64_t rid) {
sError("failed to acquire rid:%" PRId64 " of tsNodeReftId for pSyncNode", rid);
TAOS_RETURN(code);
}
vgId = pSyncNode->vgId;
sInfo("vgId:%d, begin to start sync", pSyncNode->vgId);
if ((code = syncNodeRestore(pSyncNode)) < 0) {
@ -109,7 +111,7 @@ int32_t syncStart(int64_t rid) {
syncNodeRelease(pSyncNode);
sInfo("vgId:%d, sync started", pSyncNode->vgId);
sInfo("vgId:%d, sync started", vgId);
TAOS_RETURN(code);

View File

@ -43,7 +43,7 @@ sleep 10
# Run ctest and capture output and return code
ctest_output="unit-test.log"
ctest -E "cunit_test" -j8 2>&1 | tee "$ctest_output"
ctest -E "cunit_test|pcre*|example*" -j8 2>&1 | tee "$ctest_output"
ctest_ret=${PIPESTATUS[0]}
# Read the captured output