Skip to content

Conversation

@kaka1992
Copy link
Contributor

@kaka1992 kaka1992 commented May 2, 2015

No description provided.

@marmbrus
Copy link
Contributor

marmbrus commented May 2, 2015

Please include a before and after example of the output and a description of what you changed (in the PR description).

Copy link
Contributor

Choose a reason for hiding this comment

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

Undo this change.

@kaka1992
Copy link
Contributor Author

kaka1992 commented May 3, 2015

testData.select($"*").show(5)

Before:

key value
1   1    
2   2    
3   3    
4   4    
5   5 

After:

+---+-----+
|key|value|
|  1|    1|
|  2|    2|
|  3|    3|
|  4|    4|
|  5|    5|
+---+-----+

@rxin
Copy link
Contributor

rxin commented May 3, 2015

@kaka1992 Thanks a lot for being so helpful. I have two requests:

  1. Can you add a line after the header, exactly like what I wrote in the JIRA ticket?
  2. Can you read this coding style guide and clean up the code? https://github.com/databricks/scala-style-guide In general, it would be great to have the style match exactly rest of the code. Thanks.

Copy link
Contributor

Choose a reason for hiding this comment

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

it would be great to create unit test for showString in DataFrameSuite.

云峤 added 2 commits May 3, 2015 15:20
Copy link
Contributor

Choose a reason for hiding this comment

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

you can use multi line string in Scala, especially with stripMargin.

http://alvinalexander.com/scala/scala-multiline-strings-heredoc-syntax

@rxin
Copy link
Contributor

rxin commented May 4, 2015

This is looking pretty good now. I think you would need to fix some Python tests as well, as they were expecting the output from show.

@kaka1992
Copy link
Contributor Author

kaka1992 commented May 4, 2015

@rxin Please test this PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

it's pretty awkward to have this at the end. I'd just create a variable for the expected string so we don't have so much whitespace.

@rxin
Copy link
Contributor

rxin commented May 4, 2015

Jenkins, test this please.

@rxin
Copy link
Contributor

rxin commented May 4, 2015

Jenkins, retest this please.

@SparkQA
Copy link

SparkQA commented May 4, 2015

Test build #31728 has finished for PR 5865 at commit a1338f6.

  • This patch fails to build.
  • This patch merges cleanly.
  • This patch adds no public classes.

@kaka1992
Copy link
Contributor Author

kaka1992 commented May 4, 2015

@rxin error: oro#oro;2.0.8!oro.jar origin location must be absolute. What's wrong with building?

@rxin
Copy link
Contributor

rxin commented May 4, 2015

Jenkins, retest this please.

@SparkQA
Copy link

SparkQA commented May 4, 2015

Test build #31731 has finished for PR 5865 at commit a1338f6.

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

@kaka1992
Copy link
Contributor Author

kaka1992 commented May 4, 2015

@rxin Fixed showDF test in R.

@rxin
Copy link
Contributor

rxin commented May 4, 2015

Jenkins, ok to test.

@shivaram
Copy link
Contributor

shivaram commented May 4, 2015

SparkR changes look good

@SparkQA
Copy link

SparkQA commented May 4, 2015

