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

[TD-3147] <fix>: suppport insert interval. pass test.

This commit is contained in:
Shuduo Sang 2021-03-09 17:00:00 +08:00
parent 724fb5e03a
commit 530401602a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/kit/taosdemo/taosdemo.c
View File

@ -3784,7 +3784,6 @@ static void syncWriteForNumberOfTblInOneSql(
} }
uint64_t time_counter = winfo->start_time; uint64_t time_counter = winfo->start_time;
int64_t tmp_time;
int sampleUsePos; int sampleUsePos;
int64_t st = 0; int64_t st = 0;
@ -3792,6 +3791,7 @@ static void syncWriteForNumberOfTblInOneSql(
for (int i = 0; i < superTblInfo->insertRows;) { for (int i = 0; i < superTblInfo->insertRows;) {
int32_t tbl_id = 0; int32_t tbl_id = 0;
for (int tID = winfo->start_table_id; tID <= winfo->end_table_id; ) { for (int tID = winfo->start_table_id; tID <= winfo->end_table_id; ) {
int64_t tmp_time = 0;
int inserted = i; int inserted = i;
for (int k = 0; k < g_args.num_of_RPR;) { for (int k = 0; k < g_args.num_of_RPR;) {
@ -4250,7 +4250,6 @@ static void* syncWriteWithStb(void *sarg) {
return NULL; return NULL;
} }
int64_t time_counter = winfo->start_time;
uint64_t st = 0; uint64_t st = 0;
uint64_t et = 0; uint64_t et = 0;
@ -4258,16 +4257,16 @@ static void* syncWriteWithStb(void *sarg) {
winfo->totalAffectedRows = 0; winfo->totalAffectedRows = 0;
int sampleUsePos; int sampleUsePos;
uint64_t tmp_time;
debugPrint("%s() LN%d insertRows=%"PRId64"\n", __func__, __LINE__, superTblInfo->insertRows); debugPrint("%s() LN%d insertRows=%"PRId64"\n", __func__, __LINE__, superTblInfo->insertRows);
for (uint32_t tID = winfo->start_table_id; tID <= winfo->end_table_id; for (uint32_t tID = winfo->start_table_id; tID <= winfo->end_table_id;
tID++) { tID++) {
int64_t start_time = winfo->start_time;
for (int i = 0; i < superTblInfo->insertRows;) { for (int i = 0; i < superTblInfo->insertRows;) {
int64_t tblInserted = i; int64_t tblInserted = i;
tmp_time = time_counter;
if (i > 0 && g_args.insert_interval if (i > 0 && g_args.insert_interval
&& (g_args.insert_interval > (et - st) )) { && (g_args.insert_interval > (et - st) )) {
@ -4333,7 +4332,7 @@ static void* syncWriteWithStb(void *sarg) {
retLen = getRowDataFromSample( retLen = getRowDataFromSample(
pstr + len, pstr + len,
superTblInfo->maxSqlLen - len, superTblInfo->maxSqlLen - len,
tmp_time += superTblInfo->timeStampStep, start_time + superTblInfo->timeStampStep * i,
superTblInfo, superTblInfo,
&sampleUsePos, &sampleUsePos,
fp, fp,
@ -4345,7 +4344,7 @@ static void* syncWriteWithStb(void *sarg) {
int rand_num = rand_tinyint() % 100; int rand_num = rand_tinyint() % 100;
if (0 != superTblInfo->disorderRatio if (0 != superTblInfo->disorderRatio
&& rand_num < superTblInfo->disorderRatio) { && rand_num < superTblInfo->disorderRatio) {
int64_t d = tmp_time - rand() % superTblInfo->disorderRange; int64_t d = start_time - rand() % superTblInfo->disorderRange;
retLen = generateRowData( retLen = generateRowData(
pstr + len, pstr + len,
superTblInfo->maxSqlLen - len, superTblInfo->maxSqlLen - len,
@ -4356,7 +4355,7 @@ static void* syncWriteWithStb(void *sarg) {
retLen = generateRowData( retLen = generateRowData(
pstr + len, pstr + len,
superTblInfo->maxSqlLen - len, superTblInfo->maxSqlLen - len,
tmp_time += superTblInfo->timeStampStep, start_time + superTblInfo->timeStampStep * i,
superTblInfo); superTblInfo);
} }
if (retLen < 0) { if (retLen < 0) {
@ -4417,8 +4416,6 @@ static void* syncWriteWithStb(void *sarg) {
et = taosGetTimestampMs(); et = taosGetTimestampMs();
} }
time_counter = tmp_time;
if (tblInserted >= superTblInfo->insertRows) if (tblInserted >= superTblInfo->insertRows)
break; break;
} // num_of_DPT } // num_of_DPT