ARROW-16855: [C++] Adding Read Relation ToProto - #13401

Merged
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855
Sep 8, 2022
Merged

ARROW-16855: [C++] Adding Read Relation ToProto#13401
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855

Conversation

@vibhatha

Copy link
Copy Markdown
Contributor

This is the initial PR to set the util functions and structure to include the ToProto functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation.
In this PR the read relation ToProto is added.

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

⚠️ Ticket has no components in JIRA, make sure you assign one.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

cc @westonpace added the initial PR to integrate ToProto for relations. The detailed task breakdown for ToProto is documented in here: https://issues.apache.org/jira/browse/ARROW-16854

The idea is to add part by part in smaller PRs.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

Wednesday works for me 👍

@jvanstraten

Copy link
Copy Markdown
Contributor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

Thanks a lot for the quick check on this. It’s very interesting how you validated things using the tool. Do you think it’s wise to add a CI to test Substrait related queries using this tool?

Please feel free to add suggestions. @jvanstraten

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

cc @westonpace For future reference in the review.

@jvanstraten

Copy link
Copy Markdown
Contributor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

Here it is rather, the differentiation between a user passed value vs the default. We could assume the default and do the comparison to see if an explicit value is passed. There is no API calls in Expression to check if it has_filter or has_projection. May be that kind of a function could be useful.

@vibhatha
vibhatha marked this pull request as ready for review June 23, 2022 12:58

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the long delay. I have a few suggestions but overall I think this looks good.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Should we create a JIRA for this?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/tmp/ will not be portable once we support Windows URIs. Can you use arrow::internal::TemporaryDir from arrow/util/io_util.h?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we got an issue with Windows paths already in Substrait? We have added a skip for Windows tests.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a missing path support.

GTEST_SKIP() << "ARROW-16392: Substrait File URI not supported for Windows";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but that JIRA will eventually be fixed. We don't want to make it harder to support Windows.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be okay now. I updated the test case.

Comment on lines 1484 to 1571

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting here seems off

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping: when I reformatted it comes to this shape. I tried a few times. Not sure what's wrong.

Comment on lines 1500 to 1501

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand this note.

@vibhathavibhathaJul 12, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah instead of just saying test.parquet we say /test.parquet

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the des prefix for? Can you use a whole word?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

des was meant to represent deserialized. I will update it's usage.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

We got rid of that. By the way this could would remain very much same, but ths usage would be different once this is subjected to a registry usage in Substrait ToProto methods.

@vibhatha
vibhatha marked this pull request as draft July 13, 2022 07:16
@vibhatha

vibhatha commented Jul 13, 2022

Copy link
Copy Markdown
ContributorAuthor

** THIS PR IS UNDERGOING A REFACTOR **

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I added a fix for the path issue on Mac. I think now it is more generalized.

Any other suggestions?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is close. Mostly just some cleanup comments at this point.

Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
}
read_rel_lfs->mutable_items()->AddAllocated(read_rel_lfs_ffs.release());
}
read_rel->set_allocated_local_files(read_rel_lfs.release());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have a follow-up JIRA to add support for scan options projection & filter? I don't think it should be done as part of this JIRA since it is changing.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.h Outdated
Comment threadcpp/src/arrow/util/io_util.cc Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I updated the PR. Seems like a few CIs are failing. But, it seems like not related to the changes applied here.
WDYT?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sticking with this.

@westonpace
westonpace merged commit 7475605 into apache:masterSep 8, 2022
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace Thanks a lot for keeping up with the major changes and a few rounds of reviews. 👍

@ursabot

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 8fe7e35 and contender = 7475605. 7475605 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Finished ⬇️0.31% ⬆️0.2%] test-mac-arm
[Failed ⬇️0.0% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.46% ⬆️0.0%] ursa-thinkcentre-m75q
Buildkite builds:
[Finished] 74756051 ec2-t3-xlarge-us-east-2
[Finished] 74756051 test-mac-arm
[Failed] 74756051 ursa-i9-9960x
[Finished] 74756051 ursa-thinkcentre-m75q
[Finished] 8fe7e353 ec2-t3-xlarge-us-east-2
[Finished] 8fe7e353 test-mac-arm
[Failed] 8fe7e353 ursa-i9-9960x
[Finished] 8fe7e353 ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

zagto pushed a commit to zagto/arrow that referenced this pull request Oct 7, 2022
This is the initial PR to set the util functions and structure to include the `ToProto` functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation. In this PR the `read` relation ToProto is added. Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@vibhatha@westonpace@jvanstraten@bkietz@ursabot@lidavidm
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

ARROW-16855: [C++] Adding Read Relation ToProto - #13401

Merged
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855
Sep 8, 2022
Merged

ARROW-16855: [C++] Adding Read Relation ToProto#13401
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855

Conversation

@vibhatha

Copy link
Copy Markdown
Contributor

