From e12298f814b8f3e1afc44a949d5e38d35aa3a9d8 Mon Sep 17 00:00:00 2001 From: Leo Xu <381899826@qq.com> Date: Mon, 2 Sep 2024 14:50:25 +0800 Subject: [PATCH 1/3] add case by TD-31726 --- tests/army/query/query_basic.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/army/query/query_basic.py b/tests/army/query/query_basic.py index f700ee3153..a6af026cbf 100644 --- a/tests/army/query/query_basic.py +++ b/tests/army/query/query_basic.py @@ -225,6 +225,11 @@ class TDTestCase(TBase): sql2 = "select bi from stb where bi is not null order by bi desc limit 10;" self.checkSameResult(sql1, sql2) + # same as by TD-31726 + sql1 = "select fc as a, voltage dc a from meters limit 5;" + sql2 = "select * from (select fc as a, dc as a from meters)t limit 5;" + self.checkSameResult(sql1, sql2) + # distributed expect values expects = { "Block_Rows" : 6*100000, From 579fab19e0423488a38f003a437228e717413a00 Mon Sep 17 00:00:00 2001 From: Leo Xu <381899826@qq.com> Date: Mon, 2 Sep 2024 14:59:11 +0800 Subject: [PATCH 2/3] change db name --- tests/army/query/query_basic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/army/query/query_basic.py b/tests/army/query/query_basic.py index a6af026cbf..979db9eeb4 100644 --- a/tests/army/query/query_basic.py +++ b/tests/army/query/query_basic.py @@ -226,8 +226,8 @@ class TDTestCase(TBase): self.checkSameResult(sql1, sql2) # same as by TD-31726 - sql1 = "select fc as a, voltage dc a from meters limit 5;" - sql2 = "select * from (select fc as a, dc as a from meters)t limit 5;" + sql1 = "select fc as a, dc as a from stb limit 5;" + sql2 = "select * from (select fc as a, dc as a from stb)t limit 5;" self.checkSameResult(sql1, sql2) # distributed expect values From 16a95f577f14e90ab09bb9ca43447387c72bbef5 Mon Sep 17 00:00:00 2001 From: wade zhang <95411902+gccgdb1234@users.noreply.github.com> Date: Mon, 2 Sep 2024 16:46:27 +0800 Subject: [PATCH 3/3] Update 01-taosd.md --- docs/zh/14-reference/01-components/01-taosd.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/14-reference/01-components/01-taosd.md b/docs/zh/14-reference/01-components/01-taosd.md index ba17126a92..004116b478 100644 --- a/docs/zh/14-reference/01-components/01-taosd.md +++ b/docs/zh/14-reference/01-components/01-taosd.md @@ -51,7 +51,7 @@ taosd 命令行参数如下 | 参数名称 | 参数说明 | | :--------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| queryPolicy | 查询策略，1: 只使用 vnode，不使用 qnode; 2: 没有扫描算子的子任务在 qnode 执行，带扫描算子的子任务在 vnode 执行; 3: vnode 只运行扫描算子，其余算子均在 qnode 执行 ；缺省值：1 | +| queryPolicy | 查询策略，1: 只使用 vnode，不使用 qnode; 2: 没有扫描算子的子任务在 qnode 执行，带扫描算子的子任务在 vnode 执行; 3: vnode 只运行扫描算子，其余算子均在 qnode 执行 ；4: 使用客户端聚合模式；缺省值：1 | | maxNumOfDistinctRes | 允许返回的 distinct 结果最大行数，默认值 10 万，最大允许值 1 亿 | | countAlwaysReturnValue | count/hyperloglog函数在输入数据为空或者NULL的情况下是否返回值，0: 返回空行，1: 返回；该参数设置为 1 时，如果查询中含有 INTERVAL 子句或者该查询使用了TSMA时, 且相应的组或窗口内数据为空或者NULL， 对应的组或窗口将不返回查询结果. 注意此参数客户端和服务端值应保持一致. |