Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
2783794a
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
2783794a
编写于
6月 09, 2022
作者:
M
Minglei Jin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: remove some case-insensitive checkings
上级
4f690fb3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
7 deletion
+7
-7
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+4
-4
src/common/src/tname.c
src/common/src/tname.c
+1
-1
src/mnode/src/mnodeTable.c
src/mnode/src/mnodeTable.c
+1
-1
tests/develop-test/0-others/TD-12435.py
tests/develop-test/0-others/TD-12435.py
+1
-1
未找到文件。
src/client/src/tscSQLParser.c
浏览文件 @
2783794a
...
...
@@ -1798,7 +1798,7 @@ int32_t validateOneTag(SSqlCmd* pCmd, TAOS_FIELD* pTagField) {
SSchema
*
pSchema
=
tscGetTableSchema
(
pTableMeta
);
for
(
int32_t
i
=
0
;
i
<
numOfTags
+
numOfCols
;
++
i
)
{
if
(
strnc
asec
mp
(
pTagField
->
name
,
pSchema
[
i
].
name
,
sizeof
(
pTagField
->
name
)
-
1
)
==
0
)
{
if
(
strncmp
(
pTagField
->
name
,
pSchema
[
i
].
name
,
sizeof
(
pTagField
->
name
)
-
1
)
==
0
)
{
//return tscErrorMsgWithCode(TSDB_CODE_TSC_DUP_COL_NAMES, tscGetErrorMsgPayload(pCmd), pTagField->name, NULL);
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
"duplicated column names"
);
}
...
...
@@ -1866,7 +1866,7 @@ static bool has(SArray* pFieldList, int32_t startIdx, const char* name) {
size_t
numOfCols
=
taosArrayGetSize
(
pFieldList
);
for
(
int32_t
j
=
startIdx
;
j
<
numOfCols
;
++
j
)
{
TAOS_FIELD
*
field
=
taosArrayGet
(
pFieldList
,
j
);
if
(
strnc
asec
mp
(
name
,
field
->
name
,
sizeof
(
field
->
name
)
-
1
)
==
0
)
return
true
;
if
(
strncmp
(
name
,
field
->
name
,
sizeof
(
field
->
name
)
-
1
)
==
0
)
return
true
;
}
return
false
;
...
...
@@ -3953,7 +3953,7 @@ static int16_t doGetColumnIndex(SQueryInfo* pQueryInfo, int32_t index, SStrToken
continue
;
}
if
(
strnc
asec
mp
(
pSchema
[
i
].
name
,
pToken
->
z
,
pToken
->
n
)
==
0
)
{
if
(
strncmp
(
pSchema
[
i
].
name
,
pToken
->
z
,
pToken
->
n
)
==
0
)
{
columnIndex
=
i
;
break
;
}
...
...
@@ -3974,7 +3974,7 @@ int32_t doGetColumnIndexByName(SStrToken* pToken, SQueryInfo* pQueryInfo, SColum
if
(
isTablenameToken
(
pToken
))
{
pIndex
->
columnIndex
=
TSDB_TBNAME_COLUMN_INDEX
;
}
else
if
(
strlen
(
DEFAULT_PRIMARY_TIMESTAMP_COL_NAME
)
==
pToken
->
n
&&
strnc
asec
mp
(
pToken
->
z
,
DEFAULT_PRIMARY_TIMESTAMP_COL_NAME
,
pToken
->
n
)
==
0
)
{
strncmp
(
pToken
->
z
,
DEFAULT_PRIMARY_TIMESTAMP_COL_NAME
,
pToken
->
n
)
==
0
)
{
pIndex
->
columnIndex
=
PRIMARYKEY_TIMESTAMP_COL_INDEX
;
// just make runtime happy, need fix java test case InsertSpecialCharacterJniTest
}
else
if
(
isTimeWindowToken
(
pToken
,
&
tsWinColumnIndex
))
{
pIndex
->
columnIndex
=
tsWinColumnIndex
;
...
...
src/common/src/tname.c
浏览文件 @
2783794a
...
...
@@ -312,7 +312,7 @@ static bool doValidateSchema(SSchema* pSchema, int32_t numOfCols, int32_t maxLen
// 3. valid column names
for
(
int32_t
j
=
i
+
1
;
j
<
numOfCols
;
++
j
)
{
if
(
strnc
asec
mp
(
pSchema
[
i
].
name
,
pSchema
[
j
].
name
,
sizeof
(
pSchema
[
i
].
name
)
-
1
)
==
0
)
{
if
(
strncmp
(
pSchema
[
i
].
name
,
pSchema
[
j
].
name
,
sizeof
(
pSchema
[
i
].
name
)
-
1
)
==
0
)
{
return
false
;
}
}
...
...
src/mnode/src/mnodeTable.c
浏览文件 @
2783794a
...
...
@@ -2362,7 +2362,7 @@ static int32_t mnodeProcessDropChildTableMsg(SMnodeMsg *pMsg) {
static
int32_t
mnodeFindNormalTableColumnIndex
(
SCTableObj
*
pTable
,
char
*
colName
)
{
SSchema
*
schema
=
(
SSchema
*
)
pTable
->
schema
;
for
(
int32_t
col
=
0
;
col
<
pTable
->
numOfColumns
;
col
++
)
{
if
(
strc
asec
mp
(
schema
[
col
].
name
,
colName
)
==
0
)
{
if
(
strcmp
(
schema
[
col
].
name
,
colName
)
==
0
)
{
return
col
;
}
}
...
...
tests/develop-test/0-others/TD-12435.py
浏览文件 @
2783794a
...
...
@@ -34,7 +34,7 @@ class TDTestCase:
tdSql
.
prepare
()
print
(
"============== STEP 1 ===== prepare data & validate json string"
)
tdSql
.
execute
(
"create table if not exists st(ts timestamp,
dataInt
int)"
)
tdSql
.
execute
(
"create table if not exists st(ts timestamp,
`dataInt`
int)"
)
tdSql
.
execute
(
"create table st_from_sub as select avg(`dataInt`) from st interval(1m)"
)
tdSql
.
query
(
"describe st_from_sub"
)
tdSql
.
checkData
(
1
,
0
,
'avg__dataInt__'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录