This is the initial PR to set the util functions and structure to include the ToProto functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation.
In this PR the read relation ToProto is added.

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

⚠️ Ticket has no components in JIRA, make sure you assign one.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

cc @westonpace added the initial PR to integrate ToProto for relations. The detailed task breakdown for ToProto is documented in here: https://issues.apache.org/jira/browse/ARROW-16854

The idea is to add part by part in smaller PRs.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

Wednesday works for me 👍

@jvanstraten

Copy link
Copy Markdown
Contributor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

Thanks a lot for the quick check on this. It’s very interesting how you validated things using the tool. Do you think it’s wise to add a CI to test Substrait related queries using this tool?

Please feel free to add suggestions. @jvanstraten

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

cc @westonpace For future reference in the review.

@jvanstraten

Copy link
Copy Markdown
Contributor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

Here it is rather, the differentiation between a user passed value vs the default. We could assume the default and do the comparison to see if an explicit value is passed. There is no API calls in Expression to check if it has_filter or has_projection. May be that kind of a function could be useful.

@vibhatha
vibhatha marked this pull request as ready for review June 23, 2022 12:58

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the long delay. I have a few suggestions but overall I think this looks good.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Should we create a JIRA for this?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/tmp/ will not be portable once we support Windows URIs. Can you use arrow::internal::TemporaryDir from arrow/util/io_util.h?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we got an issue with Windows paths already in Substrait? We have added a skip for Windows tests.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a missing path support.

GTEST_SKIP() << "ARROW-16392: Substrait File URI not supported for Windows";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but that JIRA will eventually be fixed. We don't want to make it harder to support Windows.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be okay now. I updated the test case.

Comment on lines 1484 to 1571

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting here seems off

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping: when I reformatted it comes to this shape. I tried a few times. Not sure what's wrong.

Comment on lines 1500 to 1501

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand this note.

@vibhathavibhathaJul 12, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah instead of just saying test.parquet we say /test.parquet

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the des prefix for? Can you use a whole word?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

des was meant to represent deserialized. I will update it's usage.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

We got rid of that. By the way this could would remain very much same, but ths usage would be different once this is subjected to a registry usage in Substrait ToProto methods.

@vibhatha
vibhatha marked this pull request as draft July 13, 2022 07:16
@vibhatha

vibhatha commented Jul 13, 2022

Copy link
Copy Markdown
ContributorAuthor

** THIS PR IS UNDERGOING A REFACTOR **

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I added a fix for the path issue on Mac. I think now it is more generalized.

Any other suggestions?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is close. Mostly just some cleanup comments at this point.

Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
}
read_rel_lfs->mutable_items()->AddAllocated(read_rel_lfs_ffs.release());
}
read_rel->set_allocated_local_files(read_rel_lfs.release());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have a follow-up JIRA to add support for scan options projection & filter? I don't think it should be done as part of this JIRA since it is changing.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.h Outdated
Comment threadcpp/src/arrow/util/io_util.cc Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I updated the PR. Seems like a few CIs are failing. But, it seems like not related to the changes applied here.
WDYT?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sticking with this.

@westonpace
westonpace merged commit 7475605 into apache:masterSep 8, 2022
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace Thanks a lot for keeping up with the major changes and a few rounds of reviews. 👍

@ursabot

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 8fe7e35 and contender = 7475605. 7475605 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Finished ⬇️0.31% ⬆️0.2%] test-mac-arm
[Failed ⬇️0.0% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.46% ⬆️0.0%] ursa-thinkcentre-m75q
Buildkite builds:
[Finished] 74756051 ec2-t3-xlarge-us-east-2
[Finished] 74756051 test-mac-arm
[Failed] 74756051 ursa-i9-9960x
[Finished] 74756051 ursa-thinkcentre-m75q
[Finished] 8fe7e353 ec2-t3-xlarge-us-east-2
[Finished] 8fe7e353 test-mac-arm
[Failed] 8fe7e353 ursa-i9-9960x
[Finished] 8fe7e353 ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

zagto pushed a commit to zagto/arrow that referenced this pull request Oct 7, 2022
This is the initial PR to set the util functions and structure to include the `ToProto` functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation. In this PR the `read` relation ToProto is added. Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@vibhatha@westonpace@jvanstraten@bkietz@ursabot@lidavidm
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ARROW-16855: [C++] Adding Read Relation ToProto - #13401

Merged
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855
Sep 8, 2022
Merged

ARROW-16855: [C++] Adding Read Relation ToProto#13401
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855

Conversation

@vibhatha

Copy link
Copy Markdown
Contributor

This is the initial PR to set the util functions and structure to include the ToProto functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation.
In this PR the read relation ToProto is added.

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

⚠️ Ticket has no components in JIRA, make sure you assign one.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

cc @westonpace added the initial PR to integrate ToProto for relations. The detailed task breakdown for ToProto is documented in here: https://issues.apache.org/jira/browse/ARROW-16854

