westonpace commented on code in PR #14174:
URL: https://github.com/apache/arrow/pull/14174#discussion_r1010880898
##########
cpp/src/arrow/engine/substrait/serde_test.cc:
##########
@@ -3187,5 +3043,637 @@ TEST(Substrait, IsthmusPlan) {
*compute::default_exec_context(), buf, {},
conversion_options);
}
+TEST(Substrait, CompoundEmitFilterless) {
+#ifdef _WIN32
+ GTEST_SKIP() << "ARROW-16392: Substrait File URI not supported for Windows";
+#endif
Review Comment:
Is this still true? ARROW-16392 is resolved.
##########
cpp/src/arrow/engine/substrait/serde_test.cc:
##########
@@ -3187,5 +3043,637 @@ TEST(Substrait, IsthmusPlan) {
*compute::default_exec_context(), buf, {},
conversion_options);
}
+TEST(Substrait, CompoundEmitFilterless) {
+#ifdef _WIN32
+ GTEST_SKIP() << "ARROW-16392: Substrait File URI not supported for Windows";
+#endif
+ compute::ExecContext exec_context;
+ auto left_schema =
+ schema({field("A", int32()), field("B", int32()), field("C", int32()),
+ field("D", int32()), field("E", int32())});
+
+ auto right_schema =
+ schema({field("X", int32()), field("Y", int32()), field("W", int32()),
+ field("V", int32()), field("Z", int32())});
+
+ // creating a dummy dataset using a dummy table
+ auto left_table = TableFromJSON(left_schema, {R"([
+ [10, 1, 21, 32, 43],
+ [20, 2, 21, 32, 43],
+ [30, 3, 21, 32, 43],
+ [80, 2, 21, 52, 45],
+ [35, 31, 25, 36, 47]
+ ])"});
+
+ auto right_table = TableFromJSON(right_schema, {R"([
+ [10, 11, 25, 36, 47],
+ [80, 21, 25, 32, 40],
+ [32, 31, 25, 36, 42],
+ [30, 11, 25, 38, 44],
+ [33, 21, 24, 32, 41]
+ ])"});
+
+ std::string substrait_json = R"({
+ "relations": [{
+ "rel": {
+ "join": {
+ "common": {
+ "emit": {
+ "outputMapping": [0, 2, 3, 4, 6, 7]
+ }
+ },
+ "left": {
+ "project": {
+ "common": {
+ "emit": {
+ "outputMapping": [0, 1, 2, 5]
+ }
+ },
+ "expressions": [{
+ "scalarFunction": {
+ "functionReference": 32,
+ "arguments": [
+ {
+ "enum": {
+ "specified": "ERROR"
+ }
+ },
+ {
+ "value": {
+ "selection": {
+ "directReference": {
+ "structField": {
+ "field": 1
+ }
+ },
+ "rootReference": {
+ }
+ }
+ }
+ }, {
+ "value": {
+ "selection": {
+ "directReference": {
+ "structField": {
+ "field": 2
+ }
+ },
+ "rootReference": {
+ }
+ }
+ }
+ }
+ ],
+ "output_type": {
+ "bool": {}
+ }
+ }
+ },
+ ],
+ "input" : {
+ "read": {
+ "base_schema": {
+ "names": ["A", "B", "C", "D", "E"],
+ "struct": {
+ "types": [{
+ "i32": {}
+ }, {
+ "i32": {}
+ }, {
+ "i32": {}
+ }, {
+ "i32": {}
+ }, {
+ "i32": {}
+ }]
+ }
+ },
+ "namedTable": {
+ "names": ["left"]
+ }
+ }
+ }
+ }
+ },
+ "right": {
+ "project": {
+ "common": {
+ "emit": {
+ "outputMapping": [0, 1, 2, 5]
+ }
+ },
+ "expressions": [{
+ "scalarFunction": {
+ "functionReference": 32,
+ "arguments": [
+ {
+ "enum": {
+ "specified": "ERROR"
+ }
+ },
+ {
+ "value": {
+ "selection": {
+ "directReference": {
+ "structField": {
+ "field": 1
+ }
+ },
+ "rootReference": {
+ }
+ }
+ }
+ }, {
+ "value": {
+ "selection": {
+ "directReference": {
+ "structField": {
+ "field": 2
+ }
+ },
+ "rootReference": {
+ }
+ }
+ }
+ }
+ ],
+ "output_type": {
+ "bool": {}
+ }
+ }
+ },
+ ],
+ "input" : {
+ "read": {
+ "base_schema": {
+ "names": ["X", "Y", "W", "V", "Z"],
+ "struct": {
+ "types": [{
+ "i32": {}
+ }, {
+ "i32": {}
+ }, {
+ "i32": {}
+ }, {
+ "i32": {}
+ }, {
+ "i32": {}
+ }]
+ }
+ },
+ "namedTable": {
+ "names": ["right"]
+ }
+ }
+ }
+ }
+ },
+ "expression": {
+ "scalarFunction": {
+ "functionReference": 14,
+ "arguments": [{
+ "value": {
+ "selection": {
+ "directReference": {
+ "structField": {
+ "field": 0
+ }
+ },
+ "rootReference": {
+ }
+ }
+ }
+ }, {
+ "value": {
+ "selection": {
+ "directReference": {
+ "structField": {
+ "field": 0
+ }
+ },
+ "rootReference": {
+ }
+ }
+ }
+ }],
+ "output_type": {
+ "bool": {}
+ },
+ "overflow" : {
+ "ERROR": {}
+ }
+ }
+ },
+ "type": "JOIN_TYPE_INNER"
+ }
+ }
+ }],
+ "extension_uris": [
+ {
+ "extension_uri_anchor": 42,
+ "uri": ")" + std::string(kSubstraitComparisonFunctionsUri) +
+ R"("
+ },
+ {
+ "extension_uri_anchor": 72,
+ "uri": ")" + std::string(kSubstraitArithmeticFunctionsUri) +
+ R"("
+ }
+ ],
+ "extensions": [
+ {
+ "extension_function": {
+ "extension_uri_reference": 42,
+ "function_anchor": 14,
+ "name": "equal"
+ }
+ },
+ {
+ "extension_function": {
+ "extension_uri_reference": 72,
+ "function_anchor": 32,
+ "name": "add"
+ }
+ }
+ ]
+ })";
+
+ ASSERT_OK_AND_ASSIGN(auto buf, internal::SubstraitFromJSON("Plan",
substrait_json));
+ auto output_schema = schema({
+ field("A", int32()),
+ field("E", int32()),
+ field("B+C", int32()),
+ field("X", int32()),
+ field("Z", int32()),
+ field("Y+W", int32()),
+ });
+
+ auto expected_table = TableFromJSON(std::move(output_schema), {R"([
+ [10, 21, 22, 10, 25, 36],
+ [30, 21, 24, 30, 25, 36],
+ [80, 21, 23, 80, 25, 46]
+ ])"});
+
+ NamedTableProvider table_provider =
+ [left_table, right_table](const std::vector<std::string>& names) {
+ std::shared_ptr<Table> output_table;
+ for (const auto& name : names) {
+ if (name == "left") {
+ output_table = left_table;
+ }
+ if (name == "right") {
+ output_table = right_table;
+ }
+ }
+ std::shared_ptr<compute::ExecNodeOptions> options =
Review Comment:
Maybe `ASSERT_TRUE(!!output_table)` just to make sure?
##########
cpp/src/arrow/engine/substrait/test_util.cc:
##########
@@ -0,0 +1,117 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+// These utilities are for internal / unit test use only.
+// They allow for the construction of simple Substrait plans
+// programmatically without first requiring the construction
+// of an ExecPlan
+
+// These utilities have to be here, and not in a test_util.cc
+// file (or in a unit test) because only one .so is allowed
+// to include each .pb.h file or else protobuf will encounter
+// global namespace conflicts.
+
+#include "arrow/engine/substrait/test_util.h"
+#include "arrow/ipc/writer.h"
+#include "arrow/testing/gtest_util.h"
+
+namespace arrow {
+
+namespace engine {
+
+std::shared_ptr<DataType> StripFieldNames(std::shared_ptr<DataType> type) {
+ if (type->id() == Type::STRUCT) {
+ FieldVector fields(type->num_fields());
+ for (int i = 0; i < type->num_fields(); ++i) {
+ fields[i] = type->field(i)->WithName("");
+ }
+ return struct_(std::move(fields));
+ }
+
+ if (type->id() == Type::LIST) {
+ return list(type->field(0)->WithName(""));
+ }
+
+ return type;
+}
+
+void WriteIpcData(const std::string& path,
+ const std::shared_ptr<fs::FileSystem> file_system,
+ const std::shared_ptr<Table> input) {
+ EXPECT_OK_AND_ASSIGN(auto mmap, file_system->OpenOutputStream(path));
+ ASSERT_OK_AND_ASSIGN(
+ auto file_writer,
+ MakeFileWriter(mmap, input->schema(), ipc::IpcWriteOptions::Defaults()));
+ TableBatchReader reader(input);
+ std::shared_ptr<RecordBatch> batch;
+ while (true) {
+ ASSERT_OK(reader.ReadNext(&batch));
+ if (batch == nullptr) {
+ break;
+ }
+ ASSERT_OK(file_writer->WriteRecordBatch(*batch));
+ }
+ ASSERT_OK(file_writer->Close());
+}
+
+Result<std::shared_ptr<Table>> GetTableFromPlan(
+ compute::Declaration& other_declrs, compute::ExecContext& exec_context,
+ const std::shared_ptr<Schema>& output_schema) {
+ ARROW_ASSIGN_OR_RAISE(auto plan, compute::ExecPlan::Make(&exec_context));
+
+ arrow::AsyncGenerator<std::optional<compute::ExecBatch>> sink_gen;
+ auto sink_node_options = compute::SinkNodeOptions{&sink_gen};
+ auto sink_declaration = compute::Declaration({"sink", sink_node_options,
"e"});
+ auto declarations = compute::Declaration::Sequence({other_declrs,
sink_declaration});
+
+ ARROW_ASSIGN_OR_RAISE(auto decl, declarations.AddToPlan(plan.get()));
+
+ RETURN_NOT_OK(decl->Validate());
+
+ std::shared_ptr<arrow::RecordBatchReader> sink_reader =
compute::MakeGeneratorReader(
+ output_schema, std::move(sink_gen), exec_context.memory_pool());
+
+ RETURN_NOT_OK(plan->Validate());
+ RETURN_NOT_OK(plan->StartProducing());
+ return arrow::Table::FromRecordBatchReader(sink_reader.get());
+}
+
+void CheckRoundTripResult(const std::shared_ptr<Schema> output_schema,
+ const std::shared_ptr<Table> expected_table,
+ compute::ExecContext& exec_context,
+ std::shared_ptr<Buffer>& buf,
+ const std::vector<int>& include_columns,
+ const ConversionOptions& conversion_options) {
+ std::shared_ptr<ExtensionIdRegistry> sp_ext_id_reg =
MakeExtensionIdRegistry();
+ ExtensionIdRegistry* ext_id_reg = sp_ext_id_reg.get();
+ ExtensionSet ext_set(ext_id_reg);
+ ASSERT_OK_AND_ASSIGN(auto sink_decls, DeserializePlans(
+ *buf, [] { return kNullConsumer; },
+ ext_id_reg, &ext_set,
conversion_options));
+ auto other_declrs =
std::get_if<compute::Declaration>(&sink_decls[0].inputs[0]);
Review Comment:
```suggestion
auto other_declrs =
std::get_if<compute::Declaration>(&sink_decls[0].inputs[0]);
ASSERT_NE(other_declrs, nullptr);
```
##########
cpp/src/arrow/engine/substrait/serde_test.cc:
##########
@@ -3187,5 +3043,637 @@ TEST(Substrait, IsthmusPlan) {
*compute::default_exec_context(), buf, {},
conversion_options);
}
+TEST(Substrait, CompoundEmitFilterless) {
+#ifdef _WIN32
+ GTEST_SKIP() << "ARROW-16392: Substrait File URI not supported for Windows";
+#endif
+ compute::ExecContext exec_context;
+ auto left_schema =
+ schema({field("A", int32()), field("B", int32()), field("C", int32()),
+ field("D", int32()), field("E", int32())});
+
+ auto right_schema =
+ schema({field("X", int32()), field("Y", int32()), field("W", int32()),
+ field("V", int32()), field("Z", int32())});
+
+ // creating a dummy dataset using a dummy table
+ auto left_table = TableFromJSON(left_schema, {R"([
+ [10, 1, 21, 32, 43],
+ [20, 2, 21, 32, 43],
+ [30, 3, 21, 32, 43],
+ [80, 2, 21, 52, 45],
+ [35, 31, 25, 36, 47]
+ ])"});
+
+ auto right_table = TableFromJSON(right_schema, {R"([
+ [10, 11, 25, 36, 47],
+ [80, 21, 25, 32, 40],
+ [32, 31, 25, 36, 42],
+ [30, 11, 25, 38, 44],
+ [33, 21, 24, 32, 41]
+ ])"});
+
+ std::string substrait_json = R"({
+ "relations": [{
+ "rel": {
+ "join": {
+ "common": {
+ "emit": {
+ "outputMapping": [0, 2, 3, 4, 6, 7]
+ }
+ },
+ "left": {
+ "project": {
+ "common": {
+ "emit": {
+ "outputMapping": [0, 1, 2, 5]
+ }
+ },
+ "expressions": [{
+ "scalarFunction": {
+ "functionReference": 32,
+ "arguments": [
+ {
+ "enum": {
+ "specified": "ERROR"
+ }
+ },
+ {
+ "value": {
+ "selection": {
+ "directReference": {
+ "structField": {
+ "field": 1
+ }
+ },
+ "rootReference": {
+ }
+ }
+ }
+ }, {
+ "value": {
+ "selection": {
+ "directReference": {
+ "structField": {
+ "field": 2
+ }
+ },
+ "rootReference": {
+ }
+ }
+ }
+ }
+ ],
+ "output_type": {
+ "bool": {}
+ }
+ }
+ },
+ ],
+ "input" : {
+ "read": {
+ "base_schema": {
+ "names": ["A", "B", "C", "D", "E"],
+ "struct": {
+ "types": [{
+ "i32": {}
+ }, {
+ "i32": {}
+ }, {
+ "i32": {}
+ }, {
+ "i32": {}
+ }, {
+ "i32": {}
+ }]
+ }
+ },
+ "namedTable": {
+ "names": ["left"]
+ }
+ }
+ }
+ }
+ },
+ "right": {
+ "project": {
+ "common": {
+ "emit": {
+ "outputMapping": [0, 1, 2, 5]
+ }
+ },
+ "expressions": [{
+ "scalarFunction": {
+ "functionReference": 32,
+ "arguments": [
+ {
+ "enum": {
+ "specified": "ERROR"
+ }
+ },
+ {
+ "value": {
+ "selection": {
+ "directReference": {
+ "structField": {
+ "field": 1
+ }
+ },
+ "rootReference": {
+ }
+ }
+ }
+ }, {
+ "value": {
+ "selection": {
+ "directReference": {
+ "structField": {
+ "field": 2
+ }
+ },
+ "rootReference": {
+ }
+ }
+ }
+ }
+ ],
+ "output_type": {
+ "bool": {}
+ }
+ }
+ },
+ ],
+ "input" : {
+ "read": {
+ "base_schema": {
+ "names": ["X", "Y", "W", "V", "Z"],
+ "struct": {
+ "types": [{
+ "i32": {}
+ }, {
+ "i32": {}
+ }, {
+ "i32": {}
+ }, {
+ "i32": {}
+ }, {
+ "i32": {}
+ }]
+ }
+ },
+ "namedTable": {
+ "names": ["right"]
+ }
+ }
+ }
+ }
+ },
+ "expression": {
+ "scalarFunction": {
+ "functionReference": 14,
+ "arguments": [{
+ "value": {
+ "selection": {
+ "directReference": {
+ "structField": {
+ "field": 0
+ }
+ },
+ "rootReference": {
+ }
+ }
+ }
+ }, {
+ "value": {
+ "selection": {
+ "directReference": {
+ "structField": {
+ "field": 0
+ }
+ },
+ "rootReference": {
+ }
+ }
+ }
+ }],
+ "output_type": {
+ "bool": {}
+ },
+ "overflow" : {
+ "ERROR": {}
+ }
+ }
+ },
+ "type": "JOIN_TYPE_INNER"
+ }
+ }
+ }],
+ "extension_uris": [
+ {
+ "extension_uri_anchor": 42,
+ "uri": ")" + std::string(kSubstraitComparisonFunctionsUri) +
+ R"("
+ },
+ {
+ "extension_uri_anchor": 72,
+ "uri": ")" + std::string(kSubstraitArithmeticFunctionsUri) +
+ R"("
+ }
+ ],
+ "extensions": [
+ {
+ "extension_function": {
+ "extension_uri_reference": 42,
+ "function_anchor": 14,
+ "name": "equal"
+ }
+ },
+ {
+ "extension_function": {
+ "extension_uri_reference": 72,
+ "function_anchor": 32,
+ "name": "add"
+ }
+ }
+ ]
+ })";
+
+ ASSERT_OK_AND_ASSIGN(auto buf, internal::SubstraitFromJSON("Plan",
substrait_json));
+ auto output_schema = schema({
+ field("A", int32()),
+ field("E", int32()),
+ field("B+C", int32()),
+ field("X", int32()),
+ field("Z", int32()),
+ field("Y+W", int32()),
+ });
+
+ auto expected_table = TableFromJSON(std::move(output_schema), {R"([
+ [10, 21, 22, 10, 25, 36],
+ [30, 21, 24, 30, 25, 36],
+ [80, 21, 23, 80, 25, 46]
+ ])"});
+
+ NamedTableProvider table_provider =
+ [left_table, right_table](const std::vector<std::string>& names) {
+ std::shared_ptr<Table> output_table;
+ for (const auto& name : names) {
+ if (name == "left") {
+ output_table = left_table;
+ }
+ if (name == "right") {
+ output_table = right_table;
+ }
+ }
+ std::shared_ptr<compute::ExecNodeOptions> options =
+
std::make_shared<compute::TableSourceNodeOptions>(std::move(output_table));
+ return compute::Declaration("table_source", {}, options,
"mock_source");
+ };
+
+ ConversionOptions conversion_options;
+ conversion_options.named_table_provider = std::move(table_provider);
+
+ CheckRoundTripResult(std::move(output_schema), std::move(expected_table),
exec_context,
+ buf, {}, conversion_options);
+}
+
+TEST(Substrait, CompoundEmitWithFilter) {
+#ifdef _WIN32
+ GTEST_SKIP() << "ARROW-16392: Substrait File URI not supported for Windows";
+#endif
Review Comment:
Same comment as above.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
