Commit 4cab6703 authored by Iustin Pop's avatar Iustin Pop
Browse files

Rename the Qlang and Queryd modules



Per the new query module hierarchy, rename Qlang to Query/Language and
Queryd to Query/Server. This way, all query-related functionality is
now "contained" in the Query/ directory.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarAgata Murawska <agatamurawska@google.com>
parent 8a65c02b
......@@ -415,14 +415,14 @@ HS_LIB_SRCS = \
htools/Ganeti/Luxi.hs \
htools/Ganeti/Objects.hs \
htools/Ganeti/OpCodes.hs \
htools/Ganeti/Rpc.hs \
htools/Ganeti/Qlang.hs \
htools/Ganeti/Query/Common.hs \
htools/Ganeti/Query/Filter.hs \
htools/Ganeti/Query/Language.hs \
htools/Ganeti/Query/Node.hs \
htools/Ganeti/Query/Query.hs \
htools/Ganeti/Query/Server.hs \
htools/Ganeti/Query/Types.hs \
htools/Ganeti/Queryd.hs \
htools/Ganeti/Rpc.hs \
htools/Ganeti/Runtime.hs \
htools/Ganeti/Ssconf.hs \
htools/Ganeti/THH.hs
......
......@@ -55,7 +55,7 @@ import Ganeti.Config
import Ganeti.Hash
import Ganeti.Logging
import qualified Ganeti.Constants as C
import Ganeti.Queryd (runQueryD)
import Ganeti.Query.Server (runQueryD)
-- * Types and constants definitions
......
......@@ -33,7 +33,7 @@ import Text.JSON.Types
import qualified Text.JSON
import qualified Ganeti.Luxi as L
import qualified Ganeti.Qlang as Qlang
import qualified Ganeti.Query.Language as Qlang
import Ganeti.HTools.Loader
import Ganeti.HTools.Types
import qualified Ganeti.HTools.Group as Group
......
......@@ -88,8 +88,8 @@ import qualified Ganeti.Logging as Logging
import qualified Ganeti.Luxi as Luxi
import qualified Ganeti.Objects as Objects
import qualified Ganeti.OpCodes as OpCodes
import qualified Ganeti.Qlang as Qlang
import qualified Ganeti.Rpc as Rpc
import qualified Ganeti.Query.Language as Qlang
import qualified Ganeti.Runtime as Runtime
import qualified Ganeti.Ssconf as Ssconf
import qualified Ganeti.HTools.CLI as CLI
......
......@@ -74,7 +74,7 @@ import Ganeti.HTools.Utils
import Ganeti.Constants
import Ganeti.Jobs (JobStatus)
import Ganeti.OpCodes (OpCode)
import qualified Ganeti.Qlang as Qlang
import qualified Ganeti.Query.Language as Qlang
import Ganeti.THH
-- * Utility functions
......
......@@ -45,7 +45,7 @@ import Text.JSON (JSON, showJSON)
import qualified Ganeti.Constants as C
import Ganeti.Config
import Ganeti.Objects
import Ganeti.Qlang
import Ganeti.Query.Language
import Ganeti.Query.Types
-- * Generic functions
......
......@@ -58,7 +58,7 @@ import Text.Regex.PCRE ((=~))
import Ganeti.BasicTypes
import Ganeti.Objects
import Ganeti.Qlang
import Ganeti.Query.Language
import Ganeti.Query.Types
import Ganeti.HTools.JSON
......
......@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-}
module Ganeti.Qlang
module Ganeti.Query.Language
( Filter(..)
, FilterField
, FilterValue(..)
......
......@@ -34,7 +34,7 @@ import qualified Data.Map as Map
import Ganeti.Config
import Ganeti.Objects
import Ganeti.Qlang
import Ganeti.Query.Language
import Ganeti.Query.Common
import Ganeti.Query.Types
......
......@@ -56,7 +56,7 @@ import qualified Data.Map as Map
import Ganeti.BasicTypes
import Ganeti.HTools.JSON
import Ganeti.Qlang
import Ganeti.Query.Language
import Ganeti.Query.Common
import Ganeti.Query.Filter
import Ganeti.Query.Types
......
......@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-}
module Ganeti.Queryd
module Ganeti.Query.Server
( ConfigReader
, runQueryD
) where
......@@ -48,7 +48,7 @@ import qualified Ganeti.Config as Config
import Ganeti.BasicTypes
import Ganeti.Logging
import Ganeti.Luxi
import qualified Ganeti.Qlang as Qlang
import qualified Ganeti.Query.Language as Qlang
import Ganeti.Query.Query
-- | A type for functions that can return the configuration when
......
......@@ -30,7 +30,7 @@ module Ganeti.Query.Types where
import qualified Data.Map as Map
import Ganeti.Qlang
import Ganeti.Query.Language
import Ganeti.Objects
-- | The type of field getters. The \"a\" type represents the type
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment