Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
b0b119
TDengine
提交
4c3fd763
TDengine
项目概览
b0b119
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
4c3fd763
编写于
1月 08, 2021
作者:
H
haojun Liao
提交者:
GitHub
1月 08, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4857 from taosdata/feature/query
Feature/query
上级
18068743
400bec62
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
60 addition
and
37 deletion
+60
-37
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+1
-1
src/query/src/qAggMain.c
src/query/src/qAggMain.c
+1
-1
src/query/src/qHistogram.c
src/query/src/qHistogram.c
+3
-0
src/query/tests/histogramTest.cpp
src/query/tests/histogramTest.cpp
+52
-35
tests/script/general/parser/tags_filter.sim
tests/script/general/parser/tags_filter.sim
+3
-0
未找到文件。
src/client/src/tscSQLParser.c
浏览文件 @
4c3fd763
...
...
@@ -4598,7 +4598,7 @@ static void setDefaultOrderInfo(SQueryInfo* pQueryInfo) {
int32_t
parseOrderbyClause
(
SSqlCmd
*
pCmd
,
SQueryInfo
*
pQueryInfo
,
SQuerySQL
*
pQuerySql
,
SSchema
*
pSchema
)
{
const
char
*
msg0
=
"only support order by primary timestamp"
;
const
char
*
msg1
=
"invalid column name"
;
const
char
*
msg2
=
"only support order by primary timestamp or
queried column
"
;
const
char
*
msg2
=
"only support order by primary timestamp or
first tag in groupby clause allowed
"
;
const
char
*
msg3
=
"invalid column in order by clause, only primary timestamp or first tag in groupby clause allowed"
;
setDefaultOrderInfo
(
pQueryInfo
);
...
...
src/query/src/qAggMain.c
浏览文件 @
4c3fd763
...
...
@@ -1328,7 +1328,7 @@ static void stddev_function_f(SQLFunctionCtx *pCtx, int32_t index) {
/* the first stage is to calculate average value */
if
(
pStd
->
stage
==
0
)
{
avg_function_f
(
pCtx
,
index
);
}
else
{
}
else
if
(
pStd
->
num
>
0
)
{
double
avg
=
pStd
->
avg
;
void
*
pData
=
GET_INPUT_DATA
(
pCtx
,
index
);
...
...
src/query/src/qHistogram.c
浏览文件 @
4c3fd763
...
...
@@ -143,6 +143,9 @@ SHistogramInfo* tHistogramCreateFrom(void* pBuf, int32_t numOfBins) {
SHistogramInfo
*
pHisto
=
(
SHistogramInfo
*
)
pBuf
;
pHisto
->
elems
=
(
SHistBin
*
)((
char
*
)
pBuf
+
sizeof
(
SHistogramInfo
));
for
(
int32_t
i
=
0
;
i
<
numOfBins
;
++
i
)
{
pHisto
->
elems
[
i
].
val
=
-
DBL_MAX
;
}
pHisto
->
maxEntries
=
numOfBins
;
...
...
src/query/tests/histogramTest.cpp
浏览文件 @
4c3fd763
...
...
@@ -4,42 +4,9 @@
#include <iostream>
#include "taos.h"
#include "tsdb.h"
#include "tstoken.h"
#include "tutil.h"
#include "qHistogram.h"
/* test validate the names for table/database */
TEST
(
testCase
,
histogram_binary_search
)
{
SHistogramInfo
*
pHisto
=
tHistogramCreate
(
MAX_HISTOGRAM_BIN
);
pHisto
->
numOfEntries
=
10
;
for
(
int32_t
i
=
0
;
i
<
10
;
++
i
)
{
pHisto
->
elems
[
i
].
num
=
1
;
pHisto
->
elems
[
i
].
val
=
i
;
}
int32_t
idx
=
histoBinarySearch
(
pHisto
->
elems
,
pHisto
->
numOfEntries
,
1
);
assert
(
idx
==
1
);
idx
=
histoBinarySearch
(
pHisto
->
elems
,
pHisto
->
numOfEntries
,
9
);
assert
(
idx
==
9
);
idx
=
histoBinarySearch
(
pHisto
->
elems
,
pHisto
->
numOfEntries
,
20
);
assert
(
idx
==
10
);
idx
=
histoBinarySearch
(
pHisto
->
elems
,
pHisto
->
numOfEntries
,
-
1
);
assert
(
idx
==
0
);
idx
=
histoBinarySearch
(
pHisto
->
elems
,
pHisto
->
numOfEntries
,
3.9
);
assert
(
idx
==
4
);
free
(
pHisto
);
}
TEST
(
testCase
,
histogram_add
)
{
namespace
{
void
doHistogramAddTest
()
{
SHistogramInfo
*
pHisto
=
NULL
;
/**
...
...
@@ -99,6 +66,56 @@ TEST(testCase, histogram_add) {
tHistogramDestroy
(
&
pRes
);
free
(
res
);
}
void
doHistogramRepeatTest
()
{
SHistogramInfo
*
pHisto
=
NULL
;
struct
timeval
systemTime
;
gettimeofday
(
&
systemTime
,
NULL
);
int64_t
st
=
(
int64_t
)
systemTime
.
tv_sec
*
1000L
+
(
uint64_t
)
systemTime
.
tv_usec
/
1000
;
for
(
int32_t
i
=
0
;
i
<
1000
;
++
i
)
{
tHistogramAdd
(
&
pHisto
,
-
24
+
i
);
// tHistogramPrint(pHisto);
}
tHistogramDestroy
(
&
pHisto
);
}
}
/* test validate the names for table/database */
TEST
(
testCase
,
histogram_binary_search
)
{
SHistogramInfo
*
pHisto
=
tHistogramCreate
(
MAX_HISTOGRAM_BIN
);
pHisto
->
numOfEntries
=
10
;
for
(
int32_t
i
=
0
;
i
<
10
;
++
i
)
{
pHisto
->
elems
[
i
].
num
=
1
;
pHisto
->
elems
[
i
].
val
=
i
;
}
int32_t
idx
=
histoBinarySearch
(
pHisto
->
elems
,
pHisto
->
numOfEntries
,
1
);
assert
(
idx
==
1
);
idx
=
histoBinarySearch
(
pHisto
->
elems
,
pHisto
->
numOfEntries
,
9
);
assert
(
idx
==
9
);
idx
=
histoBinarySearch
(
pHisto
->
elems
,
pHisto
->
numOfEntries
,
20
);
assert
(
idx
==
10
);
idx
=
histoBinarySearch
(
pHisto
->
elems
,
pHisto
->
numOfEntries
,
-
1
);
assert
(
idx
==
0
);
idx
=
histoBinarySearch
(
pHisto
->
elems
,
pHisto
->
numOfEntries
,
3.9
);
assert
(
idx
==
4
);
free
(
pHisto
);
}
TEST
(
testCase
,
histogram_add
)
{
doHistogramAddTest
();
doHistogramRepeatTest
();
}
TEST
(
testCase
,
heapsort
)
{
// int32_t num = 20;
...
...
tests/script/general/parser/tags_filter.sim
浏览文件 @
4c3fd763
...
...
@@ -73,6 +73,9 @@ endi
sql select * from stb where t1 > '1'
sql select * from stb where t1 > 'a'
print =====================> TD-2685
sql_error select t1, count(t1) from stb;
## wildcard '%'
#sql select * from stb where t1 like '%'
#if $rows != 1 then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录