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