fix(query): query from listRecoverableResources (#1613)

hstreamdb · Sep 20, 2023 · e5e63c1 · e5e63c1
1 parent 5ae5ea0
commit e5e63c1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/hstream/src/HStream/Server/Core/Cluster.hs b/hstream/src/HStream/Server/Core/Cluster.hs
@@ -126,8 +126,7 @@ nodeChangeEventHandler scMVar Gossip.ServerDead I.ServerNode {..} = do
   Log.info $ "handle Server Dead event: " <> Log.buildString' serverNodeId
   withMVar scMVar $ \sc@ServerContext{..} -> do
     recoverDeadNodeTasks sc scIOWorker serverNodeId
-    -- FIXME: DISABLED QUERY RECOVER
-    -- recoverDeadNodeTasks sc (QueryWorker sc) serverNodeId
+    recoverDeadNodeTasks sc (QueryWorker sc) serverNodeId
 nodeChangeEventHandler _ _ _ = return ()
 
 -- getNodeResources :: Meta.MetaHandle -> ResourceType -> Types.ServerID -> IO [T.Text]

diff --git a/hstream/src/HStream/Server/QueryWorker.hs b/hstream/src/HStream/Server/QueryWorker.hs
@@ -2,17 +2,18 @@
 
 module HStream.Server.QueryWorker where
 
-
-
-
-import           HStream.Server.Core.Query (listQueries, resumeQuery)
-
-import qualified Control.Concurrent        as M
-import qualified Data.HashMap.Strict       as HM
-import qualified HStream.Server.HStreamApi as API
-import           HStream.Server.Types      (ServerContext (runningQueries),
-                                            TaskManager (..))
-import           HStream.Utils             (ResourceType (ResQuery))
+#ifdef HStreamEnableSchema
+import           HStream.Server.Core.QueryNew (listQueries, resumeQuery)
+#else
+import           HStream.Server.Core.Query    (listQueries, resumeQuery)
+#endif
+
+import qualified Control.Concurrent           as M
+import qualified Data.HashMap.Strict          as HM
+import qualified HStream.Server.HStreamApi    as API
+import           HStream.Server.Types         (ServerContext (runningQueries),
+                                               TaskManager (..))
+import           HStream.Utils                (ResourceType (ResQuery))
 
 -- TODO: modularize query worker(e.g. replace runningQueries with QueryWorker)
 newtype QueryWorker = QueryWorker