The idea is to add part by part in smaller PRs.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

Wednesday works for me 👍

@jvanstraten

Copy link
Copy Markdown
Contributor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

Thanks a lot for the quick check on this. It’s very interesting how you validated things using the tool. Do you think it’s wise to add a CI to test Substrait related queries using this tool?

Please feel free to add suggestions. @jvanstraten

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

cc @westonpace For future reference in the review.

@jvanstraten

Copy link
Copy Markdown
Contributor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

Here it is rather, the differentiation between a user passed value vs the default. We could assume the default and do the comparison to see if an explicit value is passed. There is no API calls in Expression to check if it has_filter or has_projection. May be that kind of a function could be useful.

@vibhatha
vibhatha marked this pull request as ready for review June 23, 2022 12:58

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the long delay. I have a few suggestions but overall I think this looks good.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Should we create a JIRA for this?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/tmp/ will not be portable once we support Windows URIs. Can you use arrow::internal::TemporaryDir from arrow/util/io_util.h?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we got an issue with Windows paths already in Substrait? We have added a skip for Windows tests.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a missing path support.

GTEST_SKIP() << "ARROW-16392: Substrait File URI not supported for Windows";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but that JIRA will eventually be fixed. We don't want to make it harder to support Windows.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be okay now. I updated the test case.

Comment on lines 1484 to 1571

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting here seems off

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping: when I reformatted it comes to this shape. I tried a few times. Not sure what's wrong.

Comment on lines 1500 to 1501

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand this note.

@vibhathavibhathaJul 12, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah instead of just saying test.parquet we say /test.parquet

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the des prefix for? Can you use a whole word?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

des was meant to represent deserialized. I will update it's usage.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

We got rid of that. By the way this could would remain very much same, but ths usage would be different once this is subjected to a registry usage in Substrait ToProto methods.

@vibhatha
vibhatha marked this pull request as draft July 13, 2022 07:16
@vibhatha

vibhatha commented Jul 13, 2022

Copy link
Copy Markdown
ContributorAuthor

** THIS PR IS UNDERGOING A REFACTOR **

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I added a fix for the path issue on Mac. I think now it is more generalized.

Any other suggestions?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is close. Mostly just some cleanup comments at this point.

Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
}
read_rel_lfs->mutable_items()->AddAllocated(read_rel_lfs_ffs.release());
}
read_rel->set_allocated_local_files(read_rel_lfs.release());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have a follow-up JIRA to add support for scan options projection & filter? I don't think it should be done as part of this JIRA since it is changing.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.h Outdated
Comment threadcpp/src/arrow/util/io_util.cc Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I updated the PR. Seems like a few CIs are failing. But, it seems like not related to the changes applied here.
WDYT?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sticking with this.

@westonpace
westonpace merged commit 7475605 into apache:masterSep 8, 2022
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace Thanks a lot for keeping up with the major changes and a few rounds of reviews. 👍

@ursabot

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 8fe7e35 and contender = 7475605. 7475605 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Finished ⬇️0.31% ⬆️0.2%] test-mac-arm
[Failed ⬇️0.0% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.46% ⬆️0.0%] ursa-thinkcentre-m75q
Buildkite builds:
[Finished] 74756051 ec2-t3-xlarge-us-east-2
[Finished] 74756051 test-mac-arm
[Failed] 74756051 ursa-i9-9960x
[Finished] 74756051 ursa-thinkcentre-m75q
[Finished] 8fe7e353 ec2-t3-xlarge-us-east-2
[Finished] 8fe7e353 test-mac-arm
[Failed] 8fe7e353 ursa-i9-9960x
[Finished] 8fe7e353 ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

zagto pushed a commit to zagto/arrow that referenced this pull request Oct 7, 2022
This is the initial PR to set the util functions and structure to include the `ToProto` functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation. In this PR the `read` relation ToProto is added. Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@vibhatha@westonpace@jvanstraten@bkietz@ursabot@lidavidm
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ARROW-16855: [C++] Adding Read Relation ToProto - #13401

Merged
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855
Sep 8, 2022
Merged

ARROW-16855: [C++] Adding Read Relation ToProto#13401
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855

Conversation

@vibhatha

Copy link
Copy Markdown
Contributor

This is the initial PR to set the util functions and structure to include the ToProto functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation.
In this PR the read relation ToProto is added.

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

⚠️ Ticket has no components in JIRA, make sure you assign one.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

cc @westonpace added the initial PR to integrate ToProto for relations. The detailed task breakdown for ToProto is documented in here: https://issues.apache.org/jira/browse/ARROW-16854

The idea is to add part by part in smaller PRs.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

Wednesday works for me 👍

@jvanstraten

Copy link
Copy Markdown
Contributor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

Thanks a lot for the quick check on this. It’s very interesting how you validated things using the tool. Do you think it’s wise to add a CI to test Substrait related queries using this tool?

Please feel free to add suggestions. @jvanstraten

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

