diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h index 60f5683488..0aff654f36 100644 --- a/source/dnode/mnode/impl/inc/mndDef.h +++ b/source/dnode/mnode/impl/inc/mndDef.h @@ -664,15 +664,10 @@ typedef struct SStreamConf { } SStreamConf; typedef struct { + char name[TSDB_STREAM_FNAME_LEN]; // ctl SRWLatch lock; - // 3.0.20 - int64_t checkpointFreq; // ms - int64_t currentTick; // do not serialize - int64_t deleteMark; - int8_t igCheckUpdate; - // create info int64_t createTime; int64_t updateTime; @@ -707,7 +702,11 @@ typedef struct { SSchemaWrapper outputSchema; 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. int64_t checkpointId; diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c index 66acbcc05b..1c36f898c5 100644 --- a/source/dnode/mnode/impl/src/mndStream.c +++ b/source/dnode/mnode/impl/src/mndStream.c @@ -1111,7 +1111,7 @@ static int32_t mndAddStreamCheckpointToTrans(STrans *pTrans, SStreamObj *pStream pStream->checkpointId = checkpointId; pStream->checkpointFreq = taosGetTimestampMs(); - atomic_store_64(&pStream->currentTick, 0); + pStream->currentTick = 0; // 3. commit log: stream checkpoint info pStream->version = pStream->version + 1;