diff --git a/cpp/src/arrow/engine/substrait/expression_internal.h b/cpp/src/arrow/engine/substrait/expression_internal.h index cddc46066f1..2ce2ee76af2 100644 --- a/cpp/src/arrow/engine/substrait/expression_internal.h +++ b/cpp/src/arrow/engine/substrait/expression_internal.h @@ -39,11 +39,6 @@ ARROW_ENGINE_EXPORT Result DirectReferenceFromProto(const substrait::Expression::FieldReference*, const ExtensionSet&, const ConversionOptions&); -ARROW_ENGINE_EXPORT -Result FromProto(const substrait::Expression::FieldReference*, - const ExtensionSet&, const ConversionOptions&, - std::optional); - ARROW_ENGINE_EXPORT Result FromProto(const substrait::Expression&, const ExtensionSet&, const ConversionOptions&); diff --git a/cpp/src/arrow/engine/substrait/relation_internal.cc b/cpp/src/arrow/engine/substrait/relation_internal.cc index 7f9c4c289fb..b00d2420863 100644 --- a/cpp/src/arrow/engine/substrait/relation_internal.cc +++ b/cpp/src/arrow/engine/substrait/relation_internal.cc @@ -420,9 +420,8 @@ Result FromProto(const substrait::Rel& rel, const ExtensionSet& return Status::Invalid("Invalid NamedTable Source"); } - return ProcessEmit(std::move(read), - DeclarationInfo{std::move(source_decl), base_schema}, - std::move(base_schema)); + return ProcessEmit(read, DeclarationInfo{std::move(source_decl), base_schema}, + base_schema); } if (!read.has_local_files()) { @@ -568,8 +567,7 @@ Result FromProto(const substrait::Rel& rel, const ExtensionSet& compute::Declaration{"scan", dataset::ScanNodeOptions{ds, scan_options}}, base_schema}; - return ProcessEmit(std::move(read), std::move(scan_declaration), - std::move(base_schema)); + return ProcessEmit(read, scan_declaration, base_schema); } case substrait::Rel::RelTypeCase::kFilter: { @@ -594,8 +592,7 @@ Result FromProto(const substrait::Rel& rel, const ExtensionSet& }), input.output_schema}; - return ProcessEmit(std::move(filter), std::move(filter_declaration), - input.output_schema); + return ProcessEmit(filter, filter_declaration, input.output_schema); } case substrait::Rel::RelTypeCase::kProject: { @@ -648,8 +645,7 @@ Result FromProto(const substrait::Rel& rel, const ExtensionSet& }), project_schema}; - return ProcessEmit(std::move(project), std::move(project_declaration), - std::move(project_schema)); + return ProcessEmit(project, project_declaration, project_schema); } case substrait::Rel::RelTypeCase::kJoin: { @@ -755,8 +751,7 @@ Result FromProto(const substrait::Rel& rel, const ExtensionSet& DeclarationInfo join_declaration{std::move(join_dec), join_schema}; - return ProcessEmit(std::move(join), std::move(join_declaration), - std::move(join_schema)); + return ProcessEmit(join, join_declaration, join_schema); } case substrait::Rel::RelTypeCase::kAggregate: { const auto& aggregate = rel.aggregate(); @@ -824,9 +819,8 @@ Result FromProto(const substrait::Rel& rel, const ExtensionSet& std::move(aggregates), std::move(agg_src_fieldsets), std::move(keys), std::move(key_field_ids), {}, {}, ext_set, conversion_options)); - auto aggregate_schema = aggregate_declaration.output_schema; - return ProcessEmit(std::move(aggregate), std::move(aggregate_declaration), - std::move(aggregate_schema)); + return ProcessEmit(aggregate, aggregate_declaration, + aggregate_declaration.output_schema); } case substrait::Rel::RelTypeCase::kExtensionLeaf: @@ -870,7 +864,7 @@ Result FromProto(const substrait::Rel& rel, const ExtensionSet& emit_order.push_back(emit_idx); } } - return ProcessExtensionEmit(std::move(ext_decl_info), emit_order, + return ProcessExtensionEmit(ext_decl_info, emit_order, *ext_rel_info.field_output_indices); } @@ -913,8 +907,7 @@ Result FromProto(const substrait::Rel& rel, const ExtensionSet& } auto set_declaration = DeclarationInfo{union_declr, union_schema}; - return ProcessEmit(std::move(set), std::move(set_declaration), - std::move(union_schema)); + return ProcessEmit(set, set_declaration, union_schema); } default: