Mock exec plan 2 by tirumaraiselvan · Pull Request #71 · tirumaraiselvan/graphql-engine

tirumaraiselvan · 2019-10-09T13:34:58Z

mock exec plan 2

tirumaraiselvan · 2019-10-11T09:09:03Z

server/src-lib/Hasura/GraphQL/Execute.hs

+  => G.OperationType
+  -> Seq.Seq VQ.Field
+  -> m GQLReqParsed
+fieldsToRequest = undefined


Fill from RemoteJoins. Make sure variables are "unresolved". Discuss.

tirumaraiselvan · 2019-10-11T09:09:43Z

server/src-lib/Hasura/GraphQL/Transport/HTTP.hs

+  -- pure $ mergeResponses fieldResps
+  pure $ head (toList fieldResps)
+  where
+    mergeResponses = undefined


fill from RemoteJoins

tirumaraiselvan · 2019-10-11T09:10:55Z

server/src-lib/Hasura/GraphQL/Execute.hs

+        EP.RPQuery queryPlan -> do
+          (tx, genSql) <- EQ.queryOpFromPlan usrVars queryVars queryPlan
+          let queryOp = ExOpQuery tx (Just genSql)
+          pure $ pure $ GQFieldResolvedHasura queryOp


think about caching here

tirumaraiselvan · 2019-10-11T09:11:03Z

server/src-lib/Hasura/GraphQL/Execute.hs

+            GQFieldPartialHasura (gCtx, field) -> do
+              (queryTx, plan, genSql) <-
+                getQueryOp gCtx sqlGenCtx userInfo (Seq.singleton field)
+              traverse_ (addPlanToCache . EP.RPQuery) plan


think about caching here

tirumaraiselvan · 2019-10-11T09:11:42Z

server/src-lib/Hasura/GraphQL/Execute.hs

+          forM fieldPlans $ \case
+            GQFieldPartialHasura (gCtx, field) -> do
+              (lqOp, plan) <- getSubsOp pgExecCtx gCtx sqlGenCtx userInfo field
+              traverse_ (addPlanToCache . EP.RPSubs) plan


think about caching here

tirumaraiselvan · 2019-10-11T09:24:37Z

server/src-lib/Hasura/GraphQL/Execute.hs

           }

-  liftIO $ logGraphqlQuery logger $ QueryLog q Nothing reqId
+  -- liftIO $ logGraphqlQuery logger $ QueryLog q Nothing reqId


move logging out of here to the call-site of execRemoteGQ?

tirumaraiselvan · 2019-10-11T09:24:58Z

server/src-lib/Hasura/GraphQL/Transport/HTTP.hs

  E.ExecutionCtx _ sqlGenCtx pgExecCtx planCache sc scVer _ enableAL <- ask
-  execPlan <- E.getResolvedExecPlan pgExecCtx planCache
+  fieldPlans <- E.getResolvedExecPlan pgExecCtx planCache
              userInfo sqlGenCtx enableAL sc scVer req


log everything here?

but what about logging in runHasuraGQ : https://github.com/tirumaraiselvan/graphql-engine/pull/71/files#diff-ee138319d8341444234c6af198a5ea0bR57?

Maybe log the request here and its "sql map" inside runHasuraGQ?

Or we can log at the "begin" and log at the "end"

tirumaraiselvan · 2019-10-11T09:34:09Z

server/src-lib/Hasura/GraphQL/Execute.hs

+          (mapM generateFieldPlan selSet)
+        VQ.RSubscription field ->
+          (GQExecPlanPartial G.OperationTypeMutation) <$>
+          (mapM generateFieldPlan (Seq.singleton field))


Don't like this sequencing of a singleton but dunno what to do without complicating types.

tirumaraiselvan · 2019-10-11T09:42:41Z

server/src-lib/Hasura/GraphQL/Execute.hs

-  enableAL sc scVer reqUnparsed = do
-  planM <- liftIO $ EP.getPlan scVer (userRole userInfo)
-           opNameM queryStr planCache
+  -> m (Seq.Seq GQFieldResolvedPlan)


