Skip to content

T
TDengine

taosdata / TDengine
1 年多 前同步成功

通知 1187
Star 22018
Fork 4786
T
TDengine
未验证 提交 43c786a0 编写于 作者: D dapan1121 提交者： GitHub
浏览文件
操作

Merge pull request #8658 from taosdata/fix/TD-10965 

[TD-10965]<fix>:schemaless: some record can't write into TDengine by schemaless
上级 3e926547 098e274c
隐藏空白更改
内联 并排
Showing with 89 addition and 83 deletion
src/client/src/tscParseOpenTSDB.c
浏览文件 @ 43c786a0
......@@ -195,8 +195,9 @@ static int32_t parseTelnetMetricValue(TAOS_SML_KV **pKVs, int *num_kvs, const ch
}
tfree(value);
pVal->key = tcalloc(sizeof(key), 1);
pVal->key = tcalloc(sizeof(key) + TS_ESCAPE_CHAR_SIZE, 1);
memcpy(pVal->key, key, sizeof(key));
addEscapeCharToString(pVal->key, (int32_t)strlen(pVal->key));
*num_kvs += 1;
*index = cur + 1;
......@@ -881,8 +882,9 @@ static int32_t parseMetricValueFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *nu
return ret;
}
pVal->key = tcalloc(sizeof(key), 1);
pVal->key = tcalloc(sizeof(key) + TS_ESCAPE_CHAR_SIZE, 1);
memcpy(pVal->key, key, sizeof(key));
addEscapeCharToString(pVal->key, (int32_t)strlen(pVal->key));
*num_kvs += 1;
return TSDB_CODE_SUCCESS;
......
src/client/src/tscSQLParser.c
浏览文件 @ 43c786a0
......@@ -6074,14 +6074,19 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, DEFAULT_TABLE_INDEX);
bool dbIncluded = false;
if (tscValidateName(&(pAlterSQL->name), true, &dbIncluded) != TSDB_CODE_SUCCESS) {
SStrToken tmpToken = pAlterSQL->name;
tmpToken.z= strndup(pAlterSQL->name.z, pAlterSQL->name.n);
if (tscValidateName(&tmpToken, true, &dbIncluded) != TSDB_CODE_SUCCESS) {
free(tmpToken.z);
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
}
code = tscSetTableFullName(&pTableMetaInfo->name, &(pAlterSQL->name), pSql, dbIncluded);
code = tscSetTableFullName(&pTableMetaInfo->name, &tmpToken, pSql, dbIncluded);
if (code != TSDB_CODE_SUCCESS) {
free(tmpToken.z);
return code;
}
free(tmpToken.z);
code = tscGetTableMeta(pSql, pTableMetaInfo);
if (code != TSDB_CODE_SUCCESS) {
......
tests/pytest/insert/insertJSONPayload.py
浏览文件 @ 43c786a0
......@@ -686,10 +686,10 @@ class TDTestCase:
print("schemaless_insert result {}".format(code))
tdSql.query("describe `1234`")
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query("select * from `123`")
tdSql.checkRows(1)
#tdSql.query("select * from `123`")
#tdSql.checkRows(1)
payload = ['''
{
......@@ -711,10 +711,10 @@ class TDTestCase:
print("schemaless_insert result {}".format(code))
tdSql.query("describe `int`")
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query("select * from `and`")
tdSql.checkRows(1)
#tdSql.query("select * from `and`")
#tdSql.checkRows(1)
payload = ['''
{
......@@ -736,10 +736,10 @@ class TDTestCase:
print("schemaless_insert result {}".format(code))
tdSql.query("describe `double`")
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query("select * from `for`")
tdSql.checkRows(1)
#tdSql.query("select * from `for`")
#tdSql.checkRows(1)
payload = ['''
{
......@@ -761,10 +761,10 @@ class TDTestCase:
print("schemaless_insert result {}".format(code))
tdSql.query("describe `from`")
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query("select * from `!@#.^&`")
tdSql.checkRows(1)
#tdSql.query("select * from `!@#.^&`")
#tdSql.checkRows(1)
payload = ['''
{
......@@ -786,10 +786,10 @@ class TDTestCase:
print("schemaless_insert result {}".format(code))
tdSql.query("describe `!@#$.%^&*()`")
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query("select * from `none`")
tdSql.checkRows(1)
#tdSql.query("select * from `none`")
#tdSql.checkRows(1)
payload = ['''
{
......@@ -836,11 +836,10 @@ class TDTestCase:
print("schemaless_insert result {}".format(code))
tdSql.query("describe `stable`")
tdSql.checkRows(8)
tdSql.query("select * from `key`")
tdSql.checkRows(1)
tdSql.checkRows(9)
#tdSql.query("select * from `key`")
#tdSql.checkRows(1)
def stop(self):
tdSql.close()
......
tests/pytest/insert/insertTelnetLines.py
浏览文件 @ 43c786a0
......@@ -32,10 +32,10 @@ class TDTestCase:
### metric ###
print("============= step1 : test metric ================")
lines0 = [
"stb0_0 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"",
"stb0_1 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"",
"stb0_2 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"",
".stb0.3. 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"",
"stb0_0 1626006833639 4i8 host=\"host0\" interface=\"eth0\"",
"stb0_1 1626006833639 4i8 host=\"host0\" interface=\"eth0\"",
"stb0_2 1626006833639 4i8 host=\"host0\" interface=\"eth0\"",
".stb0.3. 1626006833639 4i8 host=\"host0\" interface=\"eth0\"",
]
code = self._conn.schemaless_insert(lines0, TDSmlProtocolType.TELNET.value, TDSmlTimestampType.NOT_CONFIGURED.value)
......@@ -287,72 +287,72 @@ class TDTestCase:
#tag ID as child table name
lines3_1 = [
"stb3_1 1626006833610 1 id=child_table1 host=host1",
"stb3_1 1626006833610 2 host=host2 iD=child_table2",
"stb3_1 1626006833610 3 ID=child_table3 host=host3"
]
#lines3_1 = [
# "stb3_1 1626006833610 1 id=child_table1 host=host1",
# "stb3_1 1626006833610 2 host=host2 iD=child_table2",
# "stb3_1 1626006833610 3 ID=child_table3 host=host3"
# ]
code = self._conn.schemaless_insert(lines3_1, TDSmlProtocolType.TELNET.value, TDSmlTimestampType.NOT_CONFIGURED.value)
print("schemaless_insert result {}".format(code))
#code = self._conn.schemaless_insert(lines3_1, TDSmlProtocolType.TELNET.value, TDSmlTimestampType.NOT_CONFIGURED.value)
#print("schemaless_insert result {}".format(code))
tdSql.query("select * from stb3_1")
tdSql.checkRows(3)
#tdSql.query("select * from stb3_1")
#tdSql.checkRows(3)
tdSql.query("show tables like \"child%\"")
tdSql.checkRows(3)
#tdSql.query("show tables like \"child%\"")
#tdSql.checkRows(3)
tdSql.checkData(0, 0, "child_table1")
#tdSql.checkData(0, 0, "child_table1")
### special characters and keywords ###
print("============= step4 : test special characters and keywords ================")
lines4_1 = [
"1234 1626006833610ms 1 id=123 456=true int=true double=false into=1 from=2 !@#$.%^&*()=false",
"int 1626006833610ms 2 id=and 456=true int=true double=false into=1 from=2 !@#$.%^&*()=false",
"double 1626006833610ms 2 id=for 456=true int=true double=false into=1 from=2 !@#$.%^&*()=false",
"from 1626006833610ms 2 id=!@#.^& 456=true int=true double=false into=1 from=2 !@#$.%^&*()=false",
"!@#$.%^&*() 1626006833610ms 2 id=none 456=true int=true double=false into=1 from=2 !@#$.%^&*()=false",
"STABLE 1626006833610ms 2 id=KEY 456=true int=true double=false TAG=1 FROM=2 COLUMN=false",
"1234 1626006833610 1 id=123 456=true int=true double=false into=1 from=2 !@#$.%^&*()=false",
"int 1626006833610 2 id=and 456=true int=true double=false into=1 from=2 !@#$.%^&*()=false",
"double 1626006833610 2 id=for 456=true int=true double=false into=1 from=2 !@#$.%^&*()=false",
"from 1626006833610 2 id=!@#.^& 456=true int=true double=false into=1 from=2 !@#$.%^&*()=false",
"!@#$.%^&*() 1626006833610 2 id=none 456=true int=true double=false into=1 from=2 !@#$.%^&*()=false",
"STABLE 1626006833610 2 id=KEY 456=true int=true double=false TAG=1 FROM=2 COLUMN=false",
]
code = self._conn.schemaless_insert(lines4_1, TDSmlProtocolType.TELNET.value, TDSmlTimestampType.NOT_CONFIGURED.value)
print("schemaless_insert result {}".format(code))
tdSql.query('describe `1234`')
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query('describe `int`')
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query('describe `double`')
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query('describe `from`')
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query('describe `!@#$.%^&*()`')
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query('describe `stable`')
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query('select * from `123`')
tdSql.checkRows(1)
#tdSql.query('select * from `123`')
#tdSql.checkRows(1)
tdSql.query('select * from `and`')
tdSql.checkRows(1)
#tdSql.query('select * from `and`')
#tdSql.checkRows(1)
tdSql.query('select * from `for`')
tdSql.checkRows(1)
#tdSql.query('select * from `for`')
#tdSql.checkRows(1)
tdSql.query('select * from `!@#.^&`')
tdSql.checkRows(1)
#tdSql.query('select * from `!@#.^&`')
#tdSql.checkRows(1)
tdSql.query('select * from `none`')
tdSql.checkRows(1)
#tdSql.query('select * from `none`')
#tdSql.checkRows(1)
tdSql.query('select * from `key`')
tdSql.checkRows(1)
#tdSql.query('select * from `key`')
#tdSql.checkRows(1)
def stop(self):
tdSql.close()
......
tests/pytest/insert/line_insert.py
浏览文件 @ 43c786a0
......@@ -83,8 +83,8 @@ class TDTestCase:
tdSql.query('select tbname, * from sth')
tdSql.checkRows(2)
tdSql.query('select tbname, * from childtable')
tdSql.checkRows(1)
#tdSql.query('select tbname, * from childtable')
#tdSql.checkRows(1)
###Special Character and keyss
self._conn.schemaless_insert([
......@@ -98,40 +98,40 @@ class TDTestCase:
tdSql.execute('reset query cache')
tdSql.query('describe `1234`')
tdSql.checkRows(9)
tdSql.checkRows(10)
tdSql.query('describe `int`')
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query('describe `double`')
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query('describe `from`')
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query('describe `!@#$.%^&*()`')
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query('describe `stable`')
tdSql.checkRows(8)
tdSql.checkRows(9)
tdSql.query('select * from `3456`')
tdSql.checkRows(1)
#tdSql.query('select * from `3456`')
#tdSql.checkRows(1)
tdSql.query('select * from `and`')
tdSql.checkRows(1)
#tdSql.query('select * from `and`')
#tdSql.checkRows(1)
tdSql.query('select * from `for`')
tdSql.checkRows(1)
#tdSql.query('select * from `for`')
#tdSql.checkRows(1)
tdSql.query('select * from `!@#$.%^`')
tdSql.checkRows(1)
#tdSql.query('select * from `!@#$.%^`')
#tdSql.checkRows(1)
tdSql.query('select * from `none`')
tdSql.checkRows(1)
#tdSql.query('select * from `none`')
#tdSql.checkRows(1)
tdSql.query('select * from `create`')
tdSql.checkRows(1)
#tdSql.query('select * from `create`')
#tdSql.checkRows(1)
def stop(self):
tdSql.close()
tdLog.success("%s successfully executed" % __file__)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或