(doris) branch master updated (a5f36a18cc1 -> ada30740189)

[yi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


    from a5f36a18cc1 [fix](paimon) Align incremental query behavior with Spark Paimon for single snapshot scenario (#58239)
     add ada30740189 [bugfix](memory) should count memory when cancel query is called (#58252)

No new revisions were added by this update.

Summary of changes:
 .../exec/partitioned_aggregation_sink_operator.cpp   |  2 +-
 .../exec/partitioned_aggregation_source_operator.cpp |  2 +-
 .../exec/partitioned_hash_join_probe_operator.cpp    | 13 +++++++------
 .../exec/partitioned_hash_join_sink_operator.cpp     |  4 ++--
 be/src/pipeline/exec/spill_sort_sink_operator.cpp    |  4 ++--
 be/src/runtime/fragment_mgr.cpp                      |  1 +
 be/src/runtime/thread_context.cpp                    | 15 ---------------
 be/src/runtime/thread_context.h                      | 20 +-------------------
 8 files changed, 15 insertions(+), 46 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org