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

Merge branch 'main' into enh/rocksdbSstate

This commit is contained in:
Haojun Liao 2023-04-24 14:44:13 +08:00
parent fa46165227 93a329f5ac
commit 48c36a8c35
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
View File

@ -88,6 +88,10 @@ void getLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo, int64_t *blocks, double
} }
void *destroyLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo) { void *destroyLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo) {
if (pLoadInfo == NULL) {
return NULL;
}
for (int32_t i = 0; i < pLoadInfo->numOfStt; ++i) { for (int32_t i = 0; i < pLoadInfo->numOfStt; ++i) {
pLoadInfo[i].currentLoadBlockIndex = 1; pLoadInfo[i].currentLoadBlockIndex = 1;
pLoadInfo[i].blockIndex[0] = -1; pLoadInfo[i].blockIndex[0] = -1;

2
source/libs/stream/src/stream.c
View File

@ -52,7 +52,7 @@ void streamCleanUp() {
void streamSchedByTimer(void* param, void* tmrId) { void streamSchedByTimer(void* param, void* tmrId) {
SStreamTask* pTask = (void*)param; SStreamTask* pTask = (void*)param;
if (atomic_load_8(&pTask->status.taskStatus) == TASK_STATUS__DROPPING) { if (streamTaskShouldStop(&pTask->status)) {
streamMetaReleaseTask(NULL, pTask); streamMetaReleaseTask(NULL, pTask);
return; return;
} }

6
tests/system-test/0-others/compatibility.py
View File

@ -17,12 +17,12 @@ from util.dnodes import TDDnode
from util.cluster import * from util.cluster import *
import subprocess import subprocess
BASEVERSION = "3.0.1.8" BASEVERSION = "3.0.2.3"
class TDTestCase: class TDTestCase:
def caseDescription(self): def caseDescription(self):
''' f'''
3.0 data compatibility test 3.0 data compatibility test
case1: basedata version is 3.0.1.8 case1: basedata version is {BASEVERSION}
''' '''
return return

2
tests/system-test/7-tmq/tmqCommon.py
View File

@ -170,7 +170,7 @@ class TMQCom:
if tdSql.getData(i, 1) == 1: if tdSql.getData(i, 1) == 1:
loopFlag = 0 loopFlag = 0
break break
time.sleep(0.02) time.sleep(0.10)
return return
def create_database(self,tsql, dbName,dropFlag=1,vgroups=4,replica=1): def create_database(self,tsql, dbName,dropFlag=1,vgroups=4,replica=1):