diff --git a/docs/en/14-reference/01-components/01-taosd.md b/docs/en/14-reference/01-components/01-taosd.md index 436f7c522b..3a81813d08 100644 --- a/docs/en/14-reference/01-components/01-taosd.md +++ b/docs/en/14-reference/01-components/01-taosd.md @@ -74,6 +74,9 @@ After modifying configuration file parameters, you need to restart the *taosd* s |maxNumOfDistinctRes | |Maximum number of distinct results allowed to return, default value 100,000, maximum allowed value 100 million| |queryBufferSize | |Not effective yet| |queryRspPolicy | |Query response strategy| +|queryUseMemoryPool | |Whether query will use memory pool to manage memory, default value: 1 (on); 0: off, 1: on| +|minReservedMemorySize | |The minimum reserved system available memory size, all memory except reserved can be used for queries, unit: MB, default reserved size is 20% of system physical memory, value range 1024-1000000000| +|singleQueryMaxMemorySize| |The memory limit that a single query can use on a single node (dnode), exceeding this limit will return an error, unit: MB, default value: 0 (no limit), value range 0-1000000000| |filterScalarMode | |Force scalar filter mode, 0: off; 1: on, default value 0| |queryPlannerTrace | |Internal parameter, whether the query plan outputs detailed logs| |queryNodeChunkSize | |Internal parameter, chunk size of the query plan| diff --git a/docs/zh/14-reference/01-components/01-taosd.md b/docs/zh/14-reference/01-components/01-taosd.md index 435a89c845..9ff7ab7108 100644 --- a/docs/zh/14-reference/01-components/01-taosd.md +++ b/docs/zh/14-reference/01-components/01-taosd.md @@ -70,6 +70,9 @@ taosd 命令行参数如下 |maxNumOfDistinctRes | |允许返回的 distinct 结果最大行数,默认值 10 万,最大允许值 1 亿| |queryBufferSize | |暂不生效| |queryRspPolicy | |查询响应策略| +|queryUseMemoryPool | |查询是否使用内存池管理内存,默认值:1(打开); 0: 关闭,1: 打开| +|minReservedMemorySize | |最小预留的系统可用内存数量,除预留外的内存都可以被用于查询,单位:MB,默认预留大小为系统物理内存的 20%,取值范围 1024 - 1000000000| +|singleQueryMaxMemorySize| |单个查询在单个节点(dnode)上可以使用的内存上限,超过该上限将返回错误,单位:MB,默认值:0(无上限),取值范围 0 - 1000000000| |filterScalarMode | |强制使用标量过滤模式,0:关闭;1:开启,默认值 0| |queryPlannerTrace | |内部参数,查询计划是否输出详细日志| |queryNodeChunkSize | |内部参数,查询计划的块大小| diff --git a/source/libs/qworker/src/qworker.c b/source/libs/qworker/src/qworker.c index 9897e38f8e..50af01cd6f 100644 --- a/source/libs/qworker/src/qworker.c +++ b/source/libs/qworker/src/qworker.c @@ -554,7 +554,7 @@ int32_t qwHandlePrePhaseEvents(QW_FPARAMS_DEF, int8_t phase, SQWPhaseInput *inpu switch (phase) { case QW_PHASE_PRE_QUERY: { if (QW_EVENT_PROCESSED(ctx, QW_EVENT_DROP)) { - QW_TASK_ELOG("task already dropped at wrong phase %s", qwPhaseStr(phase)); + QW_TASK_ELOG("task already dropped at phase %s", qwPhaseStr(phase)); QW_ERR_JRET(TSDB_CODE_QRY_TASK_STATUS_ERROR); }