@@ -1,4 +1,7 @@
1{-# LANGUAGE ScopedTypeVariables #-}
1{-# LANGUAGE ScopedTypeVariables #-}
2+{-# LANGUAGE FlexibleInstances #-}
3+{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.RelationalExpression where
5module ProjectM36.RelationalExpression where
3import ProjectM36.Relation
6import ProjectM36.Relation
4import ProjectM36.Tuple
7import ProjectM36.Tuple
@@ -13,32 +16,38 @@ import ProjectM36.DataTypes.Primitive
13import ProjectM36.AtomFunction
16import ProjectM36.AtomFunction
14import ProjectM36.DatabaseContextFunction
17import ProjectM36.DatabaseContextFunction
15import ProjectM36.Arbitrary
18import ProjectM36.Arbitrary
19+import ProjectM36.GraphRefRelationalExpr
16import ProjectM36.Transaction
20import ProjectM36.Transaction
17import qualified ProjectM36.Attribute as A
21import qualified ProjectM36.Attribute as A
18import qualified Data.Map as M
22import qualified Data.Map as M
19import qualified Data.HashSet as HS
23import qualified Data.HashSet as HS
20import qualified Data.Set as S
24import qualified Data.Set as S
21−import Control.Monad.Trans.RWS.Strict as RWS hiding (join)
25+import Control.Monad.State hiding (join)
22−import Control.Monad.Trans.Class (lift)
26+import Data.Bifunctor (second)
23−import Control.Monad (forM)
24−import Control.Exception
25import Data.Maybe
27import Data.Maybe
26import Data.Either
28import Data.Either
27import Data.Char (isUpper)
29import Data.Char (isUpper)
31+import qualified Data.List.NonEmpty as NE
32+import Data.Functor.Identity
28import qualified Data.Text as T
33import qualified Data.Text as T
29import qualified Data.Vector as V
34import qualified Data.Vector as V
30import qualified ProjectM36.TypeConstructorDef as TCD
35import qualified ProjectM36.TypeConstructorDef as TCD
31−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)
32−import Control.Monad.Trans.Reader as R
39+import Control.Monad.Trans.Except (except)
40+import Control.Monad.Reader as R hiding (join)
41+import ProjectM36.NormalizeExpr
42+import ProjectM36.WithNameExpr
33import Test.QuickCheck
43import Test.QuickCheck
34−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
35import GHC.Paths
49import GHC.Paths
36−import Data.Time.Clock
50+#endif
37−import Data.Time.Calendar
38−import qualified Data.List.NonEmpty as NE
39−import Data.Functor.Identity
41−import Control.Monad.IO.Class
43data DatabaseContextExprDetails = CountUpdatedTuples
52data DatabaseContextExprDetails = CountUpdatedTuples
@@ -66,48 +75,52 @@ mkDatabaseContextEvalState context = DatabaseContextEvalState {
66data RelationalExprEnv = RelationalExprEnv {
75data RelationalExprEnv = RelationalExprEnv {
67 re_context :: DatabaseContext,
76 re_context :: DatabaseContext,
68 re_graph :: TransactionGraph,
77 re_graph :: TransactionGraph,
69− re_currentTransId :: TransactionId,
70 re_extra :: Maybe (Either RelationTuple Attributes)
78 re_extra :: Maybe (Either RelationTuple Attributes)
73−stateTuple :: RelationalExprEnv -> RelationTuple
81+envTuple :: GraphRefRelationalExprEnv -> RelationTuple
74−stateTuple e = fromLeft emptyTuple (fromMaybe (Left emptyTuple) (re_extra e))
82+envTuple e = fromLeft emptyTuple (fromMaybe (Left emptyTuple) (gre_extra e))
76−stateAttributes :: RelationalExprEnv -> Attributes
84+envAttributes :: GraphRefRelationalExprEnv -> Attributes
77−stateAttributes e = fromRight emptyAttributes (fromMaybe (Right emptyAttributes) (re_extra e))
85+envAttributes e = fromRight emptyAttributes (fromMaybe (Right emptyAttributes) (gre_extra e))
79instance Show RelationalExprEnv where
87instance Show RelationalExprEnv where
80 show e@RelationalExprEnv{} = "RelationalExprEnv " ++ show (re_extra e)
88 show e@RelationalExprEnv{} = "RelationalExprEnv " ++ show (re_extra e)
90+--used to eval relationalexpr
91+type RelationalExprM a = ReaderT RelationalExprEnv (ExceptT RelationalError Identity) a
93+runRelationalExprM :: RelationalExprEnv -> RelationalExprM a -> Either RelationalError a
94+runRelationalExprM env m = runIdentity (runExceptT (runReaderT m env))
96+reGraph :: RelationalExprM TransactionGraph
97+reGraph = asks re_graph
99+reContext :: RelationalExprM DatabaseContext
100+reContext = asks re_context
82−mkRelationalExprEnv :: DatabaseContext -> TransactionId -> TransactionGraph -> RelationalExprEnv
102+mkRelationalExprEnv :: DatabaseContext -> TransactionGraph -> RelationalExprEnv
83−mkRelationalExprEnv ctx currentTransId graph =
103+mkRelationalExprEnv ctx graph =
84 RelationalExprEnv
104 RelationalExprEnv
85 { re_context = ctx,
105 { re_context = ctx,
86 re_graph = graph,
106 re_graph = graph,
87− re_currentTransId = currentTransId,
88 re_extra = Nothing }
107 re_extra = Nothing }
90−askEnv :: RelationalExprState RelationalExprEnv
109+askEnv :: GraphRefRelationalExprM GraphRefRelationalExprEnv
91askEnv = R.ask
110askEnv = R.ask
93−currentTrans :: RelationalExprState (Either RelationalError Transaction)
112+mergeTuplesIntoGraphRefRelationalExprEnv :: RelationTuple -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
94−currentTrans = do
113+mergeTuplesIntoGraphRefRelationalExprEnv tupIn env =
95− tid <- re_currentTransId <$> R.ask
96− graph <- re_graph <$> R.ask
97− pure (transactionForId tid graph)
99−mergeTuplesIntoRelationalExprState :: RelationTuple -> RelationalExprEnv -> RelationalExprEnv
100−mergeTuplesIntoRelationalExprState tupIn e@RelationalExprEnv{} =
101− e{re_extra = new_elems }
114+ env { gre_extra = new_elems }
103 new_elems = Just (Left newTuple)
116 new_elems = Just (Left newTuple)
104− mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (stateTuple e))
117+ mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (envTuple env))
105 newTuple = mkRelationTupleFromMap mergedTupMap
118 newTuple = mkRelationTupleFromMap mergedTupMap
107−mergeAttributesIntoRelationalExprState :: Attributes -> RelationalExprEnv -> RelationalExprEnv
120+mergeAttributesIntoGraphRefRelationalExprEnv :: Attributes -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
108−mergeAttributesIntoRelationalExprState attrsIn e@RelationalExprEnv{} = e{re_extra = newattrs }
121+mergeAttributesIntoGraphRefRelationalExprEnv attrsIn e = e { gre_extra = newattrs }
110− newattrs = Just (Right (A.union attrsIn (stateAttributes e)))
123+ newattrs = Just (Right (A.union attrsIn (envAttributes e)))
112type ResultAccumName = StringType
125type ResultAccumName = StringType
@@ -129,12 +142,12 @@ data DatabaseContextEvalEnv = DatabaseContextEvalEnv
131mkDatabaseContextEvalEnv :: TransactionId -> TransactionGraph -> DatabaseContextEvalEnv
144mkDatabaseContextEvalEnv :: TransactionId -> TransactionGraph -> DatabaseContextEvalEnv
132−mkDatabaseContextEvalEnv tid graph = DatabaseContextEvalEnv tid graph
145+mkDatabaseContextEvalEnv = DatabaseContextEvalEnv
134type DatabaseContextEvalMonad a = RWST DatabaseContextEvalEnv () DatabaseContextEvalState (ExceptT RelationalError Identity) a
147type DatabaseContextEvalMonad a = RWST DatabaseContextEvalEnv () DatabaseContextEvalState (ExceptT RelationalError Identity) a
136runDatabaseContextEvalMonad :: DatabaseContext -> DatabaseContextEvalEnv -> DatabaseContextEvalMonad () -> Either RelationalError DatabaseContextEvalState
149runDatabaseContextEvalMonad :: DatabaseContext -> DatabaseContextEvalEnv -> DatabaseContextEvalMonad () -> Either RelationalError DatabaseContextEvalState
137−runDatabaseContextEvalMonad ctx env m = runIdentity (runExceptT (fst <$> (execRWST m env freshEnv)))
150+runDatabaseContextEvalMonad ctx env m = runIdentity (runExceptT (fst <$> execRWST m env freshEnv))
139 freshEnv = mkDatabaseContextEvalState ctx
152 freshEnv = mkDatabaseContextEvalState ctx
@@ -146,20 +159,52 @@ dbcGraph :: DatabaseContextEvalMonad TransactionGraph
146dbcGraph = dce_graph <$> RWS.ask
159dbcGraph = dce_graph <$> RWS.ask
148dbcRelationalExprEnv :: DatabaseContextEvalMonad RelationalExprEnv
161dbcRelationalExprEnv :: DatabaseContextEvalMonad RelationalExprEnv
149−dbcRelationalExprEnv = do
162+dbcRelationalExprEnv =
152− mkRelationalExprEnv <$> getStateContext <*> dbcTransId <*> dbcGraph
163+ mkRelationalExprEnv <$> getStateContext <*> dbcGraph
154getStateContext :: DatabaseContextEvalMonad DatabaseContext
165getStateContext :: DatabaseContextEvalMonad DatabaseContext
155−getStateContext = dbc_context <$> get
166+getStateContext = gets dbc_context
157putStateContext :: DatabaseContext -> DatabaseContextEvalMonad ()
168putStateContext :: DatabaseContext -> DatabaseContextEvalMonad ()
158putStateContext ctx' = do
169putStateContext ctx' = do
160− put (s {dbc_context = ctx'})
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)
162−type RelationalExprState a = Reader RelationalExprEnv a
181+type GraphRefRelationalExprM a = ReaderT GraphRefRelationalExprEnv (ExceptT RelationalError Identity) a
183+gfTransForId :: TransactionId -> GraphRefRelationalExprM Transaction
184+gfTransForId tid = do
186+ lift $ except $ transactionForId tid graph
188+gfDatabaseContextForMarker :: GraphRefTransactionMarker -> GraphRefRelationalExprM DatabaseContext
189+gfDatabaseContextForMarker (TransactionMarker transId) = concreteDatabaseContext <$> gfTransForId transId
190+gfDatabaseContextForMarker UncommittedContextMarker = do
191+ mctx <- gre_context <$> askEnv
193+ Nothing -> throwError NoUncommittedContextInEvalError
194+ Just ctx -> pure ctx
196+runGraphRefRelationalExprM :: GraphRefRelationalExprEnv -> GraphRefRelationalExprM a -> Either RelationalError a
197+runGraphRefRelationalExprM env m = runIdentity (runExceptT (runReaderT m env))
199+freshGraphRefRelationalExprEnv :: Maybe DatabaseContext -> TransactionGraph -> GraphRefRelationalExprEnv
200+freshGraphRefRelationalExprEnv mctx graph = GraphRefRelationalExprEnv {
206+gfGraph :: GraphRefRelationalExprM TransactionGraph
207+gfGraph = asks gre_graph
164envContext :: RelationalExprEnv -> DatabaseContext
209envContext :: RelationalExprEnv -> DatabaseContext
165envContext = re_context
210envContext = re_context
@@ -167,173 +212,27 @@ envContext = re_context
167setEnvContext :: RelationalExprEnv -> DatabaseContext -> RelationalExprEnv
212setEnvContext :: RelationalExprEnv -> DatabaseContext -> RelationalExprEnv
168setEnvContext e ctx = e { re_context = ctx }
213setEnvContext e ctx = e { re_context = ctx }
171−--full evaluation down the graph
172−eval :: RelationalExpr -> RelationalExprState (Either RelationalError Relation)
175− eGfExpr <- processRelationalExpr expr
177− Left err -> pure (Left err)
178− Right gfExpr -> pure $ evalGraphRefRelationalExpr gfExpr (re_graph env)
181−--relvar state is needed in evaluation of relational expression but only as read-only in order to extract current relvar values
182−evalRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError GraphRefRelationalExpr)
183−evalRelationalExpr (RelationVariable name _) = do
184− relvarTable <- fmap (relationVariables . envContext) askEnv
185− return $ case M.lookup name relvarTable of
186− Just res -> Right res
187− Nothing -> Left $ RelVarNotDefinedError name
189−evalRelationalExpr (Project attrNames expr) = do
190− eAttrNameSet <- evalAttributeNames attrNames expr
191− case eAttrNameSet of
192− Left err -> pure (Left err)
193− Right attrNameSet -> do
194− rel <- evalRelationalExpr expr
196− Right rel2 -> pure $ Right (Project (AttributeNames attrNameSet) rel2)
197− Left err -> pure $ Left err
199−evalRelationalExpr (Union exprA exprB) = do
200− relA <- evalRelationalExpr exprA
201− relB <- evalRelationalExpr exprB
203− Left err -> return $ Left err
204− Right relA2 -> case relB of
205− Left err -> return $ Left err
206− Right relB2 -> return $ Right (Union relA2 relB2)
208−evalRelationalExpr (Join exprA exprB) = do
209− relA <- evalRelationalExpr exprA
210− relB <- evalRelationalExpr exprB
212− Left err -> return $ Left err
213− Right relA2 -> case relB of
214− Left err -> return $ Left err
215− Right relB2 -> return $ Right (Join relA2 relB2)
217−evalRelationalExpr (Difference exprA exprB) = do
218− relA <- evalRelationalExpr exprA
219− relB <- evalRelationalExpr exprB
221− Left err -> return $ Left err
222− Right relA2 -> case relB of
223− Left err -> return $ Left err
224− Right relB2 -> return $ Right (Difference relA2 relB2)
226−evalRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
227− case mkRelation attributeSet tupleSet of
228− Right rel -> return $ Right (ExistingRelation rel)
229− Left err -> return $ Left err
231−evalRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
232− currentContext <- fmap envContext askEnv
233− let tConss = typeConstructorMapping currentContext
234− -- 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
236− mAttrs <- case mAttrExprs of
238− Just . A.attributesFromList <$> mapM evalGraphRefAttrExpr (fromMaybe [] mAttrExprs)
239− Nothing -> pure Nothing
240− tuples <- mapM (liftE . evalTupleExpr mAttrs) tupleExprs
241− let attrs = fromMaybe firstTupleAttrs mAttrs
242− firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
243− expr <- either throwE pure (mkRelation attrs (RelationTupleSet tuples))
244− pure (ExistingRelation expr)
246−evalRelationalExpr (ExistingRelation rel) = pure (Right (ExistingRelation rel))
248−evalRelationalExpr (Rename oldAttrName newAttrName relExpr) = do
249− evald <- evalRelationalExpr relExpr
251− Right expr -> return $ Right (Rename oldAttrName newAttrName expr)
252− Left err -> return $ Left err
254−evalRelationalExpr (Group oldAttrNames newAttrName relExpr) = do
255− eOldAttrNameSet <- evalAttributeNames oldAttrNames relExpr
256− case eOldAttrNameSet of
257− Left err -> pure (Left err)
258− Right oldAttrNameSet -> do
259− evald <- evalRelationalExpr relExpr
261− Right expr -> return $ Right (Group (AttributeNames oldAttrNameSet) newAttrName expr)
262− Left err -> return $ Left err
264−evalRelationalExpr (Ungroup attrName relExpr) = do
265− evald <- evalRelationalExpr relExpr
267− Right expr -> return $ Right (Ungroup attrName expr)
268− Left err -> return $ Left err
270−evalRelationalExpr (Restrict predicateExpr relExpr) = do
271− evald <- evalRelationalExpr relExpr
272− pred <- processRestrictionPredicateExpr predicateExpr
274− Left err -> return $ Left err
276− pure $ Right (Restrict pred expr)
278−evalRelationalExpr (Equals relExprA relExprB) = do
279− evaldA <- evalRelationalExpr relExprA
280− evaldB <- evalRelationalExpr relExprB
282− Left err -> return $ Left err
283− Right exprA -> case evaldB of
284− Left err -> return $ Left err
285− Right exprB -> return $ Right (Equals exprA exprB)
287−evalRelationalExpr (With views mainExpr) = do
290− let addScopedView ctx (vname,vexpr) = if vname `M.member` relationVariables ctx then
291− Left (RelVarAlreadyDefinedError vname)
293− case runState (evalDatabaseContextExpr (Assign vname vexpr)) (freshDatabaseState ctx) of
294− (Left err,_) -> Left err
295− (Right (), (ctx',_,_)) -> Right ctx'
297− case foldM addScopedView (stateElemsContext rstate) views of
298− Left err -> return $ Left err
300− let evalMainExpr expr = runReader (evalRelationalExpr expr) (RelationalExprEnv ctx'')
301− case evalMainExpr mainExpr of
302− Left err -> return $ Left err
303− Right rel -> return $ Right rel
305−--warning: copy-pasta from above- refactor
306−evalRelationalExpr (NotEquals relExprA relExprB) = do
307− evaldA <- evalRelationalExpr relExprA
308− evaldB <- evalRelationalExpr relExprB
310− Left err -> return $ Left err
311− Right exprA -> case evaldB of
312− Left err -> return $ Left err
313− Right exprB -> return $ Right (NotEquals exprA exprB)
315−-- extending a relation adds a single attribute with the results of the per-tuple expression evaluated
316−evalRelationalExpr (Extend tupleExpression relExpr) = do
317− eExpr <- evalRelationalExpr relExpr
319− Left err -> pure (Left err)
321− tupProc <- processExtendTupleExpr tupleExpression
322− pure (Right (Extend tupProc expr))
324--helper function to process relation variable creation/assignment
215--helper function to process relation variable creation/assignment
325setRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
216setRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
326setRelVar relVarName relExpr = do
217setRelVar relVarName relExpr = do
328 currentContext <- getStateContext
218 currentContext <- getStateContext
219+ --prevent recursive relvar definition by resolving references to relvars in previous states
220+ relExpr' <- resolve relExpr
329− let newRelVars = M.insert relVarName relExpr $ relationVariables currentContext
221+ let newRelVars = M.insert relVarName relExpr' $ relationVariables currentContext
330 potentialContext = currentContext { relationVariables = newRelVars }
222 potentialContext = currentContext { relationVariables = newRelVars }
223+ --optimization: if the relexpr is unchanged, skip the update
224+ if M.lookup relVarName (relationVariables currentContext) == Just relExpr then
331− --determine when to check constraints
227+ --determine when to check constraints
332− graph <- dbcGraph
228+ graph <- dbcGraph
333− tid <- dbcTransId
229+ tid <- dbcTransId
334− case checkConstraints potentialContext tid graph of
230+ case checkConstraints potentialContext tid graph of
335− Left err -> dbErr err
231+ Left err -> dbErr err
336− Right _ -> putStateContext potentialContext
232+ Right _ -> putStateContext potentialContext
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 ()
338-- 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
339deleteRelVar :: RelVarName -> DatabaseContextEvalMonad ()
238deleteRelVar :: RelVarName -> DatabaseContextEvalMonad ()
@@ -352,20 +251,17 @@ evalGraphRefDatabaseContextExpr :: GraphRefDatabaseContextExpr -> DatabaseContex
352evalGraphRefDatabaseContextExpr NoOperation = pure ()
251evalGraphRefDatabaseContextExpr NoOperation = pure ()
354evalGraphRefDatabaseContextExpr (Define relVarName attrExprs) = do
253evalGraphRefDatabaseContextExpr (Define relVarName attrExprs) = do
254+ context <- getStateContext
355 relvars <- fmap relationVariables getStateContext
255 relvars <- fmap relationVariables getStateContext
356 tConss <- fmap typeConstructorMapping getStateContext
256 tConss <- fmap typeConstructorMapping getStateContext
357− relEnv <- dbcRelationalExprEnv
257+ graph <- dbcGraph
358− let eAttrs = runReader (mapM evalGraphRefAttrExpr attrExprs) relEnv
258+ let eAttrs = runGraphRefRelationalExprM gfEnv (mapM evalGraphRefAttrExpr attrExprs)
359− attrErrs = lefts eAttrs
259+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
360− attrsList = rights eAttrs
260+ case eAttrs of
361− if not (null attrErrs) then
261+ Left err -> dbErr err
362− dbErr (someErrors attrErrs)
262+ Right attrsList -> do
363− else do
263+ lift $ except $ validateAttributes tConss (A.attributesFromList attrsList)
364− let atomTypeErrs = lefts $ map ((`validateAtomType` tConss) . A.atomType) attrsList
365− if not (null atomTypeErrs) then
366− dbErr (someErrors atomTypeErrs)
368− case M.member relVarName relvars of
264+ case M.member relVarName relvars of
369 True -> dbErr (RelVarAlreadyDefinedError relVarName)
265 True -> dbErr (RelVarAlreadyDefinedError relVarName)
370 False -> setRelVar relVarName (ExistingRelation emptyRelation)
266 False -> setRelVar relVarName (ExistingRelation emptyRelation)
@@ -375,15 +271,20 @@ evalGraphRefDatabaseContextExpr (Define relVarName attrExprs) = do
375evalGraphRefDatabaseContextExpr (Undefine relVarName) = deleteRelVar relVarName
271evalGraphRefDatabaseContextExpr (Undefine relVarName) = deleteRelVar relVarName
377evalGraphRefDatabaseContextExpr (Assign relVarName expr) = do
273evalGraphRefDatabaseContextExpr (Assign relVarName expr) = do
378− relExprEnv <- dbcRelationalExprEnv
274+ graph <- re_graph <$> dbcRelationalExprEnv
379 context <- getStateContext
275 context <- getStateContext
380 let existingRelVar = M.lookup relVarName (relationVariables context)
276 let existingRelVar = M.lookup relVarName (relationVariables context)
277+ reEnv = freshGraphRefRelationalExprEnv (Just context) graph
278+ eNewExprType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr expr)
381 case existingRelVar of
279 case existingRelVar of
382 Nothing -> do
280 Nothing -> do
281+ case runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr expr) of
282+ Left err -> dbErr err
284+ lift $ except $ validateAttributes (typeConstructorMapping context) (attributes reltype)
383− setRelVar relVarName expr
285+ setRelVar relVarName expr
384 Just existingRel -> do
286 Just existingRel -> do
385− let eExpectedType = runReader (typeForGraphRefRelationalExpr existingRel) relExprEnv
287+ let eExpectedType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr existingRel)
386− eNewExprType = runReader (typeForGraphRefRelationalExpr expr) relExprEnv
387 case eExpectedType of
288 case eExpectedType of
388 Left err -> dbErr err
289 Left err -> dbErr err
389 Right expectedType ->
290 Right expectedType ->
@@ -391,44 +292,53 @@ evalGraphRefDatabaseContextExpr (Assign relVarName expr) = do
391 Left err -> dbErr err
292 Left err -> dbErr err
392 Right newExprType -> do
293 Right newExprType -> do
393 if newExprType == expectedType then do
294 if newExprType == expectedType then do
295+ lift $ except $ validateAttributes (typeConstructorMapping context) (attributes newExprType)
394 setRelVar relVarName expr
296 setRelVar relVarName expr
396 dbErr (RelationTypeMismatchError (attributes expectedType) (attributes newExprType))
298 dbErr (RelationTypeMismatchError (attributes expectedType) (attributes newExprType))
398evalGraphRefDatabaseContextExpr (Insert relVarName relExpr) = do
300evalGraphRefDatabaseContextExpr (Insert relVarName relExpr) = do
399− transId <- dbcTransId
301+ gfExpr <- relVarByName relVarName
400− evalGraphRefDatabaseContextExpr (Assign relVarName
302+ let optExpr = applyUnionCollapse (Union
402− (RelationVariable relVarName transId)
403− relExpr))
303+ relExpr
305+ evalGraphRefDatabaseContextExpr (Assign relVarName optExpr)
405evalGraphRefDatabaseContextExpr (Delete relVarName predicate) = do
307evalGraphRefDatabaseContextExpr (Delete relVarName predicate) = do
406− transId <- dbcTransId
308+ gfExpr <- relVarByName relVarName
407− let rv = RelationVariable relVarName transId
408− setRelVar relVarName (Restrict (NotPredicate predicate) rv)
309+ let optExpr = applyRestrictionCollapse (Restrict (NotPredicate predicate) gfExpr)
310+ setRelVar relVarName optExpr
410--union of restricted+updated portion and the unrestricted+unupdated portion
312--union of restricted+updated portion and the unrestricted+unupdated portion
411−evalGraphRefDatabaseContextExpr (Update relVarName atomExprMap pred) = do
313+evalGraphRefDatabaseContextExpr (Update relVarName atomExprMap pred') = do
314+ rvExpr <- relVarByName relVarName
315+ graph <- re_graph <$> dbcRelationalExprEnv
412 context <- getStateContext
316 context <- getStateContext
413− transId <- dbcTransId
317+ let reEnv = freshGraphRefRelationalExprEnv (Just context) graph
414− reEnv <- dbcRelationalExprEnv
318+ --get the current attributes name in the relvar to ensure that we don't conflict when renaming
415− let relVarMap = relationVariables context
319+ eExprType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr rvExpr)
416− case M.lookup relVarName relVarMap of
320+ exprType' <- case eExprType of
417− Nothing -> dbErr (RelVarNotDefinedError relVarName)
321+ Left err -> throwError err
418− Just existingRvExpr -> do
322+ Right t -> pure t
419− let unrestrictedPortion = Restrict (NotPredicate pred) rv
323+ let unrestrictedPortion = Restrict (NotPredicate pred') rvExpr
420− rv = RelationVariable relVarName transId
324+ tmpAttr = tmpAttrC 1
421− tmpAttr attr = "_tmp_" <> attr --this could certainly be improved to verify that there is no attribute name conflict
325+ tmpAttrC :: Int -> AttributeName -> AttributeName
327+ let tmpAttrName = "_tmp_" <> T.pack (show c) <> attr in
328+ if tmpAttrName `S.member` A.attributeNameSet (attributes exprType') then
422− updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)
332+ updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)
423− projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)
333+ projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)
424− restrictedPortion = Restrict pred
334+ restrictedPortion = Restrict pred' rvExpr
425− updated = foldr (\(oldname, atomExpr) accum ->
335+ updated = foldr (\(oldname, atomExpr) accum ->
426− let procAtomExpr = runReader (processAtomExpr atomExpr) reEnv in
336+ let procAtomExpr = runProcessExprM UncommittedContextMarker (processAtomExpr atomExpr) in
427 updateAttr oldname procAtomExpr accum
337 updateAttr oldname procAtomExpr accum
428− ) rv (M.toList atomExprMap)
338+ ) restrictedPortion (M.toList atomExprMap)
429 -- the atomExprMap could reference other attributes, so we must perform multi-pass folds
339 -- the atomExprMap could reference other attributes, so we must perform multi-pass folds
430− updatedPortion = foldr projectAndRename updated (M.keys atomExprMap)
340+ updatedPortion = foldr projectAndRename updated (M.keys atomExprMap)
431− setRelVar relVarName (Union unrestrictedPortion updatedPortion)
341+ setRelVar relVarName (Union unrestrictedPortion updatedPortion)
433evalGraphRefDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do
343evalGraphRefDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do
434 currContext <- getStateContext
344 currContext <- getStateContext
@@ -440,6 +350,8 @@ evalGraphRefDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do
440 dbErr (InclusionDependencyNameInUseError newDepName)
350 dbErr (InclusionDependencyNameInUseError newDepName)
442 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
443 case checkConstraints potentialContext transId graph of
355 case checkConstraints potentialContext transId graph of
444 Left err -> dbErr err
356 Left err -> dbErr err
445 Right _ ->
357 Right _ ->
@@ -484,9 +396,9 @@ evalGraphRefDatabaseContextExpr (AddTypeConstructor tConsDef dConsDefList) = do
484 let oldTypes = typeConstructorMapping currentContext
396 let oldTypes = typeConstructorMapping currentContext
485 tConsName = TCD.name tConsDef
397 tConsName = TCD.name tConsDef
486 -- validate that the constructor's types exist
398 -- validate that the constructor's types exist
487− case validateTypeConstructorDef tConsDef dConsDefList of
399+ case validateTypeConstructorDef tConsDef dConsDefList oldTypes of
488− errs@(_:_) -> dbErr (someErrors errs)
400+ Left err -> throwError err
489− [] | T.null tConsName || not (isUpper (T.head tConsName)) -> dbErr (InvalidAtomTypeName tConsName)
401+ Right () | T.null tConsName || not (isUpper (T.head tConsName)) -> dbErr (InvalidAtomTypeName tConsName)
490 | isJust (findTypeConstructor tConsName oldTypes) -> dbErr (AtomTypeNameInUseError tConsName)
402 | isJust (findTypeConstructor tConsName oldTypes) -> dbErr (AtomTypeNameInUseError tConsName)
491 | otherwise -> do
403 | otherwise -> do
492 let newTypes = oldTypes ++ [(tConsDef, dConsDefList)]
404 let newTypes = oldTypes ++ [(tConsDef, dConsDefList)]
@@ -502,15 +414,10 @@ evalGraphRefDatabaseContextExpr (RemoveTypeConstructor tConsName) = do
502 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes
414 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes
503 putStateContext $ currentContext { typeConstructorMapping = newTypes }
415 putStateContext $ currentContext { typeConstructorMapping = newTypes }
505−evalGraphRefDatabaseContextExpr (MultipleExpr exprs) = do
417+evalGraphRefDatabaseContextExpr (MultipleExpr exprs) =
506 --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
508−{- evald <- forM exprs (\expr -> evalGraphRefDatabaseContextExpr expr)
419+ mapM_ evalGraphRefDatabaseContextExpr exprs
509− --some lifting magic needed here
420+
512− errs -> dbErr (someErrors errs)
514evalGraphRefDatabaseContextExpr (RemoveAtomFunction funcName) = do
421evalGraphRefDatabaseContextExpr (RemoveAtomFunction funcName) = do
515 currentContext <- getStateContext
422 currentContext <- getStateContext
516 let atomFuncs = atomFunctions currentContext
423 let atomFuncs = atomFunctions currentContext
@@ -537,10 +444,11 @@ evalGraphRefDatabaseContextExpr (RemoveDatabaseContextFunction funcName) = do
538evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) = do
445evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) = do
539 context <- getStateContext
446 context <- getStateContext
540− relExprEnv <- dbcRelationalExprEnv
447+ graph <- dbcGraph
541 --resolve atom arguments
448 --resolve atom arguments
542− let eAtomTypes = map (\atomExpr -> runReader (typeForGraphRefAtomExpr emptyAttributes atomExpr) relExprEnv) atomArgExprs
449+ let eAtomTypes = mapM (runGraphRefRelationalExprM gfEnv . typeForGraphRefAtomExpr emptyAttributes) atomArgExprs
543 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)
450 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)
451+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
544 case eFunc of
452 case eFunc of
545 Left err -> dbErr err
453 Left err -> dbErr err
546 Right func -> do
454 Right func -> do
@@ -550,16 +458,16 @@ evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArg
550 dbErr (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
458 dbErr (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
552 --check that the atom types are valid
460 --check that the atom types are valid
553− case lefts eAtomTypes of
461+ case eAtomTypes of
554− _:_ -> dbErr (someErrors (lefts eAtomTypes))
462+ Left err -> dbErr err
555− [] -> do
463+ Right atomTypes -> do
556− let atomTypes = rights eAtomTypes
464+ let mValidTypes = zipWith (\ expType actType
557− let mValidTypes = map (\(expType, actType) -> case atomTypeVerify expType actType of
465+ -> case atomTypeVerify expType actType of
558− Left err -> Just err
466+ Left err -> Just err
559− Right _ -> Nothing) (zip (dbcFuncType func) atomTypes)
468+ (dbcFuncType func) atomTypes
560 typeErrors = catMaybes mValidTypes
469 typeErrors = catMaybes mValidTypes
561− eAtomArgs = unimplemented
470+ eAtomArgs = map (runGraphRefRelationalExprM gfEnv . evalGraphRefAtomExpr emptyTuple) atomArgExprs
562− --eAtomArgs = map (\arg -> runReader (evalAtomExpr emptyTuple arg) relExprState) atomArgExprs
563 if length (lefts eAtomArgs) > 1 then
471 if length (lefts eAtomArgs) > 1 then
564 dbErr (someErrors (lefts eAtomArgs))
472 dbErr (someErrors (lefts eAtomArgs))
565 else if not (null typeErrors) then
473 else if not (null typeErrors) then
@@ -568,7 +476,6 @@ evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArg
568 case evalDatabaseContextFunction func (rights eAtomArgs) context of
476 case evalDatabaseContextFunction func (rights eAtomArgs) context of
569 Left err -> dbErr err
477 Left err -> dbErr err
570 Right newContext -> putStateContext newContext
478 Right newContext -> putStateContext newContext
572data DatabaseContextIOEvalEnv = DatabaseContextIOEvalEnv
479data DatabaseContextIOEvalEnv = DatabaseContextIOEvalEnv
573 { dbcio_transId :: TransactionId,
480 { dbcio_transId :: TransactionId,
574 dbcio_graph :: TransactionGraph,
481 dbcio_graph :: TransactionGraph,
@@ -577,6 +484,15 @@ data DatabaseContextIOEvalEnv = DatabaseContextIOEvalEnv
578type DatabaseContextIOEvalMonad a = RWST DatabaseContextIOEvalEnv () DatabaseContextEvalState IO a
485type 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
580requireScriptSession :: DatabaseContextIOEvalMonad (Either RelationalError ScriptSession)
496requireScriptSession :: DatabaseContextIOEvalMonad (Either RelationalError ScriptSession)
581requireScriptSession = do
497requireScriptSession = do
582 env <- RWS.ask
498 env <- RWS.ask
@@ -595,10 +511,15 @@ getDBCIOContext = dbc_context <$> RWS.get
595getDBCIORelationalExprEnv :: DatabaseContextIOEvalMonad RelationalExprEnv
511getDBCIORelationalExprEnv :: DatabaseContextIOEvalMonad RelationalExprEnv
596getDBCIORelationalExprEnv = do
512getDBCIORelationalExprEnv = do
597 context <- getDBCIOContext
513 context <- getDBCIOContext
599− pure $ mkRelationalExprEnv context (dbcio_transId env) (dbcio_graph env)
514+ mkRelationalExprEnv context . dbcio_graph <$> RWS.ask
601evalGraphRefDatabaseContextIOExpr :: GraphRefDatabaseContextIOExpr -> DatabaseContextIOEvalMonad (Either RelationalError ())
516evalGraphRefDatabaseContextIOExpr :: 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))
602evalGraphRefDatabaseContextIOExpr (AddAtomFunction funcName funcType script) = do
523evalGraphRefDatabaseContextIOExpr (AddAtomFunction funcName funcType script) = do
603 eScriptSession <- requireScriptSession
524 eScriptSession <- requireScriptSession
604 currentContext <- getDBCIOContext
525 currentContext <- getDBCIOContext
@@ -632,7 +553,6 @@ evalGraphRefDatabaseContextIOExpr (AddAtomFunction funcName funcType script) = d
632 Right eContext -> case eContext of
553 Right eContext -> case eContext of
633 Left err -> pure (Left err)
554 Left err -> pure (Left err)
634 Right context' -> putDBCIOContext context'
555 Right context' -> putDBCIOContext context'
636evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType script) = do
556evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType script) = do
637 eScriptSession <- requireScriptSession
557 eScriptSession <- requireScriptSession
638 currentContext <- getDBCIOContext
558 currentContext <- getDBCIOContext
@@ -674,7 +594,6 @@ evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType
674 Right eContext -> case eContext of
594 Right eContext -> case eContext of
675 Left err -> pure (Left err)
595 Left err -> pure (Left err)
676 Right context' -> putDBCIOContext context'
596 Right context' -> putDBCIOContext context'
678evalGraphRefDatabaseContextIOExpr (LoadAtomFunctions modName funcName modPath) = do
597evalGraphRefDatabaseContextIOExpr (LoadAtomFunctions modName funcName modPath) = do
679 currentContext <- getDBCIOContext
598 currentContext <- getDBCIOContext
680 eLoadFunc <- liftIO $ loadAtomFunctions (T.unpack modName) (T.unpack funcName) modPath
599 eLoadFunc <- liftIO $ loadAtomFunctions (T.unpack modName) (T.unpack funcName) modPath
@@ -691,7 +610,7 @@ evalGraphRefDatabaseContextIOExpr (LoadDatabaseContextFunctions modName funcName
691 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }
610 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }
692 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)
611 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)
693 in putDBCIOContext newContext
612 in putDBCIOContext newContext
695evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs range) = do
614evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs range) = do
697 currentContext <- getDBCIOContext
616 currentContext <- getDBCIOContext
@@ -699,63 +618,61 @@ evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs
699 --create graph ref expr
618 --create graph ref expr
700 let gfExpr = Define relVarName attrExprs
619 let gfExpr = Define relVarName attrExprs
701 evalEnv = mkDatabaseContextEvalEnv (dbcio_transId env) (dbcio_graph env)
620 evalEnv = mkDatabaseContextEvalEnv (dbcio_transId env) (dbcio_graph env)
702− transId = dbcio_transId env
703 graph = dbcio_graph env
621 graph = dbcio_graph env
704 case runDatabaseContextEvalMonad currentContext evalEnv (evalGraphRefDatabaseContextExpr gfExpr) of
622 case runDatabaseContextEvalMonad currentContext evalEnv (evalGraphRefDatabaseContextExpr gfExpr) of
705 Left err -> pure (Left err)
623 Left err -> pure (Left err)
706− Right state -> do
624+ Right dbstate -> do
708 let existingRelVar = M.lookup relVarName relVarTable
626 let existingRelVar = M.lookup relVarName relVarTable
709− relVarTable = relationVariables (dbc_context state)
627+ relVarTable = relationVariables (dbc_context dbstate)
710 case existingRelVar of
628 case existingRelVar of
711 Nothing -> pure $ Left (RelVarNotDefinedError relVarName)
629 Nothing -> pure $ Left (RelVarNotDefinedError relVarName)
712 Just existingRel -> do
630 Just existingRel -> do
631+ let gfEnv = freshGraphRefRelationalExprEnv (Just currentContext) graph
713− case runReader (typeForGraphRefRelationalExpr existingRel) (mkRelationalExprEnv currentContext transId graph) of
632+ case runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr existingRel) of
714 Left err -> pure (Left err)
633 Left err -> pure (Left err)
715 Right relType -> do
634 Right relType -> do
716 let expectedAttributes = attributes relType
635 let expectedAttributes = attributes relType
717− tcMap = typeConstructorMapping (dbc_context state)
636+ tcMap = typeConstructorMapping (dbc_context dbstate)
718 eitherRel <- liftIO $ generate $ runReaderT (arbitraryRelation expectedAttributes range) tcMap
637 eitherRel <- liftIO $ generate $ runReaderT (arbitraryRelation expectedAttributes range) tcMap
719 case eitherRel of
638 case eitherRel of
720 Left err -> pure $ Left err
639 Left err -> pure $ Left err
721 Right rel ->
640 Right rel ->
722 case runDatabaseContextEvalMonad currentContext evalEnv (setRelVar relVarName (ExistingRelation rel)) of
641 case runDatabaseContextEvalMonad currentContext evalEnv (setRelVar relVarName (ExistingRelation rel)) of
723 Left err -> pure (Left err)
642 Left err -> pure (Left err)
724− Right state -> putDBCIOContext (dbc_context state)
643+ Right dbstate' -> putDBCIOContext (dbc_context dbstate')
726−updateTupleWithAtomExprs :: M.Map AttributeName AtomExpr -> DatabaseContext -> TransactionGraph -> RelationTuple -> Either RelationalError RelationTuple
727−updateTupleWithAtomExprs exprMap context graph tupIn = do
728− --resolve all atom exprs
729− atomsAssoc <- mapM (\(attrName, atomExpr) -> do
730− let atom = unimplemented
731− --atom <- runReader (evalAtomExpr tupIn atomExpr) (mkRelationalExprState context graph)
732− pure (attrName, atom)
733− ) (M.toList exprMap)
734− pure (updateTupleWithAtoms (M.fromList atomsAssoc) tupIn)
736--run verification on all constraints
645--run verification on all constraints
737checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()
646checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()
738−checkConstraints context transId graph@(TransactionGraph graphHeads transSet) =
647+checkConstraints context transId graph@(TransactionGraph graphHeads transSet) = do
739 mapM_ (uncurry checkIncDep) (M.toList deps)
648 mapM_ (uncurry checkIncDep) (M.toList deps)
741 potentialGraph = TransactionGraph graphHeads (S.insert tempTrans transSet)
650 potentialGraph = TransactionGraph graphHeads (S.insert tempTrans transSet)
742 tempStamp = UTCTime { utctDay = fromGregorian 2000 1 1,
651 tempStamp = UTCTime { utctDay = fromGregorian 2000 1 1,
743 utctDayTime = secondsToDiffTime 0 }
652 utctDayTime = secondsToDiffTime 0 }
744 tempSchemas = Schemas context M.empty
653 tempSchemas = Schemas context M.empty
654+ tempTrans = Transaction U.nil tempTransInfo tempSchemas
745− tempTrans = Transaction U.nil (TransactionInfo (transId NE.:| []) tempStamp) tempSchemas
655+ tempTransInfo = TransactionInfo { parents = transId NE.:| [],
747 deps = inclusionDependencies context
660 deps = inclusionDependencies context
748− reEnv = mkRelationalExprEnv context transId graph
749 -- no optimization available here, really? perhaps the optimizer should be passed down to here or the eval function should be passed through the environment
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
750 checkIncDep depName (InclusionDependency subsetExpr supersetExpr) = do
662 checkIncDep depName (InclusionDependency subsetExpr supersetExpr) = do
663+ let process = runProcessExprM UncommittedContextMarker
751− let gfSubsetExpr = runReader (processRelationalExpr subsetExpr) reEnv
664+ gfSubsetExpr = process (processRelationalExpr subsetExpr)
752− gfSupersetExpr = runReader (processRelationalExpr supersetExpr) reEnv
665+ gfSupersetExpr = process (processRelationalExpr supersetExpr)
753 --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.
754− typeSub <- runReader (typeForRelationalExpr subsetExpr) reEnv
667+ let gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
755− typeSuper <- runReader (typeForRelationalExpr supersetExpr) reEnv
668+ runGfRel = runGraphRefRelationalExprM gfEnv
669+ typeSub <- runGfRel (typeForGraphRefRelationalExpr gfSubsetExpr)
670+ typeSuper <- runGfRel (typeForGraphRefRelationalExpr gfSupersetExpr)
756 when (typeSub /= typeSuper) (Left (RelationTypeMismatchError (attributes typeSub) (attributes typeSuper)))
671 when (typeSub /= typeSuper) (Left (RelationTypeMismatchError (attributes typeSub) (attributes typeSuper)))
757 let checkExpr = Equals gfSupersetExpr (Union gfSubsetExpr gfSupersetExpr)
672 let checkExpr = Equals gfSupersetExpr (Union gfSubsetExpr gfSupersetExpr)
758− case evalGraphRefRelationalExpr checkExpr potentialGraph of
673+ gfEvald = runGraphRefRelationalExprM gfEnv' (evalGraphRefRelationalExpr checkExpr)
674+ gfEnv' = freshGraphRefRelationalExprEnv (Just context) potentialGraph
759 Left err -> Left err
676 Left err -> Left err
760 Right resultRel -> if resultRel == relationTrue then
677 Right resultRel -> if resultRel == relationTrue then
@@ -765,87 +682,81 @@ checkConstraints context transId graph@(TransactionGraph graphHeads transSet) =
765-- 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
766-- 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
768−typeForRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError Relation)
685+typeForRelationalExpr :: RelationalExpr -> RelationalExprM Relation
769typeForRelationalExpr expr = do
686typeForRelationalExpr expr = do
770 --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
771 --evalRelationalExpr could still return an existing relation with tuples, so strip them
688 --evalRelationalExpr could still return an existing relation with tuples, so strip them
690+ context <- reContext
772− gfExpr <- processRelationalExpr expr
691+ let gfExpr = runProcessExprM UncommittedContextMarker (processRelationalExpr expr)
692+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
773− typeForGraphRefRelationalExpr gfExpr
693+ runGf = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
774−
694+ lift $ except runGf
775−--returns a database context with all tuples removed
776−--this is useful for type checking and optimization
778−contextWithEmptyTupleSets :: DatabaseContext -> DatabaseContext
779−contextWithEmptyTupleSets contextIn = contextIn { relationVariables = relVars }
781− relVars = M.map (\rel -> ExistingRelation (Relation (attributes rel) emptyTupleSet)) (relationVariables contextIn)
784liftE :: (Monad m) => m (Either a b) -> ExceptT a m b
696liftE :: (Monad m) => m (Either a b) -> ExceptT a m b
785liftE v = do
697liftE v = do
786 y <- lift v
698 y <- lift v
787 case y of
699 case y of
788− Left err -> throwE err
700+ Left err -> throwError err
789 Right val -> pure val
701 Right val -> pure val
791{- 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 -}
792−predicateRestrictionFilter :: Attributes -> RestrictionPredicateExprBase a -> RelationalExprState (Either RelationalError RestrictionFilter)
704+predicateRestrictionFilter :: Attributes -> GraphRefRestrictionPredicateExpr -> GraphRefRelationalExprM RestrictionFilter
793−predicateRestrictionFilter attrs (AndPredicate expr1 expr2) =
705+predicateRestrictionFilter attrs (AndPredicate expr1 expr2) = do
795− expr1v <- liftE (predicateRestrictionFilter attrs expr1)
706+ expr1v <- predicateRestrictionFilter attrs expr1
796− expr2v <- liftE (predicateRestrictionFilter attrs expr2)
707+ expr2v <- predicateRestrictionFilter attrs expr2
797− pure (\x -> do
708+ pure (\x -> do
798− ev1 <- expr1v x
709+ ev1 <- expr1v x
799− ev2 <- expr2v x
710+ ev2 <- expr2v x
800− pure (ev1 && ev2))
711+ pure (ev1 && ev2))
802−predicateRestrictionFilter attrs (OrPredicate expr1 expr2) =
713+predicateRestrictionFilter attrs (OrPredicate expr1 expr2) = do
804− expr1v <- liftE (predicateRestrictionFilter attrs expr1)
714+ expr1v <- predicateRestrictionFilter attrs expr1
805− expr2v <- liftE (predicateRestrictionFilter attrs expr2)
715+ expr2v <- predicateRestrictionFilter attrs expr2
806 pure (\x -> do
716 pure (\x -> do
807 ev1 <- expr1v x
717 ev1 <- expr1v x
808 ev2 <- expr2v x
718 ev2 <- expr2v x
809 pure (ev1 || ev2))
719 pure (ev1 || ev2))
811−predicateRestrictionFilter _ TruePredicate = pure (Right (\_ -> pure True))
721+predicateRestrictionFilter _ TruePredicate = pure (\_ -> pure True)
813−predicateRestrictionFilter attrs (NotPredicate expr) =
723+predicateRestrictionFilter attrs (NotPredicate expr) = do
815− exprv <- liftE (predicateRestrictionFilter attrs expr)
724+ exprv <- predicateRestrictionFilter attrs expr
816− pure (fmap not . exprv)
725+ pure (fmap not . exprv)
818--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
820predicateRestrictionFilter _ (RelationalExprPredicate relExpr) = do
728predicateRestrictionFilter _ (RelationalExprPredicate relExpr) = do
821− rstate <- ask
729+ renv <- askEnv
822− 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
823 Left err -> Left err
735 Left err -> Left err
824 Right rel -> if arity rel /= 0 then
736 Right rel -> if arity rel /= 0 then
825 Left (PredicateExpressionError "Relational restriction filter must evaluate to 'true' or 'false'")
737 Left (PredicateExpressionError "Relational restriction filter must evaluate to 'true' or 'false'")
827− pure (rel == relationTrue)))
739+ pure (rel == relationTrue))
829predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr) = do
741predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr) = do
830− rstate <- ask
742+ env <- askEnv
831− let attrs' = stateAttributes rstate
743+ let attrs' = A.union attrs (envAttributes env)
832− ctxtup' = stateTuple rstate
744+ ctxtup' = envTuple env
834− atomExprType <- liftE (typeFromAtomExpr attrs' atomExpr)
745+ atomExprType <- typeForGraphRefAtomExpr attrs' atomExpr
835− attr <- either throwE pure $ case A.attributeForName attrName attrs of
746+ attr <- lift $ except $ case A.attributeForName attrName attrs of
836 Right attr -> Right attr
747 Right attr -> Right attr
837 Left (NoSuchAttributeNamesError _) -> case A.attributeForName attrName (tupleAttributes ctxtup') of
748 Left (NoSuchAttributeNamesError _) -> case A.attributeForName attrName (tupleAttributes ctxtup') of
838 Right ctxattr -> Right ctxattr
749 Right ctxattr -> Right ctxattr
839 Left err2@(NoSuchAttributeNamesError _) -> Left err2
750 Left err2@(NoSuchAttributeNamesError _) -> Left err2
840 Left err -> Left err
751 Left err -> Left err
841 Left err -> Left err
752 Left err -> Left err
842− if atomExprType /= A.atomType attr then
753+ if atomExprType /= A.atomType attr then
843− throwE (TupleAttributeTypeMismatchError (A.attributesFromList [attr]))
754+ throwError (TupleAttributeTypeMismatchError (A.attributesFromList [attr]))
845 pure $ \tupleIn -> let evalAndCmp atomIn = case atomEvald of
756 pure $ \tupleIn -> let evalAndCmp atomIn = case atomEvald of
846 Right atomCmp -> atomCmp == atomIn
757 Right atomCmp -> atomCmp == atomIn
847 Left _ -> False
758 Left _ -> False
848− atomEvald = runReader (evalAtomExpr tupleIn atomExpr) rstate
759+ atomEvald = runGraphRefRelationalExprM env (evalGraphRefAtomExpr tupleIn atomExpr)
850 pure $ case atomForAttributeName attrName tupleIn of
761 pure $ case atomForAttributeName attrName tupleIn of
851 Left (NoSuchAttributeNamesError _) -> case atomForAttributeName attrName ctxtup' of
762 Left (NoSuchAttributeNamesError _) -> case atomForAttributeName attrName ctxtup' of
@@ -856,277 +767,322 @@ predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr)
856-- 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
857predicateRestrictionFilter attrs (AtomExprPredicate atomExpr) = do
768predicateRestrictionFilter attrs (AtomExprPredicate atomExpr) = do
858 --merge attrs into the state attributes
769 --merge attrs into the state attributes
859− rstate <- ask
770+ renv <- askEnv
861− aType <- liftE (typeFromAtomExpr attrs atomExpr)
771+ aType <- typeForGraphRefAtomExpr attrs atomExpr
862− if aType /= BoolAtomType then
772+ if aType /= BoolAtomType then
863− throwE (AtomTypeMismatchError aType BoolAtomType)
773+ throwError (AtomTypeMismatchError aType BoolAtomType)
865 pure (\tupleIn ->
775 pure (\tupleIn ->
866− case runReader (evalAtomExpr tupleIn atomExpr) rstate of
776+ case runGraphRefRelationalExprM renv (evalGraphRefAtomExpr tupleIn atomExpr) of
867− Left err -> Left err
777+ Left err -> Left err
868− Right boolAtomValue -> pure (boolAtomValue == BoolAtom True))
778+ Right boolAtomValue -> pure (boolAtomValue == BoolAtom True))
870tupleExprCheckNewAttrName :: AttributeName -> Relation -> Either RelationalError Relation
780tupleExprCheckNewAttrName :: AttributeName -> Relation -> Either RelationalError Relation
871tupleExprCheckNewAttrName attrName rel = if isRight (attributeForName attrName rel) then
781tupleExprCheckNewAttrName attrName rel = if isRight (attributeForName attrName rel) then
872 Left (AttributeNameInUseError attrName)
782 Left (AttributeNameInUseError attrName)
874 Right rel
784 Right rel
876−extendTupleExpressionProcessor :: Relation -> ExtendTupleExpr -> RelationalExprState (Either RelationalError (Attributes, RelationTuple -> Either RelationalError RelationTuple))
786+extendGraphRefTupleExpressionProcessor :: Relation -> GraphRefExtendTupleExpr -> GraphRefRelationalExprM (Attributes, RelationTuple -> Either RelationalError RelationTuple)
877−extendTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) = do
787+extendGraphRefTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) =
878− rstate <- askEnv
788+-- renv <- askEnv
879 -- check that the attribute name is not in use
789 -- check that the attribute name is not in use
880 case tupleExprCheckNewAttrName newAttrName relIn of
790 case tupleExprCheckNewAttrName newAttrName relIn of
881− Left err -> pure (Left err)
791+ Left err -> throwError err
882− Right _ -> runExceptT $ do
792+ Right _ -> do
883− atomExprType <- liftE (typeFromAtomExpr (attributes relIn) atomExpr)
793+ atomExprType <- typeForGraphRefAtomExpr (attributes relIn) atomExpr
884− atomExprType' <- liftE (verifyAtomExprTypes relIn atomExpr atomExprType)
794+ atomExprType' <- verifyGraphRefAtomExprTypes relIn atomExpr atomExprType
885 let newAttrs = A.attributesFromList [Attribute newAttrName atomExprType']
795 let newAttrs = A.attributesFromList [Attribute newAttrName atomExprType']
886 newAndOldAttrs = A.addAttributes (attributes relIn) newAttrs
796 newAndOldAttrs = A.addAttributes (attributes relIn) newAttrs
887− pure (newAndOldAttrs, \tup -> let substate = mergeTuplesIntoRelationalExprState tup rstate in
798+ pure (newAndOldAttrs, \tup -> do
888− case unimplemented {-runReader (evalAtomExpr tup atomExpr) substate-} of
799+ let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tup env
889− Left err -> Left err
800+ atom <- runGraphRefRelationalExprM gfEnv (evalGraphRefAtomExpr tup atomExpr)
890− Right atom -> Right (tupleAtomExtend newAttrName atom tup)
801+ Right (tupleAtomExtend newAttrName atom tup)
893−
804+evalGraphRefAtomExpr :: RelationTuple -> GraphRefAtomExpr -> GraphRefRelationalExprM Atom
894−evalAtomExpr :: RelationTuple -> AtomExpr -> RelationalExprState (Either RelationalError Atom)
805+evalGraphRefAtomExpr tupIn (AttributeAtomExpr attrName) =
895−evalAtomExpr = undefined
898−evalAtomExpr tupIn (AttributeAtomExpr attrName) = case atomForAttributeName attrName tupIn of
806+ case atomForAttributeName attrName tupIn of
899− Right atom -> pure (Right atom)
807+ Right atom -> pure atom
900− err@(Left (NoSuchAttributeNamesError _)) -> do
808+ Left err@(NoSuchAttributeNamesError _) -> do
901− rstate <- ask
809+ env <- askEnv
902− let stateTup = stateTuple rstate
810+ case gre_extra env of
811+ Nothing -> throwError err
903− pure (atomForAttributeName attrName stateTup)
812+ Just (Left ctxtup) -> lift $ except $ atomForAttributeName attrName ctxtup
813+ Just (Right _) -> throwError err
904− Left err -> pure (Left err)
814+ Left err -> throwError err
905−evalAtomExpr _ (NakedAtomExpr atom) = pure (Right atom)
815+evalGraphRefAtomExpr _ (NakedAtomExpr atom) = pure atom
906−evalAtomExpr tupIn (FunctionAtomExpr funcName arguments ()) = do
816+evalGraphRefAtomExpr tupIn (FunctionAtomExpr funcName arguments tid) = do
907− argTypes <- mapM (typeFromAtomExpr (tupleAttributes tupIn)) arguments
817+ argTypes <- mapM (typeForGraphRefAtomExpr (tupleAttributes tupIn)) arguments
908− context <- fmap stateElemsContext ask
818+ context <- gfDatabaseContextForMarker tid
910− let functions = atomFunctions context
819+ let functions = atomFunctions context
911− func <- either throwE pure (atomFunctionForName funcName functions)
820+ func <- lift $ except (atomFunctionForName funcName functions)
912− let expectedArgCount = length (atomFuncType func) - 1
821+ let expectedArgCount = length (atomFuncType func) - 1
913− actualArgCount = length argTypes
822+ actualArgCount = length argTypes
914− safeInit [] = [] -- different behavior from normal init
823+ safeInit [] = [] -- different behavior from normal init
915− safeInit xs = init xs
824+ safeInit xs = init xs
916− if expectedArgCount /= actualArgCount then
825+ if expectedArgCount /= actualArgCount then
917− throwE (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
826+ throwError (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
919 let zippedArgs = zip (safeInit (atomFuncType func)) argTypes
828 let zippedArgs = zip (safeInit (atomFuncType func)) argTypes
920− mapM_ (\(expType, eActType) -> do
829+ mapM_ (\(expType, actType) ->
921− actType <- either throwE pure eActType
922− either throwE pure (atomTypeVerify expType actType)) zippedArgs
830+ lift $ except (atomTypeVerify expType actType)) zippedArgs
923− evaldArgs <- mapM (liftE . evalAtomExpr tupIn) arguments
831+ evaldArgs <- mapM (evalGraphRefAtomExpr tupIn) arguments
924 case evalAtomFunction func evaldArgs of
832 case evalAtomFunction func evaldArgs of
925− Left err -> throwE (AtomFunctionUserError err)
833+ Left err -> throwError (AtomFunctionUserError err)
926 Right result -> do
834 Right result -> do
927 --validate that the result matches the expected type
835 --validate that the result matches the expected type
928− _ <- either throwE pure (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
836+ _ <- lift $ except (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
929 pure result
837 pure result
930−evalAtomExpr tupIn (RelationAtomExpr relExpr) = do
838+evalGraphRefAtomExpr tupIn (RelationAtomExpr relExpr) = do
931 --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
932− rstate <- ask
840+ env <- ask
933− runExceptT $ do
841+ let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tupIn env
934− let newState = mergeTuplesIntoRelationalExprState tupIn rstate
842+ relAtom <- lift $ except $ runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr relExpr)
935− relAtom <- either throwE pure (runReader (evalRelationalExpr relExpr) newState)
936− pure (RelationAtom relAtom)
843+ pure (RelationAtom relAtom)
937−evalAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs ()) = runExceptT $ do
844+evalGraphRefAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs _) = do --why is the tid unused here? suspicious
938− rstate <- lift ask
845+ let mergeEnv = mergeTuplesIntoGraphRefRelationalExprEnv tupIn
939− let newState = mergeTuplesIntoRelationalExprState tupIn rstate
940− aType <- either throwE pure (runReader (typeFromAtomExpr (tupleAttributes tupIn) cons) newState)
846+ aType <- local mergeEnv (typeForGraphRefAtomExpr (tupleAttributes tupIn) cons)
941− argAtoms <- mapM (\arg -> either throwE pure (runReader (evalAtomExpr tupIn arg) newState)) dConsArgs
847+ argAtoms <- local mergeEnv $
848+ mapM (evalGraphRefAtomExpr tupIn) dConsArgs
942 pure (ConstructedAtom dConsName aType argAtoms)
849 pure (ConstructedAtom dConsName aType argAtoms)
944−typeForGraphRefAtomExpr :: Attributes -> GraphRefAtomExpr -> RelationalExprState (Either RelationalError AtomType)
851+typeForGraphRefAtomExpr :: Attributes -> GraphRefAtomExpr -> GraphRefRelationalExprM AtomType
945typeForGraphRefAtomExpr attrs (AttributeAtomExpr attrName) = do
852typeForGraphRefAtomExpr attrs (AttributeAtomExpr attrName) = do
946− rstate <- askEnv
853+ renv <- askEnv
947 case A.atomTypeForAttributeName attrName attrs of
854 case A.atomTypeForAttributeName attrName attrs of
948− Right aType -> pure (Right aType)
855+ Right aType -> pure aType
949 Left err@(NoSuchAttributeNamesError _) ->
856 Left err@(NoSuchAttributeNamesError _) ->
950− let stateTup = stateTuple rstate
857+ let envTup = envTuple renv
951− stateAttrs = stateAttributes rstate in
858+ envAttrs = envAttributes renv in
952− case A.attributeForName attrName stateAttrs of
859+ case A.attributeForName attrName envAttrs of
953− Right attr -> pure (Right (A.atomType attr))
860+ Right attr -> pure (A.atomType attr)
954− Left _ -> case atomForAttributeName attrName stateTup of
861+ Left _ -> case atomForAttributeName attrName envTup of
955− Right atom -> pure (Right (atomTypeForAtom atom))
862+ Right atom -> pure (atomTypeForAtom atom)
956− Left _ -> pure (Left err)
863+ Left _ -> --throwError (traceStack (show ("typeForGRAtomExpr", attrs, envTup)) err)
865+ Left err -> throwError err
958−typeForGraphAtomExpr _ (NakedAtomExpr atom) = pure (Right (atomTypeForAtom atom))
867+typeForGraphRefAtomExpr _ (NakedAtomExpr atom) = pure (atomTypeForAtom atom)
959−typeForGraphAtomExpr attrs (FunctionAtomExpr funcName atomArgs _) = do
868+typeForGraphRefAtomExpr attrs (FunctionAtomExpr funcName atomArgs transId) = do
960− context <- fmap envContext askEnv
961− let funcs = atomFunctions context
869+ funcs <- atomFunctions <$> gfDatabaseContextForMarker transId
962 case atomFunctionForName funcName funcs of
870 case atomFunctionForName funcName funcs of
963− Left err -> pure (Left err)
871+ Left err -> throwError err
964 Right func -> do
872 Right func -> do
965 let funcRetType = last (atomFuncType func)
873 let funcRetType = last (atomFuncType func)
966 funcArgTypes = init (atomFuncType func)
874 funcArgTypes = init (atomFuncType func)
967− eArgTypes <- mapM (typeFromAtomExpr attrs) atomArgs
875+ argTypes <- mapM (typeForGraphRefAtomExpr attrs) atomArgs
968− case lefts eArgTypes of
969− errs@(_:_) -> pure (Left (someErrors errs))
971− let eTvMap = resolveTypeVariables funcArgTypes argTypes
876+ let eTvMap = resolveTypeVariables funcArgTypes argTypes
972− argTypes = rights eArgTypes
973− case eTvMap of
877+ case eTvMap of
974− Left err -> pure (Left err)
878+ Left err -> throwError err
975− Right tvMap -> pure (resolveFunctionReturnValue funcName tvMap funcRetType)
879+ Right tvMap -> lift $ except $ resolveFunctionReturnValue funcName tvMap funcRetType
976−typeFromAtomExpr attrs (RelationAtomExpr relExpr) = do
880+typeForGraphRefAtomExpr attrs (RelationAtomExpr relExpr) = do
977− relType <- R.local (mergeAttributesIntoRelationalExprState attrs) (typeForRelationalExpr relExpr)
881+ relType <- R.local (mergeAttributesIntoGraphRefRelationalExprEnv attrs) (typeForGraphRefRelationalExpr relExpr)
979− Left err -> pure (Left err)
981− pure (pure (RelationAtomType (attributes relType')))
882+ pure (RelationAtomType (attributes relType))
982-- 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
983−typeFromAtomExpr attrs (ConstructedAtomExpr dConsName dConsArgs _) =
884+typeForGraphRefAtomExpr attrs (ConstructedAtomExpr dConsName dConsArgs tid) =
984− runExceptT $ do
885+ do
985− argsTypes <- mapM (liftE . typeFromAtomExpr attrs) dConsArgs
886+ argsTypes <- mapM (typeForGraphRefAtomExpr attrs) dConsArgs
986− context <- fmap envContext (lift askEnv)
887+ tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker tid
987− either throwE pure (atomTypeForDataConstructor (typeConstructorMapping context) dConsName argsTypes)
888+ lift $ except $ atomTypeForDataConstructor tConsMap dConsName argsTypes
989-- | Validate that the type of the AtomExpr matches the expected type.
890-- | Validate that the type of the AtomExpr matches the expected type.
990−verifyAtomExprTypes :: Relation -> AtomExpr -> AtomType -> RelationalExprState (Either RelationalError AtomType)
891+verifyGraphRefAtomExprTypes :: Relation -> GraphRefAtomExpr -> AtomType -> GraphRefRelationalExprM AtomType
991−verifyAtomExprTypes relIn (AttributeAtomExpr attrName) expectedType = runExceptT $ do
892+verifyGraphRefAtomExprTypes relIn (AttributeAtomExpr attrName) expectedType = do
992− rstate <- lift askEnv
893+ env <- askEnv
993 case A.atomTypeForAttributeName attrName (attributes relIn) of
894 case A.atomTypeForAttributeName attrName (attributes relIn) of
994− Right aType -> either throwE pure (atomTypeVerify expectedType aType)
895+ Right aType -> lift $ except $ atomTypeVerify expectedType aType
995 (Left err@(NoSuchAttributeNamesError _)) ->
896 (Left err@(NoSuchAttributeNamesError _)) ->
996− let attrs' = stateAttributes rstate in
897+ let attrs' = envAttributes env in
997 if attrs' == emptyAttributes then
898 if attrs' == emptyAttributes then
998− throwE err
899+ throwError err
1000 case A.attributeForName attrName attrs' of
901 case A.attributeForName attrName attrs' of
1001− Left err' -> throwE err'
902+ Left err' -> throwError err'
1002− Right attrType -> either throwE pure (atomTypeVerify expectedType (A.atomType attrType))
903+ Right attrType -> lift $ except $ atomTypeVerify expectedType (A.atomType attrType)
904+ Left err -> throwError err
906+verifyGraphRefAtomExprTypes _ (NakedAtomExpr atom) expectedType =
1003−verifyAtomExprTypes _ (NakedAtomExpr atom) expectedType = pure (atomTypeVerify expectedType (atomTypeForAtom atom))
907+ lift $ except $ atomTypeVerify expectedType (atomTypeForAtom atom)
1004−verifyAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs _) expectedType = do
908+verifyGraphRefAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs tid) expectedType = do
1005− rstate <- askEnv
909+ context <- gfDatabaseContextForMarker tid
1006 let functions = atomFunctions context
910 let functions = atomFunctions context
1007− context = envContext rstate
1009− func <- either throwE pure (atomFunctionForName funcName functions)
911+ func <- lift $ except $ atomFunctionForName funcName functions
1010− let expectedArgTypes = atomFuncType func
912+ let expectedArgTypes = atomFuncType func
1011− 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
1012− Left (AtomTypeMismatchError expSubType actSubType) -> throwE (AtomFunctionTypeError funcName argCount expSubType actSubType)
915+ handler (AtomTypeMismatchError expSubType actSubType) = throwError (AtomFunctionTypeError funcName argCount expSubType actSubType)
1013− Left err -> throwE err
916+ handler err = throwError err
1014− Right x -> pure x
917+ verifyGraphRefAtomExprTypes relIn atomExpr expectedType2 `catchError` handler
1015− ) $ zip3 funcArgExprs expectedArgTypes [1..]
918+ funcArgTypes <- mapM funcArgVerifier $ zip3 funcArgExprs expectedArgTypes [1..]
1016− if length funcArgTypes /= length expectedArgTypes - 1 then
919+ if length funcArgTypes /= length expectedArgTypes - 1 then
1017− throwE (AtomTypeCountError funcArgTypes expectedArgTypes)
920+ throwError (AtomTypeCountError funcArgTypes expectedArgTypes)
1019− either throwE pure (atomTypeVerify expectedType (last expectedArgTypes))
922+ lift $ except $ atomTypeVerify expectedType (last expectedArgTypes)
1020−verifyAtomExprTypes relIn (RelationAtomExpr relationExpr) expectedType = runExceptT $ do
923+verifyGraphRefAtomExprTypes relIn (RelationAtomExpr relationExpr) expectedType =
1021− rstate <- lift askEnv
924+ do
1022− 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)
1023− either throwE pure (atomTypeVerify expectedType (RelationAtomType (attributes relType)))
927+ lift $ except $ atomTypeVerify expectedType (RelationAtomType (attributes relType))
1024−verifyAtomExprTypes rel cons@ConstructedAtomExpr{} expectedType = runExceptT $ do
928+verifyGraphRefAtomExprTypes rel cons@ConstructedAtomExpr{} expectedType = do
1025− cType <- liftE (typeFromAtomExpr (attributes rel) cons)
929+ cType <- typeForGraphRefAtomExpr (attributes rel) cons
1026− either throwE pure (atomTypeVerify expectedType cType)
930+ lift $ except $ atomTypeVerify expectedType cType
1028-- | Look up the type's name and create a new attribute.
932-- | Look up the type's name and create a new attribute.
1029−evalGraphRefAttrExpr :: GraphRefAttributeExpr -> RelationalExprState (Either RelationalError Attribute)
933+evalGraphRefAttrExpr :: GraphRefAttributeExpr -> GraphRefRelationalExprM Attribute
1030evalGraphRefAttrExpr (AttributeAndTypeNameExpr attrName tCons transId) = do
934evalGraphRefAttrExpr (AttributeAndTypeNameExpr attrName tCons transId) = do
1031− graph <- re_graph <$> askEnv
935+ tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker transId
1032− case transactionForId transId graph of
1033− Left err -> pure (Left err)
1035− let tConsMap = typeConstructorMapping (concreteDatabaseContext trans)
1037− aType <- atomTypeForTypeConstructorValidate True tCons tConsMap M.empty
936+ aType <- lift $ except $ atomTypeForTypeConstructorValidate True tCons tConsMap M.empty
1038− validateAtomType aType tConsMap
937+ lift $ except $ validateAtomType aType tConsMap
1041− Left err -> pure (Left err)
1043− pure $ Right (Attribute attrName aType)
938+ pure $ Attribute attrName aType
1045−evalGraphRefAttrExpr (NakedAttributeExpr attr) = pure $ Right attr
1047−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
1048−evalTupleExpr mAttrs (TupleExpr tupMap) = do
991+evalGraphRefTupleExpr mAttrs (TupleExpr tupMap) = do
1049− context <- fmap envContext askEnv
1051 -- 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
1052 -- 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
1053− let attrs = fromMaybe A.emptyAttributes mAttrs
994+ let attrs = fromMaybe A.emptyAttributes mAttrs
1054− attrAtoms <- mapM (\(attrName, aExpr) -> do
995+ resolveOneAtom (attrName, aExpr) =
1055− --provided when the relation header is available
997+ --provided when the relation header is available
1056− let eExpectedAtomType = A.atomTypeForAttributeName attrName attrs
998+ let eExpectedAtomType = A.atomTypeForAttributeName attrName attrs
1057− unresolvedType <- liftE (typeFromAtomExpr attrs aExpr)
999+ unresolvedType <- typeForGraphRefAtomExpr attrs aExpr
1058− resolvedType <- case eExpectedAtomType of
1000+ resolvedType <- case eExpectedAtomType of
1059 Left _ -> pure unresolvedType
1001 Left _ -> pure unresolvedType
1060− Right typeHint -> either throwE pure (resolveAtomType typeHint unresolvedType)
1002+ Right typeHint -> lift $ except $ resolveAtomType typeHint unresolvedType
1061 --resolve atom typevars based on resolvedType?
1003 --resolve atom typevars based on resolvedType?
1062− newAtom <- liftE (evalAtomExpr emptyTuple aExpr)
1004+ newAtom <- evalGraphRefAtomExpr emptyTuple aExpr
1063− pure (attrName, newAtom, resolvedType)
1005+ pure (attrName, newAtom, resolvedType)
1064− ) (M.toList tupMap)
1006+ attrAtoms <- mapM resolveOneAtom (M.toList tupMap)
1065− let tupAttrs = A.attributesFromList $ map (\(attrName, _, aType) -> Attribute attrName aType) attrAtoms
1007+ let tupAttrs = A.attributesFromList $ map (\(attrName, _, aType) -> Attribute attrName aType) attrAtoms
1066− atoms = V.fromList $ map (\(_, atom, _) -> atom) attrAtoms
1008+ atoms = V.fromList $ map (\(_, atom, _) -> atom) attrAtoms
1067− tup = mkRelationTuple tupAttrs atoms
1009+ tup = mkRelationTuple tupAttrs atoms
1068− tConss = typeConstructorMapping context
1069− finalAttrs = fromMaybe tupAttrs mAttrs
1010+ finalAttrs = fromMaybe tupAttrs mAttrs
1070 --verify that the attributes match
1011 --verify that the attributes match
1071− 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
1072− tup' <- either throwE pure (resolveTypesInTuple finalAttrs tConss (reorderTuple finalAttrs tup))
1014+ --tup' <- lift $ except (resolveTypesInTuple finalAttrs tConss (reorderTuple finalAttrs tup))
1015+ let tup' = reorderTuple finalAttrs tup
1016+ --TODO: restore type resolution
1073− _ <- either throwE pure (validateTuple tup' tConss)
1017+-- _ <- lift $ except (validateTuple tup' tConss)
1074− pure tup'
1018+ pure tup'
1076−evalAttributeNames :: AttributeNames -> RelationalExpr -> RelationalExprState (Either RelationalError (S.Set AttributeName))
1020+--temporary implementation until we have a proper planner+executor
1077−evalAttributeNames attrNames expr = do
1021+evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
1078− eExprType <- typeForRelationalExpr expr
1022+evalGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
1079− case eExprType of
1023+ mAttrs <- case mAttrExprs of
1080− Left err -> pure (Left err)
1024+ Just _ ->
1081− Right exprTyp -> do
1025+ Just . A.attributesFromList <$> mapM evalGraphRefAttrExpr (fromMaybe [] mAttrExprs)
1082− let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))
1026+ Nothing -> pure Nothing
1083− case attrNames of
1027+ tuples <- evalGraphRefTupleExprs mAttrs tupleExprs
1084− AttributeNames names ->
1028+ let attrs = fromMaybe firstTupleAttrs mAttrs
1085− case A.projectionAttributesForNames names (attributes exprTyp) of
1029+ firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
1086− Left err -> pure (Left err)
1030+ lift $ except $ mkRelation attrs (RelationTupleSet tuples)
1087− Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))
1031+evalGraphRefRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
1088−
1032+ lift $ except $ mkRelation attributeSet tupleSet
1089− InvertedAttributeNames names -> do
1033+evalGraphRefRelationalExpr (ExistingRelation rel) = pure rel
1090− let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
1091− if not (S.null nonExistentAttributeNames) then
1092− pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))
1094− pure (Right (A.nonMatchingAttributeNameSet names typeNameSet))
1096− UnionAttributeNames namesA namesB -> do
1097− eNameSetA <- evalAttributeNames namesA expr
1099− Left err -> pure (Left err)
1100− Right nameSetA -> do
1101− eNameSetB <- evalAttributeNames namesB expr
1103− Left err -> pure (Left err)
1105− pure (Right (S.union nameSetA nameSetB))
1107− IntersectAttributeNames namesA namesB -> do
1108− eNameSetA <- evalAttributeNames namesA expr
1110− Left err -> pure (Left err)
1111− Right nameSetA -> do
1112− eNameSetB <- evalAttributeNames namesB expr
1114− Left err -> pure (Left err)
1116− pure (Right (S.intersection nameSetA nameSetB))
1118− RelationalExprAttributeNames attrExpr -> do
1119− eAttrExprType <- typeForRelationalExpr attrExpr
1120− case eAttrExprType of
1121− Left err -> pure (Left err)
1122− Right attrExprType -> pure (Right (A.attributeNameSet (attributes attrExprType)))
1124−evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> TransactionGraph -> Either RelationalError Relation
1125−evalGraphRefRelationalExpr (RelationVariable name tid) graph = do
1034+evalGraphRefRelationalExpr (RelationVariable name tid) = do
1126− ctx <- dbContextForTransId tid graph
1035+ ctx <- gfDatabaseContextForMarker tid
1127 case M.lookup name (relationVariables ctx) of
1036 case M.lookup name (relationVariables ctx) of
1128− Nothing -> Left (RelVarNotDefinedError name)
1037+ Nothing -> throwError (RelVarNotDefinedError name)
1129− Just rv -> evalGraphRefRelationalExpr rv graph
1038+ Just rv -> evalGraphRefRelationalExpr rv
1039+evalGraphRefRelationalExpr (Project attrNames expr) = do
1040+ attrNameSet <- evalGraphRefAttributeNames attrNames expr
1041+ rel <- evalGraphRefRelationalExpr expr
1042+ lift $ except $ project attrNameSet rel
1043+evalGraphRefRelationalExpr (Union exprA exprB) = do
1044+ relA <- evalGraphRefRelationalExpr exprA
1045+ relB <- evalGraphRefRelationalExpr exprB
1046+ lift $ except $ union relA relB
1047+evalGraphRefRelationalExpr (Join exprA exprB) = do
1048+ relA <- evalGraphRefRelationalExpr exprA
1049+ relB <- evalGraphRefRelationalExpr exprB
1050+ lift $ except $ join relA relB
1051+evalGraphRefRelationalExpr (Rename oldName newName expr) = do
1052+ rel <- evalGraphRefRelationalExpr expr
1053+ lift $ except $ rename oldName newName rel
1054+evalGraphRefRelationalExpr (Difference exprA exprB) = do
1055+ relA <- evalGraphRefRelationalExpr exprA
1056+ relB <- evalGraphRefRelationalExpr exprB
1057+ lift $ except $ difference relA relB
1058+evalGraphRefRelationalExpr (Group groupAttrNames newAttrName expr) = do
1059+ groupNames <- evalGraphRefAttributeNames groupAttrNames expr
1060+ rel <- evalGraphRefRelationalExpr expr
1061+ lift $ except $ group groupNames newAttrName rel
1062+evalGraphRefRelationalExpr (Ungroup groupAttrName expr) = do
1063+ rel <- evalGraphRefRelationalExpr expr
1064+ lift $ except $ ungroup groupAttrName rel
1065+evalGraphRefRelationalExpr (Restrict predExpr expr) = do
1066+ rel <- evalGraphRefRelationalExpr expr
1067+ filt <- predicateRestrictionFilter (attributes rel) predExpr
1068+ lift $ except $ restrict filt rel
1069+evalGraphRefRelationalExpr (Equals exprA exprB) = do
1070+ relA <- evalGraphRefRelationalExpr exprA
1071+ relB <- evalGraphRefRelationalExpr exprB
1072+ pure $ if relA == relB then relationTrue else relationFalse
1073+evalGraphRefRelationalExpr (NotEquals exprA exprB) = do
1074+ relA <- evalGraphRefRelationalExpr exprA
1075+ relB <- evalGraphRefRelationalExpr exprB
1076+ pure $ if relA == relB then relationFalse else relationTrue
1077+evalGraphRefRelationalExpr (Extend extendTupleExpr expr) = do
1078+ rel <- evalGraphRefRelationalExpr expr
1079+ (newAttrs, tupProc) <- extendGraphRefTupleExpressionProcessor rel extendTupleExpr
1080+ lift $ except $ relMogrify tupProc newAttrs rel
1081+evalGraphRefRelationalExpr expr@With{} =
1082+ --strategy A: add relation variables to the contexts in the graph
1083+ --strategy B: drop in macros in place (easier programmatically)
1084+ --strategy B implementation
1085+ evalGraphRefRelationalExpr (substituteWithNameMacros [] expr)
1131dbContextForTransId :: TransactionId -> TransactionGraph -> Either RelationalError DatabaseContext
1087dbContextForTransId :: TransactionId -> TransactionGraph -> Either RelationalError DatabaseContext
1132dbContextForTransId tid graph = do
1088dbContextForTransId tid graph = do
@@ -1144,169 +1100,120 @@ transactionForId tid graph
1145 matchingTrans = S.filter (\(Transaction idMatch _ _) -> idMatch == tid) (transactionsForGraph graph)
1101 matchingTrans = S.filter (\(Transaction idMatch _ _) -> idMatch == tid) (transactionsForGraph graph)
1147−processRestrictionPredicateExpr :: RestrictionPredicateExpr -> RelationalExprState GraphRefRestrictionPredicateExpr
1148−processRestrictionPredicateExpr TruePredicate = pure TruePredicate
1149−processRestrictionPredicateExpr (AndPredicate a b) = AndPredicate <$> processRestrictionPredicateExpr a <*> processRestrictionPredicateExpr b
1150−processRestrictionPredicateExpr (OrPredicate a b) = OrPredicate <$> processRestrictionPredicateExpr a <*> processRestrictionPredicateExpr b
1151−processRestrictionPredicateExpr (NotPredicate a) = NotPredicate <$> processRestrictionPredicateExpr a
1152−processRestrictionPredicateExpr (RelationalExprPredicate expr) =
1153− RelationalExprPredicate <$> processRelationalExpr expr
1154−processRestrictionPredicateExpr (AtomExprPredicate expr) =
1155− AtomExprPredicate <$> processAtomExpr expr
1156−processRestrictionPredicateExpr (AttributeEqualityPredicate nam expr) =
1157− AttributeEqualityPredicate nam <$> processAtomExpr expr
1159−processExtendTupleExpr :: ExtendTupleExpr -> RelationalExprState GraphRefExtendTupleExpr
1160−processExtendTupleExpr (AttributeExtendTupleExpr nam atomExpr) =
1161− AttributeExtendTupleExpr nam <$> processAtomExpr atomExpr
1163−typeForGraphRefRelationalExpr :: GraphRefRelationalExpr -> RelationalExprState (Either RelationalError Relation)
1103+typeForGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
1164−typeForGraphRefRelationalExpr (MakeStaticRelation attrs _) = pure $ mkRelation attrs emptyTupleSet
1104+typeForGraphRefRelationalExpr (MakeStaticRelation attrs _) = lift $ except $ mkRelation attrs emptyTupleSet
1165−typeForGraphRefRelationalExpr (ExistingRelation rel) = pure (Right (emptyRelationWithAttrs (attributes rel)))
1105+typeForGraphRefRelationalExpr (ExistingRelation rel) = pure (emptyRelationWithAttrs (attributes rel))
1166−typeForGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) =
1106+typeForGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
1167− case mAttrExprs of
1107+ mAttrs <- case mAttrExprs of
1168− Just attrExprs -> do
1108+ Just attrExprs -> do
1169− eAttrs <- mapM (\e -> evalGraphRefAttributeExpr e) attrExprs
1109+ attrs <- mapM evalGraphRefAttributeExpr attrExprs
1170− case lefts eAttrs of
1110+ pure (Just (attributesFromList attrs))
1171− [] -> pure (Right (emptyRelationWithAttrs (attributesFromList (rights eAttrs))))
1111+ Nothing -> pure Nothing
1172− _ -> pure (Left (someErrors (lefts eAttrs)))
1112+ tuples <- evalGraphRefTupleExprs mAttrs tupleExprs
1113+ let retAttrs = case tuples of
1114+ (tup:_) -> tupleAttributes tup
1115+ [] -> fromMaybe A.emptyAttributes mAttrs
1116+ pure $ emptyRelationWithAttrs retAttrs
1173typeForGraphRefRelationalExpr (RelationVariable rvName tid) = do
1118typeForGraphRefRelationalExpr (RelationVariable rvName tid) = do
1174− eTrans <- currentTrans
1119+ relVars <- relationVariables <$> gfDatabaseContextForMarker tid
1176− Left err -> pure (Left err)
1178− let relVars = relationVariables (concreteDatabaseContext trans)
1179− case M.lookup rvName relVars of
1120+ case M.lookup rvName relVars of
1180− Nothing -> pure (Left (RelVarNotDefinedError rvName))
1121+ Nothing -> throwError (RelVarNotDefinedError rvName)
1181− Just rvExpr -> typeForGraphRefRelationalExpr rvExpr
1123+ typeForGraphRefRelationalExpr rvExpr
1182typeForGraphRefRelationalExpr (Project attrNames expr) = do
1124typeForGraphRefRelationalExpr (Project attrNames expr) = do
1183− eExprType <- typeForGraphRefRelationalExpr expr
1125+ exprType' <- typeForGraphRefRelationalExpr expr
1185− Left err -> pure (Left err)
1186− Right exprType -> do
1187− eProjectionAttrs <- evalGraphRefAttributeNames attrNames expr
1126+ projectionAttrs <- evalGraphRefAttributeNames attrNames expr
1188− pure $ case eProjectionAttrs of
1189− Left err -> Left err
1190− Right projectionAttrs -> project projectionAttrs exprType
1127+ lift $ except $ project projectionAttrs exprType'
1191−
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'
1192−evalGraphRefAttributeNames :: GraphRefAttributeNames -> GraphRefRelationalExpr -> RelationalExprState (Either RelationalError (S.Set AttributeName))
1171+evalGraphRefAttributeNames :: GraphRefAttributeNames -> GraphRefRelationalExpr -> GraphRefRelationalExprM (S.Set AttributeName)
1193evalGraphRefAttributeNames attrNames expr = do
1172evalGraphRefAttributeNames attrNames expr = do
1194− eExprType <- typeForGraphRefRelationalExpr expr
1173+ exprType' <- typeForGraphRefRelationalExpr expr
1196− Left err -> pure (Left err)
1197− Right exprTyp -> do
1198− let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))
1174+ let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprType')))
1199− case attrNames of
1175+ case attrNames of
1200− AttributeNames names ->
1176+ AttributeNames names ->
1201− case A.projectionAttributesForNames names (attributes exprTyp) of
1177+ case A.projectionAttributesForNames names (attributes exprType') of
1202− Left err -> pure (Left err)
1178+ Left err -> throwError err
1203− Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))
1179+ Right attrs -> pure (S.fromList (V.toList (A.attributeNames attrs)))
1205− InvertedAttributeNames names -> do
1181+ InvertedAttributeNames names -> do
1206 let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
1182 let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
1207 if not (S.null nonExistentAttributeNames) then
1183 if not (S.null nonExistentAttributeNames) then
1208− pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))
1184+ throwError $ AttributeNamesMismatchError nonExistentAttributeNames
1210− pure (pure (A.nonMatchingAttributeNameSet names typeNameSet))
1186+ pure (A.nonMatchingAttributeNameSet names typeNameSet)
1212− UnionAttributeNames namesA namesB -> do
1188+ UnionAttributeNames namesA namesB -> do
1213− eNameSetA <- evalGraphRefAttributeNames namesA expr
1189+ nameSetA <- evalGraphRefAttributeNames namesA expr
1215− Left err -> pure (Left err)
1216− Right nameSetA -> do
1217− eNameSetB <- evalGraphRefAttributeNames namesB expr
1190+ nameSetB <- evalGraphRefAttributeNames namesB expr
1219− Left err -> pure (Left err)
1221− pure (Right (S.union nameSetA nameSetB))
1191+ pure (S.union nameSetA nameSetB)
1223− IntersectAttributeNames namesA namesB -> do
1193+ IntersectAttributeNames namesA namesB -> do
1224− eNameSetA <- evalGraphRefAttributeNames namesA expr
1194+ nameSetA <- evalGraphRefAttributeNames namesA expr
1226− Left err -> pure (Left err)
1227− Right nameSetA -> do
1228− eNameSetB <- evalGraphRefAttributeNames namesB expr
1195+ nameSetB <- evalGraphRefAttributeNames namesB expr
1230− Left err -> pure (Left err)
1232− pure (Right (S.intersection nameSetA nameSetB))
1196+ pure (S.intersection nameSetA nameSetB)
1234− RelationalExprAttributeNames attrExpr -> do
1235− eAttrExprType <- typeForGraphRefRelationalExpr attrExpr
1236− case eAttrExprType of
1237− Left err -> pure (Left err)
1238− Right attrExprType -> pure (Right (A.attributeNameSet (attributes attrExprType)))
1198+ RelationalExprAttributeNames attrExpr -> do
1199+ attrExprType <- typeForGraphRefRelationalExpr attrExpr
1200+ pure (A.attributeNameSet (attributes attrExprType))
1243−processAtomExpr :: AtomExpr -> RelationalExprState GraphRefAtomExpr
1244−processAtomExpr (AttributeAtomExpr nam) = pure $ AttributeAtomExpr nam
1245−processAtomExpr (NakedAtomExpr atom) = pure $ NakedAtomExpr atom
1246−processAtomExpr (FunctionAtomExpr fName atomExprs ()) = do
1247− tid <- re_currentTransId <$> askEnv
1248− FunctionAtomExpr fName <$> mapM processAtomExpr atomExprs <*> pure tid
1249−processAtomExpr (RelationAtomExpr expr) = RelationAtomExpr <$> processRelationalExpr expr
1250−processAtomExpr (ConstructedAtomExpr dConsName atomExprs ()) = ConstructedAtomExpr dConsName <$> mapM processAtomExpr atomExprs <*> (re_currentTransId <$> askEnv)
1252−processTupleExpr :: TupleExpr -> RelationalExprState GraphRefTupleExpr
1253−processTupleExpr (TupleExpr tMap) =
1254− TupleExpr . M.fromList <$> mapM (\(k,v) -> (,) k <$> processAtomExpr v) (M.toList tMap)
1256−evalGraphRefAttributeExpr :: GraphRefAttributeExpr -> RelationalExprState (Either RelationalError Attribute)
1202+evalGraphRefAttributeExpr :: GraphRefAttributeExpr -> GraphRefRelationalExprM Attribute
1257evalGraphRefAttributeExpr (AttributeAndTypeNameExpr attrName tCons tid) = do
1203evalGraphRefAttributeExpr (AttributeAndTypeNameExpr attrName tCons tid) = do
1258− graph <- re_graph <$> askEnv
1204+ tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker tid
1259− case transactionForId tid graph of
1260− Left err -> pure (Left err)
1262− let tConsMap = typeConstructorMapping (concreteDatabaseContext trans)
1263− case atomTypeForTypeConstructorValidate True tCons tConsMap M.empty of
1205+ case atomTypeForTypeConstructorValidate True tCons tConsMap M.empty of
1264− Left err -> pure (Left err)
1206+ Left err -> throwError err
1265− Right aType -> do
1207+ Right aType -> do
1266− case validateAtomType aType tConsMap of
1208+ case validateAtomType aType tConsMap of
1267− Left err -> pure (Left err)
1209+ Left err -> throwError err
1268− Right _ -> pure (Right (Attribute attrName aType))
1210+ Right _ -> pure (Attribute attrName aType)
1270−--convert AttributeExpr to GraphRefAttributeExpr
1271−processAttributeExpr :: AttributeExpr -> RelationalExprState GraphRefAttributeExpr
1272−processAttributeExpr (AttributeAndTypeNameExpr nam tCons ()) = do
1273− tid <- re_currentTransId <$> askEnv
1274− pure $ AttributeAndTypeNameExpr nam tCons tid
1275−processAttributeExpr (NakedAttributeExpr attr) = pure $ NakedAttributeExpr attr
1211+evalGraphRefAttributeExpr (NakedAttributeExpr attr) = pure attr
1277−-- convert a RelationalExpr into a GraphRefRelationalExpr using the current trans Id
1278−-- can this be done without any RelationalErrors as opposed to evalRelationalExpr?
1279−processRelationalExpr :: RelationalExpr -> RelationalExprState GraphRefRelationalExpr
1280−processRelationalExpr (MakeRelationFromExprs mAttrs tupleExprs) = do
1281− mAttrs' <- case mAttrs of
1282− Nothing -> pure Nothing
1283− Just mAttrs'' -> Just <$> mapM processAttributeExpr mAttrs''
1284− MakeRelationFromExprs mAttrs' <$> mapM processTupleExpr tupleExprs
1285−processRelationalExpr (MakeStaticRelation attrs tupSet) = pure (MakeStaticRelation attrs tupSet)
1286−processRelationalExpr (ExistingRelation rel) = pure (ExistingRelation rel)
1287−processRelationalExpr (RelationVariable rv ()) = RelationVariable rv <$> fmap re_currentTransId askEnv
1288−processRelationalExpr (Project attrNames expr) = Project <$> processAttributeNames attrNames <*> processRelationalExpr expr
1289−processRelationalExpr (Union exprA exprB) = Union <$> processRelationalExpr exprA <*> processRelationalExpr exprB
1290−processRelationalExpr (Join exprA exprB) = Join <$> processRelationalExpr exprA <*> processRelationalExpr exprB
1291−processRelationalExpr (Rename attrA attrB expr) =
1292− Rename attrA attrB <$> processRelationalExpr expr
1293−processRelationalExpr (Difference exprA exprB) = Difference <$> processRelationalExpr exprA <*> processRelationalExpr exprB
1294−processRelationalExpr (Group attrNames attrName expr) = Group <$> processAttributeNames attrNames <*> pure attrName <*> processRelationalExpr expr
1295−processRelationalExpr (Ungroup attrName expr) = Ungroup attrName <$> processRelationalExpr expr
1296−processRelationalExpr (Restrict pred expr) = Restrict <$> processRestrictionPredicateExpr pred <*> processRelationalExpr expr
1297−processRelationalExpr (Equals exprA exprB) =
1298− Equals <$> processRelationalExpr exprA <*> processRelationalExpr exprB
1299−processRelationalExpr (NotEquals exprA exprB) =
1300− NotEquals <$> processRelationalExpr exprA <*> processRelationalExpr exprB
1301−processRelationalExpr (Extend extendExpr expr) =
1302− Extend <$> processExtendTupleExpr extendExpr <*> processRelationalExpr expr
1303−processRelationalExpr (With macros expr) =
1304− With <$> mapM (\(nam, wexpr) -> (,) nam <$> processRelationalExpr wexpr) macros <*> processRelationalExpr expr
1306mkEmptyRelVars :: RelationVariables -> RelationVariables
1213mkEmptyRelVars :: RelationVariables -> RelationVariables
1307−mkEmptyRelVars rvMap = M.map mkEmptyRelVar rvMap
1214+mkEmptyRelVars = M.map mkEmptyRelVar
1309− mkEmptyRelVar (MakeRelationFromExprs mAttrs _) = MakeRelationFromExprs mAttrs []
1216+ mkEmptyRelVar expr@MakeRelationFromExprs{} = expr --do not truncate here because we might lose essential type information in emptying the tuples
1310 mkEmptyRelVar (MakeStaticRelation attrs _) = MakeStaticRelation attrs emptyTupleSet
1217 mkEmptyRelVar (MakeStaticRelation attrs _) = MakeStaticRelation attrs emptyTupleSet
1311 mkEmptyRelVar (ExistingRelation rel) = ExistingRelation (emptyRelationWithAttrs (attributes rel))
1218 mkEmptyRelVar (ExistingRelation rel) = ExistingRelation (emptyRelationWithAttrs (attributes rel))
1312 mkEmptyRelVar rv@RelationVariable{} = Restrict (NotPredicate TruePredicate) rv
1219 mkEmptyRelVar rv@RelationVariable{} = Restrict (NotPredicate TruePredicate) rv
@@ -1317,53 +1224,169 @@ mkEmptyRelVars rvMap = M.map mkEmptyRelVar rvMap
1317 mkEmptyRelVar (Difference exprA exprB) = Difference (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1224 mkEmptyRelVar (Difference exprA exprB) = Difference (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1318 mkEmptyRelVar (Group attrNames attrName expr) = Group attrNames attrName (mkEmptyRelVar expr)
1225 mkEmptyRelVar (Group attrNames attrName expr) = Group attrNames attrName (mkEmptyRelVar expr)
1319 mkEmptyRelVar (Ungroup attrName expr) = Ungroup attrName (mkEmptyRelVar expr)
1226 mkEmptyRelVar (Ungroup attrName expr) = Ungroup attrName (mkEmptyRelVar expr)
1320− mkEmptyRelVar (Restrict pred expr) = Restrict pred (mkEmptyRelVar expr)
1227+ mkEmptyRelVar (Restrict pred' expr) = Restrict pred' (mkEmptyRelVar expr)
1321 mkEmptyRelVar (Equals exprA exprB) = Equals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1228 mkEmptyRelVar (Equals exprA exprB) = Equals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1322 mkEmptyRelVar (NotEquals exprA exprB) = NotEquals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1229 mkEmptyRelVar (NotEquals exprA exprB) = NotEquals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
1323 mkEmptyRelVar (Extend extTuple expr) = Extend extTuple (mkEmptyRelVar expr)
1230 mkEmptyRelVar (Extend extTuple expr) = Extend extTuple (mkEmptyRelVar expr)
1324− mkEmptyRelVar (With macros expr) = With (map (\(rv, expr) -> (rv, mkEmptyRelVar expr)) macros) (mkEmptyRelVar expr)
1231+ mkEmptyRelVar (With macros expr) = With (map (second mkEmptyRelVar) macros) (mkEmptyRelVar expr)
1326−processAttributeNames :: AttributeNames -> RelationalExprState GraphRefAttributeNames
1327−processAttributeNames (AttributeNames nameSet) = pure $ AttributeNames nameSet
1328−processAttributeNames (UnionAttributeNames attrNamesA attrNamesB) = UnionAttributeNames <$> processAttributeNames attrNamesA <*> processAttributeNames attrNamesB
1329−processAttributeNames (IntersectAttributeNames attrNamesA attrNamesB) = IntersectAttributeNames <$> processAttributeNames attrNamesA <*> processAttributeNames attrNamesB
1330−processAttributeNames (RelationalExprAttributeNames expr) = RelationalExprAttributeNames <$> processRelationalExpr expr
1332−processDatabaseContextExpr :: DatabaseContextExpr -> RelationalExprState GraphRefDatabaseContextExpr
1333−processDatabaseContextExpr expr =
1335− NoOperation -> pure NoOperation
1336− Define nam attrExprs -> Define nam <$> mapM processAttributeExpr attrExprs
1337− Undefine nam -> pure (Undefine nam)
1338− Assign nam rexpr -> Assign nam <$> processRelationalExpr rexpr
1339− Insert nam rexpr -> Insert nam <$> processRelationalExpr rexpr
1340− Delete nam pred -> Delete nam <$> processRestrictionPredicateExpr pred
1341− Update nam attrMap pred -> Update nam attrMap <$> processRestrictionPredicateExpr pred
1343− AddInclusionDependency nam dep -> pure (AddInclusionDependency nam dep)
1344− RemoveInclusionDependency nam -> pure (RemoveInclusionDependency nam)
1345− AddNotification nam exprA exprB exprC -> pure (AddNotification nam exprA exprB exprC)
1346− RemoveNotification nam -> pure (RemoveNotification nam)
1347− AddTypeConstructor tyDef consDefs -> pure (AddTypeConstructor tyDef consDefs)
1348− RemoveTypeConstructor tyName -> pure (RemoveTypeConstructor tyName)
1350− RemoveAtomFunction aFuncName -> pure (RemoveAtomFunction aFuncName)
1351− RemoveDatabaseContextFunction funcName -> pure (RemoveDatabaseContextFunction funcName)
1352− ExecuteDatabaseContextFunction funcName atomExprs -> ExecuteDatabaseContextFunction funcName <$> mapM processAtomExpr atomExprs
1353− MultipleExpr exprs -> MultipleExpr <$> mapM processDatabaseContextExpr exprs
1355dbErr :: RelationalError -> DatabaseContextEvalMonad ()
1234dbErr :: RelationalError -> DatabaseContextEvalMonad ()
1356dbErr err = lift (except (Left err))
1235dbErr err = lift (except (Left err))
1358−processDatabaseContextIOExpr :: DatabaseContextIOExpr -> RelationalExprState GraphRefDatabaseContextIOExpr
1237+-- | Return a Relation describing the relation variables.
1359−processDatabaseContextIOExpr (AddAtomFunction f tcs sc) =
1238+relationVariablesAsRelation :: DatabaseContext -> TransactionGraph -> Either RelationalError Relation
1360− pure (AddAtomFunction f tcs sc)
1239+relationVariablesAsRelation ctx graph = do
1361−processDatabaseContextIOExpr (LoadAtomFunctions mod fun file) =
1240+ let subrelAttrs = A.attributesFromList [Attribute "attribute" TextAtomType, Attribute "type" TextAtomType]
1362− pure (LoadAtomFunctions mod fun file)
1241+ attrs = A.attributesFromList [Attribute "name" TextAtomType,
1363−processDatabaseContextIOExpr (AddDatabaseContextFunction mod fun path) =
1242+ Attribute "attributes" (RelationAtomType subrelAttrs)]
1364− pure (AddDatabaseContextFunction mod fun path)
1243+ relVars = relationVariables ctx
1365−processDatabaseContextIOExpr (LoadDatabaseContextFunctions mod fun path) =
1244+ mkRvDesc (rvName, gfExpr) = do
1366− pure (LoadDatabaseContextFunctions mod fun path)
1245+ let gfEnv = freshGraphRefRelationalExprEnv (Just ctx) graph
1367−processDatabaseContextIOExpr (CreateArbitraryRelation rvName attrExprs range) =
1246+ gfType <- runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
1368− CreateArbitraryRelation rvName <$> mapM processAttributeExpr attrExprs <*> pure range
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