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

Merge branch '3.0' of https://github.com/taosdata/TDengine into enh/tsdb_optimize

This commit is contained in:
Hongze Cheng 2023-05-17 11:45:52 +08:00
parent 0e466a97f0 d7327384e7
commit 7fd5de25e3
7 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/src/clientEnv.c
View File

@ -449,6 +449,7 @@ static void *tscCrashReportThreadFp(void *param) {
tscError("failed to send crash report"); tscError("failed to send crash report");
if (pFile) { if (pFile) {
taosReleaseCrashLogFile(pFile, false); taosReleaseCrashLogFile(pFile, false);
pFile = NULL;
continue; continue;
} }
} else { } else {
@ -468,6 +469,7 @@ static void *tscCrashReportThreadFp(void *param) {
if (pFile) { if (pFile) {
taosReleaseCrashLogFile(pFile, truncateFile); taosReleaseCrashLogFile(pFile, truncateFile);
pFile = NULL;
truncateFile = false; truncateFile = false;
} }

2
source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
View File

@ -91,6 +91,7 @@ static void *dmCrashReportThreadFp(void *param) {
dError("failed to send crash report"); dError("failed to send crash report");
if (pFile) { if (pFile) {
taosReleaseCrashLogFile(pFile, false); taosReleaseCrashLogFile(pFile, false);
pFile = NULL;
continue; continue;
} }
} else { } else {
@ -110,6 +111,7 @@ static void *dmCrashReportThreadFp(void *param) {
if (pFile) { if (pFile) {
taosReleaseCrashLogFile(pFile, truncateFile); taosReleaseCrashLogFile(pFile, truncateFile);
pFile = NULL;
truncateFile = false; truncateFile = false;
} }

4
source/dnode/mnode/impl/src/mndStream.c
View File

@ -1306,7 +1306,7 @@ int32_t mndPauseAllStreamTasks(STrans *pTrans, SStreamObj *pStream) {
int32_t sz = taosArrayGetSize(pTasks); int32_t sz = taosArrayGetSize(pTasks);
for (int32_t j = 0; j < sz; j++) { for (int32_t j = 0; j < sz; j++) {
SStreamTask *pTask = taosArrayGetP(pTasks, j); SStreamTask *pTask = taosArrayGetP(pTasks, j);
if (mndPauseStreamTask(pTrans, pTask) < 0) { if (pTask->taskLevel == TASK_LEVEL__SOURCE && mndPauseStreamTask(pTrans, pTask) < 0) {
return -1; return -1;
} }
} }
@ -1430,7 +1430,7 @@ int32_t mndResumeAllStreamTasks(STrans *pTrans, SStreamObj *pStream, int8_t igUn
int32_t sz = taosArrayGetSize(pTasks); int32_t sz = taosArrayGetSize(pTasks);
for (int32_t j = 0; j < sz; j++) { for (int32_t j = 0; j < sz; j++) {
SStreamTask *pTask = taosArrayGetP(pTasks, j); SStreamTask *pTask = taosArrayGetP(pTasks, j);
if (mndResumeStreamTask(pTrans, pTask, igUntreated) < 0) { if (pTask->taskLevel == TASK_LEVEL__SOURCE && mndResumeStreamTask(pTrans, pTask, igUntreated) < 0) {
return -1; return -1;
} }
} }

2
source/libs/executor/src/timesliceoperator.c
View File

@ -894,8 +894,10 @@ void destroyTimeSliceOperatorInfo(void* param) {
} }
taosArrayDestroy(pInfo->pLinearInfo); taosArrayDestroy(pInfo->pLinearInfo);
if (pInfo->pPrevGroupKey) {
taosMemoryFree(pInfo->pPrevGroupKey->pData); taosMemoryFree(pInfo->pPrevGroupKey->pData);
taosMemoryFree(pInfo->pPrevGroupKey); taosMemoryFree(pInfo->pPrevGroupKey);
}
cleanupExprSupp(&pInfo->scalarSup); cleanupExprSupp(&pInfo->scalarSup);

4
source/libs/stream/src/streamExec.c
View File

@ -35,7 +35,7 @@ static int32_t streamTaskExecImpl(SStreamTask* pTask, const void* data, SArray*
while (pTask->taskLevel == TASK_LEVEL__SOURCE) { while (pTask->taskLevel == TASK_LEVEL__SOURCE) {
int8_t status = atomic_load_8(&pTask->status.taskStatus); int8_t status = atomic_load_8(&pTask->status.taskStatus);
if (status != TASK_STATUS__NORMAL) { if (status != TASK_STATUS__NORMAL && status != TASK_STATUS__PAUSE) {
qError("stream task wait for the end of fill history, s-task:%s, status:%d", pTask->id.idStr, qError("stream task wait for the end of fill history, s-task:%s, status:%d", pTask->id.idStr,
atomic_load_8(&pTask->status.taskStatus)); atomic_load_8(&pTask->status.taskStatus));
taosMsleep(2); taosMsleep(2);
@ -408,7 +408,7 @@ int32_t streamTryExec(SStreamTask* pTask) {
atomic_store_8(&pTask->status.schedStatus, TASK_SCHED_STATUS__INACTIVE); atomic_store_8(&pTask->status.schedStatus, TASK_SCHED_STATUS__INACTIVE);
qDebug("s-task:%s exec completed", pTask->id.idStr); qDebug("s-task:%s exec completed", pTask->id.idStr);
if (!taosQueueEmpty(pTask->inputQueue->queue) && (!streamTaskShouldStop(&pTask->status))) { if (!taosQueueEmpty(pTask->inputQueue->queue) && (!streamTaskShouldStop(&pTask->status)) && (!streamTaskShouldPause(&pTask->status))) {
streamSchedExec(pTask); streamSchedExec(pTask);
} }
} }

57
tests/script/tsim/alter/table.sim
View File

@ -657,36 +657,33 @@ if $data20 != null then
return -1 return -1
endi endi
#print =============== error for normal table print =============== error for normal table
#sql create table tb2023(ts timestamp, f int); sql create table tb2023(ts timestamp, f int);
#sql_error alter table tb2023 add column v varchar(65535); sql_error alter table tb2023 add column v varchar(65518);
#sql_error alter table tb2023 add column v varchar(65535); sql_error alter table tb2023 add column v varchar(65531);
#sql_error alter table tb2023 add column v varchar(65530); sql_error alter table tb2023 add column v varchar(65535);
#sql alter table tb2023 add column v varchar(16374); sql alter table tb2023 add column v varchar(65517);
#sql_error alter table tb2023 modify column v varchar(65536); sql_error alter table tb2023 modify column v varchar(65518);
#sql desc tb2023 sql desc tb2023
#sql alter table tb2023 drop column v sql alter table tb2023 drop column v
#sql_error alter table tb2023 add column v nchar(16384); sql_error alter table tb2023 add column v nchar(16380);
#sql alter table tb2023 add column v nchar(4093); sql alter table tb2023 add column v nchar(16379);
#sql_error alter table tb2023 modify column v nchar(16384); sql_error alter table tb2023 modify column v nchar(16380);
#sql_error alter table tb2023 add column v nchar(16384); sql desc tb2023
#sql alter table tb2023 drop column v
#sql alter table tb2023 add column v nchar(16374); print =============== error for super table
#sql desc tb2023 sql create table stb2023(ts timestamp, f int) tags(t1 int);
# sql_error alter table stb2023 add column v varchar(65518);
#print =============== error for super table sql_error alter table stb2023 add column v varchar(65531);
#sql create table stb2023(ts timestamp, f int) tags(t1 int); sql_error alter table stb2023 add column v varchar(65535);
#sql_error alter table stb2023 add column v varchar(65535); sql alter table stb2023 add column v varchar(65517);
#sql_error alter table stb2023 add column v varchar(65536); sql_error alter table stb2023 modify column v varchar(65518);
#sql_error alter table stb2023 add column v varchar(33100); sql desc stb2023
#sql alter table stb2023 add column v varchar(16374); sql alter table stb2023 drop column v
#sql_error alter table stb2023 modify column v varchar(16375); sql_error alter table stb2023 add column v nchar(16380);
#sql desc stb2023 sql alter table stb2023 add column v nchar(16379);
#sql alter table stb2023 drop column v sql_error alter table stb2023 modify column v nchar(16380);
#sql_error alter table stb2023 add column v nchar(4094); sql desc stb2023
#sql alter table stb2023 add column v nchar(4093);
#sql_error alter table stb2023 modify column v nchar(4094);
#sql desc stb2023
print ======= over print ======= over
sql drop database d1 sql drop database d1

2
tests/script/tsim/parser/alter_column.sim
View File

@ -48,7 +48,7 @@ sql_error alter table tb modify column c2 binary(10);
sql_error alter table tb modify column c2 binary(9); sql_error alter table tb modify column c2 binary(9);
sql_error alter table tb modify column c2 binary(-9); sql_error alter table tb modify column c2 binary(-9);
sql_error alter table tb modify column c2 binary(0); sql_error alter table tb modify column c2 binary(0);
sql_error alter table tb modify column c2 binary(65600); sql_error alter table tb modify column c2 binary(65436);
sql_error alter table tb modify column c2 nchar(30); sql_error alter table tb modify column c2 nchar(30);
sql_error alter table tb modify column c3 double; sql_error alter table tb modify column c3 double;
sql_error alter table tb modify column c3 nchar(10); sql_error alter table tb modify column c3 nchar(10);