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

fix: fields area left right quotes change total method

This commit is contained in:
Alex Duan 2024-10-25 16:49:45 +08:00
parent a10e6457bf
commit 9dce56d552
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tools/shell/src/shellAuto.c
View File

@ -168,7 +168,6 @@ SWords shellCommands[] = {
{"show create database <db_name> \\G;", 0, 0, NULL}, {"show create database <db_name> \\G;", 0, 0, NULL},
{"show create stable <stb_name> \\G;", 0, 0, NULL}, {"show create stable <stb_name> \\G;", 0, 0, NULL},
{"show create table <tb_name> \\G;", 0, 0, NULL}, {"show create table <tb_name> \\G;", 0, 0, NULL},
{"show create tsma <tsma_name> \\G;", 0, 0, NULL},
#ifdef TD_ENTERPRISE #ifdef TD_ENTERPRISE
{"show create view <all_table> \\G;", 0, 0, NULL}, {"show create view <all_table> \\G;", 0, 0, NULL},
{"show compact", 0, 0, NULL}, {"show compact", 0, 0, NULL},
@ -290,7 +289,7 @@ char* tb_actions[] = {
char* user_actions[] = {"pass ", "enable ", "sysinfo "}; char* user_actions[] = {"pass ", "enable ", "sysinfo "};
char* tb_options[] = {"comment ", "watermark ", "max_delay ", "ttl ", "rollup(", "sma("}; char* tb_options[] = {"tags(", "comment ", "watermark ", "max_delay ", "ttl ", "rollup(", "sma("};
char* db_options[] = {"keep ", char* db_options[] = {"keep ",
"replica ", "replica ",
@ -335,7 +334,7 @@ char* data_types[] = {"timestamp", "int",
"bigint", "bigint unsigned", "bigint", "bigint unsigned",
"smallint", "smallint unsigned", "smallint", "smallint unsigned",
"tinyint", "tinyint unsigned", "tinyint", "tinyint unsigned",
"geometry", "varbinary(16)", "geometry(64)", "varbinary(16)",
"bool", "json"}; "bool", "json"};
char* key_tags[] = {"tags("}; char* key_tags[] = {"tags("};
@ -1759,36 +1758,24 @@ bool fieldOptionsArea(char* p) {
// if is input create fields or tags area, return true // if is input create fields or tags area, return true
bool isCreateFieldsArea(char* p) { bool isCreateFieldsArea(char* p) {
// put to while, support like create table st(ts timestamp, bin1 binary(16), bin2 + blank + TAB int32_t n = 0; // count
char* p1 = taosStrdup(p); char *p1 = p;
bool ret = false; while (*p1 != 0) {
while (1) { switch (*p1) {
char* left = strrchr(p1, '('); case '(':
if (left == NULL) { ++ n;
// like 'create table st' break;
ret = false; case ')':
-- n;
break;
default:
break; break;
} }
// move next
char* right = strrchr(p1, ')'); ++p1;
if (right == NULL) {
// like 'create table st( '
ret = true;
break;
}
if (left > right) {
// like 'create table st( ts timestamp, age int) tags(area '
ret = true;
break;
}
// set string end by small for next strrchr search
*left = 0;
} }
taosMemoryFree(p1);
return ret; return n > 0;
} }
bool matchCreateTable(TAOS* con, SShellCmd* cmd) { bool matchCreateTable(TAOS* con, SShellCmd* cmd) {