cc @westonpace For future reference in the review.

@jvanstraten

Copy link
Copy Markdown
Contributor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

Here it is rather, the differentiation between a user passed value vs the default. We could assume the default and do the comparison to see if an explicit value is passed. There is no API calls in Expression to check if it has_filter or has_projection. May be that kind of a function could be useful.

@vibhatha
vibhatha marked this pull request as ready for review June 23, 2022 12:58

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the long delay. I have a few suggestions but overall I think this looks good.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Should we create a JIRA for this?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/tmp/ will not be portable once we support Windows URIs. Can you use arrow::internal::TemporaryDir from arrow/util/io_util.h?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we got an issue with Windows paths already in Substrait? We have added a skip for Windows tests.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a missing path support.

GTEST_SKIP() << "ARROW-16392: Substrait File URI not supported for Windows";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but that JIRA will eventually be fixed. We don't want to make it harder to support Windows.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be okay now. I updated the test case.

Comment on lines 1484 to 1571

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting here seems off

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping: when I reformatted it comes to this shape. I tried a few times. Not sure what's wrong.

Comment on lines 1500 to 1501

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand this note.

@vibhathavibhathaJul 12, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah instead of just saying test.parquet we say /test.parquet

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the des prefix for? Can you use a whole word?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

des was meant to represent deserialized. I will update it's usage.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

We got rid of that. By the way this could would remain very much same, but ths usage would be different once this is subjected to a registry usage in Substrait ToProto methods.

@vibhatha
vibhatha marked this pull request as draft July 13, 2022 07:16
@vibhatha

vibhatha commented Jul 13, 2022

Copy link
Copy Markdown
ContributorAuthor

** THIS PR IS UNDERGOING A REFACTOR **

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I added a fix for the path issue on Mac. I think now it is more generalized.

Any other suggestions?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is close. Mostly just some cleanup comments at this point.

Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
}
read_rel_lfs->mutable_items()->AddAllocated(read_rel_lfs_ffs.release());
}
read_rel->set_allocated_local_files(read_rel_lfs.release());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have a follow-up JIRA to add support for scan options projection & filter? I don't think it should be done as part of this JIRA since it is changing.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.h Outdated
Comment threadcpp/src/arrow/util/io_util.cc Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I updated the PR. Seems like a few CIs are failing. But, it seems like not related to the changes applied here.
WDYT?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sticking with this.

@westonpace
westonpace merged commit 7475605 into apache:masterSep 8, 2022
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace Thanks a lot for keeping up with the major changes and a few rounds of reviews. 👍

@ursabot

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 8fe7e35 and contender = 7475605. 7475605 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Finished ⬇️0.31% ⬆️0.2%] test-mac-arm
[Failed ⬇️0.0% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.46% ⬆️0.0%] ursa-thinkcentre-m75q
Buildkite builds:
[Finished] 74756051 ec2-t3-xlarge-us-east-2
[Finished] 74756051 test-mac-arm
[Failed] 74756051 ursa-i9-9960x
[Finished] 74756051 ursa-thinkcentre-m75q
[Finished] 8fe7e353 ec2-t3-xlarge-us-east-2
[Finished] 8fe7e353 test-mac-arm
[Failed] 8fe7e353 ursa-i9-9960x
[Finished] 8fe7e353 ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

zagto pushed a commit to zagto/arrow that referenced this pull request Oct 7, 2022
This is the initial PR to set the util functions and structure to include the `ToProto` functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation. In this PR the `read` relation ToProto is added. Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@vibhatha@westonpace@jvanstraten@bkietz@ursabot@lidavidm
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

ARROW-16855: [C++] Adding Read Relation ToProto - #13401

Merged
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855
Sep 8, 2022
Merged

ARROW-16855: [C++] Adding Read Relation ToProto#13401
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855

Conversation

@vibhatha

Copy link
Copy Markdown
Contributor

This is the initial PR to set the util functions and structure to include the ToProto functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation.
In this PR the read relation ToProto is added.

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

⚠️ Ticket has no components in JIRA, make sure you assign one.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

cc @westonpace added the initial PR to integrate ToProto for relations. The detailed task breakdown for ToProto is documented in here: https://issues.apache.org/jira/browse/ARROW-16854

The idea is to add part by part in smaller PRs.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

Wednesday works for me 👍

@jvanstraten

Copy link
Copy Markdown
Contributor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

Thanks a lot for the quick check on this. It’s very interesting how you validated things using the tool. Do you think it’s wise to add a CI to test Substrait related queries using this tool?

Please feel free to add suggestions. @jvanstraten

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

cc @westonpace For future reference in the review.

@jvanstraten

Copy link
Copy Markdown
Contributor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

Here it is rather, the differentiation between a user passed value vs the default. We could assume the default and do the comparison to see if an explicit value is passed. There is no API calls in Expression to check if it has_filter or has_projection. May be that kind of a function could be useful.

