Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add means to fetch schema #2006

Merged
merged 7 commits into from
Oct 27, 2023

Conversation

AndrewSisley
Copy link
Contributor

@AndrewSisley AndrewSisley commented Oct 26, 2023

Relevant issue(s)

Resolves #1993

Description

Adds means to fetch schema.

Adds a bunch of funcs to the clients to allow fetching of schema(versions) defined in the system. When the set-default stuff got merged, users were no longer guaranteed (at least on init) to be able to view the schema ids they have created, this change allows them to view them when ever they like.

How has this been tested?

Todo:

  • Manually test the playground with open api stuff

@AndrewSisley AndrewSisley added feature New feature or request area/schema Related to the schema system action/no-benchmark Skips the action that runs the benchmark. labels Oct 26, 2023
@AndrewSisley AndrewSisley added this to the DefraDB v0.8 milestone Oct 26, 2023
@AndrewSisley AndrewSisley requested a review from a team October 26, 2023 19:54
@AndrewSisley AndrewSisley self-assigned this Oct 26, 2023
@AndrewSisley AndrewSisley force-pushed the 1993-get-schemas branch 2 times, most recently from 7a3f94c to 6defbb4 Compare October 26, 2023 21:15
Also adds a bunch of infrastructure that will be also used by GetSchema funcs in the next few commits.
@codecov
Copy link

codecov bot commented Oct 26, 2023

Codecov Report

Attention: 84 lines in your changes are missing coverage. Please review.

Comparison is base (d49c860) 74.08% compared to head (efdf13b) 73.96%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #2006      +/-   ##
===========================================
- Coverage    74.08%   73.96%   -0.12%     
===========================================
  Files          247      248       +1     
  Lines        24548    24822     +274     
===========================================
+ Hits         18184    18358     +174     
- Misses        5133     5207      +74     
- Partials      1231     1257      +26     
Flag Coverage Δ
all-tests 73.96% <69.34%> (-0.12%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
cli/cli.go 100.00% <100.00%> (ø)
db/schema.go 84.93% <100.00%> (+0.57%) ⬆️
http/openapi.go 97.14% <ø> (ø)
cli/schema_describe.go 83.93% <83.93%> (ø)
http/handler_store.go 77.90% <82.61%> (+0.84%) ⬆️
db/txn_db.go 51.12% <50.00%> (-0.25%) ⬇️
http/client.go 44.24% <58.82%> (+2.76%) ⬆️
db/description/schema.go 57.14% <55.10%> (-0.84%) ⬇️

... and 9 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d49c860...efdf13b. Read the comment docs.

Copy link
Member

@nasdf nasdf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! One minor fix in the CLI implementation.

schemas = s
}

if len(schemas) == 1 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will cause an issue since the output is expected to be an array in some of the cases.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay, I'll change it. Would you prefer an array all the time, even when version is provided, or should that still return a single item?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think following the API would be best. So returning a single one for version and array for others.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Change array logic

client/db.go Outdated

// GetAllSchema returns all schema versions that currently exist within
// this [Store].
GetAllSchema(context.Context) ([]SchemaDescription, error)
Copy link
Member

@nasdf nasdf Oct 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are great additions to the API! It really helps clarify the distinctions between schemas and collections.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey @nasdf I just wanted to point out that we try to stick to the conventional commenting style https://conventionalcomments.org/

schemaDescribe.AddParameter(schemaSchemaRootQueryParam)
schemaDescribe.AddParameter(schemaVersionIDQueryParam)
schemaDescribe.AddResponse(200, schemaResponse)
schemaDescribe.Responses["400"] = errorResponse
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for keeping these in sync!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making it simple enough to do so :)

