westonpace commented on code in PR #14174:
URL: https://github.com/apache/arrow/pull/14174#discussion_r1022347947
##########
cpp/src/arrow/engine/substrait/serde_test.cc:
##########
@@ -3692,5 +3536,641 @@ TEST(Substrait, ReadRelWithGlobFiles) {
buf, {}, {}, &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": 4
+ }
+ },
+ "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()),
Review Comment:
```suggestion
field("C", int32()),
```
##########
cpp/src/arrow/engine/substrait/serde_test.cc:
##########
@@ -3692,5 +3536,641 @@ TEST(Substrait, ReadRelWithGlobFiles) {
buf, {}, {}, &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": 4
+ }
+ },
+ "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()),
Review Comment:
```suggestion
field("W", int32()),
```
##########
cpp/src/arrow/engine/substrait/test_util.h:
##########
@@ -0,0 +1,118 @@
+// 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/compute/exec/exec_plan.h"
+#include "arrow/compute/exec/expression_internal.h"
+#include "arrow/dataset/file_base.h"
+#include "arrow/engine/substrait/util.h"
+#include "arrow/table.h"
+#include "arrow/testing/gtest_util.h"
+
+namespace arrow {
+
+namespace engine {
+
+class NullSinkNodeConsumer : public compute::SinkNodeConsumer {
+ public:
+ Status Init(const std::shared_ptr<Schema>&, compute::BackpressureControl*)
override {
+ return Status::OK();
+ }
+ Status Consume(compute::ExecBatch exec_batch) override { return
Status::OK(); }
+ Future<> Finish() override { return Status::OK(); }
+
+ public:
+ static std::shared_ptr<NullSinkNodeConsumer> Make() {
+ return std::make_shared<NullSinkNodeConsumer>();
+ }
+};
+
+const auto kNullConsumer = std::make_shared<NullSinkNodeConsumer>();
+
+const std::shared_ptr<Schema> kBoringSchema = schema({
+ field("bool", boolean()),
+ field("i8", int8()),
+ field("i32", int32()),
+ field("i32_req", int32(), /*nullable=*/false),
+ field("u32", uint32()),
+ field("i64", int64()),
+ field("f32", float32()),
+ field("f32_req", float32(), /*nullable=*/false),
+ field("f64", float64()),
+ field("date64", date64()),
+ field("str", utf8()),
+ field("list_i32", list(int32())),
+ field("struct", struct_({
+ field("i32", int32()),
+ field("str", utf8()),
+ field("struct_i32_str",
+ struct_({field("i32", int32()), field("str",
utf8())})),
+ })),
+ field("list_struct", list(struct_({
+ field("i32", int32()),
+ field("str", utf8()),
+ field("struct_i32_str", struct_({field("i32",
int32()),
+ field("str",
utf8())})),
+ }))),
+ field("dict_str", dictionary(int32(), utf8())),
+ field("dict_i32", dictionary(int32(), int32())),
+ field("ts_ns", timestamp(TimeUnit::NANO)),
+});
+
+ARROW_ENGINE_EXPORT std::shared_ptr<DataType> StripFieldNames(
+ std::shared_ptr<DataType> type);
+
+inline compute::Expression UseBoringRefs(const compute::Expression& expr) {
+ if (expr.literal()) return expr;
+
+ if (auto ref = expr.field_ref()) {
+ return compute::field_ref(*ref->FindOne(*kBoringSchema));
+ }
+
+ auto modified_call = *CallNotNull(expr);
+ for (auto& arg : modified_call.arguments) {
+ arg = UseBoringRefs(arg);
+ }
+ return compute::Expression{std::move(modified_call)};
+}
Review Comment:
Why did these two methods have to move to a header file?
--
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]
