@@ -1,35 +1,53 @@
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
5import ProjectM36.TupleSet
8import ProjectM36.TupleSet
6import ProjectM36.Base
9import ProjectM36.Base
10+import qualified Data.UUID as U
7import ProjectM36.Error
11import ProjectM36.Error
8import ProjectM36.AtomType
12import ProjectM36.AtomType
9−import ProjectM36.Attribute (emptyAttributes)
13+import ProjectM36.Attribute (emptyAttributes, attributesFromList)
10import ProjectM36.ScriptSession
14import ProjectM36.ScriptSession
11import ProjectM36.DataTypes.Primitive
15import ProjectM36.DataTypes.Primitive
12import ProjectM36.AtomFunction
16import ProjectM36.AtomFunction
13import ProjectM36.DatabaseContextFunction
17import ProjectM36.DatabaseContextFunction
14import ProjectM36.Arbitrary
18import ProjectM36.Arbitrary
19+import ProjectM36.GraphRefRelationalExpr
20+import ProjectM36.Transaction
15import qualified ProjectM36.Attribute as A
21import qualified ProjectM36.Attribute as A
16import qualified Data.Map as M
22import qualified Data.Map as M
17import qualified Data.HashSet as HS
23import qualified Data.HashSet as HS
18import qualified Data.Set as S
24import qualified Data.Set as S
19import Control.Monad.State hiding (join)
25import Control.Monad.State hiding (join)
20−import Control.Exception
26+import Data.Bifunctor (second)
21import Data.Maybe
27import Data.Maybe
22import Data.Either
28import Data.Either
23import Data.Char (isUpper)
29import Data.Char (isUpper)
31+import qualified Data.List.NonEmpty as NE
32+import Data.Functor.Identity
24import qualified Data.Text as T
33import qualified Data.Text as T
25import qualified Data.Vector as V
34import qualified Data.Vector as V
26import qualified ProjectM36.TypeConstructorDef as TCD
35import qualified ProjectM36.TypeConstructorDef as TCD
27−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)
28−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
29import Test.QuickCheck
43import Test.QuickCheck
30−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
31import GHC.Paths
49import GHC.Paths
32−import Debug.Trace
50+#endif
34data DatabaseContextExprDetails = CountUpdatedTuples
52data DatabaseContextExprDetails = CountUpdatedTuples
@@ -46,32 +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
68+mkDatabaseContextEvalState context = DatabaseContextEvalState {
69+ dbc_context = context,
50−freshDatabaseState ctx = (ctx, M.empty, False) --future work: propagate return accumulator
72+ } --future work: propagate return accumulator
52-- 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
53−data RelationalExprStateElems = RelationalExprStateTupleElems DatabaseContext RelationTuple | -- used when fully evaluating a relexpr
75+data RelationalExprEnv = RelationalExprEnv {
54− RelationalExprStateAttrsElems DatabaseContext Attributes | --used when evaluating the type of a relexpr
76+ re_context :: DatabaseContext,
55− RelationalExprStateElems DatabaseContext --used by default at the top level of evaluation
77+ re_graph :: TransactionGraph,
56−
78+ re_extra :: Maybe (Either RelationTuple Attributes)
57−instance Show RelationalExprStateElems where
79+ }
58− show (RelationalExprStateTupleElems _ tup) = "RelationalExprStateTupleElems " ++ show tup
80+
59− show (RelationalExprStateAttrsElems _ attrs) = "RelationalExprStateAttrsElems" ++ show attrs
81+envTuple :: GraphRefRelationalExprEnv -> RelationTuple
60− show (RelationalExprStateElems _) = "RelationalExprStateElems"
82+envTuple e = fromLeft emptyTuple (fromMaybe (Left emptyTuple) (gre_extra e))
62−mkRelationalExprState :: DatabaseContext -> RelationalExprStateElems
84+envAttributes :: GraphRefRelationalExprEnv -> Attributes
63−mkRelationalExprState = RelationalExprStateElems
85+envAttributes e = fromRight emptyAttributes (fromMaybe (Right emptyAttributes) (gre_extra e))
65−mergeTuplesIntoRelationalExprState :: RelationTuple -> RelationalExprStateElems -> RelationalExprStateElems
66−mergeTuplesIntoRelationalExprState tupIn (RelationalExprStateElems ctx) = RelationalExprStateTupleElems ctx tupIn
67−mergeTuplesIntoRelationalExprState _ st@(RelationalExprStateAttrsElems _ _) = st
68−mergeTuplesIntoRelationalExprState tupIn (RelationalExprStateTupleElems ctx existingTuple) = let mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap existingTuple) in
69− RelationalExprStateTupleElems ctx (mkRelationTupleFromMap mergedTupMap)
71−mergeAttributesIntoRelationalExprState :: Attributes -> RelationalExprStateElems -> RelationalExprStateElems
87+instance Show RelationalExprEnv where
72−mergeAttributesIntoRelationalExprState attrs (RelationalExprStateElems ctx) = RelationalExprStateAttrsElems ctx attrs
88+ show e@RelationalExprEnv{} = "RelationalExprEnv " ++ show (re_extra e)
73−mergeAttributesIntoRelationalExprState _ st@(RelationalExprStateTupleElems _ _) = st
89+
74−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)))
76type ResultAccumName = StringType
125type ResultAccumName = StringType
@@ -81,429 +130,403 @@ data ResultAccum = ResultAccum { resultAccumFunc :: ResultAccumFunc,
81 resultAccumResult :: Relation
130 resultAccumResult :: Relation
133+data DatabaseContextEvalState = DatabaseContextEvalState {
134+ dbc_context :: DatabaseContext, --new, alterable context for a new transaction
84−type DatabaseStateElems = (DatabaseContext, M.Map ResultAccumName ResultAccum, DirtyFlag)
135+ dbc_accum :: M.Map ResultAccumName ResultAccum,
136+ dbc_dirty :: DirtyFlag
86−type DatabaseState a = State DatabaseStateElems a
139+data DatabaseContextEvalEnv = DatabaseContextEvalEnv
140+ { dce_transId :: TransactionId,
141+ dce_graph :: TransactionGraph
88−getStateContext :: DatabaseState DatabaseContext
144+mkDatabaseContextEvalEnv :: TransactionId -> TransactionGraph -> DatabaseContextEvalEnv
89−getStateContext = do
145+mkDatabaseContextEvalEnv = DatabaseContextEvalEnv
90− (ctx,_, _) <- get
146+
91− pure ctx
147+type DatabaseContextEvalMonad a = RWST DatabaseContextEvalEnv () DatabaseContextEvalState (ExceptT RelationalError Identity) a
93−putStateContext :: DatabaseContext -> DatabaseState ()
149+runDatabaseContextEvalMonad :: DatabaseContext -> DatabaseContextEvalEnv -> DatabaseContextEvalMonad () -> Either RelationalError DatabaseContextEvalState
94−putStateContext ctx = do
150+runDatabaseContextEvalMonad ctx env m = runIdentity (runExceptT (fst <$> execRWST m env freshEnv))
95− (_, accum, _) <- get
151+ where
96− put (ctx, accum, True)
152+ freshEnv = mkDatabaseContextEvalState ctx
98−type RelationalExprState a = Reader RelationalExprStateElems a
100−stateElemsContext :: RelationalExprStateElems -> DatabaseContext
101−stateElemsContext (RelationalExprStateTupleElems ctx _) = ctx
102−stateElemsContext (RelationalExprStateElems ctx) = ctx
103−stateElemsContext (RelationalExprStateAttrsElems ctx _) = ctx
105−setStateElemsContext :: RelationalExprStateElems -> DatabaseContext -> RelationalExprStateElems
106−setStateElemsContext (RelationalExprStateTupleElems _ tup) ctx = RelationalExprStateTupleElems ctx tup
107−setStateElemsContext (RelationalExprStateElems _) ctx = RelationalExprStateElems ctx
108−setStateElemsContext (RelationalExprStateAttrsElems _ attrs) ctx = RelationalExprStateAttrsElems ctx attrs
110−--relvar state is needed in evaluation of relational expression but only as read-only in order to extract current relvar values
111−evalRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError Relation)
112−evalRelationalExpr (RelationVariable name _) = do
113− relvarTable <- fmap (relationVariables . stateElemsContext) ask
114− return $ case M.lookup name relvarTable of
115− Just res -> Right res
116− Nothing -> Left $ RelVarNotDefinedError name
118−evalRelationalExpr (Project attrNames expr) = do
119− eAttrNameSet <- evalAttributeNames attrNames expr
120− case eAttrNameSet of
121− Left err -> pure (Left err)
122− Right attrNameSet -> do
123− rel <- evalRelationalExpr expr
125− Right rel2 -> pure $ project attrNameSet rel2
126− Left err -> pure $ Left err
128−evalRelationalExpr (Union exprA exprB) = do
129− relA <- evalRelationalExpr exprA
130− relB <- evalRelationalExpr exprB
132− Left err -> return $ Left err
133− Right relA2 -> case relB of
134− Left err -> return $ Left err
135− Right relB2 -> return $ union relA2 relB2
137−evalRelationalExpr (Join exprA exprB) = do
138− relA <- evalRelationalExpr exprA
139− relB <- evalRelationalExpr exprB
141− Left err -> return $ Left err
142− Right relA2 -> case relB of
143− Left err -> return $ Left err
144− Right relB2 -> return $ join relA2 relB2
146−evalRelationalExpr (Difference exprA exprB) = do
147− relA <- evalRelationalExpr exprA
148− relB <- evalRelationalExpr exprB
150− Left err -> return $ Left err
151− Right relA2 -> case relB of
152− Left err -> return $ Left err
153− Right relB2 -> return $ difference relA2 relB2
155−evalRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
156− case mkRelation attributeSet tupleSet of
157− Right rel -> return $ Right rel
158− Left err -> return $ Left err
160−evalRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
154+
161− currentContext <- fmap stateElemsContext ask
155+dbcTransId :: DatabaseContextEvalMonad TransactionId
162− let tConss = typeConstructorMapping currentContext
156+dbcTransId = dce_transId <$> RWS.ask
163− -- 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
157+
164− runExceptT $ do
158+dbcGraph :: DatabaseContextEvalMonad TransactionGraph
165− mAttrs <- case mAttrExprs of
159+dbcGraph = dce_graph <$> RWS.ask
167− Just . A.attributesFromList <$> mapM (either throwE pure . evalAttrExpr tConss) (fromMaybe [] mAttrExprs)
161+dbcRelationalExprEnv :: DatabaseContextEvalMonad RelationalExprEnv
168− Nothing -> pure Nothing
162+dbcRelationalExprEnv =
169− tuples <- mapM (liftE . evalTupleExpr mAttrs) tupleExprs
163+ mkRelationalExprEnv <$> getStateContext <*> dbcGraph
170− let attrs = fromMaybe firstTupleAttrs mAttrs
164+
171− firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
165+getStateContext :: DatabaseContextEvalMonad DatabaseContext
172− either throwE pure (mkRelation attrs (RelationTupleSet tuples))
166+getStateContext = gets dbc_context
168+putStateContext :: DatabaseContext -> DatabaseContextEvalMonad ()
169+putStateContext ctx' = do
171+ put (s {dbc_context = ctx', dbc_dirty = True})
173+-- | The context is optionally passed down along in cases where the current context is uncommitted.
174+data GraphRefRelationalExprEnv =
175+ GraphRefRelationalExprEnv {
176+ gre_context :: Maybe DatabaseContext,
177+ gre_graph :: TransactionGraph,
178+ gre_extra :: Maybe (Either RelationTuple Attributes)
174−evalRelationalExpr (ExistingRelation rel) = pure (Right rel)
181+type GraphRefRelationalExprM a = ReaderT GraphRefRelationalExprEnv (ExceptT RelationalError Identity) a
176−evalRelationalExpr (Rename oldAttrName newAttrName relExpr) = do
183+gfTransForId :: TransactionId -> GraphRefRelationalExprM Transaction
177− evald <- evalRelationalExpr relExpr
184+gfTransForId tid = do
178− case evald of
185+ graph <- gfGraph
179− Right rel -> return $ rename oldAttrName newAttrName rel
186+ lift $ except $ transactionForId tid graph
180− Left err -> return $ Left err
182−evalRelationalExpr (Group oldAttrNames newAttrName relExpr) = do
188+gfDatabaseContextForMarker :: GraphRefTransactionMarker -> GraphRefRelationalExprM DatabaseContext
183− eOldAttrNameSet <- evalAttributeNames oldAttrNames relExpr
189+gfDatabaseContextForMarker (TransactionMarker transId) = concreteDatabaseContext <$> gfTransForId transId
184− case eOldAttrNameSet of
190+gfDatabaseContextForMarker UncommittedContextMarker = do
185− Left err -> pure (Left err)
191+ mctx <- gre_context <$> askEnv
186− Right oldAttrNameSet -> do
187− evald <- evalRelationalExpr relExpr
189− Right rel -> return $ group oldAttrNameSet newAttrName rel
190− Left err -> return $ Left err
192−evalRelationalExpr (Ungroup attrName relExpr) = do
193− evald <- evalRelationalExpr relExpr
195− Right rel -> return $ ungroup attrName rel
196− Left err -> return $ Left err
198−evalRelationalExpr (Restrict predicateExpr relExpr) = do
199− evald <- evalRelationalExpr relExpr
201− Left err -> return $ Left err
203− eFilterFunc <- predicateRestrictionFilter (attributes rel) predicateExpr
205− Left err -> return $ Left err
207− pure (restrict filterfunc rel)
209−evalRelationalExpr (Equals relExprA relExprB) = do
210− evaldA <- evalRelationalExpr relExprA
211− evaldB <- evalRelationalExpr relExprB
213− Left err -> return $ Left err
214− Right relA -> case evaldB of
215− Left err -> return $ Left err
216− Right relB -> return $ Right $ if relA == relB then relationTrue else relationFalse
218−--warning: copy-pasta from above- refactor
219−evalRelationalExpr (NotEquals relExprA relExprB) = do
220− evaldA <- evalRelationalExpr relExprA
221− evaldB <- evalRelationalExpr relExprB
222− case evaldA of
192+ case mctx of
223− Left err -> return $ Left err
193+ Nothing -> throwError NoUncommittedContextInEvalError
224− Right relA -> case evaldB of
194+ Just ctx -> pure ctx
225− Left err -> return $ Left err
195+
226− Right relB -> return $ Right $ if relA /= relB then relationTrue else relationFalse
196+runGraphRefRelationalExprM :: GraphRefRelationalExprEnv -> GraphRefRelationalExprM a -> Either RelationalError a
227−
197+runGraphRefRelationalExprM env m = runIdentity (runExceptT (runReaderT m env))
228−-- extending a relation adds a single attribute with the results of the per-tuple expression evaluated
198+
229−evalRelationalExpr (Extend tupleExpression relExpr) = do
199+freshGraphRefRelationalExprEnv :: Maybe DatabaseContext -> TransactionGraph -> GraphRefRelationalExprEnv
230− rstate <- ask
200+freshGraphRefRelationalExprEnv mctx graph = GraphRefRelationalExprEnv {
231− let evald = runReader (evalRelationalExpr relExpr) rstate
201+ gre_context = mctx,
232− case evald of
202+ gre_graph = graph,
233− Left err -> pure (Left err)
203+ gre_extra = Nothing
234− Right rel -> do
204+ }
235− tupProc <- extendTupleExpressionProcessor rel tupleExpression
205+
236− case tupProc of
206+gfGraph :: GraphRefRelationalExprM TransactionGraph
237− Left err -> pure (Left err)
207+gfGraph = asks gre_graph
238− Right (newAttrs, tupProc') -> pure $ relMogrify tupProc' newAttrs rel
208+
209+envContext :: RelationalExprEnv -> DatabaseContext
210+envContext = re_context
212+setEnvContext :: RelationalExprEnv -> DatabaseContext -> RelationalExprEnv
213+setEnvContext e ctx = e { re_context = ctx }
240--helper function to process relation variable creation/assignment
215--helper function to process relation variable creation/assignment
241−setRelVar :: RelVarName -> Relation -> DatabaseState (Either RelationalError ())
216+setRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
242−setRelVar relVarName rel = do
217+setRelVar relVarName relExpr = do
243 currentContext <- getStateContext
218 currentContext <- getStateContext
219+ --prevent recursive relvar definition by resolving references to relvars in previous states
220+ relExpr' <- resolve relExpr
244− let newRelVars = M.insert relVarName rel $ relationVariables currentContext
221+ let newRelVars = M.insert relVarName relExpr' $ relationVariables currentContext
245 potentialContext = currentContext { relationVariables = newRelVars }
222 potentialContext = currentContext { relationVariables = newRelVars }
246−
223+ --optimization: if the relexpr is unchanged, skip the update
224+ if M.lookup relVarName (relationVariables currentContext) == Just relExpr then
227+ --determine when to check constraints
247− case checkConstraints potentialContext of
230+ case checkConstraints potentialContext tid graph of
248− Left err -> pure (Left err)
231+ Left err -> dbErr err
250− putStateContext potentialContext
232+ Right _ -> putStateContext potentialContext
251− 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 ()
253-- 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
254−deleteRelVar :: RelVarName -> DatabaseState (Either RelationalError ())
238+deleteRelVar :: RelVarName -> DatabaseContextEvalMonad ()
255deleteRelVar relVarName = do
239deleteRelVar relVarName = do
256 currContext <- getStateContext
240 currContext <- getStateContext
257 let relVars = relationVariables currContext
241 let relVars = relationVariables currContext
258 if M.notMember relVarName relVars then
242 if M.notMember relVarName relVars then
259− pure (Right ())
243+ pure ()
261 let newRelVars = M.delete relVarName relVars
245 let newRelVars = M.delete relVarName relVars
262 newContext = currContext { relationVariables = newRelVars }
246 newContext = currContext { relationVariables = newRelVars }
263 putStateContext newContext
247 putStateContext newContext
264− pure (Right ())
248+ pure ()
266−evalDatabaseContextExpr :: DatabaseContextExpr -> DatabaseState (Either RelationalError ())
250+evalGraphRefDatabaseContextExpr :: GraphRefDatabaseContextExpr -> DatabaseContextEvalMonad ()
267−evalDatabaseContextExpr NoOperation = pure (Right ())
251+evalGraphRefDatabaseContextExpr NoOperation = pure ()
269−evalDatabaseContextExpr (Define relVarName attrExprs) = do
253+evalGraphRefDatabaseContextExpr (Define relVarName attrExprs) = do
254+ context <- getStateContext
270 relvars <- fmap relationVariables getStateContext
255 relvars <- fmap relationVariables getStateContext
271 tConss <- fmap typeConstructorMapping getStateContext
256 tConss <- fmap typeConstructorMapping getStateContext
272− let eAttrs = map (evalAttrExpr tConss) attrExprs
257+ graph <- dbcGraph
273− attrErrs = lefts eAttrs
258+ let eAttrs = runGraphRefRelationalExprM gfEnv (mapM evalGraphRefAttrExpr attrExprs)
274− attrsList = rights eAttrs
259+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
275− if not (null attrErrs) then
260+ case eAttrs of
276− pure (Left (someErrors attrErrs))
261+ Left err -> dbErr err
277− else do
262+ Right attrsList -> do
278− let atomTypeErrs = lefts $ map ((`validateAtomType` tConss) . A.atomType) attrsList
263+ lift $ except $ validateAttributes tConss (A.attributesFromList attrsList)
279− if not (null atomTypeErrs) then
280− pure (Left (someErrors atomTypeErrs))
282− case M.member relVarName relvars of
264+ case M.member relVarName relvars of
283− True -> pure (Left (RelVarAlreadyDefinedError relVarName))
265+ True -> dbErr (RelVarAlreadyDefinedError relVarName)
284− False -> setRelVar relVarName emptyRelation >> pure (Right ())
266+ False -> setRelVar relVarName (ExistingRelation emptyRelation)
286 attrs = A.attributesFromList attrsList
268 attrs = A.attributesFromList attrsList
287 emptyRelation = Relation attrs emptyTupleSet
269 emptyRelation = Relation attrs emptyTupleSet
289−evalDatabaseContextExpr (Undefine relVarName) = deleteRelVar relVarName
271+evalGraphRefDatabaseContextExpr (Undefine relVarName) = deleteRelVar relVarName
291−evalDatabaseContextExpr (Assign relVarName expr) = do
273+evalGraphRefDatabaseContextExpr (Assign relVarName expr) = do
292− -- in the future, it would be nice to get types from the RelationalExpr instead of needing to evaluate it
274+ graph <- re_graph <$> dbcRelationalExprEnv
293 context <- getStateContext
275 context <- getStateContext
294− let existingRelVar = M.lookup relVarName relVarTable
276+ let existingRelVar = M.lookup relVarName (relationVariables context)
295− relVarTable = relationVariables context
277+ reEnv = freshGraphRefRelationalExprEnv (Just context) graph
296− value = runReader (evalRelationalExpr expr) (RelationalExprStateElems context)
278+ eNewExprType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr expr)
298− Left err -> pure (Left err)
299− Right rel -> case existingRelVar of
279+ case existingRelVar of
281+ case runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr expr) of
282+ Left err -> dbErr err
284+ lift $ except $ validateAttributes (typeConstructorMapping context) (attributes reltype)
300− Nothing -> setRelVar relVarName rel
285+ setRelVar relVarName expr
301− Just existingRel -> let expectedAttributes = attributes existingRel
286+ Just existingRel -> do
302− foundAttributes = attributes rel in
287+ let eExpectedType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr existingRel)
303− if A.attributesEqual expectedAttributes foundAttributes then
288+ case eExpectedType of
289+ Left err -> dbErr err
290+ Right expectedType ->
291+ case eNewExprType of
292+ Left err -> dbErr err
293+ Right newExprType -> do
294+ if newExprType == expectedType then do
295+ lift $ except $ validateAttributes (typeConstructorMapping context) (attributes newExprType)
304− setRelVar relVarName rel
296+ setRelVar relVarName expr
306− pure (Left (RelationTypeMismatchError expectedAttributes foundAttributes))
298+ dbErr (RelationTypeMismatchError (attributes expectedType) (attributes newExprType))
308−evalDatabaseContextExpr (Insert relVarName relExpr) = do
309− context <- getStateContext
310− let unionexp = Union relExpr rv
311− rv = RelationVariable relVarName ()
312− unioned = runReader (evalRelationalExpr unionexp) (RelationalExprStateElems context)
313− origRel = runReader (evalRelationalExpr rv) (RelationalExprStateElems context)
315− Left err -> pure (Left err)
316− Right unioned' -> case origRel of
317− Left err -> pure (Left err)
318− Right origRel' -> if cardinality unioned' == cardinality origRel' then --no tuples actually inserted
321− evalDatabaseContextExpr $ Assign relVarName (ExistingRelation unioned')
323−evalDatabaseContextExpr (Delete relVarName predicate) = do
324− context <- getStateContext
325− let rv = RelationVariable relVarName ()
326− let updatedRel = runReader (evalRelationalExpr (Restrict (NotPredicate predicate) rv)) (RelationalExprStateElems context)
327− origRel = runReader (evalRelationalExpr rv) (RelationalExprStateElems context)
329− Left err -> pure (Left err)
330− Right updatedRel' -> case origRel of
331− Left err -> pure (Left err)
332− Right origRel' -> if cardinality origRel' == cardinality updatedRel' then
335− setRelVar relVarName updatedRel'
300+evalGraphRefDatabaseContextExpr (Insert relVarName relExpr) = do
301+ gfExpr <- relVarByName relVarName
302+ let optExpr = applyUnionCollapse (Union
305+ evalGraphRefDatabaseContextExpr (Assign relVarName optExpr)
307+evalGraphRefDatabaseContextExpr (Delete relVarName predicate) = do
308+ gfExpr <- relVarByName relVarName
309+ let optExpr = applyRestrictionCollapse (Restrict (NotPredicate predicate) gfExpr)
310+ setRelVar relVarName optExpr
337--union of restricted+updated portion and the unrestricted+unupdated portion
312--union of restricted+updated portion and the unrestricted+unupdated portion
338−evalDatabaseContextExpr (Update relVarName atomExprMap restrictionPredicateExpr) = do
313+evalGraphRefDatabaseContextExpr (Update relVarName atomExprMap pred') = do
314+ rvExpr <- relVarByName relVarName
315+ graph <- re_graph <$> dbcRelationalExprEnv
339 context <- getStateContext
316 context <- getStateContext
340− let relVarTable = relationVariables context
317+ let reEnv = freshGraphRefRelationalExprEnv (Just context) graph
341− case M.lookup relVarName relVarTable of
318+ --get the current attributes name in the relvar to ensure that we don't conflict when renaming
342− Nothing -> pure (Left (RelVarNotDefinedError relVarName))
319+ eExprType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr rvExpr)
343− Just rel ->
320+ exprType' <- case eExprType of
344− case runReader (predicateRestrictionFilter (attributes rel) restrictionPredicateExpr) (RelationalExprStateElems context) of
321+ Left err -> throwError err
345− Left err -> pure (Left err)
322+ Right t -> pure t
346− Right predicateFunc -> do
323+ let unrestrictedPortion = Restrict (NotPredicate pred') rvExpr
347− let ret = do
324+ tmpAttr = tmpAttrC 1
348− restrictedPortion <- restrict predicateFunc rel
325+ tmpAttrC :: Int -> AttributeName -> AttributeName
349− if cardinality restrictedPortion == Finite 0 then
326+ tmpAttrC c attr =
350− pure Nothing
327+ let tmpAttrName = "_tmp_" <> T.pack (show c) <> attr in
328+ if tmpAttrName `S.member` A.attributeNameSet (attributes exprType') then
352− unrestrictedPortion <- restrict (predicateFunc >=> (pure . not)) rel
331+ tmpAttrName
353− updatedPortion <- relMap (updateTupleWithAtomExprs atomExprMap context) restrictedPortion
332+ updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)
354− updatedRel <- updatedPortion `union` unrestrictedPortion
333+ projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)
355− pure (Just updatedRel)
334+ restrictedPortion = Restrict pred' rvExpr
356− case ret of
335+ updated = foldr (\(oldname, atomExpr) accum ->
357− Left err -> pure (Left err)
336+ let procAtomExpr = runProcessExprM UncommittedContextMarker (processAtomExpr atomExpr) in
358− Right Nothing -> pure (Right ())
337+ updateAttr oldname procAtomExpr accum
359− Right (Just updatedRel) -> setRelVar relVarName updatedRel
338+ ) restrictedPortion (M.toList atomExprMap)
339+ -- the atomExprMap could reference other attributes, so we must perform multi-pass folds
340+ updatedPortion = foldr projectAndRename updated (M.keys atomExprMap)
341+ setRelVar relVarName (Union unrestrictedPortion updatedPortion)
361−evalDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do
343+evalGraphRefDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do
362 currContext <- getStateContext
344 currContext <- getStateContext
345+ transId <- dbcTransId
363 let currDeps = inclusionDependencies currContext
347 let currDeps = inclusionDependencies currContext
364 newDeps = M.insert newDepName newDep currDeps
348 newDeps = M.insert newDepName newDep currDeps
365 if M.member newDepName currDeps then
349 if M.member newDepName currDeps then
366− pure (Left (InclusionDependencyNameInUseError newDepName))
350+ dbErr (InclusionDependencyNameInUseError newDepName)
368 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
369− case checkConstraints potentialContext of
355+ case checkConstraints potentialContext transId graph of
370− Left err -> pure (Left err)
356+ Left err -> dbErr err
371− Right _ -> do
357+ Right _ ->
372 putStateContext potentialContext
358 putStateContext potentialContext
375−evalDatabaseContextExpr (RemoveInclusionDependency depName) = do
360+evalGraphRefDatabaseContextExpr (RemoveInclusionDependency depName) = do
376 currContext <- getStateContext
361 currContext <- getStateContext
377 let currDeps = inclusionDependencies currContext
362 let currDeps = inclusionDependencies currContext
378 newDeps = M.delete depName currDeps
363 newDeps = M.delete depName currDeps
379 if M.notMember depName currDeps then
364 if M.notMember depName currDeps then
380− pure (Left (InclusionDependencyNameNotInUseError depName))
365+ dbErr (InclusionDependencyNameNotInUseError depName)
382 putStateContext $ currContext {inclusionDependencies = newDeps }
367 putStateContext $ currContext {inclusionDependencies = newDeps }
385-- | 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.
386−evalDatabaseContextExpr (AddNotification notName triggerExpr resultOldExpr resultNewExpr) = do
370+evalGraphRefDatabaseContextExpr (AddNotification notName triggerExpr resultOldExpr resultNewExpr) = do
387 currentContext <- getStateContext
371 currentContext <- getStateContext
388 let nots = notifications currentContext
372 let nots = notifications currentContext
389 if M.member notName nots then
373 if M.member notName nots then
390− pure (Left (NotificationNameInUseError notName))
374+ dbErr (NotificationNameInUseError notName)
392 let newNotifications = M.insert notName newNotification nots
376 let newNotifications = M.insert notName newNotification nots
393 newNotification = Notification { changeExpr = triggerExpr,
377 newNotification = Notification { changeExpr = triggerExpr,
394 reportOldExpr = resultOldExpr,
378 reportOldExpr = resultOldExpr,
395 reportNewExpr = resultNewExpr}
379 reportNewExpr = resultNewExpr}
396 putStateContext $ currentContext { notifications = newNotifications }
380 putStateContext $ currentContext { notifications = newNotifications }
399−evalDatabaseContextExpr (RemoveNotification notName) = do
382+evalGraphRefDatabaseContextExpr (RemoveNotification notName) = do
400 currentContext <- getStateContext
383 currentContext <- getStateContext
401 let nots = notifications currentContext
384 let nots = notifications currentContext
402 if M.notMember notName nots then
385 if M.notMember notName nots then
403− pure (Left (NotificationNameNotInUseError notName))
386+ dbErr (NotificationNameNotInUseError notName)
405 let newNotifications = M.delete notName nots
388 let newNotifications = M.delete notName nots
406 putStateContext $ currentContext { notifications = newNotifications }
389 putStateContext $ currentContext { notifications = newNotifications }
409-- | Adds type and data constructors to the database context.
392-- | Adds type and data constructors to the database context.
410-- 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!
411−evalDatabaseContextExpr (AddTypeConstructor tConsDef dConsDefList) = do
394+evalGraphRefDatabaseContextExpr (AddTypeConstructor tConsDef dConsDefList) = do
412 currentContext <- getStateContext
395 currentContext <- getStateContext
413 let oldTypes = typeConstructorMapping currentContext
396 let oldTypes = typeConstructorMapping currentContext
414 tConsName = TCD.name tConsDef
397 tConsName = TCD.name tConsDef
415 -- validate that the constructor's types exist
398 -- validate that the constructor's types exist
416− case validateTypeConstructorDef tConsDef dConsDefList of
399+ case validateTypeConstructorDef tConsDef dConsDefList oldTypes of
417− errs@(_:_) -> pure (Left (someErrors errs))
400+ Left err -> throwError err
418− [] | 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)
419− | isJust (findTypeConstructor tConsName oldTypes) -> pure (Left (AtomTypeNameInUseError tConsName))
402+ | isJust (findTypeConstructor tConsName oldTypes) -> dbErr (AtomTypeNameInUseError tConsName)
420 | otherwise -> do
403 | otherwise -> do
421 let newTypes = oldTypes ++ [(tConsDef, dConsDefList)]
404 let newTypes = oldTypes ++ [(tConsDef, dConsDefList)]
422 putStateContext $ currentContext { typeConstructorMapping = newTypes }
405 putStateContext $ currentContext { typeConstructorMapping = newTypes }
425-- | 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.
426−evalDatabaseContextExpr (RemoveTypeConstructor tConsName) = do
408+evalGraphRefDatabaseContextExpr (RemoveTypeConstructor tConsName) = do
427 currentContext <- getStateContext
409 currentContext <- getStateContext
428 let oldTypes = typeConstructorMapping currentContext
410 let oldTypes = typeConstructorMapping currentContext
429 if isNothing (findTypeConstructor tConsName oldTypes) then
411 if isNothing (findTypeConstructor tConsName oldTypes) then
430− pure (Left (AtomTypeNameNotInUseError tConsName))
412+ dbErr (AtomTypeNameNotInUseError tConsName)
432 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes
414 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes
433 putStateContext $ currentContext { typeConstructorMapping = newTypes }
415 putStateContext $ currentContext { typeConstructorMapping = newTypes }
436−evalDatabaseContextExpr (MultipleExpr exprs) = do
417+evalGraphRefDatabaseContextExpr (MultipleExpr exprs) =
437 --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
438− evald <- forM exprs evalDatabaseContextExpr
419+ mapM_ evalGraphRefDatabaseContextExpr exprs
439− --some lifting magic needed here
420+
441− [] -> pure (Right ())
442− errs -> pure (Left (someErrors errs))
444−evalDatabaseContextExpr (RemoveAtomFunction funcName) = do
421+evalGraphRefDatabaseContextExpr (RemoveAtomFunction funcName) = do
445 currentContext <- getStateContext
422 currentContext <- getStateContext
446 let atomFuncs = atomFunctions currentContext
423 let atomFuncs = atomFunctions currentContext
447 case atomFunctionForName funcName atomFuncs of
424 case atomFunctionForName funcName atomFuncs of
448− Left err -> pure (Left err)
425+ Left err -> dbErr err
449− Right realFunc -> if isScriptedAtomFunction realFunc then do
427+ if isScriptedAtomFunction realFunc then do
450− let updatedFuncs = HS.delete realFunc atomFuncs
428+ let updatedFuncs = HS.delete realFunc atomFuncs
451− putStateContext (currentContext {atomFunctions = updatedFuncs })
429+ putStateContext (currentContext {atomFunctions = updatedFuncs })
454− pure (Left (PrecompiledFunctionRemoveError funcName))
431+ dbErr (PrecompiledFunctionRemoveError funcName)
456−evalDatabaseContextExpr (RemoveDatabaseContextFunction funcName) = do
433+evalGraphRefDatabaseContextExpr (RemoveDatabaseContextFunction funcName) = do
457 context <- getStateContext
434 context <- getStateContext
458 let dbcFuncs = dbcFunctions context
435 let dbcFuncs = dbcFunctions context
459 case databaseContextFunctionForName funcName dbcFuncs of
436 case databaseContextFunctionForName funcName dbcFuncs of
460− Left err -> pure (Left err)
437+ Left err -> dbErr err
461− Right realFunc -> if isScriptedDatabaseContextFunction realFunc then do
439+ if isScriptedDatabaseContextFunction realFunc then do
462− let updatedFuncs = HS.delete realFunc dbcFuncs
440+ let updatedFuncs = HS.delete realFunc dbcFuncs
463− putStateContext (context { dbcFunctions = updatedFuncs })
441+ putStateContext (context { dbcFunctions = updatedFuncs })
466− pure (Left (PrecompiledFunctionRemoveError funcName))
443+ dbErr (PrecompiledFunctionRemoveError funcName)
468−evalDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) = do
445+evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) = do
469 context <- getStateContext
446 context <- getStateContext
470 --resolve atom arguments
448 --resolve atom arguments
471− let relExprState = mkRelationalExprState context
449+ let eAtomTypes = mapM (runGraphRefRelationalExprM gfEnv . typeForGraphRefAtomExpr emptyAttributes) atomArgExprs
472− eAtomTypes = map (\atomExpr -> runReader (typeFromAtomExpr emptyAttributes atomExpr) relExprState) atomArgExprs
473 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)
450 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)
451+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
474 case eFunc of
452 case eFunc of
475− Left err -> pure (Left err)
453+ Left err -> dbErr err
476 Right func -> do
454 Right func -> do
477 let expectedArgCount = length (dbcFuncType func)
455 let expectedArgCount = length (dbcFuncType func)
478 actualArgCount = length atomArgExprs
456 actualArgCount = length atomArgExprs
479 if expectedArgCount /= actualArgCount then
457 if expectedArgCount /= actualArgCount then
480− pure (Left (FunctionArgumentCountMismatchError expectedArgCount actualArgCount))
458+ dbErr (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
482 --check that the atom types are valid
460 --check that the atom types are valid
483− case lefts eAtomTypes of
461+ case eAtomTypes of
484− _:_ -> pure (Left (someErrors (lefts eAtomTypes)))
462+ Left err -> dbErr err
485− [] -> do
463+ Right atomTypes -> do
486− let atomTypes = rights eAtomTypes
464+ let mValidTypes = zipWith (\ expType actType
487− let mValidTypes = map (\(expType, actType) -> case atomTypeVerify expType actType of
465+ -> case atomTypeVerify expType actType of
488− Left err -> Just err
466+ Left err -> Just err
489− Right _ -> Nothing) (zip (dbcFuncType func) atomTypes)
468+ (dbcFuncType func) atomTypes
490− typeErrors = catMaybes mValidTypes
469+ typeErrors = catMaybes mValidTypes
491− eAtomArgs = map (\arg -> runReader (evalAtomExpr emptyTuple arg) relExprState) atomArgExprs
470+ eAtomArgs = map (runGraphRefRelationalExprM gfEnv . evalGraphRefAtomExpr emptyTuple) atomArgExprs
492 if length (lefts eAtomArgs) > 1 then
471 if length (lefts eAtomArgs) > 1 then
493− pure (Left (someErrors (lefts eAtomArgs)))
472+ dbErr (someErrors (lefts eAtomArgs))
494 else if not (null typeErrors) then
473 else if not (null typeErrors) then
495− pure (Left (someErrors typeErrors))
474+ dbErr (someErrors typeErrors)
497 case evalDatabaseContextFunction func (rights eAtomArgs) context of
476 case evalDatabaseContextFunction func (rights eAtomArgs) context of
498− Left err -> pure (Left err)
477+ Left err -> dbErr err
499− Right newContext -> putStateContext newContext >> pure (Right ())
478+ Right newContext -> putStateContext newContext
500−
479+data DatabaseContextIOEvalEnv = DatabaseContextIOEvalEnv
501−evalDatabaseContextIOExpr :: Maybe ScriptSession -> DatabaseContext -> 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))
502−evalDatabaseContextIOExpr mScriptSession currentContext (AddAtomFunction funcName funcType script) =
523+evalGraphRefDatabaseContextIOExpr (AddAtomFunction funcName funcType script) = do
503− case mScriptSession of
524+ eScriptSession <- requireScriptSession
504− Nothing -> pure (Left (ScriptError ScriptCompilationDisabledError))
525+ currentContext <- getDBCIOContext
526+ case eScriptSession of
527+ Left err -> pure (Left err)
505− Just scriptSession -> do
528+ Right scriptSession -> do
506− res <- try $ runGhc (Just libdir) $ do
529+ res <- liftIO $ try $ runGhc (Just libdir) $ do
507 setSession (hscEnv scriptSession)
530 setSession (hscEnv scriptSession)
508 let atomFuncs = atomFunctions currentContext
531 let atomFuncs = atomFunctions currentContext
509 case extractAtomFunctionType funcType of
532 case extractAtomFunctionType funcType of
@@ -514,7 +537,7 @@ evalDatabaseContextIOExpr mScriptSession currentContext (AddAtomFunction funcNam
514 pure $ case eCompiledFunc of
537 pure $ case eCompiledFunc of
515 Left err -> Left (ScriptError err)
538 Left err -> Left (ScriptError err)
516 Right compiledFunc -> do
539 Right compiledFunc -> do
517− funcAtomType <- mapM (\funcTypeArg -> atomTypeForTypeConstructor funcTypeArg (typeConstructorMapping currentContext) M.empty) adjustedAtomTypeCons
540+ funcAtomType <- mapM (\funcTypeArg -> atomTypeForTypeConstructorValidate False funcTypeArg (typeConstructorMapping currentContext) M.empty) adjustedAtomTypeCons
518 let updatedFuncs = HS.insert newAtomFunc atomFuncs
541 let updatedFuncs = HS.insert newAtomFunc atomFuncs
519 newContext = currentContext { atomFunctions = updatedFuncs }
542 newContext = currentContext { atomFunctions = updatedFuncs }
520 newAtomFunc = AtomFunction { atomFuncName = funcName,
543 newAtomFunc = AtomFunction { atomFuncName = funcName,
@@ -529,12 +552,13 @@ evalDatabaseContextIOExpr mScriptSession currentContext (AddAtomFunction funcNam
529 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
552 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
530 Right eContext -> case eContext of
553 Right eContext -> case eContext of
531 Left err -> pure (Left err)
554 Left err -> pure (Left err)
532− Right context' -> pure (Right context')
555+ Right context' -> putDBCIOContext context'
534−evalDatabaseContextIOExpr mScriptSession currentContext (AddDatabaseContextFunction funcName funcType script) =
556+evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType script) = do
535− case mScriptSession of
557+ eScriptSession <- requireScriptSession
536− Nothing -> pure (Left (ScriptError ScriptCompilationDisabledError))
558+ currentContext <- getDBCIOContext
559+ case eScriptSession of
560+ Left err -> pure (Left err)
537− Just scriptSession -> do
561+ Right scriptSession -> do
538 --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
539 let last2Args = reverse (take 2 (reverse funcType))
563 let last2Args = reverse (take 2 (reverse funcType))
540 atomArgs = take (length funcType - 2) funcType
564 atomArgs = take (length funcType - 2) funcType
@@ -544,7 +568,7 @@ evalDatabaseContextIOExpr mScriptSession currentContext (AddDatabaseContextFunct
544 if last2Args /= [ADTypeConstructor "DatabaseContext" [], dbContextTypeCons] then
568 if last2Args /= [ADTypeConstructor "DatabaseContext" [], dbContextTypeCons] then
545 pure (Left (ScriptError (TypeCheckCompilationError expectedType actualType)))
569 pure (Left (ScriptError (TypeCheckCompilationError expectedType actualType)))
547− res <- try $ runGhc (Just libdir) $ do
571+ res <- liftIO $ try $ runGhc (Just libdir) $ do
548 setSession (hscEnv scriptSession)
572 setSession (hscEnv scriptSession)
549 eCompiledFunc <- compileScript (dbcFunctionBodyType scriptSession) script
573 eCompiledFunc <- compileScript (dbcFunctionBodyType scriptSession) script
550 pure $ case eCompiledFunc of
574 pure $ case eCompiledFunc of
@@ -569,68 +593,86 @@ evalDatabaseContextIOExpr mScriptSession currentContext (AddDatabaseContextFunct
569 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
593 Left (exc :: SomeException) -> pure $ Left (ScriptError (OtherScriptCompilationError (show exc)))
570 Right eContext -> case eContext of
594 Right eContext -> case eContext of
571 Left err -> pure (Left err)
595 Left err -> pure (Left err)
572− Right context' -> pure (Right context')
596+ Right context' -> putDBCIOContext context'
573−evalDatabaseContextIOExpr _ currentContext (LoadAtomFunctions modName funcName modPath) = do
597+evalGraphRefDatabaseContextIOExpr (LoadAtomFunctions modName funcName modPath) = do
598+ currentContext <- getDBCIOContext
574− eLoadFunc <- loadAtomFunctions (T.unpack modName) (T.unpack funcName) modPath
599+ eLoadFunc <- liftIO $ loadAtomFunctions (T.unpack modName) (T.unpack funcName) modPath
575 case eLoadFunc of
600 case eLoadFunc of
576 Left LoadSymbolError -> pure (Left LoadFunctionError)
601 Left LoadSymbolError -> pure (Left LoadFunctionError)
577 Right atomFunctionListFunc -> let newContext = currentContext { atomFunctions = mergedFuncs }
602 Right atomFunctionListFunc -> let newContext = currentContext { atomFunctions = mergedFuncs }
578 mergedFuncs = HS.union (atomFunctions currentContext) (HS.fromList atomFunctionListFunc)
603 mergedFuncs = HS.union (atomFunctions currentContext) (HS.fromList atomFunctionListFunc)
579− in pure (Right newContext)
604+ in putDBCIOContext newContext
580−evalDatabaseContextIOExpr _ currentContext (LoadDatabaseContextFunctions modName funcName modPath) = do
605+evalGraphRefDatabaseContextIOExpr (LoadDatabaseContextFunctions modName funcName modPath) = do
606+ currentContext <- getDBCIOContext
581− eLoadFunc <- loadDatabaseContextFunctions (T.unpack modName) (T.unpack funcName) modPath
607+ eLoadFunc <- liftIO $ loadDatabaseContextFunctions (T.unpack modName) (T.unpack funcName) modPath
582 case eLoadFunc of
608 case eLoadFunc of
583 Left LoadSymbolError -> pure (Left LoadFunctionError)
609 Left LoadSymbolError -> pure (Left LoadFunctionError)
584 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }
610 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }
585 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)
611 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)
586− in pure (Right newContext)
612+ in putDBCIOContext newContext
588−evalDatabaseContextIOExpr _ currentContext (CreateArbitraryRelation relVarName attrExprs range) =
614+evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs range) = do
590− case runState ( evalDatabaseContextExpr (Define relVarName attrExprs)) (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
591− (Left err,_) -> pure (Left err)
623+ Left err -> pure (Left err)
592− (Right (), elems@(ctx,_,_)) -> do
624+ Right dbstate -> do
594 let existingRelVar = M.lookup relVarName relVarTable
626 let existingRelVar = M.lookup relVarName relVarTable
595− relVarTable = relationVariables ctx
627+ relVarTable = relationVariables (dbc_context dbstate)
596 case existingRelVar of
628 case existingRelVar of
597 Nothing -> pure $ Left (RelVarNotDefinedError relVarName)
629 Nothing -> pure $ Left (RelVarNotDefinedError relVarName)
598 Just existingRel -> do
630 Just existingRel -> do
599− let expectedAttributes = attributes existingRel
631+ let gfEnv = freshGraphRefRelationalExprEnv (Just currentContext) graph
632+ case runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr existingRel) of
633+ Left err -> pure (Left err)
635+ let expectedAttributes = attributes relType
600− let tcMap = typeConstructorMapping ctx
636+ tcMap = typeConstructorMapping (dbc_context dbstate)
601− eitherRel <- generate $ runReaderT (arbitraryRelation expectedAttributes range) tcMap
637+ eitherRel <- liftIO $ generate $ runReaderT (arbitraryRelation expectedAttributes range) tcMap
602− case eitherRel of
638+ case eitherRel of
603− Left err -> pure $ Left err
639+ Left err -> pure $ Left err
604− Right rel ->
640+ Right rel ->
605− case runState (setRelVar relVarName rel) elems of
641+ case runDatabaseContextEvalMonad currentContext evalEnv (setRelVar relVarName (ExistingRelation rel)) of
606− (Left err,_) -> pure (Left err)
642+ Left err -> pure (Left err)
607− (Right (), (ctx',_,_)) -> pure $ Right ctx'
643+ Right dbstate' -> putDBCIOContext (dbc_context dbstate')
609−updateTupleWithAtomExprs :: M.Map AttributeName AtomExpr -> DatabaseContext -> RelationTuple -> Either RelationalError RelationTuple
610−updateTupleWithAtomExprs exprMap context tupIn = do
611− --resolve all atom exprs
612− atomsAssoc <- mapM (\(attrName, atomExpr) -> do
613− atom <- runReader (evalAtomExpr tupIn atomExpr) (RelationalExprStateElems context)
614− pure (attrName, atom)
615− ) (M.toList exprMap)
616− pure (updateTupleWithAtoms (M.fromList atomsAssoc) tupIn)
618--run verification on all constraints
645--run verification on all constraints
619−checkConstraints :: DatabaseContext -> Either RelationalError ()
646+checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()
620−checkConstraints context = do
647+checkConstraints context transId graph@(TransactionGraph graphHeads transSet) = do
621 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.:| [],
624 deps = inclusionDependencies context
660 deps = inclusionDependencies context
625− 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
626− evalReader f = runReader f (RelationalExprStateElems context)
627 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)
628 --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.
629− typeSub <- evalReader (typeForRelationalExpr subsetExpr)
667+ let gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
630− typeSuper <- evalReader (typeForRelationalExpr supersetExpr)
668+ runGfRel = runGraphRefRelationalExprM gfEnv
669+ typeSub <- runGfRel (typeForGraphRefRelationalExpr gfSubsetExpr)
670+ typeSuper <- runGfRel (typeForGraphRefRelationalExpr gfSupersetExpr)
631 when (typeSub /= typeSuper) (Left (RelationTypeMismatchError (attributes typeSub) (attributes typeSuper)))
671 when (typeSub /= typeSuper) (Left (RelationTypeMismatchError (attributes typeSub) (attributes typeSuper)))
632− let checkExpr = Equals supersetExpr (Union subsetExpr supersetExpr)
672+ let checkExpr = Equals gfSupersetExpr (Union gfSubsetExpr gfSupersetExpr)
633− case eval checkExpr of
673+ gfEvald = runGraphRefRelationalExprM gfEnv' (evalGraphRefRelationalExpr checkExpr)
674+ gfEnv' = freshGraphRefRelationalExprEnv (Just context) potentialGraph
634 Left err -> Left err
676 Left err -> Left err
635 Right resultRel -> if resultRel == relationTrue then
677 Right resultRel -> if resultRel == relationTrue then
@@ -640,88 +682,81 @@ checkConstraints context = do
640-- 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
641-- 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
643−typeForRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError Relation)
685+typeForRelationalExpr :: RelationalExpr -> RelationalExprM Relation
644typeForRelationalExpr expr = do
686typeForRelationalExpr expr = do
646− let context = stateElemsContext rstate
647 --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
648− let context' = contextWithEmptyTupleSets context
688+ --evalRelationalExpr could still return an existing relation with tuples, so strip them
649− rstate' = setStateElemsContext rstate context'
689+ graph <- reGraph
650− pure (runReader (evalRelationalExpr expr) rstate')
690+ context <- reContext
651−
691+ let gfExpr = runProcessExprM UncommittedContextMarker (processRelationalExpr expr)
652−--returns a database context with all tuples removed
692+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
653−--this is useful for type checking and optimization
693+ runGf = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
654−contextWithEmptyTupleSets :: DatabaseContext -> DatabaseContext
694+ lift $ except runGf
655−contextWithEmptyTupleSets contextIn = contextIn { relationVariables = relVars }
657− relVars = M.map (\rel -> Relation (attributes rel) emptyTupleSet) (relationVariables contextIn)
659liftE :: (Monad m) => m (Either a b) -> ExceptT a m b
696liftE :: (Monad m) => m (Either a b) -> ExceptT a m b
660liftE v = do
697liftE v = do
661 y <- lift v
698 y <- lift v
662 case y of
699 case y of
663− Left err -> throwE err
700+ Left err -> throwError err
664 Right val -> pure val
701 Right val -> pure val
666{- 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 -}
667−predicateRestrictionFilter :: Attributes -> RestrictionPredicateExpr -> RelationalExprState (Either RelationalError RestrictionFilter)
704+predicateRestrictionFilter :: Attributes -> GraphRefRestrictionPredicateExpr -> GraphRefRelationalExprM RestrictionFilter
668−predicateRestrictionFilter attrs (AndPredicate expr1 expr2) =
705+predicateRestrictionFilter attrs (AndPredicate expr1 expr2) = do
670− expr1v <- liftE (predicateRestrictionFilter attrs expr1)
706+ expr1v <- predicateRestrictionFilter attrs expr1
671− expr2v <- liftE (predicateRestrictionFilter attrs expr2)
707+ expr2v <- predicateRestrictionFilter attrs expr2
672− pure (\x -> do
708+ pure (\x -> do
673− ev1 <- expr1v x
709+ ev1 <- expr1v x
674− ev2 <- expr2v x
710+ ev2 <- expr2v x
675− pure (ev1 && ev2))
711+ pure (ev1 && ev2))
677−predicateRestrictionFilter attrs (OrPredicate expr1 expr2) =
713+predicateRestrictionFilter attrs (OrPredicate expr1 expr2) = do
679− expr1v <- liftE (predicateRestrictionFilter attrs expr1)
714+ expr1v <- predicateRestrictionFilter attrs expr1
680− expr2v <- liftE (predicateRestrictionFilter attrs expr2)
715+ expr2v <- predicateRestrictionFilter attrs expr2
681 pure (\x -> do
716 pure (\x -> do
682 ev1 <- expr1v x
717 ev1 <- expr1v x
683 ev2 <- expr2v x
718 ev2 <- expr2v x
684 pure (ev1 || ev2))
719 pure (ev1 || ev2))
686−predicateRestrictionFilter _ TruePredicate = pure (Right (\_ -> pure True))
721+predicateRestrictionFilter _ TruePredicate = pure (\_ -> pure True)
688−predicateRestrictionFilter attrs (NotPredicate expr) =
723+predicateRestrictionFilter attrs (NotPredicate expr) = do
690− exprv <- liftE (predicateRestrictionFilter attrs expr)
724+ exprv <- predicateRestrictionFilter attrs expr
691− pure (fmap not . exprv)
725+ pure (fmap not . exprv)
693--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
694predicateRestrictionFilter _ (RelationalExprPredicate relExpr) = do
728predicateRestrictionFilter _ (RelationalExprPredicate relExpr) = do
695− rstate <- ask
729+ renv <- askEnv
696− 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
697 Left err -> Left err
735 Left err -> Left err
698 Right rel -> if arity rel /= 0 then
736 Right rel -> if arity rel /= 0 then
699 Left (PredicateExpressionError "Relational restriction filter must evaluate to 'true' or 'false'")
737 Left (PredicateExpressionError "Relational restriction filter must evaluate to 'true' or 'false'")
701− pure (rel == relationTrue)))
739+ pure (rel == relationTrue))
703predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr) = do
741predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr) = do
704− rstate <- ask
742+ env <- askEnv
705− let (attrs', ctxtup') = case rstate of
743+ let attrs' = A.union attrs (envAttributes env)
706− RelationalExprStateElems _ -> (attrs, emptyTuple)
744+ ctxtup' = envTuple env
707− RelationalExprStateAttrsElems _ _ -> (attrs, emptyTuple)
708− RelationalExprStateTupleElems _ ctxtup -> (A.union attrs (tupleAttributes ctxtup), ctxtup)
710− atomExprType <- liftE (typeFromAtomExpr attrs' atomExpr)
745+ atomExprType <- typeForGraphRefAtomExpr attrs' atomExpr
711− attr <- either throwE pure $ case A.attributeForName attrName attrs of
746+ attr <- lift $ except $ case A.attributeForName attrName attrs of
712 Right attr -> Right attr
747 Right attr -> Right attr
713 Left (NoSuchAttributeNamesError _) -> case A.attributeForName attrName (tupleAttributes ctxtup') of
748 Left (NoSuchAttributeNamesError _) -> case A.attributeForName attrName (tupleAttributes ctxtup') of
714 Right ctxattr -> Right ctxattr
749 Right ctxattr -> Right ctxattr
715 Left err2@(NoSuchAttributeNamesError _) -> Left err2
750 Left err2@(NoSuchAttributeNamesError _) -> Left err2
716 Left err -> Left err
751 Left err -> Left err
717 Left err -> Left err
752 Left err -> Left err
718− if atomExprType /= A.atomType attr then
753+ if atomExprType /= A.atomType attr then
719− throwE (TupleAttributeTypeMismatchError (A.attributesFromList [attr]))
754+ throwError (TupleAttributeTypeMismatchError (A.attributesFromList [attr]))
721 pure $ \tupleIn -> let evalAndCmp atomIn = case atomEvald of
756 pure $ \tupleIn -> let evalAndCmp atomIn = case atomEvald of
722 Right atomCmp -> atomCmp == atomIn
757 Right atomCmp -> atomCmp == atomIn
723 Left _ -> False
758 Left _ -> False
724− atomEvald = runReader (evalAtomExpr tupleIn atomExpr) rstate
759+ atomEvald = runGraphRefRelationalExprM env (evalGraphRefAtomExpr tupleIn atomExpr)
726 pure $ case atomForAttributeName attrName tupleIn of
761 pure $ case atomForAttributeName attrName tupleIn of
727 Left (NoSuchAttributeNamesError _) -> case atomForAttributeName attrName ctxtup' of
762 Left (NoSuchAttributeNamesError _) -> case atomForAttributeName attrName ctxtup' of
@@ -732,243 +767,626 @@ predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr)
732-- 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
733predicateRestrictionFilter attrs (AtomExprPredicate atomExpr) = do
768predicateRestrictionFilter attrs (AtomExprPredicate atomExpr) = do
734 --merge attrs into the state attributes
769 --merge attrs into the state attributes
735− rstate <- ask
770+ renv <- askEnv
737− aType <- liftE (typeFromAtomExpr attrs atomExpr)
771+ aType <- typeForGraphRefAtomExpr attrs atomExpr
738− if aType /= BoolAtomType then
772+ if aType /= BoolAtomType then
739− throwE (AtomTypeMismatchError aType BoolAtomType)
773+ throwError (AtomTypeMismatchError aType BoolAtomType)
741 pure (\tupleIn ->
775 pure (\tupleIn ->
742− pure $ case runReader (evalAtomExpr tupleIn atomExpr) rstate of
776+ case runGraphRefRelationalExprM renv (evalGraphRefAtomExpr tupleIn atomExpr) of
743− Left _ -> False
777+ Left err -> Left err
744− Right boolAtomValue -> boolAtomValue == BoolAtom True)
778+ Right boolAtomValue -> pure (boolAtomValue == BoolAtom True))
746tupleExprCheckNewAttrName :: AttributeName -> Relation -> Either RelationalError Relation
780tupleExprCheckNewAttrName :: AttributeName -> Relation -> Either RelationalError Relation
747tupleExprCheckNewAttrName attrName rel = if isRight (attributeForName attrName rel) then
781tupleExprCheckNewAttrName attrName rel = if isRight (attributeForName attrName rel) then
748− Left (error "SPAMMIT" $ AttributeNameInUseError attrName)
782+ Left (AttributeNameInUseError attrName)
750 Right rel
784 Right rel
752−extendTupleExpressionProcessor :: Relation -> ExtendTupleExpr -> RelationalExprState (Either RelationalError (Attributes, RelationTuple -> Either RelationalError RelationTuple))
786+extendGraphRefTupleExpressionProcessor :: Relation -> GraphRefExtendTupleExpr -> GraphRefRelationalExprM (Attributes, RelationTuple -> Either RelationalError RelationTuple)
753−extendTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) = do
787+extendGraphRefTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) =
754− rstate <- ask
788+-- renv <- askEnv
755 -- check that the attribute name is not in use
789 -- check that the attribute name is not in use
756 case tupleExprCheckNewAttrName newAttrName relIn of
790 case tupleExprCheckNewAttrName newAttrName relIn of
757− Left err -> pure (Left err)
791+ Left err -> throwError err
758− Right _ -> runExceptT $ do
792+ Right _ -> do
759− atomExprType <- liftE (typeFromAtomExpr (attributes relIn) atomExpr)
793+ atomExprType <- typeForGraphRefAtomExpr (attributes relIn) atomExpr
760− atomExprType' <- liftE (verifyAtomExprTypes relIn atomExpr atomExprType)
794+ atomExprType' <- verifyGraphRefAtomExprTypes relIn atomExpr atomExprType
761 let newAttrs = A.attributesFromList [Attribute newAttrName atomExprType']
795 let newAttrs = A.attributesFromList [Attribute newAttrName atomExprType']
762 newAndOldAttrs = A.addAttributes (attributes relIn) newAttrs
796 newAndOldAttrs = A.addAttributes (attributes relIn) newAttrs
763− pure (newAndOldAttrs, \tup -> let substate = mergeTuplesIntoRelationalExprState tup rstate in case runReader (evalAtomExpr tup atomExpr) substate of
797+ env <- ask
764− Left err -> Left err
798+ pure (newAndOldAttrs, \tup -> do
799+ let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tup env
800+ atom <- runGraphRefRelationalExprM gfEnv (evalGraphRefAtomExpr tup atomExpr)
765− Right atom -> Right (tupleAtomExtend newAttrName atom tup)
801+ Right (tupleAtomExtend newAttrName atom tup)
768−evalAtomExpr :: RelationTuple -> AtomExpr -> RelationalExprState (Either RelationalError Atom)
804+evalGraphRefAtomExpr :: RelationTuple -> GraphRefAtomExpr -> GraphRefRelationalExprM Atom
805+evalGraphRefAtomExpr tupIn (AttributeAtomExpr attrName) =
769−evalAtomExpr tupIn (AttributeAtomExpr attrName) = case atomForAttributeName attrName tupIn of
806+ case atomForAttributeName attrName tupIn of
770− Right atom -> pure (Right atom)
807+ Right atom -> pure atom
771− err@(Left (NoSuchAttributeNamesError _)) -> do
808+ Left err@(NoSuchAttributeNamesError _) -> do
772− rstate <- ask
809+ env <- askEnv
773− case rstate of
810+ case gre_extra env of
774− RelationalExprStateElems _ -> pure err
811+ Nothing -> throwError err
775− RelationalExprStateAttrsElems _ _ -> pure err
776− RelationalExprStateTupleElems _ ctxtup -> pure (atomForAttributeName attrName ctxtup)
812+ Just (Left ctxtup) -> lift $ except $ atomForAttributeName attrName ctxtup
813+ Just (Right _) -> throwError err
777− Left err -> pure (Left err)
814+ Left err -> throwError err
778−evalAtomExpr _ (NakedAtomExpr atom) = pure (Right atom)
815+evalGraphRefAtomExpr _ (NakedAtomExpr atom) = pure atom
779−evalAtomExpr tupIn (FunctionAtomExpr funcName arguments ()) = do
816+evalGraphRefAtomExpr tupIn (FunctionAtomExpr funcName arguments tid) = do
780− argTypes <- mapM (typeFromAtomExpr (tupleAttributes tupIn)) arguments
817+ argTypes <- mapM (typeForGraphRefAtomExpr (tupleAttributes tupIn)) arguments
781− context <- fmap stateElemsContext ask
818+ context <- gfDatabaseContextForMarker tid
783− let functions = atomFunctions context
819+ let functions = atomFunctions context
784− func <- either throwE pure (atomFunctionForName funcName functions)
820+ func <- lift $ except (atomFunctionForName funcName functions)
785− let expectedArgCount = length (atomFuncType func) - 1
821+ let expectedArgCount = length (atomFuncType func) - 1
786− actualArgCount = length argTypes
822+ actualArgCount = length argTypes
788− safeInit [] = [] -- different behavior from normal init
823+ safeInit [] = [] -- different behavior from normal init
789− safeInit (_:xs) = safeInit xs
824+ safeInit xs = init xs
790− if expectedArgCount /= actualArgCount then
825+ if expectedArgCount /= actualArgCount then
791− throwE (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
826+ throwError (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
793− mapM_ (\(expType, actType) -> either throwE pure (atomTypeVerify expType actType)) (safeInit (zip (atomFuncType func) argTypes))
828+ let zippedArgs = zip (safeInit (atomFuncType func)) argTypes
829+ mapM_ (\(expType, actType) ->
830+ lift $ except (atomTypeVerify expType actType)) zippedArgs
794− evaldArgs <- mapM (liftE . evalAtomExpr tupIn) arguments
831+ evaldArgs <- mapM (evalGraphRefAtomExpr tupIn) arguments
795 case evalAtomFunction func evaldArgs of
832 case evalAtomFunction func evaldArgs of
796− Left err -> throwE (AtomFunctionUserError err)
833+ Left err -> throwError (AtomFunctionUserError err)
797 Right result -> do
834 Right result -> do
798 --validate that the result matches the expected type
835 --validate that the result matches the expected type
799− _ <- either throwE pure (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
836+ _ <- lift $ except (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
800 pure result
837 pure result
801−evalAtomExpr tupIn (RelationAtomExpr relExpr) = do
838+evalGraphRefAtomExpr tupIn (RelationAtomExpr relExpr) = do
802 --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
803− rstate <- ask
840+ env <- ask
804− runExceptT $ do
841+ let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tupIn env
805− let newState = mergeTuplesIntoRelationalExprState tupIn rstate
842+ relAtom <- lift $ except $ runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr relExpr)
806− relAtom <- either throwE pure (runReader (evalRelationalExpr relExpr) newState)
807− pure (RelationAtom relAtom)
843+ pure (RelationAtom relAtom)
808−evalAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs ()) = runExceptT $ do
844+evalGraphRefAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs _) = do --why is the tid unused here? suspicious
809− rstate <- lift ask
845+ let mergeEnv = mergeTuplesIntoGraphRefRelationalExprEnv tupIn
810− let newState = mergeTuplesIntoRelationalExprState tupIn rstate
811− aType <- either throwE pure (runReader (typeFromAtomExpr (tupleAttributes tupIn) cons) newState)
846+ aType <- local mergeEnv (typeForGraphRefAtomExpr (tupleAttributes tupIn) cons)
812− argAtoms <- mapM (\arg -> either throwE pure (runReader (evalAtomExpr tupIn arg) newState)) dConsArgs
847+ argAtoms <- local mergeEnv $
848+ mapM (evalGraphRefAtomExpr tupIn) dConsArgs
813 pure (ConstructedAtom dConsName aType argAtoms)
849 pure (ConstructedAtom dConsName aType argAtoms)
815−typeFromAtomExpr :: Attributes -> AtomExpr -> RelationalExprState (Either RelationalError AtomType)
851+typeForGraphRefAtomExpr :: Attributes -> GraphRefAtomExpr -> GraphRefRelationalExprM AtomType
816−typeFromAtomExpr attrs (AttributeAtomExpr attrName) = do
852+typeForGraphRefAtomExpr attrs (AttributeAtomExpr attrName) = do
817− rstate <- ask
853+ renv <- askEnv
818 case A.atomTypeForAttributeName attrName attrs of
854 case A.atomTypeForAttributeName attrName attrs of
819− Right aType -> pure (Right aType)
855+ Right aType -> pure aType
820− Left err@(NoSuchAttributeNamesError _) -> case rstate of
856+ Left err@(NoSuchAttributeNamesError _) ->
857+ let envTup = envTuple renv
858+ envAttrs = envAttributes renv in
821− RelationalExprStateAttrsElems _ attrs' -> case A.attributeForName attrName attrs' of
859+ case A.attributeForName attrName envAttrs of
822− Left err' -> pure (Left err')
823− Right attr -> pure (Right (A.atomType attr))
860+ Right attr -> pure (A.atomType attr)
824− RelationalExprStateElems _ -> pure (Left err)
825− RelationalExprStateTupleElems _ tup -> case atomForAttributeName attrName tup of
861+ Left _ -> case atomForAttributeName attrName envTup of
826− Left err' -> pure (Left err')
862+ Right atom -> pure (atomTypeForAtom atom)
827− Right atom -> pure (Right (atomTypeForAtom atom))
863+ Left _ -> --throwError (traceStack (show ("typeForGRAtomExpr", attrs, envTup)) err)
828− Left err -> pure (Left err)
865+ Left err -> throwError err
829−typeFromAtomExpr _ (NakedAtomExpr atom) = pure (Right (atomTypeForAtom atom))
867+typeForGraphRefAtomExpr _ (NakedAtomExpr atom) = pure (atomTypeForAtom atom)
830−typeFromAtomExpr attrs (FunctionAtomExpr funcName atomArgs _) = do
868+typeForGraphRefAtomExpr attrs (FunctionAtomExpr funcName atomArgs transId) = do
831− context <- fmap stateElemsContext ask
869+ funcs <- atomFunctions <$> gfDatabaseContextForMarker transId
832− let funcs = atomFunctions context
833 case atomFunctionForName funcName funcs of
870 case atomFunctionForName funcName funcs of
834− Left err -> pure (Left err)
871+ Left err -> throwError err
835 Right func -> do
872 Right func -> do
836 let funcRetType = last (atomFuncType func)
873 let funcRetType = last (atomFuncType func)
837 funcArgTypes = init (atomFuncType func)
874 funcArgTypes = init (atomFuncType func)
838− eArgTypes <- mapM (typeFromAtomExpr attrs) atomArgs
875+ argTypes <- mapM (typeForGraphRefAtomExpr attrs) atomArgs
839− case lefts eArgTypes of
840− errs@(_:_) -> pure (Left (someErrors errs))
842− let eTvMap = resolveTypeVariables funcArgTypes argTypes
876+ let eTvMap = resolveTypeVariables funcArgTypes argTypes
843− argTypes = rights eArgTypes
844− case eTvMap of
877+ case eTvMap of
845− Left err -> pure (Left err)
878+ Left err -> throwError err
846− Right tvMap -> pure (resolveFunctionReturnValue funcName tvMap funcRetType)
879+ Right tvMap -> lift $ except $ resolveFunctionReturnValue funcName tvMap funcRetType
847−typeFromAtomExpr attrs (RelationAtomExpr relExpr) = runExceptT $ do
880+typeForGraphRefAtomExpr attrs (RelationAtomExpr relExpr) = do
848− rstate <- lift ask
881+ relType <- R.local (mergeAttributesIntoGraphRefRelationalExprEnv attrs) (typeForGraphRefRelationalExpr relExpr)
849− relType <- either throwE pure (runReader (typeForRelationalExpr relExpr) (mergeAttributesIntoRelationalExprState attrs rstate))
850 pure (RelationAtomType (attributes relType))
882 pure (RelationAtomType (attributes relType))
851-- 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
852−typeFromAtomExpr attrs (ConstructedAtomExpr dConsName dConsArgs _) =
884+typeForGraphRefAtomExpr attrs (ConstructedAtomExpr dConsName dConsArgs tid) =
853− runExceptT $ do
885+ do
854− argsTypes <- mapM (liftE . typeFromAtomExpr attrs) dConsArgs
886+ argsTypes <- mapM (typeForGraphRefAtomExpr attrs) dConsArgs
855− context <- fmap stateElemsContext (lift ask)
887+ tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker tid
856− either throwE pure (atomTypeForDataConstructor (typeConstructorMapping context) dConsName argsTypes)
888+ lift $ except $ atomTypeForDataConstructor tConsMap dConsName argsTypes
858-- | Validate that the type of the AtomExpr matches the expected type.
890-- | Validate that the type of the AtomExpr matches the expected type.
859−verifyAtomExprTypes :: Relation -> AtomExpr -> AtomType -> RelationalExprState (Either RelationalError AtomType)
891+verifyGraphRefAtomExprTypes :: Relation -> GraphRefAtomExpr -> AtomType -> GraphRefRelationalExprM AtomType
860−verifyAtomExprTypes relIn (AttributeAtomExpr attrName) expectedType = runExceptT $ do
892+verifyGraphRefAtomExprTypes relIn (AttributeAtomExpr attrName) expectedType = do
861− rstate <- lift ask
893+ env <- askEnv
862 case A.atomTypeForAttributeName attrName (attributes relIn) of
894 case A.atomTypeForAttributeName attrName (attributes relIn) of
863− Right aType -> either throwE pure (atomTypeVerify expectedType aType)
895+ Right aType -> lift $ except $ atomTypeVerify expectedType aType
864− (Left err@(NoSuchAttributeNamesError _)) -> case rstate of
896+ (Left err@(NoSuchAttributeNamesError _)) ->
865− RelationalExprStateTupleElems _ _ -> throwE err
897+ let attrs' = envAttributes env in
866− RelationalExprStateElems _ -> throwE err
898+ if attrs' == emptyAttributes then
867− RelationalExprStateAttrsElems _ attrs -> case A.attributeForName attrName attrs of
901+ case A.attributeForName attrName attrs' of
868− Left err' -> throwE err'
902+ Left err' -> throwError err'
869− Right attrType -> either throwE pure (atomTypeVerify expectedType (A.atomType attrType))
903+ Right attrType -> lift $ except $ atomTypeVerify expectedType (A.atomType attrType)
870− Left err -> throwE err
904+ Left err -> throwError err
906+verifyGraphRefAtomExprTypes _ (NakedAtomExpr atom) expectedType =
871−verifyAtomExprTypes _ (NakedAtomExpr atom) expectedType = pure (atomTypeVerify expectedType (atomTypeForAtom atom))
907+ lift $ except $ atomTypeVerify expectedType (atomTypeForAtom atom)
872−verifyAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs _) expectedType = do
908+verifyGraphRefAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs tid) expectedType = do
873− rstate <- ask
909+ context <- gfDatabaseContextForMarker tid
874 let functions = atomFunctions context
910 let functions = atomFunctions context
875− context = stateElemsContext rstate
877− func <- either throwE pure (atomFunctionForName funcName functions)
911+ func <- lift $ except $ atomFunctionForName funcName functions
878− let expectedArgTypes = atomFuncType func
912+ let expectedArgTypes = atomFuncType func
879− 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
880− Left (AtomTypeMismatchError expSubType actSubType) -> throwE (AtomFunctionTypeError funcName argCount expSubType actSubType)
915+ handler (AtomTypeMismatchError expSubType actSubType) = throwError (AtomFunctionTypeError funcName argCount expSubType actSubType)
881− Left err -> throwE err
916+ handler err = throwError err
882− Right x -> pure x
917+ verifyGraphRefAtomExprTypes relIn atomExpr expectedType2 `catchError` handler
883− ) $ zip3 funcArgExprs expectedArgTypes [1..]
918+ funcArgTypes <- mapM funcArgVerifier $ zip3 funcArgExprs expectedArgTypes [1..]
884− if length funcArgTypes /= length expectedArgTypes - 1 then
919+ if length funcArgTypes /= length expectedArgTypes - 1 then
885− throwE (AtomTypeCountError funcArgTypes expectedArgTypes)
920+ throwError (AtomTypeCountError funcArgTypes expectedArgTypes)
887− either throwE pure (atomTypeVerify expectedType (last expectedArgTypes))
922+ lift $ except $ atomTypeVerify expectedType (last expectedArgTypes)
888−verifyAtomExprTypes relIn (RelationAtomExpr relationExpr) expectedType = runExceptT $ do
923+verifyGraphRefAtomExprTypes relIn (RelationAtomExpr relationExpr) expectedType =
889− rstate <- lift ask
924+ do
890− 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)
891− either throwE pure (atomTypeVerify expectedType (RelationAtomType (attributes relType)))
927+ lift $ except $ atomTypeVerify expectedType (RelationAtomType (attributes relType))
892−verifyAtomExprTypes rel cons@ConstructedAtomExpr{} expectedType = runExceptT $ do
928+verifyGraphRefAtomExprTypes rel cons@ConstructedAtomExpr{} expectedType = do
893− cType <- liftE (typeFromAtomExpr (attributes rel) cons)
929+ cType <- typeForGraphRefAtomExpr (attributes rel) cons
894− either throwE pure (atomTypeVerify expectedType cType)
930+ lift $ except $ atomTypeVerify expectedType cType
896-- | Look up the type's name and create a new attribute.
932-- | Look up the type's name and create a new attribute.
897−evalAttrExpr :: TypeConstructorMapping -> AttributeExpr -> Either RelationalError Attribute
933+evalGraphRefAttrExpr :: GraphRefAttributeExpr -> GraphRefRelationalExprM Attribute
898−evalAttrExpr aTypes (AttributeAndTypeNameExpr attrName tCons ()) = do
934+evalGraphRefAttrExpr (AttributeAndTypeNameExpr attrName tCons transId) = do
899− aType <- atomTypeForTypeConstructor tCons aTypes M.empty
935+ tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker transId
936+ aType <- lift $ except $ atomTypeForTypeConstructorValidate True tCons tConsMap M.empty
900− validateAtomType aType aTypes
937+ lift $ except $ validateAtomType aType tConsMap
901− Right (Attribute attrName aType)
938+ pure $ Attribute attrName aType
903−evalAttrExpr _ (NakedAttributeExpr attr) = Right attr
905−evalTupleExpr :: Maybe Attributes -> TupleExpr -> RelationalExprState (Either RelationalError RelationTuple)
940+evalGraphRefAttrExpr (NakedAttributeExpr attr) = pure attr
942+-- for tuple type concrete resolution (Nothing ==> Maybe Int) when the attributes hint is Nothing, we need to first process all the tuples, then extract the concrete types on a per-attribute basis, then reprocess the tuples to include the concrete types
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
906−evalTupleExpr attrs (TupleExpr tupMap) = do
991+evalGraphRefTupleExpr mAttrs (TupleExpr tupMap) = do
907− context <- fmap stateElemsContext ask
909 -- 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
910 -- 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
994+ let attrs = fromMaybe A.emptyAttributes mAttrs
911− attrAtoms <- mapM (\(attrName, aExpr) -> do
995+ resolveOneAtom (attrName, aExpr) =
912− newAtomType <- liftE (typeFromAtomExpr A.emptyAttributes aExpr)
996+ do
997+ --provided when the relation header is available
998+ let eExpectedAtomType = A.atomTypeForAttributeName attrName attrs
999+ unresolvedType <- typeForGraphRefAtomExpr attrs aExpr
1000+ resolvedType <- case eExpectedAtomType of
1001+ Left _ -> pure unresolvedType
1002+ Right typeHint -> lift $ except $ resolveAtomType typeHint unresolvedType
1003+ --resolve atom typevars based on resolvedType?
913− newAtom <- liftE (evalAtomExpr emptyTuple aExpr)
1004+ newAtom <- evalGraphRefAtomExpr emptyTuple aExpr
914− pure (attrName, newAtom, newAtomType)
1005+ pure (attrName, newAtom, resolvedType)
915− ) (M.toList tupMap)
1006+ attrAtoms <- mapM resolveOneAtom (M.toList tupMap)
916− let tupAttrs = A.attributesFromList $ map (\(attrName, _, aType) -> Attribute attrName aType) attrAtoms
1007+ let tupAttrs = A.attributesFromList $ map (\(attrName, _, aType) -> Attribute attrName aType) attrAtoms
917− atoms = V.fromList $ map (\(_, atom, _) -> atom) attrAtoms
1008+ atoms = V.fromList $ map (\(_, atom, _) -> atom) attrAtoms
918− tup = mkRelationTuple tupAttrs atoms
1009+ tup = mkRelationTuple tupAttrs atoms
919− tConss = typeConstructorMapping context
920− finalAttrs = fromMaybe tupAttrs attrs
1010+ finalAttrs = fromMaybe tupAttrs mAttrs
921 --verify that the attributes match
1011 --verify that the attributes match
922− 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
923− tup' <- either throwE pure (resolveTypesInTuple finalAttrs (reorderTuple finalAttrs tup))
1014+ --tup' <- lift $ except (resolveTypesInTuple finalAttrs tConss (reorderTuple finalAttrs tup))
1015+ let tup' = reorderTuple finalAttrs tup
1016+ --TODO: restore type resolution
924− _ <- either throwE pure (validateTuple tup' tConss)
1017+-- _ <- lift $ except (validateTuple tup' tConss)
925− pure tup'
1018+ pure tup'
927−evalAttributeNames :: AttributeNames -> RelationalExpr -> RelationalExprState (Either RelationalError (S.Set AttributeName))
1020+--temporary implementation until we have a proper planner+executor
1021+evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
1022+evalGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
1023+ mAttrs <- case mAttrExprs of
1025+ Just . A.attributesFromList <$> mapM evalGraphRefAttrExpr (fromMaybe [] mAttrExprs)
1026+ Nothing -> pure Nothing
1027+ tuples <- evalGraphRefTupleExprs mAttrs tupleExprs
1028+ let attrs = fromMaybe firstTupleAttrs mAttrs
1029+ firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
1030+ lift $ except $ mkRelation attrs (RelationTupleSet tuples)
1031+evalGraphRefRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
1032+ lift $ except $ mkRelation attributeSet tupleSet
1033+evalGraphRefRelationalExpr (ExistingRelation rel) = pure rel
1034+evalGraphRefRelationalExpr (RelationVariable name tid) = do
1035+ ctx <- gfDatabaseContextForMarker tid
1036+ case M.lookup name (relationVariables ctx) of
1037+ Nothing -> throwError (RelVarNotDefinedError name)
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)
1087+dbContextForTransId :: TransactionId -> TransactionGraph -> Either RelationalError DatabaseContext
1088+dbContextForTransId tid graph = do
1089+ trans <- transactionForId tid graph
1090+ pure (concreteDatabaseContext trans)
1092+transactionForId :: TransactionId -> TransactionGraph -> Either RelationalError Transaction
1093+transactionForId tid graph
1095+ Left RootTransactionTraversalError
1096+ | S.null matchingTrans =
1097+ Left $ NoSuchTransactionError tid
1099+ Right $ head (S.toList matchingTrans)
1101+ matchingTrans = S.filter (\(Transaction idMatch _ _) -> idMatch == tid) (transactionsForGraph graph)
1103+typeForGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
1104+typeForGraphRefRelationalExpr (MakeStaticRelation attrs _) = lift $ except $ mkRelation attrs emptyTupleSet
1105+typeForGraphRefRelationalExpr (ExistingRelation rel) = pure (emptyRelationWithAttrs (attributes rel))
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)
928−evalAttributeNames attrNames expr = do
1172+evalGraphRefAttributeNames attrNames expr = do
929− eExprType <- typeForRelationalExpr expr
1173+ exprType' <- typeForGraphRefRelationalExpr expr
931− Left err -> pure (Left err)
933− let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))
1174+ let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprType')))
934− case attrNames of
1175+ case attrNames of
935− AttributeNames names ->
1176+ AttributeNames names ->
936− case A.projectionAttributesForNames names (attributes exprTyp) of
1177+ case A.projectionAttributesForNames names (attributes exprType') of
937− Left err -> pure (Left err)
1178+ Left err -> throwError err
938− Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))
1179+ Right attrs -> pure (S.fromList (V.toList (A.attributeNames attrs)))
940− InvertedAttributeNames names -> do
1181+ InvertedAttributeNames names -> do
941 let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
1182 let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
942 if not (S.null nonExistentAttributeNames) then
1183 if not (S.null nonExistentAttributeNames) then
943− pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))
1184+ throwError $ AttributeNamesMismatchError nonExistentAttributeNames
945− pure (Right (A.nonMatchingAttributeNameSet names typeNameSet))
1186+ pure (A.nonMatchingAttributeNameSet names typeNameSet)
947− UnionAttributeNames namesA namesB -> do
1188+ UnionAttributeNames namesA namesB -> do
948− eNameSetA <- evalAttributeNames namesA expr
1189+ nameSetA <- evalGraphRefAttributeNames namesA expr
949− case eNameSetA of
1190+ nameSetB <- evalGraphRefAttributeNames namesB expr
950− Left err -> pure (Left err)
951− Right nameSetA -> do
952− eNameSetB <- evalAttributeNames namesB expr
954− Left err -> pure (Left err)
956− pure (Right (S.union nameSetA nameSetB))
1191+ pure (S.union nameSetA nameSetB)
958− IntersectAttributeNames namesA namesB -> do
1193+ IntersectAttributeNames namesA namesB -> do
959− eNameSetA <- evalAttributeNames namesA expr
1194+ nameSetA <- evalGraphRefAttributeNames namesA expr
960− case eNameSetA of
1195+ nameSetB <- evalGraphRefAttributeNames namesB expr
961− Left err -> pure (Left err)
962− Right nameSetA -> do
963− eNameSetB <- evalAttributeNames namesB expr
965− Left err -> pure (Left err)
967− pure (Right (S.intersection nameSetA nameSetB))
1196+ pure (S.intersection nameSetA nameSetB)
969− RelationalExprAttributeNames attrExpr -> do
1198+ RelationalExprAttributeNames attrExpr -> do
970− eAttrExprType <- typeForRelationalExpr attrExpr
1199+ attrExprType <- typeForGraphRefRelationalExpr attrExpr
971− case eAttrExprType of
972− Left err -> pure (Left err)
973− Right attrExprType -> pure (Right (A.attributeNameSet (attributes attrExprType)))
1200+ pure (A.attributeNameSet (attributes attrExprType))
1202+evalGraphRefAttributeExpr :: GraphRefAttributeExpr -> GraphRefRelationalExprM Attribute
1203+evalGraphRefAttributeExpr (AttributeAndTypeNameExpr attrName tCons tid) = do
1204+ tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker tid
1205+ case atomTypeForTypeConstructorValidate True tCons tConsMap M.empty of
1206+ Left err -> throwError err
1208+ case validateAtomType aType tConsMap of
1209+ Left err -> throwError err
1210+ Right _ -> pure (Attribute attrName aType)
1211+evalGraphRefAttributeExpr (NakedAttributeExpr attr) = pure attr
1213+mkEmptyRelVars :: RelationVariables -> RelationVariables
1214+mkEmptyRelVars = M.map mkEmptyRelVar
1216+ mkEmptyRelVar expr@MakeRelationFromExprs{} = expr --do not truncate here because we might lose essential type information in emptying the tuples
1217+ mkEmptyRelVar (MakeStaticRelation attrs _) = MakeStaticRelation attrs emptyTupleSet
1218+ mkEmptyRelVar (ExistingRelation rel) = ExistingRelation (emptyRelationWithAttrs (attributes rel))
1219+ mkEmptyRelVar rv@RelationVariable{} = Restrict (NotPredicate TruePredicate) rv
1220+ mkEmptyRelVar (Project attrNames expr) = Project attrNames (mkEmptyRelVar expr)
1221+ mkEmptyRelVar (Union exprA exprB) = Union (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1222+ mkEmptyRelVar (Join exprA exprB) = Join (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1223+ mkEmptyRelVar (Rename nameA nameB expr) = Rename nameA nameB (mkEmptyRelVar expr)
1224+ mkEmptyRelVar (Difference exprA exprB) = Difference (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1225+ mkEmptyRelVar (Group attrNames attrName expr) = Group attrNames attrName (mkEmptyRelVar expr)
1226+ mkEmptyRelVar (Ungroup attrName expr) = Ungroup attrName (mkEmptyRelVar expr)
1227+ mkEmptyRelVar (Restrict pred' expr) = Restrict pred' (mkEmptyRelVar expr)
1228+ mkEmptyRelVar (Equals exprA exprB) = Equals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1229+ mkEmptyRelVar (NotEquals exprA exprB) = NotEquals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1230+ mkEmptyRelVar (Extend extTuple expr) = Extend extTuple (mkEmptyRelVar expr)
1231+ mkEmptyRelVar (With macros expr) = With (map (second mkEmptyRelVar) macros) (mkEmptyRelVar expr)
1234+dbErr :: RelationalError -> DatabaseContextEvalMonad ()
1235+dbErr err = lift (except (Left err))
1237+-- | Return a Relation describing the relation variables.
1238+relationVariablesAsRelation :: DatabaseContext -> TransactionGraph -> Either RelationalError Relation
1239+relationVariablesAsRelation ctx graph = do
1240+ let subrelAttrs = A.attributesFromList [Attribute "attribute" TextAtomType, Attribute "type" TextAtomType]
1241+ attrs = A.attributesFromList [Attribute "name" TextAtomType,
1242+ Attribute "attributes" (RelationAtomType subrelAttrs)]
1243+ relVars = relationVariables ctx
1244+ mkRvDesc (rvName, gfExpr) = do
1245+ let gfEnv = freshGraphRefRelationalExprEnv (Just ctx) graph
1246+ gfType <- runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
1247+ pure (rvName, gfType)
1248+ relVarToAtomList (rvName, rel) = [TextAtom rvName, attributesToRel (attributesVec (attributes rel))]
1249+ attrAtoms a = [TextAtom (A.attributeName a), TextAtom (prettyAtomType (A.atomType a))]
1250+ attributesToRel attrl = case mkRelationFromList subrelAttrs (map attrAtoms (V.toList attrl)) of
1251+ Left err -> error ("relationVariablesAsRelation pooped " ++ show err)
1252+ Right rel -> RelationAtom rel
1253+ rvs <- mapM mkRvDesc (M.toList relVars)
1254+ let tups = map relVarToAtomList rvs
1255+ mkRelationFromList attrs tups
1257+-- | An unoptimized variant of evalGraphRefRelationalExpr for testing.
1258+evalRelationalExpr :: RelationalExpr -> RelationalExprM Relation
1259+evalRelationalExpr expr = do
1261+ context <- reContext
1262+ let expr' = runProcessExprM UncommittedContextMarker (processRelationalExpr expr)
1263+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
1264+ case runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr expr') of
1265+ Left err -> throwError err
1266+ Right rel -> pure rel
1268+class (MonadError RelationalError m, Monad m) => DatabaseContextM m where
1269+ getContext :: m DatabaseContext
1271+instance DatabaseContextM (ReaderT GraphRefRelationalExprEnv (ExceptT RelationalError Identity)) where
1272+ getContext = gfDatabaseContextForMarker UncommittedContextMarker
1274+instance DatabaseContextM (RWST DatabaseContextEvalEnv () DatabaseContextEvalState (ExceptT RelationalError Identity)) where
1275+ getContext = getStateContext
1277+relVarByName :: DatabaseContextM m => RelVarName -> m GraphRefRelationalExpr
1278+relVarByName rvName = do
1279+ relvars <- relationVariables <$> getContext
1280+ case M.lookup rvName relvars of
1281+ Nothing -> throwError (RelVarNotDefinedError rvName)
1282+ Just gfexpr -> pure gfexpr
1284+-- | resolve UncommittedTransactionMarker whenever possible- this is important in the DatabaseContext in order to mitigate self-referencing loops for updates
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