diff --git a/benchmark/local_infinity/fulltext/fulltext_benchmark.cpp b/benchmark/local_infinity/fulltext/fulltext_benchmark.cpp
index a2ed13d291..62c6600bc3 100644
--- a/benchmark/local_infinity/fulltext/fulltext_benchmark.cpp
+++ b/benchmark/local_infinity/fulltext/fulltext_benchmark.cpp
@@ -254,7 +254,7 @@ void BenchmarkQuery(SharedPtr<Infinity> infinity, const String &db_name, const S
             output_columns->emplace_back(select_rowid_expr);
             output_columns->emplace_back(select_score_expr);
         }
-        infinity->Search(db_name, table_name, search_expr, nullptr, nullptr, nullptr, output_columns, nullptr, nullptr, nullptr, false);
+        infinity->Search(db_name, table_name, search_expr, nullptr, nullptr, nullptr, output_columns, nullptr, nullptr, nullptr, nullptr, false);
         /*
         auto result = infinity->Search(db_name, table_name, search_expr, nullptr, output_columns);
         {
diff --git a/benchmark/local_infinity/infinity_benchmark.cpp b/benchmark/local_infinity/infinity_benchmark.cpp
index 4b1a9e4831..da337e513e 100644
--- a/benchmark/local_infinity/infinity_benchmark.cpp
+++ b/benchmark/local_infinity/infinity_benchmark.cpp
@@ -227,6 +227,7 @@ int main() {
                                                                          nullptr,
                                                                          nullptr,
                                                                          nullptr,
+                                                                         nullptr,
                                                                          false);
                     });
                 results.push_back(fmt::format("-> Select QPS: {}", total_times / tims_costing_second));
diff --git a/src/executor/operator/physical_aggregate.cppm b/src/executor/operator/physical_aggregate.cppm
index 08623f7f77..43fdfb55da 100644
--- a/src/executor/operator/physical_aggregate.cppm
+++ b/src/executor/operator/physical_aggregate.cppm
@@ -57,12 +57,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     void GroupByInputTable(const Vector<UniquePtr<DataBlock>> &input_blocks, Vector<UniquePtr<DataBlock>> &output_blocks, HashTable &hash_table);
 
     void GenerateGroupByResult(const SharedPtr<DataTable> &input_table, SharedPtr<DataTable> &output_table, HashTable &hash_table);
diff --git a/src/executor/operator/physical_alter.cppm b/src/executor/operator/physical_alter.cppm
index 837ea7e1a7..8bc3ffc927 100644
--- a/src/executor/operator/physical_alter.cppm
+++ b/src/executor/operator/physical_alter.cppm
@@ -47,12 +47,6 @@ public:
 
     ~PhysicalAlter() override = default;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline SharedPtr<Vector<String>> GetOutputNames() const final { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
diff --git a/src/executor/operator/physical_command.cpp b/src/executor/operator/physical_command.cpp
index 1aca1e9d88..789d963a8c 100644
--- a/src/executor/operator/physical_command.cpp
+++ b/src/executor/operator/physical_command.cpp
@@ -556,10 +556,4 @@ bool PhysicalCommand::Execute(QueryContext *query_context, OperatorState *operat
     return true;
 }
 
-SizeT PhysicalCommand::TaskletCount() {
-    String error_message = "Not implement: TaskletCount not Implement";
-    UnrecoverableError(error_message);
-    return 0;
-}
-
 } // namespace infinity
\ No newline at end of file
diff --git a/src/executor/operator/physical_command.cppm b/src/executor/operator/physical_command.cppm
index d067935ab9..4e9441168d 100644
--- a/src/executor/operator/physical_command.cppm
+++ b/src/executor/operator/physical_command.cppm
@@ -48,8 +48,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) override;
 
-    SizeT TaskletCount() override;
-
     inline SharedPtr<Vector<String>> GetOutputNames() const override { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const override { return output_types_; }
diff --git a/src/executor/operator/physical_compact_finish.cppm b/src/executor/operator/physical_compact_finish.cppm
index f4dc41dd74..7dc9d8eec6 100644
--- a/src/executor/operator/physical_compact_finish.cppm
+++ b/src/executor/operator/physical_compact_finish.cppm
@@ -54,12 +54,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const override { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     void SaveSegmentData(QueryContext *query_context, const CompactStateData *compact_state_data);
 
diff --git a/src/executor/operator/physical_compact_index_prepare.cpp b/src/executor/operator/physical_compact_index_prepare.cpp
index 446b564f9d..1f194122eb 100644
--- a/src/executor/operator/physical_compact_index_prepare.cpp
+++ b/src/executor/operator/physical_compact_index_prepare.cpp
@@ -83,10 +83,4 @@ bool PhysicalCompactIndexPrepare::Execute(QueryContext *query_context, OperatorS
     return true;
 }
 
-SizeT PhysicalCompactIndexPrepare::TaskletCount() {
-    // auto *index_index = base_table_ref_->index_index_.get();
-    // return index_index->index_snapshots_vec_.size();
-    return 1;
-}
-
 } // namespace infinity
\ No newline at end of file
diff --git a/src/executor/operator/physical_compact_index_prepare.cppm b/src/executor/operator/physical_compact_index_prepare.cppm
index d8e6f48f92..4aea8c41a8 100644
--- a/src/executor/operator/physical_compact_index_prepare.cppm
+++ b/src/executor/operator/physical_compact_index_prepare.cppm
@@ -45,8 +45,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) override;
 
-    SizeT TaskletCount() override;
-
     inline SharedPtr<Vector<String>> GetOutputNames() const override { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const override { return output_types_; }
diff --git a/src/executor/operator/physical_create_collection.cppm b/src/executor/operator/physical_create_collection.cppm
index 0cfa97a730..e04217c0bb 100644
--- a/src/executor/operator/physical_create_collection.cppm
+++ b/src/executor/operator/physical_create_collection.cppm
@@ -48,12 +48,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline SharedPtr<Vector<String>> GetOutputNames() const final { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
diff --git a/src/executor/operator/physical_create_index_finish.cppm b/src/executor/operator/physical_create_index_finish.cppm
index e2f4ff4ab2..429a2a6185 100644
--- a/src/executor/operator/physical_create_index_finish.cppm
+++ b/src/executor/operator/physical_create_index_finish.cppm
@@ -44,8 +44,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) override;
 
-    SizeT TaskletCount() override { return 1; }
-
     SharedPtr<Vector<String>> GetOutputNames() const override { return output_names_; }
 
     SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const override { return output_types_; }
diff --git a/src/executor/operator/physical_create_index_prepare.cppm b/src/executor/operator/physical_create_index_prepare.cppm
index 8bf2298221..0f68cdef5d 100644
--- a/src/executor/operator/physical_create_index_prepare.cppm
+++ b/src/executor/operator/physical_create_index_prepare.cppm
@@ -46,8 +46,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) override;
 
-    SizeT TaskletCount() override { return 1; }
-
     SharedPtr<Vector<String>> GetOutputNames() const override { return output_names_; }
 
     SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const override { return output_types_; }
diff --git a/src/executor/operator/physical_create_schema.cppm b/src/executor/operator/physical_create_schema.cppm
index 966d5cc8cf..e86c6b8f34 100644
--- a/src/executor/operator/physical_create_schema.cppm
+++ b/src/executor/operator/physical_create_schema.cppm
@@ -51,12 +51,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline SharedPtr<Vector<String>> GetOutputNames() const final { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
diff --git a/src/executor/operator/physical_create_table.cppm b/src/executor/operator/physical_create_table.cppm
index 98e0996c2b..cb439fa493 100644
--- a/src/executor/operator/physical_create_table.cppm
+++ b/src/executor/operator/physical_create_table.cppm
@@ -59,11 +59,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
     inline SharedPtr<Vector<String>> GetOutputNames() const final { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
diff --git a/src/executor/operator/physical_create_view.cppm b/src/executor/operator/physical_create_view.cppm
index 23f99edd2d..a9ae2fdcf4 100644
--- a/src/executor/operator/physical_create_view.cppm
+++ b/src/executor/operator/physical_create_view.cppm
@@ -48,12 +48,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline const SharedPtr<CreateViewInfo> &bound_select_statement() const { return create_view_info_; };
 
     inline SharedPtr<Vector<String>> GetOutputNames() const final { return output_names_; }
diff --git a/src/executor/operator/physical_cross_product.cppm b/src/executor/operator/physical_cross_product.cppm
index b8b946eea1..0260cf4807 100644
--- a/src/executor/operator/physical_cross_product.cppm
+++ b/src/executor/operator/physical_cross_product.cppm
@@ -42,12 +42,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     SharedPtr<Vector<String>> GetOutputNames() const final;
 
     SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final;
diff --git a/src/executor/operator/physical_delete.cppm b/src/executor/operator/physical_delete.cppm
index c631bdd6a9..5e54c38ed4 100644
--- a/src/executor/operator/physical_delete.cppm
+++ b/src/executor/operator/physical_delete.cppm
@@ -42,12 +42,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline SharedPtr<Vector<String>> GetOutputNames() const final { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
diff --git a/src/executor/operator/physical_drop_collection.cppm b/src/executor/operator/physical_drop_collection.cppm
index 19759a495f..b29a128441 100644
--- a/src/executor/operator/physical_drop_collection.cppm
+++ b/src/executor/operator/physical_drop_collection.cppm
@@ -47,12 +47,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline SharedPtr<Vector<String>> GetOutputNames() const final { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
diff --git a/src/executor/operator/physical_drop_index.cppm b/src/executor/operator/physical_drop_index.cppm
index a8a259c441..e2f8f5025e 100644
--- a/src/executor/operator/physical_drop_index.cppm
+++ b/src/executor/operator/physical_drop_index.cppm
@@ -52,12 +52,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) override;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline SharedPtr<Vector<String>> GetOutputNames() const override { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const override { return output_types_; }
diff --git a/src/executor/operator/physical_drop_schema.cppm b/src/executor/operator/physical_drop_schema.cppm
index e4f0900f6e..6dbe41e43a 100644
--- a/src/executor/operator/physical_drop_schema.cppm
+++ b/src/executor/operator/physical_drop_schema.cppm
@@ -48,12 +48,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline SharedPtr<Vector<String>> GetOutputNames() const final { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
diff --git a/src/executor/operator/physical_drop_table.cppm b/src/executor/operator/physical_drop_table.cppm
index a3b23b5996..f940c54cc8 100644
--- a/src/executor/operator/physical_drop_table.cppm
+++ b/src/executor/operator/physical_drop_table.cppm
@@ -50,12 +50,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline SharedPtr<Vector<String>> GetOutputNames() const final { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
diff --git a/src/executor/operator/physical_drop_view.cppm b/src/executor/operator/physical_drop_view.cppm
index 630c28c7a2..1f0f4161f0 100644
--- a/src/executor/operator/physical_drop_view.cppm
+++ b/src/executor/operator/physical_drop_view.cppm
@@ -49,12 +49,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline SharedPtr<Vector<String>> GetOutputNames() const final { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
diff --git a/src/executor/operator/physical_dummy_operator.cppm b/src/executor/operator/physical_dummy_operator.cppm
index c335aacad9..418be8011f 100644
--- a/src/executor/operator/physical_dummy_operator.cppm
+++ b/src/executor/operator/physical_dummy_operator.cppm
@@ -41,12 +41,6 @@ public:
 
     bool Execute(QueryContext *query_context, OperatorState *operator_state) final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline SharedPtr<Vector<String>> GetOutputNames() const final { return output_names_; }
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
diff --git a/src/executor/operator/physical_dummy_scan.cppm b/src/executor/operator/physical_dummy_scan.cppm
index ece1283044..7a86673080 100644
--- a/src/executor/operator/physical_dummy_scan.cppm
+++ b/src/executor/operator/physical_dummy_scan.cppm
@@ -45,12 +45,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     SharedPtr<Vector<String>> output_names_{};
     SharedPtr<Vector<SharedPtr<DataType>>> output_types_{};
diff --git a/src/executor/operator/physical_except.cppm b/src/executor/operator/physical_except.cppm
index 139a80e0ce..32cfdb595f 100644
--- a/src/executor/operator/physical_except.cppm
+++ b/src/executor/operator/physical_except.cppm
@@ -49,12 +49,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     SharedPtr<Vector<String>> output_names_{};
     SharedPtr<Vector<SharedPtr<DataType>>> output_types_{};
diff --git a/src/executor/operator/physical_explain.cppm b/src/executor/operator/physical_explain.cppm
index 2caf39558c..c8a40905e5 100644
--- a/src/executor/operator/physical_explain.cppm
+++ b/src/executor/operator/physical_explain.cppm
@@ -55,12 +55,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline ExplainType explain_type() const { return explain_type_; }
 
     static void AlignParagraphs(Vector<SharedPtr<String>> &array1, Vector<SharedPtr<String>> &array2);
diff --git a/src/executor/operator/physical_export.cppm b/src/executor/operator/physical_export.cppm
index 848e91dd6b..91dd65a515 100644
--- a/src/executor/operator/physical_export.cppm
+++ b/src/executor/operator/physical_export.cppm
@@ -68,12 +68,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     SizeT ExportToCSV(QueryContext *query_context, ExportOperatorState *export_op_state);
 
     SizeT ExportToJSONL(QueryContext *query_context, ExportOperatorState *export_op_state);
diff --git a/src/executor/operator/physical_flush.cppm b/src/executor/operator/physical_flush.cppm
index 82f87ab070..d8c08fe36f 100644
--- a/src/executor/operator/physical_flush.cppm
+++ b/src/executor/operator/physical_flush.cppm
@@ -47,12 +47,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline FlushType flush_type() const { return flush_type_; }
 
 private:
diff --git a/src/executor/operator/physical_hash.cppm b/src/executor/operator/physical_hash.cppm
index bfcf4833b6..598b192b99 100644
--- a/src/executor/operator/physical_hash.cppm
+++ b/src/executor/operator/physical_hash.cppm
@@ -49,12 +49,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     SharedPtr<Vector<String>> output_names_{};
     SharedPtr<Vector<SharedPtr<DataType>>> output_types_{};
diff --git a/src/executor/operator/physical_hash_join.cppm b/src/executor/operator/physical_hash_join.cppm
index b7ac4f00dd..4314d46e42 100644
--- a/src/executor/operator/physical_hash_join.cppm
+++ b/src/executor/operator/physical_hash_join.cppm
@@ -44,12 +44,6 @@ public:
     SharedPtr<Vector<String>> GetOutputNames() const final;
 
     SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final;
-
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
 };
 
 } // namespace infinity
diff --git a/src/executor/operator/physical_import.cppm b/src/executor/operator/physical_import.cppm
index fdf7117003..86de46dfe2 100644
--- a/src/executor/operator/physical_import.cppm
+++ b/src/executor/operator/physical_import.cppm
@@ -86,12 +86,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     void ImportFVECS(QueryContext *query_context, ImportOperatorState *import_op_state);
 
     void ImportCSR(QueryContext *query_context, ImportOperatorState *import_op_state);
diff --git a/src/executor/operator/physical_index_join.cppm b/src/executor/operator/physical_index_join.cppm
index de7eaa7f63..6b556c22ca 100644
--- a/src/executor/operator/physical_index_join.cppm
+++ b/src/executor/operator/physical_index_join.cppm
@@ -44,12 +44,6 @@ public:
     SharedPtr<Vector<String>> GetOutputNames() const final;
 
     SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final;
-
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
 };
 
 } // namespace infinity
diff --git a/src/executor/operator/physical_insert.cppm b/src/executor/operator/physical_insert.cppm
index aa1d8229a5..bb99028e8f 100644
--- a/src/executor/operator/physical_insert.cppm
+++ b/src/executor/operator/physical_insert.cppm
@@ -57,12 +57,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     SharedPtr<TableInfo> table_info_{};
     u64 table_index_{};
diff --git a/src/executor/operator/physical_intersect.cppm b/src/executor/operator/physical_intersect.cppm
index 78116946af..63ed33f6f8 100644
--- a/src/executor/operator/physical_intersect.cppm
+++ b/src/executor/operator/physical_intersect.cppm
@@ -49,12 +49,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     SharedPtr<Vector<String>> output_names_{};
     SharedPtr<Vector<SharedPtr<DataType>>> output_types_{};
diff --git a/src/executor/operator/physical_merge_aggregate.cppm b/src/executor/operator/physical_merge_aggregate.cppm
index b095994ca8..964ab34dd5 100644
--- a/src/executor/operator/physical_merge_aggregate.cppm
+++ b/src/executor/operator/physical_merge_aggregate.cppm
@@ -55,12 +55,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     template <typename T>
     T GetInputData(MergeAggregateOperatorState *op_state, SizeT block_index, SizeT col_idx, SizeT row_idx);
 
diff --git a/src/executor/operator/physical_merge_hash.cppm b/src/executor/operator/physical_merge_hash.cppm
index 2724fd1099..49b3913563 100644
--- a/src/executor/operator/physical_merge_hash.cppm
+++ b/src/executor/operator/physical_merge_hash.cppm
@@ -49,12 +49,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     SharedPtr<Vector<String>> output_names_{};
     SharedPtr<Vector<SharedPtr<DataType>>> output_types_{};
diff --git a/src/executor/operator/physical_merge_limit.cppm b/src/executor/operator/physical_merge_limit.cppm
index b81bf35e61..de9a4b0c85 100644
--- a/src/executor/operator/physical_merge_limit.cppm
+++ b/src/executor/operator/physical_merge_limit.cppm
@@ -52,12 +52,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return left_->GetOutputTypes(); }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     [[nodiscard]] inline const SharedPtr<BaseExpression> &limit_expr() const { return limit_expr_; }
 
     [[nodiscard]] inline const SharedPtr<BaseExpression> &offset_expr() const { return offset_expr_; }
diff --git a/src/executor/operator/physical_merge_parallel_aggregate.cppm b/src/executor/operator/physical_merge_parallel_aggregate.cppm
index 0db86aeb8d..a784272633 100644
--- a/src/executor/operator/physical_merge_parallel_aggregate.cppm
+++ b/src/executor/operator/physical_merge_parallel_aggregate.cppm
@@ -49,12 +49,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     SharedPtr<Vector<String>> output_names_{};
     SharedPtr<Vector<SharedPtr<DataType>>> output_types_{};
diff --git a/src/executor/operator/physical_merge_sort.cppm b/src/executor/operator/physical_merge_sort.cppm
index 82d08bba1f..72047351a9 100644
--- a/src/executor/operator/physical_merge_sort.cppm
+++ b/src/executor/operator/physical_merge_sort.cppm
@@ -49,12 +49,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     SharedPtr<Vector<String>> output_names_{};
     SharedPtr<Vector<SharedPtr<DataType>>> output_types_{};
diff --git a/src/executor/operator/physical_nested_loop_join.cppm b/src/executor/operator/physical_nested_loop_join.cppm
index 5123c6a036..07747252e5 100644
--- a/src/executor/operator/physical_nested_loop_join.cppm
+++ b/src/executor/operator/physical_nested_loop_join.cppm
@@ -54,12 +54,6 @@ public:
 
     SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final;
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline const Vector<SharedPtr<BaseExpression>> &conditions() const { return conditions_; }
 
 private:
diff --git a/src/executor/operator/physical_optimize.cppm b/src/executor/operator/physical_optimize.cppm
index 8052fabe11..f0e5648a3c 100644
--- a/src/executor/operator/physical_optimize.cppm
+++ b/src/executor/operator/physical_optimize.cppm
@@ -54,12 +54,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     void OptimizeIndex(QueryContext *query_context, OperatorState *operator_state);
 
diff --git a/src/executor/operator/physical_parallel_aggregate.cppm b/src/executor/operator/physical_parallel_aggregate.cppm
index 3f3c631481..8f642d77b2 100644
--- a/src/executor/operator/physical_parallel_aggregate.cppm
+++ b/src/executor/operator/physical_parallel_aggregate.cppm
@@ -50,12 +50,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     SharedPtr<Vector<String>> output_names_{};
     SharedPtr<Vector<SharedPtr<DataType>>> output_types_{};
diff --git a/src/executor/operator/physical_prepared_plan.cppm b/src/executor/operator/physical_prepared_plan.cppm
index 09a0d795db..750946acc8 100644
--- a/src/executor/operator/physical_prepared_plan.cppm
+++ b/src/executor/operator/physical_prepared_plan.cppm
@@ -46,12 +46,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     SharedPtr<Vector<String>> output_names_{};
     SharedPtr<Vector<SharedPtr<DataType>>> output_types_{};
diff --git a/src/executor/operator/physical_scan/physical_merge_knn.cppm b/src/executor/operator/physical_scan/physical_merge_knn.cppm
index 4b001224b8..09ad88c4c1 100644
--- a/src/executor/operator/physical_scan/physical_merge_knn.cppm
+++ b/src/executor/operator/physical_scan/physical_merge_knn.cppm
@@ -61,12 +61,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline bool IsKnnMinHeap() const { return knn_expression_->IsKnnMinHeap(); }
 
 private:
diff --git a/src/executor/operator/physical_show.cppm b/src/executor/operator/physical_show.cppm
index 4bde8516fc..69b1b20990 100644
--- a/src/executor/operator/physical_show.cppm
+++ b/src/executor/operator/physical_show.cppm
@@ -66,12 +66,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline ShowStmtType show_type() const { return show_type_; }
 
     inline const String &db_name() const { return db_name_; };
diff --git a/src/executor/operator/physical_sink.cppm b/src/executor/operator/physical_sink.cppm
index 71be290498..5a779ccbc8 100644
--- a/src/executor/operator/physical_sink.cppm
+++ b/src/executor/operator/physical_sink.cppm
@@ -63,12 +63,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline SinkType sink_type() const { return type_; }
 
 private:
diff --git a/src/executor/operator/physical_sort_merge_join.cppm b/src/executor/operator/physical_sort_merge_join.cppm
index 6aee602ab3..7169a8bc34 100644
--- a/src/executor/operator/physical_sort_merge_join.cppm
+++ b/src/executor/operator/physical_sort_merge_join.cppm
@@ -45,12 +45,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     SharedPtr<Vector<String>> output_names_{};
     SharedPtr<Vector<SharedPtr<DataType>>> output_types_{};
diff --git a/src/executor/operator/physical_source.cppm b/src/executor/operator/physical_source.cppm
index 1227add242..4c9fca00ae 100644
--- a/src/executor/operator/physical_source.cppm
+++ b/src/executor/operator/physical_source.cppm
@@ -62,12 +62,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     inline SourceType source_type() const { return type_; }
 
 private:
diff --git a/src/executor/operator/physical_union_all.cppm b/src/executor/operator/physical_union_all.cppm
index a1588a8582..8561e2d1b1 100644
--- a/src/executor/operator/physical_union_all.cppm
+++ b/src/executor/operator/physical_union_all.cppm
@@ -47,12 +47,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
 private:
     SharedPtr<Vector<String>> output_names_{};
     SharedPtr<Vector<SharedPtr<DataType>>> output_types_{};
diff --git a/src/executor/operator/physical_update.cppm b/src/executor/operator/physical_update.cppm
index fbfc182d74..bc84c05b5d 100644
--- a/src/executor/operator/physical_update.cppm
+++ b/src/executor/operator/physical_update.cppm
@@ -54,12 +54,6 @@ public:
 
     inline SharedPtr<Vector<SharedPtr<DataType>>> GetOutputTypes() const final { return output_types_; }
 
-    SizeT TaskletCount() override {
-        String error_message = "Not implement: TaskletCount not Implement";
-        UnrecoverableError(error_message);
-        return 0;
-    }
-
     SharedPtr<TableInfo> table_info_{};
     const Vector<Pair<SizeT, SharedPtr<BaseExpression>>> &update_columns_;
     const Vector<SharedPtr<BaseExpression>> &all_columns_in_table_;
diff --git a/src/executor/physical_operator.cpp b/src/executor/physical_operator.cpp
index 37f01f3d98..6a658213a8 100644
--- a/src/executor/physical_operator.cpp
+++ b/src/executor/physical_operator.cpp
@@ -42,6 +42,8 @@ import block_index;
 
 namespace infinity {
 
+SizeT PhysicalOperator::TaskletCount() { return 1; }
+
 String PhysicalOperator::GetName() const { return PhysicalOperatorToString(operator_type_); }
 
 void PhysicalOperator::InputLoad(QueryContext *query_context, OperatorState *operator_state, HashMap<SizeT, SharedPtr<BaseTableRef>> &table_refs) {
diff --git a/src/executor/physical_operator.cppm b/src/executor/physical_operator.cppm
index 00830fee06..a6bef72c0d 100644
--- a/src/executor/physical_operator.cppm
+++ b/src/executor/physical_operator.cppm
@@ -55,7 +55,7 @@ public:
 
     virtual void Init(QueryContext* query_context) = 0;
 
-    virtual SizeT TaskletCount() = 0;
+    virtual SizeT TaskletCount();
 
     inline PhysicalOperator *left() const { return left_.get(); }
 
diff --git a/src/scheduler/fragment_context.cpp b/src/scheduler/fragment_context.cpp
index 84b3f0cdb5..07ad62b854 100644
--- a/src/scheduler/fragment_context.cpp
+++ b/src/scheduler/fragment_context.cpp
@@ -1099,10 +1099,10 @@ void FragmentContext::MakeSinkState(i64 parallel_count) {
             break;
         }
         case PhysicalOperatorType::kLimit: {
-            if (fragment_type_ != FragmentType::kParallelStream) {
-                String error_message = fmt::format("{} should in parallel stream fragment", PhysicalOperatorToString(last_operator->operator_type()));
-                UnrecoverableError(error_message);
-            }
+            // if (fragment_type_ != FragmentType::kParallelStream) {
+            //     String error_message = fmt::format("{} should in parallel stream fragment", PhysicalOperatorToString(last_operator->operator_type()));
+            //     UnrecoverableError(error_message);
+            // }
 
             if ((i64)tasks_.size() != parallel_count) {
                 String error_message = fmt::format("{} task count isn't correct.", PhysicalOperatorToString(last_operator->operator_type()));
diff --git a/test/sql/dql/knn/embedding/test_knn_hnsw_l2.slt b/test/sql/dql/knn/embedding/test_knn_hnsw_l2.slt
index 0214a4512c..a0a1a44052 100644
--- a/test/sql/dql/knn/embedding/test_knn_hnsw_l2.slt
+++ b/test/sql/dql/knn/embedding/test_knn_hnsw_l2.slt
@@ -60,5 +60,11 @@ SELECT c1 FROM test_knn_hnsw_l2 SEARCH MATCH VECTOR (c2, [0.3, 0.3, 0.2, 0.2], '
 8
 8
 
+query I
+SELECT c1 FROM test_knn_hnsw_l2 SEARCH MATCH VECTOR (c2, [0.3, 0.3, 0.2, 0.2], 'float', 'l2', 3) WITH (ef = 4) LIMIT 2;
+----
+8
+8
+
 statement ok
 DROP TABLE test_knn_hnsw_l2;
\ No newline at end of file