@vibhatha
vibhatha marked this pull request as ready for review June 23, 2022 12:58

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the long delay. I have a few suggestions but overall I think this looks good.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Should we create a JIRA for this?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/tmp/ will not be portable once we support Windows URIs. Can you use arrow::internal::TemporaryDir from arrow/util/io_util.h?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we got an issue with Windows paths already in Substrait? We have added a skip for Windows tests.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a missing path support.

GTEST_SKIP() << "ARROW-16392: Substrait File URI not supported for Windows";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but that JIRA will eventually be fixed. We don't want to make it harder to support Windows.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be okay now. I updated the test case.

Comment on lines 1484 to 1571

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting here seems off

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping: when I reformatted it comes to this shape. I tried a few times. Not sure what's wrong.

Comment on lines 1500 to 1501

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand this note.

@vibhathavibhathaJul 12, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah instead of just saying test.parquet we say /test.parquet

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the des prefix for? Can you use a whole word?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

des was meant to represent deserialized. I will update it's usage.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

We got rid of that. By the way this could would remain very much same, but ths usage would be different once this is subjected to a registry usage in Substrait ToProto methods.

@vibhatha
vibhatha marked this pull request as draft July 13, 2022 07:16
@vibhatha

vibhatha commented Jul 13, 2022

Copy link
Copy Markdown
ContributorAuthor

** THIS PR IS UNDERGOING A REFACTOR **

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I added a fix for the path issue on Mac. I think now it is more generalized.

Any other suggestions?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is close. Mostly just some cleanup comments at this point.

Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
}
read_rel_lfs->mutable_items()->AddAllocated(read_rel_lfs_ffs.release());
}
read_rel->set_allocated_local_files(read_rel_lfs.release());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have a follow-up JIRA to add support for scan options projection & filter? I don't think it should be done as part of this JIRA since it is changing.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.h Outdated
Comment threadcpp/src/arrow/util/io_util.cc Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I updated the PR. Seems like a few CIs are failing. But, it seems like not related to the changes applied here.
WDYT?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sticking with this.

@westonpace
westonpace merged commit 7475605 into apache:masterSep 8, 2022
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace Thanks a lot for keeping up with the major changes and a few rounds of reviews. 👍

@ursabot

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 8fe7e35 and contender = 7475605. 7475605 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Finished ⬇️0.31% ⬆️0.2%] test-mac-arm
[Failed ⬇️0.0% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.46% ⬆️0.0%] ursa-thinkcentre-m75q
Buildkite builds:
[Finished] 74756051 ec2-t3-xlarge-us-east-2
[Finished] 74756051 test-mac-arm
[Failed] 74756051 ursa-i9-9960x
[Finished] 74756051 ursa-thinkcentre-m75q
[Finished] 8fe7e353 ec2-t3-xlarge-us-east-2
[Finished] 8fe7e353 test-mac-arm
[Failed] 8fe7e353 ursa-i9-9960x
[Finished] 8fe7e353 ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

zagto pushed a commit to zagto/arrow that referenced this pull request Oct 7, 2022
This is the initial PR to set the util functions and structure to include the `ToProto` functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation. In this PR the `read` relation ToProto is added. Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@vibhatha@westonpace@jvanstraten@bkietz@ursabot@lidavidm
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ARROW-16855: [C++] Adding Read Relation ToProto - #13401

Merged
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855
Sep 8, 2022
Merged

ARROW-16855: [C++] Adding Read Relation ToProto#13401
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855

Conversation

@vibhatha

Copy link
Copy Markdown
Contributor

This is the initial PR to set the util functions and structure to include the ToProto functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation.
In this PR the read relation ToProto is added.

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

⚠️ Ticket has no components in JIRA, make sure you assign one.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

cc @westonpace added the initial PR to integrate ToProto for relations. The detailed task breakdown for ToProto is documented in here: https://issues.apache.org/jira/browse/ARROW-16854

The idea is to add part by part in smaller PRs.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

Wednesday works for me 👍

@jvanstraten

Copy link
Copy Markdown
Contributor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

Thanks a lot for the quick check on this. It’s very interesting how you validated things using the tool. Do you think it’s wise to add a CI to test Substrait related queries using this tool?

Please feel free to add suggestions. @jvanstraten

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

cc @westonpace For future reference in the review.

@jvanstraten

Copy link
Copy Markdown
Contributor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

Here it is rather, the differentiation between a user passed value vs the default. We could assume the default and do the comparison to see if an explicit value is passed. There is no API calls in Expression to check if it has_filter or has_projection. May be that kind of a function could be useful.

@vibhatha
vibhatha marked this pull request as ready for review June 23, 2022 12:58

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the long delay. I have a few suggestions but overall I think this looks good.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Should we create a JIRA for this?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/tmp/ will not be portable once we support Windows URIs. Can you use arrow::internal::TemporaryDir from arrow/util/io_util.h?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we got an issue with Windows paths already in Substrait? We have added a skip for Windows tests.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a missing path support.

