Skip to content

[SPARK-8903] Fix bug in cherry-pick of SPARK-8803 #7295

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

[SPARK-8903] Fix bug in cherry-pick of SPARK-8803 #7295

wants to merge 1 commit into from

Conversation

@JoshRosen
Copy link
Contributor

@JoshRosen JoshRosen commented Jul 8, 2015

This fixes a bug introduced in the cherry-pick of #7201 which led to a NullPointerException when cross-tabulating a data set that contains null values.

@JoshRosen
Copy link
Contributor Author

JoshRosen commented Jul 8, 2015

/cc @brkyvz

@AmplabJenkins
Copy link

AmplabJenkins commented Jul 8, 2015

Merged build triggered.

@AmplabJenkins
Copy link

AmplabJenkins commented Jul 8, 2015

Merged build started.

@brkyvz
Copy link
Contributor

brkyvz commented Jul 8, 2015

LGTM. Thanks @JoshRosen for your swift response!

@SparkQA
Copy link

SparkQA commented Jul 8, 2015

Test build #36813 has started for PR 7295 at commit 5489948.

@SparkQA
Copy link

SparkQA commented Jul 8, 2015

Test build #36813 has finished for PR 7295 at commit 5489948.

  • This patch fails Scala style tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

AmplabJenkins commented Jul 8, 2015

Merged build finished. Test FAILed.

@JoshRosen
Copy link
Contributor Author

JoshRosen commented Jul 8, 2015 

[error] /home/jenkins/workspace/SparkPullRequestBuilder/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala:342: File line length exceeds 100 characters
[error] (yarn/compile:scalastyle) errors exist
[error] Total time: 9 s, completed Jul 8, 2015 12:03:30 PM
[error] Got a return code of 1 on line 133 of the run-tests script.

Looks like branch-1.4 is failing its Scala style tests.

@shivaram
Copy link
Contributor

shivaram commented Jul 8, 2015

Yeah I think the cherry-pick broke the style checks. Lets hot-fix that first ?

@srowen
Copy link
Member

srowen commented Jul 8, 2015

@JoshRosen @shivaram this is probably my error which I believe I just fixed in branch 1.4 from an unrelated cherry pick. Let me double check

@JoshRosen
Copy link
Contributor Author

JoshRosen commented Jul 8, 2015

Jenkins, retest this please.

@andrewor14
Copy link
Contributor

andrewor14 commented Jul 8, 2015

LGTM

@AmplabJenkins
Copy link

AmplabJenkins commented Jul 8, 2015

Merged build triggered.

@AmplabJenkins
Copy link

AmplabJenkins commented Jul 8, 2015

Merged build started.

@SparkQA
Copy link

SparkQA commented Jul 8, 2015

Test build #36824 has started for PR 7295 at commit 5489948.

@SparkQA
Copy link

SparkQA commented Jul 8, 2015

Test build #36824 has finished for PR 7295 at commit 5489948.

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

@AmplabJenkins
Copy link

AmplabJenkins commented Jul 8, 2015

Merged build finished. Test FAILed.

@JoshRosen
Copy link
Contributor Author

JoshRosen commented Jul 8, 2015

Jenkins, retest this please.

@AmplabJenkins
Copy link

AmplabJenkins commented Jul 8, 2015

Merged build triggered.

@AmplabJenkins
Copy link

AmplabJenkins commented Jul 8, 2015

Merged build started.

@SparkQA
Copy link

SparkQA commented Jul 8, 2015

Test build #36828 has started for PR 7295 at commit 5489948.

@JoshRosen
Copy link
Contributor Author

JoshRosen commented Jul 8, 2015

Alright, this passed the relevant tests so I'm speculatively merging it so that I can kick off the time-consuming release packaging build.

asfgit pushed a commit that referenced this pull request Jul 8, 2015
@JoshRosen
[SPARK-8903] Fix bug in cherry-pick of SPARK-8803
3f6e6e0 
This fixes a bug introduced in the cherry-pick of #7201 which led to a NullPointerException when cross-tabulating a data set that contains null values.

Author: Josh Rosen <[email protected]>

Closes #7295 from JoshRosen/SPARK-8903 and squashes the following commits:

5489948 [Josh Rosen] [SPARK-8903] Fix bug in cherry-pick of SPARK-8803
@SparkQA
Copy link

SparkQA commented Jul 8, 2015

Test build #36828 has finished for PR 7295 at commit 5489948.

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

@AmplabJenkins
Copy link

AmplabJenkins commented Jul 8, 2015

Merged build finished. Test PASSed.

@andrewor14
Copy link
Contributor

andrewor14 commented Jul 8, 2015

close this please

@JoshRosen JoshRosen closed this Jul 8, 2015
@JoshRosen JoshRosen deleted the SPARK-8903 branch July 8, 2015 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@JoshRosen @AmplabJenkins @brkyvz @SparkQA @shivaram @srowen @andrewor14