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