GTEST_SKIP() << "ARROW-16392: Substrait File URI not supported for Windows";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but that JIRA will eventually be fixed. We don't want to make it harder to support Windows.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be okay now. I updated the test case.

Comment on lines 1484 to 1571

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting here seems off

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping: when I reformatted it comes to this shape. I tried a few times. Not sure what's wrong.

Comment on lines 1500 to 1501

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand this note.

@vibhathavibhathaJul 12, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah instead of just saying test.parquet we say /test.parquet

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the des prefix for? Can you use a whole word?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

des was meant to represent deserialized. I will update it's usage.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

We got rid of that. By the way this could would remain very much same, but ths usage would be different once this is subjected to a registry usage in Substrait ToProto methods.

@vibhatha
vibhatha marked this pull request as draft July 13, 2022 07:16
@vibhatha

vibhatha commented Jul 13, 2022

Copy link
Copy Markdown
ContributorAuthor

** THIS PR IS UNDERGOING A REFACTOR **

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I added a fix for the path issue on Mac. I think now it is more generalized.

Any other suggestions?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is close. Mostly just some cleanup comments at this point.

Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
}
read_rel_lfs->mutable_items()->AddAllocated(read_rel_lfs_ffs.release());
}
read_rel->set_allocated_local_files(read_rel_lfs.release());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have a follow-up JIRA to add support for scan options projection & filter? I don't think it should be done as part of this JIRA since it is changing.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.h Outdated
Comment threadcpp/src/arrow/util/io_util.cc Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I updated the PR. Seems like a few CIs are failing. But, it seems like not related to the changes applied here.
WDYT?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sticking with this.

@westonpace
westonpace merged commit 7475605 into apache:masterSep 8, 2022
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace Thanks a lot for keeping up with the major changes and a few rounds of reviews. 👍

@ursabot

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 8fe7e35 and contender = 7475605. 7475605 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Finished ⬇️0.31% ⬆️0.2%] test-mac-arm
[Failed ⬇️0.0% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.46% ⬆️0.0%] ursa-thinkcentre-m75q
Buildkite builds:
[Finished] 74756051 ec2-t3-xlarge-us-east-2
[Finished] 74756051 test-mac-arm
[Failed] 74756051 ursa-i9-9960x
[Finished] 74756051 ursa-thinkcentre-m75q
[Finished] 8fe7e353 ec2-t3-xlarge-us-east-2
[Finished] 8fe7e353 test-mac-arm
[Failed] 8fe7e353 ursa-i9-9960x
[Finished] 8fe7e353 ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

zagto pushed a commit to zagto/arrow that referenced this pull request Oct 7, 2022
This is the initial PR to set the util functions and structure to include the `ToProto` functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation. In this PR the `read` relation ToProto is added. Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@vibhatha@westonpace@jvanstraten@bkietz@ursabot@lidavidm
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ARROW-16855: [C++] Adding Read Relation ToProto - #13401

Merged
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855
Sep 8, 2022
Merged

ARROW-16855: [C++] Adding Read Relation ToProto#13401
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855

Conversation

@vibhatha

Copy link
Copy Markdown
Contributor

This is the initial PR to set the util functions and structure to include the ToProto functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation.
In this PR the read relation ToProto is added.

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

⚠️ Ticket has no components in JIRA, make sure you assign one.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

cc @westonpace added the initial PR to integrate ToProto for relations. The detailed task breakdown for ToProto is documented in here: https://issues.apache.org/jira/browse/ARROW-16854

The idea is to add part by part in smaller PRs.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

Wednesday works for me 👍

@jvanstraten

Copy link
Copy Markdown
Contributor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

Thanks a lot for the quick check on this. It’s very interesting how you validated things using the tool. Do you think it’s wise to add a CI to test Substrait related queries using this tool?

Please feel free to add suggestions. @jvanstraten

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

cc @westonpace For future reference in the review.

@jvanstraten

Copy link
Copy Markdown
Contributor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

Here it is rather, the differentiation between a user passed value vs the default. We could assume the default and do the comparison to see if an explicit value is passed. There is no API calls in Expression to check if it has_filter or has_projection. May be that kind of a function could be useful.

@vibhatha
vibhatha marked this pull request as ready for review June 23, 2022 12:58

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the long delay. I have a few suggestions but overall I think this looks good.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Should we create a JIRA for this?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/tmp/ will not be portable once we support Windows URIs. Can you use arrow::internal::TemporaryDir from arrow/util/io_util.h?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we got an issue with Windows paths already in Substrait? We have added a skip for Windows tests.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a missing path support.

GTEST_SKIP() << "ARROW-16392: Substrait File URI not supported for Windows";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but that JIRA will eventually be fixed. We don't want to make it harder to support Windows.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be okay now. I updated the test case.

