ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit - #13914

Merged
westonpace merged 22 commits into
apache:masterfrom
vibhatha:arrow-15584
Sep 13, 2022
Merged

ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit#13914
westonpace merged 22 commits into
apache:masterfrom
vibhatha:arrow-15584

Conversation

@vibhatha

@vibhathavibhatha commented Aug 18, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

Adding emit feature for Substrait plan deserialization.

This PR covers emits for read, filter, project, join and aggregate operations.

@github-actions

github-actionsBot commented Aug 18, 2022

Copy link
Copy Markdown

https://issues.apache.org/jira/browse/ARROW-15584

@github-actions

github-actionsBot commented Aug 18, 2022

Copy link
Copy Markdown

⚠️ Ticket has not been started in JIRA, please click 'Start Progress'.

@vibhatha
vibhatha marked this pull request as ready for review August 21, 2022 05:38
@vibhatha

vibhatha commented Aug 21, 2022

Copy link
Copy Markdown
ContributorAuthor

cc @westonpace@jeroen please take a look.

jvanstraten
jvanstraten suggested changes Aug 22, 2022
View reviewed changes

@jvanstratenjvanstraten left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I only checked for inconsistencies with Substrait, so not for C++ or Acero-related problems or code quality. Emit handling looks good to me from that perspective, but I did find a few schema deduction problems.

Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
Comment on lines 523 to 535

@jvanstratenjvanstratenAug 22, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Wrong order; keys come first.

The list of distinct columns from each grouping set (ordered by their first appearance) followed by the list of measures in declaration order, [...]

https://substrait.io/relations/logical_relations/#aggregate-operation

@vibhathavibhathaSep 5, 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.

@jvanstraten I also noticed this, but I forget to leave a comment about it. This is probably a separate JIRA because of the order used in the aggregate_node.cc[1]. Please refer to the comment in this line and the two loops after that. The aggregate fields appened first and then the key fields. One thing we can do is swap the response here.

cc @westonpace

[1].

arrow/cpp/src/arrow/compute/exec/aggregate_node.cc

Line 345 in 50a7d15

// Aggregate fields come before key fields to match the behavior of GroupBy function

@jvanstratenjvanstratenSep 5, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Based on the comment this looks like intentional behavior of Arrow, so I don't think aggregate node is going to be adjusted to match Substrait. So that just means there should be a project node inserted behind the aggregate node that moves the columns around accordingly, right? I guess you could fix that in a separate JIRA/PR though. Maybe add a FIXME comment in that case?

@vibhathavibhathaSep 5, 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.

Yes, the requirement in Acero may be static here.
We can use the project to swap things around and document it properly. Probably we can do it in this PR as well.

cc @westonpace

@vibhathavibhathaSep 7, 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.

On second thoughts, it would be better to solve this one in another PR. Because I am not quite sure if this would break R test cases.

@westonpacewestonpaceSep 8, 2022

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.

Another PR is fine but I wouldn't consider the output order from Acero to be too static. Fixing it up to output things in the order Substrait expects would be nice so we can at least avoid the project node in some cases (when a direct emit). It'll be a breaking change and probably cause some slight heartburn to our existing tests but we should probably fix it while we still have the opportunity.

@vibhathavibhathaSep 9, 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.

Jira created here: https://issues.apache.org/jira/browse/ARROW-17656

Comment threadcpp/src/arrow/engine/substrait/relation_internal.h Outdated
@westonpace
westonpace self-requested a review August 22, 2022 16:31
westonpace
westonpace reviewed Aug 29, 2022
View reviewed changes
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc Outdated
westonpace
westonpace reviewed Sep 6, 2022
View reviewed changes

@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.

It seems I had left this review in the pending state. Apologies.

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
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
@vibhatha

vibhatha commented Sep 7, 2022

Copy link
Copy Markdown
ContributorAuthor

@westonpace I updated the PR.

This was referenced Sep 7, 2022
Merged
Open
westonpace
westonpace requested changes Sep 8, 2022
View reviewed changes

@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 naming suggestions and potential spots for cleanup but no complaints to the overall approach.

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
westonpace approved these changes Sep 13, 2022
View reviewed changes

@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 again for putting this together.

@westonpace
westonpace merged commit 7f77811 into apache:masterSep 13, 2022
@vibhatha

vibhatha commented Sep 13, 2022

Copy link
Copy Markdown
ContributorAuthor

Thank you for reviewing this one and keeping up with a few rounds of reviews.

@ursabot

