WIP on constraintSetGroups #99
Conversation
tpolecat
force-pushed
the
constraintSetGroups
branch
from
8120f0c
to
3fda825
Compare
tpolecat
force-pushed
the
constraintSetGroups
branch
from
3fda825
to
831e788
Compare
| @@ -23,6 +23,7 @@ val postgresVersion = "42.5.1" | |||
| val skunkVersion = "0.3.2" | |||
| val lucumaSsoVersion = "0.4.4" | |||
| val testcontainersScalaVersion = "0.40.12" | |||
| val paigesVersion = "0.4.2" | |||
There was a problem hiding this comment.
This is for the GraphQL query pretty-printer, which we should upstream to Grackle once we're sure we like it. I added code to the main mapping to print the query out on each request.
| @@ -0,0 +1,3 @@ | |||
| -- https://stackoverflow.com/questions/54372666/create-an-immutable-clone-of-concat-ws/54384767#54384767 | |||
| CREATE OR REPLACE FUNCTION immutable_concat_ws(text, VARIADIC text[]) | |||
| RETURNS text AS 'text_concat_ws' LANGUAGE internal IMMUTABLE PARALLEL SAFE; | |||
There was a problem hiding this comment.
I'm using a generated column below, which is defined as a pure expression based on other fields in the row. I need to use the text_concat_ws function but it's not declared immutable for some reason . This basically just redeclares it with the right modifier.
| coalesce(c_hour_angle_max::text, 'null') | ||
| ) | ||
| ) stored, | ||
|
|
There was a problem hiding this comment.
To group observations by conditions I concatenate all the relevant fields together and use that as the key. I need to do this so the constraint set group has a key in the obs table that it can join with.
| @@ -4699,6 +4695,9 @@ type Query { | |||
|
|
|||
| # Selects the first `LIMIT` matching observations based on the provided `WHERE` parameter, if any. | |||
| observations( | |||
|
|
|||
| programId: ProgramId | |||
There was a problem hiding this comment.
At some point we decided that top-level queries for observations needed to specify the program id. I think we should get rid of these anyway and make the user traverse down to the program.
| @@ -5500,8 +5499,6 @@ type TargetEnvironmentGroupSelectResult { | |||
| } | |||
|
|
|||
| type TargetGroup { | |||
| # IDs of observations that use the same constraints | |||
| observationIds: [ObservationId!]! | |||
There was a problem hiding this comment.
This wasn't being used in the client and it's redundant with observations/matches/id so I removed it (same with other group types).
| @@ -52,6 +54,9 @@ object GraphQLRoutes { | |||
| { | |||
| for { | |||
| user <- OptionT(client.get(a)) | |||
| // If the user has never hit the ODB using http then there will be no user | |||
| // entry in the database. So go ahead and [re]canonicalize here to be sure. | |||
| _ <- OptionT.liftF(userSvc.canonicalizeUser(user)) | |||
There was a problem hiding this comment.
I ran into this issue when we tested with Explore, which never hits the server via plain HTTP and thus never went through the normal user-canonicalizing code.
| // Override `fetch` to log the query. This is optional. | ||
| // Override `defaultRootCursor` to log the GraphQL query. This is optional. | ||
| override def defaultRootCursor(query: Query, tpe: Type, env: Env): F[Result[(Query, Cursor)]] = | ||
| Logger[F].info("\n\n" + PrettyPrinter.query(query).render(100) + "\n") *> super.defaultRootCursor(query, tpe, env) |
There was a problem hiding this comment.
As with the override of fetch below this just prints stuff out and you can comment it out if it bothers you.
| import org.typelevel.paiges.Doc.text | ||
|
|
||
| /** Paiges combinators for Grackle queries. */ | ||
| object PrettyPrinter { |
There was a problem hiding this comment.
This has turned out to be helpful for debugging. We can upstream it once we're happy with it.
|
Ok this is ready for review, at long last. |
| import org.typelevel.paiges.Doc.text | ||
|
|
||
| /** Paiges combinators for Grackle queries. */ | ||
| object PrettyPrinter { |
This adds
Query/constraintSetGroupand a pretty-printer for queries.