fix(Connector): always return config in Connector (#1383)

hstreamdb · Apr 27, 2023 · 8377177 · 8377177
1 parent bbaa975
commit 8377177
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/external/protocol b/external/protocol
diff --git a/hstream-io/HStream/IO/Meta.hs b/hstream-io/HStream/IO/Meta.hs
@@ -22,7 +22,7 @@ createIOTaskMeta h taskName taskId taskInfo = do
 
 listIOTaskMeta :: MetaHandle -> IO [API.Connector]
 listIOTaskMeta h = do
-  map (convertTaskMeta False) . filter (\TaskMeta{..} -> taskStateMeta /= DELETED) <$> listMeta @TaskMeta h
+  map convertTaskMeta . filter (\TaskMeta{..} -> taskStateMeta /= DELETED) <$> listMeta @TaskMeta h
 
 getIOTaskMeta :: MetaHandle -> T.Text -> IO (Maybe TaskMeta)
 getIOTaskMeta h tid = getMeta tid h

diff --git a/hstream-io/HStream/IO/Types.hs b/hstream-io/HStream/IO/Types.hs
@@ -151,21 +151,16 @@ instance HasPath TaskIdMeta FHandle where
 instance HasPath TaskKvMeta FHandle where
   myRootPath = "ioTaskKvs"
 
-convertTaskMeta :: Bool -> TaskMeta -> API.Connector
-convertTaskMeta addConfig TaskMeta {..} =
+convertTaskMeta :: TaskMeta -> API.Connector
+convertTaskMeta TaskMeta {..} =
   API.Connector
     (taskName taskInfoMeta)
     (ioTaskTypeToText . taskType $ taskInfoMeta)
     (taskTarget taskInfoMeta)
     (Just . taskCreatedTime $ taskInfoMeta)
     (ioTaskStatusToText taskStateMeta)
-    cfg
+    (TL.toStrict . J.encodeToLazyText . J.lookup "connector" $ connectorConfig taskInfoMeta)
     Vector.empty
-  where
-    Just connectorCfg = J.lookup "connector" $ connectorConfig taskInfoMeta
-    cfg = if addConfig
-      then TL.toStrict $ J.encodeToLazyText connectorCfg
-      else ""
 
 ioTaskStatusToText :: IOTaskStatus -> T.Text
 ioTaskStatusToText = T.pack . show

diff --git a/hstream-io/HStream/IO/Worker.hs b/hstream-io/HStream/IO/Worker.hs
@@ -114,7 +114,7 @@ showIOTask_ worker@Worker{..} name = do
   taskOffsets <- C.readMVar taskOffsetsM
   M.getIOTaskMeta workerHandle taskId >>= \case
     Nothing -> throwIO $ HE.ConnectorNotFound name
-    Just c  -> return $ (convertTaskMeta True c) {API.connectorOffsets = taskOffsets}
+    Just c  -> return $ (convertTaskMeta c) {API.connectorOffsets = taskOffsets}
 
 listIOTasks :: Worker -> IO [API.Connector]
 listIOTasks Worker{..} = M.listIOTaskMeta workerHandle