From 3f6768d8cf2c8d7977aa58a5de419b1c29cdf7ea Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Wed, 5 Jul 2023 19:43:29 +0800
Subject: [PATCH] chore: rsma rocksdb adaption

---
 source/dnode/vnode/src/sma/smaRollup.c            |  6 +++++-
 source/dnode/vnode/src/vnd/vnodeOpen.c            | 12 ++++++------
 tests/script/tsim/sma/rsmaPersistenceRecovery.sim |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/source/dnode/vnode/src/sma/smaRollup.c b/source/dnode/vnode/src/sma/smaRollup.c
index 7dafc73652..dece1f90a1 100644
--- a/source/dnode/vnode/src/sma/smaRollup.c
+++ b/source/dnode/vnode/src/sma/smaRollup.c
@@ -14,6 +14,7 @@
  */
 
 #include "sma.h"
+#include "tq.h"
 
 #define RSMA_QTASKEXEC_SMOOTH_SIZE (100)     // cnt
 #define RSMA_SUBMIT_BATCH_SIZE     (1024)    // cnt
@@ -269,7 +270,10 @@ static int32_t tdSetRSmaInfoItemParams(SSma *pSma, SRSmaParam *param, SRSmaStat
       }
       taosMemoryFree(s);
     }
-    pStreamState = streamStateOpen(taskInfDir, NULL, true, -1, -1);
+
+    SStreamTask task = {.id.taskId = 0, .id.streamId = 0};  // TODO: assign value
+    task.pMeta = pVnode->pTq->pStreamMeta;
+    pStreamState = streamStateOpen(taskInfDir, &task, true, -1, -1);
     if (!pStreamState) {
       terrno = TSDB_CODE_RSMA_STREAM_STATE_OPEN;
       return TSDB_CODE_FAILED;
diff --git a/source/dnode/vnode/src/vnd/vnodeOpen.c b/source/dnode/vnode/src/vnd/vnodeOpen.c
index 64546bb4a1..2d5bffa375 100644
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
@@ -378,12 +378,6 @@ SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb) {
     goto _err;
   }
 
-  // open sma
-  if (smaOpen(pVnode, rollback)) {
-    vError("vgId:%d, failed to open vnode sma since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
-
   // open wal
   sprintf(tdir, "%s%s%s", dir, TD_DIRSEP, VNODE_WAL_DIR);
   taosRealPath(tdir, NULL, sizeof(tdir));
@@ -403,6 +397,12 @@ SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb) {
     goto _err;
   }
 
+  // open sma
+  if (smaOpen(pVnode, rollback)) {
+    vError("vgId:%d, failed to open vnode sma since %s", TD_VID(pVnode), tstrerror(terrno));
+    goto _err;
+  }
+
   // open query
   if (vnodeQueryOpen(pVnode)) {
     vError("vgId:%d, failed to open vnode query since %s", TD_VID(pVnode), tstrerror(terrno));
diff --git a/tests/script/tsim/sma/rsmaPersistenceRecovery.sim b/tests/script/tsim/sma/rsmaPersistenceRecovery.sim
index 52bdeba22f..fcec007410 100644
--- a/tests/script/tsim/sma/rsmaPersistenceRecovery.sim
+++ b/tests/script/tsim/sma/rsmaPersistenceRecovery.sim
@@ -5,7 +5,7 @@ sleep 50
 sql connect
 
 #todo xukaili sma should use rocksdb.
-return 1
+#return 1
 
 print =============== create database with retentions
 sql create database d0 retentions 5s:7d,5m:21d,15m:365d;
-- 
GitLab