Page MenuHomeSoftware Heritage

Refactor node and connection resolver bindings
ClosedPublic

Authored by jayeshv on Wed, Sep 21, 4:11 PM.

Details

Summary

Refactor node and connection resolver bindings

Use a factory class to create node and connection objects. Bind them to
schema in the resolvers module.
raise NullableObjectError in the node resolvers to return None instead
of an object

Diff Detail

Repository
rDGQL GraphQL API
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

jayeshv retitled this revision from Add filters for latest visit status to [WIP] Add filters for latest visit status.Wed, Sep 21, 4:11 PM

Build is green

Patch application report for D8518 (id=30677)

Rebasing onto 32d5564f97...

First, rewinding head to replay your work on top of it...
Applying: Add filters for latest visit status
Using index info to reconstruct a base tree...
M	swh/graphql/backends/archive.py
M	swh/graphql/errors/__init__.py
M	swh/graphql/errors/errors.py
M	swh/graphql/resolvers/resolvers.py
M	swh/graphql/resolvers/visit_status.py
M	swh/graphql/schema/schema.graphql
M	swh/graphql/tests/functional/test_visit_node.py
M	swh/graphql/tests/functional/test_visit_status.py
Falling back to patching base and 3-way merge...
Auto-merging swh/graphql/tests/functional/test_visit_node.py
CONFLICT (content): Merge conflict in swh/graphql/tests/functional/test_visit_node.py
Auto-merging swh/graphql/schema/schema.graphql
CONFLICT (content): Merge conflict in swh/graphql/schema/schema.graphql
Auto-merging swh/graphql/resolvers/resolvers.py
Patch failed at 0001 Add filters for latest visit status

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Rebase failed (ret=1)!

Could not rebase; Attempt merge onto 32d5564f97...

Already up to date.
Changes applied before test
commit c1aa68d6dc9c5f4f409cfa4885e9323b82981dfb
Merge: 32d5564 77b91d6
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 15:42:06 2022 +0200

    Refactor resolver bindings
    
    Use a factory class to create node objects. Bind them to schema in
    the resolvers module. raise NullableObjectError in the resolvers to
    to return None instead of objects.

commit 77b91d6f4773bc75795a6e55d77762d045208b14
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    resolver re-factoring

commit 01343d4509bda4d30141078db5287c03e52e58fb
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 11:36:00 2022 +0200

    Add filters for latest visit status
    
    Possibility to filter a latest vist status by status state and
    require snapshot.

See https://jenkins.softwareheritage.org/job/DGQL/job/tests-on-diff/192/ for more details.

Build is green

Patch application report for D8518 (id=30678)

Rebasing onto 32d5564f97...

Current branch diff-target is up to date.
Changes applied before test
commit 14417c8900dc3ca7d7d2bb80d4719abbcd151aaa
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    resolver re-factoring

See https://jenkins.softwareheritage.org/job/DGQL/job/tests-on-diff/193/ for more details.

Build is green

Patch application report for D8518 (id=30679)

Rebasing onto 32d5564f97...

Current branch diff-target is up to date.
Changes applied before test
commit d760b540bc5d67dfb834adf3f43e109aa8ba746a
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor resolver bindings
    
    Use a factory class to create node objects. Bind them to schema in
    the resolvers module. raise NullableObjectError in the resolvers to
    to return None instead of objects.

See https://jenkins.softwareheritage.org/job/DGQL/job/tests-on-diff/194/ for more details.

Build is green

Patch application report for D8518 (id=30681)

Rebasing onto 32d5564f97...

Current branch diff-target is up to date.
Changes applied before test
commit 181120921c9aa4289d9598ee86298e6a867a1d1a
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor resolver bindings
    
    Use a factory class to create node objects. Bind them to schema in
    the resolvers module. raise NullableObjectError in the resolvers to
    to return None instead of objects.

See https://jenkins.softwareheritage.org/job/DGQL/job/tests-on-diff/195/ for more details.

jayeshv retitled this revision from [WIP] Add filters for latest visit status to [WIP] Refactor resolver bindings.Wed, Sep 21, 5:59 PM

Build is green

Patch application report for D8518 (id=30683)

Rebasing onto 32d5564f97...

