Merge remote-tracking branch 'upstream/main' into fix473

infiniflow · Jan 26, 2025 · 884ba8d · 884ba8d
2 parents 519e0d1 + f9f0485
commit 884ba8d
Show file tree

Hide file tree

Showing 54 changed files with 15 additions and 277 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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