@@ -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
@@ -16,38 +13,27 @@ import 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,60 @@ 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+currentTrans :: RelationalExprState (Either RelationalError Transaction)
110−askEnv = R.ask
90+currentTrans = do
111−
91+ tid <- elems_currentTransId <$> ask
112−mergeTuplesIntoGraphRefRelationalExprEnv :: RelationTuple -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
92+ graph <- elems_graph <$> ask
113−mergeTuplesIntoGraphRefRelationalExprEnv tupIn env =
93+ pure (transactionForId tid graph)
95+mergeTuplesIntoRelationalExprState :: RelationTuple -> RelationalExprStateElems -> RelationalExprStateElems
96+mergeTuplesIntoRelationalExprState tupIn e@RelationalExprStateElems{} =
114− env { gre_extra = new_elems }
97+ e{elems_extra = new_elems }
116 new_elems = Just (Left newTuple)
99 new_elems = Just (Left newTuple)
117− mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (envTuple env))
100+ mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (stateTuple e))
118 newTuple = mkRelationTupleFromMap mergedTupMap
101 newTuple = mkRelationTupleFromMap mergedTupMap
120−mergeAttributesIntoGraphRefRelationalExprEnv :: Attributes -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
103+mergeAttributesIntoRelationalExprState :: Attributes -> RelationalExprStateElems -> RelationalExprStateElems
121−mergeAttributesIntoGraphRefRelationalExprEnv attrsIn e = e { gre_extra = newattrs }
104+mergeAttributesIntoRelationalExprState attrsIn e@RelationalExprStateElems{} = e{elems_extra = newattrs }
123− newattrs = Just (Right (A.union attrsIn (envAttributes e)))
106+ newattrs = Just (Right (A.union attrsIn (stateAttributes e)))
125type ResultAccumName = StringType
108type ResultAccumName = StringType
@@ -130,403 +113,440 @@ data ResultAccum = ResultAccum { resultAccumFunc :: ResultAccumFunc,
130 resultAccumResult :: Relation
113 resultAccumResult :: Relation
133−data DatabaseContextEvalState = DatabaseContextEvalState {
116+data DatabaseStateElems = DatabaseStateElems {
134− dbc_context :: DatabaseContext, --new, alterable context for a new transaction
117+ context :: DatabaseContext, --new, alterable context for a new transaction
135− dbc_accum :: M.Map ResultAccumName ResultAccum,
118+ accum :: M.Map ResultAccumName ResultAccum,
136− dbc_dirty :: DirtyFlag
119+ dirty :: DirtyFlag
139−data DatabaseContextEvalEnv = DatabaseContextEvalEnv
140− { dce_transId :: TransactionId,
141− dce_graph :: TransactionGraph
144−mkDatabaseContextEvalEnv :: TransactionId -> TransactionGraph -> DatabaseContextEvalEnv
122+type DatabaseState a = State DatabaseStateElems a
145−mkDatabaseContextEvalEnv = DatabaseContextEvalEnv
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
124+getStateContext :: DatabaseState DatabaseContext
166−getStateContext = gets dbc_context
125+getStateContext = context <$> get
168−putStateContext :: DatabaseContext -> DatabaseContextEvalMonad ()
127+putStateContext :: DatabaseContext -> DatabaseState ()
169putStateContext ctx' = do
128putStateContext ctx' = do
171− put (s {dbc_context = ctx', dbc_dirty = True})
130+ 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
132+type RelationalExprState a = Reader RelationalExprStateElems a
183−gfTransForId :: TransactionId -> GraphRefRelationalExprM Transaction
134+stateElemsContext :: RelationalExprStateElems -> DatabaseContext
184−gfTransForId tid = do
135+stateElemsContext = elems_context
185− graph <- gfGraph
136+
186− lift $ except $ transactionForId tid graph
137+setStateElemsContext :: RelationalExprStateElems -> DatabaseContext -> RelationalExprStateElems
187−
138+setStateElemsContext e ctx = e { elems_context = ctx }
188−gfDatabaseContextForMarker :: GraphRefTransactionMarker -> GraphRefRelationalExprM DatabaseContext
139+
189−gfDatabaseContextForMarker (TransactionMarker transId) = concreteDatabaseContext <$> gfTransForId transId
140+--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
141+evalRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError GraphRefRelationalExpr)
191− mctx <- gre_context <$> askEnv
142+evalRelationalExpr (RelationVariable name _) = do
192− case mctx of
143+ relvarTable <- fmap (relationVariables . stateElemsContext) ask
193− Nothing -> throwError NoUncommittedContextInEvalError
144+ return $ case M.lookup name relvarTable of
194− Just ctx -> pure ctx
145+ Just res -> Right res
195−
146+ Nothing -> Left $ RelVarNotDefinedError name
196−runGraphRefRelationalExprM :: GraphRefRelationalExprEnv -> GraphRefRelationalExprM a -> Either RelationalError a
147+
197−runGraphRefRelationalExprM env m = runIdentity (runExceptT (runReaderT m env))
148+evalRelationalExpr (Project attrNames expr) = do
198−
149+ eAttrNameSet <- evalAttributeNames attrNames expr
199−freshGraphRefRelationalExprEnv :: Maybe DatabaseContext -> TransactionGraph -> GraphRefRelationalExprEnv
150+ case eAttrNameSet of
200−freshGraphRefRelationalExprEnv mctx graph = GraphRefRelationalExprEnv {
151+ Left err -> pure (Left err)
201− gre_context = mctx,
152+ Right attrNameSet -> do
202− gre_graph = graph,
153+ rel <- evalRelationalExpr expr
203− gre_extra = Nothing
154+ case rel of
204− }
155+ Right rel2 -> pure $ Right (Project (AttributeNames attrNameSet) rel2)
205−
156+ Left err -> pure $ Left err
206−gfGraph :: GraphRefRelationalExprM TransactionGraph
157+
207−gfGraph = asks gre_graph
158+evalRelationalExpr (Union exprA exprB) = do
159+ relA <- evalRelationalExpr exprA
160+ relB <- evalRelationalExpr exprB
162+ Left err -> return $ Left err
163+ Right relA2 -> case relB of
164+ Left err -> return $ Left err
165+ Right relB2 -> return $ Right (Union relA2 relB2)
167+evalRelationalExpr (Join exprA exprB) = do
168+ relA <- evalRelationalExpr exprA
169+ relB <- evalRelationalExpr exprB
171+ Left err -> return $ Left err
172+ Right relA2 -> case relB of
173+ Left err -> return $ Left err
174+ Right relB2 -> return $ Right (Join relA2 relB2)
176+evalRelationalExpr (Difference exprA exprB) = do
177+ relA <- evalRelationalExpr exprA
178+ relB <- evalRelationalExpr exprB
180+ Left err -> return $ Left err
181+ Right relA2 -> case relB of
182+ Left err -> return $ Left err
183+ Right relB2 -> return $ Right (Difference relA2 relB2)
185+evalRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
186+ case mkRelation attributeSet tupleSet of
187+ Right rel -> return $ Right (ExistingRelation rel)
188+ Left err -> return $ Left err
190+evalRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
191+ currentContext <- fmap stateElemsContext ask
192+ let tConss = typeConstructorMapping currentContext
193+ -- 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
195+ mAttrs <- case mAttrExprs of
197+ Just . A.attributesFromList <$> mapM (either throwE pure . evalAttrExpr tConss) (fromMaybe [] mAttrExprs)
198+ Nothing -> pure Nothing
199+ tuples <- mapM (liftE . evalTupleExpr mAttrs) tupleExprs
200+ let attrs = fromMaybe firstTupleAttrs mAttrs
201+ firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
202+ expr <- either throwE pure (mkRelation attrs (RelationTupleSet tuples))
203+ pure (ExistingRelation expr)
205+evalRelationalExpr (ExistingRelation rel) = pure (Right (ExistingRelation rel))
209−envContext :: RelationalExprEnv -> DatabaseContext
207+evalRelationalExpr (Rename oldAttrName newAttrName relExpr) = do
210−envContext = re_context
208+ evald <- evalRelationalExpr relExpr
210+ Right expr -> return $ Right (Rename oldAttrName newAttrName expr)
211+ Left err -> return $ Left err
212−setEnvContext :: RelationalExprEnv -> DatabaseContext -> RelationalExprEnv
213+evalRelationalExpr (Group oldAttrNames newAttrName relExpr) = do
213−setEnvContext e ctx = e { re_context = ctx }
214+ eOldAttrNameSet <- evalAttributeNames oldAttrNames relExpr
215+ case eOldAttrNameSet of
216+ Left err -> pure (Left err)
217+ Right oldAttrNameSet -> do
218+ evald <- evalRelationalExpr relExpr
220+ Right expr -> return $ Right (Group (AttributeNames oldAttrNameSet) newAttrName expr)
221+ Left err -> return $ Left err
223+evalRelationalExpr (Ungroup attrName relExpr) = do
224+ evald <- evalRelationalExpr relExpr
226+ Right expr -> return $ Right (Ungroup attrName expr)
227+ Left err -> return $ Left err
229+evalRelationalExpr (Restrict predicateExpr relExpr) = do
230+ evald <- evalRelationalExpr relExpr
231+ ePred <- processRestrictionPredicateExpr predicateExpr
233+ Left err -> return $ Left err
234+ Right expr -> case ePred of
235+ Left err -> pure (Left err)
236+ Right pred -> pure $ Right (Restrict pred expr)
238+evalRelationalExpr (Equals relExprA relExprB) = do
239+ evaldA <- evalRelationalExpr relExprA
240+ evaldB <- evalRelationalExpr relExprB
242+ Left err -> return $ Left err
243+ Right exprA -> case evaldB of
244+ Left err -> return $ Left err
245+ Right exprB -> return $ Right (Equals exprA exprB)
247+evalRelationalExpr (With views mainExpr) = do
250+ let addScopedView ctx (vname,vexpr) = if vname `M.member` relationVariables ctx then
251+ Left (RelVarAlreadyDefinedError vname)
253+ case runState (evalDatabaseContextExpr (Assign vname vexpr)) (freshDatabaseState ctx) of
254+ (Left err,_) -> Left err
255+ (Right (), (ctx',_,_)) -> Right ctx'
257+ case foldM addScopedView (stateElemsContext rstate) views of
258+ Left err -> return $ Left err
260+ let evalMainExpr expr = runReader (evalRelationalExpr expr) (RelationalExprStateElems ctx'')
261+ case evalMainExpr mainExpr of
262+ Left err -> return $ Left err
263+ Right rel -> return $ Right rel
265+--warning: copy-pasta from above- refactor
266+evalRelationalExpr (NotEquals relExprA relExprB) = do
267+ evaldA <- evalRelationalExpr relExprA
268+ evaldB <- evalRelationalExpr relExprB
270+ Left err -> return $ Left err
271+ Right exprA -> case evaldB of
272+ Left err -> return $ Left err
273+ Right exprB -> return $ Right (NotEquals exprA exprB)
275+-- extending a relation adds a single attribute with the results of the per-tuple expression evaluated
276+evalRelationalExpr (Extend tupleExpression relExpr) = do
277+ eExpr <- evalRelationalExpr relExpr
279+ Left err -> pure (Left err)
281+ eTupProc <- processExtendTupleExpr tupleExpression
283+ Left err -> pure (Left err)
284+ Right tupProc -> pure (Right (Extend tupProc expr))
215--helper function to process relation variable creation/assignment
286--helper function to process relation variable creation/assignment
216−setRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
287+setRelVar :: RelVarName -> GraphRefRelationalExpr -> TransactionId -> TransactionGraph -> DatabaseState (Either RelationalError ())
217−setRelVar relVarName relExpr = do
288+setRelVar relVarName relExpr transId graph = do
218 currentContext <- getStateContext
289 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
290+ let newRelVars = M.insert relVarName relExpr $ relationVariables currentContext
222 potentialContext = currentContext { relationVariables = newRelVars }
291 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
292+ --determine when to check constraints
228− graph <- dbcGraph
293+
230− case checkConstraints potentialContext tid graph of
294+ case checkConstraints potentialContext transId graph of
231− Left err -> dbErr err
295+ Left err -> pure (Left err)
232− Right _ -> putStateContext potentialContext
297+ putStateContext potentialContext
233−
298+ 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
300-- 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 ()
301+deleteRelVar :: RelVarName -> DatabaseState (Either RelationalError ())
239deleteRelVar relVarName = do
302deleteRelVar relVarName = do
240 currContext <- getStateContext
303 currContext <- getStateContext
241 let relVars = relationVariables currContext
304 let relVars = relationVariables currContext
242 if M.notMember relVarName relVars then
305 if M.notMember relVarName relVars then
243− pure ()
306+ pure (Right ())
245 let newRelVars = M.delete relVarName relVars
308 let newRelVars = M.delete relVarName relVars
246 newContext = currContext { relationVariables = newRelVars }
309 newContext = currContext { relationVariables = newRelVars }
247 putStateContext newContext
310 putStateContext newContext
248− pure ()
311+ pure (Right ())
250−evalGraphRefDatabaseContextExpr :: GraphRefDatabaseContextExpr -> DatabaseContextEvalMonad ()
313+evalDatabaseContextExpr :: DatabaseContextExpr -> TransactionId -> TransactionGraph -> DatabaseState (Either RelationalError ())
251−evalGraphRefDatabaseContextExpr NoOperation = pure ()
314+evalDatabaseContextExpr NoOperation _ _ = pure (Right ())
253−evalGraphRefDatabaseContextExpr (Define relVarName attrExprs) = do
316+evalDatabaseContextExpr (Define relVarName attrExprs) transId graph = do
254− context <- getStateContext
255 relvars <- fmap relationVariables getStateContext
317 relvars <- fmap relationVariables getStateContext
256 tConss <- fmap typeConstructorMapping getStateContext
318 tConss <- fmap typeConstructorMapping getStateContext
257− graph <- dbcGraph
319+ let eAttrs = map (evalAttrExpr tConss) attrExprs
258− let eAttrs = runGraphRefRelationalExprM gfEnv (mapM evalGraphRefAttrExpr attrExprs)
320+ attrErrs = lefts eAttrs
259− gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
321+ attrsList = rights eAttrs
260− case eAttrs of
322+ if not (null attrErrs) then
261− Left err -> dbErr err
323+ pure (Left (someErrors attrErrs))
262− Right attrsList -> do
324+ else do
263− lift $ except $ validateAttributes tConss (A.attributesFromList attrsList)
325+ let atomTypeErrs = lefts $ map ((`validateAtomType` tConss) . A.atomType) attrsList
326+ if not (null atomTypeErrs) then
327+ pure (Left (someErrors atomTypeErrs))
264− case M.member relVarName relvars of
329+ case M.member relVarName relvars of
265− True -> dbErr (RelVarAlreadyDefinedError relVarName)
330+ True -> pure (Left (RelVarAlreadyDefinedError relVarName))
266− False -> setRelVar relVarName (ExistingRelation emptyRelation)
331+ False -> setRelVar relVarName (ExistingRelation emptyRelation) transId graph >> pure (Right ())
268 attrs = A.attributesFromList attrsList
333 attrs = A.attributesFromList attrsList
269 emptyRelation = Relation attrs emptyTupleSet
334 emptyRelation = Relation attrs emptyTupleSet
271−evalGraphRefDatabaseContextExpr (Undefine relVarName) = deleteRelVar relVarName
336+evalDatabaseContextExpr (Undefine relVarName) _ _ = deleteRelVar relVarName
273−evalGraphRefDatabaseContextExpr (Assign relVarName expr) = do
338+evalDatabaseContextExpr (Assign relVarName expr) transId graph = do
274− graph <- re_graph <$> dbcRelationalExprEnv
275 context <- getStateContext
339 context <- getStateContext
276 let existingRelVar = M.lookup relVarName (relationVariables context)
340 let existingRelVar = M.lookup relVarName (relationVariables context)
277− reEnv = freshGraphRefRelationalExprEnv (Just context) graph
341+ relExprState = mkRelationalExprState context transId graph
278− eNewExprType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr expr)
279 case existingRelVar of
342 case existingRelVar of
280 Nothing -> do
343 Nothing -> do
281− case runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr expr) of
344+ let ervExpr = runReader (evalRelationalExpr expr) relExprState
282− Left err -> dbErr err
346+ Left err -> pure (Left err)
284− lift $ except $ validateAttributes (typeConstructorMapping context) (attributes reltype)
285− setRelVar relVarName expr
347+ Right rvExpr -> setRelVar relVarName rvExpr transId graph
286 Just existingRel -> do
348 Just existingRel -> do
287− let eExpectedType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr existingRel)
349+ let eExpectedType = runReader (typeForGraphRefRelationalExpr existingRel) (mkRelationalExprState context transId graph)
350+ eNewExprType = runReader (typeForRelationalExpr expr) relExprState
288 case eExpectedType of
351 case eExpectedType of
289− Left err -> dbErr err
352+ Left err -> pure (Left err)
290 Right expectedType ->
353 Right expectedType ->
291 case eNewExprType of
354 case eNewExprType of
292− Left err -> dbErr err
355+ Left err -> pure (Left err)
293 Right newExprType -> do
356 Right newExprType -> do
294 if newExprType == expectedType then do
357 if newExprType == expectedType then do
295− lift $ except $ validateAttributes (typeConstructorMapping context) (attributes newExprType)
358+ let ervExpr = runReader (evalRelationalExpr expr) relExprState
360+ Left err -> pure (Left err)
296− setRelVar relVarName expr
361+ Right rvExpr -> setRelVar relVarName rvExpr transId graph
298− dbErr (RelationTypeMismatchError (attributes expectedType) (attributes newExprType))
363+ pure (Left (RelationTypeMismatchError (attributes expectedType) (attributes newExprType)))
300−evalGraphRefDatabaseContextExpr (Insert relVarName relExpr) = do
365+evalDatabaseContextExpr (Insert relVarName relExpr) tid graph =
301− gfExpr <- relVarByName relVarName
366+ evalDatabaseContextExpr (Assign relVarName (Union (RelationVariable relVarName ())
302− let optExpr = applyUnionCollapse (Union
367+ relExpr)) tid graph
305− evalGraphRefDatabaseContextExpr (Assign relVarName optExpr)
307−evalGraphRefDatabaseContextExpr (Delete relVarName predicate) = do
369+evalDatabaseContextExpr (Delete relVarName predicate) transId graph = do
308− gfExpr <- relVarByName relVarName
370+ ctx <- getStateContext
309− let optExpr = applyRestrictionCollapse (Restrict (NotPredicate predicate) gfExpr)
371+ let rv = RelationVariable relVarName transId
310− setRelVar relVarName optExpr
372+ rvState = mkRelationalExprState ctx transId graph
373+ case runReader (processRestrictionPredicateExpr predicate) rvState of
374+ Left err -> pure (Left err)
375+ Right graphRefPredicate ->
376+ setRelVar relVarName (Restrict (NotPredicate graphRefPredicate) rv) transId graph
312--union of restricted+updated portion and the unrestricted+unupdated portion
378--union of restricted+updated portion and the unrestricted+unupdated portion
313−evalGraphRefDatabaseContextExpr (Update relVarName atomExprMap pred') = do
379+evalDatabaseContextExpr (Update relVarName atomExprMap restrictionPredicateExpr) transId graph = do
314− rvExpr <- relVarByName relVarName
315− graph <- re_graph <$> dbcRelationalExprEnv
316 context <- getStateContext
380 context <- getStateContext
317− let reEnv = freshGraphRefRelationalExprEnv (Just context) graph
381+ let rvState = mkRelationalExprState context transId graph
318− --get the current attributes name in the relvar to ensure that we don't conflict when renaming
382+ relVarTable = relationVariables context
319− eExprType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr rvExpr)
383+ case runReader (processRestrictionPredicateExpr restrictionPredicateExpr) rvState of
320− exprType' <- case eExprType of
384+ Left err -> pure (Left err)
321− Left err -> throwError err
385+ Right graphRefPredicate ->
322− Right t -> pure t
386+ case M.lookup relVarName relVarTable of
323− let unrestrictedPortion = Restrict (NotPredicate pred') rvExpr
387+ Nothing -> pure (Left (RelVarNotDefinedError relVarName))
324− tmpAttr = tmpAttrC 1
388+ Just existingRvExpr -> do
325− tmpAttrC :: Int -> AttributeName -> AttributeName
389+ let unrestrictedPortion = Restrict (NotPredicate graphRefPredicate) rv
326− tmpAttrC c attr =
390+ rv = RelationVariable relVarName transId
327− let tmpAttrName = "_tmp_" <> T.pack (show c) <> attr in
391+ tmpAttr attr = "_tmp_" <> attr --this could certainly be improved to verify that there is no attribute name conflict
328− if tmpAttrName `S.member` A.attributeNameSet (attributes exprType') then
332− updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)
392+ updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)
333− projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)
393+ projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)
334− restrictedPortion = Restrict pred' rvExpr
394+ restrictedPortion = Restrict graphRefPredicate
335− updated = foldr (\(oldname, atomExpr) accum ->
395+ updated = foldr (\(oldname, atomExpr) accum ->
336− let procAtomExpr = runProcessExprM UncommittedContextMarker (processAtomExpr atomExpr) in
396+ let procAtomExpr = runReader (processAtomExpr atomExpr) rvState in
337 updateAttr oldname procAtomExpr accum
397 updateAttr oldname procAtomExpr accum
338− ) restrictedPortion (M.toList atomExprMap)
398+ ) rv (M.toList atomExprMap)
339 -- the atomExprMap could reference other attributes, so we must perform multi-pass folds
399 -- the atomExprMap could reference other attributes, so we must perform multi-pass folds
340− updatedPortion = foldr projectAndRename updated (M.keys atomExprMap)
400+ updatedPortion = foldr projectAndRename updated (M.keys atomExprMap)
341− setRelVar relVarName (Union unrestrictedPortion updatedPortion)
401+ setRelVar relVarName (Union unrestrictedPortion updatedPortion) transId graph
343−evalGraphRefDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do
403+evalDatabaseContextExpr (AddInclusionDependency newDepName newDep) transId graph = do
344 currContext <- getStateContext
404 currContext <- getStateContext
345− transId <- dbcTransId
347 let currDeps = inclusionDependencies currContext
405 let currDeps = inclusionDependencies currContext
348 newDeps = M.insert newDepName newDep currDeps
406 newDeps = M.insert newDepName newDep currDeps
349 if M.member newDepName currDeps then
407 if M.member newDepName currDeps then
350− dbErr (InclusionDependencyNameInUseError newDepName)
408+ pure (Left (InclusionDependencyNameInUseError newDepName))
352 let potentialContext = currContext { inclusionDependencies = newDeps }
410 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
411 case checkConstraints potentialContext transId graph of
356− Left err -> dbErr err
412+ Left err -> pure (Left err)
357− Right _ ->
413+ Right _ -> do
358 putStateContext potentialContext
414 putStateContext potentialContext
360−evalGraphRefDatabaseContextExpr (RemoveInclusionDependency depName) = do
417+evalDatabaseContextExpr (RemoveInclusionDependency depName) _ _ = do
361 currContext <- getStateContext
418 currContext <- getStateContext
362 let currDeps = inclusionDependencies currContext
419 let currDeps = inclusionDependencies currContext
363 newDeps = M.delete depName currDeps
420 newDeps = M.delete depName currDeps
364 if M.notMember depName currDeps then
421 if M.notMember depName currDeps then
365− dbErr (InclusionDependencyNameNotInUseError depName)
422+ pure (Left (InclusionDependencyNameNotInUseError depName))
367 putStateContext $ currContext {inclusionDependencies = newDeps }
424 putStateContext $ currContext {inclusionDependencies = newDeps }
369-- | Add a notification which will send the resultExpr when triggerExpr changes between commits.
427-- | Add a notification which will send the resultExpr when triggerExpr changes between commits.
370−evalGraphRefDatabaseContextExpr (AddNotification notName triggerExpr resultOldExpr resultNewExpr) = do
428+evalDatabaseContextExpr (AddNotification notName triggerExpr resultOldExpr resultNewExpr) _ _ = do
371 currentContext <- getStateContext
429 currentContext <- getStateContext
372 let nots = notifications currentContext
430 let nots = notifications currentContext
373 if M.member notName nots then
431 if M.member notName nots then
374− dbErr (NotificationNameInUseError notName)
432+ pure (Left (NotificationNameInUseError notName))
376 let newNotifications = M.insert notName newNotification nots
434 let newNotifications = M.insert notName newNotification nots
377 newNotification = Notification { changeExpr = triggerExpr,
435 newNotification = Notification { changeExpr = triggerExpr,
378 reportOldExpr = resultOldExpr,
436 reportOldExpr = resultOldExpr,
379 reportNewExpr = resultNewExpr}
437 reportNewExpr = resultNewExpr}
380 putStateContext $ currentContext { notifications = newNotifications }
438 putStateContext $ currentContext { notifications = newNotifications }
382−evalGraphRefDatabaseContextExpr (RemoveNotification notName) = do
441+evalDatabaseContextExpr (RemoveNotification notName) _ _ = do
383 currentContext <- getStateContext
442 currentContext <- getStateContext
384 let nots = notifications currentContext
443 let nots = notifications currentContext
385 if M.notMember notName nots then
444 if M.notMember notName nots then
386− dbErr (NotificationNameNotInUseError notName)
445+ pure (Left (NotificationNameNotInUseError notName))
388 let newNotifications = M.delete notName nots
447 let newNotifications = M.delete notName nots
389 putStateContext $ currentContext { notifications = newNotifications }
448 putStateContext $ currentContext { notifications = newNotifications }
392-- | Adds type and data constructors to the database context.
451-- | Adds type and data constructors to the database context.
393-- validate that the type *and* constructor names are unique! not yet implemented!
452-- validate that the type *and* constructor names are unique! not yet implemented!
394−evalGraphRefDatabaseContextExpr (AddTypeConstructor tConsDef dConsDefList) = do
453+evalDatabaseContextExpr (AddTypeConstructor tConsDef dConsDefList) _ _ = do
395 currentContext <- getStateContext
454 currentContext <- getStateContext
396 let oldTypes = typeConstructorMapping currentContext
455 let oldTypes = typeConstructorMapping currentContext
397 tConsName = TCD.name tConsDef
456 tConsName = TCD.name tConsDef
398 -- validate that the constructor's types exist
457 -- validate that the constructor's types exist
399− case validateTypeConstructorDef tConsDef dConsDefList oldTypes of
458+ case validateTypeConstructorDef tConsDef dConsDefList of
400− Left err -> throwError err
459+ errs@(_:_) -> pure (Left (someErrors errs))
401− Right () | T.null tConsName || not (isUpper (T.head tConsName)) -> dbErr (InvalidAtomTypeName tConsName)
460+ [] | T.null tConsName || not (isUpper (T.head tConsName)) -> pure (Left (InvalidAtomTypeName tConsName))
402− | isJust (findTypeConstructor tConsName oldTypes) -> dbErr (AtomTypeNameInUseError tConsName)
461+ | isJust (findTypeConstructor tConsName oldTypes) -> pure (Left (AtomTypeNameInUseError tConsName))
403 | otherwise -> do
462 | otherwise -> do
404 let newTypes = oldTypes ++ [(tConsDef, dConsDefList)]
463 let newTypes = oldTypes ++ [(tConsDef, dConsDefList)]
405 putStateContext $ currentContext { typeConstructorMapping = newTypes }
464 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.
467-- | 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
468+evalDatabaseContextExpr (RemoveTypeConstructor tConsName) _ _ = do
409 currentContext <- getStateContext
469 currentContext <- getStateContext
410 let oldTypes = typeConstructorMapping currentContext
470 let oldTypes = typeConstructorMapping currentContext
411 if isNothing (findTypeConstructor tConsName oldTypes) then
471 if isNothing (findTypeConstructor tConsName oldTypes) then
412− dbErr (AtomTypeNameNotInUseError tConsName)
472+ pure (Left (AtomTypeNameNotInUseError tConsName))
414 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes
474 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes
415 putStateContext $ currentContext { typeConstructorMapping = newTypes }
475 putStateContext $ currentContext { typeConstructorMapping = newTypes }
417−evalGraphRefDatabaseContextExpr (MultipleExpr exprs) =
478+evalDatabaseContextExpr (MultipleExpr exprs) transId graph = do
418 --the multiple expressions must pass the same context around- not the old unmodified context
479 --the multiple expressions must pass the same context around- not the old unmodified context
419− mapM_ evalGraphRefDatabaseContextExpr exprs
480+ evald <- forM exprs (\expr -> evalDatabaseContextExpr expr transId graph)
420−
481+ --some lifting magic needed here
483+ [] -> pure (Right ())
484+ errs -> pure (Left (someErrors errs))
421−evalGraphRefDatabaseContextExpr (RemoveAtomFunction funcName) = do
486+evalDatabaseContextExpr (RemoveAtomFunction funcName) _ _ = do
422 currentContext <- getStateContext
487 currentContext <- getStateContext
423 let atomFuncs = atomFunctions currentContext
488 let atomFuncs = atomFunctions currentContext
424 case atomFunctionForName funcName atomFuncs of
489 case atomFunctionForName funcName atomFuncs of
425− Left err -> dbErr err
490+ Left err -> pure (Left err)
427− if isScriptedAtomFunction realFunc then do
491+ Right realFunc -> if isScriptedAtomFunction realFunc then do
428− let updatedFuncs = HS.delete realFunc atomFuncs
492+ let updatedFuncs = HS.delete realFunc atomFuncs
429− putStateContext (currentContext {atomFunctions = updatedFuncs })
493+ putStateContext (currentContext {atomFunctions = updatedFuncs })
431− dbErr (PrecompiledFunctionRemoveError funcName)
496+ pure (Left (PrecompiledFunctionRemoveError funcName))
433−evalGraphRefDatabaseContextExpr (RemoveDatabaseContextFunction funcName) = do
498+evalDatabaseContextExpr (RemoveDatabaseContextFunction funcName) _ _ = do
434 context <- getStateContext
499 context <- getStateContext
435 let dbcFuncs = dbcFunctions context
500 let dbcFuncs = dbcFunctions context
436 case databaseContextFunctionForName funcName dbcFuncs of
501 case databaseContextFunctionForName funcName dbcFuncs of
437− Left err -> dbErr err
502+ Left err -> pure (Left err)
439− if isScriptedDatabaseContextFunction realFunc then do
503+ Right realFunc -> if isScriptedDatabaseContextFunction realFunc then do
440− let updatedFuncs = HS.delete realFunc dbcFuncs
504+ let updatedFuncs = HS.delete realFunc dbcFuncs
441− putStateContext (context { dbcFunctions = updatedFuncs })
505+ putStateContext (context { dbcFunctions = updatedFuncs })
443− dbErr (PrecompiledFunctionRemoveError funcName)
508+ pure (Left (PrecompiledFunctionRemoveError funcName))
445−evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) = do
510+evalDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) transId graph = do
446 context <- getStateContext
511 context <- getStateContext
448 --resolve atom arguments
512 --resolve atom arguments
449− let eAtomTypes = mapM (runGraphRefRelationalExprM gfEnv . typeForGraphRefAtomExpr emptyAttributes) atomArgExprs
513+ let relExprState = mkRelationalExprState context transId graph
514+ eAtomTypes = map (\atomExpr -> runReader (typeFromAtomExpr emptyAttributes atomExpr) relExprState) atomArgExprs
450 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)
515 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)
451− gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
452 case eFunc of
516 case eFunc of
453− Left err -> dbErr err
517+ Left err -> pure (Left err)
454 Right func -> do
518 Right func -> do
455 let expectedArgCount = length (dbcFuncType func)
519 let expectedArgCount = length (dbcFuncType func)
456 actualArgCount = length atomArgExprs
520 actualArgCount = length atomArgExprs
457 if expectedArgCount /= actualArgCount then
521 if expectedArgCount /= actualArgCount then
458− dbErr (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
522+ pure (Left (FunctionArgumentCountMismatchError expectedArgCount actualArgCount))
460 --check that the atom types are valid
524 --check that the atom types are valid
461− case eAtomTypes of
525+ case lefts eAtomTypes of
462− Left err -> dbErr err
526+ _:_ -> pure (Left (someErrors (lefts eAtomTypes)))
463− Right atomTypes -> do
527+ [] -> do
464− let mValidTypes = zipWith (\ expType actType
528+ let atomTypes = rights eAtomTypes
465− -> case atomTypeVerify expType actType of
529+ let mValidTypes = map (\(expType, actType) -> case atomTypeVerify expType actType of
466− Left err -> Just err
530+ Left err -> Just err
468− (dbcFuncType func) atomTypes
531+ Right _ -> Nothing) (zip (dbcFuncType func) atomTypes)
469 typeErrors = catMaybes mValidTypes
532 typeErrors = catMaybes mValidTypes
470− eAtomArgs = map (runGraphRefRelationalExprM gfEnv . evalGraphRefAtomExpr emptyTuple) atomArgExprs
533+ eAtomArgs = unimplemented
534+ --eAtomArgs = map (\arg -> runReader (evalAtomExpr emptyTuple arg) relExprState) atomArgExprs
471 if length (lefts eAtomArgs) > 1 then
535 if length (lefts eAtomArgs) > 1 then
472− dbErr (someErrors (lefts eAtomArgs))
536+ pure (Left (someErrors (lefts eAtomArgs)))
473 else if not (null typeErrors) then
537 else if not (null typeErrors) then
474− dbErr (someErrors typeErrors)
538+ pure (Left (someErrors typeErrors))
476 case evalDatabaseContextFunction func (rights eAtomArgs) context of
540 case evalDatabaseContextFunction func (rights eAtomArgs) context of
477− Left err -> dbErr err
541+ Left err -> pure (Left err)
478− Right newContext -> putStateContext newContext
542+ Right newContext -> putStateContext newContext >> pure (Right ())
479−data DatabaseContextIOEvalEnv = DatabaseContextIOEvalEnv
543+
480− { dbcio_transId :: TransactionId,
544+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
545+evalDatabaseContextIOExpr mScriptSession currentContext _ _ (AddAtomFunction funcName funcType script) =
524− eScriptSession <- requireScriptSession
546+ case mScriptSession of
525− currentContext <- getDBCIOContext
547+ Nothing -> pure (Left (ScriptError ScriptCompilationDisabledError))
526− case eScriptSession of
527− Left err -> pure (Left err)
528− Right scriptSession -> do
548+ Just scriptSession -> do
529− res <- liftIO $ try $ runGhc (Just libdir) $ do
549+ res <- try $ runGhc (Just libdir) $ do
530 setSession (hscEnv scriptSession)
550 setSession (hscEnv scriptSession)
531 let atomFuncs = atomFunctions currentContext
551 let atomFuncs = atomFunctions currentContext
532 case extractAtomFunctionType funcType of
552 case extractAtomFunctionType funcType of
@@ -552,13 +572,12 @@ evalGraphRefDatabaseContextIOExpr (AddAtomFunction funcName funcType script) = d
552 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
572 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
553 Right eContext -> case eContext of
573 Right eContext -> case eContext of
554 Left err -> pure (Left err)
574 Left err -> pure (Left err)
555− Right context' -> putDBCIOContext context'
575+ Right context' -> pure (Right context')
556−evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType script) = do
577+evalDatabaseContextIOExpr mScriptSession currentContext _ _ (AddDatabaseContextFunction funcName funcType script) =
557− eScriptSession <- requireScriptSession
578+ case mScriptSession of
558− currentContext <- getDBCIOContext
579+ Nothing -> pure (Left (ScriptError ScriptCompilationDisabledError))
559− case eScriptSession of
560− Left err -> pure (Left err)
561− Right scriptSession -> do
580+ Just scriptSession -> do
562 --validate that the function signature is of the form x -> y -> ... -> DatabaseContext -> DatabaseContext
581 --validate that the function signature is of the form x -> y -> ... -> DatabaseContext -> DatabaseContext
563 let last2Args = reverse (take 2 (reverse funcType))
582 let last2Args = reverse (take 2 (reverse funcType))
564 atomArgs = take (length funcType - 2) funcType
583 atomArgs = take (length funcType - 2) funcType
@@ -568,7 +587,7 @@ evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType
568 if last2Args /= [ADTypeConstructor "DatabaseContext" [], dbContextTypeCons] then
587 if last2Args /= [ADTypeConstructor "DatabaseContext" [], dbContextTypeCons] then
569 pure (Left (ScriptError (TypeCheckCompilationError expectedType actualType)))
588 pure (Left (ScriptError (TypeCheckCompilationError expectedType actualType)))
571− res <- liftIO $ try $ runGhc (Just libdir) $ do
590+ res <- try $ runGhc (Just libdir) $ do
572 setSession (hscEnv scriptSession)
591 setSession (hscEnv scriptSession)
573 eCompiledFunc <- compileScript (dbcFunctionBodyType scriptSession) script
592 eCompiledFunc <- compileScript (dbcFunctionBodyType scriptSession) script
574 pure $ case eCompiledFunc of
593 pure $ case eCompiledFunc of
@@ -593,86 +612,79 @@ evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType
593 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
612 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
594 Right eContext -> case eContext of
613 Right eContext -> case eContext of
595 Left err -> pure (Left err)
614 Left err -> pure (Left err)
596− Right context' -> putDBCIOContext context'
615+ Right context' -> pure (Right context')
597−evalGraphRefDatabaseContextIOExpr (LoadAtomFunctions modName funcName modPath) = do
616+evalDatabaseContextIOExpr _ currentContext _ _ (LoadAtomFunctions modName funcName modPath) = do
598− currentContext <- getDBCIOContext
599− eLoadFunc <- liftIO $ loadAtomFunctions (T.unpack modName) (T.unpack funcName) modPath
617+ eLoadFunc <- loadAtomFunctions (T.unpack modName) (T.unpack funcName) modPath
600 case eLoadFunc of
618 case eLoadFunc of
601 Left LoadSymbolError -> pure (Left LoadFunctionError)
619 Left LoadSymbolError -> pure (Left LoadFunctionError)
602 Right atomFunctionListFunc -> let newContext = currentContext { atomFunctions = mergedFuncs }
620 Right atomFunctionListFunc -> let newContext = currentContext { atomFunctions = mergedFuncs }
603 mergedFuncs = HS.union (atomFunctions currentContext) (HS.fromList atomFunctionListFunc)
621 mergedFuncs = HS.union (atomFunctions currentContext) (HS.fromList atomFunctionListFunc)
604− in putDBCIOContext newContext
622+ in pure (Right newContext)
605−evalGraphRefDatabaseContextIOExpr (LoadDatabaseContextFunctions modName funcName modPath) = do
623+evalDatabaseContextIOExpr _ currentContext _ _ (LoadDatabaseContextFunctions modName funcName modPath) = do
606− currentContext <- getDBCIOContext
607− eLoadFunc <- liftIO $ loadDatabaseContextFunctions (T.unpack modName) (T.unpack funcName) modPath
624+ eLoadFunc <- loadDatabaseContextFunctions (T.unpack modName) (T.unpack funcName) modPath
608 case eLoadFunc of
625 case eLoadFunc of
609 Left LoadSymbolError -> pure (Left LoadFunctionError)
626 Left LoadSymbolError -> pure (Left LoadFunctionError)
610 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }
627 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }
611 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)
628 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)
612− in putDBCIOContext newContext
629+ in pure (Right newContext)
614−evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs range) = do
631+evalDatabaseContextIOExpr _ currentContext transId graph (CreateArbitraryRelation relVarName attrExprs range) =
616− currentContext <- getDBCIOContext
633+ 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)
634+ (Left err,_) -> pure (Left err)
624− Right dbstate -> do
635+ (Right (), elems) -> do
626 let existingRelVar = M.lookup relVarName relVarTable
637 let existingRelVar = M.lookup relVarName relVarTable
627− relVarTable = relationVariables (dbc_context dbstate)
638+ relVarTable = relationVariables (context elems)
628 case existingRelVar of
639 case existingRelVar of
629 Nothing -> pure $ Left (RelVarNotDefinedError relVarName)
640 Nothing -> pure $ Left (RelVarNotDefinedError relVarName)
630 Just existingRel -> do
641 Just existingRel -> do
631− let gfEnv = freshGraphRefRelationalExprEnv (Just currentContext) graph
632− case runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr existingRel) of
642+ case runReader (typeForGraphRefRelationalExpr existingRel) (mkRelationalExprState currentContext transId graph) of
633 Left err -> pure (Left err)
643 Left err -> pure (Left err)
634 Right relType -> do
644 Right relType -> do
635 let expectedAttributes = attributes relType
645 let expectedAttributes = attributes relType
636− tcMap = typeConstructorMapping (dbc_context dbstate)
646+ tcMap = typeConstructorMapping (context elems)
637− eitherRel <- liftIO $ generate $ runReaderT (arbitraryRelation expectedAttributes range) tcMap
647+ eitherRel <- generate $ runReaderT (arbitraryRelation expectedAttributes range) tcMap
638 case eitherRel of
648 case eitherRel of
639 Left err -> pure $ Left err
649 Left err -> pure $ Left err
640 Right rel ->
650 Right rel ->
641− case runDatabaseContextEvalMonad currentContext evalEnv (setRelVar relVarName (ExistingRelation rel)) of
651+ case runState (setRelVar relVarName (ExistingRelation rel) transId graph) elems of
642− Left err -> pure (Left err)
652+ (Left err,_) -> pure (Left err)
643− Right dbstate' -> putDBCIOContext (dbc_context dbstate')
653+ (Right (), elems') -> pure $ Right (context elems)
655+updateTupleWithAtomExprs :: M.Map AttributeName AtomExpr -> DatabaseContext -> TransactionGraph -> RelationTuple -> Either RelationalError RelationTuple
656+updateTupleWithAtomExprs exprMap context graph tupIn = do
657+ --resolve all atom exprs
658+ atomsAssoc <- mapM (\(attrName, atomExpr) -> do
659+ let atom = unimplemented
660+ --atom <- runReader (evalAtomExpr tupIn atomExpr) (mkRelationalExprState context graph)
661+ pure (attrName, atom)
662+ ) (M.toList exprMap)
663+ pure (updateTupleWithAtoms (M.fromList atomsAssoc) tupIn)
645--run verification on all constraints
665--run verification on all constraints
646checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()
666checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()
647−checkConstraints context transId graph@(TransactionGraph graphHeads transSet) = do
667+checkConstraints context transId graph@(TransactionGraph graphHeads transSet) =
648 mapM_ (uncurry checkIncDep) (M.toList deps)
668 mapM_ (uncurry checkIncDep) (M.toList deps)
650 potentialGraph = TransactionGraph graphHeads (S.insert tempTrans transSet)
670 potentialGraph = TransactionGraph graphHeads (S.insert tempTrans transSet)
651 tempStamp = UTCTime { utctDay = fromGregorian 2000 1 1,
671 tempStamp = UTCTime { utctDay = fromGregorian 2000 1 1,
652 utctDayTime = secondsToDiffTime 0 }
672 utctDayTime = secondsToDiffTime 0 }
653 tempSchemas = Schemas context M.empty
673 tempSchemas = Schemas context M.empty
654− tempTrans = Transaction U.nil tempTransInfo tempSchemas
655− tempTransInfo = TransactionInfo { parents = transId NE.:| [],
674+ tempTrans = Transaction U.nil (TransactionInfo (transId NE.:| []) tempStamp) tempSchemas
660 deps = inclusionDependencies context
676 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
677+ eval expr = evalReader (evalRelationalExpr expr)
678+ evalReader f = runReader f (mkRelationalExprState context transId graph)
662 checkIncDep depName (InclusionDependency subsetExpr supersetExpr) = do
679 checkIncDep depName (InclusionDependency subsetExpr supersetExpr) = do
663− let process = runProcessExprM UncommittedContextMarker
664− gfSubsetExpr = process (processRelationalExpr subsetExpr)
680+ let gfSubsetExpr = evalReader (processRelationalExpr subsetExpr)
665− gfSupersetExpr = process (processRelationalExpr supersetExpr)
681+ 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.
682 --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
683+ typeSub <- evalReader (typeForRelationalExpr subsetExpr)
668− runGfRel = runGraphRefRelationalExprM gfEnv
684+ typeSuper <- evalReader (typeForRelationalExpr supersetExpr)
669− typeSub <- runGfRel (typeForGraphRefRelationalExpr gfSubsetExpr)
670− typeSuper <- runGfRel (typeForGraphRefRelationalExpr gfSupersetExpr)
671 when (typeSub /= typeSuper) (Left (RelationTypeMismatchError (attributes typeSub) (attributes typeSuper)))
685 when (typeSub /= typeSuper) (Left (RelationTypeMismatchError (attributes typeSub) (attributes typeSuper)))
672 let checkExpr = Equals gfSupersetExpr (Union gfSubsetExpr gfSupersetExpr)
686 let checkExpr = Equals gfSupersetExpr (Union gfSubsetExpr gfSupersetExpr)
673− gfEvald = runGraphRefRelationalExprM gfEnv' (evalGraphRefRelationalExpr checkExpr)
687+ case evalGraphRefRelationalExpr checkExpr potentialGraph of
674− gfEnv' = freshGraphRefRelationalExprEnv (Just context) potentialGraph
676 Left err -> Left err
688 Left err -> Left err
677 Right resultRel -> if resultRel == relationTrue then
689 Right resultRel -> if resultRel == relationTrue then
@@ -682,81 +694,87 @@ 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
694-- 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
695-- furthermore, the type of a relational expression is the resultant header of the evaluated empty-tupled relation
685−typeForRelationalExpr :: RelationalExpr -> RelationalExprM Relation
697+typeForRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError Relation)
686typeForRelationalExpr expr = do
698typeForRelationalExpr expr = do
687 --replace the relationVariables context element with a cloned set of relation devoid of tuples
699 --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
700 --evalRelationalExpr could still return an existing relation with tuples, so strip them
690− context <- reContext
691− let gfExpr = runProcessExprM UncommittedContextMarker (processRelationalExpr expr)
701+ gfExpr <- processRelationalExpr expr
692− gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
693− runGf = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
702+ typeForGraphRefRelationalExpr gfExpr
694− lift $ except runGf
703+
704+--returns a database context with all tuples removed
705+--this is useful for type checking and optimization
707+contextWithEmptyTupleSets :: DatabaseContext -> DatabaseContext
708+contextWithEmptyTupleSets contextIn = contextIn { relationVariables = relVars }
710+ relVars = M.map (\rel -> ExistingRelation (Relation (attributes rel) emptyTupleSet)) (relationVariables contextIn)
696liftE :: (Monad m) => m (Either a b) -> ExceptT a m b
713liftE :: (Monad m) => m (Either a b) -> ExceptT a m b
697liftE v = do
714liftE v = do
698 y <- lift v
715 y <- lift v
699 case y of
716 case y of
700− Left err -> throwError err
717+ Left err -> throwE err
701 Right val -> pure val
718 Right val -> pure val
703{- used for restrictions- take the restrictionpredicate and return the corresponding filter function -}
720{- used for restrictions- take the restrictionpredicate and return the corresponding filter function -}
704−predicateRestrictionFilter :: Attributes -> GraphRefRestrictionPredicateExpr -> GraphRefRelationalExprM RestrictionFilter
721+predicateRestrictionFilter :: Attributes -> RestrictionPredicateExprBase a -> RelationalExprState (Either RelationalError RestrictionFilter)
705−predicateRestrictionFilter attrs (AndPredicate expr1 expr2) = do
722+predicateRestrictionFilter attrs (AndPredicate expr1 expr2) =
706− expr1v <- predicateRestrictionFilter attrs expr1
724+ expr1v <- liftE (predicateRestrictionFilter attrs expr1)
707− expr2v <- predicateRestrictionFilter attrs expr2
725+ expr2v <- liftE (predicateRestrictionFilter attrs expr2)
708− pure (\x -> do
726+ pure (\x -> do
709− ev1 <- expr1v x
727+ ev1 <- expr1v x
710− ev2 <- expr2v x
728+ ev2 <- expr2v x
711− pure (ev1 && ev2))
729+ pure (ev1 && ev2))
713−predicateRestrictionFilter attrs (OrPredicate expr1 expr2) = do
731+predicateRestrictionFilter attrs (OrPredicate expr1 expr2) =
714− expr1v <- predicateRestrictionFilter attrs expr1
733+ expr1v <- liftE (predicateRestrictionFilter attrs expr1)
715− expr2v <- predicateRestrictionFilter attrs expr2
734+ expr2v <- liftE (predicateRestrictionFilter attrs expr2)
716 pure (\x -> do
735 pure (\x -> do
717 ev1 <- expr1v x
736 ev1 <- expr1v x
718 ev2 <- expr2v x
737 ev2 <- expr2v x
719 pure (ev1 || ev2))
738 pure (ev1 || ev2))
721−predicateRestrictionFilter _ TruePredicate = pure (\_ -> pure True)
740+predicateRestrictionFilter _ TruePredicate = pure (Right (\_ -> pure True))
723−predicateRestrictionFilter attrs (NotPredicate expr) = do
742+predicateRestrictionFilter attrs (NotPredicate expr) =
724− exprv <- predicateRestrictionFilter attrs expr
744+ exprv <- liftE (predicateRestrictionFilter attrs expr)
725− pure (fmap not . exprv)
745+ 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
747--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
749predicateRestrictionFilter _ (RelationalExprPredicate relExpr) = do
729− renv <- askEnv
750+ rstate <- ask
730− let eval :: RelationTuple -> Either RelationalError Relation
751+ 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
752 Left err -> Left err
736 Right rel -> if arity rel /= 0 then
753 Right rel -> if arity rel /= 0 then
737 Left (PredicateExpressionError "Relational restriction filter must evaluate to 'true' or 'false'")
754 Left (PredicateExpressionError "Relational restriction filter must evaluate to 'true' or 'false'")
739− pure (rel == relationTrue))
756+ pure (rel == relationTrue)))
741predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr) = do
758predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr) = do
742− env <- askEnv
759+ rstate <- ask
743− let attrs' = A.union attrs (envAttributes env)
760+ let attrs' = stateAttributes rstate
744− ctxtup' = envTuple env
761+ ctxtup' = stateTuple rstate
745− atomExprType <- typeForGraphRefAtomExpr attrs' atomExpr
763+ atomExprType <- liftE (typeFromAtomExpr attrs' atomExpr)
746− attr <- lift $ except $ case A.attributeForName attrName attrs of
764+ attr <- either throwE pure $ case A.attributeForName attrName attrs of
747 Right attr -> Right attr
765 Right attr -> Right attr
748 Left (NoSuchAttributeNamesError _) -> case A.attributeForName attrName (tupleAttributes ctxtup') of
766 Left (NoSuchAttributeNamesError _) -> case A.attributeForName attrName (tupleAttributes ctxtup') of
749 Right ctxattr -> Right ctxattr
767 Right ctxattr -> Right ctxattr
750 Left err2@(NoSuchAttributeNamesError _) -> Left err2
768 Left err2@(NoSuchAttributeNamesError _) -> Left err2
751 Left err -> Left err
769 Left err -> Left err
752 Left err -> Left err
770 Left err -> Left err
753− if atomExprType /= A.atomType attr then
771+ if atomExprType /= A.atomType attr then
754− throwError (TupleAttributeTypeMismatchError (A.attributesFromList [attr]))
772+ throwE (TupleAttributeTypeMismatchError (A.attributesFromList [attr]))
756 pure $ \tupleIn -> let evalAndCmp atomIn = case atomEvald of
774 pure $ \tupleIn -> let evalAndCmp atomIn = case atomEvald of
757 Right atomCmp -> atomCmp == atomIn
775 Right atomCmp -> atomCmp == atomIn
758 Left _ -> False
776 Left _ -> False
759− atomEvald = runGraphRefRelationalExprM env (evalGraphRefAtomExpr tupleIn atomExpr)
777+ atomEvald = runReader (evalAtomExpr tupleIn atomExpr) rstate
761 pure $ case atomForAttributeName attrName tupleIn of
779 pure $ case atomForAttributeName attrName tupleIn of
762 Left (NoSuchAttributeNamesError _) -> case atomForAttributeName attrName ctxtup' of
780 Left (NoSuchAttributeNamesError _) -> case atomForAttributeName attrName ctxtup' of
@@ -767,322 +785,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
785-- in the future, it would be useful to do typechecking on the attribute and atom expr filters in advance
768predicateRestrictionFilter attrs (AtomExprPredicate atomExpr) = do
786predicateRestrictionFilter attrs (AtomExprPredicate atomExpr) = do
769 --merge attrs into the state attributes
787 --merge attrs into the state attributes
770− renv <- askEnv
788+ rstate <- ask
771− aType <- typeForGraphRefAtomExpr attrs atomExpr
790+ aType <- liftE (typeFromAtomExpr attrs atomExpr)
772− if aType /= BoolAtomType then
791+ if aType /= BoolAtomType then
773− throwError (AtomTypeMismatchError aType BoolAtomType)
792+ throwE (AtomTypeMismatchError aType BoolAtomType)
775 pure (\tupleIn ->
794 pure (\tupleIn ->
776− case runGraphRefRelationalExprM renv (evalGraphRefAtomExpr tupleIn atomExpr) of
795+ case runReader (evalAtomExpr tupleIn atomExpr) rstate of
777− Left err -> Left err
796+ Left err -> Left err
778− Right boolAtomValue -> pure (boolAtomValue == BoolAtom True))
797+ Right boolAtomValue -> pure (boolAtomValue == BoolAtom True))
780tupleExprCheckNewAttrName :: AttributeName -> Relation -> Either RelationalError Relation
799tupleExprCheckNewAttrName :: AttributeName -> Relation -> Either RelationalError Relation
781tupleExprCheckNewAttrName attrName rel = if isRight (attributeForName attrName rel) then
800tupleExprCheckNewAttrName attrName rel = if isRight (attributeForName attrName rel) then
782 Left (AttributeNameInUseError attrName)
801 Left (AttributeNameInUseError attrName)
784 Right rel
803 Right rel
786−extendGraphRefTupleExpressionProcessor :: Relation -> GraphRefExtendTupleExpr -> GraphRefRelationalExprM (Attributes, RelationTuple -> Either RelationalError RelationTuple)
805+extendTupleExpressionProcessor :: Relation -> ExtendTupleExpr -> RelationalExprState (Either RelationalError (Attributes, RelationTuple -> Either RelationalError RelationTuple))
787−extendGraphRefTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) =
806+extendTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) = do
788−-- renv <- askEnv
807+ rstate <- ask
789 -- check that the attribute name is not in use
808 -- check that the attribute name is not in use
790 case tupleExprCheckNewAttrName newAttrName relIn of
809 case tupleExprCheckNewAttrName newAttrName relIn of
791− Left err -> throwError err
810+ Left err -> pure (Left err)
792− Right _ -> do
811+ Right _ -> runExceptT $ do
793− atomExprType <- typeForGraphRefAtomExpr (attributes relIn) atomExpr
812+ atomExprType <- liftE (typeFromAtomExpr (attributes relIn) atomExpr)
794− atomExprType' <- verifyGraphRefAtomExprTypes relIn atomExpr atomExprType
813+ atomExprType' <- liftE (verifyAtomExprTypes relIn atomExpr atomExprType)
795 let newAttrs = A.attributesFromList [Attribute newAttrName atomExprType']
814 let newAttrs = A.attributesFromList [Attribute newAttrName atomExprType']
796 newAndOldAttrs = A.addAttributes (attributes relIn) newAttrs
815 newAndOldAttrs = A.addAttributes (attributes relIn) newAttrs
798− pure (newAndOldAttrs, \tup -> do
816+ pure (newAndOldAttrs, \tup -> let substate = mergeTuplesIntoRelationalExprState tup rstate in
799− let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tup env
817+ case unimplemented {-runReader (evalAtomExpr tup atomExpr) substate-} of
800− atom <- runGraphRefRelationalExprM gfEnv (evalGraphRefAtomExpr tup atomExpr)
818+ Left err -> Left err
801− Right (tupleAtomExtend newAttrName atom tup)
819+ Right atom -> Right (tupleAtomExtend newAttrName atom tup)
804−evalGraphRefAtomExpr :: RelationTuple -> GraphRefAtomExpr -> GraphRefRelationalExprM Atom
822+
805−evalGraphRefAtomExpr tupIn (AttributeAtomExpr attrName) =
823+evalAtomExpr :: RelationTuple -> AtomExpr -> RelationalExprState (Either RelationalError Atom)
824+evalAtomExpr = undefined
806− case atomForAttributeName attrName tupIn of
827+evalAtomExpr tupIn (AttributeAtomExpr attrName) = case atomForAttributeName attrName tupIn of
807− Right atom -> pure atom
828+ Right atom -> pure (Right atom)
808− Left err@(NoSuchAttributeNamesError _) -> do
829+ err@(Left (NoSuchAttributeNamesError _)) -> do
809− env <- askEnv
830+ rstate <- ask
810− case gre_extra env of
831+ let stateTup = stateTuple rstate
811− Nothing -> throwError err
812− Just (Left ctxtup) -> lift $ except $ atomForAttributeName attrName ctxtup
832+ pure (atomForAttributeName attrName stateTup)
813− Just (Right _) -> throwError err
814− Left err -> throwError err
833+ Left err -> pure (Left err)
815−evalGraphRefAtomExpr _ (NakedAtomExpr atom) = pure atom
834+evalAtomExpr _ (NakedAtomExpr atom) = pure (Right atom)
816−evalGraphRefAtomExpr tupIn (FunctionAtomExpr funcName arguments tid) = do
835+evalAtomExpr tupIn (FunctionAtomExpr funcName arguments ()) = do
817− argTypes <- mapM (typeForGraphRefAtomExpr (tupleAttributes tupIn)) arguments
836+ argTypes <- mapM (typeFromAtomExpr (tupleAttributes tupIn)) arguments
818− context <- gfDatabaseContextForMarker tid
837+ context <- fmap stateElemsContext ask
819− let functions = atomFunctions context
839+ let functions = atomFunctions context
820− func <- lift $ except (atomFunctionForName funcName functions)
840+ func <- either throwE pure (atomFunctionForName funcName functions)
821− let expectedArgCount = length (atomFuncType func) - 1
841+ let expectedArgCount = length (atomFuncType func) - 1
822− actualArgCount = length argTypes
842+ actualArgCount = length argTypes
823− safeInit [] = [] -- different behavior from normal init
843+ safeInit [] = [] -- different behavior from normal init
824− safeInit xs = init xs
844+ safeInit xs = init xs
825− if expectedArgCount /= actualArgCount then
845+ if expectedArgCount /= actualArgCount then
826− throwError (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
846+ throwE (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
828 let zippedArgs = zip (safeInit (atomFuncType func)) argTypes
848 let zippedArgs = zip (safeInit (atomFuncType func)) argTypes
829− mapM_ (\(expType, actType) ->
849+ mapM_ (\(expType, eActType) -> do
850+ actType <- either throwE pure eActType
830− lift $ except (atomTypeVerify expType actType)) zippedArgs
851+ either throwE pure (atomTypeVerify expType actType)) zippedArgs
831− evaldArgs <- mapM (evalGraphRefAtomExpr tupIn) arguments
852+ evaldArgs <- mapM (liftE . evalAtomExpr tupIn) arguments
832 case evalAtomFunction func evaldArgs of
853 case evalAtomFunction func evaldArgs of
833− Left err -> throwError (AtomFunctionUserError err)
854+ Left err -> throwE (AtomFunctionUserError err)
834 Right result -> do
855 Right result -> do
835 --validate that the result matches the expected type
856 --validate that the result matches the expected type
836− _ <- lift $ except (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
857+ _ <- either throwE pure (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
837 pure result
858 pure result
838−evalGraphRefAtomExpr tupIn (RelationAtomExpr relExpr) = do
859+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
860 --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
861+ rstate <- ask
841− let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tupIn env
862+ runExceptT $ do
842− relAtom <- lift $ except $ runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr relExpr)
863+ let newState = mergeTuplesIntoRelationalExprState tupIn rstate
864+ relAtom <- either throwE pure (runReader (evalRelationalExpr relExpr) newState)
843− pure (RelationAtom relAtom)
865+ pure (RelationAtom relAtom)
844−evalGraphRefAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs _) = do --why is the tid unused here? suspicious
866+evalAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs ()) = runExceptT $ do
845− let mergeEnv = mergeTuplesIntoGraphRefRelationalExprEnv tupIn
867+ rstate <- lift ask
868+ let newState = mergeTuplesIntoRelationalExprState tupIn rstate
846− aType <- local mergeEnv (typeForGraphRefAtomExpr (tupleAttributes tupIn) cons)
869+ aType <- either throwE pure (runReader (typeFromAtomExpr (tupleAttributes tupIn) cons) newState)
847− argAtoms <- local mergeEnv $
870+ argAtoms <- mapM (\arg -> either throwE pure (runReader (evalAtomExpr tupIn arg) newState)) dConsArgs
848− mapM (evalGraphRefAtomExpr tupIn) dConsArgs
849 pure (ConstructedAtom dConsName aType argAtoms)
871 pure (ConstructedAtom dConsName aType argAtoms)
851−typeForGraphRefAtomExpr :: Attributes -> GraphRefAtomExpr -> GraphRefRelationalExprM AtomType
873+typeFromAtomExpr :: Attributes -> AtomExpr -> RelationalExprState (Either RelationalError AtomType)
852−typeForGraphRefAtomExpr attrs (AttributeAtomExpr attrName) = do
874+typeFromAtomExpr attrs (AttributeAtomExpr attrName) = do
853− renv <- askEnv
875+ rstate <- ask
854 case A.atomTypeForAttributeName attrName attrs of
876 case A.atomTypeForAttributeName attrName attrs of
855− Right aType -> pure aType
877+ Right aType -> pure (Right aType)
856 Left err@(NoSuchAttributeNamesError _) ->
878 Left err@(NoSuchAttributeNamesError _) ->
857− let envTup = envTuple renv
879+ let stateTup = stateTuple rstate
858− envAttrs = envAttributes renv in
880+ stateAttrs = stateAttributes rstate in
859− case A.attributeForName attrName envAttrs of
881+ case A.attributeForName attrName stateAttrs of
860− Right attr -> pure (A.atomType attr)
882+ Right attr -> pure (Right (A.atomType attr))
861− Left _ -> case atomForAttributeName attrName envTup of
883+ Left _ -> case atomForAttributeName attrName stateTup of
862− Right atom -> pure (atomTypeForAtom atom)
884+ Right atom -> pure (Right (atomTypeForAtom atom))
863− Left _ -> --throwError (traceStack (show ("typeForGRAtomExpr", attrs, envTup)) err)
885+ Left _ -> pure (Left err)
865− Left err -> throwError err
867−typeForGraphRefAtomExpr _ (NakedAtomExpr atom) = pure (atomTypeForAtom atom)
887+typeFromAtomExpr _ (NakedAtomExpr atom) = pure (Right (atomTypeForAtom atom))
868−typeForGraphRefAtomExpr attrs (FunctionAtomExpr funcName atomArgs transId) = do
888+typeFromAtomExpr attrs (FunctionAtomExpr funcName atomArgs _) = do
869− funcs <- atomFunctions <$> gfDatabaseContextForMarker transId
889+ context <- fmap stateElemsContext ask
890+ let funcs = atomFunctions context
870 case atomFunctionForName funcName funcs of
891 case atomFunctionForName funcName funcs of
871− Left err -> throwError err
892+ Left err -> pure (Left err)
872 Right func -> do
893 Right func -> do
873 let funcRetType = last (atomFuncType func)
894 let funcRetType = last (atomFuncType func)
874 funcArgTypes = init (atomFuncType func)
895 funcArgTypes = init (atomFuncType func)
875− argTypes <- mapM (typeForGraphRefAtomExpr attrs) atomArgs
896+ eArgTypes <- mapM (typeFromAtomExpr attrs) atomArgs
897+ case lefts eArgTypes of
898+ errs@(_:_) -> pure (Left (someErrors errs))
876− let eTvMap = resolveTypeVariables funcArgTypes argTypes
900+ let eTvMap = resolveTypeVariables funcArgTypes argTypes
901+ argTypes = rights eArgTypes
877− case eTvMap of
902+ case eTvMap of
878− Left err -> throwError err
903+ Left err -> pure (Left err)
879− Right tvMap -> lift $ except $ resolveFunctionReturnValue funcName tvMap funcRetType
904+ Right tvMap -> pure (resolveFunctionReturnValue funcName tvMap funcRetType)
880−typeForGraphRefAtomExpr attrs (RelationAtomExpr relExpr) = do
905+typeFromAtomExpr attrs (RelationAtomExpr relExpr) = do
881− relType <- R.local (mergeAttributesIntoGraphRefRelationalExprEnv attrs) (typeForGraphRefRelationalExpr relExpr)
906+ relType <- local (mergeAttributesIntoRelationalExprState attrs) (typeForRelationalExpr relExpr)
908+ Left err -> pure (Left err)
882− pure (RelationAtomType (attributes relType))
910+ pure (pure (RelationAtomType (attributes relType')))
883-- grab the type of the data constructor, then validate that the args match the expected types
911-- grab the type of the data constructor, then validate that the args match the expected types
884−typeForGraphRefAtomExpr attrs (ConstructedAtomExpr dConsName dConsArgs tid) =
912+typeFromAtomExpr attrs (ConstructedAtomExpr dConsName dConsArgs _) =
885− do
913+ runExceptT $ do
886− argsTypes <- mapM (typeForGraphRefAtomExpr attrs) dConsArgs
914+ argsTypes <- mapM (liftE . typeFromAtomExpr attrs) dConsArgs
887− tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker tid
915+ context <- fmap stateElemsContext (lift ask)
888− lift $ except $ atomTypeForDataConstructor tConsMap dConsName argsTypes
916+ either throwE pure (atomTypeForDataConstructor (typeConstructorMapping context) dConsName argsTypes)
890-- | Validate that the type of the AtomExpr matches the expected type.
918-- | Validate that the type of the AtomExpr matches the expected type.
891−verifyGraphRefAtomExprTypes :: Relation -> GraphRefAtomExpr -> AtomType -> GraphRefRelationalExprM AtomType
919+verifyAtomExprTypes :: Relation -> AtomExpr -> AtomType -> RelationalExprState (Either RelationalError AtomType)
892−verifyGraphRefAtomExprTypes relIn (AttributeAtomExpr attrName) expectedType = do
920+verifyAtomExprTypes relIn (AttributeAtomExpr attrName) expectedType = runExceptT $ do
893− env <- askEnv
921+ rstate <- lift ask
894 case A.atomTypeForAttributeName attrName (attributes relIn) of
922 case A.atomTypeForAttributeName attrName (attributes relIn) of
895− Right aType -> lift $ except $ atomTypeVerify expectedType aType
923+ Right aType -> either throwE pure (atomTypeVerify expectedType aType)
896 (Left err@(NoSuchAttributeNamesError _)) ->
924 (Left err@(NoSuchAttributeNamesError _)) ->
897− let attrs' = envAttributes env in
925+ let attrs' = stateAttributes rstate in
898 if attrs' == emptyAttributes then
926 if attrs' == emptyAttributes then
899− throwError err
927+ throwE err
901 case A.attributeForName attrName attrs' of
929 case A.attributeForName attrName attrs' of
902− Left err' -> throwError err'
930+ Left err' -> throwE err'
903− Right attrType -> lift $ except $ atomTypeVerify expectedType (A.atomType attrType)
931+ 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)
932+verifyAtomExprTypes _ (NakedAtomExpr atom) expectedType = pure (atomTypeVerify expectedType (atomTypeForAtom atom))
908−verifyGraphRefAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs tid) expectedType = do
933+verifyAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs _) expectedType = do
909− context <- gfDatabaseContextForMarker tid
934+ rstate <- ask
910 let functions = atomFunctions context
935 let functions = atomFunctions context
936+ context = stateElemsContext rstate
911− func <- lift $ except $ atomFunctionForName funcName functions
938+ func <- either throwE pure (atomFunctionForName funcName functions)
912− let expectedArgTypes = atomFuncType func
939+ let expectedArgTypes = atomFuncType func
913− funcArgVerifier (atomExpr, expectedType2, argCount) = do
940+ 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)
941+ Left (AtomTypeMismatchError expSubType actSubType) -> throwE (AtomFunctionTypeError funcName argCount expSubType actSubType)
916− handler err = throwError err
942+ Left err -> throwE err
917− verifyGraphRefAtomExprTypes relIn atomExpr expectedType2 `catchError` handler
943+ Right x -> pure x
918− funcArgTypes <- mapM funcArgVerifier $ zip3 funcArgExprs expectedArgTypes [1..]
944+ ) $ zip3 funcArgExprs expectedArgTypes [1..]
919− if length funcArgTypes /= length expectedArgTypes - 1 then
945+ if length funcArgTypes /= length expectedArgTypes - 1 then
920− throwError (AtomTypeCountError funcArgTypes expectedArgTypes)
946+ throwE (AtomTypeCountError funcArgTypes expectedArgTypes)
922− lift $ except $ atomTypeVerify expectedType (last expectedArgTypes)
948+ either throwE pure (atomTypeVerify expectedType (last expectedArgTypes))
923−verifyGraphRefAtomExprTypes relIn (RelationAtomExpr relationExpr) expectedType =
949+verifyAtomExprTypes relIn (RelationAtomExpr relationExpr) expectedType = runExceptT $ do
924− do
950+ rstate <- lift ask
925− let mergedAttrsEnv e = mergeAttributesIntoGraphRefRelationalExprEnv (attributes relIn) e
951+ 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))
952+ either throwE pure (atomTypeVerify expectedType (RelationAtomType (attributes relType)))
928−verifyGraphRefAtomExprTypes rel cons@ConstructedAtomExpr{} expectedType = do
953+verifyAtomExprTypes rel cons@ConstructedAtomExpr{} expectedType = runExceptT $ do
929− cType <- typeForGraphRefAtomExpr (attributes rel) cons
954+ cType <- liftE (typeFromAtomExpr (attributes rel) cons)
930− lift $ except $ atomTypeVerify expectedType cType
955+ either throwE pure (atomTypeVerify expectedType cType)
932-- | Look up the type's name and create a new attribute.
957-- | Look up the type's name and create a new attribute.
933−evalGraphRefAttrExpr :: GraphRefAttributeExpr -> GraphRefRelationalExprM Attribute
958+evalAttrExpr :: TypeConstructorMapping -> AttributeExpr -> Either RelationalError Attribute
934−evalGraphRefAttrExpr (AttributeAndTypeNameExpr attrName tCons transId) = do
959+evalAttrExpr aTypes (AttributeAndTypeNameExpr attrName tCons ()) = do
935− tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker transId
936− aType <- lift $ except $ atomTypeForTypeConstructorValidate True tCons tConsMap M.empty
960+ aType <- atomTypeForTypeConstructorValidate True tCons aTypes M.empty
937− lift $ except $ validateAtomType aType tConsMap
961+ validateAtomType aType aTypes
938− pure $ Attribute attrName aType
962+ Right (Attribute attrName aType)
940−evalGraphRefAttrExpr (NakedAttributeExpr attr) = pure attr
964+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
966+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
967+evalTupleExpr mAttrs (TupleExpr tupMap) = do
968+ 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
970 -- 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
971 -- 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
972+ let attrs = fromMaybe A.emptyAttributes mAttrs
995− resolveOneAtom (attrName, aExpr) =
973+ attrAtoms <- mapM (\(attrName, aExpr) -> do
997− --provided when the relation header is available
974+ --provided when the relation header is available
998− let eExpectedAtomType = A.atomTypeForAttributeName attrName attrs
975+ let eExpectedAtomType = A.atomTypeForAttributeName attrName attrs
999− unresolvedType <- typeForGraphRefAtomExpr attrs aExpr
976+ unresolvedType <- liftE (typeFromAtomExpr attrs aExpr)
1000− resolvedType <- case eExpectedAtomType of
977+ resolvedType <- case eExpectedAtomType of
1001 Left _ -> pure unresolvedType
978 Left _ -> pure unresolvedType
1002− Right typeHint -> lift $ except $ resolveAtomType typeHint unresolvedType
979+ Right typeHint -> either throwE pure (resolveAtomType typeHint unresolvedType)
1003 --resolve atom typevars based on resolvedType?
980 --resolve atom typevars based on resolvedType?
1004− newAtom <- evalGraphRefAtomExpr emptyTuple aExpr
981+ newAtom <- liftE (evalAtomExpr emptyTuple aExpr)
1005− pure (attrName, newAtom, resolvedType)
982+ pure (attrName, newAtom, resolvedType)
1006− attrAtoms <- mapM resolveOneAtom (M.toList tupMap)
983+ ) (M.toList tupMap)
1007− let tupAttrs = A.attributesFromList $ map (\(attrName, _, aType) -> Attribute attrName aType) attrAtoms
984+ let tupAttrs = A.attributesFromList $ map (\(attrName, _, aType) -> Attribute attrName aType) attrAtoms
1008− atoms = V.fromList $ map (\(_, atom, _) -> atom) attrAtoms
985+ atoms = V.fromList $ map (\(_, atom, _) -> atom) attrAtoms
1009− tup = mkRelationTuple tupAttrs atoms
986+ tup = mkRelationTuple tupAttrs atoms
987+ tConss = typeConstructorMapping context
1010− finalAttrs = fromMaybe tupAttrs mAttrs
988+ finalAttrs = fromMaybe tupAttrs mAttrs
1011 --verify that the attributes match
989 --verify that the attributes match
1012− when (A.attributeNameSet finalAttrs /= A.attributeNameSet tupAttrs) $ throwError (TupleAttributeTypeMismatchError tupAttrs)
990+ 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))
991+ 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)
992+ _ <- either throwE pure (validateTuple tup' tConss)
1018− pure tup'
993+ pure tup'
1020−--temporary implementation until we have a proper planner+executor
995+evalAttributeNames :: AttributeNames -> RelationalExpr -> RelationalExprState (Either RelationalError (S.Set AttributeName))
1021−evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
996+evalAttributeNames attrNames expr = do
1022−evalGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
997+ eExprType <- typeForRelationalExpr expr
1023− mAttrs <- case mAttrExprs of
998+ case eExprType of
1024− Just _ ->
999+ Left err -> pure (Left err)
1025− Just . A.attributesFromList <$> mapM evalGraphRefAttrExpr (fromMaybe [] mAttrExprs)
1000+ Right exprTyp -> do
1026− Nothing -> pure Nothing
1001+ let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))
1027− tuples <- evalGraphRefTupleExprs mAttrs tupleExprs
1002+ case attrNames of
1028− let attrs = fromMaybe firstTupleAttrs mAttrs
1003+ AttributeNames names ->
1029− firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
1004+ case A.projectionAttributesForNames names (attributes exprTyp) of
1030− lift $ except $ mkRelation attrs (RelationTupleSet tuples)
1005+ Left err -> pure (Left err)
1031−evalGraphRefRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
1006+ Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))
1032− lift $ except $ mkRelation attributeSet tupleSet
1007+
1033−evalGraphRefRelationalExpr (ExistingRelation rel) = pure rel
1008+ InvertedAttributeNames names -> do
1009+ let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
1010+ if not (S.null nonExistentAttributeNames) then
1011+ pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))
1013+ pure (Right (A.nonMatchingAttributeNameSet names typeNameSet))
1015+ UnionAttributeNames namesA namesB -> do
1016+ eNameSetA <- evalAttributeNames namesA expr
1018+ Left err -> pure (Left err)
1019+ Right nameSetA -> do
1020+ eNameSetB <- evalAttributeNames namesB expr
1022+ Left err -> pure (Left err)
1024+ pure (Right (S.union nameSetA nameSetB))
1026+ IntersectAttributeNames namesA namesB -> do
1027+ eNameSetA <- evalAttributeNames namesA expr
1029+ Left err -> pure (Left err)
1030+ Right nameSetA -> do
1031+ eNameSetB <- evalAttributeNames namesB expr
1033+ Left err -> pure (Left err)
1035+ pure (Right (S.intersection nameSetA nameSetB))
1037+ RelationalExprAttributeNames attrExpr -> do
1038+ eAttrExprType <- typeForRelationalExpr attrExpr
1039+ case eAttrExprType of
1040+ Left err -> pure (Left err)
1041+ Right attrExprType -> pure (Right (A.attributeNameSet (attributes attrExprType)))
1043+evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> TransactionGraph -> Either RelationalError Relation
1034−evalGraphRefRelationalExpr (RelationVariable name tid) = do
1044+evalGraphRefRelationalExpr (RelationVariable name tid) graph = do
1035− ctx <- gfDatabaseContextForMarker tid
1045+ ctx <- dbContextForTransId tid graph
1036 case M.lookup name (relationVariables ctx) of
1046 case M.lookup name (relationVariables ctx) of
1037− Nothing -> throwError (RelVarNotDefinedError name)
1047+ Nothing -> Left (RelVarNotDefinedError name)
1038− Just rv -> evalGraphRefRelationalExpr rv
1048+ 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
1050dbContextForTransId :: TransactionId -> TransactionGraph -> Either RelationalError DatabaseContext
1088dbContextForTransId tid graph = do
1051dbContextForTransId tid graph = do
@@ -1100,293 +1063,167 @@ transactionForId tid graph
1101 matchingTrans = S.filter (\(Transaction idMatch _ _) -> idMatch == tid) (transactionsForGraph graph)
1064 matchingTrans = S.filter (\(Transaction idMatch _ _) -> idMatch == tid) (transactionsForGraph graph)
1103−typeForGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
1066+processRestrictionPredicateExpr :: RestrictionPredicateExpr -> RelationalExprState (Either RelationalError GraphRefRestrictionPredicateExpr)
1104−typeForGraphRefRelationalExpr (MakeStaticRelation attrs _) = lift $ except $ mkRelation attrs emptyTupleSet
1067+processRestrictionPredicateExpr TruePredicate = pure (Right TruePredicate)
1105−typeForGraphRefRelationalExpr (ExistingRelation rel) = pure (emptyRelationWithAttrs (attributes rel))
1068+processRestrictionPredicateExpr (AndPredicate a b) = do
1106−typeForGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
1069+ a' <- processRestrictionPredicateExpr a
1070+ b' <- processRestrictionPredicateExpr b
1072+ Left err -> pure (Left err)
1073+ Right a'' -> case b' of
1074+ Left err -> pure (Left err)
1076+ pure (Right (AndPredicate a'' b''))
1077+processRestrictionPredicateExpr (OrPredicate a b) = do
1078+ a' <- processRestrictionPredicateExpr a
1079+ b' <- processRestrictionPredicateExpr b
1107− mAttrs <- case mAttrExprs of
1080+ case a' of
1108− Just attrExprs -> do
1081+ Left err -> pure (Left err)
1109− attrs <- mapM evalGraphRefAttributeExpr attrExprs
1082+ Right a'' -> case b' of
1110− pure (Just (attributesFromList attrs))
1083+ Left err -> pure (Left err)
1111− Nothing -> pure Nothing
1084+ Right b'' ->
1112− tuples <- evalGraphRefTupleExprs mAttrs tupleExprs
1085+ pure (Right (OrPredicate a'' b''))
1113− let retAttrs = case tuples of
1086+processRestrictionPredicateExpr (NotPredicate a) = do
1114− (tup:_) -> tupleAttributes tup
1087+ a' <- processRestrictionPredicateExpr a
1115− [] -> fromMaybe A.emptyAttributes mAttrs
1088+ case a' of
1116− pure $ emptyRelationWithAttrs retAttrs
1089+ Left err -> pure (Left err)
1091+ pure (Right (NotPredicate a''))
1092+processRestrictionPredicateExpr (RelationalExprPredicate expr) = do
1093+ e <- evalRelationalExpr expr
1095+ Left err -> Left err
1096+ Right e' -> Right (RelationalExprPredicate e')
1097+processRestrictionPredicateExpr (AtomExprPredicate expr) = do
1098+ e <- processAtomExpr expr
1099+ pure (Right (AtomExprPredicate e))
1100+processRestrictionPredicateExpr (AttributeEqualityPredicate nam expr) = do
1101+ e <- processAtomExpr expr
1102+ pure (Right (AttributeEqualityPredicate nam e))
1104+processExtendTupleExpr :: ExtendTupleExpr -> RelationalExprState (Either RelationalError GraphRefExtendTupleExpr)
1105+processExtendTupleExpr (AttributeExtendTupleExpr nam atomExpr) = do
1106+ e <- processAtomExpr atomExpr
1107+ pure (Right (AttributeExtendTupleExpr nam e))
1109+typeForGraphRefRelationalExpr :: GraphRefRelationalExpr -> RelationalExprState (Either RelationalError Relation)
1110+typeForGraphRefRelationalExpr (MakeStaticRelation attrs _) = pure $ mkRelation attrs emptyTupleSet
1111+typeForGraphRefRelationalExpr (ExistingRelation rel) = pure (Right (emptyRelationWithAttrs (attributes rel)))
1112+typeForGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) =
1114+ Just attrExprs -> do
1115+ eAttrs <- mapM (\e -> evalGraphRefAttributeExpr e) attrExprs
1116+ case lefts eAttrs of
1117+ [] -> pure (Right (emptyRelationWithAttrs (attributesFromList (rights eAttrs))))
1118+ _ -> pure (Left (someErrors (lefts eAttrs)))
1118typeForGraphRefRelationalExpr (RelationVariable rvName tid) = do
1119typeForGraphRefRelationalExpr (RelationVariable rvName tid) = do
1119− relVars <- relationVariables <$> gfDatabaseContextForMarker tid
1120+ eTrans <- currentTrans
1122+ Left err -> pure (Left err)
1124+ let relVars = relationVariables (concreteDatabaseContext trans)
1120− case M.lookup rvName relVars of
1125+ case M.lookup rvName relVars of
1121− Nothing -> throwError (RelVarNotDefinedError rvName)
1126+ Nothing -> pure (Left (RelVarNotDefinedError rvName))
1123− typeForGraphRefRelationalExpr rvExpr
1127+ Just rvExpr -> typeForGraphRefRelationalExpr rvExpr
1124typeForGraphRefRelationalExpr (Project attrNames expr) = do
1128typeForGraphRefRelationalExpr (Project attrNames expr) = do
1125− exprType' <- typeForGraphRefRelationalExpr expr
1129+ eExprType <- typeForGraphRefRelationalExpr expr
1131+ Left err -> pure (Left err)
1132+ Right exprType -> do
1126− projectionAttrs <- evalGraphRefAttributeNames attrNames expr
1133+ eProjectionAttrs <- evalGraphRefAttributeNames attrNames expr
1134+ pure $ case eProjectionAttrs of
1135+ Left err -> Left err
1127− lift $ except $ project projectionAttrs exprType'
1136+ Right projectionAttrs -> project projectionAttrs exprType
1128−typeForGraphRefRelationalExpr (Union exprA exprB) = do
1137+
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)
1138+evalGraphRefAttributeNames :: GraphRefAttributeNames -> GraphRefRelationalExpr -> RelationalExprState (Either RelationalError (S.Set AttributeName))
1172evalGraphRefAttributeNames attrNames expr = do
1139evalGraphRefAttributeNames attrNames expr = do
1173− exprType' <- typeForGraphRefRelationalExpr expr
1140+ eExprType <- typeForGraphRefRelationalExpr expr
1142+ Left err -> pure (Left err)
1143+ Right exprTyp -> do
1174− let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprType')))
1144+ let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))
1175− case attrNames of
1145+ case attrNames of
1176− AttributeNames names ->
1146+ AttributeNames names ->
1177− case A.projectionAttributesForNames names (attributes exprType') of
1147+ case A.projectionAttributesForNames names (attributes exprTyp) of
1178− Left err -> throwError err
1148+ Left err -> pure (Left err)
1179− Right attrs -> pure (S.fromList (V.toList (A.attributeNames attrs)))
1149+ Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))
1181− InvertedAttributeNames names -> do
1151+ InvertedAttributeNames names -> do
1182 let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
1152 let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
1183 if not (S.null nonExistentAttributeNames) then
1153 if not (S.null nonExistentAttributeNames) then
1184− throwError $ AttributeNamesMismatchError nonExistentAttributeNames
1154+ pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))
1186− pure (A.nonMatchingAttributeNameSet names typeNameSet)
1156+ pure (pure (A.nonMatchingAttributeNameSet names typeNameSet))
1188− UnionAttributeNames namesA namesB -> do
1158+ UnionAttributeNames namesA namesB -> do
1189− nameSetA <- evalGraphRefAttributeNames namesA expr
1159+ eNameSetA <- evalGraphRefAttributeNames namesA expr
1161+ Left err -> pure (Left err)
1162+ Right nameSetA -> do
1190− nameSetB <- evalGraphRefAttributeNames namesB expr
1163+ eNameSetB <- evalGraphRefAttributeNames namesB expr
1165+ Left err -> pure (Left err)
1191− pure (S.union nameSetA nameSetB)
1167+ pure (Right (S.union nameSetA nameSetB))
1169+ IntersectAttributeNames namesA namesB -> do
1170+ eNameSetA <- evalGraphRefAttributeNames namesA expr
1172+ Left err -> pure (Left err)
1173+ Right nameSetA -> do
1174+ eNameSetB <- evalGraphRefAttributeNames namesB expr
1176+ Left err -> pure (Left err)
1178+ pure (Right (S.intersection nameSetA nameSetB))
1193− IntersectAttributeNames namesA namesB -> do
1180+ RelationalExprAttributeNames attrExpr -> do
1194− nameSetA <- evalGraphRefAttributeNames namesA expr
1181+ eAttrExprType <- typeForGraphRefRelationalExpr attrExpr
1195− nameSetB <- evalGraphRefAttributeNames namesB expr
1182+ case eAttrExprType of
1196− pure (S.intersection nameSetA nameSetB)
1183+ Left err -> pure (Left err)
1184+ 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
1189+processAtomExpr :: AtomExpr -> RelationalExprState GraphRefAtomExpr
1275− getContext = getStateContext
1190+processAtomExpr (AttributeAtomExpr nam) = pure $ AttributeAtomExpr nam
1276−
1191+processAtomExpr (NakedAtomExpr atom) = pure $ NakedAtomExpr atom
1277−relVarByName :: DatabaseContextM m => RelVarName -> m GraphRefRelationalExpr
1192+processAtomExpr (FunctionAtomExpr fName atomExprs ()) = do
1278−relVarByName rvName = do
1193+ tid <- elems_currentTransId <$> ask
1279− relvars <- relationVariables <$> getContext
1194+ FunctionAtomExpr fName <$> mapM processAtomExpr atomExprs <*> pure tid
1280− case M.lookup rvName relvars of
1195+processAtomExpr (RelationAtomExpr expr) = RelationAtomExpr <$> processRelationalExpr expr
1281− Nothing -> throwError (RelVarNotDefinedError rvName)
1196+processAtomExpr (ConstructedAtomExpr dConsName atomExprs ()) = ConstructedAtomExpr dConsName <$> mapM processAtomExpr atomExprs <*> (elems_currentTransId <$> ask)
1282− Just gfexpr -> pure gfexpr
1197+
1283−
1198+processTupleExpr :: TupleExpr -> RelationalExprState GraphRefTupleExpr
1284−-- | resolve UncommittedTransactionMarker whenever possible- this is important in the DatabaseContext in order to mitigate self-referencing loops for updates
1199+processTupleExpr (TupleExpr tMap) =
1285−class ResolveGraphRefTransactionMarker a where
1200+ TupleExpr . M.fromList <$> mapM (\(k,v) -> (,) k <$> processAtomExpr v) (M.toList tMap)
1286− resolve :: a -> DatabaseContextEvalMonad a
1201+
1287−
1202+evalGraphRefAttributeExpr :: GraphRefAttributeExpr -> RelationalExprState (Either RelationalError Attribute)
1288−-- s := s union t
1203+evalGraphRefAttributeExpr (AttributeAndTypeNameExpr attrName tCons tid) = do
1289−instance ResolveGraphRefTransactionMarker GraphRefRelationalExpr where
1204+ graph <- elems_graph <$> ask
1290− resolve (MakeRelationFromExprs mAttrs tupleExprs) =
1205+ case transactionForId tid graph of
1291− MakeRelationFromExprs mAttrs <$> resolve tupleExprs
1206+ Left err -> pure (Left err)
1292− resolve orig@MakeStaticRelation{} = pure orig
1207+ Right trans -> do
1293− resolve orig@ExistingRelation{} = pure orig
1208+ let tConsMap = typeConstructorMapping (concreteDatabaseContext trans)
1294− resolve orig@(RelationVariable rvName UncommittedContextMarker) = do
1209+ case atomTypeForTypeConstructorValidate True tCons tConsMap M.empty of
1295− rvMap <- relationVariables <$> getStateContext
1210+ Left err -> pure (Left err)
1296− case M.lookup rvName rvMap of
1211+ Right aType -> do
1297− Nothing -> pure orig
1212+ case validateAtomType aType tConsMap of
1298− Just resolvedRv -> resolve resolvedRv
1213+ Left err -> pure (Left err)
1299− resolve orig@RelationVariable{} = pure orig
1214+ Right _ -> pure (Right (Attribute attrName aType))
1300− resolve (Project attrNames relExpr) = Project <$> resolve attrNames <*> resolve relExpr
1215+
1301− resolve (Union exprA exprB) = Union <$> resolve exprA <*> resolve exprB
1216+--convert AttributeExpr to GraphRefAttributeExpr
1302− resolve (Join exprA exprB) = Join <$> resolve exprA <*> resolve exprB
1217+processAttributeExpr :: AttributeExpr -> RelationalExprState GraphRefAttributeExpr
1303− resolve (Rename attrA attrB expr) = Rename attrA attrB <$> resolve expr
1218+processAttributeExpr (AttributeAndTypeNameExpr nam tCons ()) = do
1304− resolve (Difference exprA exprB) = Difference <$> resolve exprA <*> resolve exprB
1219+ tid <- elems_currentTransId <$> ask
1305− resolve (Group namesA nameB expr) = Group <$> resolve namesA <*> pure nameB <*> resolve expr
1220+ pure $ AttributeAndTypeNameExpr nam tCons tid
1306− resolve (Ungroup nameA expr) = Ungroup nameA <$> resolve expr
1221+processAttributeExpr (NakedAttributeExpr attr) = pure $ NakedAttributeExpr attr
1307− resolve (Restrict restrictExpr relExpr) = Restrict <$> resolve restrictExpr <*> resolve relExpr
1222+
1308− resolve (Equals exprA exprB) = Equals <$> resolve exprA <*> resolve exprB
1223+-- convert a RelationalExpr into a GraphRefRelationalExpr
1309− resolve (NotEquals exprA exprB) = NotEquals <$> resolve exprA <*> resolve exprB
1224+processRelationalExpr :: RelationalExpr -> RelationalExprState GraphRefRelationalExpr
1310− resolve (Extend extendExpr relExpr) = Extend <$> resolve extendExpr <*> resolve relExpr
1225+processRelationalExpr (MakeRelationFromExprs mAttrs tupleExprs) = do
1311− resolve (With withExprs relExpr) = With <$> mapM (\(nam, expr) -> (,) <$> resolve nam <*> resolve expr) withExprs <*> resolve relExpr
1226+ mAttrs' <- case mAttrs of
1312−
1227+ Nothing -> pure Nothing
1313−instance ResolveGraphRefTransactionMarker GraphRefTupleExprs where
1228+ Just mAttrs'' -> Just <$> mapM processAttributeExpr mAttrs''
1314− resolve (TupleExprs marker tupleExprs) =
1229+ MakeRelationFromExprs mAttrs' <$> mapM processTupleExpr 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
1350− resolve (ConstructedAtomExpr dConsName atomExprs marker) =
1351− ConstructedAtomExpr dConsName <$> mapM resolve atomExprs <*> pure marker
1353−--convert series of simple Union queries into MakeStaticRelation
1354−-- this is especially useful for long, nested applications of Union with simple tuples
1355−-- Union (MakeRelation x y) (MakeRelation x y') -> MakeRelation x (y + y')
1357−--MakeRelationFromExprs Nothing (TupleExprs UncommittedContextMarker [TupleExpr (fromList [("name", NakedAtomExpr (TextAtom "steve"))])])
1359−applyUnionCollapse :: GraphRefRelationalExpr -> GraphRefRelationalExpr
1360−applyUnionCollapse = Fold.cata opt
1362− opt :: RelationalExprBaseF GraphRefTransactionMarker GraphRefRelationalExpr -> GraphRefRelationalExpr
1363− opt (UnionF exprA exprB) | exprA == exprB = exprA
1365− exprA@(MakeRelationFromExprs mAttrs1 tupExprs1)
1366− exprB@(MakeRelationFromExprs mAttrs2 tupExprs2)) | tupExprs1 == tupExprs2 = MakeRelationFromExprs (mAttrs1 <|> mAttrs2) tupExprs1
1367− | tupExprsNull tupExprs1 = exprB
1368− | tupExprsNull tupExprs2 = exprA
1369− opt x = Fold.embed x
1370− tupExprsNull (TupleExprs _ []) = True
1371− tupExprsNull _ = False
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