Current branch diff-target is up to date.
Changes applied before test
commit 9a7cd432ade0d396bcc8796444a5cd8dd206c79f
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor resolver bindings
    
    Use a factory class to create node objects. Bind them to schema in
    the resolvers module. raise NullableObjectError in the resolvers to
    to return None instead of objects.

See https://jenkins.softwareheritage.org/job/DGQL/job/tests-on-diff/196/ for more details.

jayeshv retitled this revision from [WIP] Refactor resolver bindings to Refactor node resolver bindings.Thu, Sep 22, 9:19 AM
jayeshv edited the summary of this revision. (Show Details)

Build is green

Patch application report for D8518 (id=30684)

Rebasing onto 32d5564f97...

Current branch diff-target is up to date.
Changes applied before test
commit 91c0de176e0cf623198255160a2ce356918a82ba
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor node resolver bindings
    
    Use a factory class to create node objects. Bind them to schema in
    the resolvers module. raise NullableObjectError in the resolvers to
    return None instead of an object.

See https://jenkins.softwareheritage.org/job/DGQL/job/tests-on-diff/197/ for more details.

Build is green

Patch application report for D8518 (id=30685)

Rebasing onto 32d5564f97...

Current branch diff-target is up to date.
Changes applied before test
commit 82fe7599e7b14ac32ab340dc3606298b0d58b1f9
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor node resolver bindings
    
    Use a factory class to create node objects. Bind them to schema in
    the resolvers module. raise NullableObjectError in the resolvers to
    return None instead of an object.

See https://jenkins.softwareheritage.org/job/DGQL/job/tests-on-diff/198/ for more details.

connection resolver refactoring

jayeshv retitled this revision from Refactor node resolver bindings to Refactor node and connection resolver bindings.Thu, Sep 22, 3:36 PM
jayeshv edited the summary of this revision. (Show Details)

Build is green

Patch application report for D8518 (id=30691)

Rebasing onto 32d5564f97...

Current branch diff-target is up to date.
Changes applied before test
commit 2a495c8970300f9906584968b9b557626223f2fe
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor node and connection resolver bindings
    
    Use a factory class to create node and connection objects. Bind them to
    schema in the resolvers module.
    raise NullableObjectError in the node resolvers to return None instead
    of an object.
    
    Refactor connection resolver factory

See https://jenkins.softwareheritage.org/job/DGQL/job/tests-on-diff/200/ for more details.

Build is green

Patch application report for D8518 (id=30692)

Rebasing onto 32d5564f97...

Current branch diff-target is up to date.
Changes applied before test
commit 4b20ef58f24629812d62bef472b132d74ab78827
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor node and connection resolver bindings
    
    Use a factory class to create node and connection objects. Bind them to
    schema in the resolvers module.
    raise NullableObjectError in the node resolvers to return None instead
    of an object.

See https://jenkins.softwareheritage.org/job/DGQL/job/tests-on-diff/201/ for more details.

Build has FAILED

Patch application report for D8518 (id=30775)

Rebasing onto 8d764671e9...

Current branch diff-target is up to date.
Changes applied before test
commit e60916c0edcf369335bacd4adfd107b183dc53c5
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor node and connection resolver bindings
    
    Use a factory class to create node and connection objects. Bind them to
    schema in the resolvers module.
    raise NullableObjectError in the node resolvers to return None instead
    of an object.

Link to build: https://jenkins.softwareheritage.org/job/DGQL/job/tests-on-diff/204/
See console output for more information: https://jenkins.softwareheritage.org/job/DGQL/job/tests-on-diff/204/console

Build is green

Patch application report for D8518 (id=30776)

Rebasing onto 8d764671e9...

Current branch diff-target is up to date.
Changes applied before test
commit ffb88715d7b485a5dc726ed6ce517320324eb426
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed Sep 21 13:37:37 2022 +0200

    Refactor node and connection resolver bindings
    
    Use a factory class to create node and connection objects. Bind them to
    schema in the resolvers module.
    raise NullableObjectError in the node resolvers to return None instead
    of an object.

See https://jenkins.softwareheritage.org/job/DGQL/job/tests-on-diff/205/ for more details.

This revision is now accepted and ready to land.Tue, Sep 27, 1:07 PM