Comment on lines 1484 to 1571

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting here seems off

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping: when I reformatted it comes to this shape. I tried a few times. Not sure what's wrong.

Comment on lines 1500 to 1501

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand this note.

@vibhathavibhathaJul 12, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah instead of just saying test.parquet we say /test.parquet

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the des prefix for? Can you use a whole word?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

des was meant to represent deserialized. I will update it's usage.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

We got rid of that. By the way this could would remain very much same, but ths usage would be different once this is subjected to a registry usage in Substrait ToProto methods.

@vibhatha
vibhatha marked this pull request as draft July 13, 2022 07:16
@vibhatha

vibhatha commented Jul 13, 2022

Copy link
Copy Markdown
ContributorAuthor

** THIS PR IS UNDERGOING A REFACTOR **

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I added a fix for the path issue on Mac. I think now it is more generalized.

Any other suggestions?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is close. Mostly just some cleanup comments at this point.

Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
}
read_rel_lfs->mutable_items()->AddAllocated(read_rel_lfs_ffs.release());
}
read_rel->set_allocated_local_files(read_rel_lfs.release());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have a follow-up JIRA to add support for scan options projection & filter? I don't think it should be done as part of this JIRA since it is changing.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.h Outdated
Comment threadcpp/src/arrow/util/io_util.cc Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I updated the PR. Seems like a few CIs are failing. But, it seems like not related to the changes applied here.
WDYT?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sticking with this.

@westonpace
westonpace merged commit 7475605 into apache:masterSep 8, 2022
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace Thanks a lot for keeping up with the major changes and a few rounds of reviews. 👍

@ursabot

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 8fe7e35 and contender = 7475605. 7475605 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Finished ⬇️0.31% ⬆️0.2%] test-mac-arm
[Failed ⬇️0.0% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.46% ⬆️0.0%] ursa-thinkcentre-m75q
Buildkite builds:
[Finished] 74756051 ec2-t3-xlarge-us-east-2
[Finished] 74756051 test-mac-arm
[Failed] 74756051 ursa-i9-9960x
[Finished] 74756051 ursa-thinkcentre-m75q
[Finished] 8fe7e353 ec2-t3-xlarge-us-east-2
[Finished] 8fe7e353 test-mac-arm
[Failed] 8fe7e353 ursa-i9-9960x
[Finished] 8fe7e353 ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

zagto pushed a commit to zagto/arrow that referenced this pull request Oct 7, 2022
This is the initial PR to set the util functions and structure to include the `ToProto` functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation. In this PR the `read` relation ToProto is added. Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@vibhatha@westonpace@jvanstraten@bkietz@ursabot@lidavidm
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

ARROW-16855: [C++] Adding Read Relation ToProto - #13401

Merged
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855
Sep 8, 2022
Merged

ARROW-16855: [C++] Adding Read Relation ToProto#13401
westonpace merged 30 commits into
apache:masterfrom
vibhatha:arrow-16855

Conversation

@vibhatha

Copy link
Copy Markdown
Contributor

This is the initial PR to set the util functions and structure to include the ToProto functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation.
In this PR the read relation ToProto is added.

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

⚠️ Ticket has no components in JIRA, make sure you assign one.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

cc @westonpace added the initial PR to integrate ToProto for relations. The detailed task breakdown for ToProto is documented in here: https://issues.apache.org/jira/browse/ARROW-16854

The idea is to add part by part in smaller PRs.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I'm out Monday & Tuesday. Maybe @jvanstraten can take a look? Otherwise I can get to this on Wednesday

Wednesday works for me 👍

@jvanstraten

Copy link
Copy Markdown
Contributor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

I don't feel qualified to comment on those design questions, but FWIW, I ran the serialized output of the test case through the validator and it's okay-ish (the validator doesn't like the lack of a NULLABILITY_REQUIRED in the struct that represents the schema, but that's pretty pedantic I guess), and the code looks fine to me.

Thanks a lot for the quick check on this. It’s very interesting how you validated things using the tool. Do you think it’s wise to add a CI to test Substrait related queries using this tool?

Please feel free to add suggestions. @jvanstraten

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

cc @westonpace For future reference in the review.

@jvanstraten

Copy link
Copy Markdown
Contributor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Do you think it’s wise to add a CI to test Substrait related queries using this tool?

