xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix:remove dot from child table in stream

This commit is contained in:
wangmm0220 2024-05-15 14:57:50 +08:00
parent 919e2848b3
commit 1eb2984986
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/common/src/tdatablock.c
View File

@ -2424,6 +2424,11 @@ void buildCtbNameAddGroupId(const char* stbName, char* ctbName, uint64_t groupId
} }
ctbName[TSDB_TABLE_NAME_LEN - strlen(tmp) - 1] = 0; // put stbname + groupId to the end ctbName[TSDB_TABLE_NAME_LEN - strlen(tmp) - 1] = 0; // put stbname + groupId to the end
strcat(ctbName, tmp); strcat(ctbName, tmp);
for(int i = 0; i < strlen(ctbName); i++){
if(ctbName[i] == '.'){
ctbName[i] = '_';
}
}
} }
// auto stream subtable name starts with 't_', followed by the first segment of MD5 digest for group vals. // auto stream subtable name starts with 't_', followed by the first segment of MD5 digest for group vals.

14
tests/system-test/8-stream/stream_basic.py
View File

@ -87,7 +87,7 @@ class TDTestCase:
tdSql.execute(f'insert into t2 using st tags(2) values(now, 1) (now+1s, 2)') tdSql.execute(f'insert into t2 using st tags(2) values(now, 1) (now+1s, 2)')
tdSql.execute(f'insert into t3 using st tags(3) values(now, 1) (now+1s, 2)') tdSql.execute(f'insert into t3 using st tags(3) values(now, 1) (now+1s, 2)')
tdSql.execute("create stream stream1 fill_history 1 into sta subtable(concat('new-', tname)) AS SELECT " tdSql.execute("create stream stream1 fill_history 1 into sta subtable(concat('nee.w-', tname)) AS SELECT "
"_wstart, count(*), avg(i) FROM st PARTITION BY tbname tname INTERVAL(1m)", show=True) "_wstart, count(*), avg(i) FROM st PARTITION BY tbname tname INTERVAL(1m)", show=True)
tdSql.execute("create stream stream2 fill_history 1 into stb subtable(concat('new-', tname)) AS SELECT " tdSql.execute("create stream stream2 fill_history 1 into stb subtable(concat('new-', tname)) AS SELECT "
@ -97,25 +97,25 @@ class TDTestCase:
tdSql.query("select * from sta") tdSql.query("select * from sta")
tdSql.checkRows(3) tdSql.checkRows(3)
tdSql.query("select tbname from sta order by tbname") tdSql.query("select tbname from sta order by tbname")
if not tdSql.getData(0, 0).startswith('new-t1_1.d1.sta_'): if not tdSql.getData(0, 0).startswith('nee_w-t1_sta_'):
tdLog.exit("error1") tdLog.exit("error1")
if not tdSql.getData(1, 0).startswith('new-t2_1.d1.sta_'): if not tdSql.getData(1, 0).startswith('nee_w-t2_sta_'):
tdLog.exit("error2") tdLog.exit("error2")
if not tdSql.getData(2, 0).startswith('new-t3_1.d1.sta_'): if not tdSql.getData(2, 0).startswith('nee_w-t3_sta_'):
tdLog.exit("error3") tdLog.exit("error3")
tdSql.query("select * from stb") tdSql.query("select * from stb")
tdSql.checkRows(3) tdSql.checkRows(3)
tdSql.query("select tbname from stb order by tbname") tdSql.query("select tbname from stb order by tbname")
if not tdSql.getData(0, 0).startswith('new-t1_1.d1.stb_'): if not tdSql.getData(0, 0).startswith('new-t1_stb_'):
tdLog.exit("error4") tdLog.exit("error4")
if not tdSql.getData(1, 0).startswith('new-t2_1.d1.stb_'): if not tdSql.getData(1, 0).startswith('new-t2_stb_'):
tdLog.exit("error5") tdLog.exit("error5")
if not tdSql.getData(2, 0).startswith('new-t3_1.d1.stb_'): if not tdSql.getData(2, 0).startswith('new-t3_stb_'):
tdLog.exit("error6") tdLog.exit("error6")
# run # run