You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2020/12/08 02:21:47 UTC

[GitHub] [airflow] kaxil opened a new pull request #12905: Make xcom_pull results order deterministic

kaxil opened a new pull request #12905:
URL: https://github.com/apache/airflow/pull/12905


   closes https://github.com/apache/airflow/issues/11858
   
   <!--
   Thank you for contributing! Please make sure that your code changes
   are covered with tests. And in case of new features or big changes
   remember to adjust the documentation.
   
   Feel free to ping committers for the review!
   
   In case of existing issue, reference it using one of the following:
   
   closes: #ISSUE
   related: #ISSUE
   
   How to write a good git commit message:
   http://chris.beams.io/posts/git-commit/
   -->
   
   ---
   **^ Add meaningful description above**
   
   Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
   In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)) is needed.
   In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
   In case of backwards incompatible changes please leave a note in [UPDATING.md](https://github.com/apache/airflow/blob/master/UPDATING.md).
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [airflow] github-actions[bot] commented on pull request #12905: Make xcom_pull results order deterministic

Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #12905:
URL: https://github.com/apache/airflow/pull/12905#issuecomment-740551563


   The PR most likely needs to run full matrix of tests because it modifies parts of the core of Airflow. However, committers might decide to merge it quickly and take the risk. If they don't merge it quickly - please rebase it to the latest master at your convenience, or amend the last commit of the PR, and push it with --force-with-lease.


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [airflow] kaxil commented on pull request #12905: Make xcom_pull results order deterministic

Posted by GitBox <gi...@apache.org>.
kaxil commented on pull request #12905:
URL: https://github.com/apache/airflow/pull/12905#issuecomment-740317192


   cc @ephraimbuddy 


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [airflow] kaxil merged pull request #12905: Make xcom_pull results order deterministic

Posted by GitBox <gi...@apache.org>.
kaxil merged pull request #12905:
URL: https://github.com/apache/airflow/pull/12905


   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [airflow] turbaszek commented on a change in pull request #12905: Make xcom_pull results order deterministic

Posted by GitBox <gi...@apache.org>.
turbaszek commented on a change in pull request #12905:
URL: https://github.com/apache/airflow/pull/12905#discussion_r538187718



##########
File path: airflow/models/taskinstance.py
##########
@@ -1883,16 +1883,24 @@ def xcom_pull(  # pylint: disable=inconsistent-return-statements
             task_ids=task_ids,
             include_prior_dates=include_prior_dates,
             session=session,
-        ).with_entities(XCom.value)
+        )
 
         # Since we're only fetching the values field, and not the
         # whole class, the @recreate annotation does not kick in.
         # Therefore we need to deserialize the fields by ourselves.
-
         if is_container(task_ids):
-            return [XCom.deserialize_value(xcom) for xcom in query]
+            vals_kv = {
+                result.task_id: XCom.deserialize_value(result)
+                for result in query.with_entities(XCom.task_id, XCom.value)
+            }
+
+            vals = []
+            for task_id in task_ids:
+                vals.append(vals_kv.get(task_id))
+
+            return vals

Review comment:
       ```suggestion
               values_ordered_by_id = [vals_kv.get(task_id) for task_id in task_ids]
               return values_ordered_by_id
   ```




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org