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

fix:[TS-3922]rollback because cases failed & avoid atomic_store_64 core if parameters not aligned by 8

This commit is contained in:
wangmm0220 2023-09-07 19:26:33 +08:00
parent c4898bffd8
commit 842bb5742a
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/dnode/mnode/impl/inc/mndDef.h
View File

@ -664,15 +664,10 @@ typedef struct SStreamConf {
} SStreamConf; } SStreamConf;
typedef struct { typedef struct {
char name[TSDB_STREAM_FNAME_LEN];
// ctl // ctl
SRWLatch lock; SRWLatch lock;
// 3.0.20
int64_t checkpointFreq; // ms
int64_t currentTick; // do not serialize
int64_t deleteMark;
int8_t igCheckUpdate;
// create info // create info
int64_t createTime; int64_t createTime;
int64_t updateTime; int64_t updateTime;
@ -707,7 +702,11 @@ typedef struct {
SSchemaWrapper outputSchema; SSchemaWrapper outputSchema;
SSchemaWrapper tagSchema; SSchemaWrapper tagSchema;
char name[TSDB_STREAM_FNAME_LEN]; // 3.0.20
int64_t checkpointFreq; // ms
int64_t currentTick; // do not serialize
int64_t deleteMark;
int8_t igCheckUpdate;
// 3.0.5. // 3.0.5.
int64_t checkpointId; int64_t checkpointId;

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

@ -1111,7 +1111,7 @@ static int32_t mndAddStreamCheckpointToTrans(STrans *pTrans, SStreamObj *pStream
pStream->checkpointId = checkpointId; pStream->checkpointId = checkpointId;
pStream->checkpointFreq = taosGetTimestampMs(); pStream->checkpointFreq = taosGetTimestampMs();
atomic_store_64(&pStream->currentTick, 0); pStream->currentTick = 0;
// 3. commit log: stream checkpoint info // 3. commit log: stream checkpoint info
pStream->version = pStream->version + 1; pStream->version = pStream->version + 1;