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

Merge pull request #782 from taosdata/main #783

Closed
wants to merge 8 commits into from
Closed

Merge pull request #782 from taosdata/main #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e5ea947
Merge pull request #782 from taosdata/main
DuanKuanJun Aug 19, 2024
cd8578c
fix: read csv length over int32 range
DuanKuanJun Aug 20, 2024
64dc129
Merge pull request #784 from taosdata/fix/TD-31537-3.0
DuanKuanJun Aug 20, 2024
3a34a6a
fix: stmt prepareStmt must call one for interlace
DuanKuanJun Aug 21, 2024
4454a41
fix: both true with stmt_option_init
DuanKuanJun Aug 21, 2024
a92ce11
fix: stmt no interlace mode prepareStmt call once
DuanKuanJun Aug 21, 2024
67353dd
prepare_stmt call diff from old stmt init and new
DuanKuanJun Aug 22, 2024
6ff8d21
Merge pull request #786 from taosdata/fix/TD-31575-3.0
DuanKuanJun Aug 22, 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
3 changes: 2 additions & 1 deletion src/benchData.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,8 @@ static int generateSampleFromCsv(char *buffer, char* file, FILE* fp, int32_t len
continue;
}

memcpy(buffer + getRows * length, line, readLen + 1);
int64_t offset = ((int64_t)getRows) * length;
memcpy(buffer + offset, line, readLen + 1);
getRows++;

if (getRows == size) {
Expand Down
44 changes: 34 additions & 10 deletions src/benchInsert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,6 +1649,16 @@ static void *syncWriteInterlace(void *sarg) {
int64_t delay2 = 0;
int64_t delay3 = 0;

bool oldInitStmt = stbInfo->autoTblCreating || database->superTbls->size > 1;
// not auto create table call once
if(stbInfo->iface == STMT_IFACE && !oldInitStmt) {
debugPrint("call prepareStmt for stable:%s\n", stbInfo->stbName);
if (prepareStmt(stbInfo, pThreadInfo->conn->stmt, tagData, w)) {
g_fail = true;
goto free_of_interlace;
}
}

while (insertRows > 0) {
int64_t tmp_total_insert_rows = 0;
uint32_t generated = 0;
Expand Down Expand Up @@ -1820,13 +1830,16 @@ static void *syncWriteInterlace(void *sarg) {
goto free_of_interlace;
}
}


if (prepareStmt(stbInfo, pThreadInfo->conn->stmt, tagData, w)) {
g_fail = true;
goto free_of_interlace;
// old must call prepareStmt for each table
if (oldInitStmt) {
debugPrint("call prepareStmt for stable:%s\n", stbInfo->stbName);
if (prepareStmt(stbInfo, pThreadInfo->conn->stmt, tagData, w)) {
g_fail = true;
goto free_of_interlace;
}
}

int64_t start = toolsGetTimestampUs();
if (taos_stmt_set_tbname(pThreadInfo->conn->stmt,
escapedTbName)) {
Expand Down Expand Up @@ -2518,6 +2531,16 @@ void *syncWriteProgressive(void *sarg) {
csvFile = openTagCsv(stbInfo);
tagData = benchCalloc(TAG_BATCH_COUNT, stbInfo->lenOfTags, false);
}

bool oldInitStmt = stbInfo->autoTblCreating || database->superTbls->size > 1;

// not auto table create call on stmt
if (stbInfo->iface == STMT_IFACE && !oldInitStmt) {
if (prepareStmt(stbInfo, pThreadInfo->conn->stmt, tagData, w)) {
g_fail = true;
goto free_of_progressive;
}
}

for (uint64_t tableSeq = pThreadInfo->start_table_from;
tableSeq <= pThreadInfo->end_table_to; tableSeq++) {
Expand Down Expand Up @@ -2554,15 +2577,16 @@ void *syncWriteProgressive(void *sarg) {
goto free_of_progressive;
}
}
}

if (stbInfo->iface == STMT_IFACE) {
}

// old init stmt must call for each table
if (stbInfo->iface == STMT_IFACE && oldInitStmt) {
if (prepareStmt(stbInfo, pThreadInfo->conn->stmt, tagData, w)) {
g_fail = true;
goto free_of_progressive;
}
}

if(stmt || smart || acreate) {
// move next
if (++w >= TAG_BATCH_COUNT) {
Expand Down Expand Up @@ -3489,7 +3513,7 @@ int32_t initInsertThread(SDataBase* database, SSuperTable* stbInfo, int32_t nthr
TAOS_STMT_OPTIONS op;
op.reqId = 0;
op.singleStbInsert = true;
op.singleTableBindOnce = false;
op.singleTableBindOnce = true;
pThreadInfo->conn->stmt = taos_stmt_init_with_options(pThreadInfo->conn->taos, &op);
}
if (NULL == pThreadInfo->conn->stmt) {
Expand Down
Loading