Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/td 30267 #751

Merged
merged 2 commits into from
Jun 7, 2024
Merged

Feat/td 30267 #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4fd4b7
fix:default create db vgroups set to half cpu count
DuanKuanJun Jun 6, 2024
6f93351
fix: add information cpu and memory
DuanKuanJun Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions inc/toolsdef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ int32_t toolsCloseDir(TdDirPtr *ppDir);

int64_t atomic_add_fetch_64(int64_t volatile* ptr, int64_t val);
int32_t toolsGetNumberOfCores();
int32_t toolsGetPhysicalMemory();

int64_t toolsGetTimestamp(int32_t precision);
void toolsMsleep(int32_t mseconds);
Expand Down
30 changes: 29 additions & 1 deletion src/benchInsert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,34 @@ int32_t getVgroupsOfDb(SBenchConn *conn, SDataBase *database) {
}
#endif // TD_VER_COMPATIBLE_3_0_0_0

// export from taos osSysinfo.c
int32_t taosGetTotalMemory(int64_t *totalKB);

int32_t toolsGetDefaultVGroups() {
int32_t cores = toolsGetNumberOfCores();
if (cores < 3 ) {
return 1;
}

int64_t MemKB = 0;
taosGetTotalMemory(&MemKB);

infoPrint("check local machine CPU: %d Memory:%d MB \n", cores, (int32_t)(MemKB/1024));
if (MemKB <= 2*1024*1024) { // 2G
return 1;
} else if (MemKB <= 4*1024*1024) { // 4G
return 2;
} else if (MemKB <= 8*1024*1024) { // 8G
return 3;
} else if (MemKB <= 16*1024*1024) { // 16G
return 4;
} else if (MemKB <= 32*1024*1024) { // 32G
return 5;
} else {
return cores / 2;
}
}

int geneDbCreateCmd(SDataBase *database, char *command, int remainVnodes) {
int dataLen = 0;
int n;
Expand All @@ -505,7 +533,7 @@ int geneDbCreateCmd(SDataBase *database, char *command, int remainVnodes) {
database->dbName,
(-1 != g_arguments->inputted_vgroups)?
g_arguments->inputted_vgroups:
min(remainVnodes, toolsGetNumberOfCores()));
min(remainVnodes, toolsGetDefaultVGroups()));
} else {
n = snprintf(command + dataLen, SHORT_1K_SQL_BUFF_LEN - dataLen,
g_arguments->escape_character
Expand Down
Loading