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: Generate insert and select methods for context object under db #177

Merged
merged 5 commits into from
Aug 22, 2023

Conversation

darunrs
Copy link
Collaborator

@darunrs darunrs commented Aug 14, 2023

Generates table names from schema. Using the list of table names, it generates an insert and select method for each one. Methods are exposed through 'context.db'. Verified working through local testing against databases in docker image as well as frontend tested using debug mode.

@darunrs darunrs requested a review from a team as a code owner August 14, 2023 19:00
Copy link
Contributor

@roshaans roshaans left a comment

Choose a reason for hiding this comment

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

I have not yet gotten a chance to test these changes on an indexer yet. Will report back on this tomorrow.

runner/src/dml-handler/dml-handler.ts Show resolved Hide resolved
indexer-js-queue-handler/hasura-client.js Outdated Show resolved Hide resolved
frontend/src/utils/indexerRunner.js Show resolved Hide resolved
frontend/src/utils/indexerRunner.js Outdated Show resolved Hide resolved
frontend/src/utils/indexerRunner.js Show resolved Hide resolved
runner/src/dml-handler/dml-handler.ts Outdated Show resolved Hide resolved
Copy link
Collaborator

@morgsmccauley morgsmccauley left a comment

Choose a reason for hiding this comment

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

Good job on this. I've left a few comments, happy to help you work through any of them :)

runner/src/dml-handler/dml-handler.ts Outdated Show resolved Hide resolved
runner/src/indexer/indexer.ts Outdated Show resolved Hide resolved
runner/src/indexer/indexer.ts Outdated Show resolved Hide resolved
runner/src/indexer/indexer.ts Outdated Show resolved Hide resolved
runner/src/indexer/indexer.ts Show resolved Hide resolved
runner/src/dml-handler/dml-handler.ts Outdated Show resolved Hide resolved
runner/src/dml-handler/dml-handler.ts Outdated Show resolved Hide resolved
runner/src/dml-handler/dml-handler.ts Outdated Show resolved Hide resolved
runner/src/indexer/indexer.test.ts Outdated Show resolved Hide resolved
runner/src/indexer/indexer.test.ts Show resolved Hide resolved
morgsmccauley

This comment was marked as duplicate.

try {
const result = tables.reduce((prev, tableName) => ({
...prev,
[`insert_${tableName}`]: async (objects) => await this.insert(blockHeight, schemaName, tableName, objects),
Copy link
Collaborator

Choose a reason for hiding this comment

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

naming: do we want camelCase for everything or it's fine to have underscores here?

Copy link
Collaborator Author

@darunrs darunrs Aug 15, 2023

Choose a reason for hiding this comment

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

My idea was that since it's feasible for a developer to name their database something like test_9_table_4 or post_likes, I'd prefer to keep it as underscored simply to visually distinguish the modifier (insert/delete/select) while keeping the table names themselves consistent with how they're defined. It's not clear how we'd want to camelCase it otherwise. Would we want to remove underscores, uppercase the next letter after each one, and combine them (e.g. post_likes_and_comments -> PostLikesAndComments? Retain the underscores (e.g. insert_Post_likes_and_comments)? This is really more of a UX choice, but I'd say underscore and just the table name as is, is my personal vote on that.

Copy link
Collaborator

@morgsmccauley morgsmccauley left a comment

Choose a reason for hiding this comment

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

Making some good progress here, left a few more comments, mostly around code placement :)


constructor (
connectionParams: ConnectionParams,
hasuraClient: HasuraClient = new HasuraClient(),
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 the correct abstraction here is to have DmlHandler take HasuraClient. HasuraClient also depends on PgClient, so now we actually have a circular dependency between the two.

Rather than having PgClient default to admin and then change as needed, we would instantiate new pg clients for each user. I think the same would be said for DmlHandler, we'd keep the API simple, and allow ourselves to configure it as needed. Perhaps we should structure it so:

  1. DmlHandler takes an account_id as input,
  2. DmlHandler uses HasuraClient to fetch the connection info
  3. DmlHandler instantiates a new PgClient with those connection params

It's a good idea to think about where code makes the most sense, and what level of abstraction is best. PgClient is quite low level, so would make more sense to have the configuration a level above.

Copy link
Collaborator Author

@darunrs darunrs Aug 18, 2023

Choose a reason for hiding this comment

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

Implemented! I've reduced pgclient back to its original form and moved it back out to the src folder. I updated hasura client to take the new function which returns connection parameters. I updated DmlHandler to take a dependency on hasura client and pgclient and refactored it to allow for unit testing. I implemented your suggestion of using class instances and using them to later initialize the class itself to allow for default initialization and mocking.

runner/src/pg-client/pg-client.ts Outdated Show resolved Hide resolved
runner/src/pg-client/pg-client.ts Outdated Show resolved Hide resolved
runner/src/indexer/indexer.ts Show resolved Hide resolved
runner/src/indexer/indexer.test.ts Outdated Show resolved Hide resolved
@@ -41,6 +44,7 @@ export default class Indexer {
fetch,
s3: new AWS.S3(),
provisioner: new Provisioner(),
dmlHandler: new DmlHandler(),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Following on about my comment around the right level of abstraction:

Because DmlHandler is ultimately user specific, it would make more sense to configure this at runtime. It should still be injected, so that we can mock it during testing, but we should create/configure it differently per indexer prior to executing it, i.e. in buildContext

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Took your suggestions to have a class instance as a dependency and lazy loading it when the insert/select statements are ran for the first time. The class itself is re-initialized each time the context object is rebuilt for each indexer function.

runner/src/indexer/indexer.ts Outdated Show resolved Hide resolved
runner/src/indexer/indexer.test.ts Outdated Show resolved Hide resolved
@darunrs darunrs dismissed morgsmccauley’s stale review August 22, 2023 16:05

i'm not doing it

@darunrs darunrs merged commit 10aae59 into main Aug 22, 2023
@darunrs darunrs deleted the simpleDML branch August 22, 2023 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants