@@ -1,7 +1,4 @@
1{-# LANGUAGE ScopedTypeVariables #-}
1{-# LANGUAGE ScopedTypeVariables #-}
2−{-# LANGUAGE FlexibleInstances #-}
3−{-# LANGUAGE FlexibleContexts #-}
4−{-# LANGUAGE OverloadedStrings #-}
5module ProjectM36.RelationalExpression where
2module ProjectM36.RelationalExpression where
6import ProjectM36.Relation
3import ProjectM36.Relation
7import ProjectM36.Tuple
4import ProjectM36.Tuple
@@ -10,44 +7,33 @@ import ProjectM36.Base
10import qualified Data.UUID as U
7import qualified Data.UUID as U
11import ProjectM36.Error
8import ProjectM36.Error
12import ProjectM36.AtomType
9import ProjectM36.AtomType
13−import ProjectM36.Attribute (emptyAttributes, attributesFromList)
10+import ProjectM36.Attribute (emptyAttributes)
14import ProjectM36.ScriptSession
11import ProjectM36.ScriptSession
15import ProjectM36.DataTypes.Primitive
12import ProjectM36.DataTypes.Primitive
16import ProjectM36.AtomFunction
13import ProjectM36.AtomFunction
17import ProjectM36.DatabaseContextFunction
14import ProjectM36.DatabaseContextFunction
18import ProjectM36.Arbitrary
15import ProjectM36.Arbitrary
19−import ProjectM36.GraphRefRelationalExpr
20import ProjectM36.Transaction
16import ProjectM36.Transaction
21import qualified ProjectM36.Attribute as A
17import qualified ProjectM36.Attribute as A
22import qualified Data.Map as M
18import qualified Data.Map as M
23import qualified Data.HashSet as HS
19import qualified Data.HashSet as HS
24import qualified Data.Set as S
20import qualified Data.Set as S
25import Control.Monad.State hiding (join)
21import Control.Monad.State hiding (join)
26−import Data.Bifunctor (second)
22+import Control.Exception
27import Data.Maybe
23import Data.Maybe
28import Data.Either
24import Data.Either
29import Data.Char (isUpper)
25import Data.Char (isUpper)
31−import qualified Data.List.NonEmpty as NE
32−import Data.Functor.Identity
33import qualified Data.Text as T
26import qualified Data.Text as T
34import qualified Data.Vector as V
27import qualified Data.Vector as V
35import qualified ProjectM36.TypeConstructorDef as TCD
28import qualified ProjectM36.TypeConstructorDef as TCD
36−import qualified Control.Monad.RWS.Strict as RWS
29+import Control.Monad.Trans.Except
37−import Control.Monad.RWS.Strict (RWST, execRWST, runRWST)
38−import Control.Monad.Except hiding (join)
39−import Control.Monad.Trans.Except (except)
30+import Control.Monad.Trans.Reader
40−import Control.Monad.Reader as R hiding (join)
41−import ProjectM36.NormalizeExpr
42−import ProjectM36.WithNameExpr
43import Test.QuickCheck
31import Test.QuickCheck
44−import qualified Data.Functor.Foldable as Fold
32+import GHC
45−import Control.Applicative
46−#ifdef PM36_HASKELL_SCRIPTING
47−import GHC hiding (getContext)
48−import Control.Exception
49import GHC.Paths
33import GHC.Paths
50−#endif
34+import Data.Time.Clock
35+import Data.Time.Calendar
36+import qualified Data.List.NonEmpty as NE
52data DatabaseContextExprDetails = CountUpdatedTuples
38data DatabaseContextExprDetails = CountUpdatedTuples
@@ -64,63 +50,54 @@ databaseContextExprDetailsFunc CountUpdatedTuples _ relIn = Relation attrs newTu
64 Right ts -> ts
50 Right ts -> ts
66-- | Used to start a fresh database state for a new database context expression.
52-- | Used to start a fresh database state for a new database context expression.
67−mkDatabaseContextEvalState :: DatabaseContext -> DatabaseContextEvalState
53+freshDatabaseState :: DatabaseContext -> DatabaseStateElems
68−mkDatabaseContextEvalState context = DatabaseContextEvalState {
54+freshDatabaseState context = DatabaseStateElems {
69− dbc_context = context,
55+ context = context,
70− dbc_accum = M.empty,
56+ accum = M.empty,
71− dbc_dirty = False
57+ dirty = False
72 } --future work: propagate return accumulator
58 } --future work: propagate return accumulator
74-- we need to pass around a higher level RelationTuple and Attributes in order to solve #52
60-- we need to pass around a higher level RelationTuple and Attributes in order to solve #52
75−data RelationalExprEnv = RelationalExprEnv {
61+data RelationalExprStateElems = RelationalExprStateElems {
76− re_context :: DatabaseContext,
62+ elems_context :: DatabaseContext,
77− re_graph :: TransactionGraph,
63+ elems_graph :: TransactionGraph,
64+ elems_currentTransId :: TransactionId,
78− re_extra :: Maybe (Either RelationTuple Attributes)
65+ elems_extra :: Maybe (Either RelationTuple Attributes)
81−envTuple :: GraphRefRelationalExprEnv -> RelationTuple
68+stateTuple :: RelationalExprStateElems -> RelationTuple
82−envTuple e = fromLeft emptyTuple (fromMaybe (Left emptyTuple) (gre_extra e))
69+stateTuple e = fromLeft emptyTuple (fromMaybe (Left emptyTuple) (elems_extra e))
84−envAttributes :: GraphRefRelationalExprEnv -> Attributes
71+stateAttributes :: RelationalExprStateElems -> Attributes
85−envAttributes e = fromRight emptyAttributes (fromMaybe (Right emptyAttributes) (gre_extra e))
72+stateAttributes e = fromRight emptyAttributes (fromMaybe (Right emptyAttributes) (elems_extra e))
74+data RelationalExprStateElems = RelationalExprStateTupleElems DatabaseContext RelationTuple | -- used when fully evaluating a relexpr
75+ RelationalExprStateAttrsElems DatabaseContext Attributes | --used when evaluating the type of a relexpr
76+ RelationalExprStateElems DatabaseContext --used by default at the top level of evaluation
87−instance Show RelationalExprEnv where
79+instance Show RelationalExprStateElems where show e@RelationalExprStateElems{} = "RelationalExprStateElems " ++ show (elems_extra e)
88− show e@RelationalExprEnv{} = "RelationalExprEnv " ++ show (re_extra e)
80+
89−
81+mkRelationalExprState :: DatabaseContext -> TransactionId -> TransactionGraph -> RelationalExprStateElems
90−--used to eval relationalexpr
82+mkRelationalExprState ctx currentTransId graph =
91−type RelationalExprM a = ReaderT RelationalExprEnv (ExceptT RelationalError Identity) a
83+ RelationalExprStateElems
92−
84+ { elems_context = ctx,
93−runRelationalExprM :: RelationalExprEnv -> RelationalExprM a -> Either RelationalError a
85+ elems_graph = graph,
94−runRelationalExprM env m = runIdentity (runExceptT (runReaderT m env))
86+ elems_currentTransId = currentTransId,
96−reGraph :: RelationalExprM TransactionGraph
97−reGraph = asks re_graph
99−reContext :: RelationalExprM DatabaseContext
100−reContext = asks re_context
102−mkRelationalExprEnv :: DatabaseContext -> TransactionGraph -> RelationalExprEnv
103−mkRelationalExprEnv ctx graph =
107− re_extra = Nothing }
87+ elems_extra = Nothing }
109−askEnv :: GraphRefRelationalExprM GraphRefRelationalExprEnv
89+mergeTuplesIntoRelationalExprState :: RelationTuple -> RelationalExprStateElems -> RelationalExprStateElems
110−askEnv = R.ask
90+mergeTuplesIntoRelationalExprState tupIn e@RelationalExprStateElems{} =
112−mergeTuplesIntoGraphRefRelationalExprEnv :: RelationTuple -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
113−mergeTuplesIntoGraphRefRelationalExprEnv tupIn env =
114− env { gre_extra = new_elems }
91+ e{elems_extra = new_elems }
116 new_elems = Just (Left newTuple)
93 new_elems = Just (Left newTuple)
117− mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (envTuple env))
94+ mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (stateTuple e))
118 newTuple = mkRelationTupleFromMap mergedTupMap
95 newTuple = mkRelationTupleFromMap mergedTupMap
120−mergeAttributesIntoGraphRefRelationalExprEnv :: Attributes -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
97+mergeAttributesIntoRelationalExprState :: Attributes -> RelationalExprStateElems -> RelationalExprStateElems
121−mergeAttributesIntoGraphRefRelationalExprEnv attrsIn e = e { gre_extra = newattrs }
98+mergeAttributesIntoRelationalExprState attrsIn e@RelationalExprStateElems{} = e{elems_extra = newattrs }
123− newattrs = Just (Right (A.union attrsIn (envAttributes e)))
100+ newattrs = Just (Right (A.union attrsIn (stateAttributes e)))
125type ResultAccumName = StringType
102type ResultAccumName = StringType
@@ -130,403 +107,440 @@ data ResultAccum = ResultAccum { resultAccumFunc :: ResultAccumFunc,
130 resultAccumResult :: Relation
107 resultAccumResult :: Relation
133−data DatabaseContextEvalState = DatabaseContextEvalState {
110+data DatabaseStateElems = DatabaseStateElems {
134− dbc_context :: DatabaseContext, --new, alterable context for a new transaction
111+ context :: DatabaseContext, --new, alterable context for a new transaction
135− dbc_accum :: M.Map ResultAccumName ResultAccum,
112+ accum :: M.Map ResultAccumName ResultAccum,
136− dbc_dirty :: DirtyFlag
113+ dirty :: DirtyFlag
139−data DatabaseContextEvalEnv = DatabaseContextEvalEnv
116+type DatabaseState a = State DatabaseStateElems a
140− { dce_transId :: TransactionId,
141− dce_graph :: TransactionGraph
144−mkDatabaseContextEvalEnv :: TransactionId -> TransactionGraph -> DatabaseContextEvalEnv
118+getStateContext :: DatabaseState DatabaseContext
145−mkDatabaseContextEvalEnv = DatabaseContextEvalEnv
119+getStateContext = context <$> get
147−type DatabaseContextEvalMonad a = RWST DatabaseContextEvalEnv () DatabaseContextEvalState (ExceptT RelationalError Identity) a
149−runDatabaseContextEvalMonad :: DatabaseContext -> DatabaseContextEvalEnv -> DatabaseContextEvalMonad () -> Either RelationalError DatabaseContextEvalState
150−runDatabaseContextEvalMonad ctx env m = runIdentity (runExceptT (fst <$> execRWST m env freshEnv))
152− freshEnv = mkDatabaseContextEvalState ctx
155−dbcTransId :: DatabaseContextEvalMonad TransactionId
156−dbcTransId = dce_transId <$> RWS.ask
158−dbcGraph :: DatabaseContextEvalMonad TransactionGraph
159−dbcGraph = dce_graph <$> RWS.ask
161−dbcRelationalExprEnv :: DatabaseContextEvalMonad RelationalExprEnv
162−dbcRelationalExprEnv =
163− mkRelationalExprEnv <$> getStateContext <*> dbcGraph
165−getStateContext :: DatabaseContextEvalMonad DatabaseContext
166−getStateContext = gets dbc_context
168−putStateContext :: DatabaseContext -> DatabaseContextEvalMonad ()
121+putStateContext :: DatabaseContext -> DatabaseState ()
169putStateContext ctx' = do
122putStateContext ctx' = do
171− put (s {dbc_context = ctx', dbc_dirty = True})
124+ put (s {context = ctx'})
173−-- | The context is optionally passed down along in cases where the current context is uncommitted.
174−data GraphRefRelationalExprEnv =
175− GraphRefRelationalExprEnv {
176− gre_context :: Maybe DatabaseContext,
177− gre_graph :: TransactionGraph,
178− gre_extra :: Maybe (Either RelationTuple Attributes)
181−type GraphRefRelationalExprM a = ReaderT GraphRefRelationalExprEnv (ExceptT RelationalError Identity) a
126+type RelationalExprState a = Reader RelationalExprStateElems a
183−gfTransForId :: TransactionId -> GraphRefRelationalExprM Transaction
128+stateElemsContext :: RelationalExprStateElems -> DatabaseContext
184−gfTransForId tid = do
129+stateElemsContext = elems_context
185− graph <- gfGraph
130+
186− lift $ except $ transactionForId tid graph
131+setStateElemsContext :: RelationalExprStateElems -> DatabaseContext -> RelationalExprStateElems
187−
132+setStateElemsContext e ctx = e { elems_context = ctx }
188−gfDatabaseContextForMarker :: GraphRefTransactionMarker -> GraphRefRelationalExprM DatabaseContext
133+
189−gfDatabaseContextForMarker (TransactionMarker transId) = concreteDatabaseContext <$> gfTransForId transId
134+--relvar state is needed in evaluation of relational expression but only as read-only in order to extract current relvar values
190−gfDatabaseContextForMarker UncommittedContextMarker = do
135+evalRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError GraphRefRelationalExpr)
191− mctx <- gre_context <$> askEnv
136+evalRelationalExpr (RelationVariable name _) = do
192− case mctx of
137+ relvarTable <- fmap (relationVariables . stateElemsContext) ask
193− Nothing -> throwError NoUncommittedContextInEvalError
138+ return $ case M.lookup name relvarTable of
194− Just ctx -> pure ctx
139+ Just res -> Right res
195−
140+ Nothing -> Left $ RelVarNotDefinedError name
196−runGraphRefRelationalExprM :: GraphRefRelationalExprEnv -> GraphRefRelationalExprM a -> Either RelationalError a
141+
197−runGraphRefRelationalExprM env m = runIdentity (runExceptT (runReaderT m env))
142+evalRelationalExpr (Project attrNames expr) = do
198−
143+ eAttrNameSet <- evalAttributeNames attrNames expr
199−freshGraphRefRelationalExprEnv :: Maybe DatabaseContext -> TransactionGraph -> GraphRefRelationalExprEnv
144+ case eAttrNameSet of
200−freshGraphRefRelationalExprEnv mctx graph = GraphRefRelationalExprEnv {
145+ Left err -> pure (Left err)
201− gre_context = mctx,
146+ Right attrNameSet -> do
202− gre_graph = graph,
147+ rel <- evalRelationalExpr expr
203− gre_extra = Nothing
148+ case rel of
204− }
149+ Right rel2 -> pure $ Right (Project (AttributeNames attrNameSet) rel2)
205−
150+ Left err -> pure $ Left err
206−gfGraph :: GraphRefRelationalExprM TransactionGraph
151+
207−gfGraph = asks gre_graph
152+evalRelationalExpr (Union exprA exprB) = do
153+ relA <- evalRelationalExpr exprA
154+ relB <- evalRelationalExpr exprB
156+ Left err -> return $ Left err
157+ Right relA2 -> case relB of
158+ Left err -> return $ Left err
159+ Right relB2 -> return $ Right (Union relA2 relB2)
161+evalRelationalExpr (Join exprA exprB) = do
162+ relA <- evalRelationalExpr exprA
163+ relB <- evalRelationalExpr exprB
165+ Left err -> return $ Left err
166+ Right relA2 -> case relB of
167+ Left err -> return $ Left err
168+ Right relB2 -> return $ Right (Join relA2 relB2)
170+evalRelationalExpr (Difference exprA exprB) = do
171+ relA <- evalRelationalExpr exprA
172+ relB <- evalRelationalExpr exprB
174+ Left err -> return $ Left err
175+ Right relA2 -> case relB of
176+ Left err -> return $ Left err
177+ Right relB2 -> return $ Right (Difference relA2 relB2)
179+evalRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
180+ case mkRelation attributeSet tupleSet of
181+ Right rel -> return $ Right (ExistingRelation rel)
182+ Left err -> return $ Left err
184+evalRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
185+ currentContext <- fmap stateElemsContext ask
186+ let tConss = typeConstructorMapping currentContext
187+ -- if the mAttrExprs is Nothing, then we should attempt to infer the tuple attributes from the first tuple itself- note that this is not always possible
189+ mAttrs <- case mAttrExprs of
191+ Just . A.attributesFromList <$> mapM (either throwE pure . evalAttrExpr tConss) (fromMaybe [] mAttrExprs)
192+ Nothing -> pure Nothing
193+ tuples <- mapM (liftE . evalTupleExpr mAttrs) tupleExprs
194+ let attrs = fromMaybe firstTupleAttrs mAttrs
195+ firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
196+ expr <- either throwE pure (mkRelation attrs (RelationTupleSet tuples))
197+ pure (ExistingRelation expr)
199+evalRelationalExpr (ExistingRelation rel) = pure (Right (ExistingRelation rel))
209−envContext :: RelationalExprEnv -> DatabaseContext
201+evalRelationalExpr (Rename oldAttrName newAttrName relExpr) = do
210−envContext = re_context
202+ evald <- evalRelationalExpr relExpr
204+ Right expr -> return $ Right (Rename oldAttrName newAttrName expr)
205+ Left err -> return $ Left err
212−setEnvContext :: RelationalExprEnv -> DatabaseContext -> RelationalExprEnv
207+evalRelationalExpr (Group oldAttrNames newAttrName relExpr) = do
213−setEnvContext e ctx = e { re_context = ctx }
208+ eOldAttrNameSet <- evalAttributeNames oldAttrNames relExpr
209+ case eOldAttrNameSet of
210+ Left err -> pure (Left err)
211+ Right oldAttrNameSet -> do
212+ evald <- evalRelationalExpr relExpr
214+ Right expr -> return $ Right (Group (AttributeNames oldAttrNameSet) newAttrName expr)
215+ Left err -> return $ Left err
217+evalRelationalExpr (Ungroup attrName relExpr) = do
218+ evald <- evalRelationalExpr relExpr
220+ Right expr -> return $ Right (Ungroup attrName expr)
221+ Left err -> return $ Left err
223+evalRelationalExpr (Restrict predicateExpr relExpr) = do
224+ evald <- evalRelationalExpr relExpr
225+ ePred <- processRestrictionPredicateExpr predicateExpr
227+ Left err -> return $ Left err
228+ Right expr -> case ePred of
229+ Left err -> pure (Left err)
230+ Right pred -> pure $ Right (Restrict pred expr)
232+evalRelationalExpr (Equals relExprA relExprB) = do
233+ evaldA <- evalRelationalExpr relExprA
234+ evaldB <- evalRelationalExpr relExprB
236+ Left err -> return $ Left err
237+ Right exprA -> case evaldB of
238+ Left err -> return $ Left err
239+ Right exprB -> return $ Right (Equals exprA exprB)
241+evalRelationalExpr (With views mainExpr) = do
244+ let addScopedView ctx (vname,vexpr) = if vname `M.member` relationVariables ctx then
245+ Left (RelVarAlreadyDefinedError vname)
247+ case runState (evalDatabaseContextExpr (Assign vname vexpr)) (freshDatabaseState ctx) of
248+ (Left err,_) -> Left err
249+ (Right (), (ctx',_,_)) -> Right ctx'
251+ case foldM addScopedView (stateElemsContext rstate) views of
252+ Left err -> return $ Left err
254+ let evalMainExpr expr = runReader (evalRelationalExpr expr) (RelationalExprStateElems ctx'')
255+ case evalMainExpr mainExpr of
256+ Left err -> return $ Left err
257+ Right rel -> return $ Right rel
259+--warning: copy-pasta from above- refactor
260+evalRelationalExpr (NotEquals relExprA relExprB) = do
261+ evaldA <- evalRelationalExpr relExprA
262+ evaldB <- evalRelationalExpr relExprB
264+ Left err -> return $ Left err
265+ Right exprA -> case evaldB of
266+ Left err -> return $ Left err
267+ Right exprB -> return $ Right (NotEquals exprA exprB)
269+-- extending a relation adds a single attribute with the results of the per-tuple expression evaluated
270+evalRelationalExpr (Extend tupleExpression relExpr) = do
271+ eExpr <- evalRelationalExpr relExpr
273+ Left err -> pure (Left err)
275+ eTupProc <- processExtendTupleExpr tupleExpression
277+ Left err -> pure (Left err)
278+ Right tupProc -> pure (Right (Extend tupProc expr))
215--helper function to process relation variable creation/assignment
280--helper function to process relation variable creation/assignment
216−setRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
281+setRelVar :: RelVarName -> GraphRefRelationalExpr -> TransactionId -> TransactionGraph -> DatabaseState (Either RelationalError ())
217−setRelVar relVarName relExpr = do
282+setRelVar relVarName relExpr transId graph = do
218 currentContext <- getStateContext
283 currentContext <- getStateContext
219− --prevent recursive relvar definition by resolving references to relvars in previous states
220− relExpr' <- resolve relExpr
221− let newRelVars = M.insert relVarName relExpr' $ relationVariables currentContext
284+ let newRelVars = M.insert relVarName relExpr $ relationVariables currentContext
222 potentialContext = currentContext { relationVariables = newRelVars }
285 potentialContext = currentContext { relationVariables = newRelVars }
223− --optimization: if the relexpr is unchanged, skip the update
224− if M.lookup relVarName (relationVariables currentContext) == Just relExpr then
227− --determine when to check constraints
286+ --determine when to check constraints
228− graph <- dbcGraph
287+
230− case checkConstraints potentialContext tid graph of
288+ case checkConstraints potentialContext transId graph of
231− Left err -> dbErr err
289+ Left err -> pure (Left err)
232− Right _ -> putStateContext potentialContext
291+ putStateContext potentialContext
233−
292+ return (Right ())
234−--fast-path insertion- we already know that the previous relvar validated correctly, so we can validate just the relation that is being inserted for attribute matches- without this, even a single tuple relation inserted causes the entire relation to be re-validated unnecessarily
235−--insertIntoRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
237-- it is not an error to delete a relvar which does not exist, just like it is not an error to insert a pre-existing tuple into a relation
294-- it is not an error to delete a relvar which does not exist, just like it is not an error to insert a pre-existing tuple into a relation
238−deleteRelVar :: RelVarName -> DatabaseContextEvalMonad ()
295+deleteRelVar :: RelVarName -> DatabaseState (Either RelationalError ())
239deleteRelVar relVarName = do
296deleteRelVar relVarName = do
240 currContext <- getStateContext
297 currContext <- getStateContext
241 let relVars = relationVariables currContext
298 let relVars = relationVariables currContext
242 if M.notMember relVarName relVars then
299 if M.notMember relVarName relVars then
243− pure ()
300+ pure (Right ())
245 let newRelVars = M.delete relVarName relVars
302 let newRelVars = M.delete relVarName relVars
246 newContext = currContext { relationVariables = newRelVars }
303 newContext = currContext { relationVariables = newRelVars }
247 putStateContext newContext
304 putStateContext newContext
248− pure ()
305+ pure (Right ())
250−evalGraphRefDatabaseContextExpr :: GraphRefDatabaseContextExpr -> DatabaseContextEvalMonad ()
307+evalDatabaseContextExpr :: DatabaseContextExpr -> TransactionId -> TransactionGraph -> DatabaseState (Either RelationalError ())
251−evalGraphRefDatabaseContextExpr NoOperation = pure ()
308+evalDatabaseContextExpr NoOperation _ _ = pure (Right ())
253−evalGraphRefDatabaseContextExpr (Define relVarName attrExprs) = do
310+evalDatabaseContextExpr (Define relVarName attrExprs) transId graph = do
254− context <- getStateContext
255 relvars <- fmap relationVariables getStateContext
311 relvars <- fmap relationVariables getStateContext
256 tConss <- fmap typeConstructorMapping getStateContext
312 tConss <- fmap typeConstructorMapping getStateContext
257− graph <- dbcGraph
313+ let eAttrs = map (evalAttrExpr tConss) attrExprs
258− let eAttrs = runGraphRefRelationalExprM gfEnv (mapM evalGraphRefAttrExpr attrExprs)
314+ attrErrs = lefts eAttrs
259− gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
315+ attrsList = rights eAttrs
260− case eAttrs of
316+ if not (null attrErrs) then
261− Left err -> dbErr err
317+ pure (Left (someErrors attrErrs))
262− Right attrsList -> do
318+ else do
263− lift $ except $ validateAttributes tConss (A.attributesFromList attrsList)
319+ let atomTypeErrs = lefts $ map ((`validateAtomType` tConss) . A.atomType) attrsList
320+ if not (null atomTypeErrs) then
321+ pure (Left (someErrors atomTypeErrs))
264− case M.member relVarName relvars of
323+ case M.member relVarName relvars of
265− True -> dbErr (RelVarAlreadyDefinedError relVarName)
324+ True -> pure (Left (RelVarAlreadyDefinedError relVarName))
266− False -> setRelVar relVarName (ExistingRelation emptyRelation)
325+ False -> setRelVar relVarName (ExistingRelation emptyRelation) transId graph >> pure (Right ())
268 attrs = A.attributesFromList attrsList
327 attrs = A.attributesFromList attrsList
269 emptyRelation = Relation attrs emptyTupleSet
328 emptyRelation = Relation attrs emptyTupleSet
271−evalGraphRefDatabaseContextExpr (Undefine relVarName) = deleteRelVar relVarName
330+evalDatabaseContextExpr (Undefine relVarName) _ _ = deleteRelVar relVarName
273−evalGraphRefDatabaseContextExpr (Assign relVarName expr) = do
332+evalDatabaseContextExpr (Assign relVarName expr) transId graph = do
274− graph <- re_graph <$> dbcRelationalExprEnv
275 context <- getStateContext
333 context <- getStateContext
276 let existingRelVar = M.lookup relVarName (relationVariables context)
334 let existingRelVar = M.lookup relVarName (relationVariables context)
277− reEnv = freshGraphRefRelationalExprEnv (Just context) graph
335+ relExprState = mkRelationalExprState context transId graph
278− eNewExprType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr expr)
279 case existingRelVar of
336 case existingRelVar of
280 Nothing -> do
337 Nothing -> do
281− case runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr expr) of
338+ let ervExpr = runReader (evalRelationalExpr expr) relExprState
282− Left err -> dbErr err
340+ Left err -> pure (Left err)
284− lift $ except $ validateAttributes (typeConstructorMapping context) (attributes reltype)
285− setRelVar relVarName expr
341+ Right rvExpr -> setRelVar relVarName rvExpr transId graph
286 Just existingRel -> do
342 Just existingRel -> do
287− let eExpectedType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr existingRel)
343+ let eExpectedType = typeForGraphRefRelationalExpr existingRel graph
344+ eNewExprType = runReader (typeForRelationalExpr expr) relExprState
288 case eExpectedType of
345 case eExpectedType of
289− Left err -> dbErr err
346+ Left err -> pure (Left err)
290 Right expectedType ->
347 Right expectedType ->
291 case eNewExprType of
348 case eNewExprType of
292− Left err -> dbErr err
349+ Left err -> pure (Left err)
293 Right newExprType -> do
350 Right newExprType -> do
294 if newExprType == expectedType then do
351 if newExprType == expectedType then do
295− lift $ except $ validateAttributes (typeConstructorMapping context) (attributes newExprType)
352+ let ervExpr = runReader (evalRelationalExpr expr) relExprState
354+ Left err -> pure (Left err)
296− setRelVar relVarName expr
355+ Right rvExpr -> setRelVar relVarName rvExpr transId graph
298− dbErr (RelationTypeMismatchError (attributes expectedType) (attributes newExprType))
357+ pure (Left (RelationTypeMismatchError (attributes expectedType) (attributes newExprType)))
300−evalGraphRefDatabaseContextExpr (Insert relVarName relExpr) = do
359+evalDatabaseContextExpr (Insert relVarName relExpr) tid graph =
301− gfExpr <- relVarByName relVarName
360+ evalDatabaseContextExpr (Assign relVarName (Union (RelationVariable relVarName ())
302− let optExpr = applyUnionCollapse (Union
361+ relExpr)) tid graph
305− evalGraphRefDatabaseContextExpr (Assign relVarName optExpr)
307−evalGraphRefDatabaseContextExpr (Delete relVarName predicate) = do
363+evalDatabaseContextExpr (Delete relVarName predicate) transId graph = do
308− gfExpr <- relVarByName relVarName
364+ ctx <- getStateContext
309− let optExpr = applyRestrictionCollapse (Restrict (NotPredicate predicate) gfExpr)
365+ let rv = RelationVariable relVarName transId
310− setRelVar relVarName optExpr
366+ rvState = mkRelationalExprState ctx transId graph
367+ case runReader (processRestrictionPredicateExpr predicate) rvState of
368+ Left err -> pure (Left err)
369+ Right graphRefPredicate ->
370+ setRelVar relVarName (Restrict (NotPredicate graphRefPredicate) rv) transId graph
312--union of restricted+updated portion and the unrestricted+unupdated portion
372--union of restricted+updated portion and the unrestricted+unupdated portion
313−evalGraphRefDatabaseContextExpr (Update relVarName atomExprMap pred') = do
373+evalDatabaseContextExpr (Update relVarName atomExprMap restrictionPredicateExpr) transId graph = do
314− rvExpr <- relVarByName relVarName
315− graph <- re_graph <$> dbcRelationalExprEnv
316 context <- getStateContext
374 context <- getStateContext
317− let reEnv = freshGraphRefRelationalExprEnv (Just context) graph
375+ let rvState = mkRelationalExprState context transId graph
318− --get the current attributes name in the relvar to ensure that we don't conflict when renaming
376+ relVarTable = relationVariables context
319− eExprType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr rvExpr)
377+ case runReader (processRestrictionPredicateExpr restrictionPredicateExpr) rvState of
320− exprType' <- case eExprType of
321− Left err -> throwError err
378+ Left err -> pure (Left err)
322− Right t -> pure t
379+ Right graphRefPredicate ->
380+ case M.lookup relVarName relVarTable of
381+ Nothing -> pure (Left (RelVarNotDefinedError relVarName))
382+ Just existingRvExpr -> do
323− let unrestrictedPortion = Restrict (NotPredicate pred') rvExpr
383+ let unrestrictedPortion = Restrict (NotPredicate graphRefPredicate) rv
324− tmpAttr = tmpAttrC 1
384+ rv = RelationVariable relVarName transId
325− tmpAttrC :: Int -> AttributeName -> AttributeName
385+ tmpAttr attr = "_tmp_" <> attr --this could certainly be improved to verify that there is no attribute name conflict
327− let tmpAttrName = "_tmp_" <> T.pack (show c) <> attr in
328− if tmpAttrName `S.member` A.attributeNameSet (attributes exprType') then
332− updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)
386+ updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)
333− projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)
387+ projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)
334− restrictedPortion = Restrict pred' rvExpr
388+ restrictedPortion = Restrict graphRefPredicate
335− updated = foldr (\(oldname, atomExpr) accum ->
389+ updated = foldr (\(oldname, atomExpr) accum ->
336− let procAtomExpr = runProcessExprM UncommittedContextMarker (processAtomExpr atomExpr) in
390+ let procAtomExpr = processAtomExpr atomExpr transId in
337 updateAttr oldname procAtomExpr accum
391 updateAttr oldname procAtomExpr accum
338− ) restrictedPortion (M.toList atomExprMap)
392+ ) rv (M.toList atomExprMap)
339 -- the atomExprMap could reference other attributes, so we must perform multi-pass folds
393 -- the atomExprMap could reference other attributes, so we must perform multi-pass folds
340− updatedPortion = foldr projectAndRename updated (M.keys atomExprMap)
394+ updatedPortion = foldr projectAndRename updated (M.keys atomExprMap)
341− setRelVar relVarName (Union unrestrictedPortion updatedPortion)
395+ setRelVar relVarName (Union unrestrictedPortion updatedPortion) transId graph
343−evalGraphRefDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do
397+evalDatabaseContextExpr (AddInclusionDependency newDepName newDep) transId graph = do
344 currContext <- getStateContext
398 currContext <- getStateContext
345− transId <- dbcTransId
347 let currDeps = inclusionDependencies currContext
399 let currDeps = inclusionDependencies currContext
348 newDeps = M.insert newDepName newDep currDeps
400 newDeps = M.insert newDepName newDep currDeps
349 if M.member newDepName currDeps then
401 if M.member newDepName currDeps then
350− dbErr (InclusionDependencyNameInUseError newDepName)
402+ pure (Left (InclusionDependencyNameInUseError newDepName))
352 let potentialContext = currContext { inclusionDependencies = newDeps }
404 let potentialContext = currContext { inclusionDependencies = newDeps }
353− -- if the potential context passes all constraints, then save it
354− -- potential optimization: validate only the new constraint- all old constraints must already hold
355 case checkConstraints potentialContext transId graph of
405 case checkConstraints potentialContext transId graph of
356− Left err -> dbErr err
406+ Left err -> pure (Left err)
357− Right _ ->
407+ Right _ -> do
358 putStateContext potentialContext
408 putStateContext potentialContext
360−evalGraphRefDatabaseContextExpr (RemoveInclusionDependency depName) = do
411+evalDatabaseContextExpr (RemoveInclusionDependency depName) _ _ = do
361 currContext <- getStateContext
412 currContext <- getStateContext
362 let currDeps = inclusionDependencies currContext
413 let currDeps = inclusionDependencies currContext
363 newDeps = M.delete depName currDeps
414 newDeps = M.delete depName currDeps
364 if M.notMember depName currDeps then
415 if M.notMember depName currDeps then
365− dbErr (InclusionDependencyNameNotInUseError depName)
416+ pure (Left (InclusionDependencyNameNotInUseError depName))
367 putStateContext $ currContext {inclusionDependencies = newDeps }
418 putStateContext $ currContext {inclusionDependencies = newDeps }
369-- | Add a notification which will send the resultExpr when triggerExpr changes between commits.
421-- | Add a notification which will send the resultExpr when triggerExpr changes between commits.
370−evalGraphRefDatabaseContextExpr (AddNotification notName triggerExpr resultOldExpr resultNewExpr) = do
422+evalDatabaseContextExpr (AddNotification notName triggerExpr resultOldExpr resultNewExpr) _ _ = do
371 currentContext <- getStateContext
423 currentContext <- getStateContext
372 let nots = notifications currentContext
424 let nots = notifications currentContext
373 if M.member notName nots then
425 if M.member notName nots then
374− dbErr (NotificationNameInUseError notName)
426+ pure (Left (NotificationNameInUseError notName))
376 let newNotifications = M.insert notName newNotification nots
428 let newNotifications = M.insert notName newNotification nots
377 newNotification = Notification { changeExpr = triggerExpr,
429 newNotification = Notification { changeExpr = triggerExpr,
378 reportOldExpr = resultOldExpr,
430 reportOldExpr = resultOldExpr,
379 reportNewExpr = resultNewExpr}
431 reportNewExpr = resultNewExpr}
380 putStateContext $ currentContext { notifications = newNotifications }
432 putStateContext $ currentContext { notifications = newNotifications }
382−evalGraphRefDatabaseContextExpr (RemoveNotification notName) = do
435+evalDatabaseContextExpr (RemoveNotification notName) _ _ = do
383 currentContext <- getStateContext
436 currentContext <- getStateContext
384 let nots = notifications currentContext
437 let nots = notifications currentContext
385 if M.notMember notName nots then
438 if M.notMember notName nots then
386− dbErr (NotificationNameNotInUseError notName)
439+ pure (Left (NotificationNameNotInUseError notName))
388 let newNotifications = M.delete notName nots
441 let newNotifications = M.delete notName nots
389 putStateContext $ currentContext { notifications = newNotifications }
442 putStateContext $ currentContext { notifications = newNotifications }
392-- | Adds type and data constructors to the database context.
445-- | Adds type and data constructors to the database context.
393-- validate that the type *and* constructor names are unique! not yet implemented!
446-- validate that the type *and* constructor names are unique! not yet implemented!
394−evalGraphRefDatabaseContextExpr (AddTypeConstructor tConsDef dConsDefList) = do
447+evalDatabaseContextExpr (AddTypeConstructor tConsDef dConsDefList) _ _ = do
395 currentContext <- getStateContext
448 currentContext <- getStateContext
396 let oldTypes = typeConstructorMapping currentContext
449 let oldTypes = typeConstructorMapping currentContext
397 tConsName = TCD.name tConsDef
450 tConsName = TCD.name tConsDef
398 -- validate that the constructor's types exist
451 -- validate that the constructor's types exist
399− case validateTypeConstructorDef tConsDef dConsDefList oldTypes of
452+ case validateTypeConstructorDef tConsDef dConsDefList of
400− Left err -> throwError err
453+ errs@(_:_) -> pure (Left (someErrors errs))
401− Right () | T.null tConsName || not (isUpper (T.head tConsName)) -> dbErr (InvalidAtomTypeName tConsName)
454+ [] | T.null tConsName || not (isUpper (T.head tConsName)) -> pure (Left (InvalidAtomTypeName tConsName))
402− | isJust (findTypeConstructor tConsName oldTypes) -> dbErr (AtomTypeNameInUseError tConsName)
455+ | isJust (findTypeConstructor tConsName oldTypes) -> pure (Left (AtomTypeNameInUseError tConsName))
403 | otherwise -> do
456 | otherwise -> do
404 let newTypes = oldTypes ++ [(tConsDef, dConsDefList)]
457 let newTypes = oldTypes ++ [(tConsDef, dConsDefList)]
405 putStateContext $ currentContext { typeConstructorMapping = newTypes }
458 putStateContext $ currentContext { typeConstructorMapping = newTypes }
407-- | Removing the atom constructor prevents new atoms of the type from being created. Existing atoms of the type remain. Thus, the atomTypes list in the DatabaseContext need not be all-inclusive.
461-- | Removing the atom constructor prevents new atoms of the type from being created. Existing atoms of the type remain. Thus, the atomTypes list in the DatabaseContext need not be all-inclusive.
408−evalGraphRefDatabaseContextExpr (RemoveTypeConstructor tConsName) = do
462+evalDatabaseContextExpr (RemoveTypeConstructor tConsName) _ _ = do
409 currentContext <- getStateContext
463 currentContext <- getStateContext
410 let oldTypes = typeConstructorMapping currentContext
464 let oldTypes = typeConstructorMapping currentContext
411 if isNothing (findTypeConstructor tConsName oldTypes) then
465 if isNothing (findTypeConstructor tConsName oldTypes) then
412− dbErr (AtomTypeNameNotInUseError tConsName)
466+ pure (Left (AtomTypeNameNotInUseError tConsName))
414 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes
468 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes
415 putStateContext $ currentContext { typeConstructorMapping = newTypes }
469 putStateContext $ currentContext { typeConstructorMapping = newTypes }
417−evalGraphRefDatabaseContextExpr (MultipleExpr exprs) =
472+evalDatabaseContextExpr (MultipleExpr exprs) transId graph = do
418 --the multiple expressions must pass the same context around- not the old unmodified context
473 --the multiple expressions must pass the same context around- not the old unmodified context
419− mapM_ evalGraphRefDatabaseContextExpr exprs
474+ evald <- forM exprs (\expr -> evalDatabaseContextExpr expr transId graph)
420−
475+ --some lifting magic needed here
477+ [] -> pure (Right ())
478+ errs -> pure (Left (someErrors errs))
421−evalGraphRefDatabaseContextExpr (RemoveAtomFunction funcName) = do
480+evalDatabaseContextExpr (RemoveAtomFunction funcName) _ _ = do
422 currentContext <- getStateContext
481 currentContext <- getStateContext
423 let atomFuncs = atomFunctions currentContext
482 let atomFuncs = atomFunctions currentContext
424 case atomFunctionForName funcName atomFuncs of
483 case atomFunctionForName funcName atomFuncs of
425− Left err -> dbErr err
484+ Left err -> pure (Left err)
427− if isScriptedAtomFunction realFunc then do
485+ Right realFunc -> if isScriptedAtomFunction realFunc then do
428− let updatedFuncs = HS.delete realFunc atomFuncs
486+ let updatedFuncs = HS.delete realFunc atomFuncs
429− putStateContext (currentContext {atomFunctions = updatedFuncs })
487+ putStateContext (currentContext {atomFunctions = updatedFuncs })
431− dbErr (PrecompiledFunctionRemoveError funcName)
490+ pure (Left (PrecompiledFunctionRemoveError funcName))
433−evalGraphRefDatabaseContextExpr (RemoveDatabaseContextFunction funcName) = do
492+evalDatabaseContextExpr (RemoveDatabaseContextFunction funcName) _ _ = do
434 context <- getStateContext
493 context <- getStateContext
435 let dbcFuncs = dbcFunctions context
494 let dbcFuncs = dbcFunctions context
436 case databaseContextFunctionForName funcName dbcFuncs of
495 case databaseContextFunctionForName funcName dbcFuncs of
437− Left err -> dbErr err
496+ Left err -> pure (Left err)
439− if isScriptedDatabaseContextFunction realFunc then do
497+ Right realFunc -> if isScriptedDatabaseContextFunction realFunc then do
440− let updatedFuncs = HS.delete realFunc dbcFuncs
498+ let updatedFuncs = HS.delete realFunc dbcFuncs
441− putStateContext (context { dbcFunctions = updatedFuncs })
499+ putStateContext (context { dbcFunctions = updatedFuncs })
443− dbErr (PrecompiledFunctionRemoveError funcName)
502+ pure (Left (PrecompiledFunctionRemoveError funcName))
445−evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) = do
504+evalDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) transId graph = do
446 context <- getStateContext
505 context <- getStateContext
448 --resolve atom arguments
506 --resolve atom arguments
449− let eAtomTypes = mapM (runGraphRefRelationalExprM gfEnv . typeForGraphRefAtomExpr emptyAttributes) atomArgExprs
507+ let relExprState = mkRelationalExprState context transId graph
508+ eAtomTypes = map (\atomExpr -> runReader (typeFromAtomExpr emptyAttributes atomExpr) relExprState) atomArgExprs
450 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)
509 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)
451− gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
452 case eFunc of
510 case eFunc of
453− Left err -> dbErr err
511+ Left err -> pure (Left err)
454 Right func -> do
512 Right func -> do
455 let expectedArgCount = length (dbcFuncType func)
513 let expectedArgCount = length (dbcFuncType func)
456 actualArgCount = length atomArgExprs
514 actualArgCount = length atomArgExprs
457 if expectedArgCount /= actualArgCount then
515 if expectedArgCount /= actualArgCount then
458− dbErr (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
516+ pure (Left (FunctionArgumentCountMismatchError expectedArgCount actualArgCount))
460 --check that the atom types are valid
518 --check that the atom types are valid
461− case eAtomTypes of
519+ case lefts eAtomTypes of
462− Left err -> dbErr err
520+ _:_ -> pure (Left (someErrors (lefts eAtomTypes)))
463− Right atomTypes -> do
521+ [] -> do
464− let mValidTypes = zipWith (\ expType actType
522+ let atomTypes = rights eAtomTypes
465− -> case atomTypeVerify expType actType of
523+ let mValidTypes = map (\(expType, actType) -> case atomTypeVerify expType actType of
466− Left err -> Just err
524+ Left err -> Just err
468− (dbcFuncType func) atomTypes
525+ Right _ -> Nothing) (zip (dbcFuncType func) atomTypes)
469 typeErrors = catMaybes mValidTypes
526 typeErrors = catMaybes mValidTypes
470− eAtomArgs = map (runGraphRefRelationalExprM gfEnv . evalGraphRefAtomExpr emptyTuple) atomArgExprs
527+ eAtomArgs = unimplemented
528+ --eAtomArgs = map (\arg -> runReader (evalAtomExpr emptyTuple arg) relExprState) atomArgExprs
471 if length (lefts eAtomArgs) > 1 then
529 if length (lefts eAtomArgs) > 1 then
472− dbErr (someErrors (lefts eAtomArgs))
530+ pure (Left (someErrors (lefts eAtomArgs)))
473 else if not (null typeErrors) then
531 else if not (null typeErrors) then
474− dbErr (someErrors typeErrors)
532+ pure (Left (someErrors typeErrors))
476 case evalDatabaseContextFunction func (rights eAtomArgs) context of
534 case evalDatabaseContextFunction func (rights eAtomArgs) context of
477− Left err -> dbErr err
535+ Left err -> pure (Left err)
478− Right newContext -> putStateContext newContext
536+ Right newContext -> putStateContext newContext >> pure (Right ())
479−data DatabaseContextIOEvalEnv = DatabaseContextIOEvalEnv
537+
480− { dbcio_transId :: TransactionId,
538+evalDatabaseContextIOExpr :: Maybe ScriptSession -> DatabaseContext -> TransactionId -> TransactionGraph -> DatabaseContextIOExpr -> IO (Either RelationalError DatabaseContext)
481− dbcio_graph :: TransactionGraph,
482− dbcio_mScriptSession :: Maybe ScriptSession
485−type DatabaseContextIOEvalMonad a = RWST DatabaseContextIOEvalEnv () DatabaseContextEvalState IO a
487−runDatabaseContextIOEvalMonad :: DatabaseContextIOEvalEnv -> DatabaseContext -> DatabaseContextIOEvalMonad (Either RelationalError ()) -> IO (Either RelationalError DatabaseContextEvalState)
488−runDatabaseContextIOEvalMonad env ctx m = do
489− res <- runRWST m env freshState
491− (Left err,_,_) -> pure (Left err)
492− (Right (),s,_) -> pure (Right s)
494− freshState = mkDatabaseContextEvalState ctx
496−requireScriptSession :: DatabaseContextIOEvalMonad (Either RelationalError ScriptSession)
497−requireScriptSession = do
499− case dbcio_mScriptSession env of
500− Nothing -> pure $ Left $ ScriptError ScriptCompilationDisabledError
501− Just ss -> pure (Right ss)
503−putDBCIOContext :: DatabaseContext -> DatabaseContextIOEvalMonad (Either RelationalError ())
504−putDBCIOContext ctx = do
505− RWS.modify (\dbstate -> dbstate { dbc_context = ctx})
508−getDBCIOContext :: DatabaseContextIOEvalMonad DatabaseContext
509−getDBCIOContext = dbc_context <$> RWS.get
511−getDBCIORelationalExprEnv :: DatabaseContextIOEvalMonad RelationalExprEnv
512−getDBCIORelationalExprEnv = do
513− context <- getDBCIOContext
514− mkRelationalExprEnv context . dbcio_graph <$> RWS.ask
516−evalGraphRefDatabaseContextIOExpr :: GraphRefDatabaseContextIOExpr -> DatabaseContextIOEvalMonad (Either RelationalError ())
517−#if !defined(PM36_HASKELL_SCRIPTING)
518−evalGraphRefDatabaseContextIOExpr AddAtomFunction{} = pure (Left (ScriptError ScriptCompilationDisabledError))
519−evalGraphRefDatabaseContextIOExpr AddDatabaseContextFunction{} = pure (Left (ScriptError ScriptCompilationDisabledError))
520−evalGraphRefDatabaseContextIOExpr LoadAtomFunctions{} = pure (Left (ScriptError ScriptCompilationDisabledError))
521−evalGraphRefDatabaseContextIOExpr LoadDatabaseContextFunctions{} = pure (Left (ScriptError ScriptCompilationDisabledError))
523−evalGraphRefDatabaseContextIOExpr (AddAtomFunction funcName funcType script) = do
539+evalDatabaseContextIOExpr mScriptSession currentContext _ _ (AddAtomFunction funcName funcType script) =
524− eScriptSession <- requireScriptSession
540+ case mScriptSession of
525− currentContext <- getDBCIOContext
541+ Nothing -> pure (Left (ScriptError ScriptCompilationDisabledError))
526− case eScriptSession of
527− Left err -> pure (Left err)
528− Right scriptSession -> do
542+ Just scriptSession -> do
529− res <- liftIO $ try $ runGhc (Just libdir) $ do
543+ res <- try $ runGhc (Just libdir) $ do
530 setSession (hscEnv scriptSession)
544 setSession (hscEnv scriptSession)
531 let atomFuncs = atomFunctions currentContext
545 let atomFuncs = atomFunctions currentContext
532 case extractAtomFunctionType funcType of
546 case extractAtomFunctionType funcType of
@@ -552,13 +566,12 @@ evalGraphRefDatabaseContextIOExpr (AddAtomFunction funcName funcType script) = d
552 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
566 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
553 Right eContext -> case eContext of
567 Right eContext -> case eContext of
554 Left err -> pure (Left err)
568 Left err -> pure (Left err)
555− Right context' -> putDBCIOContext context'
569+ Right context' -> pure (Right context')
556−evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType script) = do
571+evalDatabaseContextIOExpr mScriptSession currentContext _ _ (AddDatabaseContextFunction funcName funcType script) =
557− eScriptSession <- requireScriptSession
572+ case mScriptSession of
558− currentContext <- getDBCIOContext
573+ Nothing -> pure (Left (ScriptError ScriptCompilationDisabledError))
559− case eScriptSession of
560− Left err -> pure (Left err)
561− Right scriptSession -> do
574+ Just scriptSession -> do
562 --validate that the function signature is of the form x -> y -> ... -> DatabaseContext -> DatabaseContext
575 --validate that the function signature is of the form x -> y -> ... -> DatabaseContext -> DatabaseContext
563 let last2Args = reverse (take 2 (reverse funcType))
576 let last2Args = reverse (take 2 (reverse funcType))
564 atomArgs = take (length funcType - 2) funcType
577 atomArgs = take (length funcType - 2) funcType
@@ -568,7 +581,7 @@ evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType
568 if last2Args /= [ADTypeConstructor "DatabaseContext" [], dbContextTypeCons] then
581 if last2Args /= [ADTypeConstructor "DatabaseContext" [], dbContextTypeCons] then
569 pure (Left (ScriptError (TypeCheckCompilationError expectedType actualType)))
582 pure (Left (ScriptError (TypeCheckCompilationError expectedType actualType)))
571− res <- liftIO $ try $ runGhc (Just libdir) $ do
584+ res <- try $ runGhc (Just libdir) $ do
572 setSession (hscEnv scriptSession)
585 setSession (hscEnv scriptSession)
573 eCompiledFunc <- compileScript (dbcFunctionBodyType scriptSession) script
586 eCompiledFunc <- compileScript (dbcFunctionBodyType scriptSession) script
574 pure $ case eCompiledFunc of
587 pure $ case eCompiledFunc of
@@ -593,86 +606,79 @@ evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType
593 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
606 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
594 Right eContext -> case eContext of
607 Right eContext -> case eContext of
595 Left err -> pure (Left err)
608 Left err -> pure (Left err)
596− Right context' -> putDBCIOContext context'
609+ Right context' -> pure (Right context')
597−evalGraphRefDatabaseContextIOExpr (LoadAtomFunctions modName funcName modPath) = do
610+evalDatabaseContextIOExpr _ currentContext _ _ (LoadAtomFunctions modName funcName modPath) = do
598− currentContext <- getDBCIOContext
599− eLoadFunc <- liftIO $ loadAtomFunctions (T.unpack modName) (T.unpack funcName) modPath
611+ eLoadFunc <- loadAtomFunctions (T.unpack modName) (T.unpack funcName) modPath
600 case eLoadFunc of
612 case eLoadFunc of
601 Left LoadSymbolError -> pure (Left LoadFunctionError)
613 Left LoadSymbolError -> pure (Left LoadFunctionError)
602 Right atomFunctionListFunc -> let newContext = currentContext { atomFunctions = mergedFuncs }
614 Right atomFunctionListFunc -> let newContext = currentContext { atomFunctions = mergedFuncs }
603 mergedFuncs = HS.union (atomFunctions currentContext) (HS.fromList atomFunctionListFunc)
615 mergedFuncs = HS.union (atomFunctions currentContext) (HS.fromList atomFunctionListFunc)
604− in putDBCIOContext newContext
616+ in pure (Right newContext)
605−evalGraphRefDatabaseContextIOExpr (LoadDatabaseContextFunctions modName funcName modPath) = do
617+evalDatabaseContextIOExpr _ currentContext _ _ (LoadDatabaseContextFunctions modName funcName modPath) = do
606− currentContext <- getDBCIOContext
607− eLoadFunc <- liftIO $ loadDatabaseContextFunctions (T.unpack modName) (T.unpack funcName) modPath
618+ eLoadFunc <- loadDatabaseContextFunctions (T.unpack modName) (T.unpack funcName) modPath
608 case eLoadFunc of
619 case eLoadFunc of
609 Left LoadSymbolError -> pure (Left LoadFunctionError)
620 Left LoadSymbolError -> pure (Left LoadFunctionError)
610 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }
621 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }
611 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)
622 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)
612− in putDBCIOContext newContext
623+ in pure (Right newContext)
614−evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs range) = do
625+evalDatabaseContextIOExpr _ currentContext transId graph (CreateArbitraryRelation relVarName attrExprs range) =
616− currentContext <- getDBCIOContext
627+ case runState (evalDatabaseContextExpr (Define relVarName attrExprs) transId graph) (freshDatabaseState currentContext) of
618− --create graph ref expr
619− let gfExpr = Define relVarName attrExprs
620− evalEnv = mkDatabaseContextEvalEnv (dbcio_transId env) (dbcio_graph env)
621− graph = dbcio_graph env
622− case runDatabaseContextEvalMonad currentContext evalEnv (evalGraphRefDatabaseContextExpr gfExpr) of
623− Left err -> pure (Left err)
628+ (Left err,_) -> pure (Left err)
624− Right dbstate -> do
629+ (Right (), elems) -> do
626 let existingRelVar = M.lookup relVarName relVarTable
631 let existingRelVar = M.lookup relVarName relVarTable
627− relVarTable = relationVariables (dbc_context dbstate)
632+ relVarTable = relationVariables (context elems)
628 case existingRelVar of
633 case existingRelVar of
629 Nothing -> pure $ Left (RelVarNotDefinedError relVarName)
634 Nothing -> pure $ Left (RelVarNotDefinedError relVarName)
630 Just existingRel -> do
635 Just existingRel -> do
631− let gfEnv = freshGraphRefRelationalExprEnv (Just currentContext) graph
632− case runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr existingRel) of
636+ case typeForGraphRefRelationalExpr existingRel graph of
633 Left err -> pure (Left err)
637 Left err -> pure (Left err)
634 Right relType -> do
638 Right relType -> do
635 let expectedAttributes = attributes relType
639 let expectedAttributes = attributes relType
636− tcMap = typeConstructorMapping (dbc_context dbstate)
640+ tcMap = typeConstructorMapping (context elems)
637− eitherRel <- liftIO $ generate $ runReaderT (arbitraryRelation expectedAttributes range) tcMap
641+ eitherRel <- generate $ runReaderT (arbitraryRelation expectedAttributes range) tcMap
638 case eitherRel of
642 case eitherRel of
639 Left err -> pure $ Left err
643 Left err -> pure $ Left err
640 Right rel ->
644 Right rel ->
641− case runDatabaseContextEvalMonad currentContext evalEnv (setRelVar relVarName (ExistingRelation rel)) of
645+ case runState (setRelVar relVarName (ExistingRelation rel) transId graph) elems of
642− Left err -> pure (Left err)
646+ (Left err,_) -> pure (Left err)
643− Right dbstate' -> putDBCIOContext (dbc_context dbstate')
647+ (Right (), elems') -> pure $ Right (context elems)
649+updateTupleWithAtomExprs :: M.Map AttributeName AtomExpr -> DatabaseContext -> TransactionGraph -> RelationTuple -> Either RelationalError RelationTuple
650+updateTupleWithAtomExprs exprMap context graph tupIn = do
651+ --resolve all atom exprs
652+ atomsAssoc <- mapM (\(attrName, atomExpr) -> do
653+ let atom = unimplemented
654+ --atom <- runReader (evalAtomExpr tupIn atomExpr) (mkRelationalExprState context graph)
655+ pure (attrName, atom)
656+ ) (M.toList exprMap)
657+ pure (updateTupleWithAtoms (M.fromList atomsAssoc) tupIn)
645--run verification on all constraints
659--run verification on all constraints
646checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()
660checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()
647−checkConstraints context transId graph@(TransactionGraph graphHeads transSet) = do
661+checkConstraints context transId graph@(TransactionGraph graphHeads transSet) =
648 mapM_ (uncurry checkIncDep) (M.toList deps)
662 mapM_ (uncurry checkIncDep) (M.toList deps)
650 potentialGraph = TransactionGraph graphHeads (S.insert tempTrans transSet)
664 potentialGraph = TransactionGraph graphHeads (S.insert tempTrans transSet)
651 tempStamp = UTCTime { utctDay = fromGregorian 2000 1 1,
665 tempStamp = UTCTime { utctDay = fromGregorian 2000 1 1,
652 utctDayTime = secondsToDiffTime 0 }
666 utctDayTime = secondsToDiffTime 0 }
653 tempSchemas = Schemas context M.empty
667 tempSchemas = Schemas context M.empty
654− tempTrans = Transaction U.nil tempTransInfo tempSchemas
655− tempTransInfo = TransactionInfo { parents = transId NE.:| [],
668+ tempTrans = Transaction U.nil (TransactionInfo (transId NE.:| []) tempStamp) tempSchemas
660 deps = inclusionDependencies context
670 deps = inclusionDependencies context
661− -- no optimization available here, really? perhaps the optimizer should be passed down to here or the eval function should be passed through the environment
671+ eval expr = evalReader (evalRelationalExpr expr)
672+ evalReader f = runReader f (mkRelationalExprState context transId graph)
662 checkIncDep depName (InclusionDependency subsetExpr supersetExpr) = do
673 checkIncDep depName (InclusionDependency subsetExpr supersetExpr) = do
663− let process = runProcessExprM UncommittedContextMarker
664− gfSubsetExpr = process (processRelationalExpr subsetExpr)
674+ let gfSubsetExpr = evalReader (processRelationalExpr subsetExpr)
665− gfSupersetExpr = process (processRelationalExpr supersetExpr)
675+ gfSupersetExpr = evalReader (processRelationalExpr supersetExpr)
666 --if both expressions are of a single-attribute (such as with a simple foreign key), the names of the attributes are irrelevant (they need not match) because the expression is unambiguous, but special-casing this to rename the attribute automatically would not be orthogonal behavior and probably cause confusion. Instead, special case the error to make it clear.
676 --if both expressions are of a single-attribute (such as with a simple foreign key), the names of the attributes are irrelevant (they need not match) because the expression is unambiguous, but special-casing this to rename the attribute automatically would not be orthogonal behavior and probably cause confusion. Instead, special case the error to make it clear.
667− let gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
677+ typeSub <- evalReader (typeForRelationalExpr subsetExpr)
668− runGfRel = runGraphRefRelationalExprM gfEnv
678+ typeSuper <- evalReader (typeForRelationalExpr supersetExpr)
669− typeSub <- runGfRel (typeForGraphRefRelationalExpr gfSubsetExpr)
670− typeSuper <- runGfRel (typeForGraphRefRelationalExpr gfSupersetExpr)
671 when (typeSub /= typeSuper) (Left (RelationTypeMismatchError (attributes typeSub) (attributes typeSuper)))
679 when (typeSub /= typeSuper) (Left (RelationTypeMismatchError (attributes typeSub) (attributes typeSuper)))
672 let checkExpr = Equals gfSupersetExpr (Union gfSubsetExpr gfSupersetExpr)
680 let checkExpr = Equals gfSupersetExpr (Union gfSubsetExpr gfSupersetExpr)
673− gfEvald = runGraphRefRelationalExprM gfEnv' (evalGraphRefRelationalExpr checkExpr)
681+ case evalGraphRefRelationalExpr checkExpr potentialGraph of
674− gfEnv' = freshGraphRefRelationalExprEnv (Just context) potentialGraph
676 Left err -> Left err
682 Left err -> Left err
677 Right resultRel -> if resultRel == relationTrue then
683 Right resultRel -> if resultRel == relationTrue then
@@ -682,81 +688,88 @@ checkConstraints context transId graph@(TransactionGraph graphHeads transSet) =
682-- the type of a relational expression is equal to the relation attribute set returned from executing the relational expression; therefore, the type can be cheaply derived by evaluating a relational expression and ignoring and tuple processing
688-- the type of a relational expression is equal to the relation attribute set returned from executing the relational expression; therefore, the type can be cheaply derived by evaluating a relational expression and ignoring and tuple processing
683-- furthermore, the type of a relational expression is the resultant header of the evaluated empty-tupled relation
689-- furthermore, the type of a relational expression is the resultant header of the evaluated empty-tupled relation
685−typeForRelationalExpr :: RelationalExpr -> RelationalExprM Relation
691+typeForRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError Relation)
686typeForRelationalExpr expr = do
692typeForRelationalExpr expr = do
693+ graph <- elems_graph <$> ask
687 --replace the relationVariables context element with a cloned set of relation devoid of tuples
694 --replace the relationVariables context element with a cloned set of relation devoid of tuples
688 --evalRelationalExpr could still return an existing relation with tuples, so strip them
695 --evalRelationalExpr could still return an existing relation with tuples, so strip them
690− context <- reContext
691− let gfExpr = runProcessExprM UncommittedContextMarker (processRelationalExpr expr)
696+ gfExpr <- processRelationalExpr expr
692− gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
693− runGf = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
697+ pure (typeForGraphRefRelationalExpr gfExpr graph)
694− lift $ except runGf
698+
699+--returns a database context with all tuples removed
700+--this is useful for type checking and optimization
702+contextWithEmptyTupleSets :: DatabaseContext -> DatabaseContext
703+contextWithEmptyTupleSets contextIn = contextIn { relationVariables = relVars }
705+ relVars = M.map (\rel -> ExistingRelation (Relation (attributes rel) emptyTupleSet)) (relationVariables contextIn)
696liftE :: (Monad m) => m (Either a b) -> ExceptT a m b
708liftE :: (Monad m) => m (Either a b) -> ExceptT a m b
697liftE v = do
709liftE v = do
698 y <- lift v
710 y <- lift v
699 case y of
711 case y of
700− Left err -> throwError err
712+ Left err -> throwE err
701 Right val -> pure val
713 Right val -> pure val
703{- used for restrictions- take the restrictionpredicate and return the corresponding filter function -}
715{- used for restrictions- take the restrictionpredicate and return the corresponding filter function -}
704−predicateRestrictionFilter :: Attributes -> GraphRefRestrictionPredicateExpr -> GraphRefRelationalExprM RestrictionFilter
716+predicateRestrictionFilter :: Attributes -> RestrictionPredicateExprBase a -> RelationalExprState (Either RelationalError RestrictionFilter)
705−predicateRestrictionFilter attrs (AndPredicate expr1 expr2) = do
717+predicateRestrictionFilter attrs (AndPredicate expr1 expr2) =
706− expr1v <- predicateRestrictionFilter attrs expr1
719+ expr1v <- liftE (predicateRestrictionFilter attrs expr1)
707− expr2v <- predicateRestrictionFilter attrs expr2
720+ expr2v <- liftE (predicateRestrictionFilter attrs expr2)
708− pure (\x -> do
721+ pure (\x -> do
709− ev1 <- expr1v x
722+ ev1 <- expr1v x
710− ev2 <- expr2v x
723+ ev2 <- expr2v x
711− pure (ev1 && ev2))
724+ pure (ev1 && ev2))
713−predicateRestrictionFilter attrs (OrPredicate expr1 expr2) = do
726+predicateRestrictionFilter attrs (OrPredicate expr1 expr2) =
714− expr1v <- predicateRestrictionFilter attrs expr1
728+ expr1v <- liftE (predicateRestrictionFilter attrs expr1)
715− expr2v <- predicateRestrictionFilter attrs expr2
729+ expr2v <- liftE (predicateRestrictionFilter attrs expr2)
716 pure (\x -> do
730 pure (\x -> do
717 ev1 <- expr1v x
731 ev1 <- expr1v x
718 ev2 <- expr2v x
732 ev2 <- expr2v x
719 pure (ev1 || ev2))
733 pure (ev1 || ev2))
721−predicateRestrictionFilter _ TruePredicate = pure (\_ -> pure True)
735+predicateRestrictionFilter _ TruePredicate = pure (Right (\_ -> pure True))
723−predicateRestrictionFilter attrs (NotPredicate expr) = do
737+predicateRestrictionFilter attrs (NotPredicate expr) =
724− exprv <- predicateRestrictionFilter attrs expr
739+ exprv <- liftE (predicateRestrictionFilter attrs expr)
725− pure (fmap not . exprv)
740+ pure (fmap not . exprv)
727--optimization opportunity: if the subexpression does not reference attributes in the top-level expression, then it need only be evaluated once, statically, outside the tuple filter- see historical implementation here
742--optimization opportunity: if the subexpression does not reference attributes in the top-level expression, then it need only be evaluated once, statically, outside the tuple filter- see historical implementation here
728predicateRestrictionFilter _ (RelationalExprPredicate relExpr) = do
744predicateRestrictionFilter _ (RelationalExprPredicate relExpr) = do
729− renv <- askEnv
745+ rstate <- ask
730− let eval :: RelationTuple -> Either RelationalError Relation
746+ pure (Right (\tup -> case runReader (evalRelationalExpr relExpr) (mergeTuplesIntoRelationalExprState tup rstate) of
732− let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tup renv in
733− runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr relExpr)
734− pure (\tup -> case eval tup of
735 Left err -> Left err
747 Left err -> Left err
736 Right rel -> if arity rel /= 0 then
748 Right rel -> if arity rel /= 0 then
737 Left (PredicateExpressionError "Relational restriction filter must evaluate to 'true' or 'false'")
749 Left (PredicateExpressionError "Relational restriction filter must evaluate to 'true' or 'false'")
739− pure (rel == relationTrue))
751+ pure (rel == relationTrue)))
741predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr) = do
753predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr) = do
742− env <- askEnv
754+ rstate <- ask
743− let attrs' = A.union attrs (envAttributes env)
755+ let attrs' = stateAttributes rstate
744− ctxtup' = envTuple env
756+ ctxtup' = stateTuple rstate
745− atomExprType <- typeForGraphRefAtomExpr attrs' atomExpr
758+ atomExprType <- liftE (typeFromAtomExpr attrs' atomExpr)
746− attr <- lift $ except $ case A.attributeForName attrName attrs of
759+ attr <- either throwE pure $ case A.attributeForName attrName attrs of
747 Right attr -> Right attr
760 Right attr -> Right attr
748 Left (NoSuchAttributeNamesError _) -> case A.attributeForName attrName (tupleAttributes ctxtup') of
761 Left (NoSuchAttributeNamesError _) -> case A.attributeForName attrName (tupleAttributes ctxtup') of
749 Right ctxattr -> Right ctxattr
762 Right ctxattr -> Right ctxattr
750 Left err2@(NoSuchAttributeNamesError _) -> Left err2
763 Left err2@(NoSuchAttributeNamesError _) -> Left err2
751 Left err -> Left err
764 Left err -> Left err
752 Left err -> Left err
765 Left err -> Left err
753− if atomExprType /= A.atomType attr then
766+ if atomExprType /= A.atomType attr then
754− throwError (TupleAttributeTypeMismatchError (A.attributesFromList [attr]))
767+ throwE (TupleAttributeTypeMismatchError (A.attributesFromList [attr]))
756 pure $ \tupleIn -> let evalAndCmp atomIn = case atomEvald of
769 pure $ \tupleIn -> let evalAndCmp atomIn = case atomEvald of
757 Right atomCmp -> atomCmp == atomIn
770 Right atomCmp -> atomCmp == atomIn
758 Left _ -> False
771 Left _ -> False
759− atomEvald = runGraphRefRelationalExprM env (evalGraphRefAtomExpr tupleIn atomExpr)
772+ atomEvald = runReader (evalAtomExpr tupleIn atomExpr) rstate
761 pure $ case atomForAttributeName attrName tupleIn of
774 pure $ case atomForAttributeName attrName tupleIn of
762 Left (NoSuchAttributeNamesError _) -> case atomForAttributeName attrName ctxtup' of
775 Left (NoSuchAttributeNamesError _) -> case atomForAttributeName attrName ctxtup' of
@@ -767,322 +780,267 @@ predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr)
767-- in the future, it would be useful to do typechecking on the attribute and atom expr filters in advance
780-- in the future, it would be useful to do typechecking on the attribute and atom expr filters in advance
768predicateRestrictionFilter attrs (AtomExprPredicate atomExpr) = do
781predicateRestrictionFilter attrs (AtomExprPredicate atomExpr) = do
769 --merge attrs into the state attributes
782 --merge attrs into the state attributes
770− renv <- askEnv
783+ rstate <- ask
771− aType <- typeForGraphRefAtomExpr attrs atomExpr
785+ aType <- liftE (typeFromAtomExpr attrs atomExpr)
772− if aType /= BoolAtomType then
786+ if aType /= BoolAtomType then
773− throwError (AtomTypeMismatchError aType BoolAtomType)
787+ throwE (AtomTypeMismatchError aType BoolAtomType)
775 pure (\tupleIn ->
789 pure (\tupleIn ->
776− case runGraphRefRelationalExprM renv (evalGraphRefAtomExpr tupleIn atomExpr) of
790+ case runReader (evalAtomExpr tupleIn atomExpr) rstate of
777− Left err -> Left err
791+ Left err -> Left err
778− Right boolAtomValue -> pure (boolAtomValue == BoolAtom True))
792+ Right boolAtomValue -> pure (boolAtomValue == BoolAtom True))
780tupleExprCheckNewAttrName :: AttributeName -> Relation -> Either RelationalError Relation
794tupleExprCheckNewAttrName :: AttributeName -> Relation -> Either RelationalError Relation
781tupleExprCheckNewAttrName attrName rel = if isRight (attributeForName attrName rel) then
795tupleExprCheckNewAttrName attrName rel = if isRight (attributeForName attrName rel) then
782 Left (AttributeNameInUseError attrName)
796 Left (AttributeNameInUseError attrName)
784 Right rel
798 Right rel
786−extendGraphRefTupleExpressionProcessor :: Relation -> GraphRefExtendTupleExpr -> GraphRefRelationalExprM (Attributes, RelationTuple -> Either RelationalError RelationTuple)
800+extendTupleExpressionProcessor :: Relation -> ExtendTupleExpr -> RelationalExprState (Either RelationalError (Attributes, RelationTuple -> Either RelationalError RelationTuple))
787−extendGraphRefTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) =
801+extendTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) = do
788−-- renv <- askEnv
802+ rstate <- ask
789 -- check that the attribute name is not in use
803 -- check that the attribute name is not in use
790 case tupleExprCheckNewAttrName newAttrName relIn of
804 case tupleExprCheckNewAttrName newAttrName relIn of
791− Left err -> throwError err
805+ Left err -> pure (Left err)
792− Right _ -> do
806+ Right _ -> runExceptT $ do
793− atomExprType <- typeForGraphRefAtomExpr (attributes relIn) atomExpr
807+ atomExprType <- liftE (typeFromAtomExpr (attributes relIn) atomExpr)
794− atomExprType' <- verifyGraphRefAtomExprTypes relIn atomExpr atomExprType
808+ atomExprType' <- liftE (verifyAtomExprTypes relIn atomExpr atomExprType)
795 let newAttrs = A.attributesFromList [Attribute newAttrName atomExprType']
809 let newAttrs = A.attributesFromList [Attribute newAttrName atomExprType']
796 newAndOldAttrs = A.addAttributes (attributes relIn) newAttrs
810 newAndOldAttrs = A.addAttributes (attributes relIn) newAttrs
798− pure (newAndOldAttrs, \tup -> do
811+ pure (newAndOldAttrs, \tup -> let substate = mergeTuplesIntoRelationalExprState tup rstate in
799− let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tup env
812+ case unimplemented {-runReader (evalAtomExpr tup atomExpr) substate-} of
800− atom <- runGraphRefRelationalExprM gfEnv (evalGraphRefAtomExpr tup atomExpr)
813+ Left err -> Left err
801− Right (tupleAtomExtend newAttrName atom tup)
814+ Right atom -> Right (tupleAtomExtend newAttrName atom tup)
804−evalGraphRefAtomExpr :: RelationTuple -> GraphRefAtomExpr -> GraphRefRelationalExprM Atom
817+
805−evalGraphRefAtomExpr tupIn (AttributeAtomExpr attrName) =
818+evalAtomExpr :: RelationTuple -> AtomExpr -> RelationalExprState (Either RelationalError Atom)
819+evalAtomExpr = undefined
806− case atomForAttributeName attrName tupIn of
822+evalAtomExpr tupIn (AttributeAtomExpr attrName) = case atomForAttributeName attrName tupIn of
807− Right atom -> pure atom
823+ Right atom -> pure (Right atom)
808− Left err@(NoSuchAttributeNamesError _) -> do
824+ err@(Left (NoSuchAttributeNamesError _)) -> do
809− env <- askEnv
825+ rstate <- ask
810− case gre_extra env of
826+ let stateTup = stateTuple rstate
811− Nothing -> throwError err
812− Just (Left ctxtup) -> lift $ except $ atomForAttributeName attrName ctxtup
827+ pure (atomForAttributeName attrName stateTup)
813− Just (Right _) -> throwError err
814− Left err -> throwError err
828+ Left err -> pure (Left err)
815−evalGraphRefAtomExpr _ (NakedAtomExpr atom) = pure atom
829+evalAtomExpr _ (NakedAtomExpr atom) = pure (Right atom)
816−evalGraphRefAtomExpr tupIn (FunctionAtomExpr funcName arguments tid) = do
830+evalAtomExpr tupIn (FunctionAtomExpr funcName arguments ()) = do
817− argTypes <- mapM (typeForGraphRefAtomExpr (tupleAttributes tupIn)) arguments
831+ argTypes <- mapM (typeFromAtomExpr (tupleAttributes tupIn)) arguments
818− context <- gfDatabaseContextForMarker tid
832+ context <- fmap stateElemsContext ask
819− let functions = atomFunctions context
834+ let functions = atomFunctions context
820− func <- lift $ except (atomFunctionForName funcName functions)
835+ func <- either throwE pure (atomFunctionForName funcName functions)
821− let expectedArgCount = length (atomFuncType func) - 1
836+ let expectedArgCount = length (atomFuncType func) - 1
822− actualArgCount = length argTypes
837+ actualArgCount = length argTypes
823− safeInit [] = [] -- different behavior from normal init
838+ safeInit [] = [] -- different behavior from normal init
824− safeInit xs = init xs
839+ safeInit xs = init xs
825− if expectedArgCount /= actualArgCount then
840+ if expectedArgCount /= actualArgCount then
826− throwError (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
841+ throwE (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
828 let zippedArgs = zip (safeInit (atomFuncType func)) argTypes
843 let zippedArgs = zip (safeInit (atomFuncType func)) argTypes
829− mapM_ (\(expType, actType) ->
844+ mapM_ (\(expType, eActType) -> do
845+ actType <- either throwE pure eActType
830− lift $ except (atomTypeVerify expType actType)) zippedArgs
846+ either throwE pure (atomTypeVerify expType actType)) zippedArgs
831− evaldArgs <- mapM (evalGraphRefAtomExpr tupIn) arguments
847+ evaldArgs <- mapM (liftE . evalAtomExpr tupIn) arguments
832 case evalAtomFunction func evaldArgs of
848 case evalAtomFunction func evaldArgs of
833− Left err -> throwError (AtomFunctionUserError err)
849+ Left err -> throwE (AtomFunctionUserError err)
834 Right result -> do
850 Right result -> do
835 --validate that the result matches the expected type
851 --validate that the result matches the expected type
836− _ <- lift $ except (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
852+ _ <- either throwE pure (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
837 pure result
853 pure result
838−evalGraphRefAtomExpr tupIn (RelationAtomExpr relExpr) = do
854+evalAtomExpr tupIn (RelationAtomExpr relExpr) = do
839 --merge existing state tuple context into new state tuple context to support an arbitrary number of levels, but new attributes trounce old attributes
855 --merge existing state tuple context into new state tuple context to support an arbitrary number of levels, but new attributes trounce old attributes
840− env <- ask
856+ rstate <- ask
841− let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tupIn env
857+ runExceptT $ do
842− relAtom <- lift $ except $ runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr relExpr)
858+ let newState = mergeTuplesIntoRelationalExprState tupIn rstate
859+ relAtom <- either throwE pure (runReader (evalRelationalExpr relExpr) newState)
843− pure (RelationAtom relAtom)
860+ pure (RelationAtom relAtom)
844−evalGraphRefAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs _) = do --why is the tid unused here? suspicious
861+evalAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs ()) = runExceptT $ do
845− let mergeEnv = mergeTuplesIntoGraphRefRelationalExprEnv tupIn
862+ rstate <- lift ask
863+ let newState = mergeTuplesIntoRelationalExprState tupIn rstate
846− aType <- local mergeEnv (typeForGraphRefAtomExpr (tupleAttributes tupIn) cons)
864+ aType <- either throwE pure (runReader (typeFromAtomExpr (tupleAttributes tupIn) cons) newState)
847− argAtoms <- local mergeEnv $
865+ argAtoms <- mapM (\arg -> either throwE pure (runReader (evalAtomExpr tupIn arg) newState)) dConsArgs
848− mapM (evalGraphRefAtomExpr tupIn) dConsArgs
849 pure (ConstructedAtom dConsName aType argAtoms)
866 pure (ConstructedAtom dConsName aType argAtoms)
851−typeForGraphRefAtomExpr :: Attributes -> GraphRefAtomExpr -> GraphRefRelationalExprM AtomType
868+typeFromAtomExpr :: Attributes -> AtomExpr -> RelationalExprState (Either RelationalError AtomType)
852−typeForGraphRefAtomExpr attrs (AttributeAtomExpr attrName) = do
869+typeFromAtomExpr attrs (AttributeAtomExpr attrName) = do
853− renv <- askEnv
870+ rstate <- ask
854 case A.atomTypeForAttributeName attrName attrs of
871 case A.atomTypeForAttributeName attrName attrs of
855− Right aType -> pure aType
872+ Right aType -> pure (Right aType)
856 Left err@(NoSuchAttributeNamesError _) ->
873 Left err@(NoSuchAttributeNamesError _) ->
857− let envTup = envTuple renv
874+ let stateTup = stateTuple rstate
858− envAttrs = envAttributes renv in
875+ stateAttrs = stateAttributes rstate in
859− case A.attributeForName attrName envAttrs of
876+ case A.attributeForName attrName stateAttrs of
860− Right attr -> pure (A.atomType attr)
877+ Right attr -> pure (Right (A.atomType attr))
861− Left _ -> case atomForAttributeName attrName envTup of
878+ Left _ -> case atomForAttributeName attrName stateTup of
862− Right atom -> pure (atomTypeForAtom atom)
879+ Right atom -> pure (Right (atomTypeForAtom atom))
863− Left _ -> --throwError (traceStack (show ("typeForGRAtomExpr", attrs, envTup)) err)
880+ Left _ -> pure (Left err)
865− Left err -> throwError err
867−typeForGraphRefAtomExpr _ (NakedAtomExpr atom) = pure (atomTypeForAtom atom)
882+typeFromAtomExpr _ (NakedAtomExpr atom) = pure (Right (atomTypeForAtom atom))
868−typeForGraphRefAtomExpr attrs (FunctionAtomExpr funcName atomArgs transId) = do
883+typeFromAtomExpr attrs (FunctionAtomExpr funcName atomArgs _) = do
869− funcs <- atomFunctions <$> gfDatabaseContextForMarker transId
884+ context <- fmap stateElemsContext ask
885+ let funcs = atomFunctions context
870 case atomFunctionForName funcName funcs of
886 case atomFunctionForName funcName funcs of
871− Left err -> throwError err
887+ Left err -> pure (Left err)
872 Right func -> do
888 Right func -> do
873 let funcRetType = last (atomFuncType func)
889 let funcRetType = last (atomFuncType func)
874 funcArgTypes = init (atomFuncType func)
890 funcArgTypes = init (atomFuncType func)
875− argTypes <- mapM (typeForGraphRefAtomExpr attrs) atomArgs
891+ eArgTypes <- mapM (typeFromAtomExpr attrs) atomArgs
892+ case lefts eArgTypes of
893+ errs@(_:_) -> pure (Left (someErrors errs))
876− let eTvMap = resolveTypeVariables funcArgTypes argTypes
895+ let eTvMap = resolveTypeVariables funcArgTypes argTypes
896+ argTypes = rights eArgTypes
877− case eTvMap of
897+ case eTvMap of
878− Left err -> throwError err
898+ Left err -> pure (Left err)
879− Right tvMap -> lift $ except $ resolveFunctionReturnValue funcName tvMap funcRetType
899+ Right tvMap -> pure (resolveFunctionReturnValue funcName tvMap funcRetType)
880−typeForGraphRefAtomExpr attrs (RelationAtomExpr relExpr) = do
900+typeFromAtomExpr attrs (RelationAtomExpr relExpr) = do
881− relType <- R.local (mergeAttributesIntoGraphRefRelationalExprEnv attrs) (typeForGraphRefRelationalExpr relExpr)
901+ relType <- local (mergeAttributesIntoRelationalExprState attrs) (typeForRelationalExpr relExpr)
903+ Left err -> pure (Left err)
882− pure (RelationAtomType (attributes relType))
905+ pure (pure (RelationAtomType (attributes relType')))
883-- grab the type of the data constructor, then validate that the args match the expected types
906-- grab the type of the data constructor, then validate that the args match the expected types
884−typeForGraphRefAtomExpr attrs (ConstructedAtomExpr dConsName dConsArgs tid) =
907+typeFromAtomExpr attrs (ConstructedAtomExpr dConsName dConsArgs _) =
885− do
908+ runExceptT $ do
886− argsTypes <- mapM (typeForGraphRefAtomExpr attrs) dConsArgs
909+ argsTypes <- mapM (liftE . typeFromAtomExpr attrs) dConsArgs
887− tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker tid
910+ context <- fmap stateElemsContext (lift ask)
888− lift $ except $ atomTypeForDataConstructor tConsMap dConsName argsTypes
911+ either throwE pure (atomTypeForDataConstructor (typeConstructorMapping context) dConsName argsTypes)
890-- | Validate that the type of the AtomExpr matches the expected type.
913-- | Validate that the type of the AtomExpr matches the expected type.
891−verifyGraphRefAtomExprTypes :: Relation -> GraphRefAtomExpr -> AtomType -> GraphRefRelationalExprM AtomType
914+verifyAtomExprTypes :: Relation -> AtomExpr -> AtomType -> RelationalExprState (Either RelationalError AtomType)
892−verifyGraphRefAtomExprTypes relIn (AttributeAtomExpr attrName) expectedType = do
915+verifyAtomExprTypes relIn (AttributeAtomExpr attrName) expectedType = runExceptT $ do
893− env <- askEnv
916+ rstate <- lift ask
894 case A.atomTypeForAttributeName attrName (attributes relIn) of
917 case A.atomTypeForAttributeName attrName (attributes relIn) of
895− Right aType -> lift $ except $ atomTypeVerify expectedType aType
918+ Right aType -> either throwE pure (atomTypeVerify expectedType aType)
896 (Left err@(NoSuchAttributeNamesError _)) ->
919 (Left err@(NoSuchAttributeNamesError _)) ->
897− let attrs' = envAttributes env in
920+ let attrs' = stateAttributes rstate in
898 if attrs' == emptyAttributes then
921 if attrs' == emptyAttributes then
899− throwError err
922+ throwE err
901 case A.attributeForName attrName attrs' of
924 case A.attributeForName attrName attrs' of
902− Left err' -> throwError err'
925+ Left err' -> throwE err'
903− Right attrType -> lift $ except $ atomTypeVerify expectedType (A.atomType attrType)
926+ Right attrType -> either throwE pure (atomTypeVerify expectedType (A.atomType attrType))
904− Left err -> throwError err
906−verifyGraphRefAtomExprTypes _ (NakedAtomExpr atom) expectedType =
907− lift $ except $ atomTypeVerify expectedType (atomTypeForAtom atom)
927+verifyAtomExprTypes _ (NakedAtomExpr atom) expectedType = pure (atomTypeVerify expectedType (atomTypeForAtom atom))
908−verifyGraphRefAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs tid) expectedType = do
928+verifyAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs _) expectedType = do
909− context <- gfDatabaseContextForMarker tid
929+ rstate <- ask
910 let functions = atomFunctions context
930 let functions = atomFunctions context
931+ context = stateElemsContext rstate
911− func <- lift $ except $ atomFunctionForName funcName functions
933+ func <- either throwE pure (atomFunctionForName funcName functions)
912− let expectedArgTypes = atomFuncType func
934+ let expectedArgTypes = atomFuncType func
913− funcArgVerifier (atomExpr, expectedType2, argCount) = do
935+ funcArgTypes <- mapM (\(atomExpr,expectedType2,argCount) -> case runReader (verifyAtomExprTypes relIn atomExpr expectedType2) rstate of
914− let handler :: RelationalError -> GraphRefRelationalExprM AtomType
915− handler (AtomTypeMismatchError expSubType actSubType) = throwError (AtomFunctionTypeError funcName argCount expSubType actSubType)
936+ Left (AtomTypeMismatchError expSubType actSubType) -> throwE (AtomFunctionTypeError funcName argCount expSubType actSubType)
916− handler err = throwError err
937+ Left err -> throwE err
917− verifyGraphRefAtomExprTypes relIn atomExpr expectedType2 `catchError` handler
938+ Right x -> pure x
918− funcArgTypes <- mapM funcArgVerifier $ zip3 funcArgExprs expectedArgTypes [1..]
939+ ) $ zip3 funcArgExprs expectedArgTypes [1..]
919− if length funcArgTypes /= length expectedArgTypes - 1 then
940+ if length funcArgTypes /= length expectedArgTypes - 1 then
920− throwError (AtomTypeCountError funcArgTypes expectedArgTypes)
941+ throwE (AtomTypeCountError funcArgTypes expectedArgTypes)
922− lift $ except $ atomTypeVerify expectedType (last expectedArgTypes)
943+ either throwE pure (atomTypeVerify expectedType (last expectedArgTypes))
923−verifyGraphRefAtomExprTypes relIn (RelationAtomExpr relationExpr) expectedType =
944+verifyAtomExprTypes relIn (RelationAtomExpr relationExpr) expectedType = runExceptT $ do
924− do
945+ rstate <- lift ask
925− let mergedAttrsEnv e = mergeAttributesIntoGraphRefRelationalExprEnv (attributes relIn) e
946+ relType <- either throwE pure (runReader (typeForRelationalExpr relationExpr) (mergeAttributesIntoRelationalExprState (attributes relIn) rstate))
926− relType <- R.local mergedAttrsEnv (typeForGraphRefRelationalExpr relationExpr)
927− lift $ except $ atomTypeVerify expectedType (RelationAtomType (attributes relType))
947+ either throwE pure (atomTypeVerify expectedType (RelationAtomType (attributes relType)))
928−verifyGraphRefAtomExprTypes rel cons@ConstructedAtomExpr{} expectedType = do
948+verifyAtomExprTypes rel cons@ConstructedAtomExpr{} expectedType = runExceptT $ do
929− cType <- typeForGraphRefAtomExpr (attributes rel) cons
949+ cType <- liftE (typeFromAtomExpr (attributes rel) cons)
930− lift $ except $ atomTypeVerify expectedType cType
950+ either throwE pure (atomTypeVerify expectedType cType)
932-- | Look up the type's name and create a new attribute.
952-- | Look up the type's name and create a new attribute.
933−evalGraphRefAttrExpr :: GraphRefAttributeExpr -> GraphRefRelationalExprM Attribute
953+evalAttrExpr :: TypeConstructorMapping -> AttributeExpr -> Either RelationalError Attribute
934−evalGraphRefAttrExpr (AttributeAndTypeNameExpr attrName tCons transId) = do
954+evalAttrExpr aTypes (AttributeAndTypeNameExpr attrName tCons ()) = do
935− tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker transId
936− aType <- lift $ except $ atomTypeForTypeConstructorValidate True tCons tConsMap M.empty
955+ aType <- atomTypeForTypeConstructorValidate True tCons aTypes M.empty
937− lift $ except $ validateAtomType aType tConsMap
956+ validateAtomType aType aTypes
938− pure $ Attribute attrName aType
957+ Right (Attribute attrName aType)
940−evalGraphRefAttrExpr (NakedAttributeExpr attr) = pure attr
959+evalAttrExpr _ (NakedAttributeExpr attr) = Right attr
942−-- for tuple type concrete resolution (Nothing ==> Maybe Int) when the attributes hint is Nothing, we need to first process all the tuples, then extract the concrete types on a per-attribute basis, then reprocess the tuples to include the concrete types
961+evalTupleExpr :: Maybe Attributes -> TupleExpr -> RelationalExprState (Either RelationalError RelationTuple)
943−evalGraphRefTupleExprs :: Maybe Attributes -> GraphRefTupleExprs -> GraphRefRelationalExprM [RelationTuple]
944−evalGraphRefTupleExprs _ (TupleExprs _ []) = pure []
945−evalGraphRefTupleExprs mAttrs (TupleExprs fixedMarker tupleExprL) = do
946− tuples <- mapM (evalGraphRefTupleExpr mAttrs) tupleExprL
947− finalAttrs <- case mAttrs of
948− Just attrs -> pure attrs
951− [] -> pure emptyAttributes
952− (headTuple:tailTuples) -> do
953− --gather up resolved atom types or throw an error if an attribute cannot be made concrete from the inferred types- this could still fail if the type cannot be inferred (e.g. from [Nothing, Nothing])
955− processTupleAttrs (tupAttr, accAttr) =
956− --if the attribute is a constructedatomtype, we can recurse into it to potentially resolve type variables
957− if isResolvedAttribute accAttr && tupAttr == accAttr then
960− lift $ except $ resolveAttributes accAttr tupAttr
961− mostResolvedTypes <-
962− foldM (\acc tup -> do
963− let zipped = zip (V.toList . attributesVec $ tupleAttributes tup) acc
964− accNames = S.fromList $ map A.attributeName acc
965− tupNames = A.attributeNameSet (tupleAttributes tup)
966− attrNamesDiff = S.union (S.difference accNames tupNames) (S.difference tupNames accNames)
967− unless (null attrNamesDiff) (throwError (AttributeNamesMismatchError attrNamesDiff))
968− nextTupleAttrs <- mapM processTupleAttrs zipped
969− let diff = A.attributesDifference (A.attributesFromList nextTupleAttrs) (A.attributesFromList acc)
970− if diff == A.emptyAttributes then
973− throwError (TupleAttributeTypeMismatchError diff)
974− ) (V.toList . attributesVec $ tupleAttributes headTuple) tailTuples
975− pure (A.attributesFromList mostResolvedTypes)
976− --strategy: if all the tuple expr transaction markers refer to one location, then we can pass the type constructor mapping from that location, otherwise, we cannot assume that the types are the same
977− tConsMap <- case singularTransactions tupleExprL of
978− SingularTransactionRef commonTransId ->
979− typeConstructorMapping <$> gfDatabaseContextForMarker commonTransId
980− NoTransactionsRef ->
981− typeConstructorMapping <$> gfDatabaseContextForMarker fixedMarker
982− -- if there are multiple transaction markers in the TupleExprs, then we can't assume a single type constructor mapping- this could be improved in the future, but if all the tuples are fully resolved, then we don't need further resolution
983− _ -> throwError TupleExprsReferenceMultipleMarkersError
984− lift $ except $ validateAttributes tConsMap finalAttrs
985− mapM (lift . except . resolveTypesInTuple finalAttrs tConsMap) tuples
988−--resolveAttributes (Attribute "gonk" (ConstructedAtomType "Either" (fromList [("a",IntegerAtomType),("b",TypeVariableType "b")]))) (Attribute "gonk" (ConstructedAtomType "Either" (fromList [("a",TypeVariableType "a"),("b",TextAtomType)])))
990−evalGraphRefTupleExpr :: Maybe Attributes -> GraphRefTupleExpr -> GraphRefRelationalExprM RelationTuple
991−evalGraphRefTupleExpr mAttrs (TupleExpr tupMap) = do
962+evalTupleExpr mAttrs (TupleExpr tupMap) = do
963+ context <- fmap stateElemsContext ask
992 -- it's not possible for AtomExprs in tuple constructors to reference other Attributes' atoms due to the necessary order-of-operations (need a tuple to pass to evalAtomExpr)- it may be possible with some refactoring of type usage or delayed evaluation- needs more thought, but not a priority
965 -- it's not possible for AtomExprs in tuple constructors to reference other Attributes' atoms due to the necessary order-of-operations (need a tuple to pass to evalAtomExpr)- it may be possible with some refactoring of type usage or delayed evaluation- needs more thought, but not a priority
993 -- I could adjust this logic so that when the attributes are not specified (Nothing), then I can attempt to extract the attributes from the tuple- the type resolution will blow up if an ambiguous data constructor is used (Left 4) and this should allow simple cases to "relation{tuple{a 4}}" to be processed
966 -- I could adjust this logic so that when the attributes are not specified (Nothing), then I can attempt to extract the attributes from the tuple- the type resolution will blow up if an ambiguous data constructor is used (Left 4) and this should allow simple cases to "relation{tuple{a 4}}" to be processed
994− let attrs = fromMaybe A.emptyAttributes mAttrs
967+ let attrs = fromMaybe A.emptyAttributes mAttrs
995− resolveOneAtom (attrName, aExpr) =
968+ attrAtoms <- mapM (\(attrName, aExpr) -> do
997− --provided when the relation header is available
969+ --provided when the relation header is available
998− let eExpectedAtomType = A.atomTypeForAttributeName attrName attrs
970+ let eExpectedAtomType = A.atomTypeForAttributeName attrName attrs
999− unresolvedType <- typeForGraphRefAtomExpr attrs aExpr
971+ unresolvedType <- liftE (typeFromAtomExpr attrs aExpr)
1000− resolvedType <- case eExpectedAtomType of
972+ resolvedType <- case eExpectedAtomType of
1001 Left _ -> pure unresolvedType
973 Left _ -> pure unresolvedType
1002− Right typeHint -> lift $ except $ resolveAtomType typeHint unresolvedType
974+ Right typeHint -> either throwE pure (resolveAtomType typeHint unresolvedType)
1003 --resolve atom typevars based on resolvedType?
975 --resolve atom typevars based on resolvedType?
1004− newAtom <- evalGraphRefAtomExpr emptyTuple aExpr
976+ newAtom <- liftE (evalAtomExpr emptyTuple aExpr)
1005− pure (attrName, newAtom, resolvedType)
977+ pure (attrName, newAtom, resolvedType)
1006− attrAtoms <- mapM resolveOneAtom (M.toList tupMap)
978+ ) (M.toList tupMap)
1007− let tupAttrs = A.attributesFromList $ map (\(attrName, _, aType) -> Attribute attrName aType) attrAtoms
979+ let tupAttrs = A.attributesFromList $ map (\(attrName, _, aType) -> Attribute attrName aType) attrAtoms
1008− atoms = V.fromList $ map (\(_, atom, _) -> atom) attrAtoms
980+ atoms = V.fromList $ map (\(_, atom, _) -> atom) attrAtoms
1009− tup = mkRelationTuple tupAttrs atoms
981+ tup = mkRelationTuple tupAttrs atoms
982+ tConss = typeConstructorMapping context
1010− finalAttrs = fromMaybe tupAttrs mAttrs
983+ finalAttrs = fromMaybe tupAttrs mAttrs
1011 --verify that the attributes match
984 --verify that the attributes match
1012− when (A.attributeNameSet finalAttrs /= A.attributeNameSet tupAttrs) $ throwError (TupleAttributeTypeMismatchError tupAttrs)
985+ when (A.attributeNameSet finalAttrs /= A.attributeNameSet tupAttrs) $ throwE (TupleAttributeTypeMismatchError tupAttrs)
1013− --we can't resolve types here- they have to be resolved at the atom level where the graph ref is held
1014− --tup' <- lift $ except (resolveTypesInTuple finalAttrs tConss (reorderTuple finalAttrs tup))
986+ tup' <- either throwE pure (resolveTypesInTuple finalAttrs tConss (reorderTuple finalAttrs tup))
1015− let tup' = reorderTuple finalAttrs tup
1016− --TODO: restore type resolution
1017−-- _ <- lift $ except (validateTuple tup' tConss)
987+ _ <- either throwE pure (validateTuple tup' tConss)
1018− pure tup'
988+ pure tup'
1020−--temporary implementation until we have a proper planner+executor
990+evalAttributeNames :: AttributeNames -> RelationalExpr -> RelationalExprState (Either RelationalError (S.Set AttributeName))
1021−evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
991+evalAttributeNames attrNames expr = do
1022−evalGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
992+ eExprType <- typeForRelationalExpr expr
1023− mAttrs <- case mAttrExprs of
993+ case eExprType of
1024− Just _ ->
994+ Left err -> pure (Left err)
1025− Just . A.attributesFromList <$> mapM evalGraphRefAttrExpr (fromMaybe [] mAttrExprs)
995+ Right exprTyp -> do
1026− Nothing -> pure Nothing
996+ let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))
1027− tuples <- evalGraphRefTupleExprs mAttrs tupleExprs
997+ case attrNames of
1028− let attrs = fromMaybe firstTupleAttrs mAttrs
998+ AttributeNames names ->
1029− firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
999+ case A.projectionAttributesForNames names (attributes exprTyp) of
1030− lift $ except $ mkRelation attrs (RelationTupleSet tuples)
1000+ Left err -> pure (Left err)
1031−evalGraphRefRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
1001+ Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))
1032− lift $ except $ mkRelation attributeSet tupleSet
1002+
1033−evalGraphRefRelationalExpr (ExistingRelation rel) = pure rel
1003+ InvertedAttributeNames names -> do
1004+ let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
1005+ if not (S.null nonExistentAttributeNames) then
1006+ pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))
1008+ pure (Right (A.nonMatchingAttributeNameSet names typeNameSet))
1010+ UnionAttributeNames namesA namesB -> do
1011+ eNameSetA <- evalAttributeNames namesA expr
1013+ Left err -> pure (Left err)
1014+ Right nameSetA -> do
1015+ eNameSetB <- evalAttributeNames namesB expr
1017+ Left err -> pure (Left err)
1019+ pure (Right (S.union nameSetA nameSetB))
1021+ IntersectAttributeNames namesA namesB -> do
1022+ eNameSetA <- evalAttributeNames namesA expr
1024+ Left err -> pure (Left err)
1025+ Right nameSetA -> do
1026+ eNameSetB <- evalAttributeNames namesB expr
1028+ Left err -> pure (Left err)
1030+ pure (Right (S.intersection nameSetA nameSetB))
1032+ RelationalExprAttributeNames attrExpr -> do
1033+ eAttrExprType <- typeForRelationalExpr attrExpr
1034+ case eAttrExprType of
1035+ Left err -> pure (Left err)
1036+ Right attrExprType -> pure (Right (A.attributeNameSet (attributes attrExprType)))
1038+evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> TransactionGraph -> Either RelationalError Relation
1034−evalGraphRefRelationalExpr (RelationVariable name tid) = do
1039+evalGraphRefRelationalExpr (RelationVariable name tid) graph = do
1035− ctx <- gfDatabaseContextForMarker tid
1040+ ctx <- dbContextForTransId tid graph
1036 case M.lookup name (relationVariables ctx) of
1041 case M.lookup name (relationVariables ctx) of
1037− Nothing -> throwError (RelVarNotDefinedError name)
1042+ Nothing -> Left (RelVarNotDefinedError name)
1038− Just rv -> evalGraphRefRelationalExpr rv
1043+ Just rv -> evalGraphRefRelationalExpr rv graph
1039−evalGraphRefRelationalExpr (Project attrNames expr) = do
1040− attrNameSet <- evalGraphRefAttributeNames attrNames expr
1041− rel <- evalGraphRefRelationalExpr expr
1042− lift $ except $ project attrNameSet rel
1043−evalGraphRefRelationalExpr (Union exprA exprB) = do
1044− relA <- evalGraphRefRelationalExpr exprA
1045− relB <- evalGraphRefRelationalExpr exprB
1046− lift $ except $ union relA relB
1047−evalGraphRefRelationalExpr (Join exprA exprB) = do
1048− relA <- evalGraphRefRelationalExpr exprA
1049− relB <- evalGraphRefRelationalExpr exprB
1050− lift $ except $ join relA relB
1051−evalGraphRefRelationalExpr (Rename oldName newName expr) = do
1052− rel <- evalGraphRefRelationalExpr expr
1053− lift $ except $ rename oldName newName rel
1054−evalGraphRefRelationalExpr (Difference exprA exprB) = do
1055− relA <- evalGraphRefRelationalExpr exprA
1056− relB <- evalGraphRefRelationalExpr exprB
1057− lift $ except $ difference relA relB
1058−evalGraphRefRelationalExpr (Group groupAttrNames newAttrName expr) = do
1059− groupNames <- evalGraphRefAttributeNames groupAttrNames expr
1060− rel <- evalGraphRefRelationalExpr expr
1061− lift $ except $ group groupNames newAttrName rel
1062−evalGraphRefRelationalExpr (Ungroup groupAttrName expr) = do
1063− rel <- evalGraphRefRelationalExpr expr
1064− lift $ except $ ungroup groupAttrName rel
1065−evalGraphRefRelationalExpr (Restrict predExpr expr) = do
1066− rel <- evalGraphRefRelationalExpr expr
1067− filt <- predicateRestrictionFilter (attributes rel) predExpr
1068− lift $ except $ restrict filt rel
1069−evalGraphRefRelationalExpr (Equals exprA exprB) = do
1070− relA <- evalGraphRefRelationalExpr exprA
1071− relB <- evalGraphRefRelationalExpr exprB
1072− pure $ if relA == relB then relationTrue else relationFalse
1073−evalGraphRefRelationalExpr (NotEquals exprA exprB) = do
1074− relA <- evalGraphRefRelationalExpr exprA
1075− relB <- evalGraphRefRelationalExpr exprB
1076− pure $ if relA == relB then relationFalse else relationTrue
1077−evalGraphRefRelationalExpr (Extend extendTupleExpr expr) = do
1078− rel <- evalGraphRefRelationalExpr expr
1079− (newAttrs, tupProc) <- extendGraphRefTupleExpressionProcessor rel extendTupleExpr
1080− lift $ except $ relMogrify tupProc newAttrs rel
1081−evalGraphRefRelationalExpr expr@With{} =
1082− --strategy A: add relation variables to the contexts in the graph
1083− --strategy B: drop in macros in place (easier programmatically)
1084− --strategy B implementation
1085− evalGraphRefRelationalExpr (substituteWithNameMacros [] expr)
1087dbContextForTransId :: TransactionId -> TransactionGraph -> Either RelationalError DatabaseContext
1045dbContextForTransId :: TransactionId -> TransactionGraph -> Either RelationalError DatabaseContext
1088dbContextForTransId tid graph = do
1046dbContextForTransId tid graph = do
@@ -1100,293 +1058,143 @@ transactionForId tid graph
1101 matchingTrans = S.filter (\(Transaction idMatch _ _) -> idMatch == tid) (transactionsForGraph graph)
1059 matchingTrans = S.filter (\(Transaction idMatch _ _) -> idMatch == tid) (transactionsForGraph graph)
1061+processRestrictionPredicateExpr :: RestrictionPredicateExpr -> RelationalExprState (Either RelationalError GraphRefRestrictionPredicateExpr)
1062+processRestrictionPredicateExpr TruePredicate = pure (Right TruePredicate)
1063+processRestrictionPredicateExpr (AndPredicate a b) = do
1064+ a' <- processRestrictionPredicateExpr a
1065+ b' <- processRestrictionPredicateExpr b
1067+ Left err -> pure (Left err)
1068+ Right a'' -> case b' of
1069+ Left err -> pure (Left err)
1071+ pure (Right (AndPredicate a'' b''))
1072+processRestrictionPredicateExpr (OrPredicate a b) = do
1073+ a' <- processRestrictionPredicateExpr a
1074+ b' <- processRestrictionPredicateExpr b
1076+ Left err -> pure (Left err)
1077+ Right a'' -> case b' of
1078+ Left err -> pure (Left err)
1080+ pure (Right (OrPredicate a'' b''))
1081+processRestrictionPredicateExpr (NotPredicate a) = do
1082+ a' <- processRestrictionPredicateExpr a
1084+ Left err -> pure (Left err)
1086+ pure (Right (NotPredicate a''))
1087+processRestrictionPredicateExpr (RelationalExprPredicate expr) = do
1088+ e <- evalRelationalExpr expr
1090+ Left err -> Left err
1091+ Right e' -> Right (RelationalExprPredicate e')
1092+processRestrictionPredicateExpr (AtomExprPredicate expr) = do
1093+ tid <- elems_currentTransId <$> ask
1094+ let e = processAtomExpr expr tid
1095+ pure (Right (AtomExprPredicate e))
1096+processRestrictionPredicateExpr (AttributeEqualityPredicate nam expr) = do
1097+ tid <- elems_currentTransId <$> ask
1098+ let e = processAtomExpr expr tid
1099+ pure (Right (AttributeEqualityPredicate nam e))
1100+processExtendTupleExpr :: ExtendTupleExpr -> RelationalExprState (Either RelationalError (ExtendTupleExprBase a))
1101+processExtendTupleExpr (AttributeExtendTupleExpr nam atomExpr) = do
1102+ eExpr <- evalAtomExpr atomExpr
1104+ Left err -> pure (Left err)
1105+ Right expr -> pure (Right (AttributeExtendTupleExpr nam expr))
1103−typeForGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
1107+typeForGraphRefRelationalExpr :: GraphRefRelationalExpr -> TransactionGraph -> Either RelationalError Relation
1104−typeForGraphRefRelationalExpr (MakeStaticRelation attrs _) = lift $ except $ mkRelation attrs emptyTupleSet
1108+typeForGraphRefRelationalExpr (MakeStaticRelation attrs _) _ = mkRelation attrs emptyTupleSet
1105−typeForGraphRefRelationalExpr (ExistingRelation rel) = pure (emptyRelationWithAttrs (attributes rel))
1109+typeForGraphRefRelationalExpr (ExistingRelation rel) _ = pure (emptyRelationWithAttrs (attributes rel))
1106−typeForGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
1110+typeForGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) graph =
1107− mAttrs <- case mAttrExprs of
1111+ case mAttrExprs of
1108− Just attrExprs -> do
1112+ Just attrExprs -> do
1109− attrs <- mapM evalGraphRefAttributeExpr attrExprs
1113+ attrs <- mapM (\e -> evalGraphRefAttributeExpr e graph) attrExprs
1110− pure (Just (attributesFromList attrs))
1114+ pure (emptyRelationWithAttrs attrs)
1111− Nothing -> pure Nothing
1112− tuples <- evalGraphRefTupleExprs mAttrs tupleExprs
1113− let retAttrs = case tuples of
1114− (tup:_) -> tupleAttributes tup
1115− [] -> fromMaybe A.emptyAttributes mAttrs
1116− pure $ emptyRelationWithAttrs retAttrs
1118−typeForGraphRefRelationalExpr (RelationVariable rvName tid) = do
1115+typeForGraphRefRelationalExpr (RelationVariable rvName tid) graph = do
1116+ trans <- transactionForId tid graph
1119− relVars <- relationVariables <$> gfDatabaseContextForMarker tid
1117+ let relVars = relationVariables (concreteDatabaseContext trans)
1120 case M.lookup rvName relVars of
1118 case M.lookup rvName relVars of
1121− Nothing -> throwError (RelVarNotDefinedError rvName)
1119+ Nothing -> Left $ RelVarNotDefinedError name
1123− typeForGraphRefRelationalExpr rvExpr
1120+ Just rvExpr -> typeForGraphRefRelationalExpr rvExpr graph
1124−typeForGraphRefRelationalExpr (Project attrNames expr) = do
1121+typeForGraphRefRelationalExpr (Project attrNames expr) graph = do
1125− exprType' <- typeForGraphRefRelationalExpr expr
1122+ exprType <- typeForGraphRefRelationalExpr expr graph
1126− projectionAttrs <- evalGraphRefAttributeNames attrNames expr
1123+ projectionAttrs <- evalGraphRefAttributeNames attrNames expr graph
1127− lift $ except $ project projectionAttrs exprType'
1124+ project projectionAttrs exprType
1128−typeForGraphRefRelationalExpr (Union exprA exprB) = do
1125+
1129− exprA' <- typeForGraphRefRelationalExpr exprA
1130− exprB' <- typeForGraphRefRelationalExpr exprB
1131− lift $ except $ union exprA' exprB'
1132−typeForGraphRefRelationalExpr (Join exprA exprB) = do
1133− exprA' <- typeForGraphRefRelationalExpr exprA
1134− exprB' <- typeForGraphRefRelationalExpr exprB
1135− lift $ except $ join exprA' exprB'
1136−typeForGraphRefRelationalExpr (Rename oldAttr newAttr expr) = do
1137− expr' <- typeForGraphRefRelationalExpr expr
1138− lift $ except $ rename oldAttr newAttr expr'
1139−typeForGraphRefRelationalExpr (Difference exprA exprB) = do
1140− exprA' <- typeForGraphRefRelationalExpr exprA
1141− exprB' <- typeForGraphRefRelationalExpr exprB
1142− lift $ except $ difference exprA' exprB'
1143−typeForGraphRefRelationalExpr (Group groupNames attrName expr) = do
1144− expr' <- typeForGraphRefRelationalExpr expr
1145− groupNames' <- evalGraphRefAttributeNames groupNames expr
1146− lift $ except $ group groupNames' attrName expr'
1147−typeForGraphRefRelationalExpr (Ungroup groupAttrName expr) = do
1148− expr' <- typeForGraphRefRelationalExpr expr
1149− lift $ except $ ungroup groupAttrName expr'
1150−typeForGraphRefRelationalExpr (Restrict pred' expr) = do
1151− expr' <- typeForGraphRefRelationalExpr expr
1152− filt <- predicateRestrictionFilter (attributes expr') pred'
1153− lift $ except $ restrict filt expr'
1154−typeForGraphRefRelationalExpr Equals{} =
1156−typeForGraphRefRelationalExpr NotEquals{} =
1158−typeForGraphRefRelationalExpr (Extend extendTupleExpr expr) = do
1159− rel <- typeForGraphRefRelationalExpr expr
1160− evalGraphRefRelationalExpr (Extend extendTupleExpr (ExistingRelation rel))
1161−typeForGraphRefRelationalExpr expr@(With withs _) = do
1162− let expr' = substituteWithNameMacros [] expr
1163− checkMacroName (WithNameExpr macroName tid) = do
1164− rvs <- relationVariables <$> gfDatabaseContextForMarker tid
1165− case M.lookup macroName rvs of
1166− Just _ -> lift $ except $ Left (RelVarAlreadyDefinedError macroName) --this error does not include the transaction marker, but should be good enough to identify the cause
1168− mapM_ (checkMacroName . fst) withs
1169− typeForGraphRefRelationalExpr expr'
1171−evalGraphRefAttributeNames :: GraphRefAttributeNames -> GraphRefRelationalExpr -> GraphRefRelationalExprM (S.Set AttributeName)
1126+evalGraphRefAttributeNames :: AttributeNames -> GraphRefRelationalExpr -> TransactionGraph -> Either RelationalError (S.Set AttributeName)
1172−evalGraphRefAttributeNames attrNames expr = do
1127+evalGraphRefAttributeNames attrNames expr graph = do
1173− exprType' <- typeForGraphRefRelationalExpr expr
1128+ exprTyp <- typeForGraphRefRelationalExpr expr graph
1174− let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprType')))
1129+ let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))
1175 case attrNames of
1130 case attrNames of
1176− AttributeNames names ->
1131+ AttributeNames names ->
1177− case A.projectionAttributesForNames names (attributes exprType') of
1132+ case A.projectionAttributesForNames names (attributes exprTyp) of
1178− Left err -> throwError err
1133+ Left err -> pure (Left err)
1179− Right attrs -> pure (S.fromList (V.toList (A.attributeNames attrs)))
1134+ Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))
1181− InvertedAttributeNames names -> do
1136+ InvertedAttributeNames names -> do
1182 let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
1137 let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
1183 if not (S.null nonExistentAttributeNames) then
1138 if not (S.null nonExistentAttributeNames) then
1184− throwError $ AttributeNamesMismatchError nonExistentAttributeNames
1139+ pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))
1186− pure (A.nonMatchingAttributeNameSet names typeNameSet)
1141+ pure (Right (A.nonMatchingAttributeNameSet names typeNameSet))
1188− UnionAttributeNames namesA namesB -> do
1143+ UnionAttributeNames namesA namesB -> do
1189− nameSetA <- evalGraphRefAttributeNames namesA expr
1144+ eNameSetA <- evalAttributeNames namesA expr
1190− nameSetB <- evalGraphRefAttributeNames namesB expr
1145+ case eNameSetA of
1146+ Left err -> pure (Left err)
1147+ Right nameSetA -> do
1148+ eNameSetB <- evalAttributeNames namesB expr
1150+ Left err -> pure (Left err)
1191− pure (S.union nameSetA nameSetB)
1152+ pure (Right (S.union nameSetA nameSetB))
1193− IntersectAttributeNames namesA namesB -> do
1154+ IntersectAttributeNames namesA namesB -> do
1194− nameSetA <- evalGraphRefAttributeNames namesA expr
1155+ eNameSetA <- evalAttributeNames namesA expr
1195− nameSetB <- evalGraphRefAttributeNames namesB expr
1156+ case eNameSetA of
1157+ Left err -> pure (Left err)
1158+ Right nameSetA -> do
1159+ eNameSetB <- evalAttributeNames namesB expr
1161+ Left err -> pure (Left err)
1196− pure (S.intersection nameSetA nameSetB)
1163+ pure (Right (S.intersection nameSetA nameSetB))
1165+ RelationalExprAttributeNames attrExpr -> do
1166+ eAttrExprType <- typeForRelationalExpr attrExpr
1167+ case eAttrExprType of
1168+ Left err -> pure (Left err)
1169+ Right attrExprType -> pure (Right (A.attributeNameSet (attributes attrExprType)))
1198− RelationalExprAttributeNames attrExpr -> do
1199− attrExprType <- typeForGraphRefRelationalExpr attrExpr
1200− pure (A.attributeNameSet (attributes attrExprType))
1202−evalGraphRefAttributeExpr :: GraphRefAttributeExpr -> GraphRefRelationalExprM Attribute
1203−evalGraphRefAttributeExpr (AttributeAndTypeNameExpr attrName tCons tid) = do
1204− tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker tid
1205− case atomTypeForTypeConstructorValidate True tCons tConsMap M.empty of
1206− Left err -> throwError err
1208− case validateAtomType aType tConsMap of
1209− Left err -> throwError err
1210− Right _ -> pure (Attribute attrName aType)
1211−evalGraphRefAttributeExpr (NakedAttributeExpr attr) = pure attr
1213−mkEmptyRelVars :: RelationVariables -> RelationVariables
1214−mkEmptyRelVars = M.map mkEmptyRelVar
1216− mkEmptyRelVar expr@MakeRelationFromExprs{} = expr --do not truncate here because we might lose essential type information in emptying the tuples
1217− mkEmptyRelVar (MakeStaticRelation attrs _) = MakeStaticRelation attrs emptyTupleSet
1218− mkEmptyRelVar (ExistingRelation rel) = ExistingRelation (emptyRelationWithAttrs (attributes rel))
1219− mkEmptyRelVar rv@RelationVariable{} = Restrict (NotPredicate TruePredicate) rv
1220− mkEmptyRelVar (Project attrNames expr) = Project attrNames (mkEmptyRelVar expr)
1221− mkEmptyRelVar (Union exprA exprB) = Union (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1222− mkEmptyRelVar (Join exprA exprB) = Join (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1223− mkEmptyRelVar (Rename nameA nameB expr) = Rename nameA nameB (mkEmptyRelVar expr)
1224− mkEmptyRelVar (Difference exprA exprB) = Difference (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1225− mkEmptyRelVar (Group attrNames attrName expr) = Group attrNames attrName (mkEmptyRelVar expr)
1226− mkEmptyRelVar (Ungroup attrName expr) = Ungroup attrName (mkEmptyRelVar expr)
1227− mkEmptyRelVar (Restrict pred' expr) = Restrict pred' (mkEmptyRelVar expr)
1228− mkEmptyRelVar (Equals exprA exprB) = Equals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1229− mkEmptyRelVar (NotEquals exprA exprB) = NotEquals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1230− mkEmptyRelVar (Extend extTuple expr) = Extend extTuple (mkEmptyRelVar expr)
1231− mkEmptyRelVar (With macros expr) = With (map (second mkEmptyRelVar) macros) (mkEmptyRelVar expr)
1234−dbErr :: RelationalError -> DatabaseContextEvalMonad ()
1235−dbErr err = lift (except (Left err))
1237−-- | Return a Relation describing the relation variables.
1238−relationVariablesAsRelation :: DatabaseContext -> TransactionGraph -> Either RelationalError Relation
1239−relationVariablesAsRelation ctx graph = do
1240− let subrelAttrs = A.attributesFromList [Attribute "attribute" TextAtomType, Attribute "type" TextAtomType]
1241− attrs = A.attributesFromList [Attribute "name" TextAtomType,
1242− Attribute "attributes" (RelationAtomType subrelAttrs)]
1243− relVars = relationVariables ctx
1244− mkRvDesc (rvName, gfExpr) = do
1245− let gfEnv = freshGraphRefRelationalExprEnv (Just ctx) graph
1246− gfType <- runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
1247− pure (rvName, gfType)
1248− relVarToAtomList (rvName, rel) = [TextAtom rvName, attributesToRel (attributesVec (attributes rel))]
1249− attrAtoms a = [TextAtom (A.attributeName a), TextAtom (prettyAtomType (A.atomType a))]
1250− attributesToRel attrl = case mkRelationFromList subrelAttrs (map attrAtoms (V.toList attrl)) of
1251− Left err -> error ("relationVariablesAsRelation pooped " ++ show err)
1252− Right rel -> RelationAtom rel
1253− rvs <- mapM mkRvDesc (M.toList relVars)
1254− let tups = map relVarToAtomList rvs
1255− mkRelationFromList attrs tups
1257−-- | An unoptimized variant of evalGraphRefRelationalExpr for testing.
1258−evalRelationalExpr :: RelationalExpr -> RelationalExprM Relation
1259−evalRelationalExpr expr = do
1261− context <- reContext
1262− let expr' = runProcessExprM UncommittedContextMarker (processRelationalExpr expr)
1263− gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
1264− case runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr expr') of
1265− Left err -> throwError err
1266− Right rel -> pure rel
1268−class (MonadError RelationalError m, Monad m) => DatabaseContextM m where
1269− getContext :: m DatabaseContext
1271−instance DatabaseContextM (ReaderT GraphRefRelationalExprEnv (ExceptT RelationalError Identity)) where
1272− getContext = gfDatabaseContextForMarker UncommittedContextMarker
1274−instance DatabaseContextM (RWST DatabaseContextEvalEnv () DatabaseContextEvalState (ExceptT RelationalError Identity)) where
1275− getContext = getStateContext
1277−relVarByName :: DatabaseContextM m => RelVarName -> m GraphRefRelationalExpr
1278−relVarByName rvName = do
1279− relvars <- relationVariables <$> getContext
1280− case M.lookup rvName relvars of
1281− Nothing -> throwError (RelVarNotDefinedError rvName)
1282− Just gfexpr -> pure gfexpr
1284−-- | resolve UncommittedTransactionMarker whenever possible- this is important in the DatabaseContext in order to mitigate self-referencing loops for updates
1173+
1285−class ResolveGraphRefTransactionMarker a where
1174+processAtomExpr :: AtomExpr -> TransactionId -> GraphRefAtomExpr
1286− resolve :: a -> DatabaseContextEvalMonad a
1175+processAtomExpr (AttributeAtomExpr nam) _ = AttributeAtomExpr nam
1287−
1176+processAtomExpr (NakedAtomExpr atom) _ = NakedAtomExpr atom
1288−-- s := s union t
1177+processAtomExpr (FunctionAtomExpr fName atomExprs ()) tid = FunctionAtomExpr fName (fmap processAtomExpr tid) tid
1289−instance ResolveGraphRefTransactionMarker GraphRefRelationalExpr where
1290− resolve (MakeRelationFromExprs mAttrs tupleExprs) =
1291− MakeRelationFromExprs mAttrs <$> resolve tupleExprs
1292− resolve orig@MakeStaticRelation{} = pure orig
1293− resolve orig@ExistingRelation{} = pure orig
1294− resolve orig@(RelationVariable rvName UncommittedContextMarker) = do
1295− rvMap <- relationVariables <$> getStateContext
1296− case M.lookup rvName rvMap of
1297− Nothing -> pure orig
1298− Just resolvedRv -> resolve resolvedRv
1299− resolve orig@RelationVariable{} = pure orig
1300− resolve (Project attrNames relExpr) = Project <$> resolve attrNames <*> resolve relExpr
1301− resolve (Union exprA exprB) = Union <$> resolve exprA <*> resolve exprB
1302− resolve (Join exprA exprB) = Join <$> resolve exprA <*> resolve exprB
1303− resolve (Rename attrA attrB expr) = Rename attrA attrB <$> resolve expr
1304− resolve (Difference exprA exprB) = Difference <$> resolve exprA <*> resolve exprB
1305− resolve (Group namesA nameB expr) = Group <$> resolve namesA <*> pure nameB <*> resolve expr
1306− resolve (Ungroup nameA expr) = Ungroup nameA <$> resolve expr
1307− resolve (Restrict restrictExpr relExpr) = Restrict <$> resolve restrictExpr <*> resolve relExpr
1308− resolve (Equals exprA exprB) = Equals <$> resolve exprA <*> resolve exprB
1309− resolve (NotEquals exprA exprB) = NotEquals <$> resolve exprA <*> resolve exprB
1310− resolve (Extend extendExpr relExpr) = Extend <$> resolve extendExpr <*> resolve relExpr
1311− resolve (With withExprs relExpr) = With <$> mapM (\(nam, expr) -> (,) <$> resolve nam <*> resolve expr) withExprs <*> resolve relExpr
1313−instance ResolveGraphRefTransactionMarker GraphRefTupleExprs where
1314− resolve (TupleExprs marker tupleExprs) =
1315− TupleExprs marker <$> mapM resolve tupleExprs
1317−instance ResolveGraphRefTransactionMarker GraphRefTupleExpr where
1318− resolve (TupleExpr tupMap) = do
1319− tupMap' <- mapM (\(attrName, expr) -> (,) attrName <$> resolve expr ) (M.toList tupMap)
1320− pure (TupleExpr (M.fromList tupMap'))
1322−instance ResolveGraphRefTransactionMarker GraphRefAttributeNames where
1323− resolve orig@AttributeNames{} = pure orig
1324− resolve orig@InvertedAttributeNames{} = pure orig
1325− resolve (UnionAttributeNames namesA namesB) = UnionAttributeNames <$> resolve namesA <*> resolve namesB
1326− resolve (IntersectAttributeNames namesA namesB) = IntersectAttributeNames <$> resolve namesA <*> resolve namesB
1327− resolve (RelationalExprAttributeNames expr) = RelationalExprAttributeNames <$> resolve expr
1329−instance ResolveGraphRefTransactionMarker GraphRefRestrictionPredicateExpr where
1330− resolve TruePredicate = pure TruePredicate
1331− resolve (AndPredicate exprA exprB) = AndPredicate <$> resolve exprA <*> resolve exprB
1332− resolve (OrPredicate exprA exprB) = OrPredicate <$> resolve exprA <*> resolve exprB
1333− resolve (NotPredicate expr) = NotPredicate <$> resolve expr
1334− resolve (RelationalExprPredicate expr) = RelationalExprPredicate <$> resolve expr
1335− resolve (AtomExprPredicate expr) = AtomExprPredicate <$> resolve expr
1336− resolve (AttributeEqualityPredicate nam expr)= AttributeEqualityPredicate nam <$> resolve expr
1338−instance ResolveGraphRefTransactionMarker GraphRefExtendTupleExpr where
1339− resolve (AttributeExtendTupleExpr nam atomExpr) = AttributeExtendTupleExpr nam <$> resolve atomExpr
1341−instance ResolveGraphRefTransactionMarker GraphRefWithNameExpr where
1342− resolve orig@WithNameExpr{} = pure orig -- match uncommitted marker?
1344−instance ResolveGraphRefTransactionMarker GraphRefAtomExpr where
1345− resolve orig@AttributeAtomExpr{} = pure orig
1346− resolve orig@NakedAtomExpr{} = pure orig
1347− resolve (FunctionAtomExpr nam atomExprs marker) =
1348− FunctionAtomExpr nam <$> mapM resolve atomExprs <*> pure marker
1349− resolve (RelationAtomExpr expr) = RelationAtomExpr <$> resolve expr
1178+processAtomExpr (RelationAtomExpr expr) tid = RelationAtomExpr (processRelationalExpr expr tid)
1350− resolve (ConstructedAtomExpr dConsName atomExprs marker) =
1179+processAtomExpr (ConstructedAtomExpr dConsName atomExprs) = ConstructedAtomExpr dConsName (fmap processAtomExpr tid) tid
1351− ConstructedAtomExpr dConsName <$> mapM resolve atomExprs <*> pure marker
1180+
1352−
1181+processTupleExpr :: TupleExpr -> TransactionId -> GraphRefTupleExpr
1353−--convert series of simple Union queries into MakeStaticRelation
1182+processTupleExpr (TupleExpr tMap) tid = TupleExpr (M.map (processAtomExpr tid) tMap)
1354−-- this is especially useful for long, nested applications of Union with simple tuples
1183+
1355−-- Union (MakeRelation x y) (MakeRelation x y') -> MakeRelation x (y + y')
1184+evalGraphRefAttributeExpr :: GraphRefAttributeExpr -> TransactionGraph -> Either RelationalError Attribute
1356−
1185+evalGraphRefAttributeExpr (AttributeAndTypeNameExpr attrName tCons tid) graph = do
1357−--MakeRelationFromExprs Nothing (TupleExprs UncommittedContextMarker [TupleExpr (fromList [("name", NakedAtomExpr (TextAtom "steve"))])])
1186+ trans <- transactionForId tid graph
1358−
1187+ let tConsMap = typeConstructorMapping (concreteDatabaseContext trans)
1359−applyUnionCollapse :: GraphRefRelationalExpr -> GraphRefRelationalExpr
1188+ aType <- atomTypeForTypeConstructorValidate True tCons tConsMap M.empty
1360−applyUnionCollapse = Fold.cata opt
1189+ validateAtomType aType tConsMap
1361− where
1190+ pure (Attribute attrName aType)
1362− opt :: RelationalExprBaseF GraphRefTransactionMarker GraphRefRelationalExpr -> GraphRefRelationalExpr
1191+
1363− opt (UnionF exprA exprB) | exprA == exprB = exprA
1192+--convert AttributeExpr to GraphRefAttributeExpr
1364− opt (UnionF
1193+processAttributeExpr :: AttributeExpr -> TransactionId -> GraphRefAttributeExpr
1365− exprA@(MakeRelationFromExprs mAttrs1 tupExprs1)
1194+processAttributeExpr (AttributeAndTypeNameExpr nam tCons ()) tid = AttributeAndTypeNameExpr nam tCons tid
1366− exprB@(MakeRelationFromExprs mAttrs2 tupExprs2)) | tupExprs1 == tupExprs2 = MakeRelationFromExprs (mAttrs1 <|> mAttrs2) tupExprs1
1195+processAttributeExpr (NakedAttributeExpr attr) = NakedAttributeExpr attr
1367− | tupExprsNull tupExprs1 = exprB
1196+
1368− | tupExprsNull tupExprs2 = exprA
1197+-- convert a RelationalExpr into a GraphRefRelationalExpr
1369− opt x = Fold.embed x
1198+processRelationalExpr :: RelationalExpr -> RelationalExprState GraphRefRelationalExpr
1370− tupExprsNull (TupleExprs _ []) = True
1199+processRelationalExpr (MakeRelationFromExprs mAttrs tupleExprs) = do
1371− tupExprsNull _ = False
1200+ MakeRelationFromExprs (fmap (fmap processAttributeExpr) mAttrs) (processTupleExprs tupleExprs)
1374−--UPDATE optimization- find matching where clause in "lower" levels of renaming
1375−--update x where y=1 set (x:=5,z:=10); update x where y=1 set(x:=6,z:=11)
1377−-- update x where y=1 set (x:=6,z:=11)
1378−-- future opt: match individual attributes update x where y=1 set (x:=5); update x where y=1 set (z:=11) => update x where y=1 set (x:=5,z:=11)
1380−--strategy: try to collapse the top-level update (union (restrict pred MakeRelationFromExpr) expr) if it contains the same predicate and resultant relation
1382−--DELETE optimization
1383−-- if a restriction matches a previous restriction, combine them
1384−-- O(1) since it only scans at the top level, critical in benchmarks generating redundant deletions
1385−applyRestrictionCollapse :: GraphRefRelationalExpr -> GraphRefRelationalExpr
1386−applyRestrictionCollapse orig@(Restrict npred@(NotPredicate _) expr) =
1388− orig'@(Restrict npred'@(NotPredicate _) _) | npred == npred' -> orig'
1390−applyRestrictionCollapse expr = expr