IMO every roundtripped plan in every Substrait consumer and/or producer should also be passed through the validator. Otherwise, how would you know for sure that the Substrait plan you've successfully roundtripped through is actually sensible in any way? It does always require a complete plan, though, so you'd need some or other function for each type of thing (expression, relation, etc) that surrounds the thing with a dummy plan. Arrow could hook into it via the C interface (it's not a very pleasant interface because it's intended to be compatible with any language that can call into C, so you might want to wrap it with some C++ stuff; also it will need a Rust compiler to build) or it could just execute the CLI on a generated file (more clunky, but that can just be pulled from PyPI in binary form, so it's probably a bit easier on CI).

I'm sure I'm biased though, since I'm the one who made the validator. It's also starting to considerably lag behind Substrait; it doesn't seem like anyone is sufficiently interested to review/collaborate, so I can't get any PRs through.

Link, just in case: https://github.com/substrait-io/substrait-validator

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

One doubtful thing is to check in serialization is whether a projection or filter expression is added or not/ differentiation from default values. For instance filter expression defaults to a boolean literal of value true.

Assuming you mean that in Acero the filter expression is mandatory and is just set to literal true if there is none, IMO you could just do the same thing on the Substrait side, at least for now. Likewise for the projection. Or you could just leave it for a later PR and error out when presented with nontrivial values. I don't know how hard any of these things are; I've never done anything with the Acero representation.

Here it is rather, the differentiation between a user passed value vs the default. We could assume the default and do the comparison to see if an explicit value is passed. There is no API calls in Expression to check if it has_filter or has_projection. May be that kind of a function could be useful.

@vibhatha
vibhatha marked this pull request as ready for review June 23, 2022 12:58

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the long delay. I have a few suggestions but overall I think this looks good.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@westonpace

Copy link
Copy Markdown
Member

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

Intersting thoughts. I will take a look at the tool. It would be better if we can use it to validate things. But I am not sure if it needs to be inside the Arrow source or should it be a plugin for Apache Arrow. cc @westonpace

I think it would make a lot of sense for unit tests to bring in the validator as a C dependency.

Should we create a JIRA for this?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/tmp/ will not be portable once we support Windows URIs. Can you use arrow::internal::TemporaryDir from arrow/util/io_util.h?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we got an issue with Windows paths already in Substrait? We have added a skip for Windows tests.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a missing path support.

GTEST_SKIP() << "ARROW-16392: Substrait File URI not supported for Windows";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but that JIRA will eventually be fixed. We don't want to make it harder to support Windows.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be okay now. I updated the test case.

Comment on lines 1484 to 1571

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting here seems off

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping: when I reformatted it comes to this shape. I tried a few times. Not sure what's wrong.

Comment on lines 1500 to 1501

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand this note.

@vibhathavibhathaJul 12, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah instead of just saying test.parquet we say /test.parquet

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the des prefix for? Can you use a whole word?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

des was meant to represent deserialized. I will update it's usage.

Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/serde_test.cc Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

A few more thoughts. Using parquet is fine. My only concern was the test data directory.

We got rid of that. By the way this could would remain very much same, but ths usage would be different once this is subjected to a registry usage in Substrait ToProto methods.

@vibhatha
vibhatha marked this pull request as draft July 13, 2022 07:16
@vibhatha

vibhatha commented Jul 13, 2022

Copy link
Copy Markdown
ContributorAuthor

** THIS PR IS UNDERGOING A REFACTOR **

@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I added a fix for the path issue on Mac. I think now it is more generalized.

Any other suggestions?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is close. Mostly just some cleanup comments at this point.

Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/plan_internal.h Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
}
read_rel_lfs->mutable_items()->AddAllocated(read_rel_lfs_ffs.release());
}
read_rel->set_allocated_local_files(read_rel_lfs.release());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have a follow-up JIRA to add support for scan options projection & filter? I don't think it should be done as part of this JIRA since it is changing.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.h Outdated
Comment threadcpp/src/arrow/util/io_util.cc Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
Comment threadcpp/src/arrow/util/uri.h Outdated
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace I updated the PR. Seems like a few CIs are failing. But, it seems like not related to the changes applied here.
WDYT?

@westonpacewestonpace left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sticking with this.

@westonpace
westonpace merged commit 7475605 into apache:masterSep 8, 2022
@vibhatha

Copy link
Copy Markdown
ContributorAuthor

@westonpace Thanks a lot for keeping up with the major changes and a few rounds of reviews. 👍

@ursabot

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 8fe7e35 and contender = 7475605. 7475605 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Finished ⬇️0.31% ⬆️0.2%] test-mac-arm
[Failed ⬇️0.0% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.46% ⬆️0.0%] ursa-thinkcentre-m75q
Buildkite builds:
[Finished] 74756051 ec2-t3-xlarge-us-east-2
[Finished] 74756051 test-mac-arm
[Failed] 74756051 ursa-i9-9960x
[Finished] 74756051 ursa-thinkcentre-m75q
[Finished] 8fe7e353 ec2-t3-xlarge-us-east-2
[Finished] 8fe7e353 test-mac-arm
[Failed] 8fe7e353 ursa-i9-9960x
[Finished] 8fe7e353 ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

zagto pushed a commit to zagto/arrow that referenced this pull request Oct 7, 2022
This is the initial PR to set the util functions and structure to include the `ToProto` functionality to relations.
Here the objective is to create an ACERO relation by interpretting what is included in a Substrait-Relation. In this PR the `read` relation ToProto is added. Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@vibhatha@westonpace@jvanstraten@bkietz@ursabot@lidavidm