Short: "View schema description.",
Long: `Introspect schema types.

Example: view all schema
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: "schemas" or "schema descriptions"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a typo, but, after googling, I am incorrect anyway and this needs changing (possibly in a few places) - I actually thought schema was both plural and singular, like sheep and sheep 😅

  • Schema is not plural

client/db.go Outdated

// GetAllSchema returns all schema versions that currently exist within
// this [Store].
GetAllSchema(context.Context) ([]SchemaDescription, error)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: rename to GetAllSchemas or GetAllSchemaVersions

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cheers, will change.

  • Rename to GetAllSchemas

txn datastore.Txn,
) ([]client.SchemaDescription, error) {
prefix := core.NewSchemaVersionKey("")
q, err := txn.Systemstore().Query(ctx, query.Query{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: I think you should use datastore.DeserializePrefix[client.SchemaDescription] for this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only recently noticed that in one of your PRs and then forgot about it, will have a look, but there is a chance I'll want to leave it as is, as I might feel that calling that function hides too much (as the purpose of this file is to show all that stuff in one place).

  • Checkout datastore.DeserializePrefix

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be just one click away from visibility though so I'm not sure the duplication would be worth it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not just about that, but extracting this function to another shared function creates an oddity in this file, which itself hinders readability in some cases.

Worse though is that it inhibits change, if this func needs to change slightly (for whatever reason), it is currently very easy to do so - you just change it, however if it is calling datastore.DeserializePrefix, then either you have to risk serious damage by changing that function, or overcome a physcological barrier and un-refactor it and then make the change - that physcological barrier can be non-trivial in some cases and is frequent cause of large bloated shared functions.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a look, and I'm still more comfy with the independent implementations. Will be leaving as is.

}

func (w *Wrapper) GetAllSchema(ctx context.Context) ([]client.SchemaDescription, error) {
args := []string{"client", "schema", "describe"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: 3 of these methods have almost identical bodies. They differ only by args.

It will look cleaner if you extract the common code and pass only args there

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure that will be cleaner, as these are very simple functions that have no reason to be coupled via a private function, atm it is quite easy to see what they do, and a private func may damage that. I'll have a quick look though.

  • Consider private func

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a look, and I prefer the current setup. Leaving as is.

Copy link
Contributor

@islamaliev islamaliev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall looks good. I just have few suggestions

}
schemas = s

case name != "":
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: It would be good to add a check after the switch to check if name and versionID were given that they are actually related like you did with collections.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I was in two minds if this should behave like the collection stuff, this is different though, as they are not going to be acting on the collection (saving docs and the like). I'll revisit today and see what happens.

- [ ] Revisit multi param schema describe stuff

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even if not acting on it, it would be weird to return a set of results event if the provided params make no sense.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to close this thread as it should match whatever we decide in #2006 (comment)

schemas = []client.SchemaDescription{schema}

case root != "":
s, err := store.GetSchemaByRoot(cmd.Context(), root)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: Why not assign directly to schemas when a slice is returned?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compilation rules as err is not yet defined, the alternative would be to declare err outside the switch.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

err outside the switch would be quite fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😆 Both are quite fine and imperfect IMO. Declaring err in the broader scope has the drawback of needlessly pulling a local variable with a short lifetime into a broader scope with a longer lifetime.

Are you asking me to change this?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. The assignment makes no difference in the number of allocation since a slice is passed by reference. I just wanted to know what was your reasoning behind it. Now I know :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The assignment makes no difference in the number of allocation since a slice is passed by reference

I wasn't talking in terms of performance, a local, short lived variable has a lower readability cost than a broadly scoped long lived one. Especially in cases when there is no real reason for the increased scope/lifetime where authors may be left wondering if there is a reason that it has such a large scope/lifetime.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know :)

But if there was a significant cost to the allocation, optimizing it would win over narrowing a variable scope. Imagine thousands of schema descriptions being allocated twice. I just mentioned it here to say that it wasn't something to consider and that your reasoning was good 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah got it :) Thanks for the explanation (and discussion) :)

func (s *storeHandler) GetSchema(rw http.ResponseWriter, req *http.Request) {
store := req.Context().Value(storeContextKey).(client.Store)

switch {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: This switch should follow the same order as the one in the cli. Although we are constructing the request in the client to match exactly one of these cases, there is nothing preventing someone from manually writing a request with multiple parameters.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The client interface does not support that, so this does not support that. Which means the [schema] CLI should not support that. Which means I was wrong to ask Keenan to make the collection describe CLI stuff to support that.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means that in both cases (CLI and HTTP for both schema and collection) we should make the params mutually exclusive.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I think so :( Unless we change the client interface to handle this:

schemas, err := db.GetSchemas(Filter{
    Name: "Users",
    Root: "baenfgddhdhshdsdh",
    VersionID: "baeghdhsdgsgsg",
})

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although, I'd see changing the collection stuff as out of scope here, and with the code freeze coming up a rework could me that users end up getting nothing for 8 more weeks.

I think I'm in favour of leaving both Schema and Collection funcs as is in this PR, and then changing them both together in another ticket.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Option[Filter] is overkill and would be annoying more than anything. I would say it's overkill for all of this but I mind it less for the fields than for the function parameter.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Option[Filter] is overkill and would be annoying more than anything. I would say it's overkill for all of this but I mind it less for the fields than for the function parameter.

Could have:

interface {
  GetSchemas(...Filter)
}

Maybe, but assuming you were happy enough with doing this in another ticket it is not important to design it here.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally ok with doing this in a different ticket. In the mean time do you mind just ordering the switch statement the same as the CLI so that they behave the same way?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ordering the switch statement the same as the CLI

Yes of course, sorry I forgot about that.

  • Change switch statement
  • Open ticket for Filter stuff

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Collaborator

@fredcarle fredcarle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Copy link
Member

@nasdf nasdf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks all good to me!

Copy link
Contributor

@islamaliev islamaliev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@AndrewSisley AndrewSisley merged commit 4427a16 into sourcenetwork:develop Oct 27, 2023
29 checks passed
@AndrewSisley AndrewSisley deleted the 1993-get-schemas branch October 27, 2023 19:08
shahzadlone pushed a commit to shahzadlone/defradb that referenced this pull request Feb 23, 2024
## Relevant issue(s)

Resolves sourcenetwork#1993

## Description

Adds means to fetch schema.

Adds a bunch of funcs to the clients to allow fetching of
schema(versions) defined in the system. When the set-default stuff got
merged, users were no longer guaranteed (at least on init) to be able to
view the schema ids they have created, this change allows them to view
them when ever they like.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
action/no-benchmark Skips the action that runs the benchmark. area/schema Related to the schema system feature New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

No way to fetch defined schema versions
4 participants