ursabot commented Sep 13, 2022

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 9d65981 and contender = 7f77811. 7f77811 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
[Failed ⬇️1.12% ⬆️0.17%] test-mac-arm
[Failed ⬇️0.28% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️3.55% ⬆️1.92%] ursa-thinkcentre-m75q
Buildkite builds:
[Finished] 7f778113 ec2-t3-xlarge-us-east-2
[Failed] 7f778113 test-mac-arm
[Failed] 7f778113 ursa-i9-9960x
[Finished] 7f778113 ursa-thinkcentre-m75q
[Finished] 9d659810 ec2-t3-xlarge-us-east-2
[Failed] 9d659810 test-mac-arm
[Failed] 9d659810 ursa-i9-9960x
[Finished] 9d659810 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
@vibhatha@zagto
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit (apach…
f98f158
…e#13914)
Adding emit feature for Substrait plan deserialization. This PR covers emits for `read`, `filter`, `project`, `join` and `aggregate` operations.
Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
@asfimportasfimport mentioned this pull request Sep 13, 2022
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@westonpacewestonpacewestonpace approved these changes
+1 more reviewer
@jvanstratenjvanstratenjvanstraten requested changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Component: C++

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@vibhatha@ursabot@westonpace@jvanstraten
, '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-15584: [C++] Add support for Substrait's RelCommon::Emit - #13914
Merged
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Sep 13, 2022
Merged
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit#13914
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Conversation
@vibhatha
@vibhathavibhatha
commented
Aug 18, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Adding emit feature for Substrait plan deserialization.
This PR covers emits for read, filter, project, join and aggregate operations.
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-15584
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

⚠️ Ticket has not been started in JIRA, please click 'Start Progress'.
@vibhatha
vibhatha
marked this pull request as ready for review
August 21, 2022 05:38
@vibhatha
vibhatha
commented
Aug 21, 2022

Copy link


Copy Markdown

ContributorAuthor
cc @westonpace@jeroen please take a look.
jvanstraten
jvanstraten
suggested changes
Aug 22, 2022
View reviewed changes
@jvanstratenjvanstraten
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I only checked for inconsistencies with Substrait, so not for C++ or Acero-related problems or code quality. Emit handling looks good to me from that perspective, but I did find a few schema deduction problems.
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

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


Comment on lines

523
 to 
535

@jvanstratenjvanstratenAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Wrong order; keys come first.
The list of distinct columns from each grouping set (ordered by their first appearance) followed by the list of measures in declaration order, [...]
https://substrait.io/relations/logical_relations/#aggregate-operation
@vibhathavibhathaSep 5, 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.

@jvanstraten I also noticed this, but I forget to leave a comment about it. This is probably a separate JIRA because of the order used in the aggregate_node.cc[1]. Please refer to the comment in this line and the two loops after that. The aggregate fields appened first and then the key fields. One thing we can do is swap the response here.
cc @westonpace
[1]. 
arrow/cpp/src/arrow/compute/exec/aggregate_node.cc

Line 345
in
50a7d15
// Aggregate fields come before key fields to match the behavior of GroupBy function
@jvanstratenjvanstratenSep 5, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Based on the comment this looks like intentional behavior of Arrow, so I don't think aggregate node is going to be adjusted to match Substrait. So that just means there should be a project node inserted behind the aggregate node that moves the columns around accordingly, right? I guess you could fix that in a separate JIRA/PR though. Maybe add a FIXME comment in that case?
@vibhathavibhathaSep 5, 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.

Yes, the requirement in Acero may be static here.

We can use the project to swap things around and document it properly. Probably we can do it in this PR as well.
cc @westonpace
@vibhathavibhathaSep 7, 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.

On second thoughts, it would be better to solve this one in another PR. Because I am not quite sure if this would break R test cases.
@westonpacewestonpaceSep 8, 2022

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.

Another PR is fine but I wouldn't consider the output order from Acero to be too static. Fixing it up to output things in the order Substrait expects would be nice so we can at least avoid the project node in some cases (when a direct emit). It'll be a breaking change and probably cause some slight heartburn to our existing tests but we should probably fix it while we still have the opportunity.
@vibhathavibhathaSep 9, 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.

Jira created here: https://issues.apache.org/jira/browse/ARROW-17656
Comment threadcpp/src/arrow/engine/substrait/relation_internal.h
Outdated

@westonpace
westonpace
self-requested a review
August 22, 2022 16:31
westonpace
westonpace
reviewed
Aug 29, 2022
View reviewed changes
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

westonpace
westonpace
reviewed
Sep 6, 2022
View reviewed changes
@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.

It seems I had left this review in the pending state. Apologies.
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

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

@vibhatha
vibhatha
commented
Sep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
@westonpace I updated the PR.

This was referenced Sep 7, 2022
 Merged


Open

westonpace
westonpace
requested changes
Sep 8, 2022
View reviewed changes
@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 naming suggestions and potential spots for cleanup but no complaints to the overall approach.
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
westonpace
approved these changes
Sep 13, 2022
View reviewed changes
@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 again for putting this together.
@westonpace
westonpace
merged commit 7f77811
into
apache:masterSep 13, 2022
@vibhatha
vibhatha
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
Thank you for reviewing this one and keeping up with a few rounds of reviews.
@ursabot
ursabot
commented
Sep 13, 2022

Copy link


Copy Markdown

Benchmark runs are scheduled for baseline = 9d65981 and contender = 7f77811. 7f77811 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

[Failed ⬇️1.12% ⬆️0.17%] test-mac-arm

[Failed ⬇️0.28% ⬆️0.0%] ursa-i9-9960x

[Finished ⬇️3.55% ⬆️1.92%] ursa-thinkcentre-m75q

Buildkite builds:

[Finished] 7f778113 ec2-t3-xlarge-us-east-2

[Failed] 7f778113 test-mac-arm

[Failed] 7f778113 ursa-i9-9960x

[Finished] 7f778113 ursa-thinkcentre-m75q

[Finished] 9d659810 ec2-t3-xlarge-us-east-2

[Failed] 9d659810 test-mac-arm

[Failed] 9d659810 ursa-i9-9960x

[Finished] 9d659810 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
@vibhatha@zagto
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit (apach…
f98f158
…e#13914)
Adding emit feature for Substrait plan deserialization. This PR covers emits for `read`, `filter`, `project`, `join` and `aggregate` operations.
Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
@asfimportasfimport
mentioned this pull request
Sep 13, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@westonpacewestonpacewestonpace approved these changes

+1 more reviewer

@jvanstratenjvanstratenjvanstraten requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

Component: C++

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@vibhatha@ursabot@westonpace@jvanstraten

, '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-15584: [C++] Add support for Substrait's RelCommon::Emit - #13914
Merged
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Sep 13, 2022
Merged
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit#13914
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Conversation
@vibhatha
@vibhathavibhatha
commented
Aug 18, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Adding emit feature for Substrait plan deserialization.
This PR covers emits for read, filter, project, join and aggregate operations.
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-15584
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

⚠️ Ticket has not been started in JIRA, please click 'Start Progress'.
@vibhatha
vibhatha
marked this pull request as ready for review
August 21, 2022 05:38
@vibhatha
vibhatha
commented
Aug 21, 2022

Copy link


Copy Markdown

ContributorAuthor
cc @westonpace@jeroen please take a look.
jvanstraten
jvanstraten
suggested changes
Aug 22, 2022
View reviewed changes
@jvanstratenjvanstraten
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I only checked for inconsistencies with Substrait, so not for C++ or Acero-related problems or code quality. Emit handling looks good to me from that perspective, but I did find a few schema deduction problems.
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

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


Comment on lines

523
 to 
535

@jvanstratenjvanstratenAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Wrong order; keys come first.
The list of distinct columns from each grouping set (ordered by their first appearance) followed by the list of measures in declaration order, [...]
https://substrait.io/relations/logical_relations/#aggregate-operation
@vibhathavibhathaSep 5, 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.

@jvanstraten I also noticed this, but I forget to leave a comment about it. This is probably a separate JIRA because of the order used in the aggregate_node.cc[1]. Please refer to the comment in this line and the two loops after that. The aggregate fields appened first and then the key fields. One thing we can do is swap the response here.
cc @westonpace
[1]. 
arrow/cpp/src/arrow/compute/exec/aggregate_node.cc

Line 345
in
50a7d15
// Aggregate fields come before key fields to match the behavior of GroupBy function
@jvanstratenjvanstratenSep 5, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Based on the comment this looks like intentional behavior of Arrow, so I don't think aggregate node is going to be adjusted to match Substrait. So that just means there should be a project node inserted behind the aggregate node that moves the columns around accordingly, right? I guess you could fix that in a separate JIRA/PR though. Maybe add a FIXME comment in that case?
@vibhathavibhathaSep 5, 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.

Yes, the requirement in Acero may be static here.

We can use the project to swap things around and document it properly. Probably we can do it in this PR as well.
cc @westonpace
@vibhathavibhathaSep 7, 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.

On second thoughts, it would be better to solve this one in another PR. Because I am not quite sure if this would break R test cases.
@westonpacewestonpaceSep 8, 2022

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.

Another PR is fine but I wouldn't consider the output order from Acero to be too static. Fixing it up to output things in the order Substrait expects would be nice so we can at least avoid the project node in some cases (when a direct emit). It'll be a breaking change and probably cause some slight heartburn to our existing tests but we should probably fix it while we still have the opportunity.
@vibhathavibhathaSep 9, 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.

Jira created here: https://issues.apache.org/jira/browse/ARROW-17656
Comment threadcpp/src/arrow/engine/substrait/relation_internal.h
Outdated

@westonpace
westonpace
self-requested a review
August 22, 2022 16:31
westonpace
westonpace
reviewed
Aug 29, 2022
View reviewed changes
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

westonpace
westonpace
reviewed
Sep 6, 2022
View reviewed changes
@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.

It seems I had left this review in the pending state. Apologies.
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

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

@vibhatha
vibhatha
commented
Sep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
@westonpace I updated the PR.

This was referenced Sep 7, 2022
 Merged


Open

westonpace
westonpace
requested changes
Sep 8, 2022
View reviewed changes
@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 naming suggestions and potential spots for cleanup but no complaints to the overall approach.
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
westonpace
approved these changes
Sep 13, 2022
View reviewed changes
@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 again for putting this together.
@westonpace
westonpace
merged commit 7f77811
into
apache:masterSep 13, 2022
@vibhatha
vibhatha
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
Thank you for reviewing this one and keeping up with a few rounds of reviews.
@ursabot
ursabot
commented
Sep 13, 2022

Copy link


Copy Markdown

Benchmark runs are scheduled for baseline = 9d65981 and contender = 7f77811. 7f77811 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

[Failed ⬇️1.12% ⬆️0.17%] test-mac-arm

[Failed ⬇️0.28% ⬆️0.0%] ursa-i9-9960x

[Finished ⬇️3.55% ⬆️1.92%] ursa-thinkcentre-m75q

Buildkite builds:

[Finished] 7f778113 ec2-t3-xlarge-us-east-2

[Failed] 7f778113 test-mac-arm

[Failed] 7f778113 ursa-i9-9960x

[Finished] 7f778113 ursa-thinkcentre-m75q

[Finished] 9d659810 ec2-t3-xlarge-us-east-2

[Failed] 9d659810 test-mac-arm

[Failed] 9d659810 ursa-i9-9960x

[Finished] 9d659810 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
@vibhatha@zagto
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit (apach…
f98f158
…e#13914)
Adding emit feature for Substrait plan deserialization. This PR covers emits for `read`, `filter`, `project`, `join` and `aggregate` operations.
Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
@asfimportasfimport
mentioned this pull request
Sep 13, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@westonpacewestonpacewestonpace approved these changes

+1 more reviewer

@jvanstratenjvanstratenjvanstraten requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

Component: C++

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@vibhatha@ursabot@westonpace@jvanstraten

, '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-15584: [C++] Add support for Substrait's RelCommon::Emit - #13914
Merged
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Sep 13, 2022
Merged
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit#13914
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Conversation
@vibhatha
@vibhathavibhatha
commented
Aug 18, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Adding emit feature for Substrait plan deserialization.
This PR covers emits for read, filter, project, join and aggregate operations.
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-15584
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

⚠️ Ticket has not been started in JIRA, please click 'Start Progress'.
@vibhatha
vibhatha
marked this pull request as ready for review
August 21, 2022 05:38
@vibhatha
vibhatha
commented
Aug 21, 2022

Copy link


Copy Markdown

ContributorAuthor
cc @westonpace@jeroen please take a look.
jvanstraten
jvanstraten
suggested changes
Aug 22, 2022
View reviewed changes
@jvanstratenjvanstraten
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I only checked for inconsistencies with Substrait, so not for C++ or Acero-related problems or code quality. Emit handling looks good to me from that perspective, but I did find a few schema deduction problems.
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

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


Comment on lines

523
 to 
535

@jvanstratenjvanstratenAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Wrong order; keys come first.
The list of distinct columns from each grouping set (ordered by their first appearance) followed by the list of measures in declaration order, [...]
https://substrait.io/relations/logical_relations/#aggregate-operation
@vibhathavibhathaSep 5, 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.

@jvanstraten I also noticed this, but I forget to leave a comment about it. This is probably a separate JIRA because of the order used in the aggregate_node.cc[1]. Please refer to the comment in this line and the two loops after that. The aggregate fields appened first and then the key fields. One thing we can do is swap the response here.
cc @westonpace
[1]. 
arrow/cpp/src/arrow/compute/exec/aggregate_node.cc

Line 345
in
50a7d15
// Aggregate fields come before key fields to match the behavior of GroupBy function
@jvanstratenjvanstratenSep 5, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Based on the comment this looks like intentional behavior of Arrow, so I don't think aggregate node is going to be adjusted to match Substrait. So that just means there should be a project node inserted behind the aggregate node that moves the columns around accordingly, right? I guess you could fix that in a separate JIRA/PR though. Maybe add a FIXME comment in that case?
@vibhathavibhathaSep 5, 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.

Yes, the requirement in Acero may be static here.

We can use the project to swap things around and document it properly. Probably we can do it in this PR as well.
cc @westonpace
@vibhathavibhathaSep 7, 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.

On second thoughts, it would be better to solve this one in another PR. Because I am not quite sure if this would break R test cases.
@westonpacewestonpaceSep 8, 2022

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.

Another PR is fine but I wouldn't consider the output order from Acero to be too static. Fixing it up to output things in the order Substrait expects would be nice so we can at least avoid the project node in some cases (when a direct emit). It'll be a breaking change and probably cause some slight heartburn to our existing tests but we should probably fix it while we still have the opportunity.
@vibhathavibhathaSep 9, 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.

Jira created here: https://issues.apache.org/jira/browse/ARROW-17656
Comment threadcpp/src/arrow/engine/substrait/relation_internal.h
Outdated

@westonpace
westonpace
self-requested a review
August 22, 2022 16:31
westonpace
westonpace
reviewed
Aug 29, 2022
View reviewed changes
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

westonpace
westonpace
reviewed
Sep 6, 2022
View reviewed changes
@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.

It seems I had left this review in the pending state. Apologies.
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

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

@vibhatha
vibhatha
commented
Sep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
@westonpace I updated the PR.

This was referenced Sep 7, 2022
 Merged


Open

westonpace
westonpace
requested changes
Sep 8, 2022
View reviewed changes
@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 naming suggestions and potential spots for cleanup but no complaints to the overall approach.
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
westonpace
approved these changes
Sep 13, 2022
View reviewed changes
@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 again for putting this together.
@westonpace
westonpace
merged commit 7f77811
into
apache:masterSep 13, 2022
@vibhatha
vibhatha
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
Thank you for reviewing this one and keeping up with a few rounds of reviews.
@ursabot
ursabot
commented
Sep 13, 2022

Copy link


Copy Markdown

Benchmark runs are scheduled for baseline = 9d65981 and contender = 7f77811. 7f77811 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

[Failed ⬇️1.12% ⬆️0.17%] test-mac-arm

[Failed ⬇️0.28% ⬆️0.0%] ursa-i9-9960x

[Finished ⬇️3.55% ⬆️1.92%] ursa-thinkcentre-m75q

Buildkite builds:

[Finished] 7f778113 ec2-t3-xlarge-us-east-2

[Failed] 7f778113 test-mac-arm

[Failed] 7f778113 ursa-i9-9960x

[Finished] 7f778113 ursa-thinkcentre-m75q

[Finished] 9d659810 ec2-t3-xlarge-us-east-2

[Failed] 9d659810 test-mac-arm

[Failed] 9d659810 ursa-i9-9960x

[Finished] 9d659810 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
@vibhatha@zagto
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit (apach…
f98f158
…e#13914)
Adding emit feature for Substrait plan deserialization. This PR covers emits for `read`, `filter`, `project`, `join` and `aggregate` operations.
Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
@asfimportasfimport
mentioned this pull request
Sep 13, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@westonpacewestonpacewestonpace approved these changes

+1 more reviewer

@jvanstratenjvanstratenjvanstraten requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

Component: C++

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@vibhatha@ursabot@westonpace@jvanstraten

, '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-15584: [C++] Add support for Substrait's RelCommon::Emit - #13914
Merged
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Sep 13, 2022
Merged
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit#13914
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Conversation
@vibhatha
@vibhathavibhatha
commented
Aug 18, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Adding emit feature for Substrait plan deserialization.
This PR covers emits for read, filter, project, join and aggregate operations.
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-15584
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

⚠️ Ticket has not been started in JIRA, please click 'Start Progress'.
@vibhatha
vibhatha
marked this pull request as ready for review
August 21, 2022 05:38
@vibhatha
vibhatha
commented
Aug 21, 2022

Copy link


Copy Markdown

ContributorAuthor
cc @westonpace@jeroen please take a look.
jvanstraten
jvanstraten
suggested changes
Aug 22, 2022
View reviewed changes
@jvanstratenjvanstraten
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I only checked for inconsistencies with Substrait, so not for C++ or Acero-related problems or code quality. Emit handling looks good to me from that perspective, but I did find a few schema deduction problems.
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

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


Comment on lines

523
 to 
535

@jvanstratenjvanstratenAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Wrong order; keys come first.
The list of distinct columns from each grouping set (ordered by their first appearance) followed by the list of measures in declaration order, [...]
https://substrait.io/relations/logical_relations/#aggregate-operation
@vibhathavibhathaSep 5, 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.

@jvanstraten I also noticed this, but I forget to leave a comment about it. This is probably a separate JIRA because of the order used in the aggregate_node.cc[1]. Please refer to the comment in this line and the two loops after that. The aggregate fields appened first and then the key fields. One thing we can do is swap the response here.
cc @westonpace
[1]. 
arrow/cpp/src/arrow/compute/exec/aggregate_node.cc

Line 345
in
50a7d15
// Aggregate fields come before key fields to match the behavior of GroupBy function
@jvanstratenjvanstratenSep 5, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Based on the comment this looks like intentional behavior of Arrow, so I don't think aggregate node is going to be adjusted to match Substrait. So that just means there should be a project node inserted behind the aggregate node that moves the columns around accordingly, right? I guess you could fix that in a separate JIRA/PR though. Maybe add a FIXME comment in that case?
@vibhathavibhathaSep 5, 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.

Yes, the requirement in Acero may be static here.

We can use the project to swap things around and document it properly. Probably we can do it in this PR as well.
cc @westonpace
@vibhathavibhathaSep 7, 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.

On second thoughts, it would be better to solve this one in another PR. Because I am not quite sure if this would break R test cases.
@westonpacewestonpaceSep 8, 2022

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.

Another PR is fine but I wouldn't consider the output order from Acero to be too static. Fixing it up to output things in the order Substrait expects would be nice so we can at least avoid the project node in some cases (when a direct emit). It'll be a breaking change and probably cause some slight heartburn to our existing tests but we should probably fix it while we still have the opportunity.
@vibhathavibhathaSep 9, 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.

Jira created here: https://issues.apache.org/jira/browse/ARROW-17656
Comment threadcpp/src/arrow/engine/substrait/relation_internal.h
Outdated

@westonpace
westonpace
self-requested a review
August 22, 2022 16:31
westonpace
westonpace
reviewed
Aug 29, 2022
View reviewed changes
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

westonpace
westonpace
reviewed
Sep 6, 2022
View reviewed changes
@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.

It seems I had left this review in the pending state. Apologies.
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

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

@vibhatha
vibhatha
commented
Sep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
@westonpace I updated the PR.

This was referenced Sep 7, 2022
 Merged


Open

westonpace
westonpace
requested changes
Sep 8, 2022
View reviewed changes
@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 naming suggestions and potential spots for cleanup but no complaints to the overall approach.
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
westonpace
approved these changes
Sep 13, 2022
View reviewed changes
@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 again for putting this together.
@westonpace
westonpace
merged commit 7f77811
into
apache:masterSep 13, 2022
@vibhatha
vibhatha
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
Thank you for reviewing this one and keeping up with a few rounds of reviews.
@ursabot
ursabot
commented
Sep 13, 2022

Copy link


Copy Markdown

Benchmark runs are scheduled for baseline = 9d65981 and contender = 7f77811. 7f77811 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

[Failed ⬇️1.12% ⬆️0.17%] test-mac-arm

[Failed ⬇️0.28% ⬆️0.0%] ursa-i9-9960x

[Finished ⬇️3.55% ⬆️1.92%] ursa-thinkcentre-m75q

Buildkite builds:

[Finished] 7f778113 ec2-t3-xlarge-us-east-2

[Failed] 7f778113 test-mac-arm

[Failed] 7f778113 ursa-i9-9960x

[Finished] 7f778113 ursa-thinkcentre-m75q

[Finished] 9d659810 ec2-t3-xlarge-us-east-2

[Failed] 9d659810 test-mac-arm

[Failed] 9d659810 ursa-i9-9960x

[Finished] 9d659810 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
@vibhatha@zagto
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit (apach…
f98f158
…e#13914)
Adding emit feature for Substrait plan deserialization. This PR covers emits for `read`, `filter`, `project`, `join` and `aggregate` operations.
Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
@asfimportasfimport
mentioned this pull request
Sep 13, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@westonpacewestonpacewestonpace approved these changes

+1 more reviewer

@jvanstratenjvanstratenjvanstraten requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

Component: C++

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@vibhatha@ursabot@westonpace@jvanstraten

, '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-15584: [C++] Add support for Substrait's RelCommon::Emit - #13914
Merged
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Sep 13, 2022
Merged
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit#13914
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Conversation
@vibhatha
@vibhathavibhatha
commented
Aug 18, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Adding emit feature for Substrait plan deserialization.
This PR covers emits for read, filter, project, join and aggregate operations.
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-15584
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

⚠️ Ticket has not been started in JIRA, please click 'Start Progress'.
@vibhatha
vibhatha
marked this pull request as ready for review
August 21, 2022 05:38
@vibhatha
vibhatha
commented
Aug 21, 2022

Copy link


Copy Markdown

ContributorAuthor
cc @westonpace@jeroen please take a look.
jvanstraten
jvanstraten
suggested changes
Aug 22, 2022
View reviewed changes
@jvanstratenjvanstraten
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I only checked for inconsistencies with Substrait, so not for C++ or Acero-related problems or code quality. Emit handling looks good to me from that perspective, but I did find a few schema deduction problems.
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

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


Comment on lines

523
 to 
535

@jvanstratenjvanstratenAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Wrong order; keys come first.
The list of distinct columns from each grouping set (ordered by their first appearance) followed by the list of measures in declaration order, [...]
https://substrait.io/relations/logical_relations/#aggregate-operation
@vibhathavibhathaSep 5, 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.

@jvanstraten I also noticed this, but I forget to leave a comment about it. This is probably a separate JIRA because of the order used in the aggregate_node.cc[1]. Please refer to the comment in this line and the two loops after that. The aggregate fields appened first and then the key fields. One thing we can do is swap the response here.
cc @westonpace
[1]. 
arrow/cpp/src/arrow/compute/exec/aggregate_node.cc

Line 345
in
50a7d15
// Aggregate fields come before key fields to match the behavior of GroupBy function
@jvanstratenjvanstratenSep 5, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Based on the comment this looks like intentional behavior of Arrow, so I don't think aggregate node is going to be adjusted to match Substrait. So that just means there should be a project node inserted behind the aggregate node that moves the columns around accordingly, right? I guess you could fix that in a separate JIRA/PR though. Maybe add a FIXME comment in that case?
@vibhathavibhathaSep 5, 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.

Yes, the requirement in Acero may be static here.

We can use the project to swap things around and document it properly. Probably we can do it in this PR as well.
cc @westonpace
@vibhathavibhathaSep 7, 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.

On second thoughts, it would be better to solve this one in another PR. Because I am not quite sure if this would break R test cases.
@westonpacewestonpaceSep 8, 2022

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.

Another PR is fine but I wouldn't consider the output order from Acero to be too static. Fixing it up to output things in the order Substrait expects would be nice so we can at least avoid the project node in some cases (when a direct emit). It'll be a breaking change and probably cause some slight heartburn to our existing tests but we should probably fix it while we still have the opportunity.
@vibhathavibhathaSep 9, 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.

Jira created here: https://issues.apache.org/jira/browse/ARROW-17656
Comment threadcpp/src/arrow/engine/substrait/relation_internal.h
Outdated

@westonpace
westonpace
self-requested a review
August 22, 2022 16:31
westonpace
westonpace
reviewed
Aug 29, 2022
View reviewed changes
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

westonpace
westonpace
reviewed
Sep 6, 2022
View reviewed changes
@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.

It seems I had left this review in the pending state. Apologies.
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

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

@vibhatha
vibhatha
commented
Sep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
@westonpace I updated the PR.

This was referenced Sep 7, 2022
 Merged


Open

westonpace
westonpace
requested changes
Sep 8, 2022
View reviewed changes
@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 naming suggestions and potential spots for cleanup but no complaints to the overall approach.
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
westonpace
approved these changes
Sep 13, 2022
View reviewed changes
@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 again for putting this together.
@westonpace
westonpace
merged commit 7f77811
into
apache:masterSep 13, 2022
@vibhatha
vibhatha
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
Thank you for reviewing this one and keeping up with a few rounds of reviews.
@ursabot
ursabot
commented
Sep 13, 2022

Copy link


Copy Markdown

Benchmark runs are scheduled for baseline = 9d65981 and contender = 7f77811. 7f77811 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

[Failed ⬇️1.12% ⬆️0.17%] test-mac-arm

[Failed ⬇️0.28% ⬆️0.0%] ursa-i9-9960x

[Finished ⬇️3.55% ⬆️1.92%] ursa-thinkcentre-m75q

Buildkite builds:

[Finished] 7f778113 ec2-t3-xlarge-us-east-2

[Failed] 7f778113 test-mac-arm

[Failed] 7f778113 ursa-i9-9960x

[Finished] 7f778113 ursa-thinkcentre-m75q

[Finished] 9d659810 ec2-t3-xlarge-us-east-2

[Failed] 9d659810 test-mac-arm

[Failed] 9d659810 ursa-i9-9960x

[Finished] 9d659810 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
@vibhatha@zagto
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit (apach…
f98f158
…e#13914)
Adding emit feature for Substrait plan deserialization. This PR covers emits for `read`, `filter`, `project`, `join` and `aggregate` operations.
Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
@asfimportasfimport
mentioned this pull request
Sep 13, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@westonpacewestonpacewestonpace approved these changes

+1 more reviewer

@jvanstratenjvanstratenjvanstraten requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

Component: C++

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@vibhatha@ursabot@westonpace@jvanstraten

, '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-15584: [C++] Add support for Substrait's RelCommon::Emit - #13914
Merged
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Sep 13, 2022
Merged
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit#13914
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Conversation
@vibhatha
@vibhathavibhatha
commented
Aug 18, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Adding emit feature for Substrait plan deserialization.
This PR covers emits for read, filter, project, join and aggregate operations.
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-15584
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

⚠️ Ticket has not been started in JIRA, please click 'Start Progress'.
@vibhatha
vibhatha
marked this pull request as ready for review
August 21, 2022 05:38
@vibhatha
vibhatha
commented
Aug 21, 2022

Copy link


Copy Markdown

ContributorAuthor
cc @westonpace@jeroen please take a look.
jvanstraten
jvanstraten
suggested changes
Aug 22, 2022
View reviewed changes
@jvanstratenjvanstraten
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I only checked for inconsistencies with Substrait, so not for C++ or Acero-related problems or code quality. Emit handling looks good to me from that perspective, but I did find a few schema deduction problems.
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

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


Comment on lines

523
 to 
535

@jvanstratenjvanstratenAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Wrong order; keys come first.
The list of distinct columns from each grouping set (ordered by their first appearance) followed by the list of measures in declaration order, [...]
https://substrait.io/relations/logical_relations/#aggregate-operation
@vibhathavibhathaSep 5, 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.

@jvanstraten I also noticed this, but I forget to leave a comment about it. This is probably a separate JIRA because of the order used in the aggregate_node.cc[1]. Please refer to the comment in this line and the two loops after that. The aggregate fields appened first and then the key fields. One thing we can do is swap the response here.
cc @westonpace
[1]. 
arrow/cpp/src/arrow/compute/exec/aggregate_node.cc

Line 345
in
50a7d15
// Aggregate fields come before key fields to match the behavior of GroupBy function
@jvanstratenjvanstratenSep 5, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Based on the comment this looks like intentional behavior of Arrow, so I don't think aggregate node is going to be adjusted to match Substrait. So that just means there should be a project node inserted behind the aggregate node that moves the columns around accordingly, right? I guess you could fix that in a separate JIRA/PR though. Maybe add a FIXME comment in that case?
@vibhathavibhathaSep 5, 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.

Yes, the requirement in Acero may be static here.

We can use the project to swap things around and document it properly. Probably we can do it in this PR as well.
cc @westonpace
@vibhathavibhathaSep 7, 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.

On second thoughts, it would be better to solve this one in another PR. Because I am not quite sure if this would break R test cases.
@westonpacewestonpaceSep 8, 2022

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.

Another PR is fine but I wouldn't consider the output order from Acero to be too static. Fixing it up to output things in the order Substrait expects would be nice so we can at least avoid the project node in some cases (when a direct emit). It'll be a breaking change and probably cause some slight heartburn to our existing tests but we should probably fix it while we still have the opportunity.
@vibhathavibhathaSep 9, 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.

Jira created here: https://issues.apache.org/jira/browse/ARROW-17656
Comment threadcpp/src/arrow/engine/substrait/relation_internal.h
Outdated

@westonpace
westonpace
self-requested a review
August 22, 2022 16:31
westonpace
westonpace
reviewed
Aug 29, 2022
View reviewed changes
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

westonpace
westonpace
reviewed
Sep 6, 2022
View reviewed changes
@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.

It seems I had left this review in the pending state. Apologies.
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

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

@vibhatha
vibhatha
commented
Sep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
@westonpace I updated the PR.

This was referenced Sep 7, 2022
 Merged


Open

westonpace
westonpace
requested changes
Sep 8, 2022
View reviewed changes
@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 naming suggestions and potential spots for cleanup but no complaints to the overall approach.
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
westonpace
approved these changes
Sep 13, 2022
View reviewed changes
@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 again for putting this together.
@westonpace
westonpace
merged commit 7f77811
into
apache:masterSep 13, 2022
@vibhatha
vibhatha
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
Thank you for reviewing this one and keeping up with a few rounds of reviews.
@ursabot
ursabot
commented
Sep 13, 2022

Copy link


Copy Markdown

Benchmark runs are scheduled for baseline = 9d65981 and contender = 7f77811. 7f77811 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

[Failed ⬇️1.12% ⬆️0.17%] test-mac-arm

[Failed ⬇️0.28% ⬆️0.0%] ursa-i9-9960x

[Finished ⬇️3.55% ⬆️1.92%] ursa-thinkcentre-m75q

Buildkite builds:

[Finished] 7f778113 ec2-t3-xlarge-us-east-2

[Failed] 7f778113 test-mac-arm

[Failed] 7f778113 ursa-i9-9960x

[Finished] 7f778113 ursa-thinkcentre-m75q

[Finished] 9d659810 ec2-t3-xlarge-us-east-2

[Failed] 9d659810 test-mac-arm

[Failed] 9d659810 ursa-i9-9960x

[Finished] 9d659810 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
@vibhatha@zagto
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit (apach…
f98f158
…e#13914)
Adding emit feature for Substrait plan deserialization. This PR covers emits for `read`, `filter`, `project`, `join` and `aggregate` operations.
Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
@asfimportasfimport
mentioned this pull request
Sep 13, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@westonpacewestonpacewestonpace approved these changes

+1 more reviewer

@jvanstratenjvanstratenjvanstraten requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

Component: C++

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@vibhatha@ursabot@westonpace@jvanstraten

, '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-15584: [C++] Add support for Substrait's RelCommon::Emit - #13914
Merged
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Sep 13, 2022
Merged
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit#13914
westonpace merged 22 commits into
apache:masterfrom 
vibhatha:arrow-15584
Conversation
@vibhatha
@vibhathavibhatha
commented
Aug 18, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Adding emit feature for Substrait plan deserialization.
This PR covers emits for read, filter, project, join and aggregate operations.
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

https://issues.apache.org/jira/browse/ARROW-15584
@github-actions
github-actionsBot
commented
Aug 18, 2022

Copy link


Copy Markdown

⚠️ Ticket has not been started in JIRA, please click 'Start Progress'.
@vibhatha
vibhatha
marked this pull request as ready for review
August 21, 2022 05:38
@vibhatha
vibhatha
commented
Aug 21, 2022

Copy link


Copy Markdown

ContributorAuthor
cc @westonpace@jeroen please take a look.
jvanstraten
jvanstraten
suggested changes
Aug 22, 2022
View reviewed changes
@jvanstratenjvanstraten
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I only checked for inconsistencies with Substrait, so not for C++ or Acero-related problems or code quality. Emit handling looks good to me from that perspective, but I did find a few schema deduction problems.
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

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


Comment on lines

523
 to 
535

@jvanstratenjvanstratenAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Wrong order; keys come first.
The list of distinct columns from each grouping set (ordered by their first appearance) followed by the list of measures in declaration order, [...]
https://substrait.io/relations/logical_relations/#aggregate-operation
@vibhathavibhathaSep 5, 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.

@jvanstraten I also noticed this, but I forget to leave a comment about it. This is probably a separate JIRA because of the order used in the aggregate_node.cc[1]. Please refer to the comment in this line and the two loops after that. The aggregate fields appened first and then the key fields. One thing we can do is swap the response here.
cc @westonpace
[1]. 
arrow/cpp/src/arrow/compute/exec/aggregate_node.cc

Line 345
in
50a7d15
// Aggregate fields come before key fields to match the behavior of GroupBy function
@jvanstratenjvanstratenSep 5, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Based on the comment this looks like intentional behavior of Arrow, so I don't think aggregate node is going to be adjusted to match Substrait. So that just means there should be a project node inserted behind the aggregate node that moves the columns around accordingly, right? I guess you could fix that in a separate JIRA/PR though. Maybe add a FIXME comment in that case?
@vibhathavibhathaSep 5, 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.

Yes, the requirement in Acero may be static here.

We can use the project to swap things around and document it properly. Probably we can do it in this PR as well.
cc @westonpace
@vibhathavibhathaSep 7, 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.

On second thoughts, it would be better to solve this one in another PR. Because I am not quite sure if this would break R test cases.
@westonpacewestonpaceSep 8, 2022

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.

Another PR is fine but I wouldn't consider the output order from Acero to be too static. Fixing it up to output things in the order Substrait expects would be nice so we can at least avoid the project node in some cases (when a direct emit). It'll be a breaking change and probably cause some slight heartburn to our existing tests but we should probably fix it while we still have the opportunity.
@vibhathavibhathaSep 9, 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.

Jira created here: https://issues.apache.org/jira/browse/ARROW-17656
Comment threadcpp/src/arrow/engine/substrait/relation_internal.h
Outdated

@westonpace
westonpace
self-requested a review
August 22, 2022 16:31
westonpace
westonpace
reviewed
Aug 29, 2022
View reviewed changes
Comment threadcpp/src/arrow/engine/substrait/relation_internal.cc
Outdated

westonpace
westonpace
reviewed
Sep 6, 2022
View reviewed changes
@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.

It seems I had left this review in the pending state. Apologies.
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

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

@vibhatha
vibhatha
commented
Sep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
@westonpace I updated the PR.

This was referenced Sep 7, 2022
 Merged


Open

westonpace
westonpace
requested changes
Sep 8, 2022
View reviewed changes
@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 naming suggestions and potential spots for cleanup but no complaints to the overall approach.
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
westonpace
approved these changes
Sep 13, 2022
View reviewed changes
@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 again for putting this together.
@westonpace
westonpace
merged commit 7f77811
into
apache:masterSep 13, 2022
@vibhatha
vibhatha
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
Thank you for reviewing this one and keeping up with a few rounds of reviews.
@ursabot
ursabot
commented
Sep 13, 2022

Copy link


Copy Markdown

Benchmark runs are scheduled for baseline = 9d65981 and contender = 7f77811. 7f77811 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

[Failed ⬇️1.12% ⬆️0.17%] test-mac-arm

[Failed ⬇️0.28% ⬆️0.0%] ursa-i9-9960x

[Finished ⬇️3.55% ⬆️1.92%] ursa-thinkcentre-m75q

Buildkite builds:

[Finished] 7f778113 ec2-t3-xlarge-us-east-2

[Failed] 7f778113 test-mac-arm

[Failed] 7f778113 ursa-i9-9960x

[Finished] 7f778113 ursa-thinkcentre-m75q

[Finished] 9d659810 ec2-t3-xlarge-us-east-2

[Failed] 9d659810 test-mac-arm

[Failed] 9d659810 ursa-i9-9960x

[Finished] 9d659810 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
@vibhatha@zagto
ARROW-15584: [C++] Add support for Substrait's RelCommon::Emit (apach…
f98f158
…e#13914)
Adding emit feature for Substrait plan deserialization. This PR covers emits for `read`, `filter`, `project`, `join` and `aggregate` operations.
Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Weston Pace <weston.pace@gmail.com>
@asfimportasfimport
mentioned this pull request
Sep 13, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@westonpacewestonpacewestonpace approved these changes

+1 more reviewer

@jvanstratenjvanstratenjvanstraten requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

Component: C++

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@vibhatha@ursabot@westonpace@jvanstraten