From e3bfc9ddf343fe903edebd809f21561413cfeb65 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Wed, 15 Feb 2023 17:06:20 +0800 Subject: [PATCH 1/6] docs: add notes for countAlwaysReturnValue parameter --- docs/en/14-reference/12-config/index.md | 1 + docs/zh/14-reference/12-config/index.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/en/14-reference/12-config/index.md b/docs/en/14-reference/12-config/index.md index afa9f5a8ae..522109337f 100644 --- a/docs/en/14-reference/12-config/index.md +++ b/docs/en/14-reference/12-config/index.md @@ -182,6 +182,7 @@ The parameters described in this document by the effect that they have on the sy | Meaning | count()/hyperloglog() return value or not if the result data is NULL | | Vlue Range | 0：Return empty line，1：Return 0 | | Default | 1 | +| Notes | When this parameter is setting to 1: for queries containing GROUP BY, PARTITION BY and INTERVAL clause, count/hyperloglog functions do not return value; if count/hyperloglog used together with other aggregate functions, other aggregate functions return NULL. | ### maxNumOfDistinctRes diff --git a/docs/zh/14-reference/12-config/index.md b/docs/zh/14-reference/12-config/index.md index 28b409de30..2506f403cf 100644 --- a/docs/zh/14-reference/12-config/index.md +++ b/docs/zh/14-reference/12-config/index.md @@ -192,7 +192,7 @@ taos --dump-config | 取值范围 | 0 表示包含函数名，1 表示不包含函数名。 | | 缺省值 | 0 | -### countAlwaysReturnValue +### countAlwaysReturnValue | 属性 | 说明 | | -------- | -------------------------------- | @@ -200,6 +200,7 @@ taos --dump-config | 含义 | count/hyperloglog函数在数据为空或者NULL的情况下是否返回值 | | 取值范围 | 0：返回空行，1：返回 0 | | 缺省值 | 1 | +| 补充说明 | 该参数设置为 1 时: 对于查询中含有 group by，partition by 以及 interval 子句的情况下， count/hyperloglog 函数结果仍然返回空行; 查询中 count/hyperloglog 和其他聚合函数一起使用时，其他聚合函数输出结果为NULL | ## 区域相关 From bda2e544c739d5b10c7a3161cdfdf9c2f862d07c Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Wed, 15 Feb 2023 17:06:20 +0800 Subject: [PATCH 2/6] docs: add notes for countAlwaysReturnValue parameter --- docs/zh/14-reference/12-config/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/14-reference/12-config/index.md b/docs/zh/14-reference/12-config/index.md index 2506f403cf..814d62343f 100644 --- a/docs/zh/14-reference/12-config/index.md +++ b/docs/zh/14-reference/12-config/index.md @@ -200,7 +200,7 @@ taos --dump-config | 含义 | count/hyperloglog函数在数据为空或者NULL的情况下是否返回值 | | 取值范围 | 0：返回空行，1：返回 0 | | 缺省值 | 1 | -| 补充说明 | 该参数设置为 1 时: 对于查询中含有 group by，partition by 以及 interval 子句的情况下， count/hyperloglog 函数结果仍然返回空行; 查询中 count/hyperloglog 和其他聚合函数一起使用时，其他聚合函数输出结果为NULL | +| 补充说明 | 该参数设置为 1 时: 对于查询中含有 GROUP BY，PARTITION BY 以及 INTERVAL 子句的情况下， count/hyperloglog 函数结果仍然返回空行; 查询中 count/hyperloglog 和其他聚合函数一起使用时，其他聚合函数输出结果为NULL | ## 区域相关 From b1c3b705b19b6c3a0c839a7d6052d55af0906ea9 Mon Sep 17 00:00:00 2001 From: dapan1121 <72057773+dapan1121@users.noreply.github.com> Date: Wed, 15 Feb 2023 17:30:51 +0800 Subject: [PATCH 3/6] Update index.md --- docs/zh/14-reference/12-config/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh/14-reference/12-config/index.md b/docs/zh/14-reference/12-config/index.md index 814d62343f..fd37666341 100644 --- a/docs/zh/14-reference/12-config/index.md +++ b/docs/zh/14-reference/12-config/index.md @@ -197,10 +197,10 @@ taos --dump-config | 属性 | 说明 | | -------- | -------------------------------- | | 适用范围 | 仅服务端适用 | -| 含义 | count/hyperloglog函数在数据为空或者NULL的情况下是否返回值 | +| 含义 | count/hyperloglog函数在输入数据为空或者NULL的情况下是否返回值 | | 取值范围 | 0：返回空行，1：返回 0 | | 缺省值 | 1 | -| 补充说明 | 该参数设置为 1 时: 对于查询中含有 GROUP BY，PARTITION BY 以及 INTERVAL 子句的情况下， count/hyperloglog 函数结果仍然返回空行; 查询中 count/hyperloglog 和其他聚合函数一起使用时，其他聚合函数输出结果为NULL | +| 补充说明 | 该参数设置为 1 时，如果查询中含有 GROUP BY，PARTITION BY 以及 INTERVAL 子句且相应的组或窗口内数据为空或者NULL， 对应的组或窗口将不返回查询结果 | ## 区域相关 From 7ef6bd7ad89faa40b906ada131f083b42aa731f5 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao <36554565+glzhao89@users.noreply.github.com> Date: Wed, 15 Feb 2023 17:41:22 +0800 Subject: [PATCH 4/6] Update index.md --- docs/en/14-reference/12-config/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/14-reference/12-config/index.md b/docs/en/14-reference/12-config/index.md index 522109337f..3ce0f9e097 100644 --- a/docs/en/14-reference/12-config/index.md +++ b/docs/en/14-reference/12-config/index.md @@ -182,7 +182,7 @@ The parameters described in this document by the effect that they have on the sy | Meaning | count()/hyperloglog() return value or not if the result data is NULL | | Vlue Range | 0：Return empty line，1：Return 0 | | Default | 1 | -| Notes | When this parameter is setting to 1: for queries containing GROUP BY, PARTITION BY and INTERVAL clause, count/hyperloglog functions do not return value; if count/hyperloglog used together with other aggregate functions, other aggregate functions return NULL. | +| Notes | When this parameter is setting to 1, for queries containing GROUP BY, PARTITION BY and INTERVAL clause, and input data in certain groups or windows is empty or NULL, the corresponding groups or windows have no return values | ### maxNumOfDistinctRes From 7f1186c876750b27b9307320a6859a0e62051a50 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao <36554565+glzhao89@users.noreply.github.com> Date: Wed, 15 Feb 2023 17:42:42 +0800 Subject: [PATCH 5/6] Update index.md --- docs/en/14-reference/12-config/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/14-reference/12-config/index.md b/docs/en/14-reference/12-config/index.md index 3ce0f9e097..2b129533eb 100644 --- a/docs/en/14-reference/12-config/index.md +++ b/docs/en/14-reference/12-config/index.md @@ -179,7 +179,7 @@ The parameters described in this document by the effect that they have on the sy | Attribute | Description | | -------- | -------------------------------- | | Applicable | Server only | -| Meaning | count()/hyperloglog() return value or not if the result data is NULL | +| Meaning | count()/hyperloglog() return value or not if the input data is NULL | | Vlue Range | 0：Return empty line，1：Return 0 | | Default | 1 | | Notes | When this parameter is setting to 1, for queries containing GROUP BY, PARTITION BY and INTERVAL clause, and input data in certain groups or windows is empty or NULL, the corresponding groups or windows have no return values | From d303ad359e2d3e846246f8d547fdf692b8da94cc Mon Sep 17 00:00:00 2001 From: Ganlin Zhao <36554565+glzhao89@users.noreply.github.com> Date: Wed, 15 Feb 2023 17:43:38 +0800 Subject: [PATCH 6/6] Update index.md --- docs/en/14-reference/12-config/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/14-reference/12-config/index.md b/docs/en/14-reference/12-config/index.md index 2b129533eb..5938b95912 100644 --- a/docs/en/14-reference/12-config/index.md +++ b/docs/en/14-reference/12-config/index.md @@ -179,7 +179,7 @@ The parameters described in this document by the effect that they have on the sy | Attribute | Description | | -------- | -------------------------------- | | Applicable | Server only | -| Meaning | count()/hyperloglog() return value or not if the input data is NULL | +| Meaning | count()/hyperloglog() return value or not if the input data is empty or NULL | | Vlue Range | 0：Return empty line，1：Return 0 | | Default | 1 | | Notes | When this parameter is setting to 1, for queries containing GROUP BY, PARTITION BY and INTERVAL clause, and input data in certain groups or windows is empty or NULL, the corresponding groups or windows have no return values |