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