Test build #31764 has finished for PR 5865 at commit c79204b.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds the following public classes (experimental):
    • abstract class ShuffleHandle(val shuffleId: Int) extends Serializable
    • * class SomethingNotSerializable
    • logDebug(s" + cloning the object $obj of class $
    • class SaslEncryption
    • static class EncryptedMessage extends AbstractReferenceCounted implements FileRegion
    • class SaslRpcHandler extends RpcHandler
    • public class SaslServerBootstrap implements TransportServerBootstrap
    • public class SparkSaslClient implements SaslEncryptionBackend
    • public class SparkSaslServer implements SaslEncryptionBackend
    • public class ByteArrayWritableChannel implements WritableByteChannel

@rxin
Copy link
Contributor

rxin commented May 4, 2015

Thanks a lot for doing this. I'm merging this in master.

@asfgit asfgit closed this in f32e69e May 4, 2015
asfgit pushed a commit that referenced this pull request May 4, 2015
Author: 云峤 <[email protected]>

Closes #5865 from kaka1992/df.show and squashes the following commits:

c79204b [云峤] Update
a1338f6 [云峤] Update python dataFrame show test and add empty df unit test.
734369c [云峤] Update python dataFrame show test and add empty df unit test.
84aec3e [云峤] Update python dataFrame show test and add empty df unit test.
159b3d5 [云峤] update
03ef434 [云峤] update
7394fd5 [云峤] update test show
ced487a [云峤] update pep8
b6e690b [云峤] Merge remote-tracking branch 'upstream/master' into df.show
30ac311 [云峤] [SPARK-7294] ADD BETWEEN
7d62368 [云峤] [SPARK-7294] ADD BETWEEN
baf839b [云峤] [SPARK-7294] ADD BETWEEN
d11d5b9 [云峤] [SPARK-7294] ADD BETWEEN

(cherry picked from commit f32e69e)
Signed-off-by: Reynold Xin <[email protected]>
jeanlyn pushed a commit to jeanlyn/spark that referenced this pull request May 28, 2015
Author: 云峤 <[email protected]>

Closes apache#5865 from kaka1992/df.show and squashes the following commits:

c79204b [云峤] Update
a1338f6 [云峤] Update python dataFrame show test and add empty df unit test.
734369c [云峤] Update python dataFrame show test and add empty df unit test.
84aec3e [云峤] Update python dataFrame show test and add empty df unit test.
159b3d5 [云峤] update
03ef434 [云峤] update
7394fd5 [云峤] update test show
ced487a [云峤] update pep8
b6e690b [云峤] Merge remote-tracking branch 'upstream/master' into df.show
30ac311 [云峤] [SPARK-7294] ADD BETWEEN
7d62368 [云峤] [SPARK-7294] ADD BETWEEN
baf839b [云峤] [SPARK-7294] ADD BETWEEN
d11d5b9 [云峤] [SPARK-7294] ADD BETWEEN
jeanlyn pushed a commit to jeanlyn/spark that referenced this pull request Jun 12, 2015
Author: 云峤 <[email protected]>

Closes apache#5865 from kaka1992/df.show and squashes the following commits:

c79204b [云峤] Update
a1338f6 [云峤] Update python dataFrame show test and add empty df unit test.
734369c [云峤] Update python dataFrame show test and add empty df unit test.
84aec3e [云峤] Update python dataFrame show test and add empty df unit test.
159b3d5 [云峤] update
03ef434 [云峤] update
7394fd5 [云峤] update test show
ced487a [云峤] update pep8
b6e690b [云峤] Merge remote-tracking branch 'upstream/master' into df.show
30ac311 [云峤] [SPARK-7294] ADD BETWEEN
7d62368 [云峤] [SPARK-7294] ADD BETWEEN
baf839b [云峤] [SPARK-7294] ADD BETWEEN
d11d5b9 [云峤] [SPARK-7294] ADD BETWEEN
nemccarthy pushed a commit to nemccarthy/spark that referenced this pull request Jun 19, 2015
Author: 云峤 <[email protected]>

Closes apache#5865 from kaka1992/df.show and squashes the following commits:

c79204b [云峤] Update
a1338f6 [云峤] Update python dataFrame show test and add empty df unit test.
734369c [云峤] Update python dataFrame show test and add empty df unit test.
84aec3e [云峤] Update python dataFrame show test and add empty df unit test.
159b3d5 [云峤] update
03ef434 [云峤] update
7394fd5 [云峤] update test show
ced487a [云峤] update pep8
b6e690b [云峤] Merge remote-tracking branch 'upstream/master' into df.show
30ac311 [云峤] [SPARK-7294] ADD BETWEEN
7d62368 [云峤] [SPARK-7294] ADD BETWEEN
baf839b [云峤] [SPARK-7294] ADD BETWEEN
d11d5b9 [云峤] [SPARK-7294] ADD BETWEEN
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants