未验证 提交 23c83a16 编写于 作者: M Minglei Jin 提交者: GitHub

Merge pull request #9872 from taosdata/fix/TS-1118-2.4

[TS-1118]<fix>: added missing params for show create database
......@@ -485,7 +485,26 @@ static int32_t tscGetDBInfo(SCreateBuilder *builder, char *result) {
if (row == NULL) {
return TSDB_CODE_TSC_DB_NOT_SELECTED;
}
const char *showColumns[] = {"REPLICA", "QUORUM", "DAYS", "KEEP", "BLOCKS", NULL};
const char *showColumns[][2] = {
{"REPLICA", "REPLICA"},
{"QUORUM", "QUORUM"},
{"DAYS", "DAYS"},
#ifdef _STORAGE
{"KEEP0,KEEP1,KEEP2", "KEEP"},
#else
{"KEEP", "KEEP"},
#endif
{"CACHE(MB)", "CACHE"},
{"BLOCKS", "BLOCKS"},
{"MINROWS", "MINROWS"},
{"MAXROWS", "MAXROWS"},
{"WALLEVEL", "WAL"},
{"FSYNC", "FSYNC"},
{"COMP", "COMP"},
{"CACHELAST", "CACHELAST"},
{"PRECISION", "PRECISION"},
{"UPDATE", "UPDATE"},
{NULL, NULL}};
SSqlObj *pSql = builder->pInterSql;
TAOS_FIELD *fields = taos_fetch_fields(pSql);
......@@ -499,12 +518,16 @@ static int32_t tscGetDBInfo(SCreateBuilder *builder, char *result) {
if (0 == ret && STR_NOCASE_EQUAL(buf, strlen(buf), builder->buf, strlen(builder->buf))) {
snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "CREATE DATABASE %s", buf);
for (int i = 1; i < num_fields; i++) {
for (int j = 0; showColumns[j] != NULL; j++) {
if (STR_NOCASE_EQUAL(fields[i].name, strlen(fields[i].name), showColumns[j], strlen(showColumns[j]))) {
for (int j = 0; showColumns[j][0] != NULL; j++) {
if (STR_NOCASE_EQUAL(fields[i].name, strlen(fields[i].name), showColumns[j][0], strlen(showColumns[j][0]))) {
memset(buf, 0, sizeof(buf));
ret = tscGetNthFieldResult(row, fields, lengths, i, buf);
if (ret == 0) {
snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), " %s %s", showColumns[j], buf);
if (STR_NOCASE_EQUAL(showColumns[j][0], strlen(showColumns[j][0]), "PRECISION", strlen("PRECISION"))) {
snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), " %s '%s'", showColumns[j][1], buf);
} else {
snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), " %s %s", showColumns[j][1], buf);
}
}
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册