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

feat(shell): modify command with 3.0

This commit is contained in:
Alex Duan 2022-09-29 11:07:15 +08:00
parent 213591f033
commit 3ad184de87
1 changed files with 65 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,8 @@ SWords shellCommands[] = {
{"show vgroups;", 0, 0, NULL}, {"show vgroups;", 0, 0, NULL},
{"insert into <tb_name> values(", 0, 0, NULL}, {"insert into <tb_name> values(", 0, 0, NULL},
{"insert into <tb_name> using <stb_name> tags(", 0, 0, NULL}, {"insert into <tb_name> using <stb_name> tags(", 0, 0, NULL},
{"insert into <tb_name> file ", 0, 0, NULL},
{"trim database <db_name>", 0, 0, NULL},
{"use <db_name>", 0, 0, NULL}, {"use <db_name>", 0, 0, NULL},
{"quit", 0, 0, NULL} {"quit", 0, 0, NULL}
}; };
@ -214,58 +216,60 @@ char * functions[] = {
}; };
char * tb_actions[] = { char * tb_actions[] = {
"add column", "add column ",
"modify column", "modify column ",
"drop column", "drop column ",
"change tag", "rename column ",
"add tag ",
"modify tag ",
"drop tag ",
"rename tag ",
"set tag ",
};
char * tb_options[] = {
"comment ",
"watermark ",
"max_delay ",
"ttl ",
"rollup(",
"sma("
}; };
char * db_options[] = { char * db_options[] = {
"keep 3650", "keep ",
"replica 1", "replica ",
"replica 3", "replica ",
"precision \'ms\'", "precision ",
"precision \'us\'", "strict ",
"precision \'ns\'", "strict ",
"strict \'off\'",
"strict \'on\'",
"buffer ", "buffer ",
"cachemodel \'none\' ", "cachemodel ",
"cachemodel \'last_row\' ", "cachesize ",
"cachemodel \'last_value\' ", "comp ",
"cachemodel \'both\' ",
"cachesize 1 ",
"comp 0 ",
"comp 1 ",
"comp 2 ",
"duration ", "duration ",
"wal_fsync_period 3000", "wal_fsync_period",
"maxrows 4096", "maxrows ",
"minrows 100", "minrows ",
"pages 256", "pages ",
"pagesize 4", "pagesize ",
"retentions", "retentions ",
"wal_level 1", "wal_level ",
"wal_level 2", "wal_level ",
"vgroups", "vgroups ",
"single_stable 0", "single_stable ",
"single_stable 1", "wal_retention_period ",
"wal_retention_period", "wal_roll_period ",
"wal_roll_period", "wal_retention_size ",
"wal_retention_size", "wal_segment_size "
"wal_segment_size"
}; };
char * alter_db_options[] = { char * alter_db_options[] = {
"keep 3650", "keep ",
"cachemodel \'none\' ", "cachemodel ",
"cachemodel \'last_row\' ", "cachesize ",
"cachemodel \'last_value\' ", "wal_fsync_period ",
"cachemodel \'both\' ", "wal_level "
"cachesize 1",
"wal_fsync_period 3000",
"wal_level 1",
"wal_level 2"
}; };
@ -320,7 +324,8 @@ bool waitAutoFill = false;
#define WT_VAR_DATATYPE 11 #define WT_VAR_DATATYPE 11
#define WT_VAR_KEYTAGS 12 #define WT_VAR_KEYTAGS 12
#define WT_VAR_ANYWORD 13 #define WT_VAR_ANYWORD 13
#define WT_VAR_CNT 14 #define WT_VAR_TBOPTION 14
#define WT_VAR_CNT 15
#define WT_FROM_DB_MAX 4 // max get content from db #define WT_FROM_DB_MAX 4 // max get content from db
#define WT_FROM_DB_CNT (WT_FROM_DB_MAX + 1) #define WT_FROM_DB_CNT (WT_FROM_DB_MAX + 1)
@ -348,7 +353,8 @@ char varTypes[WT_VAR_CNT][64] = {
"<alter_db_options>", "<alter_db_options>",
"<data_types>", "<data_types>",
"<key_tags>", "<key_tags>",
"<anyword>" "<anyword>",
"<tb_options>"
}; };
char varSqls[WT_FROM_DB_CNT][64] = { char varSqls[WT_FROM_DB_CNT][64] = {
@ -628,6 +634,7 @@ bool shellAutoInit() {
GenerateVarType(WT_VAR_TBACTION, tb_actions, sizeof(tb_actions) /sizeof(char *)); GenerateVarType(WT_VAR_TBACTION, tb_actions, sizeof(tb_actions) /sizeof(char *));
GenerateVarType(WT_VAR_DATATYPE, data_types, sizeof(data_types) /sizeof(char *)); GenerateVarType(WT_VAR_DATATYPE, data_types, sizeof(data_types) /sizeof(char *));
GenerateVarType(WT_VAR_KEYTAGS, key_tags, sizeof(key_tags) /sizeof(char *)); GenerateVarType(WT_VAR_KEYTAGS, key_tags, sizeof(key_tags) /sizeof(char *));
GenerateVarType(WT_VAR_TBOPTION, tb_options, sizeof(tb_options) /sizeof(char *));
return true; return true;
} }
@ -1523,6 +1530,18 @@ bool matchCreateTable(TAOS * con, SShellCmd * cmd) {
} }
} }
// tb options
if (!ret) {
// find like create talbe st (...) tags(..) <here is fill tb option area>
char * p1 = strchr(ps, ')'); // first ')' end
if (p1) {
if(strchr(p1 + 1, ')')) { // second ')' end
// here is tb options area, can insert option
ret = fillWithType(con, cmd, last, WT_VAR_TBOPTION);
}
}
}
taosMemoryFree(ps); taosMemoryFree(ps);
return ret; return ret;
} }