@@ -1,4 +1,7 @@
11{-# LANGUAGE ScopedTypeVariables #-}
2+{-# LANGUAGE FlexibleInstances #-}
3+{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE OverloadedStrings #-}
25module ProjectM36.RelationalExpression where
36import ProjectM36.Relation
47import ProjectM36.Tuple
@@ -13,31 +16,38 @@ import ProjectM36.DataTypes.Primitive
1316import ProjectM36.AtomFunction
1417import ProjectM36.DatabaseContextFunction
1518import ProjectM36.Arbitrary
19+import ProjectM36.GraphRefRelationalExpr
1620import ProjectM36.Transaction
1721import qualified ProjectM36.Attribute as A
1822import qualified Data.Map as M
1923import qualified Data.HashSet as HS
2024import qualified Data.Set as S
21−import Control.Monad.Trans.RWS.Strict as RWS
22−import Control.Monad.Trans.Class (lift)
23−import Control.Exception
25+import Control.Monad.State hiding (join)
26+import Data.Bifunctor (second)
2427import Data.Maybe
2528import Data.Either
2629import Data.Char (isUpper)
30+import Data.Time
31+import qualified Data.List.NonEmpty as NE
32+import Data.Functor.Identity
2733import qualified Data.Text as T
2834import qualified Data.Vector as V
2935import qualified ProjectM36.TypeConstructorDef as TCD
30−import Control.Monad.Trans.Except
31−import Control.Monad.Trans.Reader as R
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)
39+import Control.Monad.Trans.Except (except)
40+import Control.Monad.Reader as R hiding (join)
41+import ProjectM36.NormalizeExpr
42+import ProjectM36.WithNameExpr
3243import Test.QuickCheck
33−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
3449import GHC.Paths
35−import Data.Time.Clock
36−import Data.Time.Calendar
37−import qualified Data.List.NonEmpty as NE
38−import Data.Functor.Identity
39−import Control.Monad
40−import Control.Monad.IO.Class
50+#endif
4151
4252data DatabaseContextExprDetails = CountUpdatedTuples
4353
@@ -65,48 +75,52 @@ mkDatabaseContextEvalState context = DatabaseContextEvalState {
6575data RelationalExprEnv = RelationalExprEnv {
6676 re_context :: DatabaseContext,
6777 re_graph :: TransactionGraph,
68− re_currentTransId :: TransactionId,
6978 re_extra :: Maybe (Either RelationTuple Attributes)
7079 }
7180
72−stateTuple :: RelationalExprEnv -> RelationTuple
73−stateTuple e = fromLeft emptyTuple (fromMaybe (Left emptyTuple) (re_extra e))
81+envTuple :: GraphRefRelationalExprEnv -> RelationTuple
82+envTuple e = fromLeft emptyTuple (fromMaybe (Left emptyTuple) (gre_extra e))
7483
75−stateAttributes :: RelationalExprEnv -> Attributes
76−stateAttributes e = fromRight emptyAttributes (fromMaybe (Right emptyAttributes) (re_extra e))
84+envAttributes :: GraphRefRelationalExprEnv -> Attributes
85+envAttributes e = fromRight emptyAttributes (fromMaybe (Right emptyAttributes) (gre_extra e))
7786
7887instance Show RelationalExprEnv where
7988 show e@RelationalExprEnv{} = "RelationalExprEnv " ++ show (re_extra e)
8089
81−mkRelationalExprEnv :: DatabaseContext -> TransactionId -> TransactionGraph -> RelationalExprEnv
82−mkRelationalExprEnv ctx currentTransId graph =
90+--used to eval relationalexpr
91+type RelationalExprM a = ReaderT RelationalExprEnv (ExceptT RelationalError Identity) a
92+
93+runRelationalExprM :: RelationalExprEnv -> RelationalExprM a -> Either RelationalError a
94+runRelationalExprM env m = runIdentity (runExceptT (runReaderT m env))
95+
96+reGraph :: RelationalExprM TransactionGraph
97+reGraph = asks re_graph
98+
99+reContext :: RelationalExprM DatabaseContext
100+reContext = asks re_context
101+
102+mkRelationalExprEnv :: DatabaseContext -> TransactionGraph -> RelationalExprEnv
103+mkRelationalExprEnv ctx graph =
83104 RelationalExprEnv
84105 { re_context = ctx,
85106 re_graph = graph,
86− re_currentTransId = currentTransId,
87107 re_extra = Nothing }
88108
89−askEnv :: RelationalExprState RelationalExprEnv
109+askEnv :: GraphRefRelationalExprM GraphRefRelationalExprEnv
90110askEnv = R.ask
91111
92−currentTrans :: RelationalExprState (Either RelationalError Transaction)
93−currentTrans = do
94− tid <- re_currentTransId <$> R.ask
95− graph <- re_graph <$> R.ask
96− pure (transactionForId tid graph)
97−
98−mergeTuplesIntoRelationalExprState :: RelationTuple -> RelationalExprEnv -> RelationalExprEnv
99−mergeTuplesIntoRelationalExprState tupIn e@RelationalExprEnv{} =
100− e{re_extra = new_elems }
112+mergeTuplesIntoGraphRefRelationalExprEnv :: RelationTuple -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
113+mergeTuplesIntoGraphRefRelationalExprEnv tupIn env =
114+ env { gre_extra = new_elems }
101115 where
102116 new_elems = Just (Left newTuple)
103− mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (stateTuple e))
117+ mergedTupMap = M.union (tupleToMap tupIn) (tupleToMap (envTuple env))
104118 newTuple = mkRelationTupleFromMap mergedTupMap
105−
106−mergeAttributesIntoRelationalExprState :: Attributes -> RelationalExprEnv -> RelationalExprEnv
107−mergeAttributesIntoRelationalExprState attrsIn e@RelationalExprEnv{} = e{re_extra = newattrs }
119+
120+mergeAttributesIntoGraphRefRelationalExprEnv :: Attributes -> GraphRefRelationalExprEnv -> GraphRefRelationalExprEnv
121+mergeAttributesIntoGraphRefRelationalExprEnv attrsIn e = e { gre_extra = newattrs }
108122 where
109− newattrs = Just (Right (A.union attrsIn (stateAttributes e)))
123+ newattrs = Just (Right (A.union attrsIn (envAttributes e)))
110124
111125type ResultAccumName = StringType
112126
@@ -128,12 +142,12 @@ data DatabaseContextEvalEnv = DatabaseContextEvalEnv
128142 }
129143
130144mkDatabaseContextEvalEnv :: TransactionId -> TransactionGraph -> DatabaseContextEvalEnv
131−mkDatabaseContextEvalEnv tid graph = DatabaseContextEvalEnv tid graph
145+mkDatabaseContextEvalEnv = DatabaseContextEvalEnv
132146
133147type DatabaseContextEvalMonad a = RWST DatabaseContextEvalEnv () DatabaseContextEvalState (ExceptT RelationalError Identity) a
134148
135149runDatabaseContextEvalMonad :: DatabaseContext -> DatabaseContextEvalEnv -> DatabaseContextEvalMonad () -> Either RelationalError DatabaseContextEvalState
136−runDatabaseContextEvalMonad ctx env m = runIdentity (runExceptT (fst <$> (execRWST m env freshEnv)))
150+runDatabaseContextEvalMonad ctx env m = runIdentity (runExceptT (fst <$> execRWST m env freshEnv))
137151 where
138152 freshEnv = mkDatabaseContextEvalState ctx
139153
@@ -146,19 +160,51 @@ dbcGraph = dce_graph <$> RWS.ask
146160
147161dbcRelationalExprEnv :: DatabaseContextEvalMonad RelationalExprEnv
148162dbcRelationalExprEnv =
149− mkRelationalExprEnv <$> getStateContext <*> dbcTransId <*> dbcGraph
163+ mkRelationalExprEnv <$> getStateContext <*> dbcGraph
150164
151165getStateContext :: DatabaseContextEvalMonad DatabaseContext
152−getStateContext = dbc_context <$> get
166+getStateContext = gets dbc_context
153167
154168putStateContext :: DatabaseContext -> DatabaseContextEvalMonad ()
155169putStateContext ctx' = do
156170 s <- get
157− put (s {dbc_context = ctx'})
171+ put (s {dbc_context = ctx', dbc_dirty = True})
172+
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)
179+ }
158180
159−type RelationalExprState a = Reader RelationalExprEnv a
181+type GraphRefRelationalExprM a = ReaderT GraphRefRelationalExprEnv (ExceptT RelationalError Identity) a
182+
183+gfTransForId :: TransactionId -> GraphRefRelationalExprM Transaction
184+gfTransForId tid = do
185+ graph <- gfGraph
186+ lift $ except $ transactionForId tid graph
187+
188+gfDatabaseContextForMarker :: GraphRefTransactionMarker -> GraphRefRelationalExprM DatabaseContext
189+gfDatabaseContextForMarker (TransactionMarker transId) = concreteDatabaseContext <$> gfTransForId transId
190+gfDatabaseContextForMarker UncommittedContextMarker = do
191+ mctx <- gre_context <$> askEnv
192+ case mctx of
193+ Nothing -> throwError NoUncommittedContextInEvalError
194+ Just ctx -> pure ctx
195+
196+runGraphRefRelationalExprM :: GraphRefRelationalExprEnv -> GraphRefRelationalExprM a -> Either RelationalError a
197+runGraphRefRelationalExprM env m = runIdentity (runExceptT (runReaderT m env))
198+
199+freshGraphRefRelationalExprEnv :: Maybe DatabaseContext -> TransactionGraph -> GraphRefRelationalExprEnv
200+freshGraphRefRelationalExprEnv mctx graph = GraphRefRelationalExprEnv {
201+ gre_context = mctx,
202+ gre_graph = graph,
203+ gre_extra = Nothing
204+ }
160205
161−type GraphRefRelationalExprR a = Reader TransactionGraph a
206+gfGraph :: GraphRefRelationalExprM TransactionGraph
207+gfGraph = asks gre_graph
162208
163209envContext :: RelationalExprEnv -> DatabaseContext
164210envContext = re_context
@@ -166,173 +212,27 @@ envContext = re_context
166212setEnvContext :: RelationalExprEnv -> DatabaseContext -> RelationalExprEnv
167213setEnvContext e ctx = e { re_context = ctx }
168214
169−{-
170−--full evaluation down the graph
171−eval :: RelationalExpr -> RelationalExprState (Either RelationalError Relation)
172−eval expr = do
173− env <- askEnv
174− eGfExpr <- processRelationalExpr expr
175− case eGfExpr of
176− Left err -> pure (Left err)
177− Right gfExpr -> pure $ evalGraphRefRelationalExpr gfExpr (re_graph env)
178−-}
179−{-
180−--relvar state is needed in evaluation of relational expression but only as read-only in order to extract current relvar values
181−evalRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError GraphRefRelationalExpr)
182−evalRelationalExpr (RelationVariable name _) = do
183− relvarTable <- fmap (relationVariables . envContext) askEnv
184− return $ case M.lookup name relvarTable of
185− Just res -> Right res
186− Nothing -> Left $ RelVarNotDefinedError name
187−
188−evalRelationalExpr (Project attrNames expr) = do
189− eAttrNameSet <- evalAttributeNames attrNames expr
190− case eAttrNameSet of
191− Left err -> pure (Left err)
192− Right attrNameSet -> do
193− rel <- evalRelationalExpr expr
194− case rel of
195− Right rel2 -> pure $ Right (Project (AttributeNames attrNameSet) rel2)
196− Left err -> pure $ Left err
197−
198−evalRelationalExpr (Union exprA exprB) = do
199− relA <- evalRelationalExpr exprA
200− relB <- evalRelationalExpr exprB
201− case relA of
202− Left err -> return $ Left err
203− Right relA2 -> case relB of
204− Left err -> return $ Left err
205− Right relB2 -> return $ Right (Union relA2 relB2)
206−
207−evalRelationalExpr (Join exprA exprB) = do
208− relA <- evalRelationalExpr exprA
209− relB <- evalRelationalExpr exprB
210− case relA of
211− Left err -> return $ Left err
212− Right relA2 -> case relB of
213− Left err -> return $ Left err
214− Right relB2 -> return $ Right (Join relA2 relB2)
215−
216−evalRelationalExpr (Difference exprA exprB) = do
217− relA <- evalRelationalExpr exprA
218− relB <- evalRelationalExpr exprB
219− case relA of
220− Left err -> return $ Left err
221− Right relA2 -> case relB of
222− Left err -> return $ Left err
223− Right relB2 -> return $ Right (Difference relA2 relB2)
224−
225−evalRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
226− case mkRelation attributeSet tupleSet of
227− Right rel -> return $ Right (ExistingRelation rel)
228− Left err -> return $ Left err
229−
230−evalRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
231− currentContext <- fmap envContext askEnv
232− let tConss = typeConstructorMapping currentContext
233− -- 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
234− runExceptT $ do
235− mAttrs <- case mAttrExprs of
236− Just _ ->
237− Just . A.attributesFromList <$> mapM evalGraphRefAttrExpr (fromMaybe [] mAttrExprs)
238− Nothing -> pure Nothing
239− tuples <- mapM (liftE . evalTupleExpr mAttrs) tupleExprs
240− let attrs = fromMaybe firstTupleAttrs mAttrs
241− firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
242− expr <- either throwE pure (mkRelation attrs (RelationTupleSet tuples))
243− pure (ExistingRelation expr)
244−
245−evalRelationalExpr (ExistingRelation rel) = pure (Right (ExistingRelation rel))
246−
247−evalRelationalExpr (Rename oldAttrName newAttrName relExpr) = do
248− evald <- evalRelationalExpr relExpr
249− case evald of
250− Right expr -> return $ Right (Rename oldAttrName newAttrName expr)
251− Left err -> return $ Left err
252−
253−evalRelationalExpr (Group oldAttrNames newAttrName relExpr) = do
254− eOldAttrNameSet <- evalAttributeNames oldAttrNames relExpr
255− case eOldAttrNameSet of
256− Left err -> pure (Left err)
257− Right oldAttrNameSet -> do
258− evald <- evalRelationalExpr relExpr
259− case evald of
260− Right expr -> return $ Right (Group (AttributeNames oldAttrNameSet) newAttrName expr)
261− Left err -> return $ Left err
262−
263−evalRelationalExpr (Ungroup attrName relExpr) = do
264− evald <- evalRelationalExpr relExpr
265− case evald of
266− Right expr -> return $ Right (Ungroup attrName expr)
267− Left err -> return $ Left err
268−
269−evalRelationalExpr (Restrict predicateExpr relExpr) = do
270− evald <- evalRelationalExpr relExpr
271− pred <- processRestrictionPredicateExpr predicateExpr
272− case evald of
273− Left err -> return $ Left err
274− Right expr ->
275− pure $ Right (Restrict pred expr)
276−
277−evalRelationalExpr (Equals relExprA relExprB) = do
278− evaldA <- evalRelationalExpr relExprA
279− evaldB <- evalRelationalExpr relExprB
280− case evaldA of
281− Left err -> return $ Left err
282− Right exprA -> case evaldB of
283− Left err -> return $ Left err
284− Right exprB -> return $ Right (Equals exprA exprB)
285−{-
286−evalRelationalExpr (With views mainExpr) = do
287− rstate <- ask
288−
289− let addScopedView ctx (vname,vexpr) = if vname `M.member` relationVariables ctx then
290− Left (RelVarAlreadyDefinedError vname)
291− else
292− case runState (evalDatabaseContextExpr (Assign vname vexpr)) (freshDatabaseState ctx) of
293− (Left err,_) -> Left err
294− (Right (), (ctx',_,_)) -> Right ctx'
295−
296− case foldM addScopedView (stateElemsContext rstate) views of
297− Left err -> return $ Left err
298− Right ctx'' -> do
299− let evalMainExpr expr = runReader (evalRelationalExpr expr) (RelationalExprEnv ctx'')
300− case evalMainExpr mainExpr of
301− Left err -> return $ Left err
302− Right rel -> return $ Right rel
303−-}
304−--warning: copy-pasta from above- refactor
305−evalRelationalExpr (NotEquals relExprA relExprB) = do
306− evaldA <- evalRelationalExpr relExprA
307− evaldB <- evalRelationalExpr relExprB
308− case evaldA of
309− Left err -> return $ Left err
310− Right exprA -> case evaldB of
311− Left err -> return $ Left err
312− Right exprB -> return $ Right (NotEquals exprA exprB)
313−
314−-- extending a relation adds a single attribute with the results of the per-tuple expression evaluated
315−evalRelationalExpr (Extend tupleExpression relExpr) = do
316− eExpr <- evalRelationalExpr relExpr
317− case eExpr of
318− Left err -> pure (Left err)
319− Right expr -> do
320− tupProc <- processExtendTupleExpr tupleExpression
321− pure (Right (Extend tupProc expr))
322−-}
323215--helper function to process relation variable creation/assignment
324216setRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
325217setRelVar relVarName relExpr = do
326−
327218 currentContext <- getStateContext
328− let newRelVars = M.insert relVarName relExpr $ relationVariables currentContext
219+ --prevent recursive relvar definition by resolving references to relvars in previous states
220+ relExpr' <- resolve relExpr
221+ let newRelVars = M.insert relVarName relExpr' $ relationVariables currentContext
329222 potentialContext = currentContext { relationVariables = newRelVars }
330− --determine when to check constraints
331− graph <- dbcGraph
332− tid <- dbcTransId
333− case checkConstraints potentialContext tid graph of
334− Left err -> dbErr err
335− Right _ -> putStateContext potentialContext
223+ --optimization: if the relexpr is unchanged, skip the update
224+ if M.lookup relVarName (relationVariables currentContext) == Just relExpr then
225+ pure ()
226+ else do
227+ --determine when to check constraints
228+ graph <- dbcGraph
229+ tid <- dbcTransId
230+ case checkConstraints potentialContext tid graph of
231+ Left err -> dbErr err
232+ Right _ -> putStateContext potentialContext
233+
234+--fast-path insertion- we already know that the previous relvar validated correctly, so we can validate just the relation that is being inserted for attribute matches- without this, even a single tuple relation inserted causes the entire relation to be re-validated unnecessarily
235+--insertIntoRelVar :: RelVarName -> GraphRefRelationalExpr -> DatabaseContextEvalMonad ()
336236
337237-- 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
338238deleteRelVar :: RelVarName -> DatabaseContextEvalMonad ()
@@ -351,20 +251,17 @@ evalGraphRefDatabaseContextExpr :: GraphRefDatabaseContextExpr -> DatabaseContex
351251evalGraphRefDatabaseContextExpr NoOperation = pure ()
352252
353253evalGraphRefDatabaseContextExpr (Define relVarName attrExprs) = do
254+ context <- getStateContext
354255 relvars <- fmap relationVariables getStateContext
355256 tConss <- fmap typeConstructorMapping getStateContext
356− relEnv <- dbcRelationalExprEnv
357− let eAttrs = runReader (mapM evalGraphRefAttrExpr attrExprs) relEnv
358− attrErrs = lefts eAttrs
359− attrsList = rights eAttrs
360− if not (null attrErrs) then
361− dbErr (someErrors attrErrs)
362− else do
363− let atomTypeErrs = lefts $ map ((`validateAtomType` tConss) . A.atomType) attrsList
364− if not (null atomTypeErrs) then
365− dbErr (someErrors atomTypeErrs)
366− else
367− case M.member relVarName relvars of
257+ graph <- dbcGraph
258+ let eAttrs = runGraphRefRelationalExprM gfEnv (mapM evalGraphRefAttrExpr attrExprs)
259+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
260+ case eAttrs of
261+ Left err -> dbErr err
262+ Right attrsList -> do
263+ lift $ except $ validateAttributes tConss (A.attributesFromList attrsList)
264+ case M.member relVarName relvars of
368265 True -> dbErr (RelVarAlreadyDefinedError relVarName)
369266 False -> setRelVar relVarName (ExistingRelation emptyRelation)
370267 where
@@ -377,12 +274,17 @@ evalGraphRefDatabaseContextExpr (Assign relVarName expr) = do
377274 graph <- re_graph <$> dbcRelationalExprEnv
378275 context <- getStateContext
379276 let existingRelVar = M.lookup relVarName (relationVariables context)
277+ reEnv = freshGraphRefRelationalExprEnv (Just context) graph
278+ eNewExprType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr expr)
380279 case existingRelVar of
381280 Nothing -> do
382− setRelVar relVarName expr
281+ case runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr expr) of
282+ Left err -> dbErr err
283+ Right reltype -> do
284+ lift $ except $ validateAttributes (typeConstructorMapping context) (attributes reltype)
285+ setRelVar relVarName expr
383286 Just existingRel -> do
384− let eExpectedType = runReader (typeForGraphRefRelationalExpr existingRel) graph
385− eNewExprType = runReader (typeForGraphRefRelationalExpr expr) graph
287+ let eExpectedType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr existingRel)
386288 case eExpectedType of
387289 Left err -> dbErr err
388290 Right expectedType ->
@@ -390,44 +292,53 @@ evalGraphRefDatabaseContextExpr (Assign relVarName expr) = do
390292 Left err -> dbErr err
391293 Right newExprType -> do
392294 if newExprType == expectedType then do
295+ lift $ except $ validateAttributes (typeConstructorMapping context) (attributes newExprType)
393296 setRelVar relVarName expr
394297 else
395298 dbErr (RelationTypeMismatchError (attributes expectedType) (attributes newExprType))
396299
397300evalGraphRefDatabaseContextExpr (Insert relVarName relExpr) = do
398− transId <- dbcTransId
399− evalGraphRefDatabaseContextExpr (Assign relVarName
400− (Union
401− (RelationVariable relVarName transId)
402− relExpr))
301+ gfExpr <- relVarByName relVarName
302+ let optExpr = applyUnionCollapse (Union
303+ relExpr
304+ gfExpr)
305+ evalGraphRefDatabaseContextExpr (Assign relVarName optExpr)
403306
404307evalGraphRefDatabaseContextExpr (Delete relVarName predicate) = do
405− transId <- dbcTransId
406− let rv = RelationVariable relVarName transId
407− setRelVar relVarName (Restrict (NotPredicate predicate) rv)
308+ gfExpr <- relVarByName relVarName
309+ let optExpr = applyRestrictionCollapse (Restrict (NotPredicate predicate) gfExpr)
310+ setRelVar relVarName optExpr
408311
409312--union of restricted+updated portion and the unrestricted+unupdated portion
410313evalGraphRefDatabaseContextExpr (Update relVarName atomExprMap pred') = do
314+ rvExpr <- relVarByName relVarName
315+ graph <- re_graph <$> dbcRelationalExprEnv
411316 context <- getStateContext
412− transId <- dbcTransId
413− reEnv <- dbcRelationalExprEnv
414− let relVarMap = relationVariables context
415− case M.lookup relVarName relVarMap of
416− Nothing -> dbErr (RelVarNotDefinedError relVarName)
417− Just _ -> do
418− let unrestrictedPortion = Restrict (NotPredicate pred') rv
419− rv = RelationVariable relVarName transId
420− tmpAttr attr = "_tmp_" <> attr --this could certainly be improved to verify that there is no attribute name conflict
421− updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)
422− projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)
423− restrictedPortion = Restrict pred'
424− updated = foldr (\(oldname, atomExpr) accum ->
425− let procAtomExpr = runReader (processAtomExpr atomExpr) reEnv in
317+ let reEnv = freshGraphRefRelationalExprEnv (Just context) graph
318+ --get the current attributes name in the relvar to ensure that we don't conflict when renaming
319+ eExprType = runGraphRefRelationalExprM reEnv (typeForGraphRefRelationalExpr rvExpr)
320+ exprType' <- case eExprType of
321+ Left err -> throwError err
322+ Right t -> pure t
323+ let unrestrictedPortion = Restrict (NotPredicate pred') rvExpr
324+ tmpAttr = tmpAttrC 1
325+ tmpAttrC :: Int -> AttributeName -> AttributeName
326+ tmpAttrC c attr =
327+ let tmpAttrName = "_tmp_" <> T.pack (show c) <> attr in
328+ if tmpAttrName `S.member` A.attributeNameSet (attributes exprType') then
329+ tmpAttrC (c+1) attr
330+ else
331+ tmpAttrName
332+ updateAttr nam atomExpr = Extend (AttributeExtendTupleExpr (tmpAttr nam) atomExpr)
333+ projectAndRename attr expr = Rename (tmpAttr attr) attr (Project (InvertedAttributeNames (S.singleton attr)) expr)
334+ restrictedPortion = Restrict pred' rvExpr
335+ updated = foldr (\(oldname, atomExpr) accum ->
336+ let procAtomExpr = runProcessExprM UncommittedContextMarker (processAtomExpr atomExpr) in
426337 updateAttr oldname procAtomExpr accum
427− ) rv (M.toList atomExprMap)
338+ ) restrictedPortion (M.toList atomExprMap)
428339 -- the atomExprMap could reference other attributes, so we must perform multi-pass folds
429− updatedPortion = foldr projectAndRename updated (M.keys atomExprMap)
430− setRelVar relVarName (Union unrestrictedPortion updatedPortion)
340+ updatedPortion = foldr projectAndRename updated (M.keys atomExprMap)
341+ setRelVar relVarName (Union unrestrictedPortion updatedPortion)
431342
432343evalGraphRefDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do
433344 currContext <- getStateContext
@@ -439,6 +350,8 @@ evalGraphRefDatabaseContextExpr (AddInclusionDependency newDepName newDep) = do
439350 dbErr (InclusionDependencyNameInUseError newDepName)
440351 else do
441352 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
442355 case checkConstraints potentialContext transId graph of
443356 Left err -> dbErr err
444357 Right _ ->
@@ -483,9 +396,9 @@ evalGraphRefDatabaseContextExpr (AddTypeConstructor tConsDef dConsDefList) = do
483396 let oldTypes = typeConstructorMapping currentContext
484397 tConsName = TCD.name tConsDef
485398 -- validate that the constructor's types exist
486− case validateTypeConstructorDef tConsDef dConsDefList of
487− errs@(_:_) -> dbErr (someErrors errs)
488− [] | T.null tConsName || not (isUpper (T.head tConsName)) -> dbErr (InvalidAtomTypeName tConsName)
399+ case validateTypeConstructorDef tConsDef dConsDefList oldTypes of
400+ Left err -> throwError err
401+ Right () | T.null tConsName || not (isUpper (T.head tConsName)) -> dbErr (InvalidAtomTypeName tConsName)
489402 | isJust (findTypeConstructor tConsName oldTypes) -> dbErr (AtomTypeNameInUseError tConsName)
490403 | otherwise -> do
491404 let newTypes = oldTypes ++ [(tConsDef, dConsDefList)]
@@ -501,15 +414,10 @@ evalGraphRefDatabaseContextExpr (RemoveTypeConstructor tConsName) = do
501414 let newTypes = filter (\(tCons, _) -> TCD.name tCons /= tConsName) oldTypes
502415 putStateContext $ currentContext { typeConstructorMapping = newTypes }
503416
504−evalGraphRefDatabaseContextExpr (MultipleExpr _) = do
417+evalGraphRefDatabaseContextExpr (MultipleExpr exprs) =
505418 --the multiple expressions must pass the same context around- not the old unmodified context
506− unimplemented
507−{- evald <- forM exprs (\expr -> evalGraphRefDatabaseContextExpr expr)
508− --some lifting magic needed here
509− case lefts evald of
510− [] -> pure ()
511− errs -> dbErr (someErrors errs)
512− -}
419+ mapM_ evalGraphRefDatabaseContextExpr exprs
420+
513421evalGraphRefDatabaseContextExpr (RemoveAtomFunction funcName) = do
514422 currentContext <- getStateContext
515423 let atomFuncs = atomFunctions currentContext
@@ -536,10 +444,11 @@ evalGraphRefDatabaseContextExpr (RemoveDatabaseContextFunction funcName) = do
536444
537445evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArgExprs) = do
538446 context <- getStateContext
539− relExprEnv <- dbcRelationalExprEnv
447+ graph <- dbcGraph
540448 --resolve atom arguments
541− let eAtomTypes = map (\atomExpr -> runReader (typeForGraphRefAtomExpr emptyAttributes atomExpr) relExprEnv) atomArgExprs
449+ let eAtomTypes = mapM (runGraphRefRelationalExprM gfEnv . typeForGraphRefAtomExpr emptyAttributes) atomArgExprs
542450 eFunc = databaseContextFunctionForName funcName (dbcFunctions context)
451+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
543452 case eFunc of
544453 Left err -> dbErr err
545454 Right func -> do
@@ -549,16 +458,16 @@ evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArg
549458 dbErr (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
550459 else
551460 --check that the atom types are valid
552− case lefts eAtomTypes of
553− _:_ -> dbErr (someErrors (lefts eAtomTypes))
554− [] -> do
555− let atomTypes = rights eAtomTypes
556− let mValidTypes = map (\(expType, actType) -> case atomTypeVerify expType actType of
557− Left err -> Just err
558− Right _ -> Nothing) (zip (dbcFuncType func) atomTypes)
461+ case eAtomTypes of
462+ Left err -> dbErr err
463+ Right atomTypes -> do
464+ let mValidTypes = zipWith (\ expType actType
465+ -> case atomTypeVerify expType actType of
466+ Left err -> Just err
467+ Right _ -> Nothing)
468+ (dbcFuncType func) atomTypes
559469 typeErrors = catMaybes mValidTypes
560− eAtomArgs = unimplemented
561− --eAtomArgs = map (\arg -> runReader (evalAtomExpr emptyTuple arg) relExprState) atomArgExprs
470+ eAtomArgs = map (runGraphRefRelationalExprM gfEnv . evalGraphRefAtomExpr emptyTuple) atomArgExprs
562471 if length (lefts eAtomArgs) > 1 then
563472 dbErr (someErrors (lefts eAtomArgs))
564473 else if not (null typeErrors) then
@@ -567,7 +476,6 @@ evalGraphRefDatabaseContextExpr (ExecuteDatabaseContextFunction funcName atomArg
567476 case evalDatabaseContextFunction func (rights eAtomArgs) context of
568477 Left err -> dbErr err
569478 Right newContext -> putStateContext newContext
570−
571479data DatabaseContextIOEvalEnv = DatabaseContextIOEvalEnv
572480 { dbcio_transId :: TransactionId,
573481 dbcio_graph :: TransactionGraph,
@@ -603,10 +511,15 @@ getDBCIOContext = dbc_context <$> RWS.get
603511getDBCIORelationalExprEnv :: DatabaseContextIOEvalMonad RelationalExprEnv
604512getDBCIORelationalExprEnv = do
605513 context <- getDBCIOContext
606− env <- RWS.ask
607− pure $ mkRelationalExprEnv context (dbcio_transId env) (dbcio_graph env)
514+ mkRelationalExprEnv context . dbcio_graph <$> RWS.ask
608515
609516evalGraphRefDatabaseContextIOExpr :: 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))
522+#else
610523evalGraphRefDatabaseContextIOExpr (AddAtomFunction funcName funcType script) = do
611524 eScriptSession <- requireScriptSession
612525 currentContext <- getDBCIOContext
@@ -640,7 +553,6 @@ evalGraphRefDatabaseContextIOExpr (AddAtomFunction funcName funcType script) = d
640553 Right eContext -> case eContext of
641554 Left err -> pure (Left err)
642555 Right context' -> putDBCIOContext context'
643−
644556evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType script) = do
645557 eScriptSession <- requireScriptSession
646558 currentContext <- getDBCIOContext
@@ -682,7 +594,6 @@ evalGraphRefDatabaseContextIOExpr (AddDatabaseContextFunction funcName funcType
682594 Right eContext -> case eContext of
683595 Left err -> pure (Left err)
684596 Right context' -> putDBCIOContext context'
685−
686597evalGraphRefDatabaseContextIOExpr (LoadAtomFunctions modName funcName modPath) = do
687598 currentContext <- getDBCIOContext
688599 eLoadFunc <- liftIO $ loadAtomFunctions (T.unpack modName) (T.unpack funcName) modPath
@@ -699,7 +610,7 @@ evalGraphRefDatabaseContextIOExpr (LoadDatabaseContextFunctions modName funcName
699610 Right dbcListFunc -> let newContext = currentContext { dbcFunctions = mergedFuncs }
700611 mergedFuncs = HS.union (dbcFunctions currentContext) (HS.fromList dbcListFunc)
701612 in putDBCIOContext newContext
702−
613+#endif
703614evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs range) = do
704615 --Define
705616 currentContext <- getDBCIOContext
@@ -707,63 +618,61 @@ evalGraphRefDatabaseContextIOExpr (CreateArbitraryRelation relVarName attrExprs
707618 --create graph ref expr
708619 let gfExpr = Define relVarName attrExprs
709620 evalEnv = mkDatabaseContextEvalEnv (dbcio_transId env) (dbcio_graph env)
710− transId = dbcio_transId env
711621 graph = dbcio_graph env
712622 case runDatabaseContextEvalMonad currentContext evalEnv (evalGraphRefDatabaseContextExpr gfExpr) of
713623 Left err -> pure (Left err)
714− Right state -> do
624+ Right dbstate -> do
715625 --Assign
716626 let existingRelVar = M.lookup relVarName relVarTable
717− relVarTable = relationVariables (dbc_context state)
627+ relVarTable = relationVariables (dbc_context dbstate)
718628 case existingRelVar of
719629 Nothing -> pure $ Left (RelVarNotDefinedError relVarName)
720630 Just existingRel -> do
721− case runReader (typeForGraphRefRelationalExpr existingRel) graph of
631+ let gfEnv = freshGraphRefRelationalExprEnv (Just currentContext) graph
632+ case runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr existingRel) of
722633 Left err -> pure (Left err)
723634 Right relType -> do
724635 let expectedAttributes = attributes relType
725− tcMap = typeConstructorMapping (dbc_context state)
636+ tcMap = typeConstructorMapping (dbc_context dbstate)
726637 eitherRel <- liftIO $ generate $ runReaderT (arbitraryRelation expectedAttributes range) tcMap
727638 case eitherRel of
728639 Left err -> pure $ Left err
729640 Right rel ->
730641 case runDatabaseContextEvalMonad currentContext evalEnv (setRelVar relVarName (ExistingRelation rel)) of
731642 Left err -> pure (Left err)
732− Right state -> putDBCIOContext (dbc_context state)
733−
734−updateTupleWithAtomExprs :: M.Map AttributeName AtomExpr -> DatabaseContext -> TransactionGraph -> RelationTuple -> Either RelationalError RelationTuple
735−updateTupleWithAtomExprs exprMap context graph tupIn = do
736− --resolve all atom exprs
737− atomsAssoc <- mapM (\(attrName, atomExpr) -> do
738− let atom = unimplemented
739− --atom <- runReader (evalAtomExpr tupIn atomExpr) (mkRelationalExprState context graph)
740− pure (attrName, atom)
741− ) (M.toList exprMap)
742− pure (updateTupleWithAtoms (M.fromList atomsAssoc) tupIn)
643+ Right dbstate' -> putDBCIOContext (dbc_context dbstate')
743644
744645--run verification on all constraints
745646checkConstraints :: DatabaseContext -> TransactionId -> TransactionGraph -> Either RelationalError ()
746−checkConstraints context transId graph@(TransactionGraph graphHeads transSet) =
647+checkConstraints context transId graph@(TransactionGraph graphHeads transSet) = do
747648 mapM_ (uncurry checkIncDep) (M.toList deps)
748649 where
749650 potentialGraph = TransactionGraph graphHeads (S.insert tempTrans transSet)
750651 tempStamp = UTCTime { utctDay = fromGregorian 2000 1 1,
751652 utctDayTime = secondsToDiffTime 0 }
752653 tempSchemas = Schemas context M.empty
753− tempTrans = Transaction U.nil (TransactionInfo (transId NE.:| []) tempStamp) tempSchemas
654+ tempTrans = Transaction U.nil tempTransInfo tempSchemas
655+ tempTransInfo = TransactionInfo { parents = transId NE.:| [],
656+ stamp = tempStamp,
657+ merkleHash = mempty
658+ }
754659
755660 deps = inclusionDependencies context
756− reEnv = mkRelationalExprEnv context transId graph
757661 -- no optimization available here, really? perhaps the optimizer should be passed down to here or the eval function should be passed through the environment
758662 checkIncDep depName (InclusionDependency subsetExpr supersetExpr) = do
759− let gfSubsetExpr = runReader (processRelationalExpr subsetExpr) reEnv
760− gfSupersetExpr = runReader (processRelationalExpr supersetExpr) reEnv
663+ let process = runProcessExprM UncommittedContextMarker
664+ gfSubsetExpr = process (processRelationalExpr subsetExpr)
665+ gfSupersetExpr = process (processRelationalExpr supersetExpr)
761666 --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.
762− typeSub <- runReader (typeForRelationalExpr subsetExpr) reEnv
763− typeSuper <- runReader (typeForRelationalExpr supersetExpr) reEnv
667+ let gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
668+ runGfRel = runGraphRefRelationalExprM gfEnv
669+ typeSub <- runGfRel (typeForGraphRefRelationalExpr gfSubsetExpr)
670+ typeSuper <- runGfRel (typeForGraphRefRelationalExpr gfSupersetExpr)
764671 when (typeSub /= typeSuper) (Left (RelationTypeMismatchError (attributes typeSub) (attributes typeSuper)))
765672 let checkExpr = Equals gfSupersetExpr (Union gfSubsetExpr gfSupersetExpr)
766− case evalGraphRefRelationalExpr checkExpr potentialGraph of
673+ gfEvald = runGraphRefRelationalExprM gfEnv' (evalGraphRefRelationalExpr checkExpr)
674+ gfEnv' = freshGraphRefRelationalExprEnv (Just context) potentialGraph
675+ case gfEvald of
767676 Left err -> Left err
768677 Right resultRel -> if resultRel == relationTrue then
769678 pure ()
@@ -773,88 +682,81 @@ checkConstraints context transId graph@(TransactionGraph graphHeads transSet) =
773682-- 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
774683-- furthermore, the type of a relational expression is the resultant header of the evaluated empty-tupled relation
775684
776−typeForRelationalExpr :: RelationalExpr -> RelationalExprState (Either RelationalError Relation)
685+typeForRelationalExpr :: RelationalExpr -> RelationalExprM Relation
777686typeForRelationalExpr expr = do
778687 --replace the relationVariables context element with a cloned set of relation devoid of tuples
779688 --evalRelationalExpr could still return an existing relation with tuples, so strip them
780− gfExpr <- processRelationalExpr expr
781− graph <- re_graph <$> askEnv
782− pure $ runReader (typeForGraphRefRelationalExpr gfExpr) graph
783−
784−--returns a database context with all tuples removed
785−--this is useful for type checking and optimization
786−{-
787−contextWithEmptyTupleSets :: DatabaseContext -> DatabaseContext
788−contextWithEmptyTupleSets contextIn = contextIn { relationVariables = relVars }
789− where
790− relVars = M.map (\rel -> ExistingRelation (Relation (attributes rel) emptyTupleSet)) (relationVariables contextIn)
791−-}
689+ graph <- reGraph
690+ context <- reContext
691+ let gfExpr = runProcessExprM UncommittedContextMarker (processRelationalExpr expr)
692+ gfEnv = freshGraphRefRelationalExprEnv (Just context) graph
693+ runGf = runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
694+ lift $ except runGf
792695
793696liftE :: (Monad m) => m (Either a b) -> ExceptT a m b
794697liftE v = do
795698 y <- lift v
796699 case y of
797− Left err -> throwE err
700+ Left err -> throwError err
798701 Right val -> pure val
799702
800703{- used for restrictions- take the restrictionpredicate and return the corresponding filter function -}
801−predicateRestrictionFilter :: Attributes -> RestrictionPredicateExprBase a -> RelationalExprState (Either RelationalError RestrictionFilter)
802−predicateRestrictionFilter attrs (AndPredicate expr1 expr2) =
803− runExceptT $ do
804− expr1v <- liftE (predicateRestrictionFilter attrs expr1)
805− expr2v <- liftE (predicateRestrictionFilter attrs expr2)
806− pure (\x -> do
807− ev1 <- expr1v x
808− ev2 <- expr2v x
809− pure (ev1 && ev2))
810−
811−predicateRestrictionFilter attrs (OrPredicate expr1 expr2) =
812− runExceptT $ do
813− expr1v <- liftE (predicateRestrictionFilter attrs expr1)
814− expr2v <- liftE (predicateRestrictionFilter attrs expr2)
704+predicateRestrictionFilter :: Attributes -> GraphRefRestrictionPredicateExpr -> GraphRefRelationalExprM RestrictionFilter
705+predicateRestrictionFilter attrs (AndPredicate expr1 expr2) = do
706+ expr1v <- predicateRestrictionFilter attrs expr1
707+ expr2v <- predicateRestrictionFilter attrs expr2
708+ pure (\x -> do
709+ ev1 <- expr1v x
710+ ev2 <- expr2v x
711+ pure (ev1 && ev2))
712+
713+predicateRestrictionFilter attrs (OrPredicate expr1 expr2) = do
714+ expr1v <- predicateRestrictionFilter attrs expr1
715+ expr2v <- predicateRestrictionFilter attrs expr2
815716 pure (\x -> do
816717 ev1 <- expr1v x
817718 ev2 <- expr2v x
818719 pure (ev1 || ev2))
819720
820−predicateRestrictionFilter _ TruePredicate = pure (Right (\_ -> pure True))
721+predicateRestrictionFilter _ TruePredicate = pure (\_ -> pure True)
821722
822−predicateRestrictionFilter attrs (NotPredicate expr) =
823− runExceptT $ do
824− exprv <- liftE (predicateRestrictionFilter attrs expr)
825− pure (fmap not . exprv)
723+predicateRestrictionFilter attrs (NotPredicate expr) = do
724+ exprv <- predicateRestrictionFilter attrs expr
725+ pure (fmap not . exprv)
826726
827727--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
828−{-
829728predicateRestrictionFilter _ (RelationalExprPredicate relExpr) = do
830− rstate <- ask
831− pure (Right (\tup -> case runReader (evalRelationalExpr relExpr) (mergeTuplesIntoRelationalExprState tup rstate) of
729+ renv <- askEnv
730+ let eval :: RelationTuple -> Either RelationalError Relation
731+ eval tup =
732+ let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tup renv in
733+ runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr relExpr)
734+ pure (\tup -> case eval tup of
832735 Left err -> Left err
833736 Right rel -> if arity rel /= 0 then
834737 Left (PredicateExpressionError "Relational restriction filter must evaluate to 'true' or 'false'")
835738 else
836− pure (rel == relationTrue)))
739+ pure (rel == relationTrue))
837740
838741predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr) = do
839− rstate <- ask
840− let attrs' = stateAttributes rstate
841− ctxtup' = stateTuple rstate
842− runExceptT $ do
843− atomExprType <- liftE (typeFromAtomExpr attrs' atomExpr)
844− attr <- either throwE pure $ case A.attributeForName attrName attrs of
742+ env <- askEnv
743+ let attrs' = A.union attrs (envAttributes env)
744+ ctxtup' = envTuple env
745+ atomExprType <- typeForGraphRefAtomExpr attrs' atomExpr
746+ attr <- lift $ except $ case A.attributeForName attrName attrs of
845747 Right attr -> Right attr
846748 Left (NoSuchAttributeNamesError _) -> case A.attributeForName attrName (tupleAttributes ctxtup') of
847749 Right ctxattr -> Right ctxattr
848750 Left err2@(NoSuchAttributeNamesError _) -> Left err2
849751 Left err -> Left err
850752 Left err -> Left err
851− if atomExprType /= A.atomType attr then
852− throwE (TupleAttributeTypeMismatchError (A.attributesFromList [attr]))
853− else
753+ if atomExprType /= A.atomType attr then
754+ throwError (TupleAttributeTypeMismatchError (A.attributesFromList [attr]))
755+ else
854756 pure $ \tupleIn -> let evalAndCmp atomIn = case atomEvald of
855757 Right atomCmp -> atomCmp == atomIn
856758 Left _ -> False
857− atomEvald = runReader (evalAtomExpr tupleIn atomExpr) rstate
759+ atomEvald = runGraphRefRelationalExprM env (evalGraphRefAtomExpr tupleIn atomExpr)
858760 in
859761 pure $ case atomForAttributeName attrName tupleIn of
860762 Left (NoSuchAttributeNamesError _) -> case atomForAttributeName attrName ctxtup' of
@@ -865,279 +767,322 @@ predicateRestrictionFilter attrs (AttributeEqualityPredicate attrName atomExpr)
865767-- in the future, it would be useful to do typechecking on the attribute and atom expr filters in advance
866768predicateRestrictionFilter attrs (AtomExprPredicate atomExpr) = do
867769 --merge attrs into the state attributes
868− rstate <- ask
869− runExceptT $ do
870− aType <- liftE (typeFromAtomExpr attrs atomExpr)
871− if aType /= BoolAtomType then
872− throwE (AtomTypeMismatchError aType BoolAtomType)
873− else
770+ renv <- askEnv
771+ aType <- typeForGraphRefAtomExpr attrs atomExpr
772+ if aType /= BoolAtomType then
773+ throwError (AtomTypeMismatchError aType BoolAtomType)
774+ else
874775 pure (\tupleIn ->
875− case runReader (evalAtomExpr tupleIn atomExpr) rstate of
876− Left err -> Left err
877− Right boolAtomValue -> pure (boolAtomValue == BoolAtom True))
878−-}
776+ case runGraphRefRelationalExprM renv (evalGraphRefAtomExpr tupleIn atomExpr) of
777+ Left err -> Left err
778+ Right boolAtomValue -> pure (boolAtomValue == BoolAtom True))
779+
879780tupleExprCheckNewAttrName :: AttributeName -> Relation -> Either RelationalError Relation
880781tupleExprCheckNewAttrName attrName rel = if isRight (attributeForName attrName rel) then
881782 Left (AttributeNameInUseError attrName)
882783 else
883784 Right rel
884785
885−extendTupleExpressionProcessor :: Relation -> ExtendTupleExpr -> RelationalExprState (Either RelationalError (Attributes, RelationTuple -> Either RelationalError RelationTuple))
886−extendTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) = do
887− rstate <- askEnv
786+extendGraphRefTupleExpressionProcessor :: Relation -> GraphRefExtendTupleExpr -> GraphRefRelationalExprM (Attributes, RelationTuple -> Either RelationalError RelationTuple)
787+extendGraphRefTupleExpressionProcessor relIn (AttributeExtendTupleExpr newAttrName atomExpr) =
788+-- renv <- askEnv
888789 -- check that the attribute name is not in use
889790 case tupleExprCheckNewAttrName newAttrName relIn of
890− Left err -> pure (Left err)
891− Right _ -> runExceptT $ do
892− atomExprType <- liftE (typeFromAtomExpr (attributes relIn) atomExpr)
893− atomExprType' <- liftE (verifyAtomExprTypes relIn atomExpr atomExprType)
791+ Left err -> throwError err
792+ Right _ -> do
793+ atomExprType <- typeForGraphRefAtomExpr (attributes relIn) atomExpr
794+ atomExprType' <- verifyGraphRefAtomExprTypes relIn atomExpr atomExprType
894795 let newAttrs = A.attributesFromList [Attribute newAttrName atomExprType']
895796 newAndOldAttrs = A.addAttributes (attributes relIn) newAttrs
896− pure (newAndOldAttrs, \tup -> let substate = mergeTuplesIntoRelationalExprState tup rstate in
897− case unimplemented {-runReader (evalAtomExpr tup atomExpr) substate-} of
898− Left err -> Left err
899− Right atom -> Right (tupleAtomExtend newAttrName atom tup)
797+ env <- ask
798+ pure (newAndOldAttrs, \tup -> do
799+ let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tup env
800+ atom <- runGraphRefRelationalExprM gfEnv (evalGraphRefAtomExpr tup atomExpr)
801+ Right (tupleAtomExtend newAttrName atom tup)
900802 )
901803
902−
903−evalAtomExpr :: RelationTuple -> AtomExpr -> RelationalExprState (Either RelationalError Atom)
904−evalAtomExpr = undefined
905−{-
906−
907−evalAtomExpr tupIn (AttributeAtomExpr attrName) = case atomForAttributeName attrName tupIn of
908− Right atom -> pure (Right atom)
909− err@(Left (NoSuchAttributeNamesError _)) -> do
910− rstate <- ask
911− let stateTup = stateTuple rstate
912− pure (atomForAttributeName attrName stateTup)
913− Left err -> pure (Left err)
914−evalAtomExpr _ (NakedAtomExpr atom) = pure (Right atom)
915−evalAtomExpr tupIn (FunctionAtomExpr funcName arguments ()) = do
916− argTypes <- mapM (typeFromAtomExpr (tupleAttributes tupIn)) arguments
917− context <- fmap stateElemsContext ask
918− runExceptT $ do
919− let functions = atomFunctions context
920− func <- either throwE pure (atomFunctionForName funcName functions)
921− let expectedArgCount = length (atomFuncType func) - 1
922− actualArgCount = length argTypes
923− safeInit [] = [] -- different behavior from normal init
924− safeInit xs = init xs
925− if expectedArgCount /= actualArgCount then
926− throwE (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
927− else do
804+evalGraphRefAtomExpr :: RelationTuple -> GraphRefAtomExpr -> GraphRefRelationalExprM Atom
805+evalGraphRefAtomExpr tupIn (AttributeAtomExpr attrName) =
806+ case atomForAttributeName attrName tupIn of
807+ Right atom -> pure atom
808+ Left err@(NoSuchAttributeNamesError _) -> do
809+ env <- askEnv
810+ case gre_extra env of
811+ Nothing -> throwError err
812+ Just (Left ctxtup) -> lift $ except $ atomForAttributeName attrName ctxtup
813+ Just (Right _) -> throwError err
814+ Left err -> throwError err
815+evalGraphRefAtomExpr _ (NakedAtomExpr atom) = pure atom
816+evalGraphRefAtomExpr tupIn (FunctionAtomExpr funcName arguments tid) = do
817+ argTypes <- mapM (typeForGraphRefAtomExpr (tupleAttributes tupIn)) arguments
818+ context <- gfDatabaseContextForMarker tid
819+ let functions = atomFunctions context
820+ func <- lift $ except (atomFunctionForName funcName functions)
821+ let expectedArgCount = length (atomFuncType func) - 1
822+ actualArgCount = length argTypes
823+ safeInit [] = [] -- different behavior from normal init
824+ safeInit xs = init xs
825+ if expectedArgCount /= actualArgCount then
826+ throwError (FunctionArgumentCountMismatchError expectedArgCount actualArgCount)
827+ else do
928828 let zippedArgs = zip (safeInit (atomFuncType func)) argTypes
929− mapM_ (\(expType, eActType) -> do
930− actType <- either throwE pure eActType
931− either throwE pure (atomTypeVerify expType actType)) zippedArgs
932− evaldArgs <- mapM (liftE . evalAtomExpr tupIn) arguments
829+ mapM_ (\(expType, actType) ->
830+ lift $ except (atomTypeVerify expType actType)) zippedArgs
831+ evaldArgs <- mapM (evalGraphRefAtomExpr tupIn) arguments
933832 case evalAtomFunction func evaldArgs of
934− Left err -> throwE (AtomFunctionUserError err)
833+ Left err -> throwError (AtomFunctionUserError err)
935834 Right result -> do
936835 --validate that the result matches the expected type
937− _ <- either throwE pure (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
836+ _ <- lift $ except (atomTypeVerify (last (atomFuncType func)) (atomTypeForAtom result))
938837 pure result
939−evalAtomExpr tupIn (RelationAtomExpr relExpr) = do
838+evalGraphRefAtomExpr tupIn (RelationAtomExpr relExpr) = do
940839 --merge existing state tuple context into new state tuple context to support an arbitrary number of levels, but new attributes trounce old attributes
941− rstate <- ask
942− runExceptT $ do
943− let newState = mergeTuplesIntoRelationalExprState tupIn rstate
944− relAtom <- either throwE pure (runReader (evalRelationalExpr relExpr) newState)
945− pure (RelationAtom relAtom)
946−evalAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs ()) = runExceptT $ do
947− rstate <- lift ask
948− let newState = mergeTuplesIntoRelationalExprState tupIn rstate
949− aType <- either throwE pure (runReader (typeFromAtomExpr (tupleAttributes tupIn) cons) newState)
950− argAtoms <- mapM (\arg -> either throwE pure (runReader (evalAtomExpr tupIn arg) newState)) dConsArgs
840+ env <- ask
841+ let gfEnv = mergeTuplesIntoGraphRefRelationalExprEnv tupIn env
842+ relAtom <- lift $ except $ runGraphRefRelationalExprM gfEnv (evalGraphRefRelationalExpr relExpr)
843+ pure (RelationAtom relAtom)
844+evalGraphRefAtomExpr tupIn cons@(ConstructedAtomExpr dConsName dConsArgs _) = do --why is the tid unused here? suspicious
845+ let mergeEnv = mergeTuplesIntoGraphRefRelationalExprEnv tupIn
846+ aType <- local mergeEnv (typeForGraphRefAtomExpr (tupleAttributes tupIn) cons)
847+ argAtoms <- local mergeEnv $
848+ mapM (evalGraphRefAtomExpr tupIn) dConsArgs
951849 pure (ConstructedAtom dConsName aType argAtoms)
952−-}
953−typeForGraphRefAtomExpr :: Attributes -> GraphRefAtomExpr -> RelationalExprState (Either RelationalError AtomType)
850+
851+typeForGraphRefAtomExpr :: Attributes -> GraphRefAtomExpr -> GraphRefRelationalExprM AtomType
954852typeForGraphRefAtomExpr attrs (AttributeAtomExpr attrName) = do
955− rstate <- askEnv
853+ renv <- askEnv
956854 case A.atomTypeForAttributeName attrName attrs of
957− Right aType -> pure (Right aType)
855+ Right aType -> pure aType
958856 Left err@(NoSuchAttributeNamesError _) ->
959− let stateTup = stateTuple rstate
960− stateAttrs = stateAttributes rstate in
961− case A.attributeForName attrName stateAttrs of
962− Right attr -> pure (Right (A.atomType attr))
963− Left _ -> case atomForAttributeName attrName stateTup of
964− Right atom -> pure (Right (atomTypeForAtom atom))
965− Left _ -> pure (Left err)
966−
967−typeForGraphAtomExpr _ (NakedAtomExpr atom) = pure (Right (atomTypeForAtom atom))
968−typeForGraphAtomExpr attrs (FunctionAtomExpr funcName atomArgs _) = do
969− context <- fmap envContext askEnv
970− let funcs = atomFunctions context
857+ let envTup = envTuple renv
858+ envAttrs = envAttributes renv in
859+ case A.attributeForName attrName envAttrs of
860+ Right attr -> pure (A.atomType attr)
861+ Left _ -> case atomForAttributeName attrName envTup of
862+ Right atom -> pure (atomTypeForAtom atom)
863+ Left _ -> --throwError (traceStack (show ("typeForGRAtomExpr", attrs, envTup)) err)
864+ throwError err
865+ Left err -> throwError err
866+
867+typeForGraphRefAtomExpr _ (NakedAtomExpr atom) = pure (atomTypeForAtom atom)
868+typeForGraphRefAtomExpr attrs (FunctionAtomExpr funcName atomArgs transId) = do
869+ funcs <- atomFunctions <$> gfDatabaseContextForMarker transId
971870 case atomFunctionForName funcName funcs of
972− Left err -> pure (Left err)
871+ Left err -> throwError err
973872 Right func -> do
974873 let funcRetType = last (atomFuncType func)
975874 funcArgTypes = init (atomFuncType func)
976− eArgTypes <- mapM (typeFromAtomExpr attrs) atomArgs
977− case lefts eArgTypes of
978− errs@(_:_) -> pure (Left (someErrors errs))
979− [] -> do
980− let eTvMap = resolveTypeVariables funcArgTypes argTypes
981− argTypes = rights eArgTypes
982− case eTvMap of
983− Left err -> pure (Left err)
984− Right tvMap -> pure (resolveFunctionReturnValue funcName tvMap funcRetType)
985−typeFromAtomExpr attrs (RelationAtomExpr relExpr) = do
986− relType <- R.local (mergeAttributesIntoRelationalExprState attrs) (typeForRelationalExpr relExpr)
987− case relType of
988− Left err -> pure (Left err)
989− Right relType' ->
990− pure (pure (RelationAtomType (attributes relType')))
875+ argTypes <- mapM (typeForGraphRefAtomExpr attrs) atomArgs
876+ let eTvMap = resolveTypeVariables funcArgTypes argTypes
877+ case eTvMap of
878+ Left err -> throwError err
879+ Right tvMap -> lift $ except $ resolveFunctionReturnValue funcName tvMap funcRetType
880+typeForGraphRefAtomExpr attrs (RelationAtomExpr relExpr) = do
881+ relType <- R.local (mergeAttributesIntoGraphRefRelationalExprEnv attrs) (typeForGraphRefRelationalExpr relExpr)
882+ pure (RelationAtomType (attributes relType))
991883-- grab the type of the data constructor, then validate that the args match the expected types
992−typeFromAtomExpr attrs (ConstructedAtomExpr dConsName dConsArgs _) =
993− runExceptT $ do
994− argsTypes <- mapM (liftE . typeFromAtomExpr attrs) dConsArgs
995− context <- fmap envContext (lift askEnv)
996− either throwE pure (atomTypeForDataConstructor (typeConstructorMapping context) dConsName argsTypes)
884+typeForGraphRefAtomExpr attrs (ConstructedAtomExpr dConsName dConsArgs tid) =
885+ do
886+ argsTypes <- mapM (typeForGraphRefAtomExpr attrs) dConsArgs
887+ tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker tid
888+ lift $ except $ atomTypeForDataConstructor tConsMap dConsName argsTypes
997889
998890-- | Validate that the type of the AtomExpr matches the expected type.
999−verifyAtomExprTypes :: Relation -> AtomExpr -> AtomType -> RelationalExprState (Either RelationalError AtomType)
1000−verifyAtomExprTypes relIn (AttributeAtomExpr attrName) expectedType = runExceptT $ do
1001− rstate <- lift askEnv
891+verifyGraphRefAtomExprTypes :: Relation -> GraphRefAtomExpr -> AtomType -> GraphRefRelationalExprM AtomType
892+verifyGraphRefAtomExprTypes relIn (AttributeAtomExpr attrName) expectedType = do
893+ env <- askEnv
1002894 case A.atomTypeForAttributeName attrName (attributes relIn) of
1003− Right aType -> either throwE pure (atomTypeVerify expectedType aType)
895+ Right aType -> lift $ except $ atomTypeVerify expectedType aType
1004896 (Left err@(NoSuchAttributeNamesError _)) ->
1005− let attrs' = stateAttributes rstate in
897+ let attrs' = envAttributes env in
1006898 if attrs' == emptyAttributes then
1007− throwE err
899+ throwError err
1008900 else
1009901 case A.attributeForName attrName attrs' of
1010− Left err' -> throwE err'
1011− Right attrType -> either throwE pure (atomTypeVerify expectedType (A.atomType attrType))
1012−verifyAtomExprTypes _ (NakedAtomExpr atom) expectedType = pure (atomTypeVerify expectedType (atomTypeForAtom atom))
1013−verifyAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs _) expectedType = do
1014− rstate <- askEnv
902+ Left err' -> throwError err'
903+ Right attrType -> lift $ except $ atomTypeVerify expectedType (A.atomType attrType)
904+ Left err -> throwError err
905+
906+verifyGraphRefAtomExprTypes _ (NakedAtomExpr atom) expectedType =
907+ lift $ except $ atomTypeVerify expectedType (atomTypeForAtom atom)
908+verifyGraphRefAtomExprTypes relIn (FunctionAtomExpr funcName funcArgExprs tid) expectedType = do
909+ context <- gfDatabaseContextForMarker tid
1015910 let functions = atomFunctions context
1016− context = envContext rstate
1017− runExceptT $ do
1018− func <- either throwE pure (atomFunctionForName funcName functions)
1019− let expectedArgTypes = atomFuncType func
1020− funcArgTypes <- mapM (\(atomExpr,expectedType2,argCount) -> case runReader (verifyAtomExprTypes relIn atomExpr expectedType2) rstate of
1021− Left (AtomTypeMismatchError expSubType actSubType) -> throwE (AtomFunctionTypeError funcName argCount expSubType actSubType)
1022− Left err -> throwE err
1023− Right x -> pure x
1024− ) $ zip3 funcArgExprs expectedArgTypes [1..]
1025− if length funcArgTypes /= length expectedArgTypes - 1 then
1026− throwE (AtomTypeCountError funcArgTypes expectedArgTypes)
911+ func <- lift $ except $ atomFunctionForName funcName functions
912+ let expectedArgTypes = atomFuncType func
913+ funcArgVerifier (atomExpr, expectedType2, argCount) = do
914+ let handler :: RelationalError -> GraphRefRelationalExprM AtomType
915+ handler (AtomTypeMismatchError expSubType actSubType) = throwError (AtomFunctionTypeError funcName argCount expSubType actSubType)
916+ handler err = throwError err
917+ verifyGraphRefAtomExprTypes relIn atomExpr expectedType2 `catchError` handler
918+ funcArgTypes <- mapM funcArgVerifier $ zip3 funcArgExprs expectedArgTypes [1..]
919+ if length funcArgTypes /= length expectedArgTypes - 1 then
920+ throwError (AtomTypeCountError funcArgTypes expectedArgTypes)
1027921 else
1028− either throwE pure (atomTypeVerify expectedType (last expectedArgTypes))
1029−verifyAtomExprTypes relIn (RelationAtomExpr relationExpr) expectedType = runExceptT $ do
1030− rstate <- lift askEnv
1031− relType <- either throwE pure (runReader (typeForRelationalExpr relationExpr) (mergeAttributesIntoRelationalExprState (attributes relIn) rstate))
1032− either throwE pure (atomTypeVerify expectedType (RelationAtomType (attributes relType)))
1033−verifyAtomExprTypes rel cons@ConstructedAtomExpr{} expectedType = runExceptT $ do
1034− cType <- liftE (typeFromAtomExpr (attributes rel) cons)
1035− either throwE pure (atomTypeVerify expectedType cType)
922+ lift $ except $ atomTypeVerify expectedType (last expectedArgTypes)
923+verifyGraphRefAtomExprTypes relIn (RelationAtomExpr relationExpr) expectedType =
924+ do
925+ let mergedAttrsEnv e = mergeAttributesIntoGraphRefRelationalExprEnv (attributes relIn) e
926+ relType <- R.local mergedAttrsEnv (typeForGraphRefRelationalExpr relationExpr)
927+ lift $ except $ atomTypeVerify expectedType (RelationAtomType (attributes relType))
928+verifyGraphRefAtomExprTypes rel cons@ConstructedAtomExpr{} expectedType = do
929+ cType <- typeForGraphRefAtomExpr (attributes rel) cons
930+ lift $ except $ atomTypeVerify expectedType cType
1036931
1037932-- | Look up the type's name and create a new attribute.
1038−evalGraphRefAttrExpr :: GraphRefAttributeExpr -> RelationalExprState (Either RelationalError Attribute)
933+evalGraphRefAttrExpr :: GraphRefAttributeExpr -> GraphRefRelationalExprM Attribute
1039934evalGraphRefAttrExpr (AttributeAndTypeNameExpr attrName tCons transId) = do
1040− graph <- re_graph <$> askEnv
1041− case transactionForId transId graph of
1042− Left err -> pure (Left err)
1043− Right trans -> do
1044− let tConsMap = typeConstructorMapping (concreteDatabaseContext trans)
1045− validate = do
1046− aType <- atomTypeForTypeConstructorValidate True tCons tConsMap M.empty
1047− validateAtomType aType tConsMap
1048− pure aType
1049− case validate of
1050− Left err -> pure (Left err)
1051− Right aType ->
1052− pure $ Right (Attribute attrName aType)
1053−
1054−evalGraphRefAttrExpr (NakedAttributeExpr attr) = pure $ Right attr
935+ tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker transId
936+ aType <- lift $ except $ atomTypeForTypeConstructorValidate True tCons tConsMap M.empty
937+ lift $ except $ validateAtomType aType tConsMap
938+ pure $ Attribute attrName aType
1055939
1056−evalTupleExpr :: Maybe Attributes -> TupleExpr -> RelationalExprState (Either RelationalError RelationTuple)
1057−evalTupleExpr mAttrs (TupleExpr tupMap) = do
1058− context <- fmap envContext askEnv
1059− runExceptT $ do
940+evalGraphRefAttrExpr (NakedAttributeExpr attr) = pure attr
941+
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
949+ Nothing ->
950+ case tuples of
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])
954+ let
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
958+ pure accAttr
959+ else
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
971+ pure nextTupleAttrs
972+ else
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
986+
987+
988+--resolveAttributes (Attribute "gonk" (ConstructedAtomType "Either" (fromList [("a",IntegerAtomType),("b",TypeVariableType "b")]))) (Attribute "gonk" (ConstructedAtomType "Either" (fromList [("a",TypeVariableType "a"),("b",TextAtomType)])))
989+
990+evalGraphRefTupleExpr :: Maybe Attributes -> GraphRefTupleExpr -> GraphRefRelationalExprM RelationTuple
991+evalGraphRefTupleExpr mAttrs (TupleExpr tupMap) = do
1060992 -- 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
1061993 -- 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
1062− let attrs = fromMaybe A.emptyAttributes mAttrs
1063− attrAtoms <- mapM (\(attrName, aExpr) -> do
1064− --provided when the relation header is available
1065− let eExpectedAtomType = A.atomTypeForAttributeName attrName attrs
1066− unresolvedType <- liftE (typeFromAtomExpr attrs aExpr)
1067− resolvedType <- case eExpectedAtomType of
994+ let attrs = fromMaybe A.emptyAttributes mAttrs
995+ resolveOneAtom (attrName, aExpr) =
996+ do
997+ --provided when the relation header is available
998+ let eExpectedAtomType = A.atomTypeForAttributeName attrName attrs
999+ unresolvedType <- typeForGraphRefAtomExpr attrs aExpr
1000+ resolvedType <- case eExpectedAtomType of
10681001 Left _ -> pure unresolvedType
1069− Right typeHint -> either throwE pure (resolveAtomType typeHint unresolvedType)
1002+ Right typeHint -> lift $ except $ resolveAtomType typeHint unresolvedType
10701003 --resolve atom typevars based on resolvedType?
1071− newAtom <- liftE (evalAtomExpr emptyTuple aExpr)
1072− pure (attrName, newAtom, resolvedType)
1073− ) (M.toList tupMap)
1074− let tupAttrs = A.attributesFromList $ map (\(attrName, _, aType) -> Attribute attrName aType) attrAtoms
1075− atoms = V.fromList $ map (\(_, atom, _) -> atom) attrAtoms
1076− tup = mkRelationTuple tupAttrs atoms
1077− tConss = typeConstructorMapping context
1078− finalAttrs = fromMaybe tupAttrs mAttrs
1004+ newAtom <- evalGraphRefAtomExpr emptyTuple aExpr
1005+ pure (attrName, newAtom, resolvedType)
1006+ attrAtoms <- mapM resolveOneAtom (M.toList tupMap)
1007+ let tupAttrs = A.attributesFromList $ map (\(attrName, _, aType) -> Attribute attrName aType) attrAtoms
1008+ atoms = V.fromList $ map (\(_, atom, _) -> atom) attrAtoms
1009+ tup = mkRelationTuple tupAttrs atoms
1010+ finalAttrs = fromMaybe tupAttrs mAttrs
10791011 --verify that the attributes match
1080− when (A.attributeNameSet finalAttrs /= A.attributeNameSet tupAttrs) $ throwE (TupleAttributeTypeMismatchError tupAttrs)
1081− tup' <- either throwE pure (resolveTypesInTuple finalAttrs tConss (reorderTuple finalAttrs tup))
1082− _ <- either throwE pure (validateTuple tup' tConss)
1083− pure tup'
1084−
1085−evalAttributeNames :: AttributeNames -> RelationalExpr -> RelationalExprState (Either RelationalError (S.Set AttributeName))
1086−evalAttributeNames attrNames expr = do
1087− eExprType <- typeForRelationalExpr expr
1088− case eExprType of
1089− Left err -> pure (Left err)
1090− Right exprTyp -> do
1091− let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))
1092− case attrNames of
1093− AttributeNames names ->
1094− case A.projectionAttributesForNames names (attributes exprTyp) of
1095− Left err -> pure (Left err)
1096− Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))
1097−
1098− InvertedAttributeNames names -> do
1099− let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
1100− if not (S.null nonExistentAttributeNames) then
1101− pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))
1102− else
1103− pure (Right (A.nonMatchingAttributeNameSet names typeNameSet))
1104−
1105− UnionAttributeNames namesA namesB -> do
1106− eNameSetA <- evalAttributeNames namesA expr
1107− case eNameSetA of
1108− Left err -> pure (Left err)
1109− Right nameSetA -> do
1110− eNameSetB <- evalAttributeNames namesB expr
1111− case eNameSetB of
1112− Left err -> pure (Left err)
1113− Right nameSetB ->
1114− pure (Right (S.union nameSetA nameSetB))
1115−
1116− IntersectAttributeNames namesA namesB -> do
1117− eNameSetA <- evalAttributeNames namesA expr
1118− case eNameSetA of
1119− Left err -> pure (Left err)
1120− Right nameSetA -> do
1121− eNameSetB <- evalAttributeNames namesB expr
1122− case eNameSetB of
1123− Left err -> pure (Left err)
1124− Right nameSetB ->
1125− pure (Right (S.intersection nameSetA nameSetB))
1126−
1127− RelationalExprAttributeNames attrExpr -> do
1128− eAttrExprType <- typeForRelationalExpr attrExpr
1129− case eAttrExprType of
1130− Left err -> pure (Left err)
1131− Right attrExprType -> pure (Right (A.attributeNameSet (attributes attrExprType)))
1132−
1133−evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> TransactionGraph -> Either RelationalError Relation
1134−--evalGraphRefRelationalExpr (MakeRelationaFromExprs
1135−evalGraphRefRelationalExpr (RelationVariable name tid) graph = do
1136− ctx <- dbContextForTransId tid graph
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
1014+ --tup' <- lift $ except (resolveTypesInTuple finalAttrs tConss (reorderTuple finalAttrs tup))
1015+ let tup' = reorderTuple finalAttrs tup
1016+ --TODO: restore type resolution
1017+-- _ <- lift $ except (validateTuple tup' tConss)
1018+ pure tup'
1019+
1020+--temporary implementation until we have a proper planner+executor
1021+evalGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
1022+evalGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
1023+ mAttrs <- case mAttrExprs of
1024+ Just _ ->
1025+ Just . A.attributesFromList <$> mapM evalGraphRefAttrExpr (fromMaybe [] mAttrExprs)
1026+ Nothing -> pure Nothing
1027+ tuples <- evalGraphRefTupleExprs mAttrs tupleExprs
1028+ let attrs = fromMaybe firstTupleAttrs mAttrs
1029+ firstTupleAttrs = if null tuples then A.emptyAttributes else tupleAttributes (head tuples)
1030+ lift $ except $ mkRelation attrs (RelationTupleSet tuples)
1031+evalGraphRefRelationalExpr (MakeStaticRelation attributeSet tupleSet) =
1032+ lift $ except $ mkRelation attributeSet tupleSet
1033+evalGraphRefRelationalExpr (ExistingRelation rel) = pure rel
1034+evalGraphRefRelationalExpr (RelationVariable name tid) = do
1035+ ctx <- gfDatabaseContextForMarker tid
11371036 case M.lookup name (relationVariables ctx) of
1138− Nothing -> Left (RelVarNotDefinedError name)
1139− Just rv -> evalGraphRefRelationalExpr rv graph
1140−
1037+ Nothing -> throwError (RelVarNotDefinedError name)
1038+ Just rv -> evalGraphRefRelationalExpr rv
1039+evalGraphRefRelationalExpr (Project attrNames expr) = do
1040+ attrNameSet <- evalGraphRefAttributeNames attrNames expr
1041+ rel <- evalGraphRefRelationalExpr expr
1042+ lift $ except $ project attrNameSet rel
1043+evalGraphRefRelationalExpr (Union exprA exprB) = do
1044+ relA <- evalGraphRefRelationalExpr exprA
1045+ relB <- evalGraphRefRelationalExpr exprB
1046+ lift $ except $ union relA relB
1047+evalGraphRefRelationalExpr (Join exprA exprB) = do
1048+ relA <- evalGraphRefRelationalExpr exprA
1049+ relB <- evalGraphRefRelationalExpr exprB
1050+ lift $ except $ join relA relB
1051+evalGraphRefRelationalExpr (Rename oldName newName expr) = do
1052+ rel <- evalGraphRefRelationalExpr expr
1053+ lift $ except $ rename oldName newName rel
1054+evalGraphRefRelationalExpr (Difference exprA exprB) = do
1055+ relA <- evalGraphRefRelationalExpr exprA
1056+ relB <- evalGraphRefRelationalExpr exprB
1057+ lift $ except $ difference relA relB
1058+evalGraphRefRelationalExpr (Group groupAttrNames newAttrName expr) = do
1059+ groupNames <- evalGraphRefAttributeNames groupAttrNames expr
1060+ rel <- evalGraphRefRelationalExpr expr
1061+ lift $ except $ group groupNames newAttrName rel
1062+evalGraphRefRelationalExpr (Ungroup groupAttrName expr) = do
1063+ rel <- evalGraphRefRelationalExpr expr
1064+ lift $ except $ ungroup groupAttrName rel
1065+evalGraphRefRelationalExpr (Restrict predExpr expr) = do
1066+ rel <- evalGraphRefRelationalExpr expr
1067+ filt <- predicateRestrictionFilter (attributes rel) predExpr
1068+ lift $ except $ restrict filt rel
1069+evalGraphRefRelationalExpr (Equals exprA exprB) = do
1070+ relA <- evalGraphRefRelationalExpr exprA
1071+ relB <- evalGraphRefRelationalExpr exprB
1072+ pure $ if relA == relB then relationTrue else relationFalse
1073+evalGraphRefRelationalExpr (NotEquals exprA exprB) = do
1074+ relA <- evalGraphRefRelationalExpr exprA
1075+ relB <- evalGraphRefRelationalExpr exprB
1076+ pure $ if relA == relB then relationFalse else relationTrue
1077+evalGraphRefRelationalExpr (Extend extendTupleExpr expr) = do
1078+ rel <- evalGraphRefRelationalExpr expr
1079+ (newAttrs, tupProc) <- extendGraphRefTupleExpressionProcessor rel extendTupleExpr
1080+ lift $ except $ relMogrify tupProc newAttrs rel
1081+evalGraphRefRelationalExpr expr@With{} =
1082+ --strategy A: add relation variables to the contexts in the graph
1083+ --strategy B: drop in macros in place (easier programmatically)
1084+ --strategy B implementation
1085+ evalGraphRefRelationalExpr (substituteWithNameMacros [] expr)
11411086
11421087dbContextForTransId :: TransactionId -> TransactionGraph -> Either RelationalError DatabaseContext
11431088dbContextForTransId tid graph = do
@@ -1155,170 +1100,120 @@ transactionForId tid graph
11551100 where
11561101 matchingTrans = S.filter (\(Transaction idMatch _ _) -> idMatch == tid) (transactionsForGraph graph)
11571102
1158−processRestrictionPredicateExpr :: RestrictionPredicateExpr -> RelationalExprState GraphRefRestrictionPredicateExpr
1159−processRestrictionPredicateExpr TruePredicate = pure TruePredicate
1160−processRestrictionPredicateExpr (AndPredicate a b) = AndPredicate <$> processRestrictionPredicateExpr a <*> processRestrictionPredicateExpr b
1161−processRestrictionPredicateExpr (OrPredicate a b) = OrPredicate <$> processRestrictionPredicateExpr a <*> processRestrictionPredicateExpr b
1162−processRestrictionPredicateExpr (NotPredicate a) = NotPredicate <$> processRestrictionPredicateExpr a
1163−processRestrictionPredicateExpr (RelationalExprPredicate expr) =
1164− RelationalExprPredicate <$> processRelationalExpr expr
1165−processRestrictionPredicateExpr (AtomExprPredicate expr) =
1166− AtomExprPredicate <$> processAtomExpr expr
1167−processRestrictionPredicateExpr (AttributeEqualityPredicate nam expr) =
1168− AttributeEqualityPredicate nam <$> processAtomExpr expr
1169−
1170−processExtendTupleExpr :: ExtendTupleExpr -> RelationalExprState GraphRefExtendTupleExpr
1171−processExtendTupleExpr (AttributeExtendTupleExpr nam atomExpr) =
1172− AttributeExtendTupleExpr nam <$> processAtomExpr atomExpr
1173−
1174−typeForGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprR (Either RelationalError Relation)
1175−typeForGraphRefRelationalExpr (MakeStaticRelation attrs _) = pure $ mkRelation attrs emptyTupleSet
1176−typeForGraphRefRelationalExpr (ExistingRelation rel) = pure (Right (emptyRelationWithAttrs (attributes rel)))
1177−typeForGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) =
1178− case mAttrExprs of
1179− Just attrExprs -> do
1180− eAttrs <- mapM (\e -> evalGraphRefAttributeExpr e) attrExprs
1181− case lefts eAttrs of
1182− [] -> pure (Right (emptyRelationWithAttrs (attributesFromList (rights eAttrs))))
1183− _ -> pure (Left (someErrors (lefts eAttrs)))
1103+typeForGraphRefRelationalExpr :: GraphRefRelationalExpr -> GraphRefRelationalExprM Relation
1104+typeForGraphRefRelationalExpr (MakeStaticRelation attrs _) = lift $ except $ mkRelation attrs emptyTupleSet
1105+typeForGraphRefRelationalExpr (ExistingRelation rel) = pure (emptyRelationWithAttrs (attributes rel))
1106+typeForGraphRefRelationalExpr (MakeRelationFromExprs mAttrExprs tupleExprs) = do
1107+ mAttrs <- case mAttrExprs of
1108+ Just attrExprs -> do
1109+ attrs <- mapM evalGraphRefAttributeExpr attrExprs
1110+ pure (Just (attributesFromList attrs))
1111+ Nothing -> pure Nothing
1112+ tuples <- evalGraphRefTupleExprs mAttrs tupleExprs
1113+ let retAttrs = case tuples of
1114+ (tup:_) -> tupleAttributes tup
1115+ [] -> fromMaybe A.emptyAttributes mAttrs
1116+ pure $ emptyRelationWithAttrs retAttrs
1117+
11841118typeForGraphRefRelationalExpr (RelationVariable rvName tid) = do
1185− graph <- R.ask
1186− let eTrans = transactionForId tid graph
1187− case eTrans of
1188− Left err -> pure (Left err)
1189− Right trans -> do
1190− let relVars = relationVariables (concreteDatabaseContext trans)
1191− case M.lookup rvName relVars of
1192− Nothing -> pure (Left (RelVarNotDefinedError rvName))
1193− Just rvExpr -> typeForGraphRefRelationalExpr rvExpr
1119+ relVars <- relationVariables <$> gfDatabaseContextForMarker tid
1120+ case M.lookup rvName relVars of
1121+ Nothing -> throwError (RelVarNotDefinedError rvName)
1122+ Just rvExpr ->
1123+ typeForGraphRefRelationalExpr rvExpr
11941124typeForGraphRefRelationalExpr (Project attrNames expr) = do
1195− eExprType <- typeForGraphRefRelationalExpr expr
1196− case eExprType of
1197− Left err -> pure (Left err)
1198− Right exprType -> do
1199− eProjectionAttrs <- evalGraphRefAttributeNames attrNames expr
1200− pure $ case eProjectionAttrs of
1201− Left err -> Left err
1202− Right projectionAttrs -> project projectionAttrs exprType
1203−
1204−evalGraphRefAttributeNames :: GraphRefAttributeNames -> GraphRefRelationalExpr -> GraphRefRelationalExprR (Either RelationalError (S.Set AttributeName))
1125+ exprType' <- typeForGraphRefRelationalExpr expr
1126+ projectionAttrs <- evalGraphRefAttributeNames attrNames expr
1127+ lift $ except $ project projectionAttrs exprType'
1128+typeForGraphRefRelationalExpr (Union exprA exprB) = do
1129+ exprA' <- typeForGraphRefRelationalExpr exprA
1130+ exprB' <- typeForGraphRefRelationalExpr exprB
1131+ lift $ except $ union exprA' exprB'
1132+typeForGraphRefRelationalExpr (Join exprA exprB) = do
1133+ exprA' <- typeForGraphRefRelationalExpr exprA
1134+ exprB' <- typeForGraphRefRelationalExpr exprB
1135+ lift $ except $ join exprA' exprB'
1136+typeForGraphRefRelationalExpr (Rename oldAttr newAttr expr) = do
1137+ expr' <- typeForGraphRefRelationalExpr expr
1138+ lift $ except $ rename oldAttr newAttr expr'
1139+typeForGraphRefRelationalExpr (Difference exprA exprB) = do
1140+ exprA' <- typeForGraphRefRelationalExpr exprA
1141+ exprB' <- typeForGraphRefRelationalExpr exprB
1142+ lift $ except $ difference exprA' exprB'
1143+typeForGraphRefRelationalExpr (Group groupNames attrName expr) = do
1144+ expr' <- typeForGraphRefRelationalExpr expr
1145+ groupNames' <- evalGraphRefAttributeNames groupNames expr
1146+ lift $ except $ group groupNames' attrName expr'
1147+typeForGraphRefRelationalExpr (Ungroup groupAttrName expr) = do
1148+ expr' <- typeForGraphRefRelationalExpr expr
1149+ lift $ except $ ungroup groupAttrName expr'
1150+typeForGraphRefRelationalExpr (Restrict pred' expr) = do
1151+ expr' <- typeForGraphRefRelationalExpr expr
1152+ filt <- predicateRestrictionFilter (attributes expr') pred'
1153+ lift $ except $ restrict filt expr'
1154+typeForGraphRefRelationalExpr Equals{} =
1155+ pure relationFalse
1156+typeForGraphRefRelationalExpr NotEquals{} =
1157+ pure relationFalse
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
1167+ Nothing -> pure ()
1168+ mapM_ (checkMacroName . fst) withs
1169+ typeForGraphRefRelationalExpr expr'
1170+
1171+evalGraphRefAttributeNames :: GraphRefAttributeNames -> GraphRefRelationalExpr -> GraphRefRelationalExprM (S.Set AttributeName)
12051172evalGraphRefAttributeNames attrNames expr = do
1206− eExprType <- typeForGraphRefRelationalExpr expr
1207− case eExprType of
1208− Left err -> pure (Left err)
1209− Right exprTyp -> do
1210− let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprTyp)))
1211− case attrNames of
1212− AttributeNames names ->
1213− case A.projectionAttributesForNames names (attributes exprTyp) of
1214− Left err -> pure (Left err)
1215− Right attrs -> pure (Right (S.fromList (V.toList (A.attributeNames attrs))))
1173+ exprType' <- typeForGraphRefRelationalExpr expr
1174+ let typeNameSet = S.fromList (V.toList (A.attributeNames (attributes exprType')))
1175+ case attrNames of
1176+ AttributeNames names ->
1177+ case A.projectionAttributesForNames names (attributes exprType') of
1178+ Left err -> throwError err
1179+ Right attrs -> pure (S.fromList (V.toList (A.attributeNames attrs)))
12161180
1217− InvertedAttributeNames names -> do
1181+ InvertedAttributeNames names -> do
12181182 let nonExistentAttributeNames = A.attributeNamesNotContained names typeNameSet
12191183 if not (S.null nonExistentAttributeNames) then
1220− pure (Left (AttributeNamesMismatchError nonExistentAttributeNames))
1184+ throwError $ AttributeNamesMismatchError nonExistentAttributeNames
12211185 else
1222− pure (pure (A.nonMatchingAttributeNameSet names typeNameSet))
1186+ pure (A.nonMatchingAttributeNameSet names typeNameSet)
12231187
1224− UnionAttributeNames namesA namesB -> do
1225− eNameSetA <- evalGraphRefAttributeNames namesA expr
1226− case eNameSetA of
1227− Left err -> pure (Left err)
1228− Right nameSetA -> do
1229− eNameSetB <- evalGraphRefAttributeNames namesB expr
1230− case eNameSetB of
1231− Left err -> pure (Left err)
1232− Right nameSetB ->
1233− pure (Right (S.union nameSetA nameSetB))
1188+ UnionAttributeNames namesA namesB -> do
1189+ nameSetA <- evalGraphRefAttributeNames namesA expr
1190+ nameSetB <- evalGraphRefAttributeNames namesB expr
1191+ pure (S.union nameSetA nameSetB)
12341192
1235− IntersectAttributeNames namesA namesB -> do
1236− eNameSetA <- evalGraphRefAttributeNames namesA expr
1237− case eNameSetA of
1238− Left err -> pure (Left err)
1239− Right nameSetA -> do
1240− eNameSetB <- evalGraphRefAttributeNames namesB expr
1241− case eNameSetB of
1242− Left err -> pure (Left err)
1243− Right nameSetB ->
1244− pure (Right (S.intersection nameSetA nameSetB))
1193+ IntersectAttributeNames namesA namesB -> do
1194+ nameSetA <- evalGraphRefAttributeNames namesA expr
1195+ nameSetB <- evalGraphRefAttributeNames namesB expr
1196+ pure (S.intersection nameSetA nameSetB)
12451197
1246− RelationalExprAttributeNames attrExpr -> do
1247− eAttrExprType <- typeForGraphRefRelationalExpr attrExpr
1248− case eAttrExprType of
1249− Left err -> pure (Left err)
1250− Right attrExprType -> pure (Right (A.attributeNameSet (attributes attrExprType)))
1251−
1252−
1253−
1198+ RelationalExprAttributeNames attrExpr -> do
1199+ attrExprType <- typeForGraphRefRelationalExpr attrExpr
1200+ pure (A.attributeNameSet (attributes attrExprType))
12541201
1255−processAtomExpr :: AtomExpr -> RelationalExprState GraphRefAtomExpr
1256−processAtomExpr (AttributeAtomExpr nam) = pure $ AttributeAtomExpr nam
1257−processAtomExpr (NakedAtomExpr atom) = pure $ NakedAtomExpr atom
1258−processAtomExpr (FunctionAtomExpr fName atomExprs ()) = do
1259− tid <- re_currentTransId <$> askEnv
1260− FunctionAtomExpr fName <$> mapM processAtomExpr atomExprs <*> pure tid
1261−processAtomExpr (RelationAtomExpr expr) = RelationAtomExpr <$> processRelationalExpr expr
1262−processAtomExpr (ConstructedAtomExpr dConsName atomExprs ()) = ConstructedAtomExpr dConsName <$> mapM processAtomExpr atomExprs <*> (re_currentTransId <$> askEnv)
1263−
1264−processTupleExpr :: TupleExpr -> RelationalExprState GraphRefTupleExpr
1265−processTupleExpr (TupleExpr tMap) =
1266− TupleExpr . M.fromList <$> mapM (\(k,v) -> (,) k <$> processAtomExpr v) (M.toList tMap)
1267−
1268−evalGraphRefAttributeExpr :: GraphRefAttributeExpr -> GraphRefRelationalExprR (Either RelationalError Attribute)
1202+evalGraphRefAttributeExpr :: GraphRefAttributeExpr -> GraphRefRelationalExprM Attribute
12691203evalGraphRefAttributeExpr (AttributeAndTypeNameExpr attrName tCons tid) = do
1270− graph <- R.ask
1271− case transactionForId tid graph of
1272− Left err -> pure (Left err)
1273− Right trans -> do
1274− let tConsMap = typeConstructorMapping (concreteDatabaseContext trans)
1275− case atomTypeForTypeConstructorValidate True tCons tConsMap M.empty of
1276− Left err -> pure (Left err)
1277− Right aType -> do
1278− case validateAtomType aType tConsMap of
1279− Left err -> pure (Left err)
1280− Right _ -> pure (Right (Attribute attrName aType))
1281−
1282−--convert AttributeExpr to GraphRefAttributeExpr
1283−processAttributeExpr :: AttributeExpr -> RelationalExprState GraphRefAttributeExpr
1284−processAttributeExpr (AttributeAndTypeNameExpr nam tCons ()) = do
1285− tid <- re_currentTransId <$> askEnv
1286− pure $ AttributeAndTypeNameExpr nam tCons tid
1287−processAttributeExpr (NakedAttributeExpr attr) = pure $ NakedAttributeExpr attr
1288−
1289−-- convert a RelationalExpr into a GraphRefRelationalExpr using the current trans Id
1290−-- can this be done without any RelationalErrors as opposed to evalRelationalExpr?
1291−processRelationalExpr :: RelationalExpr -> RelationalExprState GraphRefRelationalExpr
1292−processRelationalExpr (MakeRelationFromExprs mAttrs tupleExprs) = do
1293− mAttrs' <- case mAttrs of
1294− Nothing -> pure Nothing
1295− Just mAttrs'' -> Just <$> mapM processAttributeExpr mAttrs''
1296− MakeRelationFromExprs mAttrs' <$> mapM processTupleExpr tupleExprs
1297−processRelationalExpr (MakeStaticRelation attrs tupSet) = pure (MakeStaticRelation attrs tupSet)
1298−processRelationalExpr (ExistingRelation rel) = pure (ExistingRelation rel)
1299−processRelationalExpr (RelationVariable rv ()) = RelationVariable rv <$> fmap re_currentTransId askEnv
1300−processRelationalExpr (Project attrNames expr) = Project <$> processAttributeNames attrNames <*> processRelationalExpr expr
1301−processRelationalExpr (Union exprA exprB) = Union <$> processRelationalExpr exprA <*> processRelationalExpr exprB
1302−processRelationalExpr (Join exprA exprB) = Join <$> processRelationalExpr exprA <*> processRelationalExpr exprB
1303−processRelationalExpr (Rename attrA attrB expr) =
1304− Rename attrA attrB <$> processRelationalExpr expr
1305−processRelationalExpr (Difference exprA exprB) = Difference <$> processRelationalExpr exprA <*> processRelationalExpr exprB
1306−processRelationalExpr (Group attrNames attrName expr) = Group <$> processAttributeNames attrNames <*> pure attrName <*> processRelationalExpr expr
1307−processRelationalExpr (Ungroup attrName expr) = Ungroup attrName <$> processRelationalExpr expr
1308−processRelationalExpr (Restrict pred expr) = Restrict <$> processRestrictionPredicateExpr pred <*> processRelationalExpr expr
1309−processRelationalExpr (Equals exprA exprB) =
1310− Equals <$> processRelationalExpr exprA <*> processRelationalExpr exprB
1311−processRelationalExpr (NotEquals exprA exprB) =
1312− NotEquals <$> processRelationalExpr exprA <*> processRelationalExpr exprB
1313−processRelationalExpr (Extend extendExpr expr) =
1314− Extend <$> processExtendTupleExpr extendExpr <*> processRelationalExpr expr
1315−processRelationalExpr (With macros expr) =
1316− With <$> mapM (\(nam, wexpr) -> (,) nam <$> processRelationalExpr wexpr) macros <*> processRelationalExpr expr
1204+ tConsMap <- typeConstructorMapping <$> gfDatabaseContextForMarker tid
1205+ case atomTypeForTypeConstructorValidate True tCons tConsMap M.empty of
1206+ Left err -> throwError err
1207+ Right aType -> do
1208+ case validateAtomType aType tConsMap of
1209+ Left err -> throwError err
1210+ Right _ -> pure (Attribute attrName aType)
1211+evalGraphRefAttributeExpr (NakedAttributeExpr attr) = pure attr
13171212
13181213mkEmptyRelVars :: RelationVariables -> RelationVariables
1319−mkEmptyRelVars rvMap = M.map mkEmptyRelVar rvMap
1214+mkEmptyRelVars = M.map mkEmptyRelVar
13201215 where
1321− 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
13221217 mkEmptyRelVar (MakeStaticRelation attrs _) = MakeStaticRelation attrs emptyTupleSet
13231218 mkEmptyRelVar (ExistingRelation rel) = ExistingRelation (emptyRelationWithAttrs (attributes rel))
13241219 mkEmptyRelVar rv@RelationVariable{} = Restrict (NotPredicate TruePredicate) rv
@@ -1329,71 +1224,169 @@ mkEmptyRelVars rvMap = M.map mkEmptyRelVar rvMap
13291224 mkEmptyRelVar (Difference exprA exprB) = Difference (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
13301225 mkEmptyRelVar (Group attrNames attrName expr) = Group attrNames attrName (mkEmptyRelVar expr)
13311226 mkEmptyRelVar (Ungroup attrName expr) = Ungroup attrName (mkEmptyRelVar expr)
1332− mkEmptyRelVar (Restrict pred expr) = Restrict pred (mkEmptyRelVar expr)
1227+ mkEmptyRelVar (Restrict pred' expr) = Restrict pred' (mkEmptyRelVar expr)
13331228 mkEmptyRelVar (Equals exprA exprB) = Equals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
13341229 mkEmptyRelVar (NotEquals exprA exprB) = NotEquals (mkEmptyRelVar exprA) (mkEmptyRelVar exprB)
13351230 mkEmptyRelVar (Extend extTuple expr) = Extend extTuple (mkEmptyRelVar expr)
1336− 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)
13371232
1338−processAttributeNames :: AttributeNames -> RelationalExprState GraphRefAttributeNames
1339−processAttributeNames (AttributeNames nameSet) = pure $ AttributeNames nameSet
1340−processAttributeNames (UnionAttributeNames attrNamesA attrNamesB) = UnionAttributeNames <$> processAttributeNames attrNamesA <*> processAttributeNames attrNamesB
1341−processAttributeNames (IntersectAttributeNames attrNamesA attrNamesB) = IntersectAttributeNames <$> processAttributeNames attrNamesA <*> processAttributeNames attrNamesB
1342−processAttributeNames (RelationalExprAttributeNames expr) = RelationalExprAttributeNames <$> processRelationalExpr expr
1343−
1344−processDatabaseContextExpr :: DatabaseContextExpr -> RelationalExprState GraphRefDatabaseContextExpr
1345−processDatabaseContextExpr expr =
1346− case expr of
1347− NoOperation -> pure NoOperation
1348− Define nam attrExprs -> Define nam <$> mapM processAttributeExpr attrExprs
1349− Undefine nam -> pure (Undefine nam)
1350− Assign nam rexpr -> Assign nam <$> processRelationalExpr rexpr
1351− Insert nam rexpr -> Insert nam <$> processRelationalExpr rexpr
1352− Delete nam pred -> Delete nam <$> processRestrictionPredicateExpr pred
1353− Update nam attrMap pred -> Update nam attrMap <$> processRestrictionPredicateExpr pred
1354−
1355− AddInclusionDependency nam dep -> pure (AddInclusionDependency nam dep)
1356− RemoveInclusionDependency nam -> pure (RemoveInclusionDependency nam)
1357− AddNotification nam exprA exprB exprC -> pure (AddNotification nam exprA exprB exprC)
1358− RemoveNotification nam -> pure (RemoveNotification nam)
1359− AddTypeConstructor tyDef consDefs -> pure (AddTypeConstructor tyDef consDefs)
1360− RemoveTypeConstructor tyName -> pure (RemoveTypeConstructor tyName)
1361−
1362− RemoveAtomFunction aFuncName -> pure (RemoveAtomFunction aFuncName)
1363− RemoveDatabaseContextFunction funcName -> pure (RemoveDatabaseContextFunction funcName)
1364− ExecuteDatabaseContextFunction funcName atomExprs -> ExecuteDatabaseContextFunction funcName <$> mapM processAtomExpr atomExprs
1365− MultipleExpr exprs -> MultipleExpr <$> mapM processDatabaseContextExpr exprs
13661233
13671234dbErr :: RelationalError -> DatabaseContextEvalMonad ()
13681235dbErr err = lift (except (Left err))
13691236
1370−processDatabaseContextIOExpr :: DatabaseContextIOExpr -> RelationalExprState GraphRefDatabaseContextIOExpr
1371−processDatabaseContextIOExpr (AddAtomFunction f tcs sc) =
1372− pure (AddAtomFunction f tcs sc)
1373−processDatabaseContextIOExpr (LoadAtomFunctions mod fun file) =
1374− pure (LoadAtomFunctions mod fun file)
1375−processDatabaseContextIOExpr (AddDatabaseContextFunction mod fun path) =
1376− pure (AddDatabaseContextFunction mod fun path)
1377−processDatabaseContextIOExpr (LoadDatabaseContextFunctions mod fun path) =
1378− pure (LoadDatabaseContextFunctions mod fun path)
1379−processDatabaseContextIOExpr (CreateArbitraryRelation rvName attrExprs range) =
1380− CreateArbitraryRelation rvName <$> mapM processAttributeExpr attrExprs <*> pure range
1381−
13821237-- | Return a Relation describing the relation variables.
1383−relationVariablesAsRelation :: RelationVariables -> TransactionGraph -> Either RelationalError Relation
1384−relationVariablesAsRelation relVarMap graph = do
1238+relationVariablesAsRelation :: DatabaseContext -> TransactionGraph -> Either RelationalError Relation
1239+relationVariablesAsRelation ctx graph = do
13851240 let subrelAttrs = A.attributesFromList [Attribute "attribute" TextAtomType, Attribute "type" TextAtomType]
13861241 attrs = A.attributesFromList [Attribute "name" TextAtomType,
13871242 Attribute "attributes" (RelationAtomType subrelAttrs)]
1243+ relVars = relationVariables ctx
13881244 mkRvDesc (rvName, gfExpr) = do
1389− gfType <- runReader (typeForGraphRefRelationalExpr gfExpr) graph
1245+ let gfEnv = freshGraphRefRelationalExprEnv (Just ctx) graph
1246+ gfType <- runGraphRefRelationalExprM gfEnv (typeForGraphRefRelationalExpr gfExpr)
13901247 pure (rvName, gfType)
1391− relVarToAtomList (rvName, rel) = [TextAtom rvName, attributesToRel (attributes rel)]
1248+ relVarToAtomList (rvName, rel) = [TextAtom rvName, attributesToRel (attributesVec (attributes rel))]
13921249 attrAtoms a = [TextAtom (A.attributeName a), TextAtom (prettyAtomType (A.atomType a))]
13931250 attributesToRel attrl = case mkRelationFromList subrelAttrs (map attrAtoms (V.toList attrl)) of
13941251 Left err -> error ("relationVariablesAsRelation pooped " ++ show err)
13951252 Right rel -> RelationAtom rel
1396− rvs <- mapM mkRvDesc (M.toList relVarMap)
1253+ rvs <- mapM mkRvDesc (M.toList relVars)
13971254 let tups = map relVarToAtomList rvs
13981255 mkRelationFromList attrs tups
13991256
1257+-- | An unoptimized variant of evalGraphRefRelationalExpr for testing.
1258+evalRelationalExpr :: RelationalExpr -> RelationalExprM Relation
1259+evalRelationalExpr expr = do
1260+ graph <- reGraph
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
1267+
1268+class (MonadError RelationalError m, Monad m) => DatabaseContextM m where
1269+ getContext :: m DatabaseContext
1270+
1271+instance DatabaseContextM (ReaderT GraphRefRelationalExprEnv (ExceptT RelationalError Identity)) where
1272+ getContext = gfDatabaseContextForMarker UncommittedContextMarker
1273+
1274+instance DatabaseContextM (RWST DatabaseContextEvalEnv () DatabaseContextEvalState (ExceptT RelationalError Identity)) where
1275+ getContext = getStateContext
1276+
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
1283+
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
1287+
1288+-- s := s union t
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
1312+
1313+instance ResolveGraphRefTransactionMarker GraphRefTupleExprs where
1314+ resolve (TupleExprs marker tupleExprs) =
1315+ TupleExprs marker <$> mapM resolve tupleExprs
1316+
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'))
1321+
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
1328+
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
1337+
1338+instance ResolveGraphRefTransactionMarker GraphRefExtendTupleExpr where
1339+ resolve (AttributeExtendTupleExpr nam atomExpr) = AttributeExtendTupleExpr nam <$> resolve atomExpr
1340+
1341+instance ResolveGraphRefTransactionMarker GraphRefWithNameExpr where
1342+ resolve orig@WithNameExpr{} = pure orig -- match uncommitted marker?
1343+
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
1352+
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')
1356+
1357+--MakeRelationFromExprs Nothing (TupleExprs UncommittedContextMarker [TupleExpr (fromList [("name", NakedAtomExpr (TextAtom "steve"))])])
1358+
1359+applyUnionCollapse :: GraphRefRelationalExpr -> GraphRefRelationalExpr
1360+applyUnionCollapse = Fold.cata opt
1361+ where
1362+ opt :: RelationalExprBaseF GraphRefTransactionMarker GraphRefRelationalExpr -> GraphRefRelationalExpr
1363+ opt (UnionF exprA exprB) | exprA == exprB = exprA
1364+ opt (UnionF
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
1372+
1373+
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)
1376+-- =>
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)
1379+
1380+--strategy: try to collapse the top-level update (union (restrict pred MakeRelationFromExpr) expr) if it contains the same predicate and resultant relation
1381+
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) =
1387+ case expr of
1388+ orig'@(Restrict npred'@(NotPredicate _) _) | npred == npred' -> orig'
1389+ _ -> orig
1390+applyRestrictionCollapse expr = expr
1391+
1392+