In RJ, this will change to GQFieldResolvedPlan -> QExecPlan (https://github.com/hasura/graphql-engine/blob/821c1c3525e36f462bedee96908646e43225c442/server/src-lib/Hasura/GraphQL/Execute.hs#L180)

where QExecPlan is type QExecPlan = ([QExecPlanUnresolved], GQFieldResolvedPlan) (https://github.com/hasura/graphql-engine/blob/821c1c3525e36f462bedee96908646e43225c442/server/src-lib/Hasura/GraphQL/Execute.hs#L95)

Might be a good idea to rename QExecPlan -> GQFieldPlan and QExecPlanUnresolved -> GQRemoteRelUnresolvedPlan

tirumaraiselvan · 2019-10-11T09:44:52Z

server/src-lib/Hasura/GraphQL/Execute.hs

+      case opType of
+        G.OperationTypeQuery ->
+          forM fieldPlans $ \case
+            GQFieldPartialHasura (gCtx, field) -> do


Introduce remoteRel plans from RJ here: https://github.com/hasura/graphql-engine/blob/821c1c3525e36f462bedee96908646e43225c442/server/src-lib/Hasura/GraphQL/Execute.hs#L214

tirumaraiselvan · 2019-10-11T10:06:50Z

server/src-lib/Hasura/GraphQL/Explain.hs

-    GV.RQuery selSet ->
-      runInTx $ encJFromJValue <$> traverse (explainField userInfo gCtx sqlGenCtx) (toList selSet)
-    GV.RMutation _ ->
+  E.GQExecPlanPartial opType fieldPlans <-


I don't think Explain is that ugly anymore because of the new GQExecPlanPartial structure!

tirumaraiselvan · 2019-10-11T19:07:00Z

server/src-lib/Hasura/GraphQL/Execute.hs

+            GQFieldPartialHasura (gCtx, field) -> do
+              (queryTx, plan, genSql) <-
+                getQueryOp gCtx sqlGenCtx userInfo (Seq.singleton field)
+              -- traverse_ (addPlanToCache . EP.RPQuery) plan


how to cache?

tirumaraiselvan · 2019-10-11T19:07:07Z

server/src-lib/Hasura/GraphQL/Execute.hs

+          forM fieldPlans $ \case
+            GQFieldPartialHasura (gCtx, field) -> do
+              (lqOp, plan) <- getSubsOp pgExecCtx gCtx sqlGenCtx userInfo field
+              -- traverse_ (addPlanToCache . EP.RPSubs) plan


how to cache? Might not be a problem here because subscriptions are always single field.

* ci: add hlint escape hatch Co-authored-by: Antoine Leblanc <antoine@hasura.io> GITHUB_PR_NUMBER: 6164 GITHUB_PR_URL: hasura#6164 * Applied changes to new workflow files. * Add missing label trigger for lint worklow Co-authored-by: Antoine Leblanc <antoine@hasura.io> GitOrigin-RevId: 3e22c30

tirumaraiselvan added 2 commits October 9, 2019 12:40

mock exec plans

e99dc0f

list of plans

b1cfe40

tirumaraiselvan force-pushed the mock-exec-plan-2 branch from bbd5402 to b1cfe40 Compare October 9, 2019 14:05

tirumaraiselvan commented Oct 11, 2019

View reviewed changes

wip

3f3d327

tirumaraiselvan force-pushed the mock-exec-plan-2 branch from e9fffe1 to 3f3d327 Compare October 11, 2019 10:05

tirumaraiselvan commented Oct 11, 2019

View reviewed changes

tirumaraiselvan added 3 commits October 11, 2019 17:01

proper merge of responses

8b0867c

changes for websocket protocol

31d9a0e

fix bugs

4a83823

tirumaraiselvan commented Oct 11, 2019

View reviewed changes

tirumaraiselvan added 2 commits October 12, 2019 16:30

wip handle remote schema execution

b746eb5

"unresolve" variables when converting from Field to GQLReq

40a9e4c

Comments

Conversation

tirumaraiselvan commented Oct 9, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tirumaraiselvan Oct 11, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tirumaraiselvan Oct 11, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tirumaraiselvan Oct 11, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tirumaraiselvan Oct 11, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tirumaraiselvan Oct 11, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

tirumaraiselvan Oct 11, 2019 •

edited

Loading

tirumaraiselvan Oct 11, 2019 •

edited

Loading

tirumaraiselvan Oct 11, 2019 •

edited

Loading

tirumaraiselvan Oct 11, 2019 •

edited

Loading

tirumaraiselvan Oct 11, 2019 •

edited

Loading