)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"0a043ac1bf8435452fedf26d054a3f7ec25f88e7","unresolved":false,"context_lines":[{"line_number":26,"context_line":"time spent in get_pending_or_processing_ops reduced by 40.7%"},{"line_number":27,"context_line":"and time spent in get_oldest_pending_db_row_with_lock reduced by 60.6%."},{"line_number":28,"context_line":""},{"line_number":29,"context_line":"NOTE: This is not a clean cherry-pick. Line 54 in this commit reads "},{"line_number":30,"context_line":"return baked_query(context.session).params("},{"line_number":31,"context_line":"        uuid\u003dobject_uuid, op\u003doperation).all()"},{"line_number":32,"context_line":" on master."},{"line_number":33,"context_line":" "},{"line_number":34,"context_line":" Line 86 in this commit is absent in master."},{"line_number":35,"context_line":""},{"line_number":36,"context_line":"Closes-Bug: 1791348"},{"line_number":37,"context_line":"Change-Id: Ieb5f14e100ea48facc1bfd2169e29b42617c6ac1"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":11,"id":"3f79a3b5_bafd8cb3","line":34,"range":{"start_line":29,"start_character":0,"end_line":34,"end_character":44},"updated":"2018-10-09 19:35:31.000000000","message":"This is less useful than simply providing the change ID or commit hash of the change on master that introduces the conflict - that\u0027s what I\u0027m looking for. I know there is a conflict, I want to know what caused it so I can compare.","commit_id":"b605dbef1cc76b728325badf0bc8a9d420871e35"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"e38301ddffc2fb2954028852e08f13a9a09e7dd2","unresolved":false,"context_lines":[{"line_number":38,"context_line":""},{"line_number":39,"context_line":"[1] https://review.openstack.org/#/q/project:openstack/networking-odl+branch:master+topic:bp/enginefacade-switch"},{"line_number":40,"context_line":"[2] 179fa53a8e6f60609068df5c1f4f058181b2f928"},{"line_number":41,"context_line":"[3] 1b1962896878d710adb43b712c6db6af862d8352"},{"line_number":42,"context_line":""},{"line_number":43,"context_line":""},{"line_number":44,"context_line":"Closes-Bug: 1791348"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":13,"id":"3f79a3b5_3c90dc97","line":41,"updated":"2018-10-31 13:37:08.000000000","message":"This would likely be a problem if parts of it were backported since it could mean depending on a new version of oslo.db, but that doesn\u0027t seem to be the case (nothing from this was backported, it\u0027s just noted for conflicts from master).","commit_id":"d0821278f610b72f1268a81d9d458bf0e97a1180"}],"networking_odl/db/db.py":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"2048209b8114703f6e9bbd5bdae76d8767abd15f","unresolved":false,"context_lines":[{"line_number":51,"context_line":"            baked_query +\u003d lambda q: q.filter("},{"line_number":52,"context_line":"                models.OpenDaylightJournal.operation \u003d\u003d bindparam(\u0027op\u0027))"},{"line_number":53,"context_line":""},{"line_number":54,"context_line":"    return baked_query(session).params("},{"line_number":55,"context_line":"        uuid\u003dobject_uuid, op\u003doperation).all()"},{"line_number":56,"context_line":""},{"line_number":57,"context_line":""}],"source_content_type":"text/x-python","patch_set":10,"id":"3f79a3b5_b8127cb2","line":54,"range":{"start_line":54,"start_character":23,"end_line":54,"end_character":30},"updated":"2018-10-09 15:00:17.000000000","message":"There is a conflict here - please note the conflict in the commit message. On master this is:\n\nreturn baked_query(context.session).params(\n        uuid\u003dobject_uuid, op\u003doperation).all()","commit_id":"d3b9605c71efb004eaca1c3bad95ad38289c4a41"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"2048209b8114703f6e9bbd5bdae76d8767abd15f","unresolved":false,"context_lines":[{"line_number":83,"context_line":"def get_oldest_pending_db_row_with_lock(session):"},{"line_number":84,"context_line":"    # NOTE (sai): For performance reasons, we expect this method to use baked"},{"line_number":85,"context_line":"    # query (http://docs.sqlalchemy.org/en/latest/orm/extensions/baked.html)"},{"line_number":86,"context_line":"    with db_api.autonested_transaction(session):"},{"line_number":87,"context_line":"        journal_dep \u003d aliased(models.OpenDaylightJournal)"},{"line_number":88,"context_line":"        dep_query \u003d bakery(lambda s1: s1.query(journal_dep))"},{"line_number":89,"context_line":"        dep_query +\u003d lambda q: q.filter("}],"source_content_type":"text/x-python","patch_set":10,"id":"3f79a3b5_d81c18c4","line":86,"range":{"start_line":86,"start_character":4,"end_line":86,"end_character":48},"updated":"2018-10-09 15:00:17.000000000","message":"This is no longer on master so another reason for the merge conflict.","commit_id":"d3b9605c71efb004eaca1c3bad95ad38289c4a41"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"533693730f236cd34c3fc6649372c0cc872e93f8","unresolved":false,"context_lines":[{"line_number":16,"context_line":""},{"line_number":17,"context_line":"from sqlalchemy import asc"},{"line_number":18,"context_line":"from sqlalchemy import bindparam"},{"line_number":19,"context_line":"from sqlalchemy.ext import baked"},{"line_number":20,"context_line":"from sqlalchemy import func"},{"line_number":21,"context_line":"from sqlalchemy import or_"},{"line_number":22,"context_line":"from sqlalchemy.orm import aliased"}],"source_content_type":"text/x-python","patch_set":13,"id":"3f79a3b5_9c0b307b","line":19,"updated":"2018-10-31 13:54:09.000000000","message":"Minimum for sqlalchemy in queens is 1.0.10:\n\nhttps://github.com/openstack/requirements/blob/stable/queens/global-requirements.txt#L306\n\nAnd baked is in there:\n\nhttps://github.com/zzzeek/sqlalchemy/blob/rel_1_0_10/lib/sqlalchemy/ext/baked.py\n\nSo minimums should be OK.","commit_id":"d0821278f610b72f1268a81d9d458bf0e97a1180"},{"author":{"_account_id":16771,"name":"mpolenchuk","email":"mpolenchuk@mirantis.com","username":"mpolenchuk"},"change_message_id":"60d9fc88e8cd85e2781ff484a7c54af6f46c3f2f","unresolved":false,"context_lines":[{"line_number":16,"context_line":""},{"line_number":17,"context_line":"from sqlalchemy import asc"},{"line_number":18,"context_line":"from sqlalchemy import bindparam"},{"line_number":19,"context_line":"from sqlalchemy.ext import baked"},{"line_number":20,"context_line":"from sqlalchemy import func"},{"line_number":21,"context_line":"from sqlalchemy import or_"},{"line_number":22,"context_line":"from sqlalchemy.orm import aliased"}],"source_content_type":"text/x-python","patch_set":13,"id":"3f79a3b5_99b47483","line":19,"in_reply_to":"3f79a3b5_9c0b307b","updated":"2018-11-02 11:23:43.000000000","message":"This patch requires sqlalchemy \u003e\u003d1.2","commit_id":"d0821278f610b72f1268a81d9d458bf0e97a1180"},{"author":{"_account_id":16771,"name":"mpolenchuk","email":"mpolenchuk@mirantis.com","username":"mpolenchuk"},"change_message_id":"5a5a102b3d666b48e243e7eda672b53989b51570","unresolved":false,"context_lines":[{"line_number":46,"context_line":"        if isinstance(operation, (list, tuple)):"},{"line_number":47,"context_line":"            baked_query +\u003d lambda q: q.filter("},{"line_number":48,"context_line":"                models.OpenDaylightJournal.operation.in_(bindparam(\u0027op\u0027,"},{"line_number":49,"context_line":"                                                         expanding\u003dTrue)))"},{"line_number":50,"context_line":"        else:"},{"line_number":51,"context_line":"            baked_query +\u003d lambda q: q.filter("},{"line_number":52,"context_line":"                models.OpenDaylightJournal.operation \u003d\u003d bindparam(\u0027op\u0027))"}],"source_content_type":"text/x-python","patch_set":13,"id":"3f79a3b5_863413fc","line":49,"range":{"start_line":49,"start_character":57,"end_line":49,"end_character":71},"updated":"2018-11-02 10:46:50.000000000","message":"From SQLAlchemy 1.2 changelog: ... added a new kind of bindparam() called “expanding” and should be considered to be experimental for 1.2.\nTherefore we (OPNFV) have got tracebacks for Queens CI jobs:\nneutron.plugins.ml2.managers TypeError: bindparam() got an unexpected keyword argument \u0027expanding\u0027.\nPlease advise what to do to resolve this issue?","commit_id":"d0821278f610b72f1268a81d9d458bf0e97a1180"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"702589a7589cf20daf0ae0ccb3d74385c96e0862","unresolved":false,"context_lines":[{"line_number":46,"context_line":"        if isinstance(operation, (list, tuple)):"},{"line_number":47,"context_line":"            baked_query +\u003d lambda q: q.filter("},{"line_number":48,"context_line":"                models.OpenDaylightJournal.operation.in_(bindparam(\u0027op\u0027,"},{"line_number":49,"context_line":"                                                         expanding\u003dTrue)))"},{"line_number":50,"context_line":"        else:"},{"line_number":51,"context_line":"            baked_query +\u003d lambda q: q.filter("},{"line_number":52,"context_line":"                models.OpenDaylightJournal.operation \u003d\u003d bindparam(\u0027op\u0027))"}],"source_content_type":"text/x-python","patch_set":13,"id":"3f79a3b5_ede5a23e","line":49,"range":{"start_line":49,"start_character":57,"end_line":49,"end_character":71},"in_reply_to":"3f79a3b5_863413fc","updated":"2018-11-02 13:31:31.000000000","message":"Hmm, OK, I missed that. I only noticed that global-requirements for queens has sqlalchemy\u003e\u003d1.0.10 and baked query is in that version. This does mean the minimum required version of sqlalchemy for this change is 1.2 which is technically not something we should be backporting to stable branches for the reason you have already hit on. I would be OK with reverting this change. At the very least, a release note should accompany it and a minor version should be bumped if/when this is released to queens.","commit_id":"d0821278f610b72f1268a81d9d458bf0e97a1180"}]}
