Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix bulk queries using more memory (fix #1942) #1972

Merged
merged 2 commits into from
Apr 9, 2019
Merged

fix bulk queries using more memory (fix #1942) #1972

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e0ce8a
fix bulk queries using more memory, fix #1942
rakeshkky Apr 9, 2019
0e148e7
Merge branch 'master' into issue-1942-bulk-query-memory
0x777 Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 28 additions & 26 deletions server/src-lib/Hasura/Prelude.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,34 @@ module Hasura.Prelude
, onLeft
) where

import Control.Applicative as M ((<|>))
import Control.Monad as M (void, when)
import Control.Monad.Base as M
import Control.Monad.Except as M
import Control.Monad.Fail as M (MonadFail)
import Control.Monad.Identity as M
import Control.Monad.Reader as M
import Control.Monad.State as M
import Data.Bool as M (bool)
import Data.Either as M (lefts, partitionEithers, rights)
import Data.Foldable as M (foldrM, toList)
import Data.Hashable as M (Hashable)
import Data.List as M (find, foldl', group, intercalate,
intersect, lookup, sort, sortBy,
sortOn, union, unionBy, (\\))
import Data.Maybe as M (catMaybes, fromMaybe, isJust,
isNothing, listToMaybe, mapMaybe,
maybeToList)
import Data.Ord as M (comparing)
import Data.Semigroup as M (Semigroup (..))
import Data.String as M (IsString)
import Data.Text as M (Text)
import Data.Word as M (Word64)
import GHC.Generics as M (Generic)
import Prelude as M hiding (fail, init, lookup)
import Text.Read as M (readEither, readMaybe)
import Control.Applicative as M ((<|>))
import Control.Monad as M (void, when)
import Control.Monad.Base as M
import Control.Monad.Except as M
import Control.Monad.Fail as M (MonadFail)
import Control.Monad.Identity as M
import Control.Monad.Reader as M
import Control.Monad.State.Strict as M
import Data.Bool as M (bool)
import Data.Either as M (lefts, partitionEithers,
rights)
import Data.Foldable as M (foldrM, toList)
import Data.Hashable as M (Hashable)
import Data.List as M (find, foldl', group,
intercalate, intersect,
lookup, sort, sortBy, sortOn,
union, unionBy, (\\))
import Data.Maybe as M (catMaybes, fromMaybe, isJust,
isNothing, listToMaybe,
mapMaybe, maybeToList)
import Data.Ord as M (comparing)
import Data.Semigroup as M (Semigroup (..))
import Data.String as M (IsString)
import Data.Text as M (Text)
import Data.Word as M (Word64)
import GHC.Generics as M (Generic)
import Prelude as M hiding (fail, init, lookup)
import Text.Read as M (readEither, readMaybe)

onNothing :: (Monad m) => Maybe a -> m a -> m a
onNothing m act = maybe act return m
Expand Down
8 changes: 4 additions & 4 deletions server/src-lib/Hasura/RQL/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ import Hasura.RQL.Types.BoolExp as R
import Hasura.RQL.Types.Common as R
import Hasura.RQL.Types.DML as R
import Hasura.RQL.Types.Error as R
import Hasura.RQL.Types.EventTrigger as R
import Hasura.RQL.Types.Permission as R
import Hasura.RQL.Types.RemoteSchema as R
import Hasura.RQL.Types.SchemaCache as R
import Hasura.RQL.Types.EventTrigger as R

import Hasura.SQL.Types

Expand Down Expand Up @@ -165,9 +165,9 @@ instance (MonadTx m) => MonadTx (ReaderT s m) where
liftTx = lift . liftTx

data LazyTx e a
= LTErr e
| LTNoTx a
| LTTx (Q.TxE e a)
= LTErr !e
| LTNoTx !a
| LTTx !(Q.TxE e a)

lazyTxToQTx :: LazyTx e a -> Q.TxE e a
lazyTxToQTx = \case
Expand Down