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

merge 3.0

This commit is contained in:
Xiaoyu Wang 2022-03-21 06:02:03 -04:00
parent dce38817be
commit bda9c0602d
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/libs/parser/src/parTranslater.c
View File

@ -2304,8 +2304,8 @@ int32_t doTranslate(SParseContext* pParseCxt, SQuery* pQuery) {
.pNsLevel = taosArrayInit(TARRAY_MIN_SIZE, POINTER_BYTES), .pNsLevel = taosArrayInit(TARRAY_MIN_SIZE, POINTER_BYTES),
.currLevel = 0, .currLevel = 0,
.currClause = 0, .currClause = 0,
.pDbs = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK), .pDbs = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK),
.pTables = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK) .pTables = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK)
}; };
if (NULL == cxt.pNsLevel) { if (NULL == cxt.pNsLevel) {
return TSDB_CODE_OUT_OF_MEMORY; return TSDB_CODE_OUT_OF_MEMORY;

22
tests/script/tsim/dnode/basic1.sim
View File

@ -5,6 +5,9 @@ system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode2 -s start system sh/exec.sh -n dnode2 -s start
sql connect sql connect
# todo remove
sql create database useless_db
print =============== show dnodes print =============== show dnodes
sql show dnodes; sql show dnodes;
if $rows != 1 then if $rows != 1 then
@ -15,9 +18,10 @@ if $data00 != 1 then
return -1 return -1
endi endi
if $data02 != 0 then # check 'vnodes' feild ?
return -1 #if $data02 != 0 then
endi # return -1
#endi
sql show mnodes; sql show mnodes;
if $rows != 1 then if $rows != 1 then
@ -49,9 +53,10 @@ if $data10 != 2 then
return -1 return -1
endi endi
if $data02 != 0 then # check 'vnodes' feild ?
return -1 #if $data02 != 0 then
endi # return -1
#endi
if $data12 != 0 then if $data12 != 0 then
return -1 return -1
@ -78,12 +83,15 @@ if $data02 != master then
return -1 return -1
endi endi
# todo remove
sql drop database useless_db
print =============== create database print =============== create database
sql create database d1 vgroups 4; sql create database d1 vgroups 4;
sql create database d2; sql create database d2;
sql show databases sql show databases
if $rows != 2 then if $rows != 3 then
return -1 return -1
endi endi

2
tests/script/tsim/insert/basic0.sim
View File

@ -7,7 +7,7 @@ sql connect
print =============== create database print =============== create database
sql create database d0 sql create database d0
sql show databases sql show databases
if $rows != 1 then if $rows != 2 then
return -1 return -1
endi endi