merge with develop branch.
This commit is contained in:
parent
466ae04d67
commit
f5f714a3ce
|
@ -120,14 +120,14 @@ enum MODE {
|
||||||
MODE_BUT
|
MODE_BUT
|
||||||
};
|
};
|
||||||
|
|
||||||
enum INTERFACE {
|
enum enum_TAOS_INTERFACE {
|
||||||
TAOSC_IFACE,
|
TAOSC_IFACE,
|
||||||
REST_IFACE,
|
REST_IFACE,
|
||||||
STMT_IFACE,
|
STMT_IFACE,
|
||||||
INTERFACE_BUT
|
INTERFACE_BUT
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef enum enum_INSERT_MODE {
|
typedef enum enum_PROGRESSIVE_OR_INTERLACE {
|
||||||
PROGRESSIVE_INSERT_MODE,
|
PROGRESSIVE_INSERT_MODE,
|
||||||
INTERLACE_INSERT_MODE,
|
INTERLACE_INSERT_MODE,
|
||||||
INVALID_INSERT_MODE
|
INVALID_INSERT_MODE
|
||||||
|
@ -1964,7 +1964,7 @@ static void printfDbInfoForQueryToFile(
|
||||||
fprintf(fp, "================ database[%d] ================\n", index);
|
fprintf(fp, "================ database[%d] ================\n", index);
|
||||||
fprintf(fp, "name: %s\n", dbInfos->name);
|
fprintf(fp, "name: %s\n", dbInfos->name);
|
||||||
fprintf(fp, "created_time: %s\n", dbInfos->create_time);
|
fprintf(fp, "created_time: %s\n", dbInfos->create_time);
|
||||||
fprintf(fp, "ntables: %d\n", dbInfos->ntables);
|
fprintf(fp, "ntables: %"PRIu64"\n", dbInfos->ntables);
|
||||||
fprintf(fp, "vgroups: %d\n", dbInfos->vgroups);
|
fprintf(fp, "vgroups: %d\n", dbInfos->vgroups);
|
||||||
fprintf(fp, "replica: %d\n", dbInfos->replica);
|
fprintf(fp, "replica: %d\n", dbInfos->replica);
|
||||||
fprintf(fp, "quorum: %d\n", dbInfos->quorum);
|
fprintf(fp, "quorum: %d\n", dbInfos->quorum);
|
||||||
|
|
Loading…
Reference in New Issue