Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-25832][SQL][BRANCH-2.4] Revert newly added map related functions #22827

Closed
wants to merge 7 commits into from

Conversation

gatorsmile
Copy link
Member

@gatorsmile gatorsmile commented Oct 25, 2018

What changes were proposed in this pull request?

How was this patch tested?

The existing tests.

@gatorsmile
Copy link
Member Author

@gatorsmile
Copy link
Member Author

@felixcheung @mengxr The last commit f1f3d0b is for R related revert. Please take a look

@@ -65,21 +65,3 @@ create or replace temporary view nested as values
(1, map(1, 1, 2, 2, 3, 3)),
(2, map(4, 4, 5, 5, 6, 6))
as t(x, ys);
Copy link
Member

Choose a reason for hiding this comment

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

We should revert line 64~67 because they are introduced by SPARK-23939 Add transform_keys function.

@dongjoon-hyun
Copy link
Member

Also, please remove public static final int WORD_SIZE = 8; in UnsafeRow.java. It's added by map_entries.

@gatorsmile
Copy link
Member Author

@dongjoon-hyun I think that can be kept.

create or replace temporary view nested as values
(1, map(1, 1, 2, 2, 3, 3)),
(2, map(4, 4, 5, 5, 6, 6))
as t(x, ys);
Copy link
Member

@dongjoon-hyun dongjoon-hyun Oct 25, 2018

Choose a reason for hiding this comment

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

higher-order-functions.sql.out together?

Copy link
Member Author

Choose a reason for hiding this comment

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

That has been removed already

Copy link
Member

Choose a reason for hiding this comment

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

Oops. Right!

@dongjoon-hyun
Copy link
Member

@gatorsmile . Could you put [BRANCH-2.4] into PR title?

@SparkQA
Copy link

SparkQA commented Oct 25, 2018

Test build #98029 has finished for PR 22827 at commit f1f3d0b.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@gatorsmile gatorsmile changed the title [SPARK-25832][SQL] Revert newly added map related functions [SPARK-25832][SQL][BRANCH-2.4] Revert newly added map related functions Oct 25, 2018
Copy link
Member

@dongjoon-hyun dongjoon-hyun left a comment

Choose a reason for hiding this comment

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

+1, LGTM.
Thank you, @gatorsmile !

@SparkQA
Copy link

SparkQA commented Oct 25, 2018

Test build #98034 has finished for PR 22827 at commit 8bdf02e.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@cloud-fan
Copy link
Contributor

thanks, merging to 2.4!

asfgit pushed a commit that referenced this pull request Oct 25, 2018
## What changes were proposed in this pull request?

- Revert [SPARK-23935][SQL] Adding map_entries function: #21236
- Revert [SPARK-23937][SQL] Add map_filter SQL function: #21986
- Revert [SPARK-23940][SQL] Add transform_values SQL function: #22045
- Revert [SPARK-23939][SQL] Add transform_keys function: #22013
- Revert [SPARK-23938][SQL] Add map_zip_with function: #22017
- Revert the changes of map_entries in [SPARK-24331][SPARKR][SQL] Adding arrays_overlap, array_repeat, map_entries to SparkR: #21434

## How was this patch tested?
The existing tests.

Closes #22827 from gatorsmile/revertMap2.4.

Authored-by: gatorsmile <gatorsmile@gmail.com>
Signed-off-by: Wenchen Fan <wenchen@databricks.com>
@HyukjinKwon
Copy link
Member

LGTM too

Copy link
Member

@felixcheung felixcheung left a comment

Choose a reason for hiding this comment

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

R LGTM

@gatorsmile gatorsmile closed this Oct 26, 2018
@MisterTea
Copy link

@gatorsmile Hey, why were these functions reverted?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
7 participants