From 5ed6aecd3851f71d14fb75144888bb3242d7dc02 Mon Sep 17 00:00:00 2001
From: Mryange <yanxuecheng@selectdb.com>
Date: Mon, 1 Jun 2026 14:15:56 +0800
Subject: [PATCH] upd

---
 be/src/exec/operator/sort_sink_operator.cpp | 7 +++----
 be/src/exec/sort/heap_sorter.cpp            | 7 +++----
 be/src/exec/sort/heap_sorter.h              | 4 +---
 be/test/exec/sort/heap_sorter_test.cpp      | 6 ++----
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/be/src/exec/operator/sort_sink_operator.cpp b/be/src/exec/operator/sort_sink_operator.cpp
index 9b045da6d8c392..00abeec183a1fb 100644
--- a/be/src/exec/operator/sort_sink_operator.cpp
+++ b/be/src/exec/operator/sort_sink_operator.cpp
@@ -51,10 +51,9 @@ Status SortSinkLocalState::open(RuntimeState* state) {
     }
     switch (p._algorithm) {
     case TSortAlgorithm::HEAP_SORT: {
-        _shared_state->sorter = HeapSorter::create_shared(
-                _ordering_expr_ctxs, state, p._limit, p._offset, p._pool, p._is_asc_order,
-                p._nulls_first, p._child->row_desc(),
-                state->get_query_ctx()->has_runtime_predicate(p._node_id));
+        _shared_state->sorter =
+                HeapSorter::create_shared(_ordering_expr_ctxs, state, p._limit, p._offset, p._pool,
+                                          p._is_asc_order, p._nulls_first, p._child->row_desc());
         break;
     }
     case TSortAlgorithm::TOPN_SORT: {
diff --git a/be/src/exec/sort/heap_sorter.cpp b/be/src/exec/sort/heap_sorter.cpp
index ab5e898e67a643..cf04978f09c078 100644
--- a/be/src/exec/sort/heap_sorter.cpp
+++ b/be/src/exec/sort/heap_sorter.cpp
@@ -28,15 +28,14 @@ namespace doris {
 HeapSorter::HeapSorter(const VExprContextSPtrs& ordering_expr_ctxs, RuntimeState* state,
                        int64_t limit, int64_t offset, ObjectPool* pool,
                        std::vector<bool>& is_asc_order, std::vector<bool>& nulls_first,
-                       const RowDescriptor& row_desc, bool have_runtime_predicate)
+                       const RowDescriptor& row_desc)
         : Sorter(ordering_expr_ctxs, state, limit, offset, pool, is_asc_order, nulls_first),
           _heap_size(limit + offset),
-          _state(MergeSorterState::create_unique(row_desc, offset)),
-          _have_runtime_predicate(have_runtime_predicate) {}
+          _state(MergeSorterState::create_unique(row_desc, offset)) {}
 
 Status HeapSorter::append_block(Block* block) {
     auto tmp_block = std::make_shared<Block>(block->clone_empty());
-    if (!_have_runtime_predicate && _queue.is_valid() && _queue_row_num >= _heap_size) {
+    if (_queue.is_valid() && _queue_row_num >= _heap_size) {
         RETURN_IF_ERROR(_prepare_sort_columns(*block, *tmp_block, false));
         tmp_block->swap(*block);
         auto tmp_cursor_impl = MergeSortCursorImpl::create_shared(tmp_block, _sort_description);
diff --git a/be/src/exec/sort/heap_sorter.h b/be/src/exec/sort/heap_sorter.h
index f520230d486358..e9a6c1f7212b50 100644
--- a/be/src/exec/sort/heap_sorter.h
+++ b/be/src/exec/sort/heap_sorter.h
@@ -27,8 +27,7 @@ class HeapSorter final : public Sorter {
 public:
     HeapSorter(const VExprContextSPtrs& ordering_expr_ctxs, RuntimeState* state, int64_t limit,
                int64_t offset, ObjectPool* pool, std::vector<bool>& is_asc_order,
-               std::vector<bool>& nulls_first, const RowDescriptor& row_desc,
-               bool have_runtime_predicate = true);
+               std::vector<bool>& nulls_first, const RowDescriptor& row_desc);
 
     ~HeapSorter() override = default;
 
@@ -56,7 +55,6 @@ class HeapSorter final : public Sorter {
     MergeSorterQueue _queue;
     std::unique_ptr<MergeSorterState> _state;
     IColumn::Permutation _reverse_buffer;
-    bool _have_runtime_predicate = true;
     RuntimeProfile::Counter* _topn_filter_timer = nullptr;
     RuntimeProfile::Counter* _topn_filter_rows_counter = nullptr;
 };
diff --git a/be/test/exec/sort/heap_sorter_test.cpp b/be/test/exec/sort/heap_sorter_test.cpp
index 9c91db2e5e3833..568cd6bfcbb835 100644
--- a/be/test/exec/sort/heap_sorter_test.cpp
+++ b/be/test/exec/sort/heap_sorter_test.cpp
@@ -92,9 +92,7 @@ TEST_F(HeapSorterTest, test_topn_sorter1) {
         EXPECT_EQ(sorter->_queue_row_num, 6);
 
         auto value = sorter->get_top_value();
-        Field real;
-        block.get_by_position(0).column->get(0, real);
-        EXPECT_EQ(value, real);
+        EXPECT_EQ(value, Field::create_field<TYPE_BIGINT>(Int64(6)));
     }
 
     EXPECT_TRUE(sorter->prepare_for_read(false));
@@ -117,4 +115,4 @@ TEST_F(HeapSorterTest, test_topn_sorter1) {
     }
 }
 
-} // namespace doris
\ No newline at